Changed workspaces

The names are now more accurate.