Changed some classes names