Changed the classes names