Fixing the new avispy naming