renames, some javadoc, reverts
renames, some javadoc, reverts