Changes to be consistent with Android client, including a rename