changed the java files to follow standard class names