Updating the API to the new API

JAVA-1325
These sure don't look distinct.  ;)