Renamed CalculatorFunctions class to CalcFunctions for consistency