Merge "Handling invalid name of workspace register and rename."