diff --git a/tests/TestSuite_crypto_perf_cryptodev_perf.py b/tests/TestSuite_crypto_perf_cryptodev_perf.py
index 91b8048a..0531b9c6 100644
--- a/tests/TestSuite_crypto_perf_cryptodev_perf.py
+++ b/tests/TestSuite_crypto_perf_cryptodev_perf.py
@@ -9,7 +9,7 @@ import tests.cryptodev_common as cc
 from framework.test_case import TestCase
 
 
-class PerfTestsCryptodev(TestCase):
+class TestCryptoPerfCryptodevPerf(TestCase):
     def set_up_all(self):
         self._perf_result = {}
         self._default_crypto_perf_opts = {
diff --git a/tests/TestSuite_dcf_lifecycle.py b/tests/TestSuite_dcf_lifecycle.py
index fd828ef8..3d093b0b 100644
--- a/tests/TestSuite_dcf_lifecycle.py
+++ b/tests/TestSuite_dcf_lifecycle.py
@@ -32,7 +32,7 @@ from framework.settings import HEADER_SIZE
 from framework.test_case import TestCase
 
 
-class TestDcfLifeCycle(TestCase):
+class TestDCFLifeCycle(TestCase):
     @property
     def target_dir(self):
         target_dir = (
diff --git a/tests/TestSuite_ddp_mpls.py b/tests/TestSuite_ddp_mpls.py
index 756d6e8e..378bb161 100644
--- a/tests/TestSuite_ddp_mpls.py
+++ b/tests/TestSuite_ddp_mpls.py
@@ -19,7 +19,7 @@ PF_MAX_QUEUE = 64
 VF_MAX_QUEUE = 4
 
 
-class Testddp_mpls(TestCase):
+class TestDdpMpls(TestCase):
     supported_vf_driver = ["pci-stub", "vfio-pci"]
 
     def set_up_all(self):
diff --git a/tests/TestSuite_dpdk_hugetlbfs_mount_size.py b/tests/TestSuite_dpdk_hugetlbfs_mount_size.py
index 6ab2bdbd..cb961e75 100644
--- a/tests/TestSuite_dpdk_hugetlbfs_mount_size.py
+++ b/tests/TestSuite_dpdk_hugetlbfs_mount_size.py
@@ -42,7 +42,7 @@ MNT_PATH = ["/mnt/huge1", "/mnt/huge2", "/mnt/huge3"]
 vhost_name = ["vhost1", "vhost2", "vhost3"]
 
 
-class DpdkHugetlbfsMountSize(TestCase):
+class TestDPDKHugetlbfsMountSize(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_eeprom_dump.py b/tests/TestSuite_eeprom_dump.py
index 669befcd..ae7d3c89 100644
--- a/tests/TestSuite_eeprom_dump.py
+++ b/tests/TestSuite_eeprom_dump.py
@@ -14,7 +14,7 @@ from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase
 
 
-class TestEEPROMDump(TestCase):
+class TestEepromDump(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_enable_package_download_in_ice_driver.py b/tests/TestSuite_enable_package_download_in_ice_driver.py
index afc667e9..c175891f 100644
--- a/tests/TestSuite_enable_package_download_in_ice_driver.py
+++ b/tests/TestSuite_enable_package_download_in_ice_driver.py
@@ -10,7 +10,7 @@ from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase
 
 
-class TestEnable_Package_Download_In_Ice_Driver(TestCase):
+class TestEnablePackageDownloadInICEDriver(TestCase):
     def set_up_all(self):
         self.verify(
             self.nic
diff --git a/tests/TestSuite_fips_cryptodev.py b/tests/TestSuite_fips_cryptodev.py
index c84a047f..eb8ffc30 100644
--- a/tests/TestSuite_fips_cryptodev.py
+++ b/tests/TestSuite_fips_cryptodev.py
@@ -9,7 +9,7 @@ import tests.cryptodev_common as cc
 from framework.test_case import TestCase
 
 
-class FipCryptodev(TestCase):
+class TestFipsCryptodev(TestCase):
     def set_up_all(self):
         out = self.dut.build_dpdk_apps("./examples/fips_validation")
         self.verify("Error" not in out, "Compilation error")
diff --git a/tests/TestSuite_floating_veb.py b/tests/TestSuite_floating_veb.py
index ab1d0d69..37f73b4c 100644
--- a/tests/TestSuite_floating_veb.py
+++ b/tests/TestSuite_floating_veb.py
@@ -21,7 +21,7 @@ from framework.utils import RED
 from framework.virt_dut import VirtDut
 
 
-class TestFloatingVEBSwitching(TestCase):
+class TestFloatingVeb(TestCase):
     def VEB_get_stats(self, vf0_vf1, portid, rx_tx):
         """
         Get packets number from port statistic
diff --git a/tests/TestSuite_generic_flow_api.py b/tests/TestSuite_generic_flow_api.py
index 1b49cb85..891652c1 100644
--- a/tests/TestSuite_generic_flow_api.py
+++ b/tests/TestSuite_generic_flow_api.py
@@ -46,7 +46,7 @@ SCTP_PROTO = 132
 RESERVED_PROTO = 255
 
 
-class TestGeneric_flow_api(TestCase):
+class TestGenericFlowApi(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_hotplug.py b/tests/TestSuite_hotplug.py
index 5cf0e933..5c08bc43 100644
--- a/tests/TestSuite_hotplug.py
+++ b/tests/TestSuite_hotplug.py
@@ -16,7 +16,7 @@ from framework.packet import Packet
 from framework.test_case import TestCase
 
 
-class TestPortHotPlug(TestCase):
+class TestHotPlug(TestCase):
     """
     This feature supports igb_uio, vfio-pci and vfio-pci:noiommu now and not support freebsd
     """
diff --git a/tests/TestSuite_i40e_rss_input.py b/tests/TestSuite_i40e_rss_input.py
index 67f5b160..178f3c16 100644
--- a/tests/TestSuite_i40e_rss_input.py
+++ b/tests/TestSuite_i40e_rss_input.py
@@ -42,7 +42,7 @@ from framework.test_case import TestCase
 #
 
 
-class TestI40ERssInput(TestCase):
+class TestI40eRSSInput(TestCase):
     #
     #
     # Utility methods and other non-test code.
diff --git a/tests/TestSuite_iavf_fdir_protocol_agnostic_flow.py b/tests/TestSuite_iavf_fdir_protocol_agnostic_flow.py
index 2e6d8a1a..cb49994c 100644
--- a/tests/TestSuite_iavf_fdir_protocol_agnostic_flow.py
+++ b/tests/TestSuite_iavf_fdir_protocol_agnostic_flow.py
@@ -635,7 +635,7 @@ mac_ipv4_udp_gtpu_ul_ipv4_tcp = [
 vf1_mac = "00:11:22:33:44:55"
 
 
-class TestIavfFdirProtocolAgnosticFlow(TestCase):
+class TestIavfFDIRProtocolAgnosticFlow(TestCase):
     """
     E810 enable Protocol agnostic flow offloading
     """
diff --git a/tests/TestSuite_iavf_package_driver_error_handle.py b/tests/TestSuite_iavf_package_driver_error_handle.py
index a3e4e9a9..6afd4cb7 100644
--- a/tests/TestSuite_iavf_package_driver_error_handle.py
+++ b/tests/TestSuite_iavf_package_driver_error_handle.py
@@ -12,7 +12,7 @@ from framework.settings import CONFIG_ROOT_PATH
 from framework.test_case import TestCase
 
 
-class Testiavf_package_and_driver_check(TestCase):
+class TestIavfPackageDriverErrorHandle(TestCase):
     def set_up_all(self):
         self.verify(
             self.nic
diff --git a/tests/TestSuite_iavf_rss_protocol_agnostic_flow.py b/tests/TestSuite_iavf_rss_protocol_agnostic_flow.py
index e8d8d58f..7dab1794 100644
--- a/tests/TestSuite_iavf_rss_protocol_agnostic_flow.py
+++ b/tests/TestSuite_iavf_rss_protocol_agnostic_flow.py
@@ -367,7 +367,7 @@ dPort = 1
 port_topology = {"port_id": dPort, "tport_id": tPort}
 
 
-class TestIavfRssProtocolAgnosticFlow(TestCase):
+class TestIavfRSSProtocolAgnosticFlow(TestCase):
     """
     E810 enable Protocol agnostic flow offloading
     """
diff --git a/tests/TestSuite_ice_advanced_iavf_rss.py b/tests/TestSuite_ice_advanced_iavf_rss.py
index ddbc8cd6..23429a86 100644
--- a/tests/TestSuite_ice_advanced_iavf_rss.py
+++ b/tests/TestSuite_ice_advanced_iavf_rss.py
@@ -6355,7 +6355,7 @@ mac_ipv6_gre_ipv6_udp_symmetric = eval(
 # gre tunnel end
 
 
-class AdvancedIavfRSSTest(TestCase):
+class TestICEAdvancedIavfRSS(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_ice_advanced_iavf_rss_gtpogre.py b/tests/TestSuite_ice_advanced_iavf_rss_gtpogre.py
index dbfda746..582520a8 100644
--- a/tests/TestSuite_ice_advanced_iavf_rss_gtpogre.py
+++ b/tests/TestSuite_ice_advanced_iavf_rss_gtpogre.py
@@ -5685,7 +5685,7 @@ exclusive = [
 ]
 
 
-class TestICEAdvancedIAVFRSSGTPoGRE(TestCase):
+class TestICEAdvancedIavfRSSGTPoGRE(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_ice_advanced_iavf_rss_gtpu.py b/tests/TestSuite_ice_advanced_iavf_rss_gtpu.py
index 5c8e57ec..6bab131e 100644
--- a/tests/TestSuite_ice_advanced_iavf_rss_gtpu.py
+++ b/tests/TestSuite_ice_advanced_iavf_rss_gtpu.py
@@ -8456,7 +8456,7 @@ mac_ipv4_gtpc_symmetric_toeplitz = [mac_ipv4_gtpc_symmetric]
 mac_ipv6_gtpc_symmetric_toeplitz = [mac_ipv6_gtpc_symmetric]
 
 
-class TestICEAdvancedIAVFRSSGTPU(TestCase):
+class TestICEAdvancedIavfRSSGTPU(TestCase):
     supported_nic = [
         "ICE_100G-E810C_QSFP",
         "ICE_25G-E810C_SFP",
diff --git a/tests/TestSuite_ice_advanced_iavf_rss_pppol2tpoudp.py b/tests/TestSuite_ice_advanced_iavf_rss_pppol2tpoudp.py
index 33e3ddb8..ab6f19ff 100644
--- a/tests/TestSuite_ice_advanced_iavf_rss_pppol2tpoudp.py
+++ b/tests/TestSuite_ice_advanced_iavf_rss_pppol2tpoudp.py
@@ -3002,7 +3002,7 @@ vector_case_108 = [
 ]
 
 
-class TestICEAdvancedIAVFRSSPPPoL2TPv2oUDP(TestCase):
+class TestICEAdvancedIavfRSSPPPoL2TPv2oUDP(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py b/tests/TestSuite_ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py
index 90e441d4..a0058987 100644
--- a/tests/TestSuite_ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py
+++ b/tests/TestSuite_ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py
@@ -1609,7 +1609,7 @@ mac_vlan_ipv6_sctp_l3dst_l4dst = {
 mac_vlan_ipv6_sctp_pay = [mac_vlan_ipv6_sctp_vlan, mac_vlan_ipv6_sctp_l3dst_l4dst]
 
 
-class ICE_advance_iavf_rss_vlan_ah_l2tp_pfcp(TestCase):
+class TestICEAdvancedIavfRSSVlanEspAhL2tpPfcp(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_ice_advanced_rss.py b/tests/TestSuite_ice_advanced_rss.py
index 839258bf..9347342a 100644
--- a/tests/TestSuite_ice_advanced_rss.py
+++ b/tests/TestSuite_ice_advanced_rss.py
@@ -6732,7 +6732,7 @@ ipv6_64bit_prefix = [
 ]
 
 
-class ICEAdvancedRSSTest(TestCase):
+class TestICEAdvancedRSS(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_ice_advanced_rss_pppoe.py b/tests/TestSuite_ice_advanced_rss_pppoe.py
index 78a6a734..087f8fd3 100644
--- a/tests/TestSuite_ice_advanced_rss_pppoe.py
+++ b/tests/TestSuite_ice_advanced_rss_pppoe.py
@@ -4921,7 +4921,7 @@ mac_vlan_pppoe_pay = [
 ]
 
 
-class Advanced_rss_pppoe(TestCase):
+class TestICEAdvancedRSSPPPOE(TestCase):
     @skip_unsupported_pkg(["os default", "wireless"])
     def set_up_all(self):
         """
diff --git a/tests/TestSuite_ice_advanced_rss_vlan_esp_ah_l2tp_pfcp.py b/tests/TestSuite_ice_advanced_rss_vlan_esp_ah_l2tp_pfcp.py
index 0a18c4b9..9b1c4a78 100644
--- a/tests/TestSuite_ice_advanced_rss_vlan_esp_ah_l2tp_pfcp.py
+++ b/tests/TestSuite_ice_advanced_rss_vlan_esp_ah_l2tp_pfcp.py
@@ -1344,7 +1344,7 @@ mac_vlan_ipv6_sctp_pay_list = [
 ]
 
 
-class Advanced_rss_vlan_ah_l2tp_pfcp(TestCase):
+class TestICEAdvancedRSSVlanEspAhL2tpPfcp(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_ice_buffer_split.py b/tests/TestSuite_ice_buffer_split.py
index 5b71853c..d8057cf1 100644
--- a/tests/TestSuite_ice_buffer_split.py
+++ b/tests/TestSuite_ice_buffer_split.py
@@ -514,7 +514,7 @@ queue_buffer_split_inner_ipv6_sctp = [
 ]
 
 
-class TestBufferSplit(TestCase):
+class TestICEBufferSplit(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_ice_dcf_acl_filter.py b/tests/TestSuite_ice_dcf_acl_filter.py
index 107358cc..9a906044 100644
--- a/tests/TestSuite_ice_dcf_acl_filter.py
+++ b/tests/TestSuite_ice_dcf_acl_filter.py
@@ -846,7 +846,7 @@ vectors_ipv4_sctp_2ports = [
 ]
 
 
-class ICEDCFACLFilterTest(TestCase):
+class TestICEDCFACLFilter(TestCase):
     def bind_nics_driver(self, ports, driver=""):
         # modprobe vfio driver
         if driver == "vfio-pci":
diff --git a/tests/TestSuite_ice_dcf_data_path.py b/tests/TestSuite_ice_dcf_data_path.py
index 62974e4f..64ee0aa6 100644
--- a/tests/TestSuite_ice_dcf_data_path.py
+++ b/tests/TestSuite_ice_dcf_data_path.py
@@ -10,7 +10,7 @@ from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase
 
 
-class DcfDataPathTest(TestCase):
+class TestICEDCFDataPath(TestCase):
     vf_mac = "D2:6B:4C:EB:1C:26"
     wrong_mac = "68:05:CA:8D:ED:A8"
 
diff --git a/tests/TestSuite_ice_dcf_disable_acl_filter.py b/tests/TestSuite_ice_dcf_disable_acl_filter.py
index 788a273a..7e12ad0e 100644
--- a/tests/TestSuite_ice_dcf_disable_acl_filter.py
+++ b/tests/TestSuite_ice_dcf_disable_acl_filter.py
@@ -70,7 +70,7 @@ subcases = {
 }
 
 
-class ICEDCFACLDisableFilterTest(TestCase):
+class TestICEDCFDisableACLFilter(TestCase):
     supported_nic = [
         "ICE_25G-E810C_SFP",
         "ICE_25G-E810_XXV_SFP",
diff --git a/tests/TestSuite_ice_dcf_dual_vlan.py b/tests/TestSuite_ice_dcf_dual_vlan.py
index fc633364..9fb42df7 100644
--- a/tests/TestSuite_ice_dcf_dual_vlan.py
+++ b/tests/TestSuite_ice_dcf_dual_vlan.py
@@ -402,7 +402,7 @@ tv_mac_qinq_ipv6_tcp = {
 tvs_mac_l4_qinq_dcf_pipeline_mode = [tv_mac_qinq_ipv6_udp, tv_mac_qinq_ipv6_tcp]
 
 
-class TestICEDcfDualVlan(TestCase):
+class TestICEDCFDualVlan(TestCase):
     @check_supported_nic(
         [
             "ICE_25G-E810C_SFP",
diff --git a/tests/TestSuite_ice_dcf_flow_priority.py b/tests/TestSuite_ice_dcf_flow_priority.py
index 3984bb0f..15476d27 100644
--- a/tests/TestSuite_ice_dcf_flow_priority.py
+++ b/tests/TestSuite_ice_dcf_flow_priority.py
@@ -1829,7 +1829,7 @@ tv_mac_vlan_pppoe_ipcp_pay = {
 }
 
 
-class ICEDCFFlowPriorityTest(TestCase):
+class TestICEDCFFlowPriority(TestCase):
     supported_nic = [
         "ICE_100G-E810C_QSFP",
         "ICE_25G-E810C_SFP",
diff --git a/tests/TestSuite_ice_dcf_qos.py b/tests/TestSuite_ice_dcf_qos.py
index 8dfce3f4..bd0317db 100644
--- a/tests/TestSuite_ice_dcf_qos.py
+++ b/tests/TestSuite_ice_dcf_qos.py
@@ -24,7 +24,7 @@ from framework.settings import HEADER_SIZE, NICS, get_nic_name
 from framework.test_case import TestCase
 
 
-class TestICEDcfQos(TestCase):
+class TestICEDCFQos(TestCase):
     def d_con(self, cmd):
         _cmd = [cmd, "# ", 15] if isinstance(cmd, str) else cmd
         return self.dut.send_expect(*_cmd)
diff --git a/tests/TestSuite_ice_dcf_switch_filter.py b/tests/TestSuite_ice_dcf_switch_filter.py
index f9e5cbf3..4c91e6df 100644
--- a/tests/TestSuite_ice_dcf_switch_filter.py
+++ b/tests/TestSuite_ice_dcf_switch_filter.py
@@ -2284,7 +2284,7 @@ tv_mac_ipv4_vxlan_mac_ipv4_tcp = {
 }
 
 
-class ICEDCFSwitchFilterTest(TestCase):
+class TestICEDCFSwitchFilter(TestCase):
     supported_nic = [
         "ICE_100G-E810C_QSFP",
         "ICE_25G-E810C_SFP",
diff --git a/tests/TestSuite_ice_dcf_switch_filter_gtpu.py b/tests/TestSuite_ice_dcf_switch_filter_gtpu.py
index 75024010..d36ea369 100644
--- a/tests/TestSuite_ice_dcf_switch_filter_gtpu.py
+++ b/tests/TestSuite_ice_dcf_switch_filter_gtpu.py
@@ -3535,7 +3535,7 @@ 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 ICEDCFSwitchFilterGTPUTest(TestCase):
+class TestICEDCFSwitchFilterGTPU(TestCase):
     supported_nic = [
         "ICE_100G-E810C_QSFP",
         "ICE_25G-E810C_SFP",
diff --git a/tests/TestSuite_ice_dcf_switch_filter_pppoe.py b/tests/TestSuite_ice_dcf_switch_filter_pppoe.py
index 38b95122..92dc2866 100644
--- a/tests/TestSuite_ice_dcf_switch_filter_pppoe.py
+++ b/tests/TestSuite_ice_dcf_switch_filter_pppoe.py
@@ -791,7 +791,7 @@ tv_mac_vlan_pppoe_ipcp_pay = {
 }
 
 
-class ICEDCFSwitchFilterPPPOETest(TestCase):
+class TestICEDCFSwitchFilterPPPOE(TestCase):
     supported_nic = [
         "ICE_100G-E810C_QSFP",
         "ICE_25G-E810C_SFP",
diff --git a/tests/TestSuite_ice_enable_basic_hqos_on_pf.py b/tests/TestSuite_ice_enable_basic_hqos_on_pf.py
index 9cf60e6e..61f4c239 100644
--- a/tests/TestSuite_ice_enable_basic_hqos_on_pf.py
+++ b/tests/TestSuite_ice_enable_basic_hqos_on_pf.py
@@ -22,7 +22,7 @@ STREAM_UP_CONFIG = [0, 1, 2, 0, 0, 0, 0, 0]
 LINERATE = 100
 
 
-class TestIceEnableBasicHqosOnPF(TestCase):
+class TestICEEnableBasicHqosOnPF(TestCase):
     def set_up_all(self):
         self.dut_ports = self.dut.get_ports()
         # for test topo requirement,need 1 100G port and 1 25G port
diff --git a/tests/TestSuite_ice_fdir.py b/tests/TestSuite_ice_fdir.py
index b0fd8207..fdc47585 100644
--- a/tests/TestSuite_ice_fdir.py
+++ b/tests/TestSuite_ice_fdir.py
@@ -2989,7 +2989,7 @@ vectors_ipv6_next_proto_sctp = [
 ]
 
 
-class TestICEFdir(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
diff --git a/tests/TestSuite_ice_fdir_protocol_agnostic_flow.py b/tests/TestSuite_ice_fdir_protocol_agnostic_flow.py
index df0979ec..9dc35586 100644
--- a/tests/TestSuite_ice_fdir_protocol_agnostic_flow.py
+++ b/tests/TestSuite_ice_fdir_protocol_agnostic_flow.py
@@ -632,7 +632,7 @@ mac_ipv4_udp_gtpu_ul_ipv4_tcp = [
 ]
 
 
-class TestIceFdirProtocolAgnosticFlow(TestCase):
+class TestICEFDIRProtocolAgnosticFlow(TestCase):
     """
     E810 enable Protocol agnostic flow offloading
     """
diff --git a/tests/TestSuite_ice_flow_priority.py b/tests/TestSuite_ice_flow_priority.py
index c3fde9d2..0209c1e9 100644
--- a/tests/TestSuite_ice_flow_priority.py
+++ b/tests/TestSuite_ice_flow_priority.py
@@ -392,7 +392,7 @@ tv_mac_vlan_pppoe_ipcp_pay = {
 }
 
 
-class ICEPFFlowPriorityTest(TestCase):
+class TestICEFlowPriority(TestCase):
     supported_nic = [
         "ICE_100G-E810C_QSFP",
         "ICE_25G-E810C_SFP",
diff --git a/tests/TestSuite_ice_header_split_perf.py b/tests/TestSuite_ice_header_split_perf.py
index e7ce11ca..a3e24ffe 100644
--- a/tests/TestSuite_ice_header_split_perf.py
+++ b/tests/TestSuite_ice_header_split_perf.py
@@ -20,7 +20,7 @@ from framework.test_case import TestCase
 from framework.utils import convert_int2ip, convert_ip2int
 
 
-class TestIceHeaderSplitPerf(TestCase):
+class TestICEHeaderSplitPerf(TestCase):
     #
     # Test cases.
     #
diff --git a/tests/TestSuite_ice_iavf_fdir.py b/tests/TestSuite_ice_iavf_fdir.py
index ba231915..1640fafc 100644
--- a/tests/TestSuite_ice_iavf_fdir.py
+++ b/tests/TestSuite_ice_iavf_fdir.py
@@ -8429,7 +8429,7 @@ vectors_ipv6_gre_ipv6_udp = [
 ]
 
 
-class TestICEIAVFFdir(TestCase):
+class TestICEIavfFDIR(TestCase):
     def rte_flow_process(self, vectors):
         test_results = {}
         for tv in vectors:
diff --git a/tests/TestSuite_ice_iavf_fdir_gtpogre.py b/tests/TestSuite_ice_iavf_fdir_gtpogre.py
index 7893faa5..688953ad 100644
--- a/tests/TestSuite_ice_iavf_fdir_gtpogre.py
+++ b/tests/TestSuite_ice_iavf_fdir_gtpogre.py
@@ -2228,7 +2228,7 @@ tvs_outer_mac_ipv6_gre_ipv6_gtpu_dl = [
 ]
 
 
-class TestICEIavfGTPoGREFDIR(TestCase):
+class TestICEIavfFDIRGTPoGRE(TestCase):
     def set_up_all(self):
         self.ports = self.dut.get_ports(self.nic)
 
diff --git a/tests/TestSuite_ice_iavf_fdir_pppol2tpoudp.py b/tests/TestSuite_ice_iavf_fdir_pppol2tpoudp.py
index 7c1fce62..c53b21d5 100644
--- a/tests/TestSuite_ice_iavf_fdir_pppol2tpoudp.py
+++ b/tests/TestSuite_ice_iavf_fdir_pppol2tpoudp.py
@@ -1899,7 +1899,7 @@ vectors_mac_ipv6_pppol2tpv2_ipv6_tcp = [
 ]
 
 
-class TestICEIAVFFDIRPPPoL2TPv2oUDP(TestCase):
+class TestICEIavfFDIRPPPoL2TPv2oUDP(TestCase):
     def rte_flow_process(self, vectors):
         test_results = {}
         for tv in vectors:
diff --git a/tests/TestSuite_ice_iavf_packet_pacing.py b/tests/TestSuite_ice_iavf_packet_pacing.py
index 46b8e341..400b8e26 100644
--- a/tests/TestSuite_ice_iavf_packet_pacing.py
+++ b/tests/TestSuite_ice_iavf_packet_pacing.py
@@ -16,7 +16,7 @@ from framework.test_case import TestCase
 from framework.utils import GREEN, RED
 
 
-class IAVFPacketPacingTest(TestCase):
+class TestICEIavfPacketPacing(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_ice_iavf_rss_configure.py b/tests/TestSuite_ice_iavf_rss_configure.py
index b227ca54..947a7da1 100644
--- a/tests/TestSuite_ice_iavf_rss_configure.py
+++ b/tests/TestSuite_ice_iavf_rss_configure.py
@@ -230,7 +230,7 @@ tvs_mac_disable_rss = eval(
 tvs_mac_default = tvs_mac_all
 
 
-class IAVFRSSConfigureTest(TestCase):
+class TestICEIavfRSSConfigure(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_ice_iavf_rx_timestamp.py b/tests/TestSuite_ice_iavf_rx_timestamp.py
index dc61da6c..a237a53e 100644
--- a/tests/TestSuite_ice_iavf_rx_timestamp.py
+++ b/tests/TestSuite_ice_iavf_rx_timestamp.py
@@ -67,7 +67,7 @@ command_line_option_with_timestamp = {
 }
 
 
-class IAVFTimestampConfigureTest(TestCase):
+class TestICEIavfRxTimestamp(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_ice_limit_value_test.py b/tests/TestSuite_ice_limit_value_test.py
index 7901a796..419e6ab0 100644
--- a/tests/TestSuite_ice_limit_value_test.py
+++ b/tests/TestSuite_ice_limit_value_test.py
@@ -40,7 +40,7 @@ tv_max_rule_number = {
 }
 
 
-class TestICELimitValue(TestCase):
+class TestICELimitValueTest(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_ice_rss_configure.py b/tests/TestSuite_ice_rss_configure.py
index aa59f07a..fcf1fc57 100644
--- a/tests/TestSuite_ice_rss_configure.py
+++ b/tests/TestSuite_ice_rss_configure.py
@@ -281,7 +281,7 @@ rss_configure_to_default = eval(
 )
 
 
-class RSSConfigureTest(TestCase):
+class TestICERSSConfigure(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_ice_rss_protocol_agnostic_flow.py b/tests/TestSuite_ice_rss_protocol_agnostic_flow.py
index 8295a591..e43a2c3c 100644
--- a/tests/TestSuite_ice_rss_protocol_agnostic_flow.py
+++ b/tests/TestSuite_ice_rss_protocol_agnostic_flow.py
@@ -359,7 +359,7 @@ mac_ipv4_udp_gtpu_dl_ipv4_tcp = {
 }
 
 
-class TestIceRssProtocolAgnosticFlow(TestCase):
+class TestICERSSProtocolAgnosticFlow(TestCase):
     """
     E810 enable Protocol agnostic flow offloading
     """
diff --git a/tests/TestSuite_ice_rx_timestamp.py b/tests/TestSuite_ice_rx_timestamp.py
index 79809988..ea106cda 100644
--- a/tests/TestSuite_ice_rx_timestamp.py
+++ b/tests/TestSuite_ice_rx_timestamp.py
@@ -67,7 +67,7 @@ command_line_option_with_timestamp = {
 }
 
 
-class TimestampConfigureTest(TestCase):
+class TestICERxTimestamp(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_ice_switch_filter.py b/tests/TestSuite_ice_switch_filter.py
index 6a5f2aff..61e1d514 100644
--- a/tests/TestSuite_ice_switch_filter.py
+++ b/tests/TestSuite_ice_switch_filter.py
@@ -4317,7 +4317,7 @@ tvs_L2_mask_non_pipeline_mode = [
 test_results = OrderedDict()
 
 
-class ICESwitchFilterTest(TestCase):
+class TestICESwitchFilter(TestCase):
     def bind_nics_driver(self, ports, driver=""):
         # modprobe vfio driver
         if driver == "vfio-pci":
diff --git a/tests/TestSuite_ice_switch_filter_pppoe.py b/tests/TestSuite_ice_switch_filter_pppoe.py
index 7ddd1e9c..ca5d09fc 100644
--- a/tests/TestSuite_ice_switch_filter_pppoe.py
+++ b/tests/TestSuite_ice_switch_filter_pppoe.py
@@ -2885,7 +2885,7 @@ tvs_mac_vlan_pppoe_ipcp_pay = [
 test_results = OrderedDict()
 
 
-class ICESwitchFilterPPPOETest(TestCase):
+class TestICESwitchFilterPPPOE(TestCase):
     def bind_nics_driver(self, ports, driver=""):
         # modprobe vfio driver
         if driver == "vfio-pci":
diff --git a/tests/TestSuite_ice_vf_support_multicast_address.py b/tests/TestSuite_ice_vf_support_multicast_address.py
index 9915b927..2e5305db 100644
--- a/tests/TestSuite_ice_vf_support_multicast_address.py
+++ b/tests/TestSuite_ice_vf_support_multicast_address.py
@@ -15,7 +15,7 @@ mul_mac_1 = "33:33:00:40:10:01"
 vf0_wrong_mac = "00:11:22:33:44:56"
 
 
-class TestICEVfSupportMulticastAdress(TestCase):
+class TestICEVfSupportMulticastAddress(TestCase):
     def set_up_all(self):
         """
         Prerequisite steps for each test suite.
diff --git a/tests/TestSuite_ip_pipeline.py b/tests/TestSuite_ip_pipeline.py
index c28622cd..352bbd99 100644
--- a/tests/TestSuite_ip_pipeline.py
+++ b/tests/TestSuite_ip_pipeline.py
@@ -15,7 +15,7 @@ from framework.packet import Packet
 from framework.test_case import TestCase, skip_unsupported_host_driver
 
 
-class TestIPPipeline(TestCase):
+class TestIpPipeline(TestCase):
     def write_pcap_file(self, pcap_file, pkts):
         try:
             wrpcap(pcap_file, pkts)
diff --git a/tests/TestSuite_ipsec_gw_cryptodev_func.py b/tests/TestSuite_ipsec_gw_cryptodev_func.py
index d0deacdb..d9f6f626 100644
--- a/tests/TestSuite_ipsec_gw_cryptodev_func.py
+++ b/tests/TestSuite_ipsec_gw_cryptodev_func.py
@@ -13,7 +13,7 @@ from framework.settings import CONFIG_ROOT_PATH
 from framework.test_case import TestCase
 
 
-class TestIPsecGW(TestCase):
+class TestIPsecGwCryptodevFunc(TestCase):
     def set_up_all(self):
         self.core_config = "1S/3C/1T"
         self.number_of_ports = 2
diff --git a/tests/TestSuite_ipv4_reassembly.py b/tests/TestSuite_ipv4_reassembly.py
index 1e9f7f4e..1aa1f3dc 100644
--- a/tests/TestSuite_ipv4_reassembly.py
+++ b/tests/TestSuite_ipv4_reassembly.py
@@ -21,7 +21,7 @@ import framework.utils as utils
 from framework.test_case import TestCase
 
 
-class IpReassemblyTestConfig(object):
+class Ipv4ReassemblyTestConfig(object):
 
     """
     Helper class that encapsulates all the parameters used by the different
@@ -85,7 +85,7 @@ class IpReassemblyTestConfig(object):
 #
 
 
-class TestIpReassembly(TestCase):
+class TestIpv4Reassembly(TestCase):
 
     #
     #
@@ -420,7 +420,7 @@ class TestIpReassembly(TestCase):
         1K maxflows.
         """
 
-        self.test_config = IpReassemblyTestConfig(self)
+        self.test_config = Ipv4ReassemblyTestConfig(self)
 
         self.execute_example_app()
         self.send_n_siff_packets()
@@ -433,7 +433,7 @@ class TestIpReassembly(TestCase):
         Only 1K frames are expected to be forwarded.
         """
 
-        self.test_config = IpReassemblyTestConfig(self, number_of_frames=2048)
+        self.test_config = Ipv4ReassemblyTestConfig(self, number_of_frames=2048)
 
         self.execute_example_app()
         self.send_n_siff_packets()
@@ -445,7 +445,7 @@ class TestIpReassembly(TestCase):
         Sends 4K frames split into 7 fragments each.
         """
 
-        self.test_config = IpReassemblyTestConfig(
+        self.test_config = Ipv4ReassemblyTestConfig(
             self,
             number_of_frames=4096,
             frags_per_frame=7,
@@ -475,7 +475,7 @@ class TestIpReassembly(TestCase):
         sends 1K frames. 1K frames must be forwarded back.
         """
 
-        self.test_config = IpReassemblyTestConfig(
+        self.test_config = Ipv4ReassemblyTestConfig(
             self, number_of_frames=1100, flowttl="3s"
         )
 
@@ -497,7 +497,7 @@ class TestIpReassembly(TestCase):
         timeout sends 1K frames expecting all of them to be forwarded back.
         """
 
-        self.test_config = IpReassemblyTestConfig(self, maxflows=1023, flowttl="5s")
+        self.test_config = Ipv4ReassemblyTestConfig(self, maxflows=1023, flowttl="5s")
 
         self.execute_example_app()
 
@@ -519,7 +519,7 @@ class TestIpReassembly(TestCase):
         Sends 1 frame split in into maximum fragments + 1 fragment, the packet can't be forwarded back.
         """
 
-        self.test_config = IpReassemblyTestConfig(
+        self.test_config = Ipv4ReassemblyTestConfig(
             self,
             number_of_frames=1,
             frags_per_frame=self.default_max_fragments + 1,
@@ -542,7 +542,7 @@ class TestIpReassembly(TestCase):
         be forwarded back.
         """
 
-        self.test_config = IpReassemblyTestConfig(
+        self.test_config = Ipv4ReassemblyTestConfig(
             self, number_of_frames=1, flowttl="3s"
         )
         self.execute_example_app()
@@ -575,7 +575,7 @@ class TestIpReassembly(TestCase):
         Expects all the frames to be forwarded back.
         """
         mtu = 9000
-        self.test_config = IpReassemblyTestConfig(
+        self.test_config = Ipv4ReassemblyTestConfig(
             self, payload_size=mtu - 100, fragment_size=2500
         )
         try:
@@ -594,7 +594,7 @@ class TestIpReassembly(TestCase):
         """
 
         mtu = 9000
-        self.test_config = IpReassemblyTestConfig(
+        self.test_config = Ipv4ReassemblyTestConfig(
             self, payload_size=mtu - 100, fragment_size=2500
         )
         try:
diff --git a/tests/TestSuite_ixgbe_vf_get_extra_queue_information.py b/tests/TestSuite_ixgbe_vf_get_extra_queue_information.py
index cf067d01..2fb9cf73 100644
--- a/tests/TestSuite_ixgbe_vf_get_extra_queue_information.py
+++ b/tests/TestSuite_ixgbe_vf_get_extra_queue_information.py
@@ -20,7 +20,7 @@ from framework.test_case import TestCase
 from framework.virt_common import VM
 
 
-class TestIxgbeVfGetExtraInfo(TestCase):
+class TestIxgbeVfGetExtraQueueInformation(TestCase):
     def get_packet_bytes(self, queue):
         """
         Get rx queue packets and bytes.
diff --git a/tests/TestSuite_l2fwd_cryptodev_func.py b/tests/TestSuite_l2fwd_cryptodev_func.py
index 58e6d8fb..a1f562ab 100644
--- a/tests/TestSuite_l2fwd_cryptodev_func.py
+++ b/tests/TestSuite_l2fwd_cryptodev_func.py
@@ -22,7 +22,7 @@ from framework.packet import Packet
 from framework.test_case import TestCase
 
 
-class TestL2fwdCrypto(TestCase):
+class TestL2fwdCryptodevFunc(TestCase):
     def set_up_all(self):
         self.core_config = "1S/3C/1T"
         self.number_of_ports = 2
diff --git a/tests/TestSuite_l2tp_esp_coverage.py b/tests/TestSuite_l2tp_esp_coverage.py
index 480c2240..7c6142ea 100644
--- a/tests/TestSuite_l2tp_esp_coverage.py
+++ b/tests/TestSuite_l2tp_esp_coverage.py
@@ -108,7 +108,7 @@ tv_MAC_IPV6_NAT_T_ESP_vlan = {
 }
 
 
-class L2tpEspCoverage(TestCase):
+class TestL2tpEspCoverage(TestCase):
     supported_nic = [
         "ICE_100G-E810C_QSFP",
         "ICE_25G-E810C_SFP",
diff --git a/tests/TestSuite_loopback_multi_paths_port_restart.py b/tests/TestSuite_loopback_multi_paths_port_restart.py
index f07634d6..91cc22c1 100644
--- a/tests/TestSuite_loopback_multi_paths_port_restart.py
+++ b/tests/TestSuite_loopback_multi_paths_port_restart.py
@@ -10,7 +10,7 @@ from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase
 
 
-class TestLoopbackPortRestart(TestCase):
+class TestLoopbackMultiPathsPortRestart(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_loopback_virtio_user_server_mode_cbdma.py b/tests/TestSuite_loopback_virtio_user_server_mode_cbdma.py
index 503a71b8..50c7fd86 100644
--- a/tests/TestSuite_loopback_virtio_user_server_mode_cbdma.py
+++ b/tests/TestSuite_loopback_virtio_user_server_mode_cbdma.py
@@ -11,7 +11,7 @@ from tests.virtio_common import basic_common as BC
 from tests.virtio_common import cbdma_common as CC
 
 
-class TestLoopbackVirtioUserServerModeCbama(TestCase):
+class TestLoopbackVirtioUserServerModeCbdma(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_malicious_driver_event_indication.py b/tests/TestSuite_malicious_driver_event_indication.py
index 5863bf40..27c22684 100644
--- a/tests/TestSuite_malicious_driver_event_indication.py
+++ b/tests/TestSuite_malicious_driver_event_indication.py
@@ -18,7 +18,7 @@ from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase
 
 
-class TestSuiteMaliciousDrvEventIndication(TestCase):
+class TestMaliciousDriverEventIndication(TestCase):
     def d_con(self, cmd):
         _cmd = [cmd, "# ", 10] if isinstance(cmd, str) else cmd
         return self.dut.send_expect(*_cmd)
diff --git a/tests/TestSuite_pmd_bonded_8023ad.py b/tests/TestSuite_pmd_bonded_8023ad.py
index 1921a942..f6fefa54 100644
--- a/tests/TestSuite_pmd_bonded_8023ad.py
+++ b/tests/TestSuite_pmd_bonded_8023ad.py
@@ -19,7 +19,7 @@ from .bonding import FRAME_SIZE_64, MODE_LACP
 ######################
 # bonding 802.3ad mode
 ######################
-class TestBonding8023AD(TestCase):
+class TestPmdBonded8023AD(TestCase):
     AGG_MODES = ["bandwidth", "stable", "count"]
     DEDICATED_QUEUES = ["disable", "enable"]
 
diff --git a/tests/TestSuite_pmd_stacked_bonded.py b/tests/TestSuite_pmd_stacked_bonded.py
index 2e47fecc..d80386b0 100644
--- a/tests/TestSuite_pmd_stacked_bonded.py
+++ b/tests/TestSuite_pmd_stacked_bonded.py
@@ -25,7 +25,7 @@ from .bonding import (
 )
 
 
-class TestBondingStacked(TestCase):
+class TestPmdStackedBonded(TestCase):
 
     #
     # On dut, dpdk bonding
diff --git a/tests/TestSuite_pmdrss_hash.py b/tests/TestSuite_pmdrss_hash.py
index 70816e8c..bb1cc9a7 100644
--- a/tests/TestSuite_pmdrss_hash.py
+++ b/tests/TestSuite_pmdrss_hash.py
@@ -43,7 +43,7 @@ from framework.test_case import TestCase
 #
 # Test class.
 #
-class TestPmdrssHash(TestCase):
+class TestPmdRSSHash(TestCase):
     #
     #
     # Utility methods and other non-test code.
diff --git a/tests/TestSuite_pmdrssreta.py b/tests/TestSuite_pmdrssreta.py
index d38cb3e2..503d87bc 100644
--- a/tests/TestSuite_pmdrssreta.py
+++ b/tests/TestSuite_pmdrssreta.py
@@ -24,7 +24,7 @@ from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase
 
 
-class TestPmdrssreta(TestCase):
+class TestPmdRSSReta(TestCase):
     def send_packet(self, itf, tran_type):
         """
         Sends packets.
diff --git a/tests/TestSuite_ptype_mapping.py b/tests/TestSuite_ptype_mapping.py
index bd524416..ef1c21d1 100644
--- a/tests/TestSuite_ptype_mapping.py
+++ b/tests/TestSuite_ptype_mapping.py
@@ -12,7 +12,7 @@ from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase
 
 
-class TestPtype_Mapping(TestCase):
+class TestPtypeMapping(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_pvp_diff_qemu_version.py b/tests/TestSuite_pvp_diff_qemu_version.py
index 6a7830f4..78e7f289 100644
--- a/tests/TestSuite_pvp_diff_qemu_version.py
+++ b/tests/TestSuite_pvp_diff_qemu_version.py
@@ -11,7 +11,7 @@ from framework.test_case import TestCase
 from framework.virt_common import VM
 
 
-class TestVhostPVPDiffQemuVersion(TestCase):
+class TestPVPDiffQemuVersion(TestCase):
     def set_up_all(self):
         # Get and verify the ports
         self.dut_ports = self.dut.get_ports()
diff --git a/tests/TestSuite_pvp_multi_paths_performance.py b/tests/TestSuite_pvp_multi_paths_performance.py
index 6f80cb84..f704f29b 100644
--- a/tests/TestSuite_pvp_multi_paths_performance.py
+++ b/tests/TestSuite_pvp_multi_paths_performance.py
@@ -19,7 +19,7 @@ from framework.settings import UPDATE_EXPECTED, load_global_setting
 from framework.test_case import TestCase
 
 
-class TestPVPMultiPathPerformance(TestCase):
+class TestPVPMultiPathsPerformance(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_pvp_multi_paths_vhost_single_core_performance.py b/tests/TestSuite_pvp_multi_paths_vhost_single_core_performance.py
index c0f56ad2..6d677441 100644
--- a/tests/TestSuite_pvp_multi_paths_vhost_single_core_performance.py
+++ b/tests/TestSuite_pvp_multi_paths_vhost_single_core_performance.py
@@ -20,7 +20,7 @@ from framework.settings import UPDATE_EXPECTED, load_global_setting
 from framework.test_case import TestCase
 
 
-class TestPVPMultiPathVhostPerformance(TestCase):
+class TestPVPMultiPathsVhostSingleCorePerformance(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_pvp_multi_paths_virtio_single_core_performance.py b/tests/TestSuite_pvp_multi_paths_virtio_single_core_performance.py
index f0c53336..fa7940c6 100644
--- a/tests/TestSuite_pvp_multi_paths_virtio_single_core_performance.py
+++ b/tests/TestSuite_pvp_multi_paths_virtio_single_core_performance.py
@@ -20,7 +20,7 @@ from framework.settings import UPDATE_EXPECTED, load_global_setting
 from framework.test_case import TestCase
 
 
-class TestPVPMultiPathVirtioPerformance(TestCase):
+class TestPVPMultiPathsVirtioSingleCorePerformance(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_pvp_qemu_multi_paths_port_restart.py b/tests/TestSuite_pvp_qemu_multi_paths_port_restart.py
index 1d19a1dd..ae9c58c4 100644
--- a/tests/TestSuite_pvp_qemu_multi_paths_port_restart.py
+++ b/tests/TestSuite_pvp_qemu_multi_paths_port_restart.py
@@ -14,7 +14,7 @@ from framework.test_case import TestCase
 from framework.virt_common import VM
 
 
-class TestPVPQemuMultiPathPortRestart(TestCase):
+class TestPVPQemuMultiPathsPortRestart(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_pvp_virtio_bonding.py b/tests/TestSuite_pvp_virtio_bonding.py
index c7115ff0..0ec24d89 100644
--- a/tests/TestSuite_pvp_virtio_bonding.py
+++ b/tests/TestSuite_pvp_virtio_bonding.py
@@ -18,7 +18,7 @@ from framework.test_case import TestCase
 from framework.virt_common import VM
 
 
-class TestPVPVirtIOBonding(TestCase):
+class TestPVPVirtioBonding(TestCase):
     def set_up_all(self):
         # Get and verify the ports
         self.core_config = "1S/5C/1T"
diff --git a/tests/TestSuite_pvp_virtio_user_2M_hugepages.py b/tests/TestSuite_pvp_virtio_user_2M_hugepages.py
index e48e772a..d14cdf58 100644
--- a/tests/TestSuite_pvp_virtio_user_2M_hugepages.py
+++ b/tests/TestSuite_pvp_virtio_user_2M_hugepages.py
@@ -9,7 +9,7 @@ from framework.settings import HEADER_SIZE, UPDATE_EXPECTED, load_global_setting
 from framework.test_case import TestCase
 
 
-class TestPVPVirtioWith2MHugepages(TestCase):
+class TestPVPVirtioUser2MHugepages(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_queue_region.py b/tests/TestSuite_queue_region.py
index 0f521765..4c83980a 100644
--- a/tests/TestSuite_queue_region.py
+++ b/tests/TestSuite_queue_region.py
@@ -21,7 +21,7 @@ from framework.settings import DRIVERS, HEADER_SIZE
 from framework.test_case import TestCase
 
 
-class TestQueue_region(TestCase):
+class TestQueueRegion(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_rss_key_update.py b/tests/TestSuite_rss_key_update.py
index d77c9df1..1509b377 100644
--- a/tests/TestSuite_rss_key_update.py
+++ b/tests/TestSuite_rss_key_update.py
@@ -35,7 +35,7 @@ iptypes = {
 }
 
 
-class TestRssKeyUpdate(TestCase):
+class TestRSSKeyUpdate(TestCase):
     def send_packet(self, itf, tran_type, symmetric):
         """
         Sends packets.
diff --git a/tests/TestSuite_rss_to_rte_flow.py b/tests/TestSuite_rss_to_rte_flow.py
index 36ecc7b9..be86ab01 100644
--- a/tests/TestSuite_rss_to_rte_flow.py
+++ b/tests/TestSuite_rss_to_rte_flow.py
@@ -17,7 +17,7 @@ from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase
 
 
-class TestRSS_to_Rteflow(TestCase):
+class TestRSSToRteflow(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_rte_flow.py b/tests/TestSuite_rte_flow.py
index 8f138be5..c0129ff8 100644
--- a/tests/TestSuite_rte_flow.py
+++ b/tests/TestSuite_rte_flow.py
@@ -17,7 +17,7 @@ from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase
 
 
-class RteFlow(TestCase):
+class TestRteFlow(TestCase):
     #
     #
     # Helper methods and setup methods.
diff --git a/tests/TestSuite_runtime_vf_queue_number.py b/tests/TestSuite_runtime_vf_queue_number.py
index af89ca1f..c195db27 100644
--- a/tests/TestSuite_runtime_vf_queue_number.py
+++ b/tests/TestSuite_runtime_vf_queue_number.py
@@ -19,7 +19,7 @@ RSS_KEY = "6EA6A420D5138E712433B813AE45B3C4BECB2B405F31AD6C331835372D15E2D5E4956
 PACKET_COUNT = 100
 
 
-class TestRuntimeVfQn(TestCase):
+class TestRuntimeVfQueueNumber(TestCase):
     supported_vf_driver = ["pci-stub", "vfio-pci"]
 
     def set_up_all(self):
diff --git a/tests/TestSuite_runtime_vf_queue_number_maxinum.py b/tests/TestSuite_runtime_vf_queue_number_maxinum.py
index 8c8d0ec3..5c50b89a 100644
--- a/tests/TestSuite_runtime_vf_queue_number_maxinum.py
+++ b/tests/TestSuite_runtime_vf_queue_number_maxinum.py
@@ -15,7 +15,7 @@ from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase
 
 
-class TestRuntimeVfQnMaxinum(TestCase):
+class TestRuntimeVfQueueNumberMaxinum(TestCase):
     supported_vf_driver = ["igb_uio", "vfio-pci"]
     rss_key = "6EA6A420D5138E712433B813AE45B3C4BECB2B405F31AD6C331835372D15E2D5E49566EE0ED1962AFA1B7932F3549520FD71C75E"
     max_allow_per_testpmd = 18
diff --git a/tests/TestSuite_rx_timestamp_perf.py b/tests/TestSuite_rx_timestamp_perf.py
index 5507939a..7f515f58 100644
--- a/tests/TestSuite_rx_timestamp_perf.py
+++ b/tests/TestSuite_rx_timestamp_perf.py
@@ -20,7 +20,7 @@ from framework.test_case import TestCase
 from framework.utils import convert_int2ip, convert_ip2int
 
 
-class TestRxTimestamoPerf(TestCase):
+class TestRxTimestampPerf(TestCase):
     #
     # Test cases.
     #
diff --git a/tests/TestSuite_rxtx_offload.py b/tests/TestSuite_rxtx_offload.py
index 351c5168..c4ccc020 100644
--- a/tests/TestSuite_rxtx_offload.py
+++ b/tests/TestSuite_rxtx_offload.py
@@ -51,7 +51,7 @@ offloads = {
 }
 
 
-class TestRxTx_Offload(TestCase):
+class TestRxTxOffload(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_short_live.py b/tests/TestSuite_short_live.py
index 7a7810d5..acb655af 100644
--- a/tests/TestSuite_short_live.py
+++ b/tests/TestSuite_short_live.py
@@ -23,7 +23,7 @@ from framework.test_case import TestCase
 #
 
 
-class TestShortLiveApp(TestCase):
+class TestShortLive(TestCase):
     #
     #
     #
diff --git a/tests/TestSuite_testpmd_perf.py b/tests/TestSuite_testpmd_perf.py
index 4caa647e..05427343 100644
--- a/tests/TestSuite_testpmd_perf.py
+++ b/tests/TestSuite_testpmd_perf.py
@@ -12,7 +12,7 @@ from framework.test_case import TestCase
 from .perf_test_base import BIN_TYPE, IP_TYPE, MATCH_MODE, PerfTestBase
 
 
-class TestPmdPerf(TestCase, PerfTestBase):
+class TestTestpmdPerf(TestCase, PerfTestBase):
 
     #
     # Test cases.
diff --git a/tests/TestSuite_tx_preparation.py b/tests/TestSuite_tx_preparation.py
index 51d02d10..a10b940e 100644
--- a/tests/TestSuite_tx_preparation.py
+++ b/tests/TestSuite_tx_preparation.py
@@ -33,7 +33,7 @@ TSO_value = 1460
 count = 4
 
 
-class TestTX_preparation(TestCase):
+class TestTxPreparation(TestCase):
     #
     # Test cases.
     #
diff --git a/tests/TestSuite_uni_pkt.py b/tests/TestSuite_uni_pkt.py
index f75d89b5..72bfe6dd 100644
--- a/tests/TestSuite_uni_pkt.py
+++ b/tests/TestSuite_uni_pkt.py
@@ -25,7 +25,7 @@ from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase
 
 
-class TestUniPacket(TestCase):
+class TestUniPkt(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_veb_switch.py b/tests/TestSuite_veb_switch.py
index 0a0b96bb..a1bd87e4 100644
--- a/tests/TestSuite_veb_switch.py
+++ b/tests/TestSuite_veb_switch.py
@@ -22,7 +22,7 @@ from framework.utils import RED
 from framework.virt_dut import VirtDut
 
 
-class TestVEBSwitching(TestCase):
+class TestVebSwitch(TestCase):
     def VEB_get_stats(self, vf0_vf1, portid, rx_tx):
         """
         Get packets number from port statistic
diff --git a/tests/TestSuite_vf_pmd_bonded.py b/tests/TestSuite_vf_pmd_bonded.py
index 821eba7b..8cc45380 100644
--- a/tests/TestSuite_vf_pmd_bonded.py
+++ b/tests/TestSuite_vf_pmd_bonded.py
@@ -50,7 +50,7 @@ D_MAC_IP_PORT = []
 LACP_MESSAGE_SIZE = 128
 
 
-class TestVFPmdBonded(TestCase):
+class TestVfPmdBonded(TestCase):
     def get_stats(self, portid, rx_tx):
         """
         Get packets number from port statistic
diff --git a/tests/TestSuite_vf_pmd_bonded_8023ad.py b/tests/TestSuite_vf_pmd_bonded_8023ad.py
index 9939f1a9..74803a7b 100644
--- a/tests/TestSuite_vf_pmd_bonded_8023ad.py
+++ b/tests/TestSuite_vf_pmd_bonded_8023ad.py
@@ -17,7 +17,7 @@ from .bonding import FRAME_SIZE_64, MODE_LACP
 ######################
 # bonding 802.3ad mode
 ######################
-class TestVFPmdBonded8023AD(TestCase):
+class TestVfPmdBonded8023AD(TestCase):
     AGG_MODES = ["bandwidth", "stable", "count"]
     DEDICATED_QUEUES = ["disable", "enable"]
 
diff --git a/tests/TestSuite_vf_pmd_stacked_bonded.py b/tests/TestSuite_vf_pmd_stacked_bonded.py
index 615e9517..dd1bb4c8 100644
--- a/tests/TestSuite_vf_pmd_stacked_bonded.py
+++ b/tests/TestSuite_vf_pmd_stacked_bonded.py
@@ -25,7 +25,7 @@ from .bonding import (
 )
 
 
-class TestVFPmdStackedBonded(TestCase):
+class TestVfPmdStackedBonded(TestCase):
 
     #
     # On dut, dpdk bonding
diff --git a/tests/TestSuite_vf_rss.py b/tests/TestSuite_vf_rss.py
index c06963af..679fb267 100644
--- a/tests/TestSuite_vf_rss.py
+++ b/tests/TestSuite_vf_rss.py
@@ -23,7 +23,7 @@ from framework.test_case import TestCase
 from framework.virt_common import VM
 
 
-class TestVfRss(TestCase):
+class TestVfRSS(TestCase):
 
     supported_vf_driver = ["pci-stub", "vfio-pci"]
 
diff --git a/tests/TestSuite_vf_to_vf_nic_bridge.py b/tests/TestSuite_vf_to_vf_nic_bridge.py
index d13f9cef..f730a974 100644
--- a/tests/TestSuite_vf_to_vf_nic_bridge.py
+++ b/tests/TestSuite_vf_to_vf_nic_bridge.py
@@ -21,7 +21,7 @@ VF_TEMP_MAC = "52:54:12:45:67:1%d"
 SEND_PACKET = 100
 
 
-class TestVF2VFBridge(TestCase):
+class TestVfToVfNicBridge(TestCase):
 
     supported_vf_driver = ["pci-stub", "vfio-pci"]
 
diff --git a/tests/TestSuite_vhost_virtio_user_interrupt.py b/tests/TestSuite_vhost_virtio_user_interrupt.py
index e9ebf7aa..36cb521e 100644
--- a/tests/TestSuite_vhost_virtio_user_interrupt.py
+++ b/tests/TestSuite_vhost_virtio_user_interrupt.py
@@ -14,7 +14,7 @@ import framework.utils as utils
 from framework.test_case import TestCase
 
 
-class TestVirtioUserInterrupt(TestCase):
+class TestVhostVirtioUserInterrupt(TestCase):
     def set_up_all(self):
         """
         run at the start of each test suite.
diff --git a/tests/TestSuite_vhost_virtio_user_interrupt_cbdma.py b/tests/TestSuite_vhost_virtio_user_interrupt_cbdma.py
index c4531a4c..37d6d8a3 100644
--- a/tests/TestSuite_vhost_virtio_user_interrupt_cbdma.py
+++ b/tests/TestSuite_vhost_virtio_user_interrupt_cbdma.py
@@ -18,7 +18,7 @@ from tests.virtio_common import basic_common as BC
 from tests.virtio_common import cbdma_common as CC
 
 
-class TestVirtioUserInterruptCbdma(TestCase):
+class TestVhostVirtioUserInterruptCbdma(TestCase):
     def set_up_all(self):
         """
         run at the start of each test suite.
diff --git a/tests/TestSuite_vhost_virtio_user_interrupt_with_power_monitor.py b/tests/TestSuite_vhost_virtio_user_interrupt_with_power_monitor.py
index 549b6a7b..39588a9b 100644
--- a/tests/TestSuite_vhost_virtio_user_interrupt_with_power_monitor.py
+++ b/tests/TestSuite_vhost_virtio_user_interrupt_with_power_monitor.py
@@ -19,7 +19,7 @@ from framework.settings import HEADER_SIZE, UPDATE_EXPECTED, load_global_setting
 from framework.test_case import TestCase
 
 
-class TestVirtioUserInterruptDsa(TestCase):
+class TestVhostVirtioUserInterruptWithPowerMonitor(TestCase):
     def set_up_all(self):
         """
         run at the start of each test suite.
diff --git a/tests/TestSuite_virtio_event_idx_interrupt.py b/tests/TestSuite_virtio_event_idx_interrupt.py
index bfc44cb4..a8be9a3d 100644
--- a/tests/TestSuite_virtio_event_idx_interrupt.py
+++ b/tests/TestSuite_virtio_event_idx_interrupt.py
@@ -12,7 +12,7 @@ from framework.test_case import TestCase
 from framework.virt_common import VM
 
 
-class TestVirtioIdxInterrupt(TestCase):
+class TestVirtioEventIdxInterrupt(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_virtio_event_idx_interrupt_cbdma.py b/tests/TestSuite_virtio_event_idx_interrupt_cbdma.py
index e6e54081..7be0f776 100644
--- a/tests/TestSuite_virtio_event_idx_interrupt_cbdma.py
+++ b/tests/TestSuite_virtio_event_idx_interrupt_cbdma.py
@@ -14,7 +14,7 @@ from tests.virtio_common import basic_common as BC
 from tests.virtio_common import cbdma_common as CC
 
 
-class TestVirtioIdxInterruptCbdma(TestCase):
+class TestVirtioEventIdxInterruptCbdma(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_virtio_ipsec_cryptodev_func.py b/tests/TestSuite_virtio_ipsec_cryptodev_func.py
index 0a7b1e88..1be953ea 100644
--- a/tests/TestSuite_virtio_ipsec_cryptodev_func.py
+++ b/tests/TestSuite_virtio_ipsec_cryptodev_func.py
@@ -18,7 +18,7 @@ from framework.qemu_kvm import QEMUKvm
 from framework.test_case import TestCase
 
 
-class VirtioCryptodevIpsecTest(TestCase):
+class TestVirtioIpsecCryptodevFunc(TestCase):
     def set_up_all(self):
         self.sample_app = self.dut.apps_name["vhost_crypto"]
         self.user_app = self.dut.apps_name["ipsec-secgw"]
diff --git a/tests/TestSuite_virtio_perf_cryptodev_func.py b/tests/TestSuite_virtio_perf_cryptodev_func.py
index 9b25da05..83bcf813 100644
--- a/tests/TestSuite_virtio_perf_cryptodev_func.py
+++ b/tests/TestSuite_virtio_perf_cryptodev_func.py
@@ -15,7 +15,7 @@ from framework.qemu_kvm import QEMUKvm
 from framework.test_case import TestCase
 
 
-class VirtioCryptodevPerfTest(TestCase):
+class TestVirtioPerfCryptodevFunc(TestCase):
     def set_up_all(self):
         self.sample_app = self.dut.apps_name["vhost_crypto"]
         self.user_app = self.dut.apps_name["test-crypto-perf"]
diff --git a/tests/TestSuite_virtio_unit_cryptodev_func.py b/tests/TestSuite_virtio_unit_cryptodev_func.py
index cd9df373..76bf19b8 100644
--- a/tests/TestSuite_virtio_unit_cryptodev_func.py
+++ b/tests/TestSuite_virtio_unit_cryptodev_func.py
@@ -16,7 +16,7 @@ from framework.qemu_kvm import QEMUKvm
 from framework.test_case import TestCase
 
 
-class VirtioCryptodevUnitTest(TestCase):
+class TestVirtioUnitCryptodevFunc(TestCase):
     def set_up_all(self):
         self.sample_app = self.dut.apps_name["vhost_crypto"]
         self.user_app = self.dut.apps_name["test"]
diff --git a/tests/TestSuite_virtio_user_for_container_networking.py b/tests/TestSuite_virtio_user_for_container_networking.py
index b26a0c1c..38b35acf 100644
--- a/tests/TestSuite_virtio_user_for_container_networking.py
+++ b/tests/TestSuite_virtio_user_for_container_networking.py
@@ -19,7 +19,7 @@ from framework.settings import HEADER_SIZE, UPDATE_EXPECTED, load_global_setting
 from framework.test_case import TestCase
 
 
-class TestVirtioUserForContainer(TestCase):
+class TestVirtioUserForContainerNetworking(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_vm2vm_virtio_pmd_cbdma.py b/tests/TestSuite_vm2vm_virtio_pmd_cbdma.py
index 0507e9ca..53898924 100644
--- a/tests/TestSuite_vm2vm_virtio_pmd_cbdma.py
+++ b/tests/TestSuite_vm2vm_virtio_pmd_cbdma.py
@@ -12,7 +12,7 @@ from framework.virt_common import VM
 from tests.virtio_common import cbdma_common as CC
 
 
-class TestVM2VMVirtioPmdCBDMA(TestCase):
+class TestVM2VMVirtioPmdCbdma(TestCase):
     def set_up_all(self):
         self.dut_ports = self.dut.get_ports()
         self.ports_socket = self.dut.get_numa_id(self.dut_ports[0])
diff --git a/tests/TestSuite_vswitch_sample_cbdma.py b/tests/TestSuite_vswitch_sample_cbdma.py
index d55ce8b2..00880268 100644
--- a/tests/TestSuite_vswitch_sample_cbdma.py
+++ b/tests/TestSuite_vswitch_sample_cbdma.py
@@ -23,7 +23,7 @@ from tests.virtio_common import basic_common as BC
 from tests.virtio_common import cbdma_common as CC
 
 
-class TestVswitchSampleCBDMA(TestCase):
+class TestVswitchSampleCbdma(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_vswitch_sample_dsa.py b/tests/TestSuite_vswitch_sample_dsa.py
index bf1e0f25..76488c82 100644
--- a/tests/TestSuite_vswitch_sample_dsa.py
+++ b/tests/TestSuite_vswitch_sample_dsa.py
@@ -19,7 +19,7 @@ from framework.virt_common import VM
 from .virtio_common import dsa_common as DC
 
 
-class TestVswitchSampleDSA(TestCase):
+class TestVswitchSampleDsa(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
