Merge "Rename api according to API Council guidance." into main