Updated classes names