Fix filenames and javadoc comments.