Include 'Workspace' in unique names; don't create new objects, just set state