Fixed hostname calls to always get the short name