Touchups to naming and cleanups of JavaDoc