Refactoring domain name