Rename this for consistency with the new namespace: #824.
Rename this for consistency with the new namespace: #824.