[ISSUE: AV-16] Update wording