Merge "Move enum name parsing to EnumName template function."