Renamed and changed files to reflect host-name-updates