The unfortunate host naming can't be fixed at the moment...
This means I can easily add new hosts now.