Cleaning
Changed some class names