diff --git a/tests/TestSuite_af_xdp_2.py b/tests/TestSuite_af_xdp_2.py
index edc9b320..7d628145 100644
--- a/tests/TestSuite_af_xdp_2.py
+++ b/tests/TestSuite_af_xdp_2.py
@@ -44,7 +44,7 @@ class TestAfXdp(TestCase):
         """
         Run at the start of each test suite.
         """
-        # self.verify(self.nic in ("fortville_spirit"), "the port can not run this suite")
+        # self.verify(self.nic in ("I40E_40G-QSFP_A"), "the port can not run this suite")
 
         self.frame_sizes = [64, 128, 256, 512, 1024, 1518]
         self.dut_ports = self.dut.get_ports()
diff --git a/tests/TestSuite_checksum_offload.py b/tests/TestSuite_checksum_offload.py
index 142be171..b849a1d5 100644
--- a/tests/TestSuite_checksum_offload.py
+++ b/tests/TestSuite_checksum_offload.py
@@ -508,8 +508,8 @@ class TestChecksumOffload(TestCase):
                     packet[VXLAN][Ether], "VXLAN", inner_flag=True
                 ):
                     error_messages.append(vxlan_error_message % self.count)
-                # fortville not support outer udp checksum
-                if "fortville" in self.nic:
+                # Intel® Ethernet 700 Series not support outer udp checksum
+                if self.is_eth_series_nic(700):
                     continue
                 if self.validate_checksum(packet, "VXLAN"):
                     error_messages.append(vxlan_error_message % self.count)
@@ -962,8 +962,8 @@ class TestChecksumOffload(TestCase):
                             if flag == "RTE_MBUF_F_RX_L4_CKSUM_":
                                 should_pass = inner_arg == ""
                             else:  # flag == RTE_MBUF_F_RX_OUTER_L4_CKSUM_
-                                # fortville not support outer checksum
-                                if "fortville" in self.nic:
+                                # Intel® Ethernet 700 Series not support outer checksum
+                                if self.is_eth_series_nic(700):
                                     continue
                                 should_pass = outer_arg == ""
                             vf = self.send_pkt_expect_good_bad_from_flag_catch_failure(
diff --git a/tests/TestSuite_cloud_filter_with_l4_port.py b/tests/TestSuite_cloud_filter_with_l4_port.py
index 6c2b3453..1ab85d9f 100644
--- a/tests/TestSuite_cloud_filter_with_l4_port.py
+++ b/tests/TestSuite_cloud_filter_with_l4_port.py
@@ -78,13 +78,13 @@ class TestCloudFilterWithL4Port(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28",
             ],
             "%s nic not support cloud filter" % self.nic,
         )
diff --git a/tests/TestSuite_ddp_gtp.py b/tests/TestSuite_ddp_gtp.py
index f6ceb5b4..50245c9a 100644
--- a/tests/TestSuite_ddp_gtp.py
+++ b/tests/TestSuite_ddp_gtp.py
@@ -49,7 +49,7 @@ class TestDdpGtp(TestCase):
 
     def set_up_all(self):
         self.verify(
-            "fortville" in self.nic, "ddp gtp can not support %s nic" % self.nic
+            self.is_eth_series_nic(700), "ddp gtp can not support %s nic" % self.nic
         )
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports")
@@ -178,9 +178,9 @@ class TestDdpGtp(TestCase):
 
     def load_profile(self):
         """
-        Load profile to update FVL configuration tables, profile will be
-        stored in binary file and need to be passed to AQ to program FVL
-        during initialization stage.
+        Load profile to update Intel® Ethernet 700 Series configuration tables,
+        profile will be stored in binary file and need to be passed to AQ to
+        program Intel® Ethernet 700 Series during initialization stage.
         """
         self.dut_testpmd.start_testpmd(
             "Default",
diff --git a/tests/TestSuite_ddp_gtp_qregion.py b/tests/TestSuite_ddp_gtp_qregion.py
index 5daa3c17..3600c7b4 100644
--- a/tests/TestSuite_ddp_gtp_qregion.py
+++ b/tests/TestSuite_ddp_gtp_qregion.py
@@ -77,9 +77,9 @@ class TestDdpGtpQregion(TestCase):
 
     def load_profile(self):
         """
-        Load profile to update FVL configuration tables, profile will be
-        stored in binary file and need to be passed to AQ to program FVL
-        during initialization stage.
+        Load profile to update Intel® Ethernet 700 Series configuration tables,
+        profile will be stored in binary file and need to be passed to AQ to
+        program Intel® Ethernet 700 Series during initialization stage.
         """
         self.dut_testpmd.start_testpmd(
             "Default",
diff --git a/tests/TestSuite_ddp_l2tpv3.py b/tests/TestSuite_ddp_l2tpv3.py
index 1eece104..7c3d5ee4 100644
--- a/tests/TestSuite_ddp_l2tpv3.py
+++ b/tests/TestSuite_ddp_l2tpv3.py
@@ -75,8 +75,8 @@ class TestDdpL2tpv3(TestCase):
 
     def load_profile(self):
         """
-        Load profile to update FVL configuration tables, profile will be
-        stored in binary file.
+        Load profile to update Intel® Ethernet 700 Series configuration
+        tables, profile will be stored in binary file.
         """
         self.dut_testpmd.start_testpmd(
             "Default",
diff --git a/tests/TestSuite_ddp_mpls.py b/tests/TestSuite_ddp_mpls.py
index 9b1179be..4108a62c 100644
--- a/tests/TestSuite_ddp_mpls.py
+++ b/tests/TestSuite_ddp_mpls.py
@@ -51,7 +51,7 @@ class Testddp_mpls(TestCase):
 
     def set_up_all(self):
         self.verify(
-            "fortville" in self.nic, "ddp mpls can not support %s nic" % self.nic
+            self.is_eth_series_nic(700), "ddp mpls can not support %s nic" % self.nic
         )
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports")
@@ -137,9 +137,9 @@ class Testddp_mpls(TestCase):
 
     def load_profile(self):
         """
-        Load profile to update FVL configuration tables, profile will be
-        stored in binary file and need to be passed to AQ to program FVL
-        during initialization stage.
+        Load profile to update Intel® Ethernet 700 Series configuration tables,
+        profile will be stored in binary file and need to be passed to AQ to
+        program Intel® Ethernet 700 Series during initialization stage.
         """
         self.dut_testpmd.execute_cmd("port stop all")
         time.sleep(1)
@@ -218,7 +218,7 @@ class Testddp_mpls(TestCase):
 
     def test_load_ddp(self):
         """
-        Load profile to update FVL configuration tables.
+        Load profile to update Intel® Ethernet 700 Series configuration tables.
         """
         self.load_profile()
 
diff --git a/tests/TestSuite_ddp_ppp_l2tp.py b/tests/TestSuite_ddp_ppp_l2tp.py
index 3fe8879b..15d29ef0 100644
--- a/tests/TestSuite_ddp_ppp_l2tp.py
+++ b/tests/TestSuite_ddp_ppp_l2tp.py
@@ -76,9 +76,9 @@ class TestDdpPppL2tp(TestCase):
 
     def load_profile(self):
         """
-        Load profile to update FVL configuration tables, profile will be
-        stored in binary file and need to be passed to AQ to program FVL
-        during initialization stage.
+        Load profile to update Intel® Ethernet 700 Series configuration tables,
+        profile will be stored in binary file and need to be passed to AQ to
+        program Intel® Ethernet 700 Series during initialization stage.
         """
         self.dut_testpmd.start_testpmd(
             "Default",
diff --git a/tests/TestSuite_dual_vlan.py b/tests/TestSuite_dual_vlan.py
index 63e273f1..0c0cae6d 100644
--- a/tests/TestSuite_dual_vlan.py
+++ b/tests/TestSuite_dual_vlan.py
@@ -133,13 +133,13 @@ class TestDualVlan(TestCase):
         )
 
         if self.nic in [
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirit_single",
-            "fortville_25g",
-            "fortpark_TLV",
-            "carlsville",
-            "fortpark_BASE-T",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_40G-QSFP_B",
+            "I40E_25G-25G_SFP28",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_BC",
+            "I40E_10G-10G_BASE_T_X722",
         ]:
             self.dut.send_expect("vlan set filter on all", "testpmd> ")
             self.dut.send_expect("set promisc all off", "testpmd> ")
@@ -191,15 +191,15 @@ class TestDualVlan(TestCase):
 
         for mode in modeName:
             if self.nic in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "fortpark_TLV",
-                "carlsville",
-                "fortpark_BASE-T",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_10G-10G_BASE_T_X722",
             ]:
-                # fortville NIC vlan filter can't close, if want close need remove rx_vlan
+                # Intel® Ethernet 700 Series NIC vlan filter can't close, if want close need remove rx_vlan
                 if mode == "filter":
                     if modeName[mode] == "off":
                         self.dut.send_expect(
@@ -226,15 +226,15 @@ class TestDualVlan(TestCase):
         out = self.dut.send_expect("show port info %s" % dutRxPortId, "testpmd> ")
         for mode in modeName:
             if self.nic in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "fortpark_TLV",
-                "carlsville",
-                "fortpark_BASE-T",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_10G-10G_BASE_T_X722",
             ]:
-                # fortville NIC vlan filter can't close, if want close need remove rx_vlan
+                # Intel® Ethernet 700 Series NIC vlan filter can't close, if want close need remove rx_vlan
                 if mode == "filter":
                     if modeName[mode] == "off":
                         self.dut.send_expect(
@@ -376,15 +376,15 @@ class TestDualVlan(TestCase):
         )
 
         if self.nic not in [
-            "columbiaville_25g",
-            "columbiaville_100g",
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirit_single",
-            "fortville_25g",
-            "fortpark_TLV",
-            "carlsville",
-            "fortpark_BASE-T",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_40G-QSFP_B",
+            "I40E_25G-25G_SFP28",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_BC",
+            "I40E_10G-10G_BASE_T_X722",
         ]:
             self.mode_config(filter="off")
             self.vlan_send_packet(outvlan)
@@ -434,15 +434,15 @@ class TestDualVlan(TestCase):
         self.mode_config(extend="off")
         self.mode_config(strip="on")
         if self.nic in [
-            "columbiaville_25g",
-            "columbiaville_100g",
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirit_single",
-            "fortville_25g",
-            "fortpark_TLV",
-            "carlsville",
-            "fortpark_BASE-T",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_40G-QSFP_B",
+            "I40E_25G-25G_SFP28",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_BC",
+            "I40E_10G-10G_BASE_T_X722",
         ]:
             self.dut.send_expect(
                 "rx_vlan add %s %s" % (outvlan, dutRxPortId), "testpmd> "
@@ -456,15 +456,15 @@ class TestDualVlan(TestCase):
         out = self.get_tcpdump_package()
         self.verify("vlan %s" % outvlan in out, "Vlan strip disable error: " + out)
         if self.nic in [
-            "columbiaville_25g",
-            "columbiaville_100g",
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirit_single",
-            "fortville_25g",
-            "fortpark_TLV",
-            "carlsville",
-            "fortpark_BASE-T",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_40G-QSFP_B",
+            "I40E_25G-25G_SFP28",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_BC",
+            "I40E_10G-10G_BASE_T_X722",
         ]:
             self.dut.send_expect(
                 "rx_vlan rm %s %s" % (outvlan, dutRxPortId), "testpmd> "
@@ -483,7 +483,7 @@ class TestDualVlan(TestCase):
         self.verify(
             "vlan %s" % outvlan in out, "vlan strip queue disable error : " + out
         )
-        # if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]:
+        # if self.nic in ["I40E_10G-SFP_XL710", "I40E_40G-QSFP_A", "I40E_40G-QSFP_B"]:
         self.mode_config(strip="on")
         self.mode_config(stripq="on")
         self.vlan_send_packet(outvlan)
@@ -504,8 +504,8 @@ class TestDualVlan(TestCase):
         self.mode_config(filter="off")
         self.mode_config(extend="off")
 
-        # hartwell need to set CTRL.VME for vlan insert
-        if self.nic == "hartwell":
+        # IGB_1G-82574L need to set CTRL.VME for vlan insert
+        if self.nic == "IGB_1G-82574L":
             self.dut.send_expect("vlan set strip on %s" % dutTxPortId, "testpmd> ")
 
         self.dut.send_expect("stop", "testpmd> ")
@@ -535,19 +535,19 @@ class TestDualVlan(TestCase):
         self.verify(
             self.nic
             not in [
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "hartwell",
-                "carlsville",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGB_1G-82574L",
+                "I40E_10G-10G_BASE_T_BC",
             ],
             "%s NIC not support tcpid " % self.nic,
         )
 
         self.mode_config(filter="on", strip="on", extend="on")
-        # nic only support inner model, except fortville nic
+        # nic only support inner model, except Intel® Ethernet 700 Series nic
         self.dut.send_expect("vlan set inner tpid 1234 %s" % dutRxPortId, "testpmd> ")
         self.vlan_send_packet(outvlan, invlan)
 
@@ -568,7 +568,7 @@ class TestDualVlan(TestCase):
         VLAN synthetic test.
         """
         self.verify(
-            self.nic != "hartwell", "sorry, dual vlan cannot support this self.nic"
+            self.nic != "IGB_1G-82574L", "sorry, dual vlan cannot support this self.nic"
         )
         for i in range(len(vlanCase)):
             self.multimode_test(i)
@@ -578,7 +578,7 @@ class TestDualVlan(TestCase):
         VLAN random test.
         """
         self.verify(
-            self.nic != "hartwell", "sorry, dual vlan cannot support this self.nic"
+            self.nic != "IGB_1G-82574L", "sorry, dual vlan cannot support this self.nic"
         )
         for _ in range(30):
             rand = random.randint(0, 15)
diff --git a/tests/TestSuite_dynamic_flowtype.py b/tests/TestSuite_dynamic_flowtype.py
index fbf7d178..81c06976 100644
--- a/tests/TestSuite_dynamic_flowtype.py
+++ b/tests/TestSuite_dynamic_flowtype.py
@@ -43,7 +43,7 @@ VM_CORES_MASK = "all"
 class TestDynamicFlowtype(TestCase):
     def set_up_all(self):
         self.verify(
-            "fortville" in self.nic,
+            self.is_eth_series_nic(700),
             "dynamic flow type mapping can not support %s nic" % self.nic,
         )
         ports = self.dut.get_ports()
@@ -87,9 +87,9 @@ class TestDynamicFlowtype(TestCase):
 
     def load_profile(self):
         """
-        Load profile to update FVL configuration tables, profile will be
-        stored in binary file and need to be passed to AQ to program FVL
-        during initialization stage.
+        Load profile to update Intel® Ethernet 700 Series configuration tables,
+        profile will be stored in binary file and need to be passed to AQ to
+        program Intel® Ethernet 700 Series during initialization stage.
         """
         self.dut_testpmd.execute_cmd("port stop all")
         time.sleep(1)
diff --git a/tests/TestSuite_dynamic_queue.py b/tests/TestSuite_dynamic_queue.py
index 9c65efaf..59a3443c 100644
--- a/tests/TestSuite_dynamic_queue.py
+++ b/tests/TestSuite_dynamic_queue.py
@@ -56,8 +56,8 @@ class TestDynamicQueue(TestCase):
         self.dut_testpmd = PmdOutput(self.dut)
 
     def set_up(self):
-        # Fortville_spirit needs more cores to run properly
-        if self.nic in ["fortville_spirit"]:
+        # Intel® Ethernet Converged Network Adapter XL710-QDA1 needs more cores to run properly
+        if self.nic in ["I40E_40G-QSFP_A"]:
             self.verify(
                 "len(self.dut.cores)>=7", "Less than seven cores can't run testpmd"
             )
diff --git a/tests/TestSuite_eeprom_dump.py b/tests/TestSuite_eeprom_dump.py
index b220316b..c4a6173a 100644
--- a/tests/TestSuite_eeprom_dump.py
+++ b/tests/TestSuite_eeprom_dump.py
@@ -71,9 +71,9 @@ class TestEEPROMDump(TestCase):
         self.verify(not result, "Testpmd dumped is not same as linux dumped")
 
     def dump_to_file(self, regex, get, to, testname):
-        # if nic is columbiaville, eeprom_dump get testpmd output of the first 1000 lines,
-        # module_eeprom_dump get testpmd output of the first 16 lines.
-        if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
+        # if nic is Intel® Ethernet 800 Series, eeprom_dump get testpmd output of the
+        # first 1000 lines, module_eeprom_dump get testpmd output of the first 16 lines.
+        if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
             if testname == "eeprom":
                 count = 1000
             elif testname == "module_eeprom":
diff --git a/tests/TestSuite_enable_package_download_in_ice_driver.py b/tests/TestSuite_enable_package_download_in_ice_driver.py
index 5e91ea6e..79fdf653 100644
--- a/tests/TestSuite_enable_package_download_in_ice_driver.py
+++ b/tests/TestSuite_enable_package_download_in_ice_driver.py
@@ -40,7 +40,7 @@ from framework.test_case import TestCase
 class TestEnable_Package_Download_In_Ice_Driver(TestCase):
     def set_up_all(self):
         self.verify(
-            self.nic in ["columbiaville_100g", "columbiaville_25g"],
+            self.nic in ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP"],
             "NIC Unsupported: " + str(self.nic),
         )
         self.dut_ports = self.dut.get_ports(self.nic)
@@ -413,13 +413,14 @@ class TestEnable_Package_Download_In_Ice_Driver(TestCase):
 
     def check_env(self):
         """
-        Check the DUT has two or more CVL NICs. If not, return "the ENV needs at least two CVL NICs"
+        Check the DUT has two or more Intel® Ethernet 800 Series NICs. If not, return
+        "the case needs >=2 Intel® Ethernet 800 Series NICs with different Serial Numbers"
         """
         self.nic_pci = [self.dut.ports_info[0]["pci"], self.dut.ports_info[-1]["pci"]]
         self.nic_sn = [self.get_sn(self.nic_pci[0]), self.get_sn(self.nic_pci[1])]
         self.verify(
             self.nic_sn[0] != self.nic_sn[1],
-            "the case needs >=2 CVL NICs with different Serial Numbers",
+            "the case needs >=2 Intel® Ethernet 800 Series NICs with different Serial Numbers",
         )
 
     def copy_specify_ice_pkg(self, pkg_ver):
diff --git a/tests/TestSuite_flexible_rxd.py b/tests/TestSuite_flexible_rxd.py
index ef800603..1fa04e39 100644
--- a/tests/TestSuite_flexible_rxd.py
+++ b/tests/TestSuite_flexible_rxd.py
@@ -41,10 +41,10 @@ from .flexible_common import FlexibleRxdBase
 
 class TestFlexibleRxd(TestCase, FlexibleRxdBase):
     supported_nic = [
-        "columbiaville_100g",
-        "columbiaville_25g",
-        "columbiaville_25gx2",
-        "foxville",
+        "ICE_100G-E810C_QSFP",
+        "ICE_25G-E810C_SFP",
+        "ICE_25G-E810_XXV_SFP",
+        "IGC-I225_LM",
     ]
 
     def preset_compilation(self):
diff --git a/tests/TestSuite_floating_veb.py b/tests/TestSuite_floating_veb.py
index c3c0f83c..ad95227a 100644
--- a/tests/TestSuite_floating_veb.py
+++ b/tests/TestSuite_floating_veb.py
@@ -139,10 +139,10 @@ class TestFloatingVEBSwitching(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
diff --git a/tests/TestSuite_generic_flow_api.py b/tests/TestSuite_generic_flow_api.py
index a87f3f8b..18380d20 100644
--- a/tests/TestSuite_generic_flow_api.py
+++ b/tests/TestSuite_generic_flow_api.py
@@ -76,9 +76,14 @@ class TestGeneric_flow_api(TestCase):
         Generic filter Prerequistites
         """
         global MAX_QUEUE
-        if self.nic in ["powerville", "bartonhills", "kawela", "kawela_4"]:
+        if self.nic in [
+            "IGB_1G-I350_COPPER",
+            "IGB_1G-82580_COPPER",
+            "IGB_1G-82576_QUAD_COPPER",
+            "IGB_1G-82576_QUAD_COPPER_ET2",
+        ]:
             MAX_QUEUE = 7
-        elif self.nic in ["foxville"]:
+        elif self.nic in ["IGC-I225_LM"]:
             MAX_QUEUE = 3
         # Based on h/w type, choose how many ports to use
         self.dut_ports = self.dut.get_ports(self.nic)
@@ -350,30 +355,29 @@ class TestGeneric_flow_api(TestCase):
                 or "index %s" % str(MAX_QUEUE + 1) in flow_cmd
             ):
                 if self.nic in [
-                    "fortville_eagle",
-                    "fortville_spirit",
-                    "fortville_spirit_single",
-                    "fortpark_TLV",
-                    "fortpark_BASE-T",
-                    "niantic",
-                    "kawela_4",
-                    "kawela",
-                    "bartonhills",
-                    "twinville",
-                    "sagepond",
-                    "sageville",
-                    "powerville",
-                    "carlsville",
+                    "I40E_10G-SFP_XL710",
+                    "I40E_40G-QSFP_A",
+                    "I40E_40G-QSFP_B",
+                    "I40E_10G-SFP_X722",
+                    "I40E_10G-10G_BASE_T_X722",
+                    "IXGBE_10G-82599_SFP",
+                    "IGB_1G-82576_QUAD_COPPER_ET2",
+                    "IGB_1G-82576_QUAD_COPPER",
+                    "IGB_1G-82580_COPPER",
+                    "IXGBE_10G-X550EM_X_10G_T",
+                    "IXGBE_10G-X550T",
+                    "IGB_1G-I350_COPPER",
+                    "I40E_10G-10G_BASE_T_BC",
                 ]:
                     self.dut.send_expect(flow_cmd, "error")
             elif "type is 0x8100" in flow_cmd:
                 if self.nic in [
-                    "fortville_eagle",
-                    "fortville_spirit",
-                    "fortville_spirit_single",
-                    "fortpark_TLV",
-                    "fortpark_BASE-T",
-                    "carlsville",
+                    "I40E_10G-SFP_XL710",
+                    "I40E_40G-QSFP_A",
+                    "I40E_40G-QSFP_B",
+                    "I40E_10G-SFP_X722",
+                    "I40E_10G-10G_BASE_T_X722",
+                    "I40E_10G-10G_BASE_T_BC",
                 ]:
                     self.dut.send_expect(flow_cmd, "error")
             # vf queue id exceeds max vf queue number.
@@ -394,30 +398,29 @@ class TestGeneric_flow_api(TestCase):
                 or "index %s" % str(MAX_QUEUE + 1) in flow_cmd
             ):
                 if self.nic in [
-                    "fortville_eagle",
-                    "fortville_spirit",
-                    "fortville_spirit_single",
-                    "fortpark_TLV",
-                    "fortpark_BASE-T",
-                    "niantic",
-                    "kawela_4",
-                    "kawela",
-                    "bartonhills",
-                    "twinville",
-                    "sagepond",
-                    "sageville",
-                    "powerville",
-                    "carlsville",
+                    "I40E_10G-SFP_XL710",
+                    "I40E_40G-QSFP_A",
+                    "I40E_40G-QSFP_B",
+                    "I40E_10G-SFP_X722",
+                    "I40E_10G-10G_BASE_T_X722",
+                    "IXGBE_10G-82599_SFP",
+                    "IGB_1G-82576_QUAD_COPPER_ET2",
+                    "IGB_1G-82576_QUAD_COPPER",
+                    "IGB_1G-82580_COPPER",
+                    "IXGBE_10G-X550EM_X_10G_T",
+                    "IXGBE_10G-X550T",
+                    "IGB_1G-I350_COPPER",
+                    "I40E_10G-10G_BASE_T_BC",
                 ]:
                     self.dut.send_expect(flow_cmd, "error")
             elif "type is 0x8100" in flow_cmd:
                 if self.nic in [
-                    "fortville_eagle",
-                    "fortville_spirit",
-                    "fortville_spirit_single",
-                    "fortpark_TLV",
-                    "fortpark_BASE-T",
-                    "carlsville",
+                    "I40E_10G-SFP_XL710",
+                    "I40E_40G-QSFP_A",
+                    "I40E_40G-QSFP_B",
+                    "I40E_10G-SFP_X722",
+                    "I40E_10G-10G_BASE_T_X722",
+                    "I40E_10G-10G_BASE_T_BC",
                 ]:
                     self.dut.send_expect(flow_cmd, "error")
             # vf queue id exceeds max vf queue number.
@@ -937,15 +940,14 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "niantic",
-                "kawela_4",
-                "kawela",
-                "bartonhills",
-                "twinville",
-                "sagepond",
-                "sageville",
-                "powerville",
-                "foxville",
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-82576_QUAD_COPPER",
+                "IGB_1G-82580_COPPER",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IGB_1G-I350_COPPER",
+                "IGC-I225_LM",
             ],
             "%s nic not support SYN filter" % self.nic,
         )
@@ -990,7 +992,7 @@ class TestGeneric_flow_api(TestCase):
         self.dut.send_expect("flow destroy 0 rule 0", "testpmd> ", 120)
 
         # validate and create the flow rules
-        q_idx = "2" if self.nic == "foxville" else "4"
+        q_idx = "2" if self.nic == "IGC-I225_LM" else "4"
         self.dut.send_expect(
             "flow validate 0 ingress pattern eth / ipv6 / tcp flags spec 0x02 flags mask 0x02 / end actions queue index %s / end"
             % (q_idx),
@@ -1026,7 +1028,13 @@ class TestGeneric_flow_api(TestCase):
         only supported by ixgbe and igb
         """
         self.verify(
-            self.nic in ["niantic", "kawela_4", "kawela", "twinville", "foxville"],
+            self.nic
+            in [
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-82576_QUAD_COPPER",
+                "IGC-I225_LM",
+            ],
             "%s nic not support n-tuple filter" % self.nic,
         )
 
@@ -1127,14 +1135,14 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "bartonhills",
-                "powerville",
-                "foxville",
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "IGB_1G-82580_COPPER",
+                "IGB_1G-I350_COPPER",
+                "IGC-I225_LM",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support 2-tuple filter" % self.nic,
         )
@@ -1151,11 +1159,11 @@ 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 [
-            "fortville_eagle",
-            "fortville_25g",
-            "fortville_spirit",
-            "columbiaville_25g",
-            "columbiaville_100g",
+            "I40E_10G-SFP_XL710",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_A",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
         ]:
             basic_flow_actions = [
                 {
@@ -1229,26 +1237,25 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "niantic",
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "kawela_4",
-                "kawela",
-                "bartonhills",
-                "twinville",
-                "sagepond",
-                "sageville",
-                "powerville",
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "foxville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "IXGBE_10G-82599_SFP",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-82576_QUAD_COPPER",
+                "IGB_1G-82580_COPPER",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IGB_1G-I350_COPPER",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGC-I225_LM",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support ethertype filter" % self.nic,
         )
@@ -1265,14 +1272,14 @@ class TestGeneric_flow_api(TestCase):
 
         # i40e,ixgbe and igb support different packet types.
         if self.nic in [
-            "fortville_eagle",
-            "fortville_spirit",
-            "carlsville",
-            "fortville_spirit_single",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "columbiaville_25g",
-            "columbiaville_100g",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_10G-10G_BASE_T_BC",
+            "I40E_40G-QSFP_B",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
         ]:
 
             basic_flow_actions = [
@@ -1357,16 +1364,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "foxville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGC-I225_LM",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir L2 payload filter" % self.nic,
         )
@@ -1425,16 +1432,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir vlan filter" % self.nic,
         )
@@ -1557,16 +1564,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir vlan filter" % self.nic,
         )
@@ -1691,16 +1698,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir vlan filter" % self.nic,
         )
@@ -1825,16 +1832,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir vlan filter" % self.nic,
         )
@@ -1969,16 +1976,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir vlan filter" % self.nic,
         )
