Service name refactoring