Change a method's name
Change class names
Fix javadoc