Refactor binder type name; update javadoc [ci skip]