Killed compile warnings
Renamed a few classes according to google style guide's naming conventions