Move naming convention to be closer to Room service.