diff --git a/tests/TestSuite_cloud_filter_with_l4_port.py b/tests/TestSuite_cloud_filter_with_l4_port.py
index 5f4ff0de..e2a16f69 100644
--- a/tests/TestSuite_cloud_filter_with_l4_port.py
+++ b/tests/TestSuite_cloud_filter_with_l4_port.py
@@ -51,7 +51,7 @@ class TestCloudFilterWithL4Port(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
diff --git a/tests/TestSuite_dual_vlan.py b/tests/TestSuite_dual_vlan.py
index f09f9d00..695ff1b3 100644
--- a/tests/TestSuite_dual_vlan.py
+++ b/tests/TestSuite_dual_vlan.py
@@ -56,7 +56,7 @@ class TestDualVlan(TestCase):
             self.fwversion = self.pmdout.get_firmware_version(self.dut_ports[0]).split()
 
         if self.nic in [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_40G-QSFP_A",
             "I40E_40G-QSFP_B",
             "I40E_25G-25G_SFP28",
@@ -233,7 +233,7 @@ class TestDualVlan(TestCase):
 
         for mode in modeName:
             if self.nic in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -264,7 +264,7 @@ class TestDualVlan(TestCase):
         out = self.dut.send_expect("show port info %s" % dutRxPortId, "testpmd> ")
         for mode in modeName:
             if self.nic in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
@@ -441,7 +441,7 @@ class TestDualVlan(TestCase):
         if self.nic not in [
             "ICE_25G-E810C_SFP",
             "ICE_100G-E810C_QSFP",
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_40G-QSFP_A",
             "I40E_40G-QSFP_B",
             "I40E_25G-25G_SFP28",
@@ -514,7 +514,7 @@ class TestDualVlan(TestCase):
         if self.nic in [
             "ICE_25G-E810C_SFP",
             "ICE_100G-E810C_QSFP",
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_40G-QSFP_A",
             "I40E_40G-QSFP_B",
             "I40E_25G-25G_SFP28",
@@ -540,7 +540,7 @@ class TestDualVlan(TestCase):
         if self.nic in [
             "ICE_25G-E810C_SFP",
             "ICE_100G-E810C_QSFP",
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_40G-QSFP_A",
             "I40E_40G-QSFP_B",
             "I40E_25G-25G_SFP28",
@@ -566,7 +566,7 @@ class TestDualVlan(TestCase):
             "vlan %s" % self.outvlanId_id in out,
             "vlan strip queue disable error : " + out,
         )
-        # if self.nic in ["I40E_10G-SFP_XL710", "I40E_40G-QSFP_A", "I40E_40G-QSFP_B"]:
+        # if self.nic in ["I40E_10G-SFP_X710", "I40E_40G-QSFP_A", "I40E_40G-QSFP_B"]:
         self.mode_config(strip="on")
         self.mode_config(stripq="on")
         self.vlan_send_packet(self.outvlanId_id)
diff --git a/tests/TestSuite_floating_veb.py b/tests/TestSuite_floating_veb.py
index aabb9c27..ab1d0d69 100644
--- a/tests/TestSuite_floating_veb.py
+++ b/tests/TestSuite_floating_veb.py
@@ -112,7 +112,7 @@ class TestFloatingVEBSwitching(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
diff --git a/tests/TestSuite_generic_flow_api.py b/tests/TestSuite_generic_flow_api.py
index b0d0eb44..1b49cb85 100644
--- a/tests/TestSuite_generic_flow_api.py
+++ b/tests/TestSuite_generic_flow_api.py
@@ -297,7 +297,7 @@ class TestGeneric_flow_api(TestCase):
                 or "index %s" % str(MAX_QUEUE + 1) in flow_cmd
             ):
                 if self.nic in [
-                    "I40E_10G-SFP_XL710",
+                    "I40E_10G-SFP_X710",
                     "I40E_40G-QSFP_A",
                     "I40E_40G-QSFP_B",
                     "I40E_10G-SFP_X722",
@@ -314,7 +314,7 @@ class TestGeneric_flow_api(TestCase):
                     self.dut.send_expect(flow_cmd, "error")
             elif "type is 0x8100" in flow_cmd:
                 if self.nic in [
-                    "I40E_10G-SFP_XL710",
+                    "I40E_10G-SFP_X710",
                     "I40E_40G-QSFP_A",
                     "I40E_40G-QSFP_B",
                     "I40E_10G-SFP_X722",
@@ -340,7 +340,7 @@ class TestGeneric_flow_api(TestCase):
                 or "index %s" % str(MAX_QUEUE + 1) in flow_cmd
             ):
                 if self.nic in [
-                    "I40E_10G-SFP_XL710",
+                    "I40E_10G-SFP_X710",
                     "I40E_40G-QSFP_A",
                     "I40E_40G-QSFP_B",
                     "I40E_10G-SFP_X722",
@@ -357,7 +357,7 @@ class TestGeneric_flow_api(TestCase):
                     self.dut.send_expect(flow_cmd, "error")
             elif "type is 0x8100" in flow_cmd:
                 if self.nic in [
-                    "I40E_10G-SFP_XL710",
+                    "I40E_10G-SFP_X710",
                     "I40E_40G-QSFP_A",
                     "I40E_40G-QSFP_B",
                     "I40E_10G-SFP_X722",
@@ -1083,7 +1083,7 @@ class TestGeneric_flow_api(TestCase):
                 "IGB_1G-I350_COPPER",
                 "IGC-I225_LM",
                 "IGC-I226_LM",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_X722",
@@ -1107,7 +1107,7 @@ class TestGeneric_flow_api(TestCase):
         # i350 and 82580 only support 2-tuple, and don't support SCTP
         # create the flow rules
         if self.nic in [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_25G-25G_SFP28",
             "I40E_40G-QSFP_A",
             "I40E_10G-10G_BASE_T_X722",
@@ -1197,7 +1197,7 @@ class TestGeneric_flow_api(TestCase):
                 "IXGBE_10G-X550EM_X_10G_T",
                 "IXGBE_10G-X550T",
                 "IGB_1G-I350_COPPER",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
@@ -1225,7 +1225,7 @@ class TestGeneric_flow_api(TestCase):
 
         # i40e,ixgbe and igb support different packet types.
         if self.nic in [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_40G-QSFP_A",
             "I40E_10G-10G_BASE_T_BC",
             "I40E_40G-QSFP_B",
@@ -1318,7 +1318,7 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
@@ -1388,7 +1388,7 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1521,7 +1521,7 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1656,7 +1656,7 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1791,7 +1791,7 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1936,7 +1936,7 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -2023,7 +2023,7 @@ class TestGeneric_flow_api(TestCase):
         )
 
     support_nic = [
-        "I40E_10G-SFP_XL710",
+        "I40E_10G-SFP_X710",
         "I40E_25G-25G_SFP28",
         "I40E_40G-QSFP_A",
         "I40E_10G-10G_BASE_T_BC",
@@ -2271,7 +2271,7 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
@@ -2609,7 +2609,7 @@ class TestGeneric_flow_api(TestCase):
                 "ICE_25G-E823C_QSFP",
                 "IXGBE_10G-X550EM_X_10G_T",
                 "IXGBE_10G-X550T",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
@@ -2623,7 +2623,7 @@ class TestGeneric_flow_api(TestCase):
         )
         # i40e
         if self.nic in [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_25G-25G_SFP28",
             "I40E_40G-QSFP_A",
             "ICE_25G-E810C_SFP",
@@ -2906,7 +2906,7 @@ class TestGeneric_flow_api(TestCase):
                 "IXGBE_10G-82599_SFP",
                 "IXGBE_10G-X550EM_X_10G_T",
                 "IXGBE_10G-X550T",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
@@ -2918,7 +2918,7 @@ class TestGeneric_flow_api(TestCase):
         )
         # i40e
         if self.nic in [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_25G-25G_SFP28",
             "I40E_40G-QSFP_A",
             "I40E_40G-QSFP_B",
@@ -3249,7 +3249,7 @@ class TestGeneric_flow_api(TestCase):
                 "ICE_25G-E810C_SFP",
                 "ICE_100G-E810C_QSFP",
                 "ICE_25G-E823C_QSFP",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
@@ -3263,7 +3263,7 @@ class TestGeneric_flow_api(TestCase):
         )
         # i40e
         if self.nic in [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_25G-25G_SFP28",
             "I40E_40G-QSFP_A",
             "ICE_25G-E810C_SFP",
@@ -3557,7 +3557,7 @@ class TestGeneric_flow_api(TestCase):
                 "IXGBE_10G-82599_SFP",
                 "IXGBE_10G-X550EM_X_10G_T",
                 "IXGBE_10G-X550T",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
@@ -3571,7 +3571,7 @@ class TestGeneric_flow_api(TestCase):
         )
         # i40e
         if self.nic in [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_25G-25G_SFP28",
             "I40E_40G-QSFP_A",
             "I40E_40G-QSFP_B",
@@ -4140,7 +4140,7 @@ class TestGeneric_flow_api(TestCase):
                 "IXGBE_10G-82599_SFP",
                 "IXGBE_10G-X550EM_X_10G_T",
                 "IXGBE_10G-X550T",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
@@ -4157,7 +4157,7 @@ class TestGeneric_flow_api(TestCase):
         )
         # i40e
         if self.nic in [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_25G-25G_SFP28",
             "I40E_40G-QSFP_A",
             "I40E_10G-10G_BASE_T_BC",
@@ -4740,7 +4740,7 @@ class TestGeneric_flow_api(TestCase):
             in [
                 "IXGBE_10G-X550EM_X_10G_T",
                 "IXGBE_10G-X550T",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_X722",
@@ -4765,7 +4765,7 @@ class TestGeneric_flow_api(TestCase):
 
         # create the flow rules
         if self.nic in [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_25G-25G_SFP28",
             "I40E_40G-QSFP_A",
             "I40E_10G-10G_BASE_T_X722",
@@ -5014,7 +5014,7 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "ICE_25G-E810C_SFP",
@@ -5281,7 +5281,7 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_A",
                 "ICE_25G-E810C_SFP",
@@ -5531,7 +5531,7 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
diff --git a/tests/TestSuite_i40e_rss_input.py b/tests/TestSuite_i40e_rss_input.py
index 716800d9..67f5b160 100644
--- a/tests/TestSuite_i40e_rss_input.py
+++ b/tests/TestSuite_i40e_rss_input.py
@@ -56,7 +56,7 @@ class TestI40ERssInput(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
diff --git a/tests/TestSuite_ipgre.py b/tests/TestSuite_ipgre.py
index 14c57812..efb5e13b 100644
--- a/tests/TestSuite_ipgre.py
+++ b/tests/TestSuite_ipgre.py
@@ -40,7 +40,7 @@ class TestIpgre(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
diff --git a/tests/TestSuite_l2fwd_jobstats.py b/tests/TestSuite_l2fwd_jobstats.py
index d4414013..4ae706c1 100644
--- a/tests/TestSuite_l2fwd_jobstats.py
+++ b/tests/TestSuite_l2fwd_jobstats.py
@@ -23,7 +23,7 @@ class TestL2fwdJobstats(TestCase):
         self.verify(
             self.nic
             not in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
diff --git a/tests/TestSuite_link_status_interrupt.py b/tests/TestSuite_link_status_interrupt.py
index 971eac1d..9f9a3f24 100644
--- a/tests/TestSuite_link_status_interrupt.py
+++ b/tests/TestSuite_link_status_interrupt.py
@@ -40,7 +40,7 @@ class TestLinkStatusInterrupt(TestCase):
         if self.nic in [
             "ICE_25G-E810C_SFP",
             "ICE_100G-E810C_QSFP",
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_40G-QSFP_A",
             "I40E_40G-QSFP_B",
             "I40E_25G-25G_SFP28",
diff --git a/tests/TestSuite_nvgre.py b/tests/TestSuite_nvgre.py
index 46ea6bad..f47acc5d 100644
--- a/tests/TestSuite_nvgre.py
+++ b/tests/TestSuite_nvgre.py
@@ -373,7 +373,7 @@ class TestNvgre(TestCase):
         """
         # this feature only enable in Intel® Ethernet 700 Series now
         if self.nic in [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_40G-QSFP_A",
             "I40E_40G-QSFP_B",
             "I40E_25G-25G_SFP28",
diff --git a/tests/TestSuite_pmdrss_hash.py b/tests/TestSuite_pmdrss_hash.py
index afa30bf3..70816e8c 100644
--- a/tests/TestSuite_pmdrss_hash.py
+++ b/tests/TestSuite_pmdrss_hash.py
@@ -500,7 +500,7 @@ class TestPmdrssHash(TestCase):
         global queue
 
         if self.nic in [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_40G-QSFP_A",
             "I40E_40G-QSFP_B",
             "I40E_10G-SFP_X722",
diff --git a/tests/TestSuite_pmdrssreta.py b/tests/TestSuite_pmdrssreta.py
index 0bc5ce01..d38cb3e2 100644
--- a/tests/TestSuite_pmdrssreta.py
+++ b/tests/TestSuite_pmdrssreta.py
@@ -293,7 +293,7 @@ class TestPmdrssreta(TestCase):
             "ICE_25G-E810C_SFP": 52,
             "ICE_25G-E823C_QSFP": 52,
             "ICE_100G-E810C_QSFP": 52,
-            "I40E_10G-SFP_XL710": 52,
+            "I40E_10G-SFP_X710": 52,
             "I40E_40G-QSFP_A": 52,
             "I40E_40G-QSFP_B": 52,
             "I40E_25G-25G_SFP28": 52,
diff --git a/tests/TestSuite_port_representor.py b/tests/TestSuite_port_representor.py
index eb0ddba5..dfb845a9 100644
--- a/tests/TestSuite_port_representor.py
+++ b/tests/TestSuite_port_representor.py
@@ -26,7 +26,7 @@ class TestPortRepresentor(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
diff --git a/tests/TestSuite_ptype_mapping.py b/tests/TestSuite_ptype_mapping.py
index b460e293..bd524416 100644
--- a/tests/TestSuite_ptype_mapping.py
+++ b/tests/TestSuite_ptype_mapping.py
@@ -20,7 +20,7 @@ class TestPtype_Mapping(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
diff --git a/tests/TestSuite_pvp_share_lib.py b/tests/TestSuite_pvp_share_lib.py
index 5d3eb26f..0152f683 100644
--- a/tests/TestSuite_pvp_share_lib.py
+++ b/tests/TestSuite_pvp_share_lib.py
@@ -186,7 +186,7 @@ class TestPVPShareLib(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_10G-SFP_X722",
diff --git a/tests/TestSuite_qinq_filter.py b/tests/TestSuite_qinq_filter.py
index 87653681..00ebc15a 100644
--- a/tests/TestSuite_qinq_filter.py
+++ b/tests/TestSuite_qinq_filter.py
@@ -28,7 +28,7 @@ class TestQinqFilter(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
diff --git a/tests/TestSuite_queue_region.py b/tests/TestSuite_queue_region.py
index f1c27962..0f521765 100644
--- a/tests/TestSuite_queue_region.py
+++ b/tests/TestSuite_queue_region.py
@@ -30,7 +30,7 @@ class TestQueue_region(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_B",
diff --git a/tests/TestSuite_rss_key_update.py b/tests/TestSuite_rss_key_update.py
index 77f11839..d77c9df1 100644
--- a/tests/TestSuite_rss_key_update.py
+++ b/tests/TestSuite_rss_key_update.py
@@ -166,7 +166,7 @@ class TestRssKeyUpdate(TestCase):
             in [
                 "ICE_25G-E810C_SFP",
                 "ICE_100G-E810C_QSFP",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_10G-SFP_X722",
@@ -185,7 +185,7 @@ class TestRssKeyUpdate(TestCase):
             queue = 4
 
         if self.nic in [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_40G-QSFP_A",
             "I40E_40G-QSFP_B",
             "I40E_10G-SFP_X722",
@@ -344,7 +344,7 @@ class TestRssKeyUpdate(TestCase):
         nic_rss_key_size = {
             "ICE_25G-E810C_SFP": 52,
             "ICE_100G-E810C_QSFP": 52,
-            "I40E_10G-SFP_XL710": 52,
+            "I40E_10G-SFP_X710": 52,
             "I40E_40G-QSFP_A": 52,
             "I40E_40G-QSFP_B": 52,
             "I40E_25G-25G_SFP28": 52,
diff --git a/tests/TestSuite_rss_to_rte_flow.py b/tests/TestSuite_rss_to_rte_flow.py
index 7d2bfa9b..36ecc7b9 100644
--- a/tests/TestSuite_rss_to_rte_flow.py
+++ b/tests/TestSuite_rss_to_rte_flow.py
@@ -373,7 +373,7 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -589,7 +589,7 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -700,7 +700,7 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -815,7 +815,7 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -960,7 +960,7 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1161,7 +1161,7 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1212,7 +1212,7 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1287,7 +1287,7 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1344,7 +1344,7 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1404,7 +1404,7 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1466,7 +1466,7 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1516,7 +1516,7 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1625,7 +1625,7 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1723,7 +1723,7 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
@@ -1813,7 +1813,7 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_10G-10G_BASE_T_BC",
                 "I40E_40G-QSFP_B",
diff --git a/tests/TestSuite_runtime_vf_queue_number_kernel.py b/tests/TestSuite_runtime_vf_queue_number_kernel.py
index ea6800c1..a5a9a974 100644
--- a/tests/TestSuite_runtime_vf_queue_number_kernel.py
+++ b/tests/TestSuite_runtime_vf_queue_number_kernel.py
@@ -27,7 +27,7 @@ class TestRuntimeVfQueueNumberKernel(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_B",
diff --git a/tests/TestSuite_runtime_vf_queue_number_maxinum.py b/tests/TestSuite_runtime_vf_queue_number_maxinum.py
index 9424010e..8c8d0ec3 100644
--- a/tests/TestSuite_runtime_vf_queue_number_maxinum.py
+++ b/tests/TestSuite_runtime_vf_queue_number_maxinum.py
@@ -24,7 +24,7 @@ class TestRuntimeVfQnMaxinum(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_25G-25G_SFP28",
                 "I40E_10G-SFP_X722",
@@ -53,7 +53,7 @@ class TestRuntimeVfQnMaxinum(TestCase):
         Bind Intel® Ethernet 700 Series nic to DPDK PF, and create 32/64 vfs on it.
         Start testpmd based on the created vfs.
         """
-        if self.nic in ["I40E_10G-SFP_XL710"]:
+        if self.nic in ["I40E_10G-SFP_X710"]:
             self.dut.generate_sriov_vfs_by_port(self.used_dut_port, 32, driver=driver)
         elif self.nic in [
             "I40E_25G-25G_SFP28",
@@ -148,7 +148,7 @@ class TestRuntimeVfQnMaxinum(TestCase):
         vf2_queue_number = 0
         vf3_allow_index = 0
         vf3_allow_list = ""
-        if self.nic in ["I40E_10G-SFP_XL710"]:
+        if self.nic in ["I40E_10G-SFP_X710"]:
             left_queues = 384 - 65 - 32 * 4
             vf1_allow_index = left_queues / 16
             vf2_queue_number = left_queues % 16
diff --git a/tests/TestSuite_rxtx_offload.py b/tests/TestSuite_rxtx_offload.py
index a40bf0b0..351c5168 100644
--- a/tests/TestSuite_rxtx_offload.py
+++ b/tests/TestSuite_rxtx_offload.py
@@ -61,7 +61,7 @@ class TestRxTx_Offload(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_B",
@@ -594,7 +594,7 @@ class TestRxTx_Offload(TestCase):
         self.dut.send_expect("set fwd txonly", "testpmd> ")
         self.dut.send_expect("set verbose 1", "testpmd> ")
         if self.nic in [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_40G-QSFP_A",
             "I40E_25G-25G_SFP28",
             "I40E_40G-QSFP_B",
@@ -651,7 +651,7 @@ class TestRxTx_Offload(TestCase):
         self.dut.send_expect("set fwd txonly", "testpmd> ")
         self.dut.send_expect("set verbose 1", "testpmd> ")
         if self.nic in [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_40G-QSFP_A",
             "I40E_25G-25G_SFP28",
             "I40E_40G-QSFP_B",
@@ -789,7 +789,7 @@ class TestRxTx_Offload(TestCase):
         capabilities = self.check_port_capability("tx")
         # Disable per queue capability first, if it is Intel® Ethernet 700 Series/X722.
         if self.nic in [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_40G-QSFP_A",
             "I40E_25G-25G_SFP28",
             "I40E_40G-QSFP_B",
@@ -825,7 +825,7 @@ class TestRxTx_Offload(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_25G-25G_SFP28",
                 "I40E_10G-10G_BASE_T_BC",
diff --git a/tests/TestSuite_scatter.py b/tests/TestSuite_scatter.py
index c4b2de23..171829ef 100644
--- a/tests/TestSuite_scatter.py
+++ b/tests/TestSuite_scatter.py
@@ -43,7 +43,7 @@ class TestScatter(TestCase):
             "IXGBE_10G-82599_SFP",
             "IXGBE_10G-X550T",
             "I40E_10G-X722_A0",
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_40G-QSFP_A",
             "I40E_40G-QSFP_B",
             "I40E_25G-25G_SFP28",
diff --git a/tests/TestSuite_tso.py b/tests/TestSuite_tso.py
index 8cbd7a70..a8292d8c 100755
--- a/tests/TestSuite_tso.py
+++ b/tests/TestSuite_tso.py
@@ -303,7 +303,7 @@ class TestTSO(TestCase):
         )
 
         Nic_list = [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_40G-QSFP_A",
             "I40E_40G-QSFP_B",
             "I40E_25G-25G_SFP28",
diff --git a/tests/TestSuite_uni_pkt.py b/tests/TestSuite_uni_pkt.py
index 8aa526f0..f75d89b5 100644
--- a/tests/TestSuite_uni_pkt.py
+++ b/tests/TestSuite_uni_pkt.py
@@ -284,7 +284,7 @@ class TestUniPacket(TestCase):
                 "ICE_25G-E823C_QSFP",
                 "ICE_100G-E810C_QSFP",
                 "IXGBE_10G-82599_SFP",
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "IGB_1G-I350_COPPER",
                 "I40E_10G-SFP_X722",
diff --git a/tests/TestSuite_veb_switch.py b/tests/TestSuite_veb_switch.py
index f87b726f..0a0b96bb 100644
--- a/tests/TestSuite_veb_switch.py
+++ b/tests/TestSuite_veb_switch.py
@@ -137,7 +137,7 @@ class TestVEBSwitching(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
diff --git a/tests/TestSuite_vf_interrupt_pmd.py b/tests/TestSuite_vf_interrupt_pmd.py
index 4a84c917..391b8f9b 100644
--- a/tests/TestSuite_vf_interrupt_pmd.py
+++ b/tests/TestSuite_vf_interrupt_pmd.py
@@ -271,7 +271,7 @@ class TestVfInterruptPmd(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_B",
@@ -316,7 +316,7 @@ class TestVfInterruptPmd(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_25G-25G_SFP28",
                 "I40E_40G-QSFP_B",
diff --git a/tests/TestSuite_vf_rss.py b/tests/TestSuite_vf_rss.py
index 2b961ad3..c06963af 100644
--- a/tests/TestSuite_vf_rss.py
+++ b/tests/TestSuite_vf_rss.py
@@ -268,7 +268,7 @@ class TestVfRss(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_25G-25G_SFP28",
diff --git a/tests/TestSuite_vlan_ethertype_config.py b/tests/TestSuite_vlan_ethertype_config.py
index 7147c490..a2029b91 100644
--- a/tests/TestSuite_vlan_ethertype_config.py
+++ b/tests/TestSuite_vlan_ethertype_config.py
@@ -340,7 +340,7 @@ class TestVlanEthertypeConfig(TestCase):
         self.verify(
             self.nic
             in [
-                "I40E_10G-SFP_XL710",
+                "I40E_10G-SFP_X710",
                 "I40E_40G-QSFP_A",
                 "I40E_40G-QSFP_B",
                 "I40E_10G-10G_BASE_T_BC",
diff --git a/tests/TestSuite_vmdq.py b/tests/TestSuite_vmdq.py
index 280d54bb..4a8b8df5 100644
--- a/tests/TestSuite_vmdq.py
+++ b/tests/TestSuite_vmdq.py
@@ -49,7 +49,7 @@ class TestVmdq(TestCase):
             self.pools = 64
         elif self.nic in ("I40E_40G-QSFP_A", "I40E_40G-QSFP_B"):
             self.pools = 63
-        elif self.nic in ("I40E_10G-SFP_XL710"):
+        elif self.nic in ("I40E_10G-SFP_X710"):
             self.pools = 34
         else:
             self.pools = 8
diff --git a/tests/TestSuite_vxlan.py b/tests/TestSuite_vxlan.py
index 98d6e666..bfdf5b90 100644
--- a/tests/TestSuite_vxlan.py
+++ b/tests/TestSuite_vxlan.py
@@ -265,7 +265,7 @@ class TestVxlan(TestCase):
         """
         # this feature only enable in Intel® Ethernet 700 Series now
         if self.nic in [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_40G-QSFP_A",
             "I40E_40G-QSFP_B",
             "I40E_25G-25G_SFP28",
diff --git a/tests/TestSuite_vxlan_gpe_support_in_i40e.py b/tests/TestSuite_vxlan_gpe_support_in_i40e.py
index bb854b70..582d99f7 100644
--- a/tests/TestSuite_vxlan_gpe_support_in_i40e.py
+++ b/tests/TestSuite_vxlan_gpe_support_in_i40e.py
@@ -107,7 +107,7 @@ class TestVxlanGpeSupportInI40e(TestCase):
         """
         # this feature only enable in Intel® Ethernet 700 Series now
         if self.nic not in [
-            "I40E_10G-SFP_XL710",
+            "I40E_10G-SFP_X710",
             "I40E_40G-QSFP_A",
             "I40E_40G-QSFP_B",
             "I40E_25G-25G_SFP28",
diff --git a/tests/perf_test_base.py b/tests/perf_test_base.py
index 5c87163f..2ced3eba 100644
--- a/tests/perf_test_base.py
+++ b/tests/perf_test_base.py
@@ -34,7 +34,7 @@ VF_L3FWD_NIC_SUPPORT = frozenset(
         "IXGBE_10G-82599_SFP",
         "I40E_40G-QSFP_A",
         "I40E_25G-25G_SFP28",
-        "I40E_10G-SFP_XL710",
+        "I40E_10G-SFP_X710",
         "ICE_100G-E810C_QSFP",
         "ICE_25G-E810C_SFP",
         "ICE_25G-E810_XXV_SFP",
