roomservice.py: Remove naming in roomservice