Only convert "-" to "_" in underscore, use hyphenize for anything else.