Renamed some npr API's.
More NPR api name changes.