Fix for issues caused by variable names like "classifier"

(Note the "class")