adjusting name of the classes