Rename spaces
Fix switch