Minor renaming and Javadoc updates