javadoc and naming refinements