renamings and javadoc
javadoc