Fix bug navigating back from a just renamed workspace
Workspace code cleanup