Merge "Update audio terminology"