Merge "Address API renaming suggestions" into rvc-dev