Revert "QC_AV -> _AV_"