Refactored the hostname