Removed underscore prefix and suffix from enum