Renamed few classes to match the naming pattern, fixed a few warnings