adding both i40evf iavf to support back compatibility