Refactoring the hostname