@@ -2061,16 +2068,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "foxville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGC-I225_LM",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir vlan filter" % self.nic,
         )
@@ -2390,35 +2397,34 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "niantic",
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "twinville",
-                "sagepond",
-                "sageville",
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "foxville",
+                "IXGBE_10G-82599_SFP",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGC-I225_LM",
             ],
             "%s nic not support fdir ipv4 filter" % self.nic,
         )
         # i40e
         if self.nic in [
-            "fortville_eagle",
-            "fortville_25g",
-            "fortville_spirit",
-            "columbiaville_25g",
-            "columbiaville_100g",
-            "fortville_spirit_single",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "foxville",
-            "carlsville",
+            "I40E_10G-SFP_XL710",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_A",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
+            "I40E_40G-QSFP_B",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "IGC-I225_LM",
+            "I40E_10G-10G_BASE_T_BC",
         ]:
             self.setup_env()
             # start testpmd on pf
@@ -2692,7 +2698,7 @@ class TestGeneric_flow_api(TestCase):
             self.dut.send_expect("start", "testpmd> ", 120)
             time.sleep(2)
 
-            if self.nic in ["sagepond", "sageville"]:
+            if self.nic in ["IXGBE_10G-X550EM_X_10G_T", "IXGBE_10G-X550T"]:
                 # create the flow rules
                 basic_flow_actions = [
                     {
@@ -2815,34 +2821,33 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "niantic",
-                "twinville",
-                "sagepond",
-                "sageville",
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "foxville",
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGC-I225_LM",
             ],
             "%s nic not support fdir ipv6 filter" % self.nic,
         )
         # i40e
         if self.nic in [
-            "fortville_eagle",
-            "fortville_25g",
-            "fortville_spirit",
-            "columbiaville_25g",
-            "columbiaville_100g",
-            "fortville_spirit_single",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "carlsville",
+            "I40E_10G-SFP_XL710",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_A",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
+            "I40E_40G-QSFP_B",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "I40E_10G-10G_BASE_T_BC",
         ]:
             self.setup_env()
             self.pmdout.start_testpmd(
@@ -3128,7 +3133,7 @@ class TestGeneric_flow_api(TestCase):
             self.dut.send_expect("set verbose 1", "testpmd> ", 120)
             self.dut.send_expect("start", "testpmd> ", 120)
             time.sleep(2)
-            if self.nic in ["niantic", "twinville"]:
+            if self.nic in ["IXGBE_10G-82599_SFP"]:
                 # create the flow rules
                 basic_flow_actions = [
                     {
@@ -3283,7 +3288,7 @@ class TestGeneric_flow_api(TestCase):
                 )
                 rule_num = extrapkt_rulenum["rulenum"]
                 self.verify_rulenum(rule_num + 1)
-            elif self.nic in ["sagepond", "sageville"]:
+            elif self.nic in ["IXGBE_10G-X550EM_X_10G_T", "IXGBE_10G-X550T"]:
                 # create the flow rules
                 basic_flow_actions = [
                     {
@@ -3458,34 +3463,33 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "niantic",
-                "twinville",
-                "sagepond",
-                "sageville",
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "foxville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGC-I225_LM",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir flexbytes filter" % self.nic,
         )
         # i40e
         if self.nic in [
-            "fortville_eagle",
-            "fortville_25g",
-            "fortville_spirit",
-            "carlsville",
-            "fortville_spirit_single",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "columbiaville_25g",
-            "columbiaville_100g",
+            "I40E_10G-SFP_XL710",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_A",
+            "I40E_10G-10G_BASE_T_BC",
+            "I40E_40G-QSFP_B",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
         ]:
             self.pmdout.start_testpmd(
                 "%s" % self.pf_cores,
@@ -3774,7 +3778,7 @@ class TestGeneric_flow_api(TestCase):
             time.sleep(2)
 
             # ipv4-sctp-flexbytes
-            if self.nic in ["sagepond", "sageville"]:
+            if self.nic in ["IXGBE_10G-X550EM_X_10G_T", "IXGBE_10G-X550T"]:
                 self.dut.send_expect(
                     "flow validate 0 ingress pattern fuzzy thresh is 6 / eth / ipv4 src is 192.168.0.1 dst is 192.168.0.2 / sctp src is 24 dst is 25 / raw relative is 0 search is 0 offset is 48 limit is 0 pattern is ab / end actions queue index 3 / end",
                     "validated",
@@ -3810,7 +3814,7 @@ class TestGeneric_flow_api(TestCase):
             )
 
             # ipv6-other-flexbytes
-            if self.nic in ["niantic", "twinville"]:
+            if self.nic in ["IXGBE_10G-82599_SFP"]:
                 self.dut.send_expect("quit", "# ")
                 time.sleep(2)
 
@@ -3852,7 +3856,7 @@ class TestGeneric_flow_api(TestCase):
         The filter structure is different between igb, ixgbe and i40e
         """
         self.verify(
-            self.nic in ["bartonhills", "powerville", "foxville"],
+            self.nic in ["IGB_1G-82580_COPPER", "IGB_1G-I350_COPPER", "IGC-I225_LM"],
             "%s nic not support flexbytes filter" % self.nic,
         )
 
@@ -4064,15 +4068,14 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "twinville",
-                "sagepond",
-                "sageville",
-                "foxville",
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IGC-I225_LM",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir mac vlan filter" % self.nic,
         )
@@ -4091,11 +4094,11 @@ class TestGeneric_flow_api(TestCase):
 
         # create the flow rules
         if self.nic in [
-            "fortville_eagle",
-            "fortville_25g",
-            "fortville_spirit",
-            "columbiaville_25g",
-            "columbiaville_100g",
+            "I40E_10G-SFP_XL710",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_A",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
         ]:
             basic_flow_actions = [
                 {"create": "validate", "flows": ["vlan"], "actions": ["queue"]},
@@ -4137,12 +4140,11 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "twinville",
-                "sagepond",
-                "sageville",
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "foxville",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "IGC-I225_LM",
             ],
             "%s nic not support fdir vxlan filter" % self.nic,
         )
@@ -4189,7 +4191,7 @@ class TestGeneric_flow_api(TestCase):
         only supported by ixgbe
         """
         self.verify(
-            self.nic in ["twinville", "sagepond", "sageville", "foxville"],
+            self.nic in ["IXGBE_10G-X550EM_X_10G_T", "IXGBE_10G-X550T", "IGC-I225_LM"],
             "%s nic not support fdir nvgre filter" % self.nic,
         )
 
@@ -4237,16 +4239,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "foxville",
-                "carlsville",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGC-I225_LM",
+                "I40E_10G-10G_BASE_T_BC",
             ],
             "%s nic not support tunnel vxlan filter" % self.nic,
         )
@@ -4408,16 +4410,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "foxville",
-                "carlsville",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGC-I225_LM",
+                "I40E_10G-10G_BASE_T_BC",
             ],
             "%s nic not support tunnel nvgre filter" % self.nic,
         )
@@ -4656,13 +4658,13 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "carlsville",
-                "fortpark_BASE-T",
-                "fortpark_TLV",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-SFP_X722",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -4736,7 +4738,13 @@ class TestGeneric_flow_api(TestCase):
         only supported by ixgbe and igb
         """
         self.verify(
-            self.nic in ["niantic", "kawela_4", "kawela", "twinville", "foxville"],
+            self.nic
+            in [
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-82576_QUAD_COPPER",
+                "IGC-I225_LM",
+            ],
             "%s nic not support n-tuple filter" % self.nic,
         )
         self.pmdout.start_testpmd(
@@ -4862,19 +4870,18 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "niantic",
-                "kawela_4",
-                "kawela",
-                "bartonhills",
-                "twinville",
-                "sagepond",
-                "sageville",
-                "powerville",
-                "foxville",
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-82576_QUAD_COPPER",
+                "IGB_1G-82580_COPPER",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IGB_1G-I350_COPPER",
+                "IGC-I225_LM",
             ],
             "%s nic not support" % self.nic,
         )
-        if self.nic in ["cavium_a063", "cavium_a064", "foxville"]:
+        if self.nic in ["cavium_a063", "cavium_a064", "IGC-I225_LM"]:
             self.pmdout.start_testpmd(
                 "%s" % self.cores,
                 "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1 --mbcache=200 --mbuf-size=2048 --max-pkt-len=9200"
@@ -5016,7 +5023,7 @@ class TestGeneric_flow_api(TestCase):
         else:
             self.verify(False, "%s not support this test" % self.nic)
 
-    @check_supported_nic(["niantic"])
+    @check_supported_nic(["IXGBE_10G-82599_SFP"])
     def test_fdir_for_match_report(self):
         """
         Test case: IXGBE fdir for Control levels of FDir match reporting
diff --git a/tests/TestSuite_hotplug.py b/tests/TestSuite_hotplug.py
index 1e1b9266..a490233a 100644
--- a/tests/TestSuite_hotplug.py
+++ b/tests/TestSuite_hotplug.py
@@ -86,7 +86,7 @@ class TestPortHotPlug(TestCase):
         self.verify("is attached" in out, "Failed to attach")
         out = self.dut.send_expect("port start %s" % port, "testpmd>", 120)
         self.verify("Configuring Port" in out, "Failed to start port")
-        # sleep 10 seconds for fortville update link stats
+        # sleep 10 seconds for Intel® Ethernet 700 Series update link stats
         time.sleep(10)
         self.dut.send_expect("show port info %s" % port, "testpmd>", 60)
 
@@ -96,7 +96,7 @@ class TestPortHotPlug(TestCase):
         """
         out = self.dut.send_expect("port stop %s" % port, "testpmd>", 60)
         self.verify("Stopping ports" in out, "Failed to stop port")
-        # sleep 10 seconds for fortville update link stats
+        # sleep 10 seconds for Intel® Ethernet 700 Series update link stats
         time.sleep(10)
         out = self.dut.send_expect("port detach %s" % port, "testpmd>", 60)
         self.verify("is detached" in out, "Failed to detach port")
diff --git a/tests/TestSuite_fortville_rss_input.py b/tests/TestSuite_i40e_rss_input.py
similarity index 99%
rename from tests/TestSuite_fortville_rss_input.py
rename to tests/TestSuite_i40e_rss_input.py
index 4b009d02..eb60329d 100644
--- a/tests/TestSuite_fortville_rss_input.py
+++ b/tests/TestSuite_i40e_rss_input.py
@@ -33,14 +33,14 @@
 DPDK Test suite.
 
 Test DPDK2.3 feature:
-1.Fortville support granularity configuration of RSS.
-By default Fortville uses hash input set preloaded from NVM image which includes all fields
+1.Intel® Ethernet 700 Series support granularity configuration of RSS.
+By default Intel® Ethernet 700 Series uses hash input set preloaded from NVM image which includes all fields
 - IPv4/v6+TCP/UDP port. Potential problem for this is global configuration per device and can
 affect all ports. It is required that hash input set can be configurable,  such as using IPv4
 only or IPv6 only or IPv4/v6+TCP/UDP.
 
-2.Fortville support 32-bit GRE keys.
-By default Fortville extracts only 24 bits of GRE key to FieldVector (NVGRE use case) but
+2.Intel® Ethernet 700 Series support 32-bit GRE keys.
+By default Intel® Ethernet 700 Series extracts only 24 bits of GRE key to FieldVector (NVGRE use case) but
 for Telco use cases full 32-bit GRE key is needed. It is required that both 24-bit and 32-bit
 keys for GRE should be supported. the test plan is to test the API to switch between 24-bit and
 32-bit keys
@@ -69,7 +69,7 @@ from framework.test_case import TestCase
 #
 
 
-class TestFortvilleRssInput(TestCase):
+class TestI40ERssInput(TestCase):
     #
     #
     # Utility methods and other non-test code.
@@ -83,13 +83,13 @@ class TestFortvilleRssInput(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
diff --git a/tests/TestSuite_iavf_flexible_descriptor.py b/tests/TestSuite_iavf_flexible_descriptor.py
index 0268cf83..29d1e491 100644
--- a/tests/TestSuite_iavf_flexible_descriptor.py
+++ b/tests/TestSuite_iavf_flexible_descriptor.py
@@ -41,10 +41,10 @@ from .flexible_common import FlexibleRxdBase
 
 class TestIavfFlexibleDescriptor(TestCase, FlexibleRxdBase):
     supported_nic = [
-        "columbiaville_100g",
-        "columbiaville_25g",
-        "columbiaville_25gx2",
-        "foxville",
+        "ICE_100G-E810C_QSFP",
+        "ICE_25G-E810C_SFP",
+        "ICE_25G-E810_XXV_SFP",
+        "IGC-I225_LM",
     ]
 
     def preset_compilation(self):
@@ -87,12 +87,12 @@ class TestIavfFlexibleDescriptor(TestCase, FlexibleRxdBase):
         vf_driver = "vfio-pci"
         self.pf0_intf = self.dut.ports_info[self.dut_ports[dut_index]]["intf"]
         # get priv-flags default stats
-        if self.nic.startswith("columbiaville"):
+        if self.is_eth_series_nic(800):
             self.flag = "vf-vlan-pruning"
         else:
             self.flag = "vf-vlan-prune-disable"
         self.default_stats = self.dut.get_priv_flags_state(self.pf0_intf, self.flag)
-        if self.nic.startswith("columbiaville") and self.default_stats:
+        if self.is_eth_series_nic(800) and self.default_stats:
             self.dut.send_expect(
                 "ethtool --set-priv-flags %s %s off" % (self.pf0_intf, self.flag), "# "
             )
diff --git a/tests/TestSuite_iavf_package_driver_error_handle.py b/tests/TestSuite_iavf_package_driver_error_handle.py
index be105f9c..e54b38a2 100644
--- a/tests/TestSuite_iavf_package_driver_error_handle.py
+++ b/tests/TestSuite_iavf_package_driver_error_handle.py
@@ -42,7 +42,7 @@ from framework.test_case import TestCase
 class Testiavf_package_and_driver_check(TestCase):
     def set_up_all(self):
         self.verify(
-            self.nic in ["columbiaville_100g", "columbiaville_25g"],
+            self.nic in ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP"],
             "NIC Unsupported: " + str(self.nic),
         )
         self.dut_ports = self.dut.get_ports(self.nic)
diff --git a/tests/TestSuite_cvl_1pps_signal.py b/tests/TestSuite_ice_1pps_signal.py
old mode 100755
new mode 100644
similarity index 98%
rename from tests/TestSuite_cvl_1pps_signal.py
rename to tests/TestSuite_ice_1pps_signal.py
index 890a1df8..060c08b7
--- a/tests/TestSuite_cvl_1pps_signal.py
+++ b/tests/TestSuite_ice_1pps_signal.py
@@ -36,8 +36,8 @@ from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase, check_supported_nic
 
 
-class TestCVL1PPS(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g"]
+class TestICE1PPS(TestCase):
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP"]
 
     @check_supported_nic(supported_nic)
     def set_up_all(self):
diff --git a/tests/TestSuite_cvl_advanced_iavf_rss.py b/tests/TestSuite_ice_advanced_iavf_rss.py
old mode 100755
new mode 100644
similarity index 100%
rename from tests/TestSuite_cvl_advanced_iavf_rss.py
rename to tests/TestSuite_ice_advanced_iavf_rss.py
diff --git a/tests/TestSuite_cvl_advanced_iavf_rss_gtpogre.py b/tests/TestSuite_ice_advanced_iavf_rss_gtpogre.py
old mode 100755
new mode 100644
similarity index 99%
rename from tests/TestSuite_cvl_advanced_iavf_rss_gtpogre.py
rename to tests/TestSuite_ice_advanced_iavf_rss_gtpogre.py
index 9c8e6122..2d884dc3
--- a/tests/TestSuite_cvl_advanced_iavf_rss_gtpogre.py
+++ b/tests/TestSuite_ice_advanced_iavf_rss_gtpogre.py
@@ -5713,7 +5713,7 @@ exclusive = [
 ]
 
 
-class TestCVLAdvancedIAVFRSSGTPoGRE(TestCase):
+class TestICEAdvancedIAVFRSSGTPoGRE(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_cvl_advanced_iavf_rss_gtpu.py b/tests/TestSuite_ice_advanced_iavf_rss_gtpu.py
similarity index 99%
rename from tests/TestSuite_cvl_advanced_iavf_rss_gtpu.py
rename to tests/TestSuite_ice_advanced_iavf_rss_gtpu.py
index 2bc79a66..d80ce759 100644
--- a/tests/TestSuite_cvl_advanced_iavf_rss_gtpu.py
+++ b/tests/TestSuite_ice_advanced_iavf_rss_gtpu.py
@@ -8484,8 +8484,8 @@ mac_ipv4_gtpc_symmetric_toeplitz = [mac_ipv4_gtpc_symmetric]
 mac_ipv6_gtpc_symmetric_toeplitz = [mac_ipv6_gtpc_symmetric]
 
 
-class TestCVLAdvancedIAVFRSSGTPU(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]
+class TestICEAdvancedIAVFRSSGTPU(TestCase):
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP", "ICE_25G-E810_XXV_SFP"]
 
     @check_supported_nic(supported_nic)
     @skip_unsupported_pkg("os default")
diff --git a/tests/TestSuite_cvl_advanced_iavf_rss_pppol2tpoudp.py b/tests/TestSuite_ice_advanced_iavf_rss_pppol2tpoudp.py
similarity index 99%
rename from tests/TestSuite_cvl_advanced_iavf_rss_pppol2tpoudp.py
rename to tests/TestSuite_ice_advanced_iavf_rss_pppol2tpoudp.py
index c6ee9699..651c0d9b 100644
--- a/tests/TestSuite_cvl_advanced_iavf_rss_pppol2tpoudp.py
+++ b/tests/TestSuite_ice_advanced_iavf_rss_pppol2tpoudp.py
@@ -3030,7 +3030,7 @@ vector_case_108 = [
 ]
 
 
-class TestCVLAdvancedIAVFRSSPPPoL2TPv2oUDP(TestCase):
+class TestICEAdvancedIAVFRSSPPPoL2TPv2oUDP(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_cvl_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py b/tests/TestSuite_ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py
similarity index 99%
rename from tests/TestSuite_cvl_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py
rename to tests/TestSuite_ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py
index 1b89d07e..ba56b024 100644
--- a/tests/TestSuite_cvl_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py
+++ b/tests/TestSuite_ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py
@@ -996,7 +996,7 @@ mac_vlan_ipv6_sctp_pay = {
 }
 
 
-class Cvl_advance_iavf_rss_vlan_ah_l2tp_pfcp(TestCase):
+class ICE_advance_iavf_rss_vlan_ah_l2tp_pfcp(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_cvl_advanced_rss.py b/tests/TestSuite_ice_advanced_rss.py
similarity index 100%
rename from tests/TestSuite_cvl_advanced_rss.py
rename to tests/TestSuite_ice_advanced_rss.py
diff --git a/tests/TestSuite_cvl_advanced_rss_gtpogre.py b/tests/TestSuite_ice_advanced_rss_gtpogre.py
old mode 100755
new mode 100644
similarity index 99%
rename from tests/TestSuite_cvl_advanced_rss_gtpogre.py
rename to tests/TestSuite_ice_advanced_rss_gtpogre.py
index 68d8f26f..add2d23b
--- a/tests/TestSuite_cvl_advanced_rss_gtpogre.py
+++ b/tests/TestSuite_ice_advanced_rss_gtpogre.py
@@ -3821,7 +3821,7 @@ mac_ipv4_gtpu_eh_ipv6_tcp_without_ul_dl_symmetric = eval(
 )
 
 
-class TestCVLAdvancedRSSGTPoGRE(TestCase):
+class TestICEAdvancedRSSGTPoGRE(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_cvl_advanced_rss_gtpu.py b/tests/TestSuite_ice_advanced_rss_gtpu.py
old mode 100755
new mode 100644
similarity index 99%
rename from tests/TestSuite_cvl_advanced_rss_gtpu.py
rename to tests/TestSuite_ice_advanced_rss_gtpu.py
index 48bee0c2..b3e51b40
--- a/tests/TestSuite_cvl_advanced_rss_gtpu.py
+++ b/tests/TestSuite_ice_advanced_rss_gtpu.py
@@ -5086,8 +5086,8 @@ mac_ipv4_gtpu_eh_ipv6_tcp_without_ul_dl_symmetric = eval(
 )
 
 
-class TestCVLAdvancedRSSGTPU(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]
+class TestICEAdvancedRSSGTPU(TestCase):
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP", "ICE_25G-E810_XXV_SFP"]
 
     @check_supported_nic(supported_nic)
     @skip_unsupported_pkg("os default")
diff --git a/tests/TestSuite_cvl_advanced_rss_pppoe.py b/tests/TestSuite_ice_advanced_rss_pppoe.py
similarity index 100%
rename from tests/TestSuite_cvl_advanced_rss_pppoe.py
rename to tests/TestSuite_ice_advanced_rss_pppoe.py
diff --git a/tests/TestSuite_cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp.py b/tests/TestSuite_ice_advanced_rss_vlan_esp_ah_l2tp_pfcp.py
similarity index 100%
rename from tests/TestSuite_cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp.py
rename to tests/TestSuite_ice_advanced_rss_vlan_esp_ah_l2tp_pfcp.py
diff --git a/tests/TestSuite_cvl_dcf_acl_filter.py b/tests/TestSuite_ice_dcf_acl_filter.py
similarity index 99%
rename from tests/TestSuite_cvl_dcf_acl_filter.py
rename to tests/TestSuite_ice_dcf_acl_filter.py
index 42eaaa5b..49fd23a0 100644
--- a/tests/TestSuite_cvl_dcf_acl_filter.py
+++ b/tests/TestSuite_ice_dcf_acl_filter.py
@@ -892,7 +892,7 @@ vectors_ipv4_sctp_2ports = [
 ]
 
 
-class CVLDCFACLFilterTest(TestCase):
+class ICEDCFACLFilterTest(TestCase):
     def bind_nics_driver(self, ports, driver=""):
         # modprobe vfio driver
         if driver == "vfio-pci":
@@ -923,7 +923,8 @@ class CVLDCFACLFilterTest(TestCase):
         Run at the start of each test suite.
         """
         self.verify(
-            self.nic in ["columbiaville_25g", "columbiaville_100g"], "nic is not CVL"
+            self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"],
+            "nic is not Intel® Ethernet 800 Series",
         )
         self.dut_ports = self.dut.get_ports(self.nic)
         # Verify that enough ports are available
