changed class names to match convention

http://stackoverflow.com/questions/16537620/class-name-convention-in-java