Fixed naming issue. This refs #7924
Merge branch 'feature/7924_workspace_naming' into develop