More renames and javadoc