Get rid of "FunctionN" as a shorthand for numbered function classes