some changes in the name of the classes