Merge "Update api name"