New names for classes and a few Javadoc comments