Change enum name to not have a leading underscore