Better workspace renaming in workspace selector.

Refs #5590