Renaming and Javadoc