renamed AVMapping to AV and other related renamings