Removed underscore prefix/sufix from enums