Updated host and renamed some stuff