@@ -1210,25 +1211,25 @@ class CVLDCFACLFilterTest(TestCase):
         self.verify(all(test_results.values()), "{} failed.".format(failed_cases))
 
     def test_mac_ipv4(self):
-        if self.nic == "columbiaville_25g":
+        if self.nic == "ICE_25G-E810C_SFP":
             self.common_process(vectors_ipv4_pay_4ports)
         else:
             self.common_process(vectors_ipv4_pay_2ports)
 
     def test_mac_ipv4_tcp(self):
-        if self.nic == "columbiaville_25g":
+        if self.nic == "ICE_25G-E810C_SFP":
             self.common_process(vectors_ipv4_tcp_4ports)
         else:
             self.common_process(vectors_ipv4_tcp_2ports)
 
     def test_mac_ipv4_udp(self):
-        if self.nic == "columbiaville_25g":
+        if self.nic == "ICE_25G-E810C_SFP":
             self.common_process(vectors_ipv4_udp_4ports)
         else:
             self.common_process(vectors_ipv4_udp_2ports)
 
     def test_mac_ipv4_sctp(self):
-        if self.nic == "columbiaville_25g":
+        if self.nic == "ICE_25G-E810C_SFP":
             self.common_process(vectors_ipv4_sctp_4ports)
         else:
             self.common_process(vectors_ipv4_sctp_2ports)
diff --git a/tests/TestSuite_cvl_dcf_date_path.py b/tests/TestSuite_ice_dcf_date_path.py
similarity index 100%
rename from tests/TestSuite_cvl_dcf_date_path.py
rename to tests/TestSuite_ice_dcf_date_path.py
diff --git a/tests/TestSuite_cvl_dcf_flow_priority.py b/tests/TestSuite_ice_dcf_flow_priority.py
old mode 100755
new mode 100644
similarity index 99%
rename from tests/TestSuite_cvl_dcf_flow_priority.py
rename to tests/TestSuite_ice_dcf_flow_priority.py
index db2ba9cc..39b2dfcc
--- a/tests/TestSuite_cvl_dcf_flow_priority.py
+++ b/tests/TestSuite_ice_dcf_flow_priority.py
@@ -1856,8 +1856,8 @@ tv_mac_vlan_pppoe_ipcp_pay = {
 }
 
 
-class CVLDCFFlowPriorityTest(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]
+class ICEDCFFlowPriorityTest(TestCase):
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP", "ICE_25G-E810_XXV_SFP"]
 
     def bind_nics_driver(self, ports, driver=""):
         # modprobe vfio driver
diff --git a/tests/TestSuite_cvl_dcf_qos.py b/tests/TestSuite_ice_dcf_qos.py
similarity index 99%
rename from tests/TestSuite_cvl_dcf_qos.py
rename to tests/TestSuite_ice_dcf_qos.py
index 4186e46d..4f632007 100644
--- a/tests/TestSuite_cvl_dcf_qos.py
+++ b/tests/TestSuite_ice_dcf_qos.py
@@ -29,8 +29,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
-DPDK Test suite cvl_dcf_qos
-CVL configure QoS for vf/vsi in DCF
+DPDK Test suite ICE_dcf_qos
+Intel® Ethernet 800 Series configure QoS for vf/vsi in DCF
 Support ETS-based QoS configuration, including Arbiters configuration (strict priority, WFQ)
 and BW Allocation and limitation.
 """
@@ -50,7 +50,7 @@ from framework.settings import HEADER_SIZE, NICS, get_nic_name
 from framework.test_case import TestCase
 
 
-class TestCvlDcfQos(TestCase):
+class TestICEDcfQos(TestCase):
     def d_con(self, cmd):
         _cmd = [cmd, "# ", 15] if isinstance(cmd, str) else cmd
         return self.dut.send_expect(*_cmd)
@@ -231,13 +231,13 @@ class TestCvlDcfQos(TestCase):
     def pf_preset(self, num=None):
         self.nic_100g, self.nic100G_intf, self.nic100g_pci = self.get_custom_nic_port(
             [
-                "columbiaville_100g",
+                "ICE_100G-E810C_QSFP",
             ],
             num=num,
         )
         self.nic_25g, self.nic25G_intf, self.nic25g_pci = self.get_custom_nic_port(
             [
-                "columbiaville_25gx2",
+                "ICE_25G-E810_XXV_SFP",
             ]
         )
         msg = "not enough nics for testing"
diff --git a/tests/TestSuite_cvl_dcf_switch_filter.py b/tests/TestSuite_ice_dcf_switch_filter.py
old mode 100755
new mode 100644
similarity index 99%
rename from tests/TestSuite_cvl_dcf_switch_filter.py
rename to tests/TestSuite_ice_dcf_switch_filter.py
index 7b473c92..4c9f7336
--- a/tests/TestSuite_cvl_dcf_switch_filter.py
+++ b/tests/TestSuite_ice_dcf_switch_filter.py
@@ -1672,8 +1672,8 @@ sv_mac_test_drop_action = [
 ]
 
 
-class CVLDCFSwitchFilterTest(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]
+class ICEDCFSwitchFilterTest(TestCase):
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP", "ICE_25G-E810_XXV_SFP"]
 
     def bind_nics_driver(self, ports, driver=""):
         # modprobe vfio driver
diff --git a/tests/TestSuite_cvl_dcf_switch_filter_gtpu.py b/tests/TestSuite_ice_dcf_switch_filter_gtpu.py
similarity index 99%
rename from tests/TestSuite_cvl_dcf_switch_filter_gtpu.py
rename to tests/TestSuite_ice_dcf_switch_filter_gtpu.py
index 00d19af0..da815910 100644
--- a/tests/TestSuite_cvl_dcf_switch_filter_gtpu.py
+++ b/tests/TestSuite_ice_dcf_switch_filter_gtpu.py
@@ -3562,8 +3562,8 @@ sv_mac_ipv6_gtpu_ipv6_tcp_2 = [
 sv_mac_ipv6_gtpu_ipv6_tcp = [sv_mac_ipv6_gtpu_ipv6_tcp_1, sv_mac_ipv6_gtpu_ipv6_tcp_2]
 
 
-class CVLDCFSwitchFilterGTPUTest(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]
+class ICEDCFSwitchFilterGTPUTest(TestCase):
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP", "ICE_25G-E810_XXV_SFP"]
 
     @check_supported_nic(supported_nic)
     @skip_unsupported_pkg(["os default", "wireless"])
diff --git a/tests/TestSuite_cvl_dcf_switch_filter_pppoe.py b/tests/TestSuite_ice_dcf_switch_filter_pppoe.py
similarity index 99%
rename from tests/TestSuite_cvl_dcf_switch_filter_pppoe.py
rename to tests/TestSuite_ice_dcf_switch_filter_pppoe.py
index 76d9bb97..49d8ce94 100644
--- a/tests/TestSuite_cvl_dcf_switch_filter_pppoe.py
+++ b/tests/TestSuite_ice_dcf_switch_filter_pppoe.py
@@ -818,8 +818,8 @@ tv_mac_vlan_pppoe_ipcp_pay = {
 }
 
 
-class CVLDCFSwitchFilterPPPOETest(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]
+class ICEDCFSwitchFilterPPPOETest(TestCase):
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP", "ICE_25G-E810_XXV_SFP"]
 
     def bind_nics_driver(self, ports, driver=""):
         # modprobe vfio driver
diff --git a/tests/TestSuite_cvl_ecpri.py b/tests/TestSuite_ice_ecpri.py
similarity index 99%
rename from tests/TestSuite_cvl_ecpri.py
rename to tests/TestSuite_ice_ecpri.py
index f0556dad..92d6aa4a 100644
--- a/tests/TestSuite_cvl_ecpri.py
+++ b/tests/TestSuite_ice_ecpri.py
@@ -180,7 +180,7 @@ tv_over_ip_udp = [
 ]
 
 
-class TestCVLEcpri(TestCase):
+class TestICEEcpri(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_cvl_fdir.py b/tests/TestSuite_ice_fdir.py
similarity index 99%
rename from tests/TestSuite_cvl_fdir.py
rename to tests/TestSuite_ice_fdir.py
index f0fe6c4d..7b642f70 100644
--- a/tests/TestSuite_cvl_fdir.py
+++ b/tests/TestSuite_ice_fdir.py
@@ -2712,7 +2712,7 @@ vectors_mac_ipv6_nat_t_esp = [
 ]
 
 
-class TestCVLFdir(TestCase):
+class TestICEFdir(TestCase):
     def query_count(self, hits_set, hits, port_id=0, rule_id=0):
         out = self.dut.send_command(
             "flow query %s %s count" % (port_id, rule_id), timeout=1
@@ -2890,7 +2890,7 @@ class TestCVLFdir(TestCase):
         self.pmd_output.execute_cmd("port config 0 udp_tunnel_port add vxlan 4789")
         self.pmd_output.execute_cmd("port config 1 udp_tunnel_port add vxlan 4789")
         self.pmd_output.execute_cmd("port config all rss all")
-        # specify a fixed rss-hash-key for cvl ether
+        # specify a fixed rss-hash-key for Intel® Ethernet 800 Series ether
         self.pmd_output.execute_cmd(
             "port config 0 rss-hash-key ipv4 1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd"
         )
diff --git a/tests/TestSuite_cvl_flow_priority.py b/tests/TestSuite_ice_flow_priority.py
similarity index 99%
rename from tests/TestSuite_cvl_flow_priority.py
rename to tests/TestSuite_ice_flow_priority.py
index 48111d1b..ded9b405 100644
--- a/tests/TestSuite_cvl_flow_priority.py
+++ b/tests/TestSuite_ice_flow_priority.py
@@ -421,8 +421,8 @@ tv_mac_vlan_pppoe_ipcp_pay = {
 }
 
 
-class CVLPFFlowPriorityTest(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]
+class ICEPFFlowPriorityTest(TestCase):
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP", "ICE_25G-E810_XXV_SFP"]
 
     @check_supported_nic(supported_nic)
     def set_up_all(self):
diff --git a/tests/TestSuite_iavf_fdir.py b/tests/TestSuite_ice_iavf_fdir.py
similarity index 99%
rename from tests/TestSuite_iavf_fdir.py
rename to tests/TestSuite_ice_iavf_fdir.py
index e0d16e7b..376275b7 100644
--- a/tests/TestSuite_iavf_fdir.py
+++ b/tests/TestSuite_ice_iavf_fdir.py
@@ -41,7 +41,7 @@ from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase, skip_unsupported_pkg
 from framework.utils import GREEN, RED
 
-from .rte_flow_common import CVL_TXQ_RXQ_NUMBER
+from .rte_flow_common import TXQ_RXQ_NUMBER
 
 MAC_IPV4_PAY = {
     "match": [
@@ -8283,7 +8283,7 @@ vectors_ipv6_gre_ipv6_udp = [
 ]
 
 
-class TestIAVFFdir(TestCase):
+class TestICEIAVFFdir(TestCase):
     def rte_flow_process(self, vectors):
         test_results = {}
         for tv in vectors:
@@ -8428,7 +8428,7 @@ class TestIAVFFdir(TestCase):
 
         self.src_file_dir = "dep/"
         self.dut_file_dir = "/tmp/"
-        self.cvlq_num = CVL_TXQ_RXQ_NUMBER
+        self.q_num = TXQ_RXQ_NUMBER
 
     def set_up(self):
         """
@@ -8532,7 +8532,7 @@ class TestIAVFFdir(TestCase):
         self.pmd_output.execute_cmd("set verbose 1")
         self.pmd_output.execute_cmd("vlan set filter on 0")
         self.pmd_output.execute_cmd("rx_vlan add 1 0")
-        # specify a fixed rss-hash-key for cvl ether
+        # specify a fixed rss-hash-key for Intel® Ethernet 800 Series ether
         self.pmd_output.execute_cmd(
             "port config 0 rss-hash-key ipv4 1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd"
         )
