Names of the classes are changed