Changed FormulaType enums to CamelCase