Changed name of all classes