Updated hostnames
merged