Merge "Rename API as per API Council review" into main