Name changes and javadoc