Revert accidental class name change
Align javadoc improvements