Changed name of the classes