Switched to real hostnames, not assumed hostnames from device name