Naming, Javadoc comments and package cleanups.