Rename base on API review (#13557)

Change-Id: I3174d19d2595232b66f4120ba8fb6fbb1c6d8be8