Fix hostnames cannot have underscores