Fix a critical bug that was causing Spaces to break

Changing the name of a Space would cause horrible chaos.  Have fixed
that, at least for now.