Feat rename spaces

simplifies names for Spaces