Changed classes names