Hotelling fixes
UC-1519 - hoteling feature rename