Also update docs to be consistent with the new namings.
Also update docs to be consistent with the new namings.