Minor fix, renames,  and hostfile updates