Renaming service to entity