Fix workspace numbers & names