Fixing naming scheme, changing bool to BOOL for changingSpace