Refactoring: rename namespace and service