Merge "Per API review, revert the API renaming CL." into nyc-dev