diff --git a/tests/amd/bobcat/brazos-zacate.test b/tests/amd/bobcat/amd-e-350-processor.test
similarity index 100%
rename from tests/amd/bobcat/brazos-zacate.test
rename to tests/amd/bobcat/amd-e-350-processor.test
diff --git a/tests/amd/bulldozer/kaveri-x4.test b/tests/amd/bulldozer/amd-a10-pro-7350b-r6-10-compute-cores-4c+6g.test
similarity index 100%
rename from tests/amd/bulldozer/kaveri-x4.test
rename to tests/amd/bulldozer/amd-a10-pro-7350b-r6-10-compute-cores-4c+6g.test
diff --git a/tests/amd/bulldozer/godavari-x4.test b/tests/amd/bulldozer/amd-athlon-x4-870k-quad-core-processor.test
similarity index 100%
rename from tests/amd/bulldozer/godavari-x4.test
rename to tests/amd/bulldozer/amd-athlon-x4-870k-quad-core-processor.test
diff --git a/tests/amd/bulldozer/zambezi-x3.test b/tests/amd/bulldozer/amd-fx-6100-six-core-processor.test
similarity index 100%
rename from tests/amd/bulldozer/zambezi-x3.test
rename to tests/amd/bulldozer/amd-fx-6100-six-core-processor.test
diff --git a/tests/amd/bulldozer/zambezi-x4.test b/tests/amd/bulldozer/amd-fx-8150-eight-core-processor.test
similarity index 100%
rename from tests/amd/bulldozer/zambezi-x4.test
rename to tests/amd/bulldozer/amd-fx-8150-eight-core-processor.test
diff --git a/tests/amd/bulldozer/vishera-x4.test b/tests/amd/bulldozer/amd-fx-9590-eight-core-processor.test
similarity index 100%
rename from tests/amd/bulldozer/vishera-x4.test
rename to tests/amd/bulldozer/amd-fx-9590-eight-core-processor.test
diff --git a/tests/amd/bulldozer/opteron-interlagos.test b/tests/amd/bulldozer/amd-opteron-processor-6238.test
similarity index 100%
rename from tests/amd/bulldozer/opteron-interlagos.test
rename to tests/amd/bulldozer/amd-opteron-processor-6238.test
diff --git a/tests/amd/bulldozer/opteron-abu-dhabi.test b/tests/amd/bulldozer/amd-opteron-processor-6380.test
similarity index 100%
rename from tests/amd/bulldozer/opteron-abu-dhabi.test
rename to tests/amd/bulldozer/amd-opteron-processor-6380.test
diff --git a/tests/amd/bulldozer/bald-eagle-x4.test b/tests/amd/bulldozer/amd-rx-427bb-with-amd-radeon-r7-graphics.test
similarity index 100%
rename from tests/amd/bulldozer/bald-eagle-x4.test
rename to tests/amd/bulldozer/amd-rx-427bb-with-amd-radeon-r7-graphics.test
diff --git a/tests/amd/jaguar/kabini-x4.test b/tests/amd/jaguar/amd-a4-5000-apu-with-radeon-hd-graphics.test
similarity index 100%
rename from tests/amd/jaguar/kabini-x4.test
rename to tests/amd/jaguar/amd-a4-5000-apu-with-radeon-hd-graphics.test
diff --git a/tests/amd/jaguar/beema-x4.test b/tests/amd/jaguar/amd-a8-6410-apu-with-amd-radeon-r5-graphics.test
similarity index 100%
rename from tests/amd/jaguar/beema-x4.test
rename to tests/amd/jaguar/amd-a8-6410-apu-with-amd-radeon-r5-graphics.test
diff --git a/tests/amd/jaguar/athlon-kabini.test b/tests/amd/jaguar/amd-athlon-5350-apu-with-radeon-r3.test
similarity index 100%
rename from tests/amd/jaguar/athlon-kabini.test
rename to tests/amd/jaguar/amd-athlon-5350-apu-with-radeon-r3.test
diff --git a/tests/amd/jaguar/steppe-eagle-x2.test b/tests/amd/jaguar/amd-gx-218gl-soc-with-radeon-r1e-graphics.test
similarity index 100%
rename from tests/amd/jaguar/steppe-eagle-x2.test
rename to tests/amd/jaguar/amd-gx-218gl-soc-with-radeon-r1e-graphics.test
diff --git a/tests/amd/k10/athlon-2-kuma.test b/tests/amd/k10/amd-athlon-7750-dual-core-processor.test
similarity index 100%
rename from tests/amd/k10/athlon-2-kuma.test
rename to tests/amd/k10/amd-athlon-7750-dual-core-processor.test
diff --git a/tests/amd/k10/athlon-2-champlain-mobile.test b/tests/amd/k10/amd-athlon-ii-p320-dual-core-processor.test
similarity index 100%
rename from tests/amd/k10/athlon-2-champlain-mobile.test
rename to tests/amd/k10/amd-athlon-ii-p320-dual-core-processor.test
diff --git a/tests/amd/k10/athlon-2-propus-3.test b/tests/amd/k10/amd-athlon-ii-x4-620-processor.test
similarity index 100%
rename from tests/amd/k10/athlon-2-propus-3.test
rename to tests/amd/k10/amd-athlon-ii-x4-620-processor.test
diff --git a/tests/amd/k10/athlon-2-regor.test b/tests/amd/k10/amd-athlon-x2-250-processor.test
similarity index 100%
rename from tests/amd/k10/athlon-2-regor.test
rename to tests/amd/k10/amd-athlon-x2-250-processor.test
diff --git a/tests/amd/k10/athlon-2-propus-2.test b/tests/amd/k10/amd-athlon-x4-620-processor.test
similarity index 100%
rename from tests/amd/k10/athlon-2-propus-2.test
rename to tests/amd/k10/amd-athlon-x4-620-processor.test
diff --git a/tests/amd/k10/magny-cours.test b/tests/amd/k10/amd-opteron-processor-6168.test
similarity index 100%
rename from tests/amd/k10/magny-cours.test
rename to tests/amd/k10/amd-opteron-processor-6168.test
diff --git a/tests/amd/k10/phenom-agena.test b/tests/amd/k10/amd-phenom-9850-quad-core-processor.test
similarity index 100%
rename from tests/amd/k10/phenom-agena.test
rename to tests/amd/k10/amd-phenom-9850-quad-core-processor.test
diff --git a/tests/amd/k10/phenom-2-heka.test b/tests/amd/k10/amd-phenom-ii-x3-710-processor.test
similarity index 100%
rename from tests/amd/k10/phenom-2-heka.test
rename to tests/amd/k10/amd-phenom-ii-x3-710-processor.test
diff --git a/tests/amd/k10/phenom-2-deneb.test b/tests/amd/k10/amd-phenom-ii-x4-940-processor.test
similarity index 100%
rename from tests/amd/k10/phenom-2-deneb.test
rename to tests/amd/k10/amd-phenom-ii-x4-940-processor.test
diff --git a/tests/amd/k10/phenom-2-thuban.test b/tests/amd/k10/amd-phenom-ii-x6-1055t-processor.test
similarity index 100%
rename from tests/amd/k10/phenom-2-thuban.test
rename to tests/amd/k10/amd-phenom-ii-x6-1055t-processor.test
diff --git a/tests/amd/k10/sempron-sargas.test b/tests/amd/k10/amd-sempron-processor-140-processor.test
similarity index 100%
rename from tests/amd/k10/sempron-sargas.test
rename to tests/amd/k10/amd-sempron-processor-140-processor.test
diff --git a/tests/amd/k10/athlon-2-propus.test b/tests/amd/k10/athlon-2-propus.test
deleted file mode 100644
index 075ec6e..0000000
--- a/tests/amd/k10/athlon-2-propus.test
+++ /dev/null
@@ -1,107 +0,0 @@
-basic_cpuid[0]=00000005 68747541 444d4163 69746e65
-basic_cpuid[1]=00100f52 00040800 00802009 178bfbff
-basic_cpuid[2]=00000000 00000000 00000000 00000000
-basic_cpuid[3]=00000000 00000000 00000000 00000000
-basic_cpuid[4]=00000000 00000000 00000000 00000000
-basic_cpuid[5]=00000040 00000040 00000003 00000000
-basic_cpuid[6]=00000000 00000000 00000000 00000000
-basic_cpuid[7]=00000000 00000000 00000000 00000000
-basic_cpuid[8]=00000000 00000000 00000000 00000000
-basic_cpuid[9]=00000000 00000000 00000000 00000000
-basic_cpuid[10]=00000000 00000000 00000000 00000000
-basic_cpuid[11]=00000000 00000000 00000000 00000000
-basic_cpuid[12]=00000000 00000000 00000000 00000000
-basic_cpuid[13]=00000000 00000000 00000000 00000000
-basic_cpuid[14]=00000000 00000000 00000000 00000000
-basic_cpuid[15]=00000000 00000000 00000000 00000000
-basic_cpuid[16]=00000000 00000000 00000000 00000000
-basic_cpuid[17]=00000000 00000000 00000000 00000000
-basic_cpuid[18]=00000000 00000000 00000000 00000000
-basic_cpuid[19]=00000000 00000000 00000000 00000000
-basic_cpuid[20]=00000000 00000000 00000000 00000000
-basic_cpuid[21]=00000000 00000000 00000000 00000000
-basic_cpuid[22]=00000000 00000000 00000000 00000000
-basic_cpuid[23]=00000000 00000000 00000000 00000000
-basic_cpuid[24]=00000000 00000000 00000000 00000000
-basic_cpuid[25]=00000000 00000000 00000000 00000000
-basic_cpuid[26]=00000000 00000000 00000000 00000000
-basic_cpuid[27]=00000000 00000000 00000000 00000000
-basic_cpuid[28]=00000000 00000000 00000000 00000000
-basic_cpuid[29]=00000000 00000000 00000000 00000000
-basic_cpuid[30]=00000000 00000000 00000000 00000000
-basic_cpuid[31]=00000000 00000000 00000000 00000000
-ext_cpuid[0]=8000001b 68747541 444d4163 69746e65
-ext_cpuid[1]=00100f52 10005146 000037ff efd3fbff
-ext_cpuid[2]=20444d41 6c687441 74286e6f 5820296d
-ext_cpuid[3]=32362034 72502030 7365636f 00726f73
-ext_cpuid[4]=00000000 00000000 00000000 00000000
-ext_cpuid[5]=ff30ff10 ff30ff20 40020140 40020140
-ext_cpuid[6]=20800000 42004200 02008140 00000000
-ext_cpuid[7]=00000000 00000000 00000000 000001f9
-ext_cpuid[8]=00003030 00000000 00002003 00000000
-ext_cpuid[9]=00000000 00000000 00000000 00000000
-ext_cpuid[10]=00000001 00000040 00000000 0000000f
-ext_cpuid[11]=00000000 00000000 00000000 00000000
-ext_cpuid[12]=00000000 00000000 00000000 00000000
-ext_cpuid[13]=00000000 00000000 00000000 00000000
-ext_cpuid[14]=00000000 00000000 00000000 00000000
-ext_cpuid[15]=00000000 00000000 00000000 00000000
-ext_cpuid[16]=00000000 00000000 00000000 00000000
-ext_cpuid[17]=00000000 00000000 00000000 00000000
-ext_cpuid[18]=00000000 00000000 00000000 00000000
-ext_cpuid[19]=00000000 00000000 00000000 00000000
-ext_cpuid[20]=00000000 00000000 00000000 00000000
-ext_cpuid[21]=00000000 00000000 00000000 00000000
-ext_cpuid[22]=00000000 00000000 00000000 00000000
-ext_cpuid[23]=00000000 00000000 00000000 00000000
-ext_cpuid[24]=00000000 00000000 00000000 00000000
-ext_cpuid[25]=f0300000 60100000 00000000 00000000
-ext_cpuid[26]=00000003 00000000 00000000 00000000
-ext_cpuid[27]=0000001f 00000000 00000000 00000000
-ext_cpuid[28]=00000000 00000000 00000000 00000000
-ext_cpuid[29]=00000000 00000000 00000000 00000000
-ext_cpuid[30]=00000000 00000000 00000000 00000000
-ext_cpuid[31]=00000000 00000000 00000000 00000000
-intel_fn4[0]=00000000 00000000 00000000 00000000
-intel_fn4[1]=00000000 00000000 00000000 00000000
-intel_fn4[2]=00000000 00000000 00000000 00000000
-intel_fn4[3]=00000000 00000000 00000000 00000000
-intel_fn11[0]=00000000 00000000 00000000 00000000
-intel_fn11[1]=00000000 00000000 00000000 00000000
-intel_fn11[2]=00000000 00000000 00000000 00000000
-intel_fn11[3]=00000000 00000000 00000000 00000000
---------------------------------------------------------------------------------
-x86
-x86-64-v1
-general
-15
-5
-2
-16
-5
-4
-4
-64
-64
-512
--1
--1
-2
-2
-16
--1
--1
-64
-64
-64
--1
--1
--1
--1
--1
--1
--1
-128 (authoritative)
-Athlon II X4 (Propus)
-45 nm
-fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor cx16 syscall popcnt mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc
diff --git a/tests/amd/k7/athlon-thoroughbred.test b/tests/amd/k7/amd-athlon-xp.test
similarity index 100%
rename from tests/amd/k7/athlon-thoroughbred.test
rename to tests/amd/k7/amd-athlon-xp.test
diff --git a/tests/amd/k7/duron-applebred.test b/tests/amd/k7/amd-duron-processor.test
similarity index 100%
rename from tests/amd/k7/duron-applebred.test
rename to tests/amd/k7/amd-duron-processor.test
diff --git a/tests/amd/k7/sempron-barton.test b/tests/amd/k7/amd-sempron-3000+.test
similarity index 100%
rename from tests/amd/k7/sempron-barton.test
rename to tests/amd/k7/amd-sempron-3000+.test
diff --git a/tests/amd/k8/athlon-64-venice.test b/tests/amd/k8/amd-athlon-64-processor-3000+.test
similarity index 100%
rename from tests/amd/k8/athlon-64-venice.test
rename to tests/amd/k8/amd-athlon-64-processor-3000+.test
diff --git a/tests/amd/k8/athlon-64-brisbane.test b/tests/amd/k8/amd-athlon-64-x2-dual-core-processor-5200+.test
similarity index 100%
rename from tests/amd/k8/athlon-64-brisbane.test
rename to tests/amd/k8/amd-athlon-64-x2-dual-core-processor-5200+.test
diff --git a/tests/amd/k8/athlon-64-sherman.test b/tests/amd/k8/amd-athlon-processor-tf-20.test
similarity index 100%
rename from tests/amd/k8/athlon-64-sherman.test
rename to tests/amd/k8/amd-athlon-processor-tf-20.test
diff --git a/tests/amd/k8/sempron-64-sparta.test b/tests/amd/k8/amd-sempron-processor-le-1100.test
similarity index 100%
rename from tests/amd/k8/sempron-64-sparta.test
rename to tests/amd/k8/amd-sempron-processor-le-1100.test
diff --git a/tests/amd/k8/turion-64-lancaster.test b/tests/amd/k8/amd-turion-64-mobile-technology-ml-34.test
similarity index 100%
rename from tests/amd/k8/turion-64-lancaster.test
rename to tests/amd/k8/amd-turion-64-mobile-technology-ml-34.test
diff --git a/tests/amd/k8/opteron-denmark.test b/tests/amd/k8/dual-core-amd-opteron-processor-165.test
similarity index 100%
rename from tests/amd/k8/opteron-denmark.test
rename to tests/amd/k8/dual-core-amd-opteron-processor-165.test
diff --git a/tests/amd/k8/mobile-sempron-64-sonora.test b/tests/amd/k8/mobile-amd-sempron-processor-3300+.test
similarity index 100%
rename from tests/amd/k8/mobile-sempron-64-sonora.test
rename to tests/amd/k8/mobile-amd-sempron-processor-3300+.test
diff --git a/tests/amd/k8/mobile-sempron-64-keene.test b/tests/amd/k8/mobile-amd-sempron-processor-3500+.test
similarity index 100%
rename from tests/amd/k8/mobile-sempron-64-keene.test
rename to tests/amd/k8/mobile-amd-sempron-processor-3500+.test
diff --git a/tests/amd/zen+/ryzen5-picasso.test b/tests/amd/zen+/amd-ryzen-5-3550h-with-radeon-vega-mobile-gfx.test
similarity index 100%
rename from tests/amd/zen+/ryzen5-picasso.test
rename to tests/amd/zen+/amd-ryzen-5-3550h-with-radeon-vega-mobile-gfx.test
diff --git a/tests/amd/zen+/ryzen7-pinnacle-ridge.test b/tests/amd/zen+/amd-ryzen-7-2700x-eight-core-processor.test
similarity index 100%
rename from tests/amd/zen+/ryzen7-pinnacle-ridge.test
rename to tests/amd/zen+/amd-ryzen-7-2700x-eight-core-processor.test
diff --git a/tests/amd/zen+/threadripper-colfax.test b/tests/amd/zen+/amd-ryzen-threadripper-2990wx-32-core-processor.test
similarity index 100%
rename from tests/amd/zen+/threadripper-colfax.test
rename to tests/amd/zen+/amd-ryzen-threadripper-2990wx-32-core-processor.test
diff --git a/tests/amd/zen/dali.test b/tests/amd/zen/amd-3020e-with-radeon-graphics.test
similarity index 100%
rename from tests/amd/zen/dali.test
rename to tests/amd/zen/amd-3020e-with-radeon-graphics.test
diff --git a/tests/amd/zen/epyc-naples.test b/tests/amd/zen/amd-epyc-7551p-32-core-processor.test
similarity index 100%
rename from tests/amd/zen/epyc-naples.test
rename to tests/amd/zen/amd-epyc-7551p-32-core-processor.test
diff --git a/tests/amd/zen/ryzen3-raven-ridge.test b/tests/amd/zen/amd-ryzen-3-2200g-with-radeon-vega-graphics.test
similarity index 100%
rename from tests/amd/zen/ryzen3-raven-ridge.test
rename to tests/amd/zen/amd-ryzen-3-2200g-with-radeon-vega-graphics.test
diff --git a/tests/amd/zen/ryzen5-summit-ridge.test b/tests/amd/zen/amd-ryzen-5-1500x-quad-core-processor.test
similarity index 100%
rename from tests/amd/zen/ryzen5-summit-ridge.test
rename to tests/amd/zen/amd-ryzen-5-1500x-quad-core-processor.test
diff --git a/tests/amd/zen/ryzen5-raven-ridge.test b/tests/amd/zen/amd-ryzen-5-2400g-with-radeon-vega-graphics.test
similarity index 100%
rename from tests/amd/zen/ryzen5-raven-ridge.test
rename to tests/amd/zen/amd-ryzen-5-2400g-with-radeon-vega-graphics.test
diff --git a/tests/amd/zen/ryzen7-summit-ridge.test b/tests/amd/zen/amd-ryzen-7-1800x-eight-core-processor.test
similarity index 100%
rename from tests/amd/zen/ryzen7-summit-ridge.test
rename to tests/amd/zen/amd-ryzen-7-1800x-eight-core-processor.test
diff --git a/tests/amd/zen/threadripper-whitehaven.test b/tests/amd/zen/amd-ryzen-threadripper-1920x-12-core-processor.test
similarity index 100%
rename from tests/amd/zen/threadripper-whitehaven.test
rename to tests/amd/zen/amd-ryzen-threadripper-1920x-12-core-processor.test
diff --git a/tests/amd/zen2/4700s.test b/tests/amd/zen2/amd-4700s-8-core-processor-desktop-kit.test
similarity index 100%
rename from tests/amd/zen2/4700s.test
rename to tests/amd/zen2/amd-4700s-8-core-processor-desktop-kit.test
diff --git a/tests/amd/zen2/4800s.test b/tests/amd/zen2/amd-4800s-8-core-processor-desktop-kit.test
similarity index 100%
rename from tests/amd/zen2/4800s.test
rename to tests/amd/zen2/amd-4800s-8-core-processor-desktop-kit.test
diff --git a/tests/amd/zen2/van-gogh-custom-0405.test b/tests/amd/zen2/amd-custom-apu-0405.test
similarity index 100%
rename from tests/amd/zen2/van-gogh-custom-0405.test
rename to tests/amd/zen2/amd-custom-apu-0405.test
diff --git a/tests/amd/zen2/van-gogh-custom-0932.test b/tests/amd/zen2/amd-custom-apu-0932.test
similarity index 100%
rename from tests/amd/zen2/van-gogh-custom-0932.test
rename to tests/amd/zen2/amd-custom-apu-0932.test
diff --git a/tests/amd/zen2/epyc-rome-dual.test.xz b/tests/amd/zen2/amd-epyc-7742-64-core-processor-dual.test.xz
similarity index 92%
rename from tests/amd/zen2/epyc-rome-dual.test.xz
rename to tests/amd/zen2/amd-epyc-7742-64-core-processor-dual.test.xz
index 9508484..53a28a0 100644
Binary files a/tests/amd/zen2/epyc-rome-dual.test.xz and b/tests/amd/zen2/amd-epyc-7742-64-core-processor-dual.test.xz differ
diff --git a/tests/amd/zen2/epyc-rome.test.xz b/tests/amd/zen2/amd-epyc-7742-64-core-processor.test.xz
similarity index 96%
rename from tests/amd/zen2/epyc-rome.test.xz
rename to tests/amd/zen2/amd-epyc-7742-64-core-processor.test.xz
index e176ce3..708a411 100644
Binary files a/tests/amd/zen2/epyc-rome.test.xz and b/tests/amd/zen2/amd-epyc-7742-64-core-processor.test.xz differ
diff --git a/tests/amd/zen2/ryzen3-mendocino.test b/tests/amd/zen2/amd-ryzen-3-7320u-with-radeon-graphics.test
similarity index 100%
rename from tests/amd/zen2/ryzen3-mendocino.test
rename to tests/amd/zen2/amd-ryzen-3-7320u-with-radeon-graphics.test
diff --git a/tests/amd/zen2/ryzen5-matisse.test b/tests/amd/zen2/amd-ryzen-5-3600x-6-core-processor.test
similarity index 100%
rename from tests/amd/zen2/ryzen5-matisse.test
rename to tests/amd/zen2/amd-ryzen-5-3600x-6-core-processor.test
diff --git a/tests/amd/zen2/ryzen5-renoir.test b/tests/amd/zen2/amd-ryzen-5-4500u-with-radeon-graphics.test
similarity index 100%
rename from tests/amd/zen2/ryzen5-renoir.test
rename to tests/amd/zen2/amd-ryzen-5-4500u-with-radeon-graphics.test
diff --git a/tests/amd/zen2/ryzen5-lucienne.test b/tests/amd/zen2/amd-ryzen-5-5500u-with-radeon-graphics.test
similarity index 100%
rename from tests/amd/zen2/ryzen5-lucienne.test
rename to tests/amd/zen2/amd-ryzen-5-5500u-with-radeon-graphics.test
diff --git a/tests/amd/zen2/ryzen5-mendocino.test b/tests/amd/zen2/amd-ryzen-5-7520u-with-radeon-graphics.test
similarity index 100%
rename from tests/amd/zen2/ryzen5-mendocino.test
rename to tests/amd/zen2/amd-ryzen-5-7520u-with-radeon-graphics.test
diff --git a/tests/amd/zen2/ryzen7-matisse.test b/tests/amd/zen2/amd-ryzen-7-3700x-8-core-processor.test
similarity index 100%
rename from tests/amd/zen2/ryzen7-matisse.test
rename to tests/amd/zen2/amd-ryzen-7-3700x-8-core-processor.test
diff --git a/tests/amd/zen2/ryzen7-renoir.test b/tests/amd/zen2/amd-ryzen-7-4800h-with-radeon-graphics.test
similarity index 100%
rename from tests/amd/zen2/ryzen7-renoir.test
rename to tests/amd/zen2/amd-ryzen-7-4800h-with-radeon-graphics.test
diff --git a/tests/amd/zen2/ryzen7-lucienne.test b/tests/amd/zen2/amd-ryzen-7-5700u-with-radeon-graphics.test
similarity index 100%
rename from tests/amd/zen2/ryzen7-lucienne.test
rename to tests/amd/zen2/amd-ryzen-7-5700u-with-radeon-graphics.test
diff --git a/tests/amd/zen2/ryzen9-matisse.test b/tests/amd/zen2/amd-ryzen-9-pro-3900-12-core-processor.test
similarity index 100%
rename from tests/amd/zen2/ryzen9-matisse.test
rename to tests/amd/zen2/amd-ryzen-9-pro-3900-12-core-processor.test
diff --git a/tests/amd/zen2/threadripper-castle-peak.test.xz b/tests/amd/zen2/amd-ryzen-threadripper-3970x-32-core-processor.test.xz
similarity index 72%
rename from tests/amd/zen2/threadripper-castle-peak.test.xz
rename to tests/amd/zen2/amd-ryzen-threadripper-3970x-32-core-processor.test.xz
index 573fa79..639d735 100644
Binary files a/tests/amd/zen2/threadripper-castle-peak.test.xz and b/tests/amd/zen2/amd-ryzen-threadripper-3970x-32-core-processor.test.xz differ
diff --git a/tests/amd/zen3/epyc-milan.test.xz b/tests/amd/zen3/amd-epyc-7713-64-core-processor.test.xz
similarity index 95%
rename from tests/amd/zen3/epyc-milan.test.xz
rename to tests/amd/zen3/amd-epyc-7713-64-core-processor.test.xz
index 3a61353..9281155 100644
Binary files a/tests/amd/zen3/epyc-milan.test.xz and b/tests/amd/zen3/amd-epyc-7713-64-core-processor.test.xz differ
diff --git a/tests/amd/zen3/ryzen5-vermeer.test b/tests/amd/zen3/amd-ryzen-5-5600x3d-6-core-processor.test
similarity index 100%
rename from tests/amd/zen3/ryzen5-vermeer.test
rename to tests/amd/zen3/amd-ryzen-5-5600x3d-6-core-processor.test
diff --git a/tests/amd/zen3/ryzen7-vermeer.test b/tests/amd/zen3/amd-ryzen-7-5700x3d-8-core-processor.test
similarity index 100%
rename from tests/amd/zen3/ryzen7-vermeer.test
rename to tests/amd/zen3/amd-ryzen-7-5700x3d-8-core-processor.test
diff --git a/tests/amd/zen3/ryzen7-cezanne.test b/tests/amd/zen3/amd-ryzen-7-5800h-with-radeon-graphics.test
similarity index 100%
rename from tests/amd/zen3/ryzen7-cezanne.test
rename to tests/amd/zen3/amd-ryzen-7-5800h-with-radeon-graphics.test
diff --git a/tests/amd/zen3/ryzen7-rembrandt.test b/tests/amd/zen3/amd-ryzen-7-6800hs-with-radeon-graphics.test
similarity index 100%
rename from tests/amd/zen3/ryzen7-rembrandt.test
rename to tests/amd/zen3/amd-ryzen-7-6800hs-with-radeon-graphics.test
diff --git a/tests/amd/zen3/ryzen7-rembrandt-r.test b/tests/amd/zen3/amd-ryzen-7-7735hs-with-radeon-graphics.test
similarity index 100%
rename from tests/amd/zen3/ryzen7-rembrandt-r.test
rename to tests/amd/zen3/amd-ryzen-7-7735hs-with-radeon-graphics.test
diff --git a/tests/amd/zen3/ryzen9-cezanne.test b/tests/amd/zen3/amd-ryzen-9-5900hs-with-radeon-graphics.test
similarity index 100%
rename from tests/amd/zen3/ryzen9-cezanne.test
rename to tests/amd/zen3/amd-ryzen-9-5900hs-with-radeon-graphics.test
diff --git a/tests/amd/zen3/ryzen9-vermeer.test b/tests/amd/zen3/amd-ryzen-9-5950x-16-core-processor.test
similarity index 100%
rename from tests/amd/zen3/ryzen9-vermeer.test
rename to tests/amd/zen3/amd-ryzen-9-5950x-16-core-processor.test
diff --git a/tests/amd/zen3/ryzen9-rembrandt.test b/tests/amd/zen3/amd-ryzen-9-6900hx-with-radeon-graphics.test
similarity index 100%
rename from tests/amd/zen3/ryzen9-rembrandt.test
rename to tests/amd/zen3/amd-ryzen-9-6900hx-with-radeon-graphics.test
diff --git a/tests/amd/zen4/epyc-genoa.test.xz b/tests/amd/zen4/amd-epyc-9124-16-core-processor.test.xz
similarity index 87%
rename from tests/amd/zen4/epyc-genoa.test.xz
rename to tests/amd/zen4/amd-epyc-9124-16-core-processor.test.xz
index 92e7d0c..439c51a 100644
Binary files a/tests/amd/zen4/epyc-genoa.test.xz and b/tests/amd/zen4/amd-epyc-9124-16-core-processor.test.xz differ
diff --git a/tests/amd/zen4/ryzen5-raphael.test b/tests/amd/zen4/amd-ryzen-5-7600x-6-core-processor.test
similarity index 100%
rename from tests/amd/zen4/ryzen5-raphael.test
rename to tests/amd/zen4/amd-ryzen-5-7600x-6-core-processor.test
diff --git a/tests/amd/zen4/ryzen7-raphael.test b/tests/amd/zen4/amd-ryzen-7-7800x3d-8-core-processor.test
similarity index 100%
rename from tests/amd/zen4/ryzen7-raphael.test
rename to tests/amd/zen4/amd-ryzen-7-7800x3d-8-core-processor.test
diff --git a/tests/amd/zen4/ryzen7-phoenix-g.test b/tests/amd/zen4/amd-ryzen-7-8700g-with-radeon-780m-graphics.test
similarity index 100%
rename from tests/amd/zen4/ryzen7-phoenix-g.test
rename to tests/amd/zen4/amd-ryzen-7-8700g-with-radeon-780m-graphics.test
diff --git a/tests/amd/zen4/ryzen7-hawk-point.test b/tests/amd/zen4/amd-ryzen-7-8845hs-with-radeon-780m-graphics.test
similarity index 100%
rename from tests/amd/zen4/ryzen7-hawk-point.test
rename to tests/amd/zen4/amd-ryzen-7-8845hs-with-radeon-780m-graphics.test
diff --git a/tests/amd/zen4/ryzen9-raphael.test b/tests/amd/zen4/amd-ryzen-9-7900x-12-core-processor.test
similarity index 100%
rename from tests/amd/zen4/ryzen9-raphael.test
rename to tests/amd/zen4/amd-ryzen-9-7900x-12-core-processor.test
diff --git a/tests/amd/zen4/ryzen9-phoenix-h.test b/tests/amd/zen4/amd-ryzen-9-7940h-with-radeon-780m-graphics.test
similarity index 100%
rename from tests/amd/zen4/ryzen9-phoenix-h.test
rename to tests/amd/zen4/amd-ryzen-9-7940h-with-radeon-780m-graphics.test
diff --git a/tests/amd/zen4/threadripper-pro-storm-peak.test.xz b/tests/amd/zen4/amd-ryzen-threadripper-pro-7995wx-96-cores.test.xz
similarity index 86%
rename from tests/amd/zen4/threadripper-pro-storm-peak.test.xz
rename to tests/amd/zen4/amd-ryzen-threadripper-pro-7995wx-96-cores.test.xz
index bbd65ce..c4beac1 100644
Binary files a/tests/amd/zen4/threadripper-pro-storm-peak.test.xz and b/tests/amd/zen4/amd-ryzen-threadripper-pro-7995wx-96-cores.test.xz differ
diff --git a/tests/amd/zen4/ryzen-z1-phoenix.test b/tests/amd/zen4/amd-ryzen-z1.test
similarity index 100%
rename from tests/amd/zen4/ryzen-z1-phoenix.test
rename to tests/amd/zen4/amd-ryzen-z1.test
diff --git a/tests/amd/zen5/epyc-turin.test.xz b/tests/amd/zen5/amd-epyc-9655-96-core-processor.test.xz
similarity index 83%
rename from tests/amd/zen5/epyc-turin.test.xz
rename to tests/amd/zen5/amd-epyc-9655-96-core-processor.test.xz
index e06de9a..c448487 100644
Binary files a/tests/amd/zen5/epyc-turin.test.xz and b/tests/amd/zen5/amd-epyc-9655-96-core-processor.test.xz differ
diff --git a/tests/amd/zen5/epyc-turin-dense.test.xz b/tests/amd/zen5/amd-epyc-9965-192-core-processor.test.xz
similarity index 96%
rename from tests/amd/zen5/epyc-turin-dense.test.xz
rename to tests/amd/zen5/amd-epyc-9965-192-core-processor.test.xz
index 2e44787..b8acd0f 100644
Binary files a/tests/amd/zen5/epyc-turin-dense.test.xz and b/tests/amd/zen5/amd-epyc-9965-192-core-processor.test.xz differ
diff --git a/tests/amd/zen5/ryzen7-granite-ridge.test b/tests/amd/zen5/amd-ryzen-7-9700x-8-core-processor.test
similarity index 100%
rename from tests/amd/zen5/ryzen7-granite-ridge.test
rename to tests/amd/zen5/amd-ryzen-7-9700x-8-core-processor.test
diff --git a/tests/amd/zen5/ryzen9-granite-ridge.test b/tests/amd/zen5/amd-ryzen-9-9950x-16-core-processor.test
similarity index 100%
rename from tests/amd/zen5/ryzen9-granite-ridge.test
rename to tests/amd/zen5/amd-ryzen-9-9950x-16-core-processor.test
diff --git a/tests/arm/armv7a/cortex-a15-qemu.test b/tests/arm/armv7a/cortex-a15.test
similarity index 100%
rename from tests/arm/armv7a/cortex-a15-qemu.test
rename to tests/arm/armv7a/cortex-a15.test
diff --git a/tests/arm/armv7a/cortex-a7-qemu.test b/tests/arm/armv7a/cortex-a7.test
similarity index 100%
rename from tests/arm/armv7a/cortex-a7-qemu.test
rename to tests/arm/armv7a/cortex-a7.test
diff --git a/tests/arm/armv8a/cortex-a57-qemu.test b/tests/arm/armv8a/cortex-a57.test
similarity index 100%
rename from tests/arm/armv8a/cortex-a57-qemu.test
rename to tests/arm/armv8a/cortex-a57.test
diff --git a/tests/arm/armv9a/neoverse-n2-qemu.test b/tests/arm/armv9a/neoverse-n2.test
similarity index 100%
rename from tests/arm/armv9a/neoverse-n2-qemu.test
rename to tests/arm/armv9a/neoverse-n2.test
diff --git a/tests/hygon/dhyana/dhyana.test b/tests/hygon/dhyana/hygon-c86-7185-32-core-processor.test
similarity index 100%
rename from tests/hygon/dhyana/dhyana.test
rename to tests/hygon/dhyana/hygon-c86-7185-32-core-processor.test
diff --git a/tests/intel/ia-32/netburst/willamette-celeron.test b/tests/intel/ia-32/netburst/intel-celeron-cpu-1.80ghz.test
similarity index 100%
rename from tests/intel/ia-32/netburst/willamette-celeron.test
rename to tests/intel/ia-32/netburst/intel-celeron-cpu-1.80ghz.test
diff --git a/tests/intel/ia-32/netburst/prescott-celeron.test b/tests/intel/ia-32/netburst/intel-celeron-cpu-2.40ghz.test
similarity index 100%
rename from tests/intel/ia-32/netburst/prescott-celeron.test
rename to tests/intel/ia-32/netburst/intel-celeron-cpu-2.40ghz.test
diff --git a/tests/intel/ia-32/netburst/northwood-celeron.test b/tests/intel/ia-32/netburst/intel-celeron-cpu-2.50ghz.test
similarity index 100%
rename from tests/intel/ia-32/netburst/northwood-celeron.test
rename to tests/intel/ia-32/netburst/intel-celeron-cpu-2.50ghz.test
diff --git a/tests/intel/ia-32/netburst/northwood-pentium.test b/tests/intel/ia-32/netburst/intel-pentium-4-cpu-2.66ghz.test
similarity index 100%
rename from tests/intel/ia-32/netburst/northwood-pentium.test
rename to tests/intel/ia-32/netburst/intel-pentium-4-cpu-2.66ghz.test
diff --git a/tests/intel/ia-32/netburst/prescott-pentium.test b/tests/intel/ia-32/netburst/intel-pentium-4-cpu-3.20ghz.test
similarity index 100%
rename from tests/intel/ia-32/netburst/prescott-pentium.test
rename to tests/intel/ia-32/netburst/intel-pentium-4-cpu-3.20ghz.test
diff --git a/tests/intel/ia-32/netburst/prestonia-xeon.test b/tests/intel/ia-32/netburst/intel-xeon-cpu-2.40ghz.test
similarity index 100%
rename from tests/intel/ia-32/netburst/prestonia-xeon.test
rename to tests/intel/ia-32/netburst/intel-xeon-cpu-2.40ghz.test
diff --git a/tests/intel/ia-32/netburst/northwood-pentium-m.test b/tests/intel/ia-32/netburst/mobile-intel-pentium-4-m-cpu-2.20ghz.test
similarity index 100%
rename from tests/intel/ia-32/netburst/northwood-pentium-m.test
rename to tests/intel/ia-32/netburst/mobile-intel-pentium-4-m-cpu-2.20ghz.test
diff --git a/tests/intel/ia-32/p6/yonah-core-solo.test b/tests/intel/ia-32/p6/genuine-intel-cpu-1300-@-1.66ghz.test
similarity index 100%
rename from tests/intel/ia-32/p6/yonah-core-solo.test
rename to tests/intel/ia-32/p6/genuine-intel-cpu-1300-@-1.66ghz.test
diff --git a/tests/intel/ia-32/p6/yonah-core-duo-t2400.test b/tests/intel/ia-32/p6/genuine-intel-cpu-t2400-@-1.83ghz.test
similarity index 100%
rename from tests/intel/ia-32/p6/yonah-core-duo-t2400.test
rename to tests/intel/ia-32/p6/genuine-intel-cpu-t2400-@-1.83ghz.test
diff --git a/tests/intel/ia-32/p6/yonah-core-duo-t2600.test b/tests/intel/ia-32/p6/intel-core-duo-cpu-t2600-@-2.16ghz.test
similarity index 100%
rename from tests/intel/ia-32/p6/yonah-core-duo-t2600.test
rename to tests/intel/ia-32/p6/intel-core-duo-cpu-t2600-@-2.16ghz.test
diff --git a/tests/intel/ia-32/p6/dixon-pentium.test b/tests/intel/ia-32/p6/intel-pentium-ii-dixon.test
similarity index 100%
rename from tests/intel/ia-32/p6/dixon-pentium.test
rename to tests/intel/ia-32/p6/intel-pentium-ii-dixon.test
diff --git a/tests/intel/ia-32/p6/dothan-pentium-m.test b/tests/intel/ia-32/p6/intel-pentium-m-processor-1.60ghz.test
similarity index 100%
rename from tests/intel/ia-32/p6/dothan-pentium-m.test
rename to tests/intel/ia-32/p6/intel-pentium-m-processor-1.60ghz.test
diff --git a/tests/intel/qemu/qemu-cpu64-rhel6.test b/tests/intel/qemu/qemu-virtual-cpu-version.test
similarity index 100%
rename from tests/intel/qemu/qemu-cpu64-rhel6.test
rename to tests/intel/qemu/qemu-virtual-cpu-version.test
diff --git a/tests/intel/x86-64/core/conroe-l-celeron.test b/tests/intel/x86-64/core/intel-celeron-cpu-420-@-1.60ghz.test
similarity index 100%
rename from tests/intel/x86-64/core/conroe-l-celeron.test
rename to tests/intel/x86-64/core/intel-celeron-cpu-420-@-1.60ghz.test
diff --git a/tests/intel/x86-64/core/penryn-l-celeron.test b/tests/intel/x86-64/core/intel-celeron-cpu-900-@-2.20ghz.test
similarity index 100%
rename from tests/intel/x86-64/core/penryn-l-celeron.test
rename to tests/intel/x86-64/core/intel-celeron-cpu-900-@-2.20ghz.test
diff --git a/tests/intel/x86-64/core/allendale-celeron.test b/tests/intel/x86-64/core/intel-celeron-cpu-e1200-@-1.60ghz.test
similarity index 100%
rename from tests/intel/x86-64/core/allendale-celeron.test
rename to tests/intel/x86-64/core/intel-celeron-cpu-e1200-@-1.60ghz.test
diff --git a/tests/intel/x86-64/core/wolfdale-celeron.test b/tests/intel/x86-64/core/intel-celeron-cpu-e3400-@-2.60ghz.test
similarity index 100%
rename from tests/intel/x86-64/core/wolfdale-celeron.test
rename to tests/intel/x86-64/core/intel-celeron-cpu-e3400-@-2.60ghz.test
diff --git a/tests/intel/x86-64/core/conroe-core-2-duo.test b/tests/intel/x86-64/core/intel-core2-cpu-6420-@-2.13ghz.test
similarity index 100%
rename from tests/intel/x86-64/core/conroe-core-2-duo.test
rename to tests/intel/x86-64/core/intel-core2-cpu-6420-@-2.13ghz.test
diff --git a/tests/intel/x86-64/core/merom-core-2-duo-2m.test b/tests/intel/x86-64/core/intel-core2-cpu-t5600-@-1.83ghz.test
similarity index 100%
rename from tests/intel/x86-64/core/merom-core-2-duo-2m.test
rename to tests/intel/x86-64/core/intel-core2-cpu-t5600-@-1.83ghz.test
diff --git a/tests/intel/x86-64/core/allendale-core-2-duo.test b/tests/intel/x86-64/core/intel-core2-duo-cpu-e4500-@-2.20ghz.test
similarity index 100%
rename from tests/intel/x86-64/core/allendale-core-2-duo.test
rename to tests/intel/x86-64/core/intel-core2-duo-cpu-e4500-@-2.20ghz.test
diff --git a/tests/intel/x86-64/core/merom-core-2-duo-4m.test b/tests/intel/x86-64/core/intel-core2-duo-cpu-t7500-@-2.20ghz.test
similarity index 100%
rename from tests/intel/x86-64/core/merom-core-2-duo-4m.test
rename to tests/intel/x86-64/core/intel-core2-duo-cpu-t7500-@-2.20ghz.test
diff --git a/tests/intel/x86-64/core/penryn-core-2-duo-3m.test b/tests/intel/x86-64/core/intel-core2-duo-cpu-t8100-@-2.10ghz.test
similarity index 100%
rename from tests/intel/x86-64/core/penryn-core-2-duo-3m.test
rename to tests/intel/x86-64/core/intel-core2-duo-cpu-t8100-@-2.10ghz.test
diff --git a/tests/intel/x86-64/core/kentsfield-core-2-quad.test b/tests/intel/x86-64/core/intel-core2-quad-cpu-q6600-@-2.40ghz.test
similarity index 100%
rename from tests/intel/x86-64/core/kentsfield-core-2-quad.test
rename to tests/intel/x86-64/core/intel-core2-quad-cpu-q6600-@-2.40ghz.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-@2.50ghz.test
new file mode 100644
index 0000000..99fdfdd
--- /dev/null
+++ b/tests/intel/x86-64/core/intel-core2-quad-cpu-q9300-@2.50ghz.test
@@ -0,0 +1,128 @@
+------[ CPUID Registers / Logical CPU #0 ]------
+CPUID Registers (CPU #1):
+CPUID 00000000: 0000000A-756E6547-6C65746E-49656E69
+CPUID 00000001: 00010677-00040800-0008E3FD-BFEBFBFF
+CPUID 00000002: 05B0B101-005657F0-00000000-2CB43048
+CPUID 00000003: 00000000-00000000-00000000-00000000
+CPUID 00000004: 0C000121-01C0003F-0000003F-00000000
+CPUID 00000004: 0C000122-01C0003F-0000003F-00000000
+CPUID 00000004: 0C004143-02C0003F-00000FFF-00000000
+CPUID 00000005: 00000040-00000040-00000003-00000020
+CPUID 00000006: 00000001-00000002-00000001-00000000
+CPUID 00000007: 00000000-00000000-00000000-00000000
+CPUID 00000008: 00000400-00000000-00000000-00000000
+CPUID 00000009: 00000000-00000000-00000000-00000000
+CPUID 0000000A: 07280202-00000000-00000000-00000503
+CPUID 80000000: 80000008-00000000-00000000-00000000
+CPUID 80000001: 00000000-00000000-00000001-20100000
+CPUID 80000002: 65746E49-2952286C-726F4320-4D542865
+CPUID 80000003: 51203229-20646175-55504320-51202020
+CPUID 80000004: 30303339-20402020-30352E32-007A4847
+CPUID 80000005: 00000000-00000000-00000000-00000000
+CPUID 80000006: 00000000-00000000-0C006040-00000000
+CPUID 80000007: 00000000-00000000-00000000-00000000
+CPUID 80000008: 00003024-00000000-00000000-00000000
+------[ CPUID Registers / Logical CPU #1 ]------
+CPUID 00000000: 0000000A-756E6547-6C65746E-49656E69
+CPUID 00000001: 00010677-01040800-0008E3FD-BFEBFBFF
+CPUID 00000002: 05B0B101-005657F0-00000000-2CB43048
+CPUID 00000003: 00000000-00000000-00000000-00000000
+CPUID 00000004: 0C000121-01C0003F-0000003F-00000000
+CPUID 00000004: 0C000122-01C0003F-0000003F-00000000
+CPUID 00000004: 0C004143-02C0003F-00000FFF-00000000
+CPUID 00000005: 00000040-00000040-00000003-00000020
+CPUID 00000006: 00000001-00000002-00000001-00000000
+CPUID 00000007: 00000000-00000000-00000000-00000000
+CPUID 00000008: 00000400-00000000-00000000-00000000
+CPUID 00000009: 00000000-00000000-00000000-00000000
+CPUID 0000000A: 07280202-00000000-00000000-00000503
+CPUID 80000000: 80000008-00000000-00000000-00000000
+CPUID 80000001: 00000000-00000000-00000001-20100000
+CPUID 80000002: 65746E49-2952286C-726F4320-4D542865
+CPUID 80000003: 51203229-20646175-55504320-51202020
+CPUID 80000004: 30303339-20402020-30352E32-007A4847
+CPUID 80000005: 00000000-00000000-00000000-00000000
+CPUID 80000006: 00000000-00000000-0C006040-00000000
+CPUID 80000007: 00000000-00000000-00000000-00000000
+CPUID 80000008: 00003024-00000000-00000000-00000000
+------[ CPUID Registers / Logical CPU #2 ]------
+CPUID 00000000: 0000000A-756E6547-6C65746E-49656E69
+CPUID 00000001: 00010677-02040800-0008E3FD-BFEBFBFF
+CPUID 00000002: 05B0B101-005657F0-00000000-2CB43048
+CPUID 00000003: 00000000-00000000-00000000-00000000
+CPUID 00000004: 0C000121-01C0003F-0000003F-00000000
+CPUID 00000004: 0C000122-01C0003F-0000003F-00000000
+CPUID 00000004: 0C004143-02C0003F-00000FFF-00000000
+CPUID 00000005: 00000040-00000040-00000003-00000020
+CPUID 00000006: 00000001-00000002-00000001-00000000
+CPUID 00000007: 00000000-00000000-00000000-00000000
+CPUID 00000008: 00000400-00000000-00000000-00000000
+CPUID 00000009: 00000000-00000000-00000000-00000000
+CPUID 0000000A: 07280202-00000000-00000000-00000503
+CPUID 80000000: 80000008-00000000-00000000-00000000
+CPUID 80000001: 00000000-00000000-00000001-20100000
+CPUID 80000002: 65746E49-2952286C-726F4320-4D542865
+CPUID 80000003: 51203229-20646175-55504320-51202020
+CPUID 80000004: 30303339-20402020-30352E32-007A4847
+CPUID 80000005: 00000000-00000000-00000000-00000000
+CPUID 80000006: 00000000-00000000-0C006040-00000000
+CPUID 80000007: 00000000-00000000-00000000-00000000
+CPUID 80000008: 00003024-00000000-00000000-00000000
+------[ CPUID Registers / Logical CPU #3 ]------
+CPUID 00000000: 0000000A-756E6547-6C65746E-49656E69
+CPUID 00000001: 00010677-03040800-0008E3FD-BFEBFBFF
+CPUID 00000002: 05B0B101-005657F0-00000000-2CB43048
+CPUID 00000003: 00000000-00000000-00000000-00000000
+CPUID 00000004: 0C000121-01C0003F-0000003F-00000000
+CPUID 00000004: 0C000122-01C0003F-0000003F-00000000
+CPUID 00000004: 0C004143-02C0003F-00000FFF-00000000
+CPUID 00000005: 00000040-00000040-00000003-00000020
+CPUID 00000006: 00000001-00000002-00000001-00000000
+CPUID 00000007: 00000000-00000000-00000000-00000000
+CPUID 00000008: 00000400-00000000-00000000-00000000
+CPUID 00000009: 00000000-00000000-00000000-00000000
+CPUID 0000000A: 07280202-00000000-00000000-00000503
+CPUID 80000000: 80000008-00000000-00000000-00000000
+CPUID 80000001: 00000000-00000000-00000001-20100000
+CPUID 80000002: 65746E49-2952286C-726F4320-4D542865
+CPUID 80000003: 51203229-20646175-55504320-51202020
+CPUID 80000004: 30303339-20402020-30352E32-007A4847
+CPUID 80000005: 00000000-00000000-00000000-00000000
+CPUID 80000006: 00000000-00000000-0C006040-00000000
+CPUID 80000007: 00000000-00000000-00000000-00000000
+CPUID 80000008: 00003024-00000000-00000000-00000000
+--------------------------------------------------------------------------------
+x86
+x86-64-v2
+general
+6
+7
+7
+6
+23
+4
+4
+-1
+-1
+-1
+-1
+-1
+-1
+-1
+-1
+-1
+-1
+-1
+-1
+-1
+-1
+-1
+-1
+-1
+-1
+-1
+-1
+128 (non-authoritative)
+Core 2 Quad (Yorkfield-6M)
+45 nm
+fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 xd lm lahf_lm
diff --git a/tests/intel/x86-64/core/yorkfield-core-2-quad-6m.test b/tests/intel/x86-64/core/intel-core2-quad-cpu-q9450-@-2.66ghz.test
similarity index 100%
rename from tests/intel/x86-64/core/yorkfield-core-2-quad-6m.test
rename to tests/intel/x86-64/core/intel-core2-quad-cpu-q9450-@-2.66ghz.test
diff --git a/tests/intel/x86-64/core/allendale-pentium.test b/tests/intel/x86-64/core/intel-pentium-dual-cpu-e2160-@-1.80ghz.test
similarity index 100%
rename from tests/intel/x86-64/core/allendale-pentium.test
rename to tests/intel/x86-64/core/intel-pentium-dual-cpu-e2160-@-1.80ghz.test
diff --git a/tests/intel/x86-64/core/wolfdale-xeon.test b/tests/intel/x86-64/core/intel-xeon-cpu-e3110-@-3.00ghz.test
similarity index 100%
rename from tests/intel/x86-64/core/wolfdale-xeon.test
rename to tests/intel/x86-64/core/intel-xeon-cpu-e3110-@-3.00ghz.test
diff --git a/tests/intel/x86-64/core/clovertown-xeon.test b/tests/intel/x86-64/core/intel-xeon-cpu-e5335-@-2.00ghz.test
similarity index 100%
rename from tests/intel/x86-64/core/clovertown-xeon.test
rename to tests/intel/x86-64/core/intel-xeon-cpu-e5335-@-2.00ghz.test
diff --git a/tests/intel/x86-64/core/harpertown-xeon.test b/tests/intel/x86-64/core/intel-xeon-cpu-e5420-@-2.50ghz.test
similarity index 100%
rename from tests/intel/x86-64/core/harpertown-xeon.test
rename to tests/intel/x86-64/core/intel-xeon-cpu-e5420-@-2.50ghz.test
diff --git a/tests/intel/x86-64/core/wolfdale-pentium.test b/tests/intel/x86-64/core/pentium-dual-core-cpu-e5200-@-2.50ghz.test
similarity index 100%
rename from tests/intel/x86-64/core/wolfdale-pentium.test
rename to tests/intel/x86-64/core/pentium-dual-core-cpu-e5200-@-2.50ghz.test
diff --git a/tests/intel/x86-64/core/penryn-pentium-m.test b/tests/intel/x86-64/core/pentium-dual-core-cpu-t4500-@-2.30ghz.test
similarity index 100%
rename from tests/intel/x86-64/core/penryn-pentium-m.test
rename to tests/intel/x86-64/core/pentium-dual-core-cpu-t4500-@-2.30ghz.test
diff --git a/tests/intel/x86-64/core/yorkfield-core-2-quad-2m.test b/tests/intel/x86-64/core/yorkfield-core-2-quad-2m.test
deleted file mode 100644
index 229e193..0000000
--- a/tests/intel/x86-64/core/yorkfield-core-2-quad-2m.test
+++ /dev/null
@@ -1,107 +0,0 @@
-basic_cpuid[0]=0000000d 756e6547 6c65746e 49656e69
-basic_cpuid[1]=0001067a 00040800 0c08e3bd bfebfbff
-basic_cpuid[2]=05b0b101 005657f0 00000000 2cb4307d
-basic_cpuid[3]=00000000 00000000 00000000 00000000
-basic_cpuid[4]=0c000121 01c0003f 0000003f 00000001
-basic_cpuid[5]=00000040 00000040 00000003 00022220
-basic_cpuid[6]=00000001 00000002 00000003 00000000
-basic_cpuid[7]=00000000 00000000 00000000 00000000
-basic_cpuid[8]=00000400 00000000 00000000 00000000
-basic_cpuid[9]=00000000 00000000 00000000 00000000
-basic_cpuid[10]=07280202 00000000 00000000 00000503
-basic_cpuid[11]=00000000 00000000 00000000 00000000
-basic_cpuid[12]=00000000 00000000 00000000 00000000
-basic_cpuid[13]=00000003 00000240 00000240 00000000
-basic_cpuid[14]=00000003 00000240 00000240 00000000
-basic_cpuid[15]=00000003 00000240 00000240 00000000
-basic_cpuid[16]=00000003 00000240 00000240 00000000
-basic_cpuid[17]=00000003 00000240 00000240 00000000
-basic_cpuid[18]=00000003 00000240 00000240 00000000
-basic_cpuid[19]=00000003 00000240 00000240 00000000
-basic_cpuid[20]=00000003 00000240 00000240 00000000
-basic_cpuid[21]=00000003 00000240 00000240 00000000
-basic_cpuid[22]=00000003 00000240 00000240 00000000
-basic_cpuid[23]=00000003 00000240 00000240 00000000
-basic_cpuid[24]=00000003 00000240 00000240 00000000
-basic_cpuid[25]=00000003 00000240 00000240 00000000
-basic_cpuid[26]=00000003 00000240 00000240 00000000
-basic_cpuid[27]=00000003 00000240 00000240 00000000
-basic_cpuid[28]=00000003 00000240 00000240 00000000
-basic_cpuid[29]=00000003 00000240 00000240 00000000
-basic_cpuid[30]=00000003 00000240 00000240 00000000
-basic_cpuid[31]=00000003 00000240 00000240 00000000
-ext_cpuid[0]=80000008 00000000 00000000 00000000
-ext_cpuid[1]=00000000 00000000 00000001 20100000
-ext_cpuid[2]=00000000 00000000 00000000 00000000
-ext_cpuid[3]=00000000 00000000 00000000 51000000
-ext_cpuid[4]=30303338 20402020 30352e32 007a4847
-ext_cpuid[5]=00000000 00000000 00000000 00000000
-ext_cpuid[6]=00000000 00000000 08006040 00000000
-ext_cpuid[7]=00000000 00000000 00000000 00000000
-ext_cpuid[8]=00003024 00000000 00000000 00000000
-ext_cpuid[9]=00000003 00000240 00000240 00000000
-ext_cpuid[10]=00000003 00000240 00000240 00000000
-ext_cpuid[11]=00000003 00000240 00000240 00000000
-ext_cpuid[12]=00000003 00000240 00000240 00000000
-ext_cpuid[13]=00000003 00000240 00000240 00000000
-ext_cpuid[14]=00000003 00000240 00000240 00000000
-ext_cpuid[15]=00000003 00000240 00000240 00000000
-ext_cpuid[16]=00000003 00000240 00000240 00000000
-ext_cpuid[17]=00000003 00000240 00000240 00000000
-ext_cpuid[18]=00000003 00000240 00000240 00000000
-ext_cpuid[19]=00000003 00000240 00000240 00000000
-ext_cpuid[20]=00000003 00000240 00000240 00000000
-ext_cpuid[21]=00000003 00000240 00000240 00000000
-ext_cpuid[22]=00000003 00000240 00000240 00000000
-ext_cpuid[23]=00000003 00000240 00000240 00000000
-ext_cpuid[24]=00000003 00000240 00000240 00000000
-ext_cpuid[25]=00000003 00000240 00000240 00000000
-ext_cpuid[26]=00000003 00000240 00000240 00000000
-ext_cpuid[27]=00000003 00000240 00000240 00000000
-ext_cpuid[28]=00000003 00000240 00000240 00000000
-ext_cpuid[29]=00000003 00000240 00000240 00000000
-ext_cpuid[30]=00000003 00000240 00000240 00000000
-ext_cpuid[31]=00000003 00000240 00000240 00000000
-intel_fn4[0]=0c000121 01c0003f 0000003f 00000001
-intel_fn4[1]=0c000122 01c0003f 0000003f 00000001
-intel_fn4[2]=0c004143 01c0003f 00000fff 00000001
-intel_fn4[3]=00000000 00000000 00000000 00000000
-intel_fn11[0]=00000000 00000000 00000000 00000000
-intel_fn11[1]=00000000 00000000 00000000 00000000
-intel_fn11[2]=00000000 00000000 00000000 00000000
-intel_fn11[3]=00000000 00000000 00000000 00000000
---------------------------------------------------------------------------------
-x86
-x86-64-v3
-general
-6
-7
-10
-6
-23
-4
-4
-32
-32
-2048
--1
--1
-8
-8
-8
--1
--1
-64
-64
-64
--1
--1
--1
--1
--1
--1
--1
-128 (non-authoritative)
-Core 2 Quad (Yorkfield-6M)
-45 nm
-fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 xd xsave osxsave lm lahf_lm
diff --git a/tests/intel/x86-64/cypress-cove/rocket-lake-core-i7.test b/tests/intel/x86-64/cypress-cove/11th-gen-intel-core-i7-11700kf-@-3.60ghz.test
similarity index 100%
rename from tests/intel/x86-64/cypress-cove/rocket-lake-core-i7.test
rename to tests/intel/x86-64/cypress-cove/11th-gen-intel-core-i7-11700kf-@-3.60ghz.test
diff --git a/tests/intel/x86-64/cypress-cove/rocket-lake-xeon-e.test b/tests/intel/x86-64/cypress-cove/intel-xeon-e-2356g-cpu-@-3.20ghz.test
similarity index 100%
rename from tests/intel/x86-64/cypress-cove/rocket-lake-xeon-e.test
rename to tests/intel/x86-64/cypress-cove/intel-xeon-e-2356g-cpu-@-3.20ghz.test
diff --git a/tests/intel/x86-64/golden-cove/alder-lake-p-core-i3.test b/tests/intel/x86-64/golden-cove/12th-gen-intel-core-i3-1220p.test
similarity index 100%
rename from tests/intel/x86-64/golden-cove/alder-lake-p-core-i3.test
rename to tests/intel/x86-64/golden-cove/12th-gen-intel-core-i3-1220p.test
diff --git a/tests/intel/x86-64/golden-cove/alder-lake-s-core-i5.test b/tests/intel/x86-64/golden-cove/12th-gen-intel-core-i5-12400.test
similarity index 100%
rename from tests/intel/x86-64/golden-cove/alder-lake-s-core-i5.test
rename to tests/intel/x86-64/golden-cove/12th-gen-intel-core-i5-12400.test
diff --git a/tests/intel/x86-64/golden-cove/alder-lake-h-core-i7.test b/tests/intel/x86-64/golden-cove/12th-gen-intel-core-i7-12700h.test
similarity index 100%
rename from tests/intel/x86-64/golden-cove/alder-lake-h-core-i7.test
rename to tests/intel/x86-64/golden-cove/12th-gen-intel-core-i7-12700h.test
diff --git a/tests/intel/x86-64/golden-cove/alder-lake-hx-core-i7.test b/tests/intel/x86-64/golden-cove/12th-gen-intel-core-i7-12800hx.test
similarity index 100%
rename from tests/intel/x86-64/golden-cove/alder-lake-hx-core-i7.test
rename to tests/intel/x86-64/golden-cove/12th-gen-intel-core-i7-12800hx.test
diff --git a/tests/intel/x86-64/golden-cove/alder-lake-h-core-i9.test b/tests/intel/x86-64/golden-cove/12th-gen-intel-core-i9-12900hk.test
similarity index 100%
rename from tests/intel/x86-64/golden-cove/alder-lake-h-core-i9.test
rename to tests/intel/x86-64/golden-cove/12th-gen-intel-core-i9-12900hk.test
diff --git a/tests/intel/x86-64/golden-cove/alder-lake-s-core-i9.test b/tests/intel/x86-64/golden-cove/12th-gen-intel-core-i9-12900k.test
similarity index 100%
rename from tests/intel/x86-64/golden-cove/alder-lake-s-core-i9.test
rename to tests/intel/x86-64/golden-cove/12th-gen-intel-core-i9-12900k.test
diff --git a/tests/intel/x86-64/golden-cove/raptor-lake-s-core-i5.test b/tests/intel/x86-64/golden-cove/13th-gen-intel-core-i5-13500.test
similarity index 100%
rename from tests/intel/x86-64/golden-cove/raptor-lake-s-core-i5.test
rename to tests/intel/x86-64/golden-cove/13th-gen-intel-core-i5-13500.test
diff --git a/tests/intel/x86-64/golden-cove/alder-lake-u-pentium.test b/tests/intel/x86-64/golden-cove/intel-pentium-gold-8505.test
similarity index 100%
rename from tests/intel/x86-64/golden-cove/alder-lake-u-pentium.test
rename to tests/intel/x86-64/golden-cove/intel-pentium-gold-8505.test
diff --git a/tests/intel/x86-64/golden-cove/alder-lake-s-pentium.test b/tests/intel/x86-64/golden-cove/intel-pentium-gold-g7400.test
similarity index 100%
rename from tests/intel/x86-64/golden-cove/alder-lake-s-pentium.test
rename to tests/intel/x86-64/golden-cove/intel-pentium-gold-g7400.test
diff --git a/tests/intel/x86-64/golden-cove/sapphire-rapids-ws-xeon-w7.test b/tests/intel/x86-64/golden-cove/intel-xeon-w7-2475x.test
similarity index 100%
rename from tests/intel/x86-64/golden-cove/sapphire-rapids-ws-xeon-w7.test
rename to tests/intel/x86-64/golden-cove/intel-xeon-w7-2475x.test
diff --git a/tests/intel/x86-64/golden-cove/sapphire-rapids-ws-xeon-w9.test b/tests/intel/x86-64/golden-cove/intel-xeon-w9-3475x.test
similarity index 100%
rename from tests/intel/x86-64/golden-cove/sapphire-rapids-ws-xeon-w9.test
rename to tests/intel/x86-64/golden-cove/intel-xeon-w9-3475x.test
diff --git a/tests/intel/x86-64/haswell/haswell-core-i3.test b/tests/intel/x86-64/haswell/intel-core-i3-4130-cpu-@-3.40ghz.test
similarity index 100%
rename from tests/intel/x86-64/haswell/haswell-core-i3.test
rename to tests/intel/x86-64/haswell/intel-core-i3-4130-cpu-@-3.40ghz.test
diff --git a/tests/intel/x86-64/haswell/haswell-core-i5.test b/tests/intel/x86-64/haswell/intel-core-i5-4258u-cpu-@-2.40ghz.test
similarity index 100%
rename from tests/intel/x86-64/haswell/haswell-core-i5.test
rename to tests/intel/x86-64/haswell/intel-core-i5-4258u-cpu-@-2.40ghz.test
diff --git a/tests/intel/x86-64/haswell/haswell-core-i7.test b/tests/intel/x86-64/haswell/intel-core-i7-4710mq-cpu-@-2.50ghz.test
similarity index 100%
rename from tests/intel/x86-64/haswell/haswell-core-i7.test
rename to tests/intel/x86-64/haswell/intel-core-i7-4710mq-cpu-@-2.50ghz.test
diff --git a/tests/intel/x86-64/haswell/crystal-well-core-i7.test b/tests/intel/x86-64/haswell/intel-core-i7-4750hq-cpu-@-2.00ghz.test
similarity index 100%
rename from tests/intel/x86-64/haswell/crystal-well-core-i7.test
rename to tests/intel/x86-64/haswell/intel-core-i7-4750hq-cpu-@-2.00ghz.test
diff --git a/tests/intel/x86-64/haswell/broadwell-e-core-i7.test b/tests/intel/x86-64/haswell/intel-core-i7-6950x-cpu-@-3.00ghz.test
similarity index 100%
rename from tests/intel/x86-64/haswell/broadwell-e-core-i7.test
rename to tests/intel/x86-64/haswell/intel-core-i7-6950x-cpu-@-3.00ghz.test
diff --git a/tests/intel/x86-64/lion-cove/arrow-lake-s-core-ultra-5.test b/tests/intel/x86-64/lion-cove/intel-core-ultra-5-245k.test
similarity index 100%
rename from tests/intel/x86-64/lion-cove/arrow-lake-s-core-ultra-5.test
rename to tests/intel/x86-64/lion-cove/intel-core-ultra-5-245k.test
diff --git a/tests/intel/x86-64/lion-cove/arrow-lake-s-core-ultra-7.test b/tests/intel/x86-64/lion-cove/intel-core-ultra-7-265k.test
similarity index 100%
rename from tests/intel/x86-64/lion-cove/arrow-lake-s-core-ultra-7.test
rename to tests/intel/x86-64/lion-cove/intel-core-ultra-7-265k.test
diff --git a/tests/intel/x86-64/lion-cove/lunar-lake-v-core-ultra-9.test b/tests/intel/x86-64/lion-cove/intel-core-ultra-9-288v.test
similarity index 100%
rename from tests/intel/x86-64/lion-cove/lunar-lake-v-core-ultra-9.test
rename to tests/intel/x86-64/lion-cove/intel-core-ultra-9-288v.test
diff --git a/tests/intel/x86-64/nehalem/lynnfield-core-i5.test b/tests/intel/x86-64/nehalem/intel-core-i5-cpu-750-@-2.67ghz.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/lynnfield-core-i5.test
rename to tests/intel/x86-64/nehalem/intel-core-i5-cpu-750-@-2.67ghz.test
diff --git a/tests/intel/x86-64/nehalem/arrandale-core-i5.test b/tests/intel/x86-64/nehalem/intel-core-i5-cpu-m-520-@-2.40ghz.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/arrandale-core-i5.test
rename to tests/intel/x86-64/nehalem/intel-core-i5-cpu-m-520-@-2.40ghz.test
diff --git a/tests/intel/x86-64/nehalem/lynnfield-core-i7.test b/tests/intel/x86-64/nehalem/intel-core-i7-cpu-860-@-2.80ghz.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/lynnfield-core-i7.test
rename to tests/intel/x86-64/nehalem/intel-core-i7-cpu-860-@-2.80ghz.test
diff --git a/tests/intel/x86-64/nehalem/bloomfield-core-i7.test b/tests/intel/x86-64/nehalem/intel-core-i7-cpu-920-@-2.67ghz.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/bloomfield-core-i7.test
rename to tests/intel/x86-64/nehalem/intel-core-i7-cpu-920-@-2.67ghz.test
diff --git a/tests/intel/x86-64/nehalem/arrandale-core-i7.test b/tests/intel/x86-64/nehalem/intel-core-i7-cpu-m-640-@-2.80ghz.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/arrandale-core-i7.test
rename to tests/intel/x86-64/nehalem/intel-core-i7-cpu-m-640-@-2.80ghz.test
diff --git a/tests/intel/x86-64/nehalem/gulftown-core-i7.test b/tests/intel/x86-64/nehalem/intel-core-i7-cpu-x-980-@-3.33ghz.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/gulftown-core-i7.test
rename to tests/intel/x86-64/nehalem/intel-core-i7-cpu-x-980-@-3.33ghz.test
diff --git a/tests/intel/x86-64/nehalem/arrandale-pentium.test b/tests/intel/x86-64/nehalem/intel-pentium-cpu-p6100-@-2.00ghz.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/arrandale-pentium.test
rename to tests/intel/x86-64/nehalem/intel-pentium-cpu-p6100-@-2.00ghz.test
diff --git a/tests/intel/x86-64/nehalem/gainestown-xeon.test b/tests/intel/x86-64/nehalem/intel-xeon-cpu-e5520-@-2.27ghz.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/gainestown-xeon.test
rename to tests/intel/x86-64/nehalem/intel-xeon-cpu-e5520-@-2.27ghz.test
diff --git a/tests/intel/x86-64/nehalem/bloomfield-xeon.test b/tests/intel/x86-64/nehalem/intel-xeon-cpu-w3520-@-2.67ghz.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/bloomfield-xeon.test
rename to tests/intel/x86-64/nehalem/intel-xeon-cpu-w3520-@-2.67ghz.test
diff --git a/tests/intel/x86-64/nehalem/westmere-ep-xeon.test b/tests/intel/x86-64/nehalem/intel-xeon-cpu-x5650-@-2.67ghz.test
similarity index 100%
rename from tests/intel/x86-64/nehalem/westmere-ep-xeon.test
rename to tests/intel/x86-64/nehalem/intel-xeon-cpu-x5650-@-2.67ghz.test
diff --git a/tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i5.test b/tests/intel/x86-64/raptor-cove/13th-gen-intel-core-i5-13600k.test
similarity index 100%
rename from tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i5.test
rename to tests/intel/x86-64/raptor-cove/13th-gen-intel-core-i5-13600k.test
diff --git a/tests/intel/x86-64/raptor-cove/raptor-lake-u-core-i7.test b/tests/intel/x86-64/raptor-cove/13th-gen-intel-core-i7-1365u.test
similarity index 100%
rename from tests/intel/x86-64/raptor-cove/raptor-lake-u-core-i7.test
rename to tests/intel/x86-64/raptor-cove/13th-gen-intel-core-i7-1365u.test
diff --git a/tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i7.test b/tests/intel/x86-64/raptor-cove/13th-gen-intel-core-i7-13700k.test
similarity index 100%
rename from tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i7.test
rename to tests/intel/x86-64/raptor-cove/13th-gen-intel-core-i7-13700k.test
diff --git a/tests/intel/x86-64/raptor-cove/raptor-lake-h-core-i9.test b/tests/intel/x86-64/raptor-cove/13th-gen-intel-core-i9-13900h.test
similarity index 100%
rename from tests/intel/x86-64/raptor-cove/raptor-lake-h-core-i9.test
rename to tests/intel/x86-64/raptor-cove/13th-gen-intel-core-i9-13900h.test
diff --git a/tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i9.test b/tests/intel/x86-64/raptor-cove/13th-gen-intel-core-i9-13900kf.test
similarity index 100%
rename from tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i9.test
rename to tests/intel/x86-64/raptor-cove/13th-gen-intel-core-i9-13900kf.test
diff --git a/tests/intel/x86-64/raptor-cove/raptor-lake-p-core-i7.test b/tests/intel/x86-64/raptor-cove/13th-gen-intel-coret-i7-1370p.test
similarity index 100%
rename from tests/intel/x86-64/raptor-cove/raptor-lake-p-core-i7.test
rename to tests/intel/x86-64/raptor-cove/13th-gen-intel-coret-i7-1370p.test
diff --git a/tests/intel/x86-64/raptor-cove/raptor-lake-s-refresh-core-i5.test b/tests/intel/x86-64/raptor-cove/intel-core-i5-14600k.test
similarity index 100%
rename from tests/intel/x86-64/raptor-cove/raptor-lake-s-refresh-core-i5.test
rename to tests/intel/x86-64/raptor-cove/intel-core-i5-14600k.test
diff --git a/tests/intel/x86-64/raptor-cove/raptor-lake-s-refresh-core-i7.test b/tests/intel/x86-64/raptor-cove/intel-core-i7-14700k.test
similarity index 100%
rename from tests/intel/x86-64/raptor-cove/raptor-lake-s-refresh-core-i7.test
rename to tests/intel/x86-64/raptor-cove/intel-core-i7-14700k.test
diff --git a/tests/intel/x86-64/raptor-cove/raptor-lake-s-refresh-core-i9.test b/tests/intel/x86-64/raptor-cove/intel-core-i9-14900k.test
similarity index 100%
rename from tests/intel/x86-64/raptor-cove/raptor-lake-s-refresh-core-i9.test
rename to tests/intel/x86-64/raptor-cove/intel-core-i9-14900k.test
diff --git a/tests/intel/x86-64/raptor-cove/emerald-rapids-sp-xeon-platinum.test b/tests/intel/x86-64/raptor-cove/intel-xeon-platinum-8570.test
similarity index 100%
rename from tests/intel/x86-64/raptor-cove/emerald-rapids-sp-xeon-platinum.test
rename to tests/intel/x86-64/raptor-cove/intel-xeon-platinum-8570.test
diff --git a/tests/intel/x86-64/redwood-cove/meteor-lake-h-core-ultra-5.test b/tests/intel/x86-64/redwood-cove/intel-core-ultra-5-125h.test
similarity index 100%
rename from tests/intel/x86-64/redwood-cove/meteor-lake-h-core-ultra-5.test
rename to tests/intel/x86-64/redwood-cove/intel-core-ultra-5-125h.test
diff --git a/tests/intel/x86-64/redwood-cove/meteor-lake-h-core-ultra-7.test b/tests/intel/x86-64/redwood-cove/intel-core-ultra-7-155h.test
similarity index 100%
rename from tests/intel/x86-64/redwood-cove/meteor-lake-h-core-ultra-7.test
rename to tests/intel/x86-64/redwood-cove/intel-core-ultra-7-155h.test
diff --git a/tests/intel/x86-64/sandy-bridge/sandy-bridge-celeron.test b/tests/intel/x86-64/sandy-bridge/intel-celeron-cpu-g540-@-2.50ghz.test
similarity index 100%
rename from tests/intel/x86-64/sandy-bridge/sandy-bridge-celeron.test
rename to tests/intel/x86-64/sandy-bridge/intel-celeron-cpu-g540-@-2.50ghz.test
diff --git a/tests/intel/x86-64/sandy-bridge/ivy-bridge-core-i3.test b/tests/intel/x86-64/sandy-bridge/intel-core-i3-3220t-cpu-@-2.80ghz.test
similarity index 100%
rename from tests/intel/x86-64/sandy-bridge/ivy-bridge-core-i3.test
rename to tests/intel/x86-64/sandy-bridge/intel-core-i3-3220t-cpu-@-2.80ghz.test
diff --git a/tests/intel/x86-64/sandy-bridge/ivy-bridge-core-i5.test b/tests/intel/x86-64/sandy-bridge/intel-core-i5-3570k-cpu-@-3.40ghz.test
similarity index 100%
rename from tests/intel/x86-64/sandy-bridge/ivy-bridge-core-i5.test
rename to tests/intel/x86-64/sandy-bridge/intel-core-i5-3570k-cpu-@-3.40ghz.test
diff --git a/tests/intel/x86-64/sandy-bridge/sandy-bridge-core-i7.test b/tests/intel/x86-64/sandy-bridge/intel-core-i7-2600k-cpu-@-3.40ghz.test
similarity index 100%
rename from tests/intel/x86-64/sandy-bridge/sandy-bridge-core-i7.test
rename to tests/intel/x86-64/sandy-bridge/intel-core-i7-2600k-cpu-@-3.40ghz.test
diff --git a/tests/intel/x86-64/sandy-bridge/sandy-bridge-e-core-i7.test b/tests/intel/x86-64/sandy-bridge/intel-core-i7-3930k-cpu-@-3.20ghz.test
similarity index 100%
rename from tests/intel/x86-64/sandy-bridge/sandy-bridge-e-core-i7.test
rename to tests/intel/x86-64/sandy-bridge/intel-core-i7-3930k-cpu-@-3.20ghz.test
diff --git a/tests/intel/x86-64/sandy-bridge/sandy-bridge-xeon-e3.test b/tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e31275-@-3.40ghz.test
similarity index 100%
rename from tests/intel/x86-64/sandy-bridge/sandy-bridge-xeon-e3.test
rename to tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e31275-@-3.40ghz.test
diff --git a/tests/intel/x86-64/sandy-bridge/sandy-bridge-e-xeon-e5.test b/tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e5-2687w-0-@-3.10ghz.test
similarity index 100%
rename from tests/intel/x86-64/sandy-bridge/sandy-bridge-e-xeon-e5.test
rename to tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e5-2687w-0-@-3.10ghz.test
diff --git a/tests/intel/x86-64/sandy-bridge/ivy-bridge-xeon-e5.test b/tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e5-2697-v2-@-2.70ghz.test
similarity index 100%
rename from tests/intel/x86-64/sandy-bridge/ivy-bridge-xeon-e5.test
rename to tests/intel/x86-64/sandy-bridge/intel-xeon-cpu-e5-2697-v2-@-2.70ghz.test
diff --git a/tests/intel/x86-64/skylake/cannon-lake-core-i3-u.test b/tests/intel/x86-64/skylake/intel-core-i3-8121u-cpu-@-2.20ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/cannon-lake-core-i3-u.test
rename to tests/intel/x86-64/skylake/intel-core-i3-8121u-cpu-@-2.20ghz.test
diff --git a/tests/intel/x86-64/skylake/skylake-core-i5.test b/tests/intel/x86-64/skylake/intel-core-i5-6600k-cpu-@-3.50ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/skylake-core-i5.test
rename to tests/intel/x86-64/skylake/intel-core-i5-6600k-cpu-@-3.50ghz.test
diff --git a/tests/intel/x86-64/skylake/whiskey-lake-core-i5-u.test b/tests/intel/x86-64/skylake/intel-core-i5-8265u-cpu-@-1.60ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/whiskey-lake-core-i5-u.test
rename to tests/intel/x86-64/skylake/intel-core-i5-8265u-cpu-@-1.60ghz.test
diff --git a/tests/intel/x86-64/skylake/kaby-lake-r-core-i5.test b/tests/intel/x86-64/skylake/intel-core-i5-8350u-cpu-@-1.70ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/kaby-lake-r-core-i5.test
rename to tests/intel/x86-64/skylake/intel-core-i5-8350u-cpu-@-1.70ghz.test
diff --git a/tests/intel/x86-64/skylake/comet-lake-core-i7-u.test b/tests/intel/x86-64/skylake/intel-core-i7-10610u-cpu-@-1.80ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/comet-lake-core-i7-u.test
rename to tests/intel/x86-64/skylake/intel-core-i7-10610u-cpu-@-1.80ghz.test
diff --git a/tests/intel/x86-64/skylake/kaby-lake-core-i7-u.test b/tests/intel/x86-64/skylake/intel-core-i7-7500u-cpu-@-2.70ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/kaby-lake-core-i7-u.test
rename to tests/intel/x86-64/skylake/intel-core-i7-7500u-cpu-@-2.70ghz.test
diff --git a/tests/intel/x86-64/skylake/skylake-x-core-i7.test b/tests/intel/x86-64/skylake/intel-core-i7-7800x-cpu-@-3.50ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/skylake-x-core-i7.test
rename to tests/intel/x86-64/skylake/intel-core-i7-7800x-cpu-@-3.50ghz.test
diff --git a/tests/intel/x86-64/skylake/coffee-lake-core-i7.test b/tests/intel/x86-64/skylake/intel-core-i7-8700k-cpu-@-3.70ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/coffee-lake-core-i7.test
rename to tests/intel/x86-64/skylake/intel-core-i7-8700k-cpu-@-3.70ghz.test
diff --git a/tests/intel/x86-64/skylake/kaby-lake-core-i7-g.test b/tests/intel/x86-64/skylake/intel-core-i7-8705g-cpu-@-3.10ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/kaby-lake-core-i7-g.test
rename to tests/intel/x86-64/skylake/intel-core-i7-8705g-cpu-@-3.10ghz.test
diff --git a/tests/intel/x86-64/skylake/cascade-lake-x-core-i9.test b/tests/intel/x86-64/skylake/intel-core-i9-10980xe-cpu-@-3.00ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/cascade-lake-x-core-i9.test
rename to tests/intel/x86-64/skylake/intel-core-i9-10980xe-cpu-@-3.00ghz.test
diff --git a/tests/intel/x86-64/skylake/skylake-pentium.test b/tests/intel/x86-64/skylake/intel-pentium-cpu-4405u-@-2.10ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/skylake-pentium.test
rename to tests/intel/x86-64/skylake/intel-pentium-cpu-4405u-@-2.10ghz.test
diff --git a/tests/intel/x86-64/skylake/skylake-sp-xeon-bronze.test b/tests/intel/x86-64/skylake/intel-xeon-bronze-3104-cpu-@-1.70ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/skylake-sp-xeon-bronze.test
rename to tests/intel/x86-64/skylake/intel-xeon-bronze-3104-cpu-@-1.70ghz.test
diff --git a/tests/intel/x86-64/skylake/skylake-de-xeon-d.test b/tests/intel/x86-64/skylake/intel-xeon-d-2183it-cpu-@-2.20ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/skylake-de-xeon-d.test
rename to tests/intel/x86-64/skylake/intel-xeon-d-2183it-cpu-@-2.20ghz.test
diff --git a/tests/intel/x86-64/skylake/skylake-w-xeon-d.test b/tests/intel/x86-64/skylake/intel-xeon-d-2183it-cpu-@2.20ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/skylake-w-xeon-d.test
rename to tests/intel/x86-64/skylake/intel-xeon-d-2183it-cpu-@2.20ghz.test
diff --git a/tests/intel/x86-64/skylake/cascade-lake-sp-xeon-gold.test b/tests/intel/x86-64/skylake/intel-xeon-gold-5215-cpu-@-2.50ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/cascade-lake-sp-xeon-gold.test
rename to tests/intel/x86-64/skylake/intel-xeon-gold-5215-cpu-@-2.50ghz.test
diff --git a/tests/intel/x86-64/skylake/skylake-sp-xeon-gold.test b/tests/intel/x86-64/skylake/intel-xeon-gold-6154-cpu-@-3.00ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/skylake-sp-xeon-gold.test
rename to tests/intel/x86-64/skylake/intel-xeon-gold-6154-cpu-@-3.00ghz.test
diff --git a/tests/intel/x86-64/skylake/skylake-sp-xeon-platinum.test b/tests/intel/x86-64/skylake/intel-xeon-platinum-8180-cpu-@-2.50ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/skylake-sp-xeon-platinum.test
rename to tests/intel/x86-64/skylake/intel-xeon-platinum-8180-cpu-@-2.50ghz.test
diff --git a/tests/intel/x86-64/skylake/cascade-lake-sp-xeon-platinum.test b/tests/intel/x86-64/skylake/intel-xeon-platinum-8280-cpu-@-2.70ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/cascade-lake-sp-xeon-platinum.test
rename to tests/intel/x86-64/skylake/intel-xeon-platinum-8280-cpu-@-2.70ghz.test
diff --git a/tests/intel/x86-64/skylake/skylake-sp-xeon-silver.test b/tests/intel/x86-64/skylake/intel-xeon-silver-4108-cpu-@-1.80ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/skylake-sp-xeon-silver.test
rename to tests/intel/x86-64/skylake/intel-xeon-silver-4108-cpu-@-1.80ghz.test
diff --git a/tests/intel/x86-64/skylake/cascade-lake-sp-xeon-silver.test b/tests/intel/x86-64/skylake/intel-xeon-silver-4214-cpu-@-2.20ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/cascade-lake-sp-xeon-silver.test
rename to tests/intel/x86-64/skylake/intel-xeon-silver-4214-cpu-@-2.20ghz.test
diff --git a/tests/intel/x86-64/skylake/cascade-lake-w-xeon-w.test b/tests/intel/x86-64/skylake/intel-xeon-w-3275-cpu-@-2.50ghz.test
similarity index 100%
rename from tests/intel/x86-64/skylake/cascade-lake-w-xeon-w.test
rename to tests/intel/x86-64/skylake/intel-xeon-w-3275-cpu-@-2.50ghz.test
diff --git a/tests/intel/x86-64/sunny-cove/ice-lake-i5.test b/tests/intel/x86-64/sunny-cove/intel-core-i5-1035g4-cpu-@-1.10ghz.test
similarity index 100%
rename from tests/intel/x86-64/sunny-cove/ice-lake-i5.test
rename to tests/intel/x86-64/sunny-cove/intel-core-i5-1035g4-cpu-@-1.10ghz.test
diff --git a/tests/intel/x86-64/sunny-cove/ice-lake-i7.test b/tests/intel/x86-64/sunny-cove/intel-core-i7-1065g7-cpu-@-1.30ghz.test
similarity index 100%
rename from tests/intel/x86-64/sunny-cove/ice-lake-i7.test
rename to tests/intel/x86-64/sunny-cove/intel-core-i7-1065g7-cpu-@-1.30ghz.test
diff --git a/tests/intel/x86-64/sunny-cove/ice-lake-d-xeon-d.test b/tests/intel/x86-64/sunny-cove/intel-xeon-d-1718t-cpu-@-2.60ghz.test
similarity index 100%
rename from tests/intel/x86-64/sunny-cove/ice-lake-d-xeon-d.test
rename to tests/intel/x86-64/sunny-cove/intel-xeon-d-1718t-cpu-@-2.60ghz.test
diff --git a/tests/intel/x86-64/willow-cove/tiger-lake-core-i5.test b/tests/intel/x86-64/willow-cove/11th-gen-intel-core-i5-1135g7-@-2.40ghz.test
similarity index 100%
rename from tests/intel/x86-64/willow-cove/tiger-lake-core-i5.test
rename to tests/intel/x86-64/willow-cove/11th-gen-intel-core-i5-1135g7-@-2.40ghz.test
diff --git a/tests/intel/x86-atom/bonnell/diamondville-atom-330.test b/tests/intel/x86-atom/bonnell/intel-atom-cpu-330-@-1.60ghz.test
similarity index 100%
rename from tests/intel/x86-atom/bonnell/diamondville-atom-330.test
rename to tests/intel/x86-atom/bonnell/intel-atom-cpu-330-@-1.60ghz.test
diff --git a/tests/intel/x86-atom/bonnell/pineview-atom-d425.test b/tests/intel/x86-atom/bonnell/intel-atom-cpu-d425-@-1.80ghz.test
similarity index 100%
rename from tests/intel/x86-atom/bonnell/pineview-atom-d425.test
rename to tests/intel/x86-atom/bonnell/intel-atom-cpu-d425-@-1.80ghz.test
diff --git a/tests/intel/x86-atom/bonnell/pineview-atom-d525.test b/tests/intel/x86-atom/bonnell/intel-atom-cpu-d525-@-1.80ghz.test
similarity index 100%
rename from tests/intel/x86-atom/bonnell/pineview-atom-d525.test
rename to tests/intel/x86-atom/bonnell/intel-atom-cpu-d525-@-1.80ghz.test
diff --git a/tests/intel/x86-atom/bonnell/diamondville-atom-n270.test b/tests/intel/x86-atom/bonnell/intel-atom-cpu-n270-@-1.60ghz.test
similarity index 100%
rename from tests/intel/x86-atom/bonnell/diamondville-atom-n270.test
rename to tests/intel/x86-atom/bonnell/intel-atom-cpu-n270-@-1.60ghz.test
diff --git a/tests/intel/x86-atom/bonnell/pineview-atom-n450.test b/tests/intel/x86-atom/bonnell/intel-atom-cpu-n450-@-1.66ghz.test
similarity index 100%
rename from tests/intel/x86-atom/bonnell/pineview-atom-n450.test
rename to tests/intel/x86-atom/bonnell/intel-atom-cpu-n450-@-1.66ghz.test
diff --git a/tests/intel/x86-atom/goldmont-plus/apollo-lake-atom-x5.test b/tests/intel/x86-atom/goldmont-plus/intel-atom-processor-e3930-@-1.30ghz.test
similarity index 100%
rename from tests/intel/x86-atom/goldmont-plus/apollo-lake-atom-x5.test
rename to tests/intel/x86-atom/goldmont-plus/intel-atom-processor-e3930-@-1.30ghz.test
diff --git a/tests/intel/x86-atom/goldmont-plus/gemini-lake-celeron.test b/tests/intel/x86-atom/goldmont-plus/intel-celeron-n4100-cpu-@-1.10ghz.test
similarity index 100%
rename from tests/intel/x86-atom/goldmont-plus/gemini-lake-celeron.test
rename to tests/intel/x86-atom/goldmont-plus/intel-celeron-n4100-cpu-@-1.10ghz.test
diff --git a/tests/intel/x86-atom/gracemont/twin-lake-n-core-3.test b/tests/intel/x86-atom/gracemont/intel-core-3-n355.test
similarity index 100%
rename from tests/intel/x86-atom/gracemont/twin-lake-n-core-3.test
rename to tests/intel/x86-atom/gracemont/intel-core-3-n355.test
diff --git a/tests/intel/x86-atom/gracemont/alder-lake-n-core-i3.test b/tests/intel/x86-atom/gracemont/intel-core-i3-n305.test
similarity index 100%
rename from tests/intel/x86-atom/gracemont/alder-lake-n-core-i3.test
rename to tests/intel/x86-atom/gracemont/intel-core-i3-n305.test
diff --git a/tests/intel/x86-atom/gracemont/alder-lake-n95.test b/tests/intel/x86-atom/gracemont/intel-n95.test
similarity index 100%
rename from tests/intel/x86-atom/gracemont/alder-lake-n95.test
rename to tests/intel/x86-atom/gracemont/intel-n95.test
diff --git a/tests/intel/x86-atom/saltwell/cedarview-atom.test b/tests/intel/x86-atom/saltwell/intel-atom-cpu-n2800-@-1.86ghz.test
similarity index 100%
rename from tests/intel/x86-atom/saltwell/cedarview-atom.test
rename to tests/intel/x86-atom/saltwell/intel-atom-cpu-n2800-@-1.86ghz.test
diff --git a/tests/intel/x86-atom/silvermont/bay-trail-i-atom-e3827.test b/tests/intel/x86-atom/silvermont/intel-atom-cpu-e3827-@-1.74ghz.test
similarity index 100%
rename from tests/intel/x86-atom/silvermont/bay-trail-i-atom-e3827.test
rename to tests/intel/x86-atom/silvermont/intel-atom-cpu-e3827-@-1.74ghz.test
diff --git a/tests/intel/x86-atom/silvermont/bay-trail-t-atom-z3740.test b/tests/intel/x86-atom/silvermont/intel-atom-cpu-z3740-@-1.33ghz.test
similarity index 100%
rename from tests/intel/x86-atom/silvermont/bay-trail-t-atom-z3740.test
rename to tests/intel/x86-atom/silvermont/intel-atom-cpu-z3740-@-1.33ghz.test
diff --git a/tests/intel/x86-atom/silvermont/bay-trail-d-celeron.test b/tests/intel/x86-atom/silvermont/intel-celeron-cpu-j1900-@-1.99ghz.test
similarity index 100%
rename from tests/intel/x86-atom/silvermont/bay-trail-d-celeron.test
rename to tests/intel/x86-atom/silvermont/intel-celeron-cpu-j1900-@-1.99ghz.test
diff --git a/tests/intel/x86-atom/silvermont/bay-trail-m-celeron.test b/tests/intel/x86-atom/silvermont/intel-celeron-cpu-n2930-@-1.83ghz.test
similarity index 100%
rename from tests/intel/x86-atom/silvermont/bay-trail-m-celeron.test
rename to tests/intel/x86-atom/silvermont/intel-celeron-cpu-n2930-@-1.83ghz.test
diff --git a/tests/intel/x86-atom/tremont/elkhart-lake-celeron.test b/tests/intel/x86-atom/tremont/intel-celeron-j6412-@-2.00ghz.test
similarity index 100%
rename from tests/intel/x86-atom/tremont/elkhart-lake-celeron.test
rename to tests/intel/x86-atom/tremont/intel-celeron-j6412-@-2.00ghz.test
diff --git a/tests/intel/x86-atom/tremont/jasper-lake-celeron.test b/tests/intel/x86-atom/tremont/intel-celeron-n5100-@-1.10ghz.test
similarity index 100%
rename from tests/intel/x86-atom/tremont/jasper-lake-celeron.test
rename to tests/intel/x86-atom/tremont/intel-celeron-n5100-@-1.10ghz.test
diff --git a/tests/intel/x86-atom/tremont/lakefield-core-i5.test b/tests/intel/x86-atom/tremont/intel-core-i5-l16g7-cpu-@-1.40ghz.test
similarity index 100%
rename from tests/intel/x86-atom/tremont/lakefield-core-i5.test
rename to tests/intel/x86-atom/tremont/intel-core-i5-l16g7-cpu-@-1.40ghz.test
diff --git a/tests/intel/x86-atom/tremont/jasper-lake-pentium.test b/tests/intel/x86-atom/tremont/intel-pentium-silver-n6005-@-2.00ghz.test
similarity index 100%
rename from tests/intel/x86-atom/tremont/jasper-lake-pentium.test
rename to tests/intel/x86-atom/tremont/intel-pentium-silver-n6005-@-2.00ghz.test
diff --git a/tests/via/esther/c7-m.test b/tests/via/esther/via-c7-m-processor-1200mhz.test
similarity index 100%
rename from tests/via/esther/c7-m.test
rename to tests/via/esther/via-c7-m-processor-1200mhz.test
diff --git a/tests/via/esther/c7.test b/tests/via/esther/via-esther-processor-1500mhz.test
similarity index 100%
rename from tests/via/esther/c7.test
rename to tests/via/esther/via-esther-processor-1500mhz.test
diff --git a/tests/via/ezra/c3-t.test b/tests/via/ezra/via-c3-ezra.test
similarity index 100%
rename from tests/via/ezra/c3-t.test
rename to tests/via/ezra/via-c3-ezra.test
diff --git a/tests/via/ezra/c3.test b/tests/via/ezra/via-ezra.test
similarity index 100%
rename from tests/via/ezra/c3.test
rename to tests/via/ezra/via-ezra.test
diff --git a/tests/via/isaiah/eden-x4.test b/tests/via/isaiah/via-eden-x4-c4250@1.2+ghz.test
similarity index 100%
rename from tests/via/isaiah/eden-x4.test
rename to tests/via/isaiah/via-eden-x4-c4250@1.2+ghz.test
diff --git a/tests/via/isaiah/nano-l-3000.test b/tests/via/isaiah/via-nano-l3050@1800mhz.test
similarity index 100%
rename from tests/via/isaiah/nano-l-3000.test
rename to tests/via/isaiah/via-nano-l3050@1800mhz.test
diff --git a/tests/via/isaiah/nano-x2.test b/tests/via/isaiah/via-nano-processor-@1800mhz.test
similarity index 100%
rename from tests/via/isaiah/nano-x2.test
rename to tests/via/isaiah/via-nano-processor-@1800mhz.test
diff --git a/tests/via/isaiah/nano-l-2000.test b/tests/via/isaiah/via-nano-processor-l2200@1600mhz.test
similarity index 100%
rename from tests/via/isaiah/nano-l-2000.test
rename to tests/via/isaiah/via-nano-processor-l2200@1600mhz.test
diff --git a/tests/via/isaiah/nano-x4.test b/tests/via/isaiah/via-quadcore-l4700-@-1.2+-ghz.test
similarity index 100%
rename from tests/via/isaiah/nano-x4.test
rename to tests/via/isaiah/via-quadcore-l4700-@-1.2+-ghz.test
diff --git a/tests/via/nehemiah/c3.test b/tests/via/nehemiah/via-nehemiah.test
similarity index 100%
rename from tests/via/nehemiah/c3.test
rename to tests/via/nehemiah/via-nehemiah.test
diff --git a/tests/via/samuel/cyrix-iii.test b/tests/via/samuel/via-samuel.test
similarity index 100%
rename from tests/via/samuel/cyrix-iii.test
rename to tests/via/samuel/via-samuel.test
diff --git a/tests/via/samuel2/c3.test b/tests/via/samuel2/via-samuel-2.test
similarity index 100%
rename from tests/via/samuel2/c3.test
rename to tests/via/samuel2/via-samuel-2.test
diff --git a/tests/zhaoxin/lujiazui/kaixian-kx-6000g.test b/tests/zhaoxin/lujiazui/zhaoxin-kaixian-kx-6000g.test
similarity index 100%
rename from tests/zhaoxin/lujiazui/kaixian-kx-6000g.test
rename to tests/zhaoxin/lujiazui/zhaoxin-kaixian-kx-6000g.test
diff --git a/tests/zhaoxin/lujiazui/kaixian-kx-6640ma.test b/tests/zhaoxin/lujiazui/zhaoxin-kaixian-kx-6640ma@2.2+ghz.test
similarity index 100%
rename from tests/zhaoxin/lujiazui/kaixian-kx-6640ma.test
rename to tests/zhaoxin/lujiazui/zhaoxin-kaixian-kx-6640ma@2.2+ghz.test
diff --git a/tests/zhaoxin/lujiazui/kaixian-kx-u6780a.test b/tests/zhaoxin/lujiazui/zhaoxin-kaixian-kx-u6780a@2.7ghz.test
similarity index 100%
rename from tests/zhaoxin/lujiazui/kaixian-kx-u6780a.test
rename to tests/zhaoxin/lujiazui/zhaoxin-kaixian-kx-u6780a@2.7ghz.test
diff --git a/tests/zhaoxin/yongfeng/kaisheng-hk-40000.test b/tests/zhaoxin/yongfeng/zhaoxin-kaisheng-kh-40000.test
similarity index 100%
rename from tests/zhaoxin/yongfeng/kaisheng-hk-40000.test
rename to tests/zhaoxin/yongfeng/zhaoxin-kaisheng-kh-40000.test
diff --git a/tests/zhaoxin/zhangjiang/kaixian-zx-c+-c4580.test b/tests/zhaoxin/zhangjiang/zhaoxin-kaixian-zx-c+-c4580@1.83ghz.test
similarity index 100%
rename from tests/zhaoxin/zhangjiang/kaixian-zx-c+-c4580.test
rename to tests/zhaoxin/zhangjiang/zhaoxin-kaixian-zx-c+-c4580@1.83ghz.test