changed the name of some classes