Renamed some npr API's.