simplify generated enums, use generated enums instead of custom ones