new names of classes
correct work