Merge "audio: Make renamings suggested by reviewers" into main