Merge "Renaming AAC variants to their more technical forms." into jb-dev