Changed some class and methods name