Revert "roomservice.py: Remove naming in roomservice"

This reverts commit 99553416381454216888a241caa9d146325ba7a4.