Modified classifiers to match official list of classifiers.