Change of classes names