Simple renames on enums reduced "_"