Merge "Rename to follow API council guidance." into oc-dev