Nicer hostnames

Fixes #1180
Fixes #1189