JAL-1953 first pass of adding javadoc, some methods renamed