Revert back to using numbers for all workspace names