Merge "Consistent naming for internal storage APIs." into nyc-dev