diff --git a/tests/intel/ia-32/netburst/mobile-intel-pentium-4-m-cpu-2.20ghz.test b/tests/intel/ia-32/netburst/mobile-intel-pentium-4-m-cpu.test
similarity index 100%
rename from tests/intel/ia-32/netburst/mobile-intel-pentium-4-m-cpu-2.20ghz.test
rename to tests/intel/ia-32/netburst/mobile-intel-pentium-4-m-cpu.test
diff --git a/tests/intel/ia-32/p6/genuine-intel-cpu-1300-@-1.66ghz.test b/tests/intel/ia-32/p6/genuine-intel-cpu-1300.test
similarity index 100%
rename from tests/intel/ia-32/p6/genuine-intel-cpu-1300-@-1.66ghz.test
rename to tests/intel/ia-32/p6/genuine-intel-cpu-1300.test
diff --git a/tests/intel/ia-32/p6/genuine-intel-cpu-t2400-@-1.83ghz.test b/tests/intel/ia-32/p6/genuine-intel-cpu-t2400.test
similarity index 100%
rename from tests/intel/ia-32/p6/genuine-intel-cpu-t2400-@-1.83ghz.test
rename to tests/intel/ia-32/p6/genuine-intel-cpu-t2400.test
diff --git a/tests/intel/ia-32/p6/intel-core-duo-cpu-t2600-@-2.16ghz.test b/tests/intel/ia-32/p6/intel-core-duo-cpu-t2600.test
similarity index 100%
rename from tests/intel/ia-32/p6/intel-core-duo-cpu-t2600-@-2.16ghz.test
rename to tests/intel/ia-32/p6/intel-core-duo-cpu-t2600.test
diff --git a/tests/intel/x86-64/core/intel-celeron-cpu-420-@-1.60ghz.test b/tests/intel/x86-64/core/intel-celeron-cpu-420.test
similarity index 100%
rename from tests/intel/x86-64/core/intel-celeron-cpu-420-@-1.60ghz.test
rename to tests/intel/x86-64/core/intel-celeron-cpu-420.test
diff --git a/tests/intel/x86-64/core/intel-celeron-cpu-900-@-2.20ghz.test b/tests/intel/x86-64/core/intel-celeron-cpu-900.test
similarity index 100%
rename from tests/intel/x86-64/core/intel-celeron-cpu-900-@-2.20ghz.test
rename to tests/intel/x86-64/core/intel-celeron-cpu-900.test
diff --git a/tests/intel/x86-64/core/intel-celeron-cpu-e1200-@-1.60ghz.test b/tests/intel/x86-64/core/intel-celeron-cpu-e1200.test
similarity index 100%
rename from tests/intel/x86-64/core/intel-celeron-cpu-e1200-@-1.60ghz.test
rename to tests/intel/x86-64/core/intel-celeron-cpu-e1200.test
diff --git a/tests/intel/x86-64/core/intel-celeron-cpu-e3400-@-2.60ghz.test b/tests/intel/x86-64/core/intel-celeron-cpu-e3400.test
similarity index 100%
rename from tests/intel/x86-64/core/intel-celeron-cpu-e3400-@-2.60ghz.test
rename to tests/intel/x86-64/core/intel-celeron-cpu-e3400.test
diff --git a/tests/intel/x86-64/core/intel-core2-cpu-6420-@-2.13ghz.test b/tests/intel/x86-64/core/intel-core2-cpu-6420.test
similarity index 100%
rename from tests/intel/x86-64/core/intel-core2-cpu-6420-@-2.13ghz.test
rename to tests/intel/x86-64/core/intel-core2-cpu-6420.test
diff --git a/tests/intel/x86-64/core/intel-core2-cpu-t5600-@-1.83ghz.test b/tests/intel/x86-64/core/intel-core2-cpu-t5600.test
similarity index 100%
rename from tests/intel/x86-64/core/intel-core2-cpu-t5600-@-1.83ghz.test
rename to tests/intel/x86-64/core/intel-core2-cpu-t5600.test
diff --git a/tests/intel/x86-64/core/intel-core2-duo-cpu-e4500-@-2.20ghz.test b/tests/intel/x86-64/core/intel-core2-duo-cpu-e4500.test
similarity index 100%
rename from tests/intel/x86-64/core/intel-core2-duo-cpu-e4500-@-2.20ghz.test
rename to tests/intel/x86-64/core/intel-core2-duo-cpu-e4500.test
diff --git a/tests/intel/x86-64/core/intel-core2-duo-cpu-t7500-@-2.20ghz.test b/tests/intel/x86-64/core/intel-core2-duo-cpu-t7500.test
similarity index 100%
rename from tests/intel/x86-64/core/intel-core2-duo-cpu-t7500-@-2.20ghz.test
rename to tests/intel/x86-64/core/intel-core2-duo-cpu-t7500.test
diff --git a/tests/intel/x86-64/core/intel-core2-duo-cpu-t8100-@-2.10ghz.test b/tests/intel/x86-64/core/intel-core2-duo-cpu-t8100.test
similarity index 100%
rename from tests/intel/x86-64/core/intel-core2-duo-cpu-t8100-@-2.10ghz.test
rename to tests/intel/x86-64/core/intel-core2-duo-cpu-t8100.test
diff --git a/tests/intel/x86-64/core/intel-core2-quad-cpu-q6600-@-2.40ghz.test b/tests/intel/x86-64/core/intel-core2-quad-cpu-q6600.test
similarity index 100%
rename from tests/intel/x86-64/core/intel-core2-quad-cpu-q6600-@-2.40ghz.test
rename to tests/intel/x86-64/core/intel-core2-quad-cpu-q6600.test
diff --git a/tests/intel/x86-64/core/intel-core2-quad-cpu-q9300-@2.50ghz.test b/tests/intel/x86-64/core/intel-core2-quad-cpu-q9300.test
similarity index 100%
rename from tests/intel/x86-64/core/intel-core2-quad-cpu-q9300-@2.50ghz.test
rename to tests/intel/x86-64/core/intel-core2-quad-cpu-q9300.test
diff --git a/tests/intel/x86-64/core/intel-core2-quad-cpu-q9450-@-2.66ghz.test b/tests/intel/x86-64/core/intel-core2-quad-cpu-q9450.test
similarity index 100%
rename from tests/intel/x86-64/core/intel-core2-quad-cpu-q9450-@-2.66ghz.test
rename to tests/intel/x86-64/core/intel-core2-quad-cpu-q9450.test
diff --git a/tests/intel/x86-64/core/intel-pentium-dual-cpu-e2160-@-1.80ghz.test b/tests/intel/x86-64/core/intel-pentium-dual-cpu-e2160.test
similarity index 100%
rename from tests/intel/x86-64/core/intel-pentium-dual-cpu-e2160-@-1.80ghz.test
rename to tests/intel/x86-64/core/intel-pentium-dual-cpu-e2160.test
diff --git a/tests/intel/x86-64/core/intel-xeon-cpu-e3110-@-3.00ghz.test b/tests/intel/x86-64/core/intel-xeon-cpu-e3110.test
similarity index 100%
rename from tests/intel/x86-64/core/intel-xeon-cpu-e3110-@-3.00ghz.test
rename to tests/intel/x86-64/core/intel-xeon-cpu-e3110.test
diff --git a/tests/intel/x86-64/core/intel-xeon-cpu-e5335-@-2.00ghz.test b/tests/intel/x86-64/core/intel-xeon-cpu-e5335.test
similarity index 100%
rename from tests/intel/x86-64/core/intel-xeon-cpu-e5335-@-2.00ghz.test
rename to tests/intel/x86-64/core/intel-xeon-cpu-e5335.test
diff --git a/tests/intel/x86-64/core/intel-xeon-cpu-e5420-@-2.50ghz.test b/tests/intel/x86-64/core/intel-xeon-cpu-e5420.test
similarity index 100%
rename from tests/intel/x86-64/core/intel-xeon-cpu-e5420-@-2.50ghz.test
rename to tests/intel/x86-64/core/intel-xeon-cpu-e5420.test
diff --git a/tests/intel/x86-64/core/pentium-dual-core-cpu-e5200-@-2.50ghz.test b/tests/intel/x86-64/core/pentium-dual-core-cpu-e5200.test
similarity index 100%
rename from tests/intel/x86-64/core/pentium-dual-core-cpu-e5200-@-2.50ghz.test
rename to tests/intel/x86-64/core/pentium-dual-core-cpu-e5200.test
diff --git a/tests/intel/x86-64/core/pentium-dual-core-cpu-t4500-@-2.30ghz.test b/tests/intel/x86-64/core/pentium-dual-core-cpu-t4500.test
similarity index 100%
rename from tests/intel/x86-64/core/pentium-dual-core-cpu-t4500-@-2.30ghz.test
rename to tests/intel/x86-64/core/pentium-dual-core-cpu-t4500.test
diff --git a/tests/intel/x86-64/cypress-cove/11th-gen-intel-core-i7-11700k-@-3.60ghz.test b/tests/intel/x86-64/cypress-cove/11th-gen-intel-core-i7-11700k.test
similarity index 100%
rename from tests/intel/x86-64/cypress-cove/11th-gen-intel-core-i7-11700k-@-3.60ghz.test
rename to tests/intel/x86-64/cypress-cove/11th-gen-intel-core-i7-11700k.test
diff --git a/tests/intel/x86-64/cypress-cove/11th-gen-intel-core-i7-11700kf-@-3.60ghz.test b/tests/intel/x86-64/cypress-cove/11th-gen-intel-core-i7-11700kf.test
similarity index 100%
rename from tests/intel/x86-64/cypress-cove/11th-gen-intel-core-i7-11700kf-@-3.60ghz.test
rename to tests/intel/x86-64/cypress-cove/11th-gen-intel-core-i7-11700kf.test
diff --git a/tests/intel/x86-64/cypress-cove/11th-gen-intel-core-i9-11900k-@-3.50ghz.test b/tests/intel/x86-64/cypress-cove/11th-gen-intel-core-i9-11900k.test
similarity index 100%
rename from tests/intel/x86-64/cypress-cove/11th-gen-intel-core-i9-11900k-@-3.50ghz.test
rename to tests/intel/x86-64/cypress-cove/11th-gen-intel-core-i9-11900k.test
diff --git a/tests/intel/x86-64/cypress-cove/intel-xeon-e-2356g-cpu-@-3.20ghz.test b/tests/intel/x86-64/cypress-cove/intel-xeon-e-2356g-cpu.test
similarity index 100%
rename from tests/intel/x86-64/cypress-cove/intel-xeon-e-2356g-cpu-@-3.20ghz.test
rename to tests/intel/x86-64/cypress-cove/intel-xeon-e-2356g-cpu.test
diff --git a/tests/intel/x86-64/haswell/intel-core-i3-4130-cpu-@-3.40ghz.test b/tests/intel/x86-64/haswell/intel-core-i3-4130-cpu.test
similarity index 100%
rename from tests/intel/x86-64/haswell/intel-core-i3-4130-cpu-@-3.40ghz.test
rename to tests/intel/x86-64/haswell/intel-core-i3-4130-cpu.test
diff --git a/tests/intel/x86-64/haswell/intel-core-i5-4258u-cpu-@-2.40ghz.test b/tests/intel/x86-64/haswell/intel-core-i5-4258u-cpu.test
similarity index 100%
rename from tests/intel/x86-64/haswell/intel-core-i5-4258u-cpu-@-2.40ghz.test
rename to tests/intel/x86-64/haswell/intel-core-i5-4258u-cpu.test
diff --git a/tests/intel/x86-64/haswell/intel-core-i7-4710mq-cpu-@-2.50ghz.test b/tests/intel/x86-64/haswell/intel-core-i7-4710mq-cpu.test
similarity index 100%
rename from tests/intel/x86-64/haswell/intel-core-i7-4710mq-cpu-@-2.50ghz.test
rename to tests/intel/x86-64/haswell/intel-core-i7-4710mq-cpu.test
diff --git a/tests/intel/x86-64/haswell/intel-core-i7-4750hq-cpu-@-2.00ghz.test b/tests/intel/x86-64/haswell/intel-core-i7-4750hq-cpu.test
similarity index 100%
rename from tests/intel/x86-64/haswell/intel-core-i7-4750hq-cpu-@-2.00ghz.test
rename to tests/intel/x86-64/haswell/intel-core-i7-4750hq-cpu.test
diff --git a/tests/intel/x86-64/haswell/intel-core-i7-6950x-cpu-@-3.00ghz.test b/tests/intel/x86-64/haswell/intel-core-i7-6950x-cpu.test
similarity index 100%
rename from tests/intel/x86-64/haswell/intel-core-i7-6950x-cpu-@-3.00ghz.test
rename to tests/intel/x86-64/haswell/intel-core-i7-6950x-cpu.test
diff --git a/tests/intel/x86-64/nehalem/intel-core-i5-cpu-750-@-2.67ghz.test b/tests/intel/x86-64/nehalem/intel-core-i5-cpu-750.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/intel-core-i5-cpu-750-@-2.67ghz.test
rename to tests/intel/x86-64/nehalem/intel-core-i5-cpu-750.test
diff --git a/tests/intel/x86-64/nehalem/intel-core-i5-cpu-m-520-@-2.40ghz.test b/tests/intel/x86-64/nehalem/intel-core-i5-cpu-m-520.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/intel-core-i5-cpu-m-520-@-2.40ghz.test
rename to tests/intel/x86-64/nehalem/intel-core-i5-cpu-m-520.test
diff --git a/tests/intel/x86-64/nehalem/intel-core-i7-cpu-860-@-2.80ghz.test b/tests/intel/x86-64/nehalem/intel-core-i7-cpu-860.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/intel-core-i7-cpu-860-@-2.80ghz.test
rename to tests/intel/x86-64/nehalem/intel-core-i7-cpu-860.test
diff --git a/tests/intel/x86-64/nehalem/intel-core-i7-cpu-920-@-2.67ghz.test b/tests/intel/x86-64/nehalem/intel-core-i7-cpu-920.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/intel-core-i7-cpu-920-@-2.67ghz.test
rename to tests/intel/x86-64/nehalem/intel-core-i7-cpu-920.test
diff --git a/tests/intel/x86-64/nehalem/intel-core-i7-cpu-m-640-@-2.80ghz.test b/tests/intel/x86-64/nehalem/intel-core-i7-cpu-m-640.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/intel-core-i7-cpu-m-640-@-2.80ghz.test
rename to tests/intel/x86-64/nehalem/intel-core-i7-cpu-m-640.test
diff --git a/tests/intel/x86-64/nehalem/intel-core-i7-cpu-x-980-@-3.33ghz.test b/tests/intel/x86-64/nehalem/intel-core-i7-cpu-x-980.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/intel-core-i7-cpu-x-980-@-3.33ghz.test
rename to tests/intel/x86-64/nehalem/intel-core-i7-cpu-x-980.test
diff --git a/tests/intel/x86-64/nehalem/intel-pentium-cpu-p6100-@-2.00ghz.test b/tests/intel/x86-64/nehalem/intel-pentium-cpu-p6100.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/intel-pentium-cpu-p6100-@-2.00ghz.test
rename to tests/intel/x86-64/nehalem/intel-pentium-cpu-p6100.test
diff --git a/tests/intel/x86-64/nehalem/intel-xeon-cpu-e5520-@-2.27ghz.test b/tests/intel/x86-64/nehalem/intel-xeon-cpu-e5520.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/intel-xeon-cpu-e5520-@-2.27ghz.test
rename to tests/intel/x86-64/nehalem/intel-xeon-cpu-e5520.test
diff --git a/tests/intel/x86-64/nehalem/intel-xeon-cpu-w3520-@-2.67ghz.test b/tests/intel/x86-64/nehalem/intel-xeon-cpu-w3520.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/intel-xeon-cpu-w3520-@-2.67ghz.test
rename to tests/intel/x86-64/nehalem/intel-xeon-cpu-w3520.test
diff --git a/tests/intel/x86-64/nehalem/intel-xeon-cpu-x5650-@-2.67ghz.test b/tests/intel/x86-64/nehalem/intel-xeon-cpu-x5650.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/intel-xeon-cpu-x5650-@-2.67ghz.test
rename to tests/intel/x86-64/nehalem/intel-xeon-cpu-x5650.test
diff --git a/tests/intel/x86-64/sandy-bridge/intel-celeron-cpu-g540-@-2.50ghz.test b/tests/intel/x86-64/sandy-bridge/intel-celeron-cpu-g540.test
similarity index 100%
rename from tests/intel/x86-64/sandy-bridge/intel-celeron-cpu-g540-@-2.50ghz.test
rename to tests/intel/x86-64/sandy-bridge/intel-celeron-cpu-g540.test
diff --git a/tests/intel/x86-64/sandy-bridge/intel-core-i3-3220t-cpu-@-2.80ghz.test b/tests/intel/x86-64/sandy-bridge/intel-core-i3-3220t-cpu.test
similarity index 100%
rename from tests/intel/x86-64/sandy-bridge/intel-core-i3-3220t-cpu-@-2.80ghz.test
rename to tests/intel/x86-64/sandy-bridge/intel-core-i3-3220t-cpu.test
diff --git a/tests/intel/x86-64/sandy-bridge/intel-core-i5-3570k-cpu-@-3.40ghz.test b/tests/intel/x86-64/sandy-bridge/intel-core-i5-3570k-cpu.test
similarity index 100%
rename from tests/intel/x86-64/sandy-bridge/intel-core-i5-3570k-cpu-@-3.40ghz.test
rename to tests/intel/x86-64/sandy-bridge/intel-core-i5-3570k-cpu.test
diff --git a/tests/intel/x86-64/sandy-bridge/intel-core-i7-2600k-cpu-@-3.40ghz.test b/tests/intel/x86-64/sandy-bridge/intel-core-i7-2600k-cpu.test
similarity index 100%
rename from tests/intel/x86-64/sandy-bridge/intel-core-i7-2600k-cpu-@-3.40ghz.test
rename to tests/intel/x86-64/sandy-bridge/intel-core-i7-2600k-cpu.test
diff --git a/tests/intel/x86-64/sandy-bridge/intel-core-i7-3930k-cpu-@-3.20ghz.test b/tests/intel/x86-64/sandy-bridge/intel-core-i7-3930k-cpu.test
similarity index 100%
rename from tests/intel/x86-64/sandy-bridge/intel-core-i7-3930k-cpu-@-3.20ghz.test
rename to tests/intel/x86-64/sandy-bridge/intel-core-i7-3930k-cpu.test
diff --git a/tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e31275-@-3.40ghz.test b/tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e31275.test
similarity index 100%
rename from tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e31275-@-3.40ghz.test
rename to tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e31275.test
diff --git a/tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e5-2687w-0-@-3.10ghz.test b/tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e5-2687w-0.test
similarity index 100%
rename from tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e5-2687w-0-@-3.10ghz.test
rename to tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e5-2687w-0.test
diff --git a/tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e5-2697-v2-@-2.70ghz.test b/tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e5-2697-v2.test
similarity index 100%
rename from tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e5-2697-v2-@-2.70ghz.test
rename to tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e5-2697-v2.test
diff --git a/tests/intel/x86-64/skylake/intel-cc150-cpu-@-3.50ghz.test b/tests/intel/x86-64/skylake/intel-cc150-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-cc150-cpu-@-3.50ghz.test
rename to tests/intel/x86-64/skylake/intel-cc150-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i3-10110u-cpu-@-2.10ghz.test b/tests/intel/x86-64/skylake/intel-core-i3-10110u-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i3-10110u-cpu-@-2.10ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i3-10110u-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i3-7100-cpu-@-3.90ghz.test b/tests/intel/x86-64/skylake/intel-core-i3-7100-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i3-7100-cpu-@-3.90ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i3-7100-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i3-8121u-cpu-@-2.20ghz.test b/tests/intel/x86-64/skylake/intel-core-i3-8121u-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i3-8121u-cpu-@-2.20ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i3-8121u-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i3-8350k-cpu-@-4.00ghz.test b/tests/intel/x86-64/skylake/intel-core-i3-8350k-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i3-8350k-cpu-@-4.00ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i3-8350k-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i5-10210u-cpu-@-1.60ghz.test b/tests/intel/x86-64/skylake/intel-core-i5-10210u-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i5-10210u-cpu-@-1.60ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i5-10210u-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i5-10600k-cpu-@-4.10ghz.test b/tests/intel/x86-64/skylake/intel-core-i5-10600k-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i5-10600k-cpu-@-4.10ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i5-10600k-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i5-6600k-cpu-@-3.50ghz.test b/tests/intel/x86-64/skylake/intel-core-i5-6600k-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i5-6600k-cpu-@-3.50ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i5-6600k-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i5-7200u-cpu-@-2.50ghz.test b/tests/intel/x86-64/skylake/intel-core-i5-7200u-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i5-7200u-cpu-@-2.50ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i5-7200u-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i5-7600k-cpu-@-3.80ghz.test b/tests/intel/x86-64/skylake/intel-core-i5-7600k-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i5-7600k-cpu-@-3.80ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i5-7600k-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i5-8265u-cpu-@-1.60ghz.test b/tests/intel/x86-64/skylake/intel-core-i5-8265u-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i5-8265u-cpu-@-1.60ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i5-8265u-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i5-8350u-cpu-@-1.70ghz.test b/tests/intel/x86-64/skylake/intel-core-i5-8350u-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i5-8350u-cpu-@-1.70ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i5-8350u-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i5-9600k-cpu-@-3.70ghz.test b/tests/intel/x86-64/skylake/intel-core-i5-9600k-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i5-9600k-cpu-@-3.70ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i5-9600k-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i7-10610u-cpu-@-1.80ghz.test b/tests/intel/x86-64/skylake/intel-core-i7-10610u-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i7-10610u-cpu-@-1.80ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i7-10610u-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i7-10700k-cpu-@-3.80ghz.test b/tests/intel/x86-64/skylake/intel-core-i7-10700k-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i7-10700k-cpu-@-3.80ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i7-10700k-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i7-10710u-cpu-@-1.10ghz.test b/tests/intel/x86-64/skylake/intel-core-i7-10710u-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i7-10710u-cpu-@-1.10ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i7-10710u-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i7-10750h-cpu-@-2.60ghz.test b/tests/intel/x86-64/skylake/intel-core-i7-10750h-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i7-10750h-cpu-@-2.60ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i7-10750h-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i7-7500u-cpu-@-2.70ghz.test b/tests/intel/x86-64/skylake/intel-core-i7-7500u-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i7-7500u-cpu-@-2.70ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i7-7500u-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i7-7700k-cpu-@-4.20ghz.test b/tests/intel/x86-64/skylake/intel-core-i7-7700k-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i7-7700k-cpu-@-4.20ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i7-7700k-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i7-7740x-cpu-@-4.30ghz.test b/tests/intel/x86-64/skylake/intel-core-i7-7740x-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i7-7740x-cpu-@-4.30ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i7-7740x-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i7-7800x-cpu-@-3.50ghz.test b/tests/intel/x86-64/skylake/intel-core-i7-7800x-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i7-7800x-cpu-@-3.50ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i7-7800x-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i7-8086k-cpu-@-4.00ghz.test b/tests/intel/x86-64/skylake/intel-core-i7-8086k-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i7-8086k-cpu-@-4.00ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i7-8086k-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i7-8565u-cpu-@-1.80ghz.test b/tests/intel/x86-64/skylake/intel-core-i7-8565u-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i7-8565u-cpu-@-1.80ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i7-8565u-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i7-8700k-cpu-@-3.70ghz.test b/tests/intel/x86-64/skylake/intel-core-i7-8700k-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i7-8700k-cpu-@-3.70ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i7-8700k-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i7-8705g-cpu-@-3.10ghz.test b/tests/intel/x86-64/skylake/intel-core-i7-8705g-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i7-8705g-cpu-@-3.10ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i7-8705g-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i7-8750h-cpu-@-2.20ghz.test b/tests/intel/x86-64/skylake/intel-core-i7-8750h-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i7-8750h-cpu-@-2.20ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i7-8750h-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i7-9750h-cpu-@-2.60ghz.test b/tests/intel/x86-64/skylake/intel-core-i7-9750h-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i7-9750h-cpu-@-2.60ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i7-9750h-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i9-10900k-cpu-@-3.70ghz.test b/tests/intel/x86-64/skylake/intel-core-i9-10900k-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i9-10900k-cpu-@-3.70ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i9-10900k-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i9-10980xe-cpu-@-3.00ghz.test b/tests/intel/x86-64/skylake/intel-core-i9-10980xe-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i9-10980xe-cpu-@-3.00ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i9-10980xe-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-i9-9900k-cpu-@-3.60ghz.test b/tests/intel/x86-64/skylake/intel-core-i9-9900k-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-i9-9900k-cpu-@-3.60ghz.test
rename to tests/intel/x86-64/skylake/intel-core-i9-9900k-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-m3-7y30-cpu-@-1.00ghz.test b/tests/intel/x86-64/skylake/intel-core-m3-7y30-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-m3-7y30-cpu-@-1.00ghz.test
rename to tests/intel/x86-64/skylake/intel-core-m3-7y30-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-core-m3-8100y-cpu-@-1.10ghz.test b/tests/intel/x86-64/skylake/intel-core-m3-8100y-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-core-m3-8100y-cpu-@-1.10ghz.test
rename to tests/intel/x86-64/skylake/intel-core-m3-8100y-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-pentium-cpu-4405u-@-2.10ghz.test b/tests/intel/x86-64/skylake/intel-pentium-cpu-4405u.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-pentium-cpu-4405u-@-2.10ghz.test
rename to tests/intel/x86-64/skylake/intel-pentium-cpu-4405u.test
diff --git a/tests/intel/x86-64/skylake/intel-pentium-cpu-4415u-@-2.30ghz.test b/tests/intel/x86-64/skylake/intel-pentium-cpu-4415u.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-pentium-cpu-4415u-@-2.30ghz.test
rename to tests/intel/x86-64/skylake/intel-pentium-cpu-4415u.test
diff --git a/tests/intel/x86-64/skylake/intel-pentium-cpu-4425y-@-1.70ghz.test b/tests/intel/x86-64/skylake/intel-pentium-cpu-4425y.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-pentium-cpu-4425y-@-1.70ghz.test
rename to tests/intel/x86-64/skylake/intel-pentium-cpu-4425y.test
diff --git a/tests/intel/x86-64/skylake/intel-pentium-cpu-5405u-@-2.30ghz.test b/tests/intel/x86-64/skylake/intel-pentium-cpu-5405u.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-pentium-cpu-5405u-@-2.30ghz.test
rename to tests/intel/x86-64/skylake/intel-pentium-cpu-5405u.test
diff --git a/tests/intel/x86-64/skylake/intel-pentium-cpu-g4600-@-3.60ghz.test b/tests/intel/x86-64/skylake/intel-pentium-cpu-g4600.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-pentium-cpu-g4600-@-3.60ghz.test
rename to tests/intel/x86-64/skylake/intel-pentium-cpu-g4600.test
diff --git a/tests/intel/x86-64/skylake/intel-pentium-gold-g5400-cpu-@-3.70ghz.test b/tests/intel/x86-64/skylake/intel-pentium-gold-g5400-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-pentium-gold-g5400-cpu-@-3.70ghz.test
rename to tests/intel/x86-64/skylake/intel-pentium-gold-g5400-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-xeon-bronze-3104-cpu-@-1.70ghz.test b/tests/intel/x86-64/skylake/intel-xeon-bronze-3104-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-xeon-bronze-3104-cpu-@-1.70ghz.test
rename to tests/intel/x86-64/skylake/intel-xeon-bronze-3104-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-xeon-d-2183it-cpu-@2.20ghz.test b/tests/intel/x86-64/skylake/intel-xeon-d-2183it-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-xeon-d-2183it-cpu-@2.20ghz.test
rename to tests/intel/x86-64/skylake/intel-xeon-d-2183it-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-xeon-e-2226g-cpu-@-3.40ghz.test b/tests/intel/x86-64/skylake/intel-xeon-e-2226g-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-xeon-e-2226g-cpu-@-3.40ghz.test
rename to tests/intel/x86-64/skylake/intel-xeon-e-2226g-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-xeon-gold-5215-cpu-@-2.50ghz.test b/tests/intel/x86-64/skylake/intel-xeon-gold-5215-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-xeon-gold-5215-cpu-@-2.50ghz.test
rename to tests/intel/x86-64/skylake/intel-xeon-gold-5215-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-xeon-gold-6154-cpu-@-3.00ghz.test b/tests/intel/x86-64/skylake/intel-xeon-gold-6154-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-xeon-gold-6154-cpu-@-3.00ghz.test
rename to tests/intel/x86-64/skylake/intel-xeon-gold-6154-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-xeon-platinum-8180-cpu-@-2.50ghz.test b/tests/intel/x86-64/skylake/intel-xeon-platinum-8180-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-xeon-platinum-8180-cpu-@-2.50ghz.test
rename to tests/intel/x86-64/skylake/intel-xeon-platinum-8180-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-xeon-platinum-8280-cpu-@-2.70ghz.test b/tests/intel/x86-64/skylake/intel-xeon-platinum-8280-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-xeon-platinum-8280-cpu-@-2.70ghz.test
rename to tests/intel/x86-64/skylake/intel-xeon-platinum-8280-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-xeon-silver-4108-cpu-@-1.80ghz.test b/tests/intel/x86-64/skylake/intel-xeon-silver-4108-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-xeon-silver-4108-cpu-@-1.80ghz.test
rename to tests/intel/x86-64/skylake/intel-xeon-silver-4108-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-xeon-silver-4214-cpu-@-2.20ghz.test b/tests/intel/x86-64/skylake/intel-xeon-silver-4214-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-xeon-silver-4214-cpu-@-2.20ghz.test
rename to tests/intel/x86-64/skylake/intel-xeon-silver-4214-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-xeon-w-1290p-cpu-@-3.70ghz.test b/tests/intel/x86-64/skylake/intel-xeon-w-1290p-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-xeon-w-1290p-cpu-@-3.70ghz.test
rename to tests/intel/x86-64/skylake/intel-xeon-w-1290p-cpu.test
diff --git a/tests/intel/x86-64/skylake/intel-xeon-w-3275-cpu-@-2.50ghz.test b/tests/intel/x86-64/skylake/intel-xeon-w-3275-cpu.test
similarity index 100%
rename from tests/intel/x86-64/skylake/intel-xeon-w-3275-cpu-@-2.50ghz.test
rename to tests/intel/x86-64/skylake/intel-xeon-w-3275-cpu.test
diff --git a/tests/intel/x86-64/sunny-cove/intel-core-i3-1005g1-cpu-@-1.20ghz.test b/tests/intel/x86-64/sunny-cove/intel-core-i3-1005g1-cpu.test
similarity index 100%
rename from tests/intel/x86-64/sunny-cove/intel-core-i3-1005g1-cpu-@-1.20ghz.test
rename to tests/intel/x86-64/sunny-cove/intel-core-i3-1005g1-cpu.test
diff --git a/tests/intel/x86-64/sunny-cove/intel-core-i5-1035g4-cpu-@-1.10ghz.test b/tests/intel/x86-64/sunny-cove/intel-core-i5-1035g4-cpu.test
similarity index 100%
rename from tests/intel/x86-64/sunny-cove/intel-core-i5-1035g4-cpu-@-1.10ghz.test
rename to tests/intel/x86-64/sunny-cove/intel-core-i5-1035g4-cpu.test
diff --git a/tests/intel/x86-64/sunny-cove/intel-core-i5-l16g7-cpu-@-1.40ghz.test b/tests/intel/x86-64/sunny-cove/intel-core-i5-l16g7-cpu.test
similarity index 100%
rename from tests/intel/x86-64/sunny-cove/intel-core-i5-l16g7-cpu-@-1.40ghz.test
rename to tests/intel/x86-64/sunny-cove/intel-core-i5-l16g7-cpu.test
diff --git a/tests/intel/x86-64/sunny-cove/intel-core-i7-1065g7-cpu-@-1.30ghz.test b/tests/intel/x86-64/sunny-cove/intel-core-i7-1065g7-cpu.test
similarity index 100%
rename from tests/intel/x86-64/sunny-cove/intel-core-i7-1065g7-cpu-@-1.30ghz.test
rename to tests/intel/x86-64/sunny-cove/intel-core-i7-1065g7-cpu.test
diff --git a/tests/intel/x86-64/sunny-cove/intel-xeon-d-1718t-cpu-@-2.60ghz.test b/tests/intel/x86-64/sunny-cove/intel-xeon-d-1718t-cpu.test
similarity index 100%
rename from tests/intel/x86-64/sunny-cove/intel-xeon-d-1718t-cpu-@-2.60ghz.test
rename to tests/intel/x86-64/sunny-cove/intel-xeon-d-1718t-cpu.test
diff --git a/tests/intel/x86-64/willow-cove/11th-gen-intel-core-i5-1135g7-@-2.40ghz.test b/tests/intel/x86-64/willow-cove/11th-gen-intel-core-i5-1135g7.test
similarity index 100%
rename from tests/intel/x86-64/willow-cove/11th-gen-intel-core-i5-1135g7-@-2.40ghz.test
rename to tests/intel/x86-64/willow-cove/11th-gen-intel-core-i5-1135g7.test
diff --git a/tests/intel/x86-64/willow-cove/11th-gen-intel-core-i7-11375h-@-3.30ghz.test b/tests/intel/x86-64/willow-cove/11th-gen-intel-core-i7-11375h.test
similarity index 100%
rename from tests/intel/x86-64/willow-cove/11th-gen-intel-core-i7-11375h-@-3.30ghz.test
rename to tests/intel/x86-64/willow-cove/11th-gen-intel-core-i7-11375h.test
diff --git a/tests/intel/x86-64/willow-cove/11th-gen-intel-core-i7-1165g7-@-2.80ghz.test b/tests/intel/x86-64/willow-cove/11th-gen-intel-core-i7-1165g7.test
similarity index 100%
rename from tests/intel/x86-64/willow-cove/11th-gen-intel-core-i7-1165g7-@-2.80ghz.test
rename to tests/intel/x86-64/willow-cove/11th-gen-intel-core-i7-1165g7.test
diff --git a/tests/intel/x86-64/willow-cove/11th-gen-intel-core-i7-11800h-@-2.30ghz.test b/tests/intel/x86-64/willow-cove/11th-gen-intel-core-i7-11800h.test
similarity index 100%
rename from tests/intel/x86-64/willow-cove/11th-gen-intel-core-i7-11800h-@-2.30ghz.test
rename to tests/intel/x86-64/willow-cove/11th-gen-intel-core-i7-11800h.test
diff --git a/tests/intel/x86-64/willow-cove/intel-celeron-6305-@-1.80ghz.test b/tests/intel/x86-64/willow-cove/intel-celeron-6305.test
similarity index 100%
rename from tests/intel/x86-64/willow-cove/intel-celeron-6305-@-1.80ghz.test
rename to tests/intel/x86-64/willow-cove/intel-celeron-6305.test
diff --git a/tests/intel/x86-64/willow-cove/intel-pentium-gold-7505-@-2.00ghz.test b/tests/intel/x86-64/willow-cove/intel-pentium-gold-7505.test
similarity index 100%
rename from tests/intel/x86-64/willow-cove/intel-pentium-gold-7505-@-2.00ghz.test
rename to tests/intel/x86-64/willow-cove/intel-pentium-gold-7505.test
diff --git a/tests/intel/x86-atom/bonnell/intel-atom-cpu-330-@-1.60ghz.test b/tests/intel/x86-atom/bonnell/intel-atom-cpu-330.test
similarity index 100%
rename from tests/intel/x86-atom/bonnell/intel-atom-cpu-330-@-1.60ghz.test
rename to tests/intel/x86-atom/bonnell/intel-atom-cpu-330.test
diff --git a/tests/intel/x86-atom/bonnell/intel-atom-cpu-d425-@-1.80ghz.test b/tests/intel/x86-atom/bonnell/intel-atom-cpu-d425.test
similarity index 100%
rename from tests/intel/x86-atom/bonnell/intel-atom-cpu-d425-@-1.80ghz.test
rename to tests/intel/x86-atom/bonnell/intel-atom-cpu-d425.test
diff --git a/tests/intel/x86-atom/bonnell/intel-atom-cpu-d525-@-1.80ghz.test b/tests/intel/x86-atom/bonnell/intel-atom-cpu-d525.test
similarity index 100%
rename from tests/intel/x86-atom/bonnell/intel-atom-cpu-d525-@-1.80ghz.test
rename to tests/intel/x86-atom/bonnell/intel-atom-cpu-d525.test
diff --git a/tests/intel/x86-atom/bonnell/intel-atom-cpu-n270-@-1.60ghz.test b/tests/intel/x86-atom/bonnell/intel-atom-cpu-n270.test
similarity index 100%
rename from tests/intel/x86-atom/bonnell/intel-atom-cpu-n270-@-1.60ghz.test
rename to tests/intel/x86-atom/bonnell/intel-atom-cpu-n270.test
diff --git a/tests/intel/x86-atom/bonnell/intel-atom-cpu-n450-@-1.66ghz.test b/tests/intel/x86-atom/bonnell/intel-atom-cpu-n450.test
similarity index 100%
rename from tests/intel/x86-atom/bonnell/intel-atom-cpu-n450-@-1.66ghz.test
rename to tests/intel/x86-atom/bonnell/intel-atom-cpu-n450.test
diff --git a/tests/intel/x86-atom/goldmont-plus/intel-atom-processor-e3930-@-1.30ghz.test b/tests/intel/x86-atom/goldmont-plus/intel-atom-processor-e3930.test
similarity index 100%
rename from tests/intel/x86-atom/goldmont-plus/intel-atom-processor-e3930-@-1.30ghz.test
rename to tests/intel/x86-atom/goldmont-plus/intel-atom-processor-e3930.test
diff --git a/tests/intel/x86-atom/goldmont-plus/intel-celeron-j4105-cpu-@-1.50ghz.test b/tests/intel/x86-atom/goldmont-plus/intel-celeron-j4105-cpu.test
similarity index 100%
rename from tests/intel/x86-atom/goldmont-plus/intel-celeron-j4105-cpu-@-1.50ghz.test
rename to tests/intel/x86-atom/goldmont-plus/intel-celeron-j4105-cpu.test
diff --git a/tests/intel/x86-atom/goldmont-plus/intel-celeron-n4100-cpu-@-1.10ghz.test b/tests/intel/x86-atom/goldmont-plus/intel-celeron-n4100-cpu.test
similarity index 100%
rename from tests/intel/x86-atom/goldmont-plus/intel-celeron-n4100-cpu-@-1.10ghz.test
rename to tests/intel/x86-atom/goldmont-plus/intel-celeron-n4100-cpu.test
diff --git a/tests/intel/x86-atom/goldmont-plus/intel-pentium-silver-j5040-cpu-@-2.00ghz.test b/tests/intel/x86-atom/goldmont-plus/intel-pentium-silver-j5040-cpu.test
similarity index 100%
rename from tests/intel/x86-atom/goldmont-plus/intel-pentium-silver-j5040-cpu-@-2.00ghz.test
rename to tests/intel/x86-atom/goldmont-plus/intel-pentium-silver-j5040-cpu.test
diff --git a/tests/intel/x86-atom/goldmont-plus/intel-pentium-silver-n5030-cpu-@-1.10ghz.test b/tests/intel/x86-atom/goldmont-plus/intel-pentium-silver-n5030-cpu.test
similarity index 100%
rename from tests/intel/x86-atom/goldmont-plus/intel-pentium-silver-n5030-cpu-@-1.10ghz.test
rename to tests/intel/x86-atom/goldmont-plus/intel-pentium-silver-n5030-cpu.test
diff --git a/tests/intel/x86-atom/saltwell/intel-atom-cpu-n2800-@-1.86ghz.test b/tests/intel/x86-atom/saltwell/intel-atom-cpu-n2800.test
similarity index 100%
rename from tests/intel/x86-atom/saltwell/intel-atom-cpu-n2800-@-1.86ghz.test
rename to tests/intel/x86-atom/saltwell/intel-atom-cpu-n2800.test
diff --git a/tests/intel/x86-atom/silvermont/intel-atom-cpu-e3827-@-1.74ghz.test b/tests/intel/x86-atom/silvermont/intel-atom-cpu-e3827.test
similarity index 100%
rename from tests/intel/x86-atom/silvermont/intel-atom-cpu-e3827-@-1.74ghz.test
rename to tests/intel/x86-atom/silvermont/intel-atom-cpu-e3827.test
diff --git a/tests/intel/x86-atom/silvermont/intel-atom-cpu-z3740-@-1.33ghz.test b/tests/intel/x86-atom/silvermont/intel-atom-cpu-z3740.test
similarity index 100%
rename from tests/intel/x86-atom/silvermont/intel-atom-cpu-z3740-@-1.33ghz.test
rename to tests/intel/x86-atom/silvermont/intel-atom-cpu-z3740.test
diff --git a/tests/intel/x86-atom/silvermont/intel-celeron-cpu-j1900-@-1.99ghz.test b/tests/intel/x86-atom/silvermont/intel-celeron-cpu-j1900.test
similarity index 100%
rename from tests/intel/x86-atom/silvermont/intel-celeron-cpu-j1900-@-1.99ghz.test
rename to tests/intel/x86-atom/silvermont/intel-celeron-cpu-j1900.test
diff --git a/tests/intel/x86-atom/silvermont/intel-celeron-cpu-n2930-@-1.83ghz.test b/tests/intel/x86-atom/silvermont/intel-celeron-cpu-n2930.test
similarity index 100%
rename from tests/intel/x86-atom/silvermont/intel-celeron-cpu-n2930-@-1.83ghz.test
rename to tests/intel/x86-atom/silvermont/intel-celeron-cpu-n2930.test
diff --git a/tests/intel/x86-atom/tremont/intel-celeron-j6412-@-2.00ghz.test b/tests/intel/x86-atom/tremont/intel-celeron-j6412.test
similarity index 100%
rename from tests/intel/x86-atom/tremont/intel-celeron-j6412-@-2.00ghz.test
rename to tests/intel/x86-atom/tremont/intel-celeron-j6412.test
diff --git a/tests/intel/x86-atom/tremont/intel-celeron-n4505-@-2.00ghz.test b/tests/intel/x86-atom/tremont/intel-celeron-n4505.test
similarity index 100%
rename from tests/intel/x86-atom/tremont/intel-celeron-n4505-@-2.00ghz.test
rename to tests/intel/x86-atom/tremont/intel-celeron-n4505.test
diff --git a/tests/intel/x86-atom/tremont/intel-celeron-n5095a-@-2.00ghz.test b/tests/intel/x86-atom/tremont/intel-celeron-n5095a.test
similarity index 100%
rename from tests/intel/x86-atom/tremont/intel-celeron-n5095a-@-2.00ghz.test
rename to tests/intel/x86-atom/tremont/intel-celeron-n5095a.test
diff --git a/tests/intel/x86-atom/tremont/intel-celeron-n5100-@-1.10ghz.test b/tests/intel/x86-atom/tremont/intel-celeron-n5100.test
similarity index 100%
rename from tests/intel/x86-atom/tremont/intel-celeron-n5100-@-1.10ghz.test
rename to tests/intel/x86-atom/tremont/intel-celeron-n5100.test
diff --git a/tests/intel/x86-atom/tremont/intel-core-i5-l16g7-cpu-@-1.40ghz.test b/tests/intel/x86-atom/tremont/intel-core-i5-l16g7-cpu.test
similarity index 100%
rename from tests/intel/x86-atom/tremont/intel-core-i5-l16g7-cpu-@-1.40ghz.test
rename to tests/intel/x86-atom/tremont/intel-core-i5-l16g7-cpu.test
diff --git a/tests/intel/x86-atom/tremont/intel-pentium-silver-n6005-@-2.00ghz.test b/tests/intel/x86-atom/tremont/intel-pentium-silver-n6005.test
similarity index 100%
rename from tests/intel/x86-atom/tremont/intel-pentium-silver-n6005-@-2.00ghz.test
rename to tests/intel/x86-atom/tremont/intel-pentium-silver-n6005.test
diff --git a/tests/via/isaiah/via-eden-x4-c4250@1.2+ghz.test b/tests/via/isaiah/via-eden-x4-c4250.test
similarity index 100%
rename from tests/via/isaiah/via-eden-x4-c4250@1.2+ghz.test
rename to tests/via/isaiah/via-eden-x4-c4250.test
diff --git a/tests/via/isaiah/via-nano-l3050@1800mhz.test b/tests/via/isaiah/via-nano-l3050.test
similarity index 100%
rename from tests/via/isaiah/via-nano-l3050@1800mhz.test
rename to tests/via/isaiah/via-nano-l3050.test
diff --git a/tests/via/isaiah/via-nano-processor-l2200@1600mhz.test b/tests/via/isaiah/via-nano-processor-l2200.test
similarity index 100%
rename from tests/via/isaiah/via-nano-processor-l2200@1600mhz.test
rename to tests/via/isaiah/via-nano-processor-l2200.test
diff --git a/tests/via/isaiah/via-nano-processor-@1800mhz.test b/tests/via/isaiah/via-nano-processor.test
similarity index 100%
rename from tests/via/isaiah/via-nano-processor-@1800mhz.test
rename to tests/via/isaiah/via-nano-processor.test
diff --git a/tests/via/isaiah/via-quadcore-l4700-@-1.2+-ghz.test b/tests/via/isaiah/via-quadcore-l4700.test
similarity index 100%
rename from tests/via/isaiah/via-quadcore-l4700-@-1.2+-ghz.test
rename to tests/via/isaiah/via-quadcore-l4700.test
diff --git a/tests/zhaoxin/lujiazui/zhaoxin-kaixian-kx-6640ma@2.2+ghz.test b/tests/zhaoxin/lujiazui/zhaoxin-kaixian-kx-6640ma.test
similarity index 100%
rename from tests/zhaoxin/lujiazui/zhaoxin-kaixian-kx-6640ma@2.2+ghz.test
rename to tests/zhaoxin/lujiazui/zhaoxin-kaixian-kx-6640ma.test
diff --git a/tests/zhaoxin/lujiazui/zhaoxin-kaixian-kx-u6780a@2.7ghz.test b/tests/zhaoxin/lujiazui/zhaoxin-kaixian-kx-u6780a.test
similarity index 100%
rename from tests/zhaoxin/lujiazui/zhaoxin-kaixian-kx-u6780a@2.7ghz.test
rename to tests/zhaoxin/lujiazui/zhaoxin-kaixian-kx-u6780a.test
diff --git a/tests/zhaoxin/zhangjiang/zhaoxin-kaixian-zx-c+-c4580@1.83ghz.test b/tests/zhaoxin/zhangjiang/zhaoxin-kaixian-zx-c+-c4580.test
similarity index 100%
rename from tests/zhaoxin/zhangjiang/zhaoxin-kaixian-zx-c+-c4580@1.83ghz.test
rename to tests/zhaoxin/zhangjiang/zhaoxin-kaixian-zx-c+-c4580.test
diff --git a/utils/create_test_from_instlatx64.sh b/utils/create_test_from_instlatx64.sh
index bd7529e..8a6ee9c 100755
--- a/utils/create_test_from_instlatx64.sh
+++ b/utils/create_test_from_instlatx64.sh
@@ -16,7 +16,7 @@ echo -e "\033[1mCreating '$REPORT_FILE' report file...\033[0m"
 "$CPUID_TOOL" --load="$RAW_FILE" --outfile="$REPORT_FILE" --report
 
 if [[ -d "$OUTPUT_DIR" ]]; then
-	test_file="$("$CPUID_TOOL" --load="$RAW_FILE" --brandstr | head -n1 | xargs | sed 's/([^)]*)//g' | sed -r 's/\s+/-/g' | tr '[:upper:]' '[:lower:]')"
+	test_file="$("$CPUID_TOOL" --load="$RAW_FILE" --brandstr | head -n1 | sed -e 's/([^)]*)//g' -e 's/,//g' | cut -d'@' -f1 | xargs | sed -r 's/\s+/-/g' | tr '[:upper:]' '[:lower:]')"
 	output_file="${OUTPUT_DIR}/${test_file}.test"
 	echo -e "\033[1mCreating '$output_file' test file...\033[0m"
 else