@@ -8546,7 +8546,7 @@ class TestIAVFFdir(TestCase):
     def launch_testpmd(self):
         self.pmd_output.start_testpmd(
             cores="1S/4C/1T",
-            param="--rxq={} --txq={}".format(self.cvlq_num, self.cvlq_num),
+            param="--rxq={} --txq={}".format(self.q_num, self.q_num),
             eal_param="-a %s -a %s"
             % (self.sriov_vfs_pf0[0].pci, self.sriov_vfs_pf0[1].pci),
             socket=self.ports_socket,
@@ -9445,7 +9445,7 @@ class TestIAVFFdir(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
         )
         self.dut.send_expect(command, "testpmd> ", 300)
         self.config_testpmd()
@@ -9457,13 +9457,13 @@ class TestIAVFFdir(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
         )
         self.session_secondary.send_expect(command, "testpmd> ", 300)
         # self.session_secondary.config_testpmd()
         self.session_secondary.send_expect("set fwd rxonly", "testpmd> ")
         self.session_secondary.send_expect("set verbose 1", "testpmd> ")
-        # specify a fixed rss-hash-key for cvl ether
+        # specify a fixed rss-hash-key for Intel® Ethernet 800 Series ether
         self.session_secondary.send_expect(
             "port config 0 rss-hash-key ipv4 1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd",
             "testpmd> ",
@@ -9687,7 +9687,7 @@ class TestIAVFFdir(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
         )
         self.dut.send_expect(command, "testpmd> ", 300)
         self.config_testpmd()
@@ -9699,13 +9699,13 @@ class TestIAVFFdir(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
         )
         self.session_secondary.send_expect(command, "testpmd> ", 300)
         # self.session_secondary.config_testpmd()
         self.session_secondary.send_expect("set fwd rxonly", "testpmd> ")
         self.session_secondary.send_expect("set verbose 1", "testpmd> ")
-        # specify a fixed rss-hash-key for cvl ether
+        # specify a fixed rss-hash-key for Intel® Ethernet 800 Series ether
         self.session_secondary.send_expect(
             "port config 0 rss-hash-key ipv4 1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd",
             "testpmd> ",
@@ -9950,7 +9950,7 @@ class TestIAVFFdir(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
         )
         self.dut.send_expect(command, "testpmd> ", 300)
         self.config_testpmd()
@@ -9962,13 +9962,13 @@ class TestIAVFFdir(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
         )
         self.session_secondary.send_expect(command, "testpmd> ", 300)
         # self.session_secondary.config_testpmd()
         self.session_secondary.send_expect("set fwd rxonly", "testpmd> ")
         self.session_secondary.send_expect("set verbose 1", "testpmd> ")
-        # specify a fixed rss-hash-key for cvl ether
+        # specify a fixed rss-hash-key for Intel® Ethernet 800 Series ether
         self.session_secondary.send_expect(
             "port config 0 rss-hash-key ipv4 1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd",
             "testpmd> ",
@@ -10916,7 +10916,7 @@ class TestIAVFFdir(TestCase):
         self.pmd_output.start_testpmd(
             cores="1S/4C/1T",
             param="--rxq={} --txq={} --enable-rx-cksum --port-topology=loop".format(
-                self.cvlq_num, self.cvlq_num
+                self.q_num, self.q_num
             ),
             eal_param="-a %s" % self.sriov_vfs_pf0[0].pci,
             socket=self.ports_socket,
@@ -11071,7 +11071,7 @@ class TestIAVFFdir(TestCase):
         self.pmd_output.start_testpmd(
             cores="1S/4C/1T",
             param="--rxq={} --txq={} --enable-rx-cksum --port-topology=loop".format(
-                self.cvlq_num, self.cvlq_num
+                self.q_num, self.q_num
             ),
             eal_param="-a %s" % self.sriov_vfs_pf0[0].pci,
             socket=self.ports_socket,
@@ -11219,7 +11219,7 @@ class TestIAVFFdir(TestCase):
         self.pmd_output.start_testpmd(
             cores="1S/4C/1T",
             param="--rxq={} --txq={} --enable-rx-cksum --port-topology=loop".format(
-                self.cvlq_num, self.cvlq_num
+                self.q_num, self.q_num
             ),
             eal_param="-a %s" % self.sriov_vfs_pf0[0].pci,
             socket=self.ports_socket,
diff --git a/tests/TestSuite_iavf_fdir_gtpogre.py b/tests/TestSuite_ice_iavf_fdir_gtpogre.py
old mode 100755
new mode 100644
similarity index 99%
rename from tests/TestSuite_iavf_fdir_gtpogre.py
rename to tests/TestSuite_ice_iavf_fdir_gtpogre.py
index d95739b1..f1c2390b
--- a/tests/TestSuite_iavf_fdir_gtpogre.py
+++ b/tests/TestSuite_ice_iavf_fdir_gtpogre.py
@@ -2255,7 +2255,7 @@ tvs_outer_mac_ipv6_gre_ipv6_gtpu_dl = [
 ]
 
 
-class TestCvlIavfGTPoGREFDIR(TestCase):
+class TestICEIavfGTPoGREFDIR(TestCase):
     def set_up_all(self):
         self.ports = self.dut.get_ports(self.nic)
 
diff --git a/tests/TestSuite_cvl_iavf_fdir_pppol2tpoudp.py b/tests/TestSuite_ice_iavf_fdir_pppol2tpoudp.py
similarity index 99%
rename from tests/TestSuite_cvl_iavf_fdir_pppol2tpoudp.py
rename to tests/TestSuite_ice_iavf_fdir_pppol2tpoudp.py
index 1d367aaf..6bcaba70 100644
--- a/tests/TestSuite_cvl_iavf_fdir_pppol2tpoudp.py
+++ b/tests/TestSuite_ice_iavf_fdir_pppol2tpoudp.py
@@ -42,7 +42,7 @@ from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase
 from framework.utils import GREEN, RED
 
-from .rte_flow_common import CVL_TXQ_RXQ_NUMBER
+from .rte_flow_common import TXQ_RXQ_NUMBER
 
 tv_l2tpv2_seession_id_mac_ipv4_l2tpv2_control = {
     "name": "l2tpv2_seession_id_mac_ipv4_l2tpv2_control",
@@ -1927,7 +1927,7 @@ vectors_mac_ipv6_pppol2tpv2_ipv6_tcp = [
 ]
 
 
-class TestCVLIAVFFDIRPPPoL2TPv2oUDP(TestCase):
+class TestICEIAVFFDIRPPPoL2TPv2oUDP(TestCase):
     def rte_flow_process(self, vectors):
         test_results = {}
         for tv in vectors:
diff --git a/tests/TestSuite_cvl_iavf_ip_fragment_rte_flow.py b/tests/TestSuite_ice_iavf_ip_fragment_rte_flow.py
similarity index 99%
rename from tests/TestSuite_cvl_iavf_ip_fragment_rte_flow.py
rename to tests/TestSuite_ice_iavf_ip_fragment_rte_flow.py
index 9c890b25..8c9cfd9d 100644
--- a/tests/TestSuite_cvl_iavf_ip_fragment_rte_flow.py
+++ b/tests/TestSuite_ice_iavf_ip_fragment_rte_flow.py
@@ -343,7 +343,7 @@ tv_mac_ipv6_fragment_rss = {
 }
 
 
-class TestCvlIavfIpFragmentRteFlow(TestCase):
+class TestICEIavfIpFragmentRteFlow(TestCase):
     def set_up_all(self):
         self.ports = self.dut.get_ports(self.nic)
 
diff --git a/tests/TestSuite_cvl_iavf_rss_configure.py b/tests/TestSuite_ice_iavf_rss_configure.py
old mode 100755
new mode 100644
similarity index 100%
rename from tests/TestSuite_cvl_iavf_rss_configure.py
rename to tests/TestSuite_ice_iavf_rss_configure.py
diff --git a/tests/TestSuite_cvl_ip_fragment_rte_flow.py b/tests/TestSuite_ice_ip_fragment_rte_flow.py
similarity index 99%
rename from tests/TestSuite_cvl_ip_fragment_rte_flow.py
rename to tests/TestSuite_ice_ip_fragment_rte_flow.py
index dc2c0290..3acf3250 100644
--- a/tests/TestSuite_cvl_ip_fragment_rte_flow.py
+++ b/tests/TestSuite_ice_ip_fragment_rte_flow.py
@@ -349,7 +349,7 @@ tv_mac_ipv6_fragment_rss = {
 }
 
 
-class TestCvlIpFragmentRteFlow(TestCase):
+class TestICEIpFragmentRteFlow(TestCase):
     def set_up_all(self):
         self.ports = self.dut.get_ports(self.nic)
 
diff --git a/tests/TestSuite_cvl_limit_value_test.py b/tests/TestSuite_ice_limit_value_test.py
similarity index 96%
rename from tests/TestSuite_cvl_limit_value_test.py
rename to tests/TestSuite_ice_limit_value_test.py
index cc609a38..057e2d55 100644
--- a/tests/TestSuite_cvl_limit_value_test.py
+++ b/tests/TestSuite_ice_limit_value_test.py
@@ -41,7 +41,7 @@ from framework.packet import Packet
 from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase
 
-from .rte_flow_common import CVL_TXQ_RXQ_NUMBER
+from .rte_flow_common import TXQ_RXQ_NUMBER
 
 # max rule number case: rte_flow_pattern and matched packets will be generated by code, and rte_flow_pattern will be writed to file.
 tv_max_rule_number = {
@@ -68,7 +68,7 @@ tv_max_rule_number = {
 }
 
 
-class TestCvlLimitValue(TestCase):
+class TestICELimitValue(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
@@ -98,7 +98,7 @@ class TestCvlLimitValue(TestCase):
         self.path = self.dut.apps_name["test-pmd"]
 
         self.src_file_dir = "dep/"
-        self.cvlq_num = CVL_TXQ_RXQ_NUMBER
+        self.q_num = TXQ_RXQ_NUMBER
 
         # max_rule number
         localPort = self.tester.get_local_port(self.dut_ports[0])
@@ -210,13 +210,13 @@ class TestCvlLimitValue(TestCase):
         self.verify(res is True, "there have port link is down")
         self.pmd_output.execute_cmd("start")
 
-    def config_testpmd_cvl_fidr(self):
+    def config_testpmd_with_rss_key(self):
         self.pmd_output.execute_cmd("set fwd rxonly")
         self.pmd_output.execute_cmd("set verbose 1")
         self.pmd_output.execute_cmd("port config 0 udp_tunnel_port add vxlan 4789")
         self.pmd_output.execute_cmd("port config 1 udp_tunnel_port add vxlan 4789")
         self.pmd_output.execute_cmd("port config all rss all")
-        # specify a fixed rss-hash-key for cvl ether
+        # specify a fixed rss-hash-key for Intel® Ethernet 800 Series ether
         self.pmd_output.execute_cmd(
             "port config 0 rss-hash-key ipv4 1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd"
         )
@@ -229,7 +229,7 @@ class TestCvlLimitValue(TestCase):
     def launch_testpmd(self):
         self.pmd_output.start_testpmd(
             cores="1S/4C/1T",
-            param="--rxq={} --txq={}".format(self.cvlq_num, self.cvlq_num),
+            param="--rxq={} --txq={}".format(self.q_num, self.q_num),
             eal_param="-a %s -a %s"
             % (self.sriov_vfs_pf0[0].pci, self.sriov_vfs_pf0[1].pci),
             socket=self.ports_socket,
@@ -386,10 +386,10 @@ class TestCvlLimitValue(TestCase):
         """
         vfs share 14336 rules table
         maximum number of rules varies with NIC, it can be identified by product name as below:
-        product name   NIC type           rule maximum
-        E810-XXVDA4   cvl25g*4             14336
-        E810-CQDA2    cvl100g*2            14336
-        E810-2CQDA2   chapmanbeach100g*2   14336 (1 vf)
+        product name   NIC type                                     rule maximum
+        E810-XXVDA4   Intel® Ethernet 800 Series 25g*4              14336
+        E810-CQDA2    Intel® Ethernet 800 Series 100g*2             14336
+        E810-2CQDA2   chapmanbeach100g*2                            14336 (1 vf)
         """
         dut_file_dir = "/tmp/"
         self.set_up_for_iavf_dir()
@@ -415,7 +415,7 @@ class TestCvlLimitValue(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
             + " --cmdline-file=%s" % (dut_file_dir + src_file)
         )
         self.dut.send_expect(command, "testpmd> ", 300)
@@ -501,10 +501,11 @@ class TestCvlLimitValue(TestCase):
     def test_maxnum_rules_2vf(self):
         """
         maximum number of rules varies with NIC, it can be identified by product name as below:
-        product name   NIC type           rule maximum
-        E810-XXVDA4   cvl25g*4             14336
-        E810-CQDA2    cvl100g*2            14336
-        E810-2CQDA2   chapmanbeach100g*2   14336*2 (if vfs generated by 2 pf port, each can create 14336 rules at most)
+        product name   NIC type                        rule maximum
+        E810-XXVDA4   ICE_25G-E810C_SFP*4              14336
+        E810-CQDA2    ICE_100G-E810C_QSFP*2            14336
+        E810-2CQDA2   chapmanbeach100g*2               14336*2 (if vfs generated by 2 pf port,
+                                                               each can create 14336 rules at most)
         """
         dut_file_dir = "/tmp/"
         self.dut.kill_all()
@@ -535,7 +536,7 @@ class TestCvlLimitValue(TestCase):
                         file_handle.write(rule.format(k, i, j))
         self.dut.session.copy_file_to(src_file, dut_file_dir)
         param = "--rxq={} --txq={} --cmdline-file={}".format(
-            self.cvlq_num, self.cvlq_num, os.path.join(dut_file_dir, file_name)
+            self.q_num, self.q_num, os.path.join(dut_file_dir, file_name)
         )
         self.pmd_output.start_testpmd(param=param, ports=ports, timeout=1200)
         self.config_testpmd()
@@ -683,11 +684,11 @@ class TestCvlLimitValue(TestCase):
         self.session_secondary = self.dut.new_session()
         # create kernel rules on pf1
         rule = "ethtool -N {} flow-type tcp4 src-ip 192.168.{}.{} dst-ip 192.168.100.2 src-port 32 dst-port 33 action 8 \n"
-        if self.nic in ["columbiaville_100g"]:
+        if self.nic in ["ICE_100G-E810C_QSFP"]:
             num = 4
             if self.is_chapman:
                 num = 8
-        if self.nic in ["columbiaville_25g"]:
+        if self.nic in ["ICE_25G-E810C_SFP"]:
             num = 2
         for i in range(num):
             for j in range(256):
@@ -726,7 +727,7 @@ class TestCvlLimitValue(TestCase):
                         file_handle.write(rule.format(k, i, j))
         self.dut.session.copy_file_to(src_file, dut_file_dir)
         param = "--rxq={} --txq={} --cmdline-file={}".format(
-            self.cvlq_num, self.cvlq_num, os.path.join(dut_file_dir, file_name)
+            self.q_num, self.q_num, os.path.join(dut_file_dir, file_name)
         )
         self.pmd_output.start_testpmd(param=param, ports=ports, timeout=1200)
         self.config_testpmd()
@@ -869,7 +870,7 @@ class TestCvlLimitValue(TestCase):
         num = 60
         if self.is_chapman:
             num = 64
-        if self.nic in ["columbiaville_100g"]:
+        if self.nic in ["ICE_100G-E810C_QSFP"]:
             for i in range(num):
                 for j in range(256):
                     flows.write(
@@ -882,7 +883,7 @@ class TestCvlLimitValue(TestCase):
                 count == num * 256,
                 "failed to create %s fdir rules on pf." % (num * 256),
             )
-        elif self.nic in ["columbiaville_25g"]:
+        elif self.nic in ["ICE_25G-E810C_SFP"]:
             for i in range(58):
                 for j in range(256):
                     flows.write(
@@ -918,7 +919,7 @@ class TestCvlLimitValue(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
         )
         self.dut.send_expect(command, "testpmd> ", 20)
 
@@ -1014,7 +1015,7 @@ class TestCvlLimitValue(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
             + " --cmdline-file=%s" % (dut_file_dir + src_file)
         )
         self.dut.send_expect(command, "testpmd> ", 900)
@@ -1073,7 +1074,7 @@ class TestCvlLimitValue(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
             + " --cmdline-file=%s" % (dut_file_dir + src_file)
         )
         self.dut.send_expect(command, "testpmd> ", 900)
@@ -1099,9 +1100,9 @@ class TestCvlLimitValue(TestCase):
             eal_param="-a %s -a %s --log-level=ice,7" % (self.pci0, self.pci1),
             socket=self.ports_socket,
         )
-        self.config_testpmd_cvl_fidr()
+        self.config_testpmd_with_rss_key()
 
-    # this case copy from cvl_fdir
+    # this case copy from ice_fdir
     def test_add_delete_rules(self):
         self.launch_testpmd_with_mark()
         self.pmd_output.execute_cmd("start")
@@ -1131,7 +1132,7 @@ class TestCvlLimitValue(TestCase):
             self.verify(
                 "Failed to create file" not in out, "create some rule failed: %s" % out
             )
-            self.config_testpmd_cvl_fidr()
+            self.config_testpmd_with_rss_key()
             self.pmd_output.execute_cmd("start")
             rules = [
                 "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / udp src is 22 dst is 23 / end actions queue index 1 / mark / end",
@@ -1168,7 +1169,7 @@ class TestCvlLimitValue(TestCase):
         finally:
             self.dut.kill_all()
 
-    # this case copy from cvl_dcf_switch_filter
+    # this case copy from ice_dcf_switch_filter
     def test_max_rule_number(self):
         # bind pf to kernel
         self.bind_nics_driver(self.dut_ports, driver="ice")
diff --git a/tests/TestSuite_cvl_qinq.py b/tests/TestSuite_ice_qinq.py
similarity index 99%
rename from tests/TestSuite_cvl_qinq.py
rename to tests/TestSuite_ice_qinq.py
index c82a606c..b912b5c6 100644
--- a/tests/TestSuite_cvl_qinq.py
+++ b/tests/TestSuite_ice_qinq.py
@@ -431,9 +431,9 @@ tv_mac_qinq_ipv6_tcp = {
 tvs_mac_l4_qinq_dcf_pipeline_mode = [tv_mac_qinq_ipv6_udp, tv_mac_qinq_ipv6_tcp]
 
 
-class TestCvlQinq(TestCase):
+class TestICEQinq(TestCase):
     @check_supported_nic(
-        ["columbiaville_25g", "columbiaville_100g", "columbiaville_25gx2"]
+        ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP", "ICE_25G-E810_XXV_SFP"]
     )
     def set_up_all(self):
         """
diff --git a/tests/TestSuite_cvl_rss_configure.py b/tests/TestSuite_ice_rss_configure.py
similarity index 99%
rename from tests/TestSuite_cvl_rss_configure.py
rename to tests/TestSuite_ice_rss_configure.py
index 1b2b84c9..11130f1d 100644
--- a/tests/TestSuite_cvl_rss_configure.py
+++ b/tests/TestSuite_ice_rss_configure.py
@@ -327,7 +327,7 @@ class RSSConfigureTest(TestCase):
         self.pf_mac = self.dut.get_mac_address(0)
         self.pf_pci = self.dut.ports_info[self.dut_ports[0]]["pci"]
         self.verify(
-            self.nic in ["columbiaville_25g", "columbiaville_100g"],
+            self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"],
             "%s nic not support ethertype filter" % self.nic,
         )
         self.rsspro = RssProcessing(self, self.pmdout, [self.__tx_iface], rxq=16)
diff --git a/tests/TestSuite_cvl_switch_filter.py b/tests/TestSuite_ice_switch_filter.py
old mode 100755
new mode 100644
similarity index 99%
rename from tests/TestSuite_cvl_switch_filter.py
rename to tests/TestSuite_ice_switch_filter.py
index 6fca7998..2622a5cd
--- a/tests/TestSuite_cvl_switch_filter.py
+++ b/tests/TestSuite_ice_switch_filter.py
@@ -4243,7 +4243,7 @@ drop_any_pkt_list = [
 test_results = OrderedDict()
 
 
-class CVLSwitchFilterTest(TestCase):
+class ICESwitchFilterTest(TestCase):
     def bind_nics_driver(self, ports, driver=""):
         # modprobe vfio driver
         if driver == "vfio-pci":
@@ -4274,8 +4274,8 @@ class CVLSwitchFilterTest(TestCase):
         Run at the start of each test suite.
         """
         self.verify(
-            self.nic in ["columbiaville_25g", "columbiaville_100g"],
-            "%s nic not support CVL switch filter" % self.nic,
+            self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"],
+            "%s nic not support Intel® Ethernet 800 Series switch filter" % self.nic,
         )
         self.dut_ports = self.dut.get_ports(self.nic)
         # Verify that enough ports are available
diff --git a/tests/TestSuite_cvl_switch_filter_pppoe.py b/tests/TestSuite_ice_switch_filter_pppoe.py
old mode 100755
new mode 100644
similarity index 99%
rename from tests/TestSuite_cvl_switch_filter_pppoe.py
rename to tests/TestSuite_ice_switch_filter_pppoe.py
index 64dea49e..5a50f487
--- a/tests/TestSuite_cvl_switch_filter_pppoe.py
+++ b/tests/TestSuite_ice_switch_filter_pppoe.py
@@ -2851,7 +2851,7 @@ tvs_mac_vlan_pppoe_ipcp_pay = [
 test_results = OrderedDict()
 
 
-class CVLSwitchFilterPPPOETest(TestCase):
+class ICESwitchFilterPPPOETest(TestCase):
     def bind_nics_driver(self, ports, driver=""):
         # modprobe vfio driver
         if driver == "vfio-pci":
@@ -2883,8 +2883,8 @@ class CVLSwitchFilterPPPOETest(TestCase):
         Run at the start of each test suite.
         """
         self.verify(
-            self.nic in ["columbiaville_25g", "columbiaville_100g"],
-            "%s nic not support CVL switch filter" % self.nic,
+            self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"],
+            "%s nic not support Intel® Ethernet 800 Series switch filter" % self.nic,
         )
         self.dut_ports = self.dut.get_ports(self.nic)
         # Verify that enough ports are available
diff --git a/tests/TestSuite_cvl_vf_support_multicast_address.py b/tests/TestSuite_ice_vf_support_multicast_address.py
similarity index 99%
rename from tests/TestSuite_cvl_vf_support_multicast_address.py
rename to tests/TestSuite_ice_vf_support_multicast_address.py
index 1a58aa7f..765abdc2 100644
--- a/tests/TestSuite_cvl_vf_support_multicast_address.py
+++ b/tests/TestSuite_ice_vf_support_multicast_address.py
@@ -42,7 +42,7 @@ mul_mac_1 = "33:33:00:40:10:01"
 vf0_wrong_mac = "00:11:22:33:44:56"
 
 
-class TestCvlVfSupportMulticastAdress(TestCase):
+class TestICEVfSupportMulticastAdress(TestCase):
     def set_up_all(self):
         """
         Prerequisite steps for each test suite.
diff --git a/tests/TestSuite_inline_ipsec.py b/tests/TestSuite_inline_ipsec.py
index 9cc15301..c2ed0391 100644
--- a/tests/TestSuite_inline_ipsec.py
+++ b/tests/TestSuite_inline_ipsec.py
@@ -60,7 +60,8 @@ class TestInlineIpsec(TestCase):
         Run at the start of each test suite.
         """
         self.verify(
-            self.nic in ["niantic", "twinpond"], "%s NIC not support" % self.nic
+            self.nic in ["IXGBE_10G-82599_SFP", "IXGBE_10G-X540T"],
+            "%s NIC not support" % self.nic,
         )
         self.verify(
             self.drivername in ["vfio-pci"],
diff --git a/tests/TestSuite_ipgre.py b/tests/TestSuite_ipgre.py
index 4deaf315..37c7fe97 100644
--- a/tests/TestSuite_ipgre.py
+++ b/tests/TestSuite_ipgre.py
@@ -36,7 +36,8 @@ Generic Routing Encapsulation (GRE) is a tunneling protocol developed by
 Cisco Systems that can encapsulate a wide variety of network layer protocols 
 inside virtual point-to-point links over an Internet Protocol network.
 
-Fortville support GRE packet detecting, checksum computing and filtering.
+Intel® Ethernet 700 Series support GRE packet detecting, checksum computing
+and filtering.
 """
 
 import os
@@ -66,17 +67,19 @@ class TestIpgre(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
                 "cavium_a063",
                 "cavium_a064",
             ],
-            "GRE tunnel packet type only support by fortville, carlsville and cavium",
+            "GRE tunnel packet type only support by Intel® Ethernet 700 Series, "
+            "Intel® Ethernet Network Adapter X710-T4L, Intel® Ethernet Network "
+            "Adapter X710-T2L and cavium",
         )
         self.verify(len(ports) >= 1, "Insufficient ports for testing")
         valports = [_ for _ in ports if self.tester.get_local_port(_) != -1]
diff --git a/tests/TestSuite_ixgbe_vf_get_extra_queue_information.py b/tests/TestSuite_ixgbe_vf_get_extra_queue_information.py
index 0e64a5d6..a6b08071 100644
--- a/tests/TestSuite_ixgbe_vf_get_extra_queue_information.py
+++ b/tests/TestSuite_ixgbe_vf_get_extra_queue_information.py
@@ -31,7 +31,7 @@
 
 """
 DPDK Test suite.
-Test Niantic ixgbe_get_vf_queue Include Extra Information function.
+Test 82599 ixgbe_get_vf_queue Include Extra Information function.
 """
 import random
 import re
@@ -149,7 +149,9 @@ class TestIxgbeVfGetExtraInfo(TestCase):
         """
         Run at the start of each test suite.
         """
-        self.verify(self.nic in ["niantic"], "NIC Unsupported: " + str(self.nic))
+        self.verify(
+            self.nic in ["IXGBE_10G-82599_SFP"], "NIC Unsupported: " + str(self.nic)
+        )
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports")
         self.cores = "1S/8C/1T"
diff --git a/tests/TestSuite_jumboframes.py b/tests/TestSuite_jumboframes.py
index bcdf6c62..af532a74 100644
--- a/tests/TestSuite_jumboframes.py
+++ b/tests/TestSuite_jumboframes.py
@@ -250,7 +250,12 @@ class TestJumboframes(TestCase):
         """
         On 1G NICs, when the jubmo frame MTU set as 9000, the software adjust it to 9004.
         """
-        if self.nic in ["powerville", "springville", "kawela_4", "foxville"]:
+        if self.nic in [
+            "IGB_1G-I350_COPPER",
+            "IGB_1G-I210_COPPER",
+            "IGB_1G-82576_QUAD_COPPER_ET2",
+            "IGC-I225_LM",
+        ]:
             self.jumboframes_send_packet(ETHER_JUMBO_FRAME_MTU + 4 + 1, False)
         else:
             self.jumboframes_send_packet(ETHER_JUMBO_FRAME_MTU + 1, False)
diff --git a/tests/TestSuite_kernelpf_iavf.py b/tests/TestSuite_kernelpf_iavf.py
index 3c8e5929..a5aa1a4c 100644
--- a/tests/TestSuite_kernelpf_iavf.py
+++ b/tests/TestSuite_kernelpf_iavf.py
@@ -124,7 +124,7 @@ class TestKernelpfIavf(TestCase):
         # bind to default driver
         self.bind_nic_driver(self.dut_ports, driver="")
         self.used_dut_port = self.dut_ports[0]
-        if self.nic.startswith("columbiaville") and self.default_stats:
+        if self.is_eth_series_nic(800) and self.default_stats:
             self.dut.send_expect(
                 "ethtool --set-priv-flags %s %s on" % (self.host_intf, self.flag), "# "
             )
@@ -132,7 +132,7 @@ class TestKernelpfIavf(TestCase):
         self.sriov_vfs_port = self.dut.ports_info[self.used_dut_port]["vfs_port"]
         out = self.dut.send_expect("ethtool %s" % self.host_intf, "#")
         self.speed = int(re.findall("Speed: (\d*)", out)[0]) // 1000
-        if self.nic.startswith("columbiaville"):
+        if self.is_eth_series_nic(800):
             self.dut.send_expect(
                 "ip link set %s vf 0 spoofchk off" % (self.host_intf), "# "
             )
@@ -1162,7 +1162,7 @@ class TestKernelpfIavf(TestCase):
         if self.env_done:
             self.destroy_vm_env()
 
-        if self.nic.startswith("columbiaville") and self.default_stats:
+        if self.is_eth_series_nic(800) and self.default_stats:
             self.dut.send_expect(
                 "ethtool --set-priv-flags %s %s %s"
                 % (self.host_intf, self.flag, self.default_stats),
diff --git a/tests/TestSuite_l2fwd_jobstats.py b/tests/TestSuite_l2fwd_jobstats.py
index ad099d87..fd0dad11 100644
--- a/tests/TestSuite_l2fwd_jobstats.py
+++ b/tests/TestSuite_l2fwd_jobstats.py
@@ -51,12 +51,12 @@ class TestL2fwdJobstats(TestCase):
         self.verify(
             self.nic
             not in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
diff --git a/tests/TestSuite_l2tp_esp_coverage.py b/tests/TestSuite_l2tp_esp_coverage.py
index 22813b9d..981b3730 100644
--- a/tests/TestSuite_l2tp_esp_coverage.py
+++ b/tests/TestSuite_l2tp_esp_coverage.py
@@ -136,7 +136,7 @@ tv_MAC_IPV6_NAT_T_ESP_vlan = {
 
 
 class L2tpEspCoverage(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP", "ICE_25G-E810_XXV_SFP"]
 
     @check_supported_nic(supported_nic)
     def set_up_all(self):
@@ -181,7 +181,7 @@ class L2tpEspCoverage(TestCase):
         """
         self.dut.kill_all()
         self.destroy_iavf()
-        if self.nic.startswith("columbiaville") and self.default_stats:
+        if self.is_eth_series_nic(800) and self.default_stats:
             self.dut.send_expect(
                 "ethtool --set-priv-flags %s %s %s"
                 % (self.pf_interface, self.flag, self.default_stats),
@@ -197,7 +197,7 @@ class L2tpEspCoverage(TestCase):
             self.default_stats = self.dut.get_priv_flags_state(
                 self.pf_interface, self.flag
             )
-            if self.nic.startswith("columbiaville") and self.default_stats:
+            if self.is_eth_series_nic(800) and self.default_stats:
                 self.dut.send_expect(
                     "ethtool --set-priv-flags %s %s on"
                     % (self.pf_interface, self.flag),
diff --git a/tests/TestSuite_large_vf.py b/tests/TestSuite_large_vf.py
index 171e2a5b..c6797179 100644
--- a/tests/TestSuite_large_vf.py
+++ b/tests/TestSuite_large_vf.py
@@ -216,7 +216,7 @@ class TestLargeVf(TestCase):
         # Based on h/w type, choose how many ports to use
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(
-            self.nic in ["columbiaville_25g", "columbiaville_100g"],
+            self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"],
             "%s nic not support large vf" % self.nic,
         )
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
diff --git a/tests/TestSuite_link_flowctrl.py b/tests/TestSuite_link_flowctrl.py
index 5c4e7c6b..f24a63a1 100644
--- a/tests/TestSuite_link_flowctrl.py
+++ b/tests/TestSuite_link_flowctrl.py
@@ -192,7 +192,7 @@ class TestLinkFlowctrl(TestCase):
         self.tester.scapy_execute()
         # The following sleep is needed to allow all the packets to arrive.
         # 1s works for Crown Pass (FC18) DUT, Lizard Head Pass (FC14) tester
-        # using Niantic. Increase it in case of packet loosing.
+        # using 82599. Increase it in case of packet loosing.
         sleep(1)
 
         self.dut.send_expect("stop", "testpmd> ")
@@ -496,7 +496,7 @@ class TestLinkFlowctrl(TestCase):
         )
 
         self.logger.info("Packet loss: %.3f" % result)
-        if self.nic == "niantic":
+        if self.nic == "IXGBE_10G-82599_SFP":
             self.verify(
                 result >= 0.3,
                 "Link flow control fail, the loss percent is less than 30%",
@@ -517,7 +517,7 @@ class TestLinkFlowctrl(TestCase):
         )
 
         self.logger.info("Packet loss: %.3f" % result)
-        if self.nic == "niantic":
+        if self.nic == "IXGBE_10G-82599_SFP":
             self.verify(
                 result >= 0.3,
                 "Link flow control fail, the loss percent is less than 30%",
@@ -538,7 +538,7 @@ class TestLinkFlowctrl(TestCase):
         )
 
         self.logger.info("Packet loss: %.3f" % result)
-        if self.nic == "niantic":
+        if self.nic == "IXGBE_10G-82599_SFP":
             self.verify(
                 result >= 0.3,
                 "Link flow control fail, the loss percent is less than 30%",
@@ -599,7 +599,7 @@ class TestLinkFlowctrl(TestCase):
         )
         result = self.start_traffic(tgenInput)
         self.logger.info("Packet loss: %.3f" % result)
-        if self.nic == "niantic":
+        if self.nic == "IXGBE_10G-82599_SFP":
             self.verify(
                 result >= 0.3,
                 "Link flow control fail, the loss percent is less than 30%",
@@ -617,7 +617,7 @@ class TestLinkFlowctrl(TestCase):
         self.pmdout.wait_link_status_up(self.dutPorts[0])
         result = self.start_traffic(tgenInput)
         self.logger.info("Packet loss: %.3f" % result)
-        if self.nic == "niantic":
+        if self.nic == "IXGBE_10G-82599_SFP":
             self.verify(
                 result >= 0.3,
                 "Link flow control fail, the loss percent is less than 30%",
diff --git a/tests/TestSuite_link_status_interrupt.py b/tests/TestSuite_link_status_interrupt.py
index 663c957d..efcb8a0e 100755
--- a/tests/TestSuite_link_status_interrupt.py
+++ b/tests/TestSuite_link_status_interrupt.py
@@ -66,13 +66,13 @@ class TestLinkStatusInterrupt(TestCase):
         # from kernel 4.8+, kernel will not support legacy intr mode.
         # detailed info:https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/drivers/pci/quirks.c?id=8bcf4525c5d43306c5fd07e132bc8650e3491aec
         if self.nic in [
-            "columbiaville_25g",
-            "columbiaville_100g",
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirt_single",
-            "fortville_25g",
-            "carlsville",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_40G-QSFP_B",
+            "I40E_25G-25G_SFP28",
+            "I40E_10G-10G_BASE_T_BC",
         ]:
             self.basic_intr_mode = ["msix"]
         else:
diff --git a/tests/TestSuite_mac_filter.py b/tests/TestSuite_mac_filter.py
index 77240b26..7ef2aad2 100644
--- a/tests/TestSuite_mac_filter.py
+++ b/tests/TestSuite_mac_filter.py
@@ -110,7 +110,7 @@ class TestMacFilter(TestCase):
         # send one packet with the portid MAC address
         self.allowlist_send_packet(portid, self.dest)
 
-        # Niantic and FVL have different packet statistics when using the
+        # 82599 and Intel® Ethernet 700 Series have different packet statistics when using the
         # "show port stats" command. Packets number is stripped from log.
         out = self.dut.get_session_output()
         cur_rxpkt = utils.regexp(out, "received ([0-9]+) packets")
diff --git a/tests/TestSuite_macsec_for_ixgbe.py b/tests/TestSuite_macsec_for_ixgbe.py
index 1048ae68..ee7163db 100644
--- a/tests/TestSuite_macsec_for_ixgbe.py
+++ b/tests/TestSuite_macsec_for_ixgbe.py
@@ -44,7 +44,9 @@ class TestMacsecForIxgbe(TestCase):
         """
         Prerequisite steps for each test suite.
         """
-        self.verify(self.nic in ["niantic"], "NIC Unsupported: " + str(self.nic))
+        self.verify(
+            self.nic in ["IXGBE_10G-82599_SFP"], "NIC Unsupported: " + str(self.nic)
+        )
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) >= 2, "Insufficient ports")
         self.core_list = self.dut.get_core_list("1S/4C/1T")
diff --git a/tests/TestSuite_metering_and_policing.py b/tests/TestSuite_metering_and_policing.py
index 092974f9..06234997 100644
--- a/tests/TestSuite_metering_and_policing.py
+++ b/tests/TestSuite_metering_and_policing.py
@@ -215,7 +215,7 @@ class TestMeteringAndPolicing(TestCase):
             eal_param="-s %s --vdev 'net_softnic0,firmware=%s'"
             % (Servicecorelist, filename),
         )
-        if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
+        if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
             self.dut.send_expect("set fwd mac", "testpmd>")
 
     def add_port_meter_profile(self, profile_id, cbs=400, pbs=500):
diff --git a/tests/TestSuite_mtu_update.py b/tests/TestSuite_mtu_update.py
index f10dfbb7..b6b48439 100644
--- a/tests/TestSuite_mtu_update.py
+++ b/tests/TestSuite_mtu_update.py
@@ -250,7 +250,10 @@ class TestMtuUpdate(TestCase):
         """
         On 1G NICs, when the jubmo frame MTU set > 1500, the software adjust it to MTU+4.
         """
-        if self.nic in ["powerville", "springville", "foxville"] and packet_size > 1500:
+        if (
+            self.nic in ["IGB_1G-I350_COPPER", "IGB_1G-I210_COPPER", "IGC-I225_LM"]
+            and packet_size > 1500
+        ):
             self.send_packet_of_size_to_tx_port(packet_size + 8 - 1, received=True)
             self.send_packet_of_size_to_tx_port(packet_size + 8, received=True)
             self.send_packet_of_size_to_tx_port(packet_size + 8 + 1, received=False)
diff --git a/tests/TestSuite_nic_single_core_perf.py b/tests/TestSuite_nic_single_core_perf.py
index bcb19eeb..1bdbf877 100644
--- a/tests/TestSuite_nic_single_core_perf.py
+++ b/tests/TestSuite_nic_single_core_perf.py
@@ -57,14 +57,14 @@ class TestNicSingleCorePerf(TestCase):
         self.verify(
             self.nic
             in [
-                "niantic",
-                "fortville_25g",
-                "fortville_spirit",
+                "IXGBE_10G-82599_SFP",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
                 "ConnectX5_MT4121",
                 "ConnectX4_LX_MT4117",
-                "columbiaville_100g",
-                "columbiaville_25g",
-                "columbiaville_25gx2",
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP",
+                "ICE_25G-E810_XXV_SFP",
                 "brcm_57414",
                 "brcm_P2100G",
             ],
@@ -79,13 +79,13 @@ class TestNicSingleCorePerf(TestCase):
         self.verify(self.rx_desc_size == 16 or self.rx_desc_size == 32, err_msg)
         if self.rx_desc_size == 16:
             extra_options = ""
-            # rebuild to get best perf on fortville
-            if self.nic in ["fortville_25g", "fortville_spirit"]:
+            # rebuild to get best perf on Intel® Ethernet 700 Series
+            if self.nic in ["I40E_25G-25G_SFP28", "I40E_40G-QSFP_A"]:
                 extra_options = "-Dc_args=-DRTE_LIBRTE_I40E_16BYTE_RX_DESC"
             elif self.nic in [
-                "columbiaville_100g",
-                "columbiaville_25g",
-                "columbiaville_25gx2",
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP",
+                "ICE_25G-E810_XXV_SFP",
             ]:
                 extra_options = "-Dc_args=-DRTE_LIBRTE_ICE_16BYTE_RX_DESC"
             self.dut.build_install_dpdk(self.target, extra_options=extra_options)
@@ -292,14 +292,14 @@ class TestNicSingleCorePerf(TestCase):
 
             nb_cores = thread_num
 
-            # fortville has to use 2 queues at least to get the best performance
-            if self.nic in ["fortville_25g", "fortville_spirit"] or thread_num == 2:
+            # Intel® Ethernet 700 Series has to use 2 queues at least to get the best performance
+            if self.nic in ["I40E_25G-25G_SFP28", "I40E_40G-QSFP_A"] or thread_num == 2:
                 param += " --rxq=2 --txq=2"
-            # columbiaville use one queue per port for best performance.
+            # Intel® Ethernet 810 Series use one queue per port for best performance.
             elif self.nic in [
-                "columbiaville_100g",
-                "columbiaville_25g",
-                "columbiaville_25gx2",
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP",
+                "ICE_25G-E810_XXV_SFP",
             ]:
                 param += " --rxq=1 --txq=1"
                 # workaround for that testpmd can't forward packets in io forward mode
diff --git a/tests/TestSuite_nvgre.py b/tests/TestSuite_nvgre.py
index a129c561..67165e01 100644
--- a/tests/TestSuite_nvgre.py
+++ b/tests/TestSuite_nvgre.py
@@ -398,23 +398,23 @@ class TestNvgre(TestCase):
         """
         nvgre Prerequisites
         """
-        # this feature only enable in FVL now
+        # this feature only enable in Intel® Ethernet 700 Series now
         if self.nic in [
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirit_single",
-            "fortville_25g",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_40G-QSFP_B",
+            "I40E_25G-25G_SFP28",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
             "cavium_a063",
             "cavium_a064",
-            "carlsville",
+            "I40E_10G-10G_BASE_T_BC",
         ]:
             self.compile_switch = "CONFIG_RTE_LIBRTE_I40E_INC_VECTOR"
-        elif self.nic in ["sageville", "sagepond"]:
+        elif self.nic in ["IXGBE_10G-X550T", "IXGBE_10G-X550EM_X_10G_T"]:
             self.compile_switch = "CONFIG_RTE_IXGBE_INC_VECTOR"
-        elif self.nic in ["columbiaville_25g", "columbiaville_100g"]:
-            print("CVL support default none VECTOR")
+        elif self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
+            print("Intel® Ethernet 800 Series support default none VECTOR")
         else:
             self.verify(False, "%s not support NVGRE case" % self.nic)
         # Based on h/w type, choose how many ports to use
@@ -751,8 +751,8 @@ class TestNvgre(TestCase):
         verify nvgre packet with ipv6
         """
         # packet type detect must used without VECTOR pmd
-        if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
-            print("CVL support default none VECTOR")
+        if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
+            print("Intel® Ethernet 800 Series support default none VECTOR")
             src_vec_model = "n"
 
         # check no nvgre packet
@@ -843,8 +843,8 @@ class TestNvgre(TestCase):
         verify nvgre packet with ipv4
         """
         # packet type detect must used without VECTOR pmd
-        if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
-            print("CVL support default none VECTOR")
+        if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
+            print("Intel® Ethernet 800 Series support default none VECTOR")
             src_vec_model = "n"
 
         # check no nvgre packet
diff --git a/tests/TestSuite_pmdrss_hash.py b/tests/TestSuite_pmdrss_hash.py
index e167cc43..f4f40ff2 100644
--- a/tests/TestSuite_pmdrss_hash.py
+++ b/tests/TestSuite_pmdrss_hash.py
@@ -32,7 +32,7 @@
 """
 DPDK Test suite.
 
-Test DPDK1.8 feature: Fortville RSS full support - configuring hash functions.
+Test DPDK1.8 feature: Intel® Ethernet 700 Series RSS full support - configuring hash functions.
 It can select Toeplitz or simple XOR hash function and it can configure symmetric hash functions.
 Support 4*10G, 1*40G and 2*40G NICs.
 """
@@ -509,7 +509,12 @@ class TestPmdrssHash(TestCase):
         self.verify(sum(result) == 0, "the symmetric RSS hash function failed!")
 
     @skip_unsupported_nic(
-        ["columbiaville_25g", "columbiaville_100g", "niantic", "foxville"]
+        [
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
+            "IXGBE_10G-82599_SFP",
+            "IGC-I225_LM",
+        ]
     )
     def set_up_all(self):
         """
@@ -521,13 +526,13 @@ class TestPmdrssHash(TestCase):
         global queue
 
         if self.nic in [
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirit_single",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "fortville_25g",
-            "carlsville",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_40G-QSFP_B",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "I40E_25G-25G_SFP28",
+            "I40E_10G-10G_BASE_T_BC",
         ]:
             reta_num = 512
         else:
diff --git a/tests/TestSuite_pmdrssreta.py b/tests/TestSuite_pmdrssreta.py
index 7bc8d484..9e7c0f5f 100644
--- a/tests/TestSuite_pmdrssreta.py
+++ b/tests/TestSuite_pmdrssreta.py
@@ -177,7 +177,7 @@ class TestPmdrssreta(TestCase):
                 hash_index = int(tmp_reta_line["RSS hash"], 16) % 64
             elif self.nic in ["hi1822"]:
                 hash_index = int(tmp_reta_line["RSS hash"], 16) % 256
-            elif self.nic in ["niantic", "foxville", "twinpond"]:
+            elif self.nic in ["IXGBE_10G-82599_SFP", "IGC-I225_LM", "IXGBE_10G-X540T"]:
                 # compute the hash result of five tuple into the 7 LSBs value.
                 hash_index = int(tmp_reta_line["RSS hash"], 16) % 128
             else:
@@ -239,7 +239,7 @@ class TestPmdrssreta(TestCase):
 
         self.dut.kill_all()
         global testQueues
-        if self.nic == "foxville":
+        if self.nic == "IGC-I225_LM":
             testQueues = [2]
         # test with different rss queues
         for queue in testQueues:
@@ -285,7 +285,7 @@ class TestPmdrssreta(TestCase):
                             "port config 0 rss reta (%d,%d)" % (i, reta_entries[i]),
                             "testpmd> ",
                         )
-                elif self.nic in ["niantic", "foxville"]:
+                elif self.nic in ["IXGBE_10G-82599_SFP", "IGC-I225_LM"]:
                     for i in range(128):
                         reta_entries.insert(i, random.randint(0, queue - 1))
                         self.dut.send_expect(
@@ -306,24 +306,24 @@ class TestPmdrssreta(TestCase):
 
     def test_rss_key_size(self):
         nic_rss_key_size = {
-            "columbiaville_25g": 52,
-            "columbiaville_100g": 52,
-            "fortville_eagle": 52,
-            "fortville_spirit": 52,
-            "fortville_spirit_single": 52,
-            "fortville_25g": 52,
-            "niantic": 40,
+            "ICE_25G-E810C_SFP": 52,
+            "ICE_100G-E810C_QSFP": 52,
+            "I40E_10G-SFP_XL710": 52,
+            "I40E_40G-QSFP_A": 52,
+            "I40E_40G-QSFP_B": 52,
+            "I40E_25G-25G_SFP28": 52,
+            "IXGBE_10G-82599_SFP": 40,
             "e1000": 40,
-            "fortpark_TLV": 52,
-            "fortpark_BASE-T": 52,
+            "I40E_10G-SFP_X722": 52,
+            "I40E_10G-10G_BASE_T_X722": 52,
             "hi1822": 40,
             "cavium_a063": 48,
             "cavium_a064": 48,
-            "carlsville": 52,
-            "sagepond": 40,
-            "sageville": 40,
-            "foxville": 40,
-            "twinpond": 40,
+            "I40E_10G-10G_BASE_T_BC": 52,
+            "IXGBE_10G-X550EM_X_10G_T": 40,
+            "IXGBE_10G-X550T": 40,
+            "IGC-I225_LM": 40,
+            "IXGBE_10G-X540T": 40,
         }
         self.verify(
             self.nic in list(nic_rss_key_size.keys()),
diff --git a/tests/TestSuite_port_control.py b/tests/TestSuite_port_control.py
index 8055b776..c3fea5d9 100755
--- a/tests/TestSuite_port_control.py
+++ b/tests/TestSuite_port_control.py
@@ -160,7 +160,7 @@ class TestPortControl(TestCase):
         terminal.execute_cmd("stop")
         terminal.execute_cmd("port stop all")
         ret = terminal.get_port_link_status(self.port_id_0)
-        if self.nic.startswith("columbiaville") or (
+        if self.is_eth_series_nic(800) or (
             getattr(self, "vm_testpmd", None) and terminal is self.vm_testpmd
         ):
             self.verify(ret != "", "port status error!")
@@ -170,7 +170,7 @@ class TestPortControl(TestCase):
     def reset_pmd_port(self, terminal):
         terminal.execute_cmd("port reset all")
         ret = terminal.get_port_link_status(self.port_id_0)
-        if self.nic.startswith("columbiaville") or (
+        if self.is_eth_series_nic(800) or (
             getattr(self, "vm_testpmd", None) and terminal is self.vm_testpmd
         ):
             self.verify(ret != "", "port status error!")
diff --git a/tests/TestSuite_port_representor.py b/tests/TestSuite_port_representor.py
index 03a8d1c9..15f03ce8 100644
--- a/tests/TestSuite_port_representor.py
+++ b/tests/TestSuite_port_representor.py
@@ -53,13 +53,13 @@ class TestPortRepresentor(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
diff --git a/tests/TestSuite_ptype_mapping.py b/tests/TestSuite_ptype_mapping.py
index 9b458073..6bf02052 100644
--- a/tests/TestSuite_ptype_mapping.py
+++ b/tests/TestSuite_ptype_mapping.py
@@ -48,13 +48,13 @@ class TestPtype_Mapping(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
                 "cavium_a063",
                 "cavium_a064",
             ],
diff --git a/tests/TestSuite_pvp_share_lib.py b/tests/TestSuite_pvp_share_lib.py
index f9c1f5da..0990d0d4 100644
--- a/tests/TestSuite_pvp_share_lib.py
+++ b/tests/TestSuite_pvp_share_lib.py
@@ -195,10 +195,10 @@ class TestPVPShareLib(TestCase):
 
     def test_perf_pvp_share_lib_of_niantic(self):
         """
-        Vhost/virtio-user pvp share lib test with niantic
+        Vhost/virtio-user pvp share lib test with 82599
         """
         self.verify(
-            self.nic in ["niantic"],
+            self.nic in ["IXGBE_10G-82599_SFP"],
             "the nic not support this case: %s" % self.running_case,
         )
         self.start_testpmd_as_vhost(driver="ixgbe")
@@ -209,10 +209,10 @@ class TestPVPShareLib(TestCase):
 
     def test_perf_pvp_share_lib_of_fortville(self):
         """
-        Vhost/virtio-user pvp share lib test with fortville
+        Vhost/virtio-user pvp share lib test with Intel® Ethernet 700 Series
         """
         self.verify(
-            self.nic in ["fortville_eagle", "fortville_spirit", "fortville_25g"],
+            self.nic in ["I40E_10G-SFP_XL710", "I40E_40G-QSFP_A", "I40E_25G-25G_SFP28"],
             "the nic not support this case: %s" % self.running_case,
         )
         self.start_testpmd_as_vhost(driver="i40e")
diff --git a/tests/TestSuite_pvp_vhost_user_reconnect.py b/tests/TestSuite_pvp_vhost_user_reconnect.py
index 327444fb..61b56bd0 100644
--- a/tests/TestSuite_pvp_vhost_user_reconnect.py
+++ b/tests/TestSuite_pvp_vhost_user_reconnect.py
@@ -283,7 +283,7 @@ class TestPVPVhostUserReconnect(TestCase):
             cinfo = tinfo
         self.result_table_add(["vm2vm iperf", iperfdata[-1], cinfo])
         data_li = iperfdata[-1].strip().split()
-        if self.nic in ["fortville_spirit"]:
+        if self.nic in ["I40E_40G-QSFP_A"]:
             self.verify(data_li[1] == "Gbits/sec", "data unit not correct")
         return float(data_li[0])
 
@@ -453,7 +453,8 @@ class TestPVPVhostUserReconnect(TestCase):
         self.config_vm_intf()
         self.start_iperf()
         self.before_data = self.iperf_result_verify(vm_cycle, "before reconnet")
-        # Because of repeat iperf test on FVL-40g nic, the result is unstable, so use 15Gb/s as check value.
+        # Because of repeat iperf test on Intel® Ethernet Converged Network Adapter XL710-QDA2 nic,
+        # the result is unstable, so use 15Gb/s as check value.
         self.check_data = 15.000
 
         vm_cycle = 1
@@ -582,7 +583,8 @@ class TestPVPVhostUserReconnect(TestCase):
         self.config_vm_intf()
         self.start_iperf()
         self.before_data = self.iperf_result_verify(vm_cycle, "before reconnet")
-        # Because of repeat iperf test on FVL-40g nic, the result is unstable, so use 15Gb/s as check value.
+        # Because of repeat iperf test on Intel® Ethernet Converged Network Adapter XL710-QDA2 nic,
+        # the result is unstable, so use 15Gb/s as check value.
         self.check_data = 15.000
 
         vm_cycle = 1
diff --git a/tests/TestSuite_qinq_filter.py b/tests/TestSuite_qinq_filter.py
index 955a0dc0..f3d076df 100644
--- a/tests/TestSuite_qinq_filter.py
+++ b/tests/TestSuite_qinq_filter.py
@@ -56,16 +56,18 @@ class TestQinqFilter(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "foxville",
-                "carlsville",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "IGC-I225_LM",
+                "I40E_10G-10G_BASE_T_BC",
             ],
             "NIC %s not support this test" % self.nic,
         )
-        print("this case only supports fortville with 6.0.0+ firmware and dpdk17.05+")
+        print(
+            "this case only supports Intel® Ethernet 700 Series with 6.0.0+ firmware and dpdk17.05+"
+        )
         ports = self.dut.get_ports()
         # Verify that enough ports are available
         self.verify(len(ports) >= 1, "Insufficient ports")
diff --git a/tests/TestSuite_queue_region.py b/tests/TestSuite_queue_region.py
index 3ff02075..faf2ecac 100644
--- a/tests/TestSuite_queue_region.py
+++ b/tests/TestSuite_queue_region.py
@@ -57,13 +57,13 @@ class TestQueue_region(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -281,7 +281,7 @@ class TestQueue_region(TestCase):
         self.dut.send_expect(
             "set port 0 queue-region region_id 6 flowtype 36", "testpmd> "
         )
-        if self.nic in ["fortpark_TLV", "fortpark_BASE-T"]:
+        if self.nic in ["I40E_10G-SFP_X722", "I40E_10G-10G_BASE_T_X722"]:
             self.dut.send_expect(
                 "set port 0 queue-region region_id 2 flowtype 39", "testpmd> "
             )
@@ -317,8 +317,8 @@ class TestQueue_region(TestCase):
         queue_region = ["1"]
         queue_udp = self.send_and_check(queue_region, mac=self.pf_mac, pkt_type="udp")
 
-        # fortville can't parse the TCP SYN type packet, fortpark can parse it.
-        if self.nic in ["fortpark_TLV", "fortpark_BASE-T"]:
+        # Intel® Ethernet 700 Series can't parse the TCP SYN type packet, X722 can parse it.
+        if self.nic in ["I40E_10G-SFP_X722", "I40E_10G-10G_BASE_T_X722"]:
             queue_region = ["3", "4"]
             self.send_and_check(
                 queue_region, mac=self.pf_mac, pkt_type="tcp", flags="S"
@@ -344,10 +344,10 @@ class TestQueue_region(TestCase):
         queue_region = ["5"]
         self.send_and_check(queue_region, mac=self.pf_mac, pkt_type="ipv4", frag=1)
 
-        # fortville can't parse the TCP SYN type packet, fortpark can parse it.
+        # Intel® Ethernet 700 Series can't parse the TCP SYN type packet, X722 can parse it.
         # default is SYN mode.
         # not assign ipv4-tcp SYN packet to any queue region, the packet to queue region 0.
-        if self.nic in ["fortpark_TLV", "fortpark_BASE-T"]:
+        if self.nic in ["I40E_10G-SFP_X722", "I40E_10G-10G_BASE_T_X722"]:
             queue_region = ["1"]
             queue_ipv6tcp = self.send_and_check(
                 queue_region, mac=self.pf_mac, pkt_type="ipv6_tcp", flags="S"
diff --git a/tests/TestSuite_rss_key_update.py b/tests/TestSuite_rss_key_update.py
index 09a6564d..6d5a2fe6 100644
--- a/tests/TestSuite_rss_key_update.py
+++ b/tests/TestSuite_rss_key_update.py
@@ -191,37 +191,37 @@ class TestRssKeyUpdate(TestCase):
         self.verify(
             self.nic
             in [
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "niantic",
-                "carlsville",
-                "foxville",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28",
+                "IXGBE_10G-82599_SFP",
+                "I40E_10G-10G_BASE_T_BC",
+                "IGC-I225_LM",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
         global reta_num
         global iptypes
         global queue
-        if self.nic in ["foxville"]:
+        if self.nic in ["IGC-I225_LM"]:
             queue = 4
 
         if self.nic in [
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirit_single",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "fortville_25g",
-            "carlsville",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_40G-QSFP_B",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "I40E_25G-25G_SFP28",
+            "I40E_10G-10G_BASE_T_BC",
         ]:
             reta_num = 512
-        elif self.nic in ["niantic", "foxville"]:
+        elif self.nic in ["IXGBE_10G-82599_SFP", "IGC-I225_LM"]:
             reta_num = 128
             iptypes = {
                 "ipv4-other": "ip",
@@ -361,24 +361,24 @@ class TestRssKeyUpdate(TestCase):
     def test_set_hash_key_short_long(self):
 
         nic_rss_key_size = {
-            "columbiaville_25g": 52,
-            "columbiaville_100g": 52,
-            "fortville_eagle": 52,
-            "fortville_spirit": 52,
-            "fortville_spirit_single": 52,
-            "fortville_25g": 52,
-            "niantic": 40,
+            "ICE_25G-E810C_SFP": 52,
+            "ICE_100G-E810C_QSFP": 52,
+            "I40E_10G-SFP_XL710": 52,
+            "I40E_40G-QSFP_A": 52,
+            "I40E_40G-QSFP_B": 52,
+            "I40E_25G-25G_SFP28": 52,
+            "IXGBE_10G-82599_SFP": 40,
             "e1000": 40,
-            "fortpark_TLV": 52,
-            "fortpark_BASE-T": 52,
+            "I40E_10G-SFP_X722": 52,
+            "I40E_10G-10G_BASE_T_X722": 52,
             "hi1822": 40,
             "cavium_a063": 48,
             "cavium_a064": 48,
-            "carlsville": 52,
-            "sagepond": 40,
-            "sageville": 40,
-            "foxville": 40,
-            "twinpond": 40,
+            "I40E_10G-10G_BASE_T_BC": 52,
+            "IXGBE_10G-X550EM_X_10G_T": 40,
+            "IXGBE_10G-X550T": 40,
+            "IGC-I225_LM": 40,
+            "IXGBE_10G-X540T": 40,
         }
 
         self.verify(
diff --git a/tests/TestSuite_rss_to_rte_flow.py b/tests/TestSuite_rss_to_rte_flow.py
index a18808bb..de952ac3 100644
--- a/tests/TestSuite_rss_to_rte_flow.py
+++ b/tests/TestSuite_rss_to_rte_flow.py
@@ -400,15 +400,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -616,15 +616,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -727,15 +727,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -842,15 +842,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -987,15 +987,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -1188,15 +1188,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -1241,15 +1241,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -1316,15 +1316,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -1373,15 +1373,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -1433,15 +1433,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -1495,15 +1495,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -1545,19 +1545,19 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.pmdout.start_testpmd(
                 "%s" % self.cores, "--rxq=4 --txq=4 --port-topology=chained"
             )
@@ -1571,7 +1571,7 @@ class TestRSS_to_Rteflow(TestCase):
         time.sleep(2)
 
         # Create a rss queue rule
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.dut.send_expect(
                 "flow create 0 ingress pattern end actions rss queues 1 2 end / end",
                 "created",
@@ -1594,7 +1594,7 @@ class TestRSS_to_Rteflow(TestCase):
             "ipv6-tcp",
             "ipv6-sctp",
         ]
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.send_check_100_packet_queue(ptype_list1, ["1", "2"], port_id=0)
         else:
             self.send_check_100_packet_queue(ptype_list1, ["1", "4", "7"], port_id=0)
@@ -1635,7 +1635,7 @@ class TestRSS_to_Rteflow(TestCase):
             "flow create 0 ingress pattern end actions rss queues 8 end / end", "error"
         )
         # Set all the queues to the rule
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.dut.send_expect(
                 "flow create 0 ingress pattern end actions rss queues 0 1 2 3 end / end",
                 "created",
@@ -1654,19 +1654,19 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.pmdout.start_testpmd(
                 "%s" % self.cores, "--rxq=4 --txq=4 --port-topology=chained"
             )
@@ -1680,7 +1680,7 @@ class TestRSS_to_Rteflow(TestCase):
         time.sleep(2)
 
         # Create a rss queue rule
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.dut.send_expect(
                 "flow create 0 ingress pattern end actions rss types udp ipv4-tcp ipv6-sctp ipv4-other end queues 1 2 3 end / end",
                 "created",
@@ -1707,7 +1707,7 @@ class TestRSS_to_Rteflow(TestCase):
         # send the packets and verify the results
         if self.nic in ["cavium_a063", "cavium_a064"]:
             self.send_check_100_packet_queue(ptype_list1, ["1", "4", "7"], port_id=0)
-        elif self.nic in ["foxville", "springville"]:
+        elif self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.send_check_100_packet_queue(ptype_list1, ["1", "2", "3"], port_id=0)
             self.send_check_100_packet_queue(ptype_list2, "0", port_id=0)
         else:
@@ -1717,7 +1717,7 @@ class TestRSS_to_Rteflow(TestCase):
         # Create different ptype rss rule.
         self.dut.send_expect("flow flush 0", "testpmd> ")
 
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.dut.send_expect(
                 "flow create 0 ingress pattern end actions rss types ipv4 ipv6 end queues 1 3 end / end",
                 "created",
@@ -1740,7 +1740,7 @@ class TestRSS_to_Rteflow(TestCase):
             "ipv6-tcp",
             "ipv6-sctp",
         ]
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.send_check_100_packet_queue(ptype_list3, ["1", "3"], port_id=0)
         else:
             self.send_check_100_packet_queue(ptype_list3, ["3", "7"], port_id=0)
@@ -1752,19 +1752,19 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.pmdout.start_testpmd(
                 "%s" % self.cores,
                 "--rxq=4 --txq=4 --disable-rss --port-topology=chained",
@@ -1805,7 +1805,7 @@ class TestRSS_to_Rteflow(TestCase):
         self.send_check_100_packet_queue(ptype_list1, "0", port_id=0)
 
         # Create a rss queue rule
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.dut.send_expect(
                 "flow create 0 ingress pattern end actions rss types ipv6-tcp ipv4-udp end queues 1 2 3 end / end",
                 "created",
@@ -1829,7 +1829,7 @@ class TestRSS_to_Rteflow(TestCase):
             "ipv6-udp",
             "ipv6-sctp",
         ]
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.send_check_100_packet_queue(ptype_list2, ["1", "2", "3"], port_id=0)
         else:
             self.send_check_100_packet_queue(ptype_list2, ["5", "6", "7"], port_id=0)
@@ -1842,19 +1842,19 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.pmdout.start_testpmd(
                 "%s" % self.cores,
                 "--rxq=4 --txq=4 --disable-rss --port-topology=chained",
@@ -1869,7 +1869,7 @@ class TestRSS_to_Rteflow(TestCase):
         time.sleep(2)
 
         # Create a rss queue rule
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.dut.send_expect(
                 "flow create 0 ingress pattern end actions rss types ipv4-udp end queues 2 3 end / end",
                 "created",
@@ -1883,7 +1883,12 @@ class TestRSS_to_Rteflow(TestCase):
             self.send_and_check(self.pkt2, ["3", "4", "5"], port_id=0)
 
         # Create a flow director rule
-        if self.nic in ["bartonhills", "powerville", "springville", "foxville"]:
+        if self.nic in [
+            "IGB_1G-82580_COPPER",
+            "IGB_1G-I350_COPPER",
+            "IGB_1G-I210_COPPER",
+            "IGC-I225_LM",
+        ]:
             self.dut.send_expect(
                 "flow create 0 ingress pattern eth / ipv4 proto is 17 / udp dst is 50 / end actions queue index 1 / end",
                 "created",
@@ -1897,7 +1902,7 @@ class TestRSS_to_Rteflow(TestCase):
             self.send_and_check(self.pkt2, ["1"], port_id=0)
         # Delete the fdir rule
         self.dut.send_expect("flow destroy 0 rule 1", "testpmd> ")
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.send_and_check(self.pkt2, ["2", "3"], port_id=0)
         else:
             self.send_and_check(self.pkt2, ["3", "4", "5"], port_id=0)
diff --git a/tests/TestSuite_runtime_vf_queue_number_kernel.py b/tests/TestSuite_runtime_vf_queue_number_kernel.py
index e8f9f5c9..eabf829d 100755
--- a/tests/TestSuite_runtime_vf_queue_number_kernel.py
+++ b/tests/TestSuite_runtime_vf_queue_number_kernel.py
@@ -54,17 +54,17 @@ class TestRuntimeVfQueueNumberKernel(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g",
-                "fortville_spirit_single",
-                "fortpark_BASE-T",
-                "fortpark_TLV",
-                "carlsville",
-                "columbiaville_100g",
-                "columbiaville_25g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP",
             ],
-            "Only supported by Fortville and columbiaville",
+            "Only supported by Intel® Ethernet 700 Series and Intel® Ethernet 800 Series",
         )
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) > 1, "Insufficient ports")
diff --git a/tests/TestSuite_runtime_vf_queue_number_maxinum.py b/tests/TestSuite_runtime_vf_queue_number_maxinum.py
index 94f57cc1..5dbc52ba 100644
--- a/tests/TestSuite_runtime_vf_queue_number_maxinum.py
+++ b/tests/TestSuite_runtime_vf_queue_number_maxinum.py
@@ -51,13 +51,13 @@ class TestRuntimeVfQnMaxinum(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
             ],
-            "Only supported by Fortville",
+            "Only supported by Intel® Ethernet 700 Series",
         )
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports")
@@ -77,16 +77,16 @@ class TestRuntimeVfQnMaxinum(TestCase):
 
     def setup_test_env(self, driver="default"):
         """
-        Bind fortville nic to DPDK PF, and create 32/64 vfs on it.
+        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 ["fortville_eagle"]:
+        if self.nic in ["I40E_10G-SFP_XL710"]:
             self.dut.generate_sriov_vfs_by_port(self.used_dut_port, 32, driver=driver)
         elif self.nic in [
-            "fortville_25g",
-            "fortville_spirit",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_A",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
         ]:
             self.dut.generate_sriov_vfs_by_port(self.used_dut_port, 64, driver=driver)
 
@@ -158,8 +158,8 @@ class TestRuntimeVfQnMaxinum(TestCase):
     def test_vf_consume_max_queues_on_one_pf(self):
         """
         Test case 1: VF consume max queue number on one PF port.
-        For four port fortville nic, each port has 384 queues,
-        and for two port fortville nic, each port has 768 queues.
+        For four port Intel® Ethernet 700 Series nic, each port has 384 queues,
+        and for two port Intel® Ethernet 700 Series nic, each port has 768 queues.
         PF will use 65 queues on each port, the firmware will reserve 4 queues
         for each vf, when requested queues exceed 4 queues, it need to realloc queues
         in the left queues, the reserved queues generally can't be reused.
@@ -175,15 +175,15 @@ class TestRuntimeVfQnMaxinum(TestCase):
         vf2_queue_number = 0
         vf3_allow_index = 0
         vf3_allow_list = ""
-        if self.nic in ["fortville_eagle"]:
+        if self.nic in ["I40E_10G-SFP_XL710"]:
             left_queues = 384 - 65 - 32 * 4
             vf1_allow_index = left_queues / 16
             vf2_queue_number = left_queues % 16
         elif self.nic in [
-            "fortville_25g",
-            "fortville_spirit",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_A",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
         ]:
             left_queues = 768 - 65 - 64 * 4
             vf1_allow_index = left_queues / 16
diff --git a/tests/TestSuite_rxtx_offload.py b/tests/TestSuite_rxtx_offload.py
index a1c7a262..f108c3d9 100644
--- a/tests/TestSuite_rxtx_offload.py
+++ b/tests/TestSuite_rxtx_offload.py
@@ -88,22 +88,22 @@ class TestRxTx_Offload(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
-                "niantic",
-                "twinpond",
-                "sagepond",
-                "sageville",
-                "foxville",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IGC-I225_LM",
                 "cavium_a063",
                 "cavium_a064",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -520,7 +520,7 @@ class TestRxTx_Offload(TestCase):
         capabilities = self.check_port_capability("rx")
         for capability in capabilities:
             if (
-                self.nic in ["foxville", "cavium_a063", "cavium_a064"]
+                self.nic in ["IGC-I225_LM", "cavium_a063", "cavium_a064"]
                 and capability == "sctp_cksum"
             ):
                 continue
@@ -543,7 +543,14 @@ class TestRxTx_Offload(TestCase):
         """
         # Only support ixgbe NICs
         self.verify(
-            self.nic in ["niantic", "twinpond", "sagepond", "sageville", "foxville"],
+            self.nic
+            in [
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IGC-I225_LM",
+            ],
             "%s nic not support rx offload setting by queue." % self.nic,
         )
         # Define the vlan packets
@@ -611,17 +618,17 @@ class TestRxTx_Offload(TestCase):
         self.dut.send_expect("set fwd txonly", "testpmd> ")
         self.dut.send_expect("set verbose 1", "testpmd> ")
         if self.nic in [
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_25g",
-            "fortville_spirit_single",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "carlsville",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_B",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "I40E_10G-10G_BASE_T_BC",
             "cavium_a063",
             "cavium_a064",
-            "columbiaville_100g",
-            "columbiaville_25g",
+            "ICE_100G-E810C_QSFP",
+            "ICE_25G-E810C_SFP",
         ]:
             self.dut.send_expect("port stop 0", "testpmd> ")
             self.dut.send_expect(
@@ -667,15 +674,15 @@ class TestRxTx_Offload(TestCase):
         self.dut.send_expect("set fwd txonly", "testpmd> ")
         self.dut.send_expect("set verbose 1", "testpmd> ")
         if self.nic in [
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_25g",
-            "fortville_spirit_single",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "carlsville",
-            "columbiaville_100g",
-            "columbiaville_25g",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_B",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "I40E_10G-10G_BASE_T_BC",
+            "ICE_100G-E810C_QSFP",
+            "ICE_25G-E810C_SFP",
         ]:
             self.dut.send_expect("port stop 0", "testpmd> ")
             self.dut.send_expect(
@@ -803,17 +810,17 @@ class TestRxTx_Offload(TestCase):
         """
         self.pmdout.start_testpmd("%s" % self.cores, "--rxq=4 --txq=4")
         capabilities = self.check_port_capability("tx")
-        # Disable per queue capability first, if it is FVL/Fortpark.
+        # Disable per queue capability first, if it is Intel® Ethernet 700 Series/X722.
         if self.nic in [
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_25g",
-            "fortville_spirit_single",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "carlsville",
-            "columbiaville_100g",
-            "columbiaville_25g",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_B",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "I40E_10G-10G_BASE_T_BC",
+            "ICE_100G-E810C_QSFP",
+            "ICE_25G-E810C_SFP",
         ]:
             self.dut.send_expect("port stop 0", "testpmd> ")
             self.dut.send_expect(
@@ -841,15 +848,15 @@ class TestRxTx_Offload(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "columbiaville_100g",
-                "columbiaville_25g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP",
             ],
             "%s nic not support rx offload setting by queue." % self.nic,
         )
diff --git a/tests/TestSuite_scatter.py b/tests/TestSuite_scatter.py
index 30f883bf..7a1f22ce 100644
--- a/tests/TestSuite_scatter.py
+++ b/tests/TestSuite_scatter.py
@@ -66,24 +66,24 @@ class TestScatter(TestCase):
 
         self.pmdout = PmdOutput(self.dut)
         if self.nic in [
-            "magnolia_park",
-            "niantic",
-            "sageville",
-            "fortpark",
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirit_single",
-            "fortville_25g",
+            "IXGBE_10G-X550EM_A_SFP",
+            "IXGBE_10G-82599_SFP",
+            "IXGBE_10G-X550T",
+            "I40E_10G-X722_A0",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_40G-QSFP_B",
+            "I40E_25G-25G_SFP28",
             "x722_37d2",
-            "ironpond",
-            "twinpond",
-            "springfountain",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "sagepond",
-            "carlsville",
-            "columbiaville_25g",
-            "columbiaville_100g",
+            "IXGBE_10G-82599_T3_LOM",
+            "IXGBE_10G-X540T",
+            "IXGBE_10G-82599_SFP_SF_QP",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "IXGBE_10G-X550EM_X_10G_T",
+            "I40E_10G-10G_BASE_T_BC",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
         ]:
             self.mbsize = 2048
         else:
diff --git a/tests/TestSuite_shutdown_api.py b/tests/TestSuite_shutdown_api.py
index a109932a..327f7bd5 100644
--- a/tests/TestSuite_shutdown_api.py
+++ b/tests/TestSuite_shutdown_api.py
@@ -222,7 +222,7 @@ class TestShutdownApi(TestCase):
             # vlan strip default is off
             tx_bytes_exp -= 16
 
-        # fortville nic enable send lldp packet function when port setup
+        # Intel® Ethernet 700 Series nic enable send lldp packet function when port setup
         # now the tx-packets size is lldp_size(110) * n + forward packe size
         # so use (tx-packets - forward packet size) % lldp_size, if it is 0, it means forward packet size right
 
@@ -375,7 +375,7 @@ class TestShutdownApi(TestCase):
         self.dut.send_expect("stop", "testpmd> ")
         self.check_forwarding(received=False)
         self.dut.send_expect("port stop all", "testpmd> ", 100)
-        if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
+        if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
             self.check_ports(status=True)
         else:
             self.check_ports(status=False)
@@ -561,10 +561,10 @@ class TestShutdownApi(TestCase):
 
         for config in configs:
             print(config)
-            if self.nic in ["ironpond"]:
+            if self.nic in ["IXGBE_10G-82599_T3_LOM"]:
                 if config[0] != "1000" or "10000":
                     continue
-            elif self.nic in ["sagepond"]:
+            elif self.nic in ["IXGBE_10G-X550EM_X_10G_T"]:
                 if config[0] not in ["1000", "10000"]:
                     continue
             self.dut.send_expect("port stop all", "testpmd> ", 100)
@@ -726,14 +726,14 @@ class TestShutdownApi(TestCase):
             self.dut.send_expect("start", "testpmd> ")
 
             if self.nic in [
-                "magnolia_park",
-                "niantic",
-                "twinpond",
-                "kawela_4",
-                "ironpond",
-                "springfountain",
-                "sageville",
-                "sagepond",
+                "IXGBE_10G-X550EM_A_SFP",
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X540T",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X550T",
+                "IXGBE_10G-X550EM_X_10G_T",
             ]:
                 # nantic vlan length will not be calculated
                 vlan_jumbo_size = jumbo_size + 4
@@ -768,7 +768,7 @@ class TestShutdownApi(TestCase):
         """
         On 1G NICs, when the jubmo frame MTU set as X, the software adjust it to (X + 4).
         """
-        if self.nic in ["kawela_4"]:
+        if self.nic in ["IGB_1G-82576_QUAD_COPPER_ET2"]:
             jumbo_size += 4
         self.check_forwarding(pktSize=jumbo_size - 1)
         self.check_forwarding(pktSize=jumbo_size)
@@ -848,9 +848,9 @@ class TestShutdownApi(TestCase):
     def test_change_thresholds(self):
         """
         Change RX/TX thresholds
-        DPDK-24129:1.CVL and FVL not support tx and rx
+        DPDK-24129:1.Intel® Ethernet 700/800 Series not support tx and rx
                    2.Ixgbe not support rx, only support tx.
-                   3.foxville, powerville and springville not support txfree and txrs
+                   3.IGC-I225_LM, IGB_1G-I350_COPPER and IGB_1G-I210_COPPER not support txfree and txrs
         """
         self.pmdout.start_testpmd(
             "Default",
@@ -860,13 +860,18 @@ class TestShutdownApi(TestCase):
         self.dut.send_expect("set promisc all off", "testpmd>")
 
         self.dut.send_expect("port stop all", "testpmd> ", 100)
-        if self.nic in ["sagepond", "sageville", "twinpond", "niantic"]:
+        if self.nic in [
+            "IXGBE_10G-X550EM_X_10G_T",
+            "IXGBE_10G-X550T",
+            "IXGBE_10G-X540T",
+            "IXGBE_10G-82599_SFP",
+        ]:
             self.dut.send_expect("port config all txfreet 32", "testpmd> ")
             self.dut.send_expect("port config all txrst 32", "testpmd> ")
         self.dut.send_expect("port config all rxfreet 32", "testpmd> ")
         self.dut.send_expect("port config all txpt 64", "testpmd> ")
         self.dut.send_expect("port config all txht 64", "testpmd> ")
-        if self.nic in ["foxville"]:
+        if self.nic in ["IGC-I225_LM"]:
             self.dut.send_expect("port config all txwt 16", "testpmd> ")
         else:
             self.dut.send_expect("port config all txwt 0", "testpmd> ")
@@ -876,7 +881,12 @@ class TestShutdownApi(TestCase):
         self.verify(
             "RX free threshold=32" in out, "RX descriptor not reconfigured properly"
         )
-        if self.nic in ["sagepond", "sageville", "twinpond", "niantic"]:
+        if self.nic in [
+            "IXGBE_10G-X550EM_X_10G_T",
+            "IXGBE_10G-X550T",
+            "IXGBE_10G-X540T",
+            "IXGBE_10G-82599_SFP",
+        ]:
             self.verify(
                 "TX free threshold=32" in out, "TX descriptor not reconfigured properly"
             )
@@ -886,7 +896,7 @@ class TestShutdownApi(TestCase):
             )
         self.verify("pthresh=64" in out, "TX descriptor not reconfigured properly")
         self.verify("hthresh=64" in out, "TX descriptor not reconfigured properly")
-        if self.nic in ["foxville"]:
+        if self.nic in ["IGC-I225_LM"]:
             self.verify("wthresh=16" in out, "TX descriptor not reconfigured properly")
         else:
             self.verify("wthresh=0" in out, "TX descriptor not reconfigured properly")
@@ -964,9 +974,9 @@ class TestShutdownApi(TestCase):
         When tx_descriptor_status is used, status can be “FULL”, “DONE” or “UNAVAILABLE.”
         """
         queue_num = 16
-        if self.nic in ["springville", "foxville"]:
+        if self.nic in ["IGB_1G-I210_COPPER", "IGC-I225_LM"]:
             queue_num = 4
-        if self.nic in ["powerville"]:
+        if self.nic in ["IGB_1G-I350_COPPER"]:
             queue_num = 8
         self.pmdout.start_testpmd(
             "Default",
diff --git a/tests/TestSuite_softnic.py b/tests/TestSuite_softnic.py
index 2015b703..a001397d 100644
--- a/tests/TestSuite_softnic.py
+++ b/tests/TestSuite_softnic.py
@@ -218,9 +218,9 @@ class TestSoftnic(TestCase):
                     % (self.eal_param, "nat_firmware.cli"),
                 )
                 if self.nic in [
-                    "columbiaville_100g",
-                    "columbiaville_25g",
-                    "columbiaville_25gx2",
+                    "ICE_100G-E810C_QSFP",
+                    "ICE_25G-E810C_SFP",
+                    "ICE_25G-E810_XXV_SFP",
                 ]:
                     self.dut.send_expect("set fwd mac", "testpmd>")
                 self.dut.send_expect("start", "testpmd>")
diff --git a/tests/TestSuite_sriov_kvm.py b/tests/TestSuite_sriov_kvm.py
index c2ce2259..48d25d9f 100644
--- a/tests/TestSuite_sriov_kvm.py
+++ b/tests/TestSuite_sriov_kvm.py
@@ -558,10 +558,10 @@ class TestSriovKvm(TestCase):
 
     def test_two_vms_enalbe_or_disable_one_uta_mac_on_vf(self):
         self.verify(
-            self.nic.startswith("fortville") == False,
+            self.is_eth_series_nic(700) == False,
             "NIC is [%s], skip this case" % self.nic,
         )
-        if self.nic.startswith("fortville"):
+        if self.is_eth_series_nic(700):
             self.dut.logger.warning("NIC is [%s], skip this case" % self.nic)
             return
 
@@ -617,10 +617,10 @@ class TestSriovKvm(TestCase):
 
     def test_two_vms_add_multi_uta_mac_on_vf(self):
         self.verify(
-            self.nic.startswith("fortville") == False,
+            not self.is_eth_series_nic(700),
             "NIC is [%s], skip this case" % self.nic,
         )
-        if self.nic.startswith("fortville"):
+        if self.is_eth_series_nic(700):
             self.dut.logger.warning("NIC is [%s], skip this case" % self.nic)
             return
 
@@ -657,10 +657,10 @@ class TestSriovKvm(TestCase):
 
     def test_two_vms_add_or_remove_uta_mac_on_vf(self):
         self.verify(
-            self.nic.startswith("fortville") == False,
+            not self.is_eth_series_nic(700),
             "NIC is [%s], skip this case" % self.nic,
         )
-        if self.nic.startswith("fortville"):
+        if self.is_eth_series_nic(700):
             self.dut.logger.warning("NIC is [%s], skip this case" % self.nic)
             return
 
@@ -715,10 +715,10 @@ class TestSriovKvm(TestCase):
 
     def test_two_vms_pause_rx_queues(self):
         self.verify(
-            self.nic.startswith("fortville") == False,
+            not self.is_eth_series_nic(700),
             "NIC is [%s], skip this case" % self.nic,
         )
-        if self.nic.startswith("fortville"):
+        if self.is_eth_series_nic(700):
             self.dut.logger.warning("NIC is [%s], skip this case" % self.nic)
             return
 
@@ -765,10 +765,10 @@ class TestSriovKvm(TestCase):
 
     def test_two_vms_pause_tx_queuse(self):
         self.verify(
-            self.nic.startswith("fortville") == False,
+            not self.is_eth_series_nic(700),
             "NIC is [%s], skip this case" % self.nic,
         )
-        if self.nic.startswith("fortville"):
+        if self.is_eth_series_nic(700):
             self.dut.logger.warning("NIC is [%s], skip this case" % self.nic)
             return
 
@@ -810,10 +810,10 @@ class TestSriovKvm(TestCase):
 
     def test_two_vms_prevent_rx_broadcast_on_vf(self):
         self.verify(
-            self.nic.startswith("fortville") == False,
+            not self.is_eth_series_nic(700),
             "NIC is [%s], skip this case" % self.nic,
         )
-        if self.nic.startswith("fortville"):
+        if self.is_eth_series_nic(700):
             self.dut.logger.warning("NIC is [%s], skip this case" % self.nic)
             return
 
diff --git a/tests/TestSuite_testpmd_perf.py b/tests/TestSuite_testpmd_perf.py
index 6a30fd9e..684a0ba1 100644
--- a/tests/TestSuite_testpmd_perf.py
+++ b/tests/TestSuite_testpmd_perf.py
@@ -47,11 +47,11 @@ class TestPmdPerf(TestCase, PerfTestBase):
     @property
     def supported_nics(self):
         return [
-            "niantic",
-            "fortville_25g",
-            "fortville_spirit",
-            "columbiaville_100g",
-            "columbiaville_25g",
+            "IXGBE_10G-82599_SFP",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_A",
+            "ICE_100G-E810C_QSFP",
+            "ICE_25G-E810C_SFP",
             "ConnectX5_MT4121",
             "ConnectX4_LX_MT4117",
         ]
diff --git a/tests/TestSuite_tso.py b/tests/TestSuite_tso.py
index 47a2df59..2f492741 100644
--- a/tests/TestSuite_tso.py
+++ b/tests/TestSuite_tso.py
@@ -359,10 +359,10 @@ class TestTSO(TestCase):
         )
 
         Nic_list = [
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirit_single",
-            "fortville_25g",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_40G-QSFP_B",
+            "I40E_25G-25G_SFP28",
         ]
         save_file = "/tmp/save.pcap"
         dump_pcap = "/tmp/tcpdump_%s.pcap" % rx_interface
@@ -397,7 +397,9 @@ class TestTSO(TestCase):
             "csum set outer-ip hw %d" % self.dut_ports[0], "testpmd> ", 120
         )
         if self.nic in Nic_list:
-            self.logger.warning("Warning: fvl serise not support outer udp.")
+            self.logger.warning(
+                "Warning: Intel® Ethernet 700 Series not support outer udp."
+            )
         else:
             self.dut.send_expect(
                 "csum set outer-udp hw %d" % self.dut_ports[0], "testpmd> ", 120
@@ -416,7 +418,9 @@ class TestTSO(TestCase):
             "csum set outer-ip hw %d" % self.dut_ports[1], "testpmd> ", 120
         )
         if self.nic in Nic_list:
-            self.logger.warning("Warning: fvl serise not support outer udp.")
+            self.logger.warning(
+                "Warning: Intel® Ethernet 700 Series not support outer udp."
+            )
         else:
             self.dut.send_expect(
                 "csum set outer-udp hw %d" % self.dut_ports[1], "testpmd> ", 120
diff --git a/tests/TestSuite_uni_pkt.py b/tests/TestSuite_uni_pkt.py
index 275b8cac..9274fe7d 100644
--- a/tests/TestSuite_uni_pkt.py
+++ b/tests/TestSuite_uni_pkt.py
@@ -98,16 +98,16 @@ class TestUniPacket(TestCase):
         """
         self.verify(
             (
-                "fortville" in self.nic
-                or "fortpark_TLV" in self.nic
-                or "carlsville" in self.nic
-                or "columbiaville" in self.nic
-                or "fortpark_BASE-T" in self.nic
+                self.is_eth_series_nic(700)
+                or "I40E_10G-SFP_X722" in self.nic
+                or "I40E_10G-10G_BASE_T_BC" in self.nic
+                or self.is_eth_series_nic(800)
+                or "I40E_10G-10G_BASE_T_X722" in self.nic
             ),
-            "L2 packet detect only support by Fortville",
+            "L2 packet detect only support by Intel® Ethernet 700 Series",
         )
         # Change this code start for DPDK-15109, the share code doest not support TIMESYNC, once /supported then will enable
-        if "columbiaville" in self.nic:
+        if self.is_eth_series_nic(800):
             self.L2_types = {
                 "ARP": "L2_ETHER_ARP",
                 "LLDP": "L2_ETHER_LLDP",
@@ -134,25 +134,24 @@ class TestUniPacket(TestCase):
         checked that whether L3 and L4 packet can be normally detected.
         """
         if (
-            "fortville" in self.nic
-            or "fortpark_TLV" in self.nic
-            or "carlsville" in self.nic
-            or "columbiaville" in self.nic
+            self.is_eth_series_nic(700)
+            or "I40E_10G-SFP_X722" in self.nic
+            or "I40E_10G-10G_BASE_T_BC" in self.nic
+            or self.is_eth_series_nic(800)
             or "x722" in self.nic
-            or "fortpark_BASE-T" in self.nic
+            or "I40E_10G-10G_BASE_T_X722" in self.nic
         ):
             outerL4Type = "L4_NONFRAG"
             ipv4_default_packet_type = ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN"]
         elif (
-            "niantic" in self.nic.lower()
-            or "powerville" in self.nic.lower()
-            or "cavium" in self.nic.lower()
-            or "twinpond" in self.nic.lower()
-            or "twinville" in self.nic.lower()
-            or "sageville" in self.nic.lower()
-            or "sagepond" in self.nic.lower()
-            or "springville" in self.nic.lower()
-            or "foxville" in self.nic.lower()
+            "IXGBE_10G-82599_SFP" in self.nic
+            or "IGB_1G-I350_COPPER" in self.nic
+            or "cavium" in self.nic
+            or "IXGBE_10G-X540T" in self.nic
+            or "IXGBE_10G-X550T" in self.nic
+            or "IXGBE_10G-X550EM_X_10G_T" in self.nic
+            or "IGB_1G-I210_COPPER" in self.nic
+            or "IGC-I225_LM" in self.nic
         ):
             outerL4Type = ""
             ipv4_default_packet_type = ["L2_ETHER", "L3_IPV4"]
@@ -169,24 +168,23 @@ class TestUniPacket(TestCase):
 
         # delete the unsupported packet based on nic type
         if (
-            "fortville" in self.nic
-            or "fortpark_TLV" in self.nic
-            or "carlsville" in self.nic
-            or "columbiaville" in self.nic
+            self.is_eth_series_nic(700)
+            or "I40E_10G-SFP_X722" in self.nic
+            or "I40E_10G-10G_BASE_T_BC" in self.nic
+            or self.is_eth_series_nic(800)
             or "x722" in self.nic
-            or "fortpark_BASE-T" in self.nic
+            or "I40E_10G-10G_BASE_T_X722" in self.nic
         ):
             pktType.pop("MAC_IPihl_PKT")
             pktType.pop("MAC_IPihl_SCTP_PKT")
         elif (
-            "niantic" in self.nic.lower()
-            or "powerville" in self.nic.lower()
-            or "cavium" in self.nic.lower()
-            or "twinpond" in self.nic.lower()
-            or "twinville" in self.nic.lower()
-            or "sageville" in self.nic.lower()
-            or "sagepond" in self.nic.lower()
-            or "springville" in self.nic.lower()
+            "IXGBE_10G-82599_SFP" in self.nic
+            or "IGB_1G-I350_COPPER" in self.nic
+            or "cavium" in self.nic
+            or "IXGBE_10G-X540T" in self.nic
+            or "IXGBE_10G-X550T" in self.nic
+            or "IXGBE_10G-X550EM_X_10G_T" in self.nic
+            or "IGB_1G-I210_COPPER" in self.nic
         ):
             pktType.pop("MAC_IP_ICMP_PKT")
             pktType.pop("MAC_IPFRAG_TCP_PKT")
@@ -198,25 +196,24 @@ class TestUniPacket(TestCase):
         checked that whether IPv6 and L4 packet can be normally detected.
         """
         if (
-            "fortville" in self.nic
-            or "fortpark_TLV" in self.nic
-            or "carlsville" in self.nic
-            or "columbiaville" in self.nic
+            self.is_eth_series_nic(700)
+            or "I40E_10G-SFP_X722" in self.nic
+            or "I40E_10G-10G_BASE_T_BC" in self.nic
+            or self.is_eth_series_nic(800)
             or "x722" in self.nic
-            or "fortpark_BASE-T" in self.nic
+            or "I40E_10G-10G_BASE_T_X722" in self.nic
         ):
             outerL4Type = "L4_NONFRAG"
             ipv6_default_packet_type = ["L2_ETHER", "L3_IPV6_EXT_UNKNOWN"]
         elif (
-            "niantic" in self.nic.lower()
-            or "powerville" in self.nic.lower()
-            or "cavium" in self.nic.lower()
-            or "twinpond" in self.nic.lower()
-            or "twinville" in self.nic.lower()
-            or "sageville" in self.nic.lower()
-            or "sagepond" in self.nic.lower()
-            or "springville" in self.nic.lower()
-            or "foxville" in self.nic.lower()
+            "IXGBE_10G-82599_SFP" in self.nic
+            or "IGB_1G-I350_COPPER" in self.nic
+            or "cavium" in self.nic
+            or "IXGBE_10G-X540T" in self.nic
+            or "IXGBE_10G-X550T" in self.nic
+            or "IXGBE_10G-X550EM_X_10G_T" in self.nic
+            or "IGB_1G-I210_COPPER" in self.nic
+            or "IGC-I225_LM" in self.nic
         ):
             outerL4Type = ""
             ipv6_default_packet_type = ["L2_ETHER", "L3_IPV6"]
@@ -231,23 +228,22 @@ class TestUniPacket(TestCase):
 
         # delete the unsupported packet based on nic type
         if (
-            "fortville" in self.nic
-            or "fortpark_TLV" in self.nic
-            or "carlsville" in self.nic
-            or "columbiaville" in self.nic
+            self.is_eth_series_nic(700)
+            or "I40E_10G-SFP_X722" in self.nic
+            or "I40E_10G-10G_BASE_T_BC" in self.nic
+            or self.is_eth_series_nic(800)
             or "x722" in self.nic
-            or "fortpark_BASE-T" in self.nic
+            or "I40E_10G-10G_BASE_T_X722" in self.nic
         ):
             pktType.pop("MAC_IPv6FRAG_PKT_N")
         elif (
-            "niantic" in self.nic.lower()
-            or "powerville" in self.nic.lower()
-            or "cavium" in self.nic.lower()
-            or "twinpond" in self.nic.lower()
-            or "twinville" in self.nic.lower()
-            or "sageville" in self.nic.lower()
-            or "sagepond" in self.nic.lower()
-            or "springville" in self.nic.lower()
+            "IXGBE_10G-82599_SFP" in self.nic
+            or "IGB_1G-I350_COPPER" in self.nic
+            or "cavium" in self.nic
+            or "IXGBE_10G-X540T" in self.nic
+            or "IXGBE_10G-X550T" in self.nic
+            or "IXGBE_10G-X550EM_X_10G_T" in self.nic
+            or "IGB_1G-I210_COPPER" in self.nic
         ):
             pktType.pop("MAC_IPv6FRAG_PKT_F")
 
@@ -256,17 +252,17 @@ class TestUniPacket(TestCase):
     def test_IP_in_IPv4_tunnel(self):
         """
         checked that whether IP in IPv4 tunnel packet can be normally
-        detected by Fortville.
+        detected by Intel® Ethernet 700 Series.
         """
         self.verify(
             (
-                "fortville" in self.nic
-                or "fortpark_TLV" in self.nic
-                or "carlsville" in self.nic
-                or "columbiaville" in self.nic
-                or "fortpark_BASE-T" in self.nic
+                self.is_eth_series_nic(700)
+                or "I40E_10G-SFP_X722" in self.nic
+                or "I40E_10G-10G_BASE_T_BC" in self.nic
+                or self.is_eth_series_nic(800)
+                or "I40E_10G-10G_BASE_T_X722" in self.nic
             ),
-            "IP in IPv4 tunnel packet type detect only support by Fortville",
+            "IP in IPv4 tunnel packet type detect only support by Intel® Ethernet 700 Series",
         )
         ipv4_in_ipv4_packet_type = [
             "L2_ETHER",
@@ -306,18 +302,18 @@ class TestUniPacket(TestCase):
         self.verify(
             self.nic
             in [
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "niantic",
-                "fortville_eagle",
-                "fortville_spirit",
-                "powerville",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "fortville_spirit_single",
-                "carlsville",
-                "foxville",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "IXGBE_10G-82599_SFP",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "IGB_1G-I350_COPPER",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-10G_BASE_T_BC",
+                "IGC-I225_LM",
             ],
             "not support %s" % self.nic,
         )
@@ -363,17 +359,17 @@ class TestUniPacket(TestCase):
     def test_IP_in_IPv6_tunnel(self):
         """
         checked that whether IP in IPv6 tunnel packet can be normally
-        detected by Fortville.
+        detected by Intel® Ethernet 700 Series.
         """
         self.verify(
             (
-                "fortville" in self.nic
-                or "fortpark_TLV" in self.nic
-                or "carlsville" in self.nic
-                or "columbiaville" in self.nic
-                or "fortpark_BASE-T" in self.nic
+                self.is_eth_series_nic(700)
+                or "I40E_10G-SFP_X722" in self.nic
+                or "I40E_10G-10G_BASE_T_BC" in self.nic
+                or self.is_eth_series_nic(800)
+                or "I40E_10G-10G_BASE_T_X722" in self.nic
             ),
-            "IP in IPv6 tunnel packet type detect only support by Fortville",
+            "IP in IPv6 tunnel packet type detect only support by Intel® Ethernet 700 Series",
         )
         ipv4_in_ipv6_packet_type = [
             "L2_ETHER",
@@ -407,17 +403,17 @@ class TestUniPacket(TestCase):
     def test_NVGRE_tunnel(self):
         """
         checked that whether NVGRE tunnel packet can be normally detected
-        by Fortville.
+        by Intel® Ethernet 700 Series.
         """
         self.verify(
             (
-                "fortville" in self.nic
-                or "fortpark_TLV" in self.nic
-                or "carlsville" in self.nic
-                or "columbiaville" in self.nic
-                or "fortpark_BASE-T" in self.nic
+                self.is_eth_series_nic(700)
+                or "I40E_10G-SFP_X722" in self.nic
+                or "I40E_10G-10G_BASE_T_BC" in self.nic
+                or self.is_eth_series_nic(800)
+                or "I40E_10G-10G_BASE_T_X722" in self.nic
             ),
-            "NVGRE tunnel packet type detect only support by Fortville",
+            "NVGRE tunnel packet type detect only support by Intel® Ethernet 700 Series",
         )
         nvgre_base_packet_type = ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN", "TUNNEL_GRENAT"]
         # INNER IPV4 not with vlan
@@ -477,17 +473,17 @@ class TestUniPacket(TestCase):
     def test_NVGRE_in_IPv6_tunnel(self):
         """
         checked that whether NVGRE in IPv6 tunnel packet can be normally
-        detected by Fortville.
+        detected by Intel® Ethernet 700 Series.
         """
         self.verify(
             (
-                "fortville" in self.nic
-                or "fortpark_TLV" in self.nic
-                or "carlsville" in self.nic
-                or "columbiaville" in self.nic
-                or "fortpark_BASE-T" in self.nic
+                self.is_eth_series_nic(700)
+                or "I40E_10G-SFP_X722" in self.nic
+                or "I40E_10G-10G_BASE_T_BC" in self.nic
+                or self.is_eth_series_nic(800)
+                or "I40E_10G-10G_BASE_T_X722" in self.nic
             ),
-            "NVGRE in IPv6 detect only support by Fortville",
+            "NVGRE in IPv6 detect only support by Intel® Ethernet 700 Series",
         )
         nvgre_base_packet_type = ["L2_ETHER", "L3_IPV6_EXT_UNKNOWN", "TUNNEL_GRENAT"]
         # INNER IPV4 not with vlan
@@ -634,17 +630,17 @@ class TestUniPacket(TestCase):
 
     def test_GRE_tunnel(self):
         """
-        checked that whether GRE tunnel packet can be normally detected by Fortville.
+        checked that whether GRE tunnel packet can be normally detected by Intel® Ethernet 700 Series.
         """
         self.verify(
             (
-                "fortville" in self.nic
-                or "fortpark_TLV" in self.nic
-                or "carlsville" in self.nic
-                or "columbiaville" in self.nic
-                or "fortpark_BASE-T" in self.nic
+                self.is_eth_series_nic(700)
+                or "I40E_10G-SFP_X722" in self.nic
+                or "I40E_10G-10G_BASE_T_BC" in self.nic
+                or self.is_eth_series_nic(800)
+                or "I40E_10G-10G_BASE_T_X722" in self.nic
             ),
-            "GRE tunnel packet type detect only support by Fortville",
+            "GRE tunnel packet type detect only support by Intel® Ethernet 700 Series",
         )
         base_packet_type = [" L2_ETHER", " L3_IPV4_EXT_UNKNOWN", "TUNNEL_GRENAT"]
         pktType = {
@@ -666,18 +662,17 @@ class TestUniPacket(TestCase):
 
     def test_Vxlan_tunnel(self):
         """
-        checked that whether Vxlan tunnel packet can be normally detected by
-        Fortville.
+        checked that whether Vxlan tunnel packet can be normally detected by Intel® Ethernet 700 Series.
         """
         self.verify(
             (
-                "fortville" in self.nic
-                or "fortpark_TLV" in self.nic
-                or "carlsville" in self.nic
-                or "columbiaville" in self.nic
-                or "fortpark_BASE-T" in self.nic
+                self.is_eth_series_nic(700)
+                or "I40E_10G-SFP_X722" in self.nic
+                or "I40E_10G-10G_BASE_T_BC" in self.nic
+                or self.is_eth_series_nic(800)
+                or "I40E_10G-10G_BASE_T_X722" in self.nic
             ),
-            "Vxlan tunnel packet type detect only support by Fortville",
+            "Vxlan tunnel packet type detect only support by Intel® Ethernet 700 Series",
         )
 
         self.dut.send_expect("rx_vxlan_port add 4789 0", "testpmd>", 10)
@@ -735,7 +730,7 @@ class TestUniPacket(TestCase):
 
     def test_nsh(self):
         """
-        check if NSH packets can be normally detected by Fortpark and Fortville
+        check if NSH packets can be normally detected by X722 and Intel® Ethernet 700 Series
         """
         self.verify(
             self.kdriver == "i40e",
diff --git a/tests/TestSuite_userspace_ethtool.py b/tests/TestSuite_userspace_ethtool.py
index c1818722..8a056ea2 100755
--- a/tests/TestSuite_userspace_ethtool.py
+++ b/tests/TestSuite_userspace_ethtool.py
@@ -294,10 +294,7 @@ class TestUserspaceEthtool(TestCase):
         # only detect physical link disconnect status
         verify_pass = True
         verify_msg = ""
-        if (
-            self.nic.startswith("fortville") == False
-            and self.nic.startswith("columbiaville") == False
-        ):
+        if not (self.is_eth_series_nic(700) or self.is_eth_series_nic(800)):
             # check link status dump function
             for port in self.ports:
                 tester_port = self.tester.get_local_port(port)
@@ -542,14 +539,18 @@ class TestUserspaceEthtool(TestCase):
         for index in range(len(self.ports)):
             port = self.ports[index]
             ori_rx_pkts, _ = self.strip_portstats(index)
-            # add sleep time for update link status with fortville nic
+            # add sleep time for update link status with Intel® Ethernet 700 Series nic
             time.sleep(10)
             # stop port
             self.dut.send_expect("stop %d" % index, "EthApp>")
-            # about columbiaville_25g(8086:1593),there have a kernel driver link status issue
-            # about Sageville(8086:1563),driver do not write register to set link-down
+            # about ICE_25G-E810C_SFP(8086:1593),there have a kernel driver link status issue
+            # about IXGBE_10G-X550T(8086:1563),driver do not write register to set link-down
             # so skip this step of verify status
-            if self.nic not in ["columbiaville_25g", "sageville", "columbiaville_100g"]:
+            if self.nic not in [
+                "ICE_25G-E810C_SFP",
+                "IXGBE_10G-X550T",
+                "ICE_100G-E810C_QSFP",
+            ]:
                 self.verify(
                     self.ethapp_check_link_status(index, "Down") == True,
                     "Fail to stop port{}".format(index),
@@ -584,11 +585,11 @@ class TestUserspaceEthtool(TestCase):
         mtus = [1519, 2048]
         mtu_threshold = 2022
         offset = 0
-        if self.nic in ["powerville", "springville", "foxville"]:
+        if self.nic in ["IGB_1G-I350_COPPER", "IGB_1G-I210_COPPER", "IGC-I225_LM"]:
             mtu_threshold = 2026
             offset = 4
         # RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + ICE_VLAN_TAG_SIZE * 2
-        if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
+        if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
             offset = 8
         for index in range(len(self.ports)):
             port = self.ports[index]
@@ -598,20 +599,24 @@ class TestUserspaceEthtool(TestCase):
             ori_mtu = self.strip_mtu(intf)
             self.tester.send_expect("ifconfig %s mtu 9000" % (intf), "# ")
             for mtu in mtus:
-                # cvl should stop port before set mtu
-                if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
+                # Intel® Ethernet 800 Series should stop port before set mtu
+                if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
                     self.dut.send_expect("stop %s" % index, "EthApp>")
 
                 # The mtu threshold is 2022,When it is greater than 2022, the open/stop port is required.
                 if mtu > mtu_threshold:
-                    if self.nic in ["powerville", "springville", "foxville"]:
+                    if self.nic in [
+                        "IGB_1G-I350_COPPER",
+                        "IGB_1G-I210_COPPER",
+                        "IGC-I225_LM",
+                    ]:
                         mtu = mtu_threshold
                     self.dut.send_expect("stop %s" % index, "EthApp>")
                     self.dut.send_expect("mtu %d %d" % (index, mtu), "EthApp>")
                     self.dut.send_expect("open %s" % index, "EthApp>")
                 self.dut.send_expect("mtu %d %d" % (index, mtu), "EthApp>")
 
-                if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
+                if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
                     self.dut.send_expect("open %s" % index, "EthApp>")
 
                 time.sleep(5)
diff --git a/tests/TestSuite_veb_switch.py b/tests/TestSuite_veb_switch.py
index 7b91fee3..51f9b53c 100644
--- a/tests/TestSuite_veb_switch.py
+++ b/tests/TestSuite_veb_switch.py
@@ -164,13 +164,13 @@ class TestVEBSwitching(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "carlsville",
-                "columbiaville_100g",
-                "columbiaville_25g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
diff --git a/tests/TestSuite_vf_interrupt_pmd.py b/tests/TestSuite_vf_interrupt_pmd.py
index d0b02b12..2877911d 100644
--- a/tests/TestSuite_vf_interrupt_pmd.py
+++ b/tests/TestSuite_vf_interrupt_pmd.py
@@ -347,13 +347,13 @@ class TestVfInterruptPmd(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
             ],
             "%s nic port not support vf multi-queues interrupt" % str(self.nic),
         )
@@ -392,13 +392,13 @@ class TestVfInterruptPmd(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
             ],
             "%s nic port not support vf multi-queues interrupt" % str(self.nic),
         )
diff --git a/tests/TestSuite_vf_kernel.py b/tests/TestSuite_vf_kernel.py
index b30b60b2..1a1cb24f 100755
--- a/tests/TestSuite_vf_kernel.py
+++ b/tests/TestSuite_vf_kernel.py
@@ -163,7 +163,7 @@ class TestVfKernel(TestCase):
             if self.vm1_dut is None:
                 raise Exception("Set up VM1 ENV failed!")
             else:
-                # fortville: PF not up ,vf will not get interface
+                # Intel® Ethernet 700 Series: PF not up ,vf will not get interface
                 self.verify(
                     self.vm1_dut.ports_info[0]["intf"] != "N/A", "Not interface"
                 )
@@ -484,7 +484,7 @@ class TestVfKernel(TestCase):
 
         # Send packet from tester to VF MAC with not-matching vlan id, check
         # the packet can't be received at the vlan device
-        # fortville nic need add -p parameter to disable promisc mode
+        # Intel® Ethernet 700 Series nic need add -p parameter to disable promisc mode
         wrong_vlan = vlan_ids % 4095 + 1
         self.verify(
             self.verify_vm_tcpdump(
@@ -512,7 +512,7 @@ class TestVfKernel(TestCase):
         self.vm0_dut.send_expect("vconfig rem %s.%s" % (self.vm0_intf1, vlan_ids), "#")
         out = self.vm0_dut.send_expect("ls /proc/net/vlan/ ", "#")
         self.verify("%s.%s" % (self.vm0_intf1, vlan_ids) not in out, "vlan error")
-        # behavior is different between niantic and fortville ,because of kernel
+        # behavior is different between 82599 and 700 Series ,because of kernel
         # driver
         self.verify(
             self.verify_vm_tcpdump(
@@ -665,7 +665,9 @@ class TestVfKernel(TestCase):
         """
         verify Enable/disable promisc mode
         """
-        self.verify(self.nic not in ["niantic"], "%s NIC not support" % self.nic)
+        self.verify(
+            self.nic not in ["IXGBE_10G-82599_SFP"], "%s NIC not support" % self.nic
+        )
         wrong_mac = "01:02:03:04:05:06"
         # Set up kernel VF tcpdump with -p parameter, which means disable promisc
         # Start DPDK PF, enable promisc mode, set rxonly forwarding
@@ -755,7 +757,10 @@ class TestVfKernel(TestCase):
         """
         verify kernel VF each queue can receive packets
         """
-        self.verify(self.nic not in ["niantic"], "%s NIC not support tcpid " % self.nic)
+        self.verify(
+            self.nic not in ["IXGBE_10G-82599_SFP"],
+            "%s NIC not support tcpid " % self.nic,
+        )
 
         # Verify kernel VF RSS using ethtool -"l" (lower case L) <devx> that the
         # default RSS setting is equal to the number of CPUs in the system and
diff --git a/tests/TestSuite_vf_l3fwd.py b/tests/TestSuite_vf_l3fwd.py
index 492349df..a0487cb3 100644
--- a/tests/TestSuite_vf_l3fwd.py
+++ b/tests/TestSuite_vf_l3fwd.py
@@ -282,8 +282,8 @@ class TestVfL3fwd(TestCase):
             eal_param += " -a " + self.sriov_vfs_port[i][0].pci
         port_mask = utils.create_mask(self.dut_ports)
 
-        # for fvl40g, fvl25g, use 2c/2q per VF port for performance test ,
-        # for fvl10g, nnt, use 1c/1q per VF port for performance test
+        # for IIntel® Ethernet 700 Series: XL710, XXV710, use 2c/2q per VF port for performance test ,
+        # for IIntel® Ethernet 700 Series: X710, 82599/500 Series, use 1c/1q per VF port for performance test
         core_list = self.cores[-len(valports) * self.queue :]
         core_mask = utils.create_mask(core_list)
         self.logger.info("Executing Test Using cores: %s" % core_list)
@@ -321,7 +321,7 @@ class TestVfL3fwd(TestCase):
         for idx in self.dut_ports:
             self.verify(
                 self.dut.ports_info[idx]["port"].default_driver != "ice",
-                "Columbiaville do not support generate vfs from igb_uio",
+                "Intel® Ethernet 800 Series do not support generate vfs from igb_uio",
             )
 
         self.set_rxtx_descriptor_2048_and_rebuild_l3fwd()
@@ -335,13 +335,14 @@ class TestVfL3fwd(TestCase):
 
     def test_perf_kernel_pf_dpdk_iavf_perf_host_only(self):
         """
-        Need to change dpdk code to test FVL iavf.
-        CVL iavf testing is same as FVL VF, so use dpdk_pf_dpdk_vf_perf_host_only to test CVL iavf
+        Need to change dpdk code to test Intel® Ethernet 700 Series iavf.
+        Intel® Ethernet 800 Series iavf testing is same as Intel® Ethernet 700 Series VF,
+        so use dpdk_pf_dpdk_vf_perf_host_only to test Intel® Ethernet 800 Series iavf
         """
         for idx in self.dut_ports:
             self.verify(
                 self.dut.ports_info[idx]["port"].default_driver == "i40e",
-                "The case is only designed for Fortville",
+                "The case is only designed for Intel® Ethernet 700 Series",
             )
 
         self.set_rxtx_descriptor_2048_and_rebuild_l3fwd()
diff --git a/tests/TestSuite_vf_macfilter.py b/tests/TestSuite_vf_macfilter.py
index 5351cb68..02cd81db 100644
--- a/tests/TestSuite_vf_macfilter.py
+++ b/tests/TestSuite_vf_macfilter.py
@@ -97,7 +97,12 @@ class TestVfMacFilter(TestCase):
             if driver == "igb_uio":
                 # start testpmd without the two VFs on the host
                 self.host_testpmd = PmdOutput(self.dut)
-                if self.nic in ["niantic", "sageville", "sagepond", "twinpond"]:
+                if self.nic in [
+                    "IXGBE_10G-82599_SFP",
+                    "IXGBE_10G-X550T",
+                    "IXGBE_10G-X550EM_X_10G_T",
+                    "IXGBE_10G-X540T",
+                ]:
                     self.host_testpmd.start_testpmd("1S/9C/1T", "--txq=4 --rxq=4 ")
                 else:
                     self.host_testpmd.start_testpmd("1S/2C/2T")
@@ -236,14 +241,14 @@ class TestVfMacFilter(TestCase):
         What's more, send packets with a wrong MAC address to the VF, check
         the VF will not RX packets.
         """
-        if "niantic" == self.nic:
+        if "IXGBE_10G-82599_SFP" == self.nic:
             self.verify(
-                self.nic.startswith("niantic") == True,
+                self.nic.startswith("IXGBE_10G-82599_SFP") == True,
                 "NIC is [%s], skip this case" % self.nic,
             )
         else:
             self.verify(
-                self.nic.startswith("fortville") == True,
+                self.is_eth_series_nic(700),
                 "NIC is [%s], skip this case" % self.nic,
             )
         self.setup_2pf_2vf_1vm_env(False, driver="igb_uio")
diff --git a/tests/TestSuite_vf_packet_rxtx.py b/tests/TestSuite_vf_packet_rxtx.py
index ea000c83..ab5d5d65 100644
--- a/tests/TestSuite_vf_packet_rxtx.py
+++ b/tests/TestSuite_vf_packet_rxtx.py
@@ -92,7 +92,12 @@ class TestVfPacketRxtx(TestCase):
             if driver == "igb_uio":
                 # start testpmd without the two VFs on the host
                 self.host_testpmd = PmdOutput(self.dut)
-                if self.nic in ["niantic", "sageville", "sagepond", "twinpond"]:
+                if self.nic in [
+                    "IXGBE_10G-82599_SFP",
+                    "IXGBE_10G-X550T",
+                    "IXGBE_10G-X550EM_X_10G_T",
+                    "IXGBE_10G-X540T",
+                ]:
                     self.host_testpmd.start_testpmd("1S/9C/1T", "--txq=4 --rxq=4 ")
                 else:
                     self.host_testpmd.start_testpmd("1S/5C/1T")
@@ -215,7 +220,12 @@ class TestVfPacketRxtx(TestCase):
 
             if driver == "igb_uio":
                 self.host_testpmd = PmdOutput(self.dut)
-                if self.nic in ["niantic", "sageville", "sagepond", "twinpond"]:
+                if self.nic in [
+                    "IXGBE_10G-82599_SFP",
+                    "IXGBE_10G-X550T",
+                    "IXGBE_10G-X550EM_X_10G_T",
+                    "IXGBE_10G-X540T",
+                ]:
                     self.host_testpmd.start_testpmd("1S/9C/1T", "--txq=4 --rxq=4 ")
                 else:
                     self.host_testpmd.start_testpmd("1S/2C/2T")
diff --git a/tests/TestSuite_vf_rss.py b/tests/TestSuite_vf_rss.py
index b8bf65a5..65995df1 100644
--- a/tests/TestSuite_vf_rss.py
+++ b/tests/TestSuite_vf_rss.py
@@ -248,7 +248,7 @@ class TestVfRss(TestCase):
             if (
                 self.kdriver == "i40e"
                 or self.kdriver == "ice"
-                or self.nic in ["sageville", "sagepond"]
+                or self.nic in ["IXGBE_10G-X550T", "IXGBE_10G-X550EM_X_10G_T"]
             ):
                 # compute the hash result of five tuple into the 7 LSBs value.
                 hash_index = int(tmp_reta_line["RSS hash"], 16) % 64
@@ -285,17 +285,17 @@ class TestVfRss(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "sageville",
-                "sagepond",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "IXGBE_10G-X550T",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -425,11 +425,14 @@ class TestVfRss(TestCase):
                 if (
                     self.kdriver == "i40e"
                     or self.kdriver == "ice"
-                    or self.nic in ["sageville", "sagepond"]
+                    or self.nic in ["IXGBE_10G-X550T", "IXGBE_10G-X550EM_X_10G_T"]
                 ):
-                    if self.nic in ["sageville", "sagepond"] and rss_type == "sctp":
+                    if (
+                        self.nic in ["IXGBE_10G-X550T", "IXGBE_10G-X550EM_X_10G_T"]
+                        and rss_type == "sctp"
+                    ):
                         self.logger.info(
-                            "sageville and sagepond do not support rsstype sctp"
+                            "IXGBE_10G-X550T and IXGBE_10G-X550EM_X_10G_T do not support rsstype sctp"
                         )
                         continue
                     for i in range(64):
@@ -488,9 +491,12 @@ class TestVfRss(TestCase):
             for iptype, rsstype in list(iptypes.items()):
                 self.vm_dut_0.send_expect("set verbose 8", "testpmd> ")
                 self.vm_dut_0.send_expect("set fwd rxonly", "testpmd> ")
-                if self.nic in ["sageville", "sagepond"] and rsstype == "sctp":
+                if (
+                    self.nic in ["IXGBE_10G-X550T", "IXGBE_10G-X550EM_X_10G_T"]
+                    and rsstype == "sctp"
+                ):
                     self.logger.info(
-                        "sageville and sagepond do not support rsstype sctp"
+                        "IXGBE_10G-X550T and IXGBE_10G-X550EM_X_10G_T do not support rsstype sctp"
                     )
                     continue
                 out = self.vm_dut_0.send_expect(
diff --git a/tests/TestSuite_vf_single_core_perf.py b/tests/TestSuite_vf_single_core_perf.py
index ef4c54ae..7f611ae7 100644
--- a/tests/TestSuite_vf_single_core_perf.py
+++ b/tests/TestSuite_vf_single_core_perf.py
@@ -274,14 +274,14 @@ class TestVfSingleCorePerf(TestCase):
 
             nb_cores = thread_num
 
-            # fortville has to use 2 queues at least to get the best performance
-            if self.nic in ["fortville_25g", "fortville_spirit"] or thread_num == 2:
+            # Intel® Ethernet 700 Series has to use 2 queues at least to get the best performance
+            if self.nic in ["I40E_25G-25G_SFP28", "I40E_40G-QSFP_A"] or thread_num == 2:
                 param += " --rxq=2 --txq=2"
-            # columbiaville use one queue per port for best performance.
+            # Intel® Ethernet 800 Series use one queue per port for best performance.
             elif self.nic in [
-                "columbiaville_100g",
-                "columbiaville_25g",
-                "columbiaville_25gx2",
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP",
+                "ICE_25G-E810_XXV_SFP",
             ]:
                 param += " --rxq=1 --txq=1"
                 # workaround for that testpmd can't forward packets in io forward mode
diff --git a/tests/TestSuite_vf_vlan.py b/tests/TestSuite_vf_vlan.py
index d4cf29b3..91f065bc 100644
--- a/tests/TestSuite_vf_vlan.py
+++ b/tests/TestSuite_vf_vlan.py
@@ -89,7 +89,7 @@ class TestVfVlan(TestCase):
         self.host_intf0 = self.dut.ports_info[self.used_dut_port_0]["intf"]
         tester_port = self.tester.get_local_port(self.used_dut_port_0)
         self.tester_intf0 = self.tester.get_interface(tester_port)
-        if self.nic.startswith("columbiaville") and self.default_stats:
+        if self.is_eth_series_nic(800) and self.default_stats:
             self.dut.send_expect(
                 "ethtool --set-priv-flags %s %s on" % (self.host_intf0, self.flag), "# "
             )
@@ -106,7 +106,7 @@ class TestVfVlan(TestCase):
 
         self.used_dut_port_1 = self.dut_ports[1]
         self.host_intf1 = self.dut.ports_info[self.used_dut_port_1]["intf"]
-        if self.nic.startswith("columbiaville") and self.default_stats:
+        if self.is_eth_series_nic(800) and self.default_stats:
             self.dut.send_expect(
                 "ethtool --set-priv-flags %s %s on" % (self.host_intf1, self.flag), "# "
             )
@@ -305,7 +305,7 @@ class TestVfVlan(TestCase):
         self.vm0_testpmd.execute_cmd("set verbose 1")
 
         for tx_vlan in tx_vlans:
-            # for fortville ,
+            # for Intel® Ethernet 700 Series ,
             # if you want insert tx_vlan,
             # please enable rx_vlan at the same time
             if self.kdriver == "i40e" or self.kdriver == "ice":
@@ -442,7 +442,7 @@ class TestVfVlan(TestCase):
 
     def tear_down_all(self):
         self.destroy_vm_env()
-        if self.nic.startswith("columbiaville") and self.default_stats:
+        if self.is_eth_series_nic(800) and self.default_stats:
             self.dut.send_expect(
                 "ethtool --set-priv-flags %s %s %s"
                 % (self.host_intf0, self.flag, self.default_stats),
diff --git a/tests/TestSuite_vlan_ethertype_config.py b/tests/TestSuite_vlan_ethertype_config.py
index f0f24182..ce7f1c7b 100644
--- a/tests/TestSuite_vlan_ethertype_config.py
+++ b/tests/TestSuite_vlan_ethertype_config.py
@@ -305,7 +305,7 @@ class TestVlanEthertypeConfig(TestCase):
         self.dut.send_expect("start", "testpmd> ")
 
         # caium_a063 card support only default '0x8100' tpid in rx mode
-        if self.nic in ["cavium_a063", "cavium_a064", "foxville"]:
+        if self.nic in ["cavium_a063", "cavium_a064", "IGC-I225_LM"]:
             tpids = [0x8100]
         else:
             tpids = [0x8100, 0xA100]
@@ -347,10 +347,10 @@ class TestVlanEthertypeConfig(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "carlsville",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-10G_BASE_T_BC",
             ],
             "%s NIC not support QinQ " % self.nic,
         )
diff --git a/tests/TestSuite_vmdq.py b/tests/TestSuite_vmdq.py
index aa02bbcf..ab8869ff 100644
--- a/tests/TestSuite_vmdq.py
+++ b/tests/TestSuite_vmdq.py
@@ -71,12 +71,12 @@ class TestVmdq(TestCase):
         self.core_configs.append({"cores": "1S/4C/1T", "mpps": {}})
 
         # Put different number of pools: in the case of 10G 82599 Nic is 64, in the case
-        # of FVL spirit is 63,in case of FVL eagle is 34.
-        if self.nic in ("niantic", "springfountain"):
+        # of XL710 is 63,in case of X710 is 34.
+        if self.nic in ("IXGBE_10G-82599_SFP", "IXGBE_10G-82599_SFP_SF_QP"):
             self.pools = 64
-        elif self.nic in ("fortville_spirit", "fortville_spirit_single"):
+        elif self.nic in ("I40E_40G-QSFP_A", "I40E_40G-QSFP_B"):
             self.pools = 63
-        elif self.nic in ("fortville_eagle"):
+        elif self.nic in ("I40E_10G-SFP_XL710"):
             self.pools = 34
         else:
             self.pools = 8
diff --git a/tests/TestSuite_vxlan.py b/tests/TestSuite_vxlan.py
index 9b547a99..9bf8b739 100644
--- a/tests/TestSuite_vxlan.py
+++ b/tests/TestSuite_vxlan.py
@@ -290,21 +290,21 @@ class TestVxlan(TestCase):
         """
         vxlan Prerequisites
         """
-        # this feature only enable in FVL now
+        # this feature only enable in Intel® Ethernet 700 Series now
         if self.nic in [
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirit_single",
-            "fortville_25g",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "carlsville",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_40G-QSFP_B",
+            "I40E_25G-25G_SFP28",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "I40E_10G-10G_BASE_T_BC",
         ]:
             self.compile_switch = "CONFIG_RTE_LIBRTE_I40E_INC_VECTOR"
-        elif self.nic in ["sageville", "sagepond"]:
+        elif self.nic in ["IXGBE_10G-X550T", "IXGBE_10G-X550EM_X_10G_T"]:
             self.compile_switch = "CONFIG_RTE_IXGBE_INC_VECTOR"
-        elif self.nic in ["columbiaville_25g", "columbiaville_100g"]:
-            print("CVL support default none VECTOR")
+        elif self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
+            print("Intel® Ethernet 700 Series support default none VECTOR")
         else:
             self.verify(False, "%s not support this vxlan" % self.nic)
         # Based on h/w type, choose how many ports to use
@@ -705,8 +705,8 @@ class TestVxlan(TestCase):
         """
         verify vxlan packet detection
         """
-        if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
-            print("CVL support default none VECTOR")
+        if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
+            print("Intel® Ethernet 700 Series support default none VECTOR")
             src_vec_model = "n"
         self.eal_para = self.dut.create_eal_parameters(
             cores="1S/5C/1T", socket=self.ports_socket
@@ -744,8 +744,8 @@ class TestVxlan(TestCase):
         """
         verify vxlan packet detection with ipv6 header
         """
-        if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
-            print("CVL support default none VECTOR")
+        if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
+            print("Intel® Ethernet 700 Series support default none VECTOR")
             src_vec_model = "n"
 
         self.eal_para = self.dut.create_eal_parameters(
diff --git a/tests/TestSuite_vxlan_gpe_support_in_i40e.py b/tests/TestSuite_vxlan_gpe_support_in_i40e.py
index b5b129a8..e9753c86 100644
--- a/tests/TestSuite_vxlan_gpe_support_in_i40e.py
+++ b/tests/TestSuite_vxlan_gpe_support_in_i40e.py
@@ -132,13 +132,13 @@ class TestVxlanGpeSupportInI40e(TestCase):
         """
         vxlan Prerequisites
         """
-        # this feature only enable in FVL now
+        # this feature only enable in Intel® Ethernet 700 Series now
         if self.nic not in [
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirit_single",
-            "fortville_25g",
-            "carlsville",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_40G-QSFP_B",
+            "I40E_25G-25G_SFP28",
+            "I40E_10G-10G_BASE_T_BC",
         ]:
             self.verify(False, "%s not support this vxlan-gpe" % self.nic)
         # Based on h/w type, choose how many ports to use
diff --git a/tests/flexible_common.py b/tests/flexible_common.py
index 9d032c8e..35d4d38f 100644
--- a/tests/flexible_common.py
+++ b/tests/flexible_common.py
@@ -60,7 +60,7 @@ class FlexibleRxdBase(object):
 
     def __get_port_option(self, flex_opt="", queue_num=None):
         nb_core = 2
-        num = 4 if self.nic == "foxville" or self.__is_iavf else 32
+        num = 4 if self.nic == "IGC-I225_LM" or self.__is_iavf else 32
         queue_num = queue_num if queue_num else num
         # port option
         port_option = ("{queue} " "--portmask=0x1 " "--nb-cores={nb_core}").format(
diff --git a/tests/perf_test_base.py b/tests/perf_test_base.py
index 5f80a9d8..fb4f123a 100644
--- a/tests/perf_test_base.py
+++ b/tests/perf_test_base.py
@@ -58,13 +58,13 @@ from framework.utils import convert_int2ip, convert_ip2int
 
 VF_L3FWD_NIC_SUPPORT = frozenset(
     (
-        "niantic",
-        "fortville_spirit",
-        "fortville_25g",
-        "fortville_eagle",
-        "columbiaville_100g",
-        "columbiaville_25g",
-        "columbiaville_25gx2",
+        "IXGBE_10G-82599_SFP",
+        "I40E_40G-QSFP_A",
+        "I40E_25G-25G_SFP28",
+        "I40E_10G-SFP_XL710",
+        "ICE_100G-E810C_QSFP",
+        "ICE_25G-E810C_SFP",
+        "ICE_25G-E810_XXV_SFP",
     )
 )
 
@@ -367,7 +367,8 @@ class PerfTestBase(object):
             }
         else:
             if self.__bin_type is BIN_TYPE.PMD and self.kdriver == "ice":
-                # testpmd can't use port real mac address to create traffic packet when use CVL nics.
+                # testpmd can't use port real mac address to create traffic
+                # packet when use Intel® Ethernet 800 Series nics.
                 dmacs = [
                     "52:00:00:00:00:00",
                     "52:00:00:00:00:01",
@@ -874,10 +875,10 @@ class PerfTestBase(object):
             }
         )
         suppored_nics = [
-            "niantic",
-            "columbiaville_100g",
-            "columbiaville_25g",
-            "columbiaville_25gx2",
+            "IXGBE_10G-82599_SFP",
+            "ICE_100G-E810C_QSFP",
+            "ICE_25G-E810C_SFP",
+            "ICE_25G-E810_XXV_SFP",
         ]
         if self.__rxtx_queue_size:
             command_line += " --rx-queue-size {rxtx} --tx-queue-size {rxtx}".format(
diff --git a/tests/rte_flow_common.py b/tests/rte_flow_common.py
index 98b07905..45446521 100644
--- a/tests/rte_flow_common.py
+++ b/tests/rte_flow_common.py
@@ -36,7 +36,7 @@ import time
 from framework.packet import Packet
 from framework.utils import GREEN, RED
 
-CVL_TXQ_RXQ_NUMBER = 16
+TXQ_RXQ_NUMBER = 16
 
 # switch filter common functions
 def get_suite_config(test_case):
@@ -502,7 +502,7 @@ def check_mark(out, pkt_num, check_param, stats=True):
                 raise Exception("got wrong output, not match pattern %s" % p.pattern)
             if mark_id is not None:
                 mark_list = set(
-                    int(i, CVL_TXQ_RXQ_NUMBER) for i in fdir_scanner.findall(out)
+                    int(i, TXQ_RXQ_NUMBER) for i in fdir_scanner.findall(out)
                 )
                 verify(
                     all([i == check_param["mark_id"] for i in mark_list]) and mark_list,
@@ -529,12 +529,12 @@ def check_mark(out, pkt_num, check_param, stats=True):
 def verify_directed_by_rss(out, rxq=64, stats=True):
     p = re.compile("RSS\shash=(\w+)\s-\sRSS\squeue=(\w+)")
     pkt_info = p.findall(out)
-    pkt_queue = set([int(i[1], CVL_TXQ_RXQ_NUMBER) for i in pkt_info])
+    pkt_queue = set([int(i[1], TXQ_RXQ_NUMBER) for i in pkt_info])
     if stats:
         verify(
             all(
                 [
-                    int(i[0], CVL_TXQ_RXQ_NUMBER) % rxq == int(i[1], CVL_TXQ_RXQ_NUMBER)
+                    int(i[0], TXQ_RXQ_NUMBER) % rxq == int(i[1], TXQ_RXQ_NUMBER)
                     for i in pkt_info
                 ]
             ),
@@ -544,7 +544,7 @@ def verify_directed_by_rss(out, rxq=64, stats=True):
         verify(
             not any(
                 [
-                    int(i[0], CVL_TXQ_RXQ_NUMBER) % rxq == int(i[1], CVL_TXQ_RXQ_NUMBER)
+                    int(i[0], TXQ_RXQ_NUMBER) % rxq == int(i[1], TXQ_RXQ_NUMBER)
                     for i in pkt_info
                 ]
             ),
@@ -590,14 +590,10 @@ def check_iavf_fdir_queue(out, pkt_num, check_param, stats=True):
                 raise Exception("wrong queue value, expect int or list")
         else:
             if isinstance(queue, int):
-                verify_iavf_fdir_directed_by_rss(
-                    out, rxq=CVL_TXQ_RXQ_NUMBER, stats=True
-                )
+                verify_iavf_fdir_directed_by_rss(out, rxq=TXQ_RXQ_NUMBER, stats=True)
                 print((GREEN("pass: queue id %s not matched" % res_queue)))
             elif isinstance(queue, list):
-                verify_iavf_fdir_directed_by_rss(
-                    out, rxq=CVL_TXQ_RXQ_NUMBER, stats=True
-                )
+                verify_iavf_fdir_directed_by_rss(out, rxq=TXQ_RXQ_NUMBER, stats=True)
                 print((GREEN("pass: queue id %s not matched" % res_queue)))
             else:
                 raise Exception("wrong action value, expect queue_index or queue_group")
@@ -605,13 +601,13 @@ def check_iavf_fdir_queue(out, pkt_num, check_param, stats=True):
         raise Exception("got wrong output, not match pattern %s" % p.pattern)
 
 
-def verify_iavf_fdir_directed_by_rss(out, rxq=CVL_TXQ_RXQ_NUMBER, stats=True):
+def verify_iavf_fdir_directed_by_rss(out, rxq=TXQ_RXQ_NUMBER, stats=True):
     p = re.compile("RSS hash=(0x\w+) - RSS queue=(0x\w+)")
     pkt_info = p.findall(out)
     if stats:
         for i in pkt_info:
             verify(
-                (int(i[0], CVL_TXQ_RXQ_NUMBER) % rxq == int(i[1], CVL_TXQ_RXQ_NUMBER)),
+                (int(i[0], TXQ_RXQ_NUMBER) % rxq == int(i[1], TXQ_RXQ_NUMBER)),
                 "some packets are not directed by RSS",
             )
             print(
@@ -623,7 +619,7 @@ def verify_iavf_fdir_directed_by_rss(out, rxq=CVL_TXQ_RXQ_NUMBER, stats=True):
     else:
         for i in pkt_info:
             verify(
-                (int(i[0], CVL_TXQ_RXQ_NUMBER) % rxq != int(i[1], CVL_TXQ_RXQ_NUMBER)),
+                (int(i[0], TXQ_RXQ_NUMBER) % rxq != int(i[1], TXQ_RXQ_NUMBER)),
                 "some packets are not directed by RSS",
             )
 
@@ -645,7 +641,7 @@ def check_iavf_fdir_passthru(out, pkt_num, check_param, stats=True):
         "fail: got wrong number of passthru packets, expect passthru packet number %s, got %s."
         % (pkt_num, len(pkt_hash)),
     )
-    verify_iavf_fdir_directed_by_rss(out, rxq=CVL_TXQ_RXQ_NUMBER, stats=True)
+    verify_iavf_fdir_directed_by_rss(out, rxq=TXQ_RXQ_NUMBER, stats=True)
 
 
 def check_iavf_fdir_mark(out, pkt_num, check_param, stats=True):
@@ -662,7 +658,7 @@ def check_iavf_fdir_mark(out, pkt_num, check_param, stats=True):
             verify(len(res) == pkt_num, "get wrong number of packet with mark_id")
             if isinstance(check_param.get("mark_id"), list):
                 result = [
-                    int(m, CVL_TXQ_RXQ_NUMBER) in check_param.get("mark_id")
+                    int(m, TXQ_RXQ_NUMBER) in check_param.get("mark_id")
                     for m in mark_list
                 ]
                 verify(
@@ -672,10 +668,7 @@ def check_iavf_fdir_mark(out, pkt_num, check_param, stats=True):
             elif isinstance(check_param.get("mark_id"), int):
                 verify(
                     all(
-                        [
-                            int(i, CVL_TXQ_RXQ_NUMBER) == check_param["mark_id"]
-                            for i in res
-                        ]
+                        [int(i, TXQ_RXQ_NUMBER) == check_param["mark_id"] for i in res]
                     ),
                     "failed: some packet mark id of %s not match" % mark_list,
                 )
@@ -818,7 +811,7 @@ def check_iavf_packets_rss_queue(out, count, rss_match=True):
                 packet_sumnum = packet_sumnum + int(packet_num)
 
     if rss_match:
-        if queue_flag == CVL_TXQ_RXQ_NUMBER and packet_sumnum == count:
+        if queue_flag == TXQ_RXQ_NUMBER and packet_sumnum == count:
             log_msg = "Packets has send to %s queues" % queue_flag
             return True, log_msg
         else:
