Fix hostnames cannot have underscores
Fix hostnames cannot have underscores