Clean and refactor for naming convention the Antivirus contribution. Still to be more deeply tested.