Renaming and refactoring to service