diff --git a/config/coreboot/g43t-am3/config/libgfxinit_txtmode b/config/coreboot/g43t_am3/config/libgfxinit_txtmode
similarity index 100%
rename from config/coreboot/g43t-am3/config/libgfxinit_txtmode
rename to config/coreboot/g43t_am3/config/libgfxinit_txtmode
diff --git a/config/coreboot/g43t-am3/target.cfg b/config/coreboot/g43t_am3/target.cfg
similarity index 100%
rename from config/coreboot/g43t-am3/target.cfg
rename to config/coreboot/g43t_am3/target.cfg
diff --git a/config/coreboot/g43t-am3_16mb/config/libgfxinit_txtmode b/config/coreboot/g43t_am3_16mb/config/libgfxinit_txtmode
similarity index 100%
rename from config/coreboot/g43t-am3_16mb/config/libgfxinit_txtmode
rename to config/coreboot/g43t_am3_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/g43t-am3_16mb/target.cfg b/config/coreboot/g43t_am3_16mb/target.cfg
similarity index 100%
rename from config/coreboot/g43t-am3_16mb/target.cfg
rename to config/coreboot/g43t_am3_16mb/target.cfg
diff --git a/config/coreboot/ga-g41m-es2l/config/libgfxinit_txtmode b/config/coreboot/ga_g41m_es2l/config/libgfxinit_txtmode
similarity index 100%
rename from config/coreboot/ga-g41m-es2l/config/libgfxinit_txtmode
rename to config/coreboot/ga_g41m_es2l/config/libgfxinit_txtmode
diff --git a/config/coreboot/ga-g41m-es2l/target.cfg b/config/coreboot/ga_g41m_es2l/target.cfg
similarity index 100%
rename from config/coreboot/ga-g41m-es2l/target.cfg
rename to config/coreboot/ga_g41m_es2l/target.cfg
diff --git a/config/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode b/config/coreboot/kcma_d8-udimm_16mb/config/libgfxinit_txtmode
similarity index 100%
rename from config/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode
rename to config/coreboot/kcma_d8-udimm_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/kcma-d8-udimm_16mb/target.cfg b/config/coreboot/kcma_d8-udimm_16mb/target.cfg
similarity index 100%
rename from config/coreboot/kcma-d8-udimm_16mb/target.cfg
rename to config/coreboot/kcma_d8-udimm_16mb/target.cfg
diff --git a/config/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode b/config/coreboot/kcma_d8_rdimm_16mb/config/libgfxinit_txtmode
similarity index 100%
rename from config/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode
rename to config/coreboot/kcma_d8_rdimm_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/kcma-d8-rdimm_16mb/target.cfg b/config/coreboot/kcma_d8_rdimm_16mb/target.cfg
similarity index 100%
rename from config/coreboot/kcma-d8-rdimm_16mb/target.cfg
rename to config/coreboot/kcma_d8_rdimm_16mb/target.cfg
diff --git a/config/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode b/config/coreboot/kcma_d8_rdimm_2mb/config/libgfxinit_txtmode
similarity index 100%
rename from config/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode
rename to config/coreboot/kcma_d8_rdimm_2mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/kcma-d8-rdimm_2mb/target.cfg b/config/coreboot/kcma_d8_rdimm_2mb/target.cfg
similarity index 100%
rename from config/coreboot/kcma-d8-rdimm_2mb/target.cfg
rename to config/coreboot/kcma_d8_rdimm_2mb/target.cfg
diff --git a/config/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode b/config/coreboot/kcma_d8_udimm_2mb/config/libgfxinit_txtmode
similarity index 100%
rename from config/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode
rename to config/coreboot/kcma_d8_udimm_2mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/kcma-d8-udimm_2mb/target.cfg b/config/coreboot/kcma_d8_udimm_2mb/target.cfg
similarity index 100%
rename from config/coreboot/kcma-d8-udimm_2mb/target.cfg
rename to config/coreboot/kcma_d8_udimm_2mb/target.cfg
diff --git a/config/coreboot/kfsn4-dre_1mb/config/libgfxinit_txtmode b/config/coreboot/kfsn4_dre_1mb/config/libgfxinit_txtmode
similarity index 100%
rename from config/coreboot/kfsn4-dre_1mb/config/libgfxinit_txtmode
rename to config/coreboot/kfsn4_dre_1mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/kfsn4-dre_1mb/target.cfg b/config/coreboot/kfsn4_dre_1mb/target.cfg
similarity index 100%
rename from config/coreboot/kfsn4-dre_1mb/target.cfg
rename to config/coreboot/kfsn4_dre_1mb/target.cfg
diff --git a/config/coreboot/kfsn4-dre_2mb/config/libgfxinit_txtmode b/config/coreboot/kfsn4_dre_2mb/config/libgfxinit_txtmode
similarity index 100%
rename from config/coreboot/kfsn4-dre_2mb/config/libgfxinit_txtmode
rename to config/coreboot/kfsn4_dre_2mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/kfsn4-dre_2mb/target.cfg b/config/coreboot/kfsn4_dre_2mb/target.cfg
similarity index 100%
rename from config/coreboot/kfsn4-dre_2mb/target.cfg
rename to config/coreboot/kfsn4_dre_2mb/target.cfg
diff --git a/config/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode b/config/coreboot/kgpe_d16_rdimm_16mb/config/libgfxinit_txtmode
similarity index 100%
rename from config/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode
rename to config/coreboot/kgpe_d16_rdimm_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg b/config/coreboot/kgpe_d16_rdimm_16mb/target.cfg
similarity index 100%
rename from config/coreboot/kgpe-d16-rdimm_16mb/target.cfg
rename to config/coreboot/kgpe_d16_rdimm_16mb/target.cfg
diff --git a/config/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode b/config/coreboot/kgpe_d16_rdimm_2mb/config/libgfxinit_txtmode
similarity index 100%
rename from config/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode
rename to config/coreboot/kgpe_d16_rdimm_2mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg b/config/coreboot/kgpe_d16_rdimm_2mb/target.cfg
similarity index 100%
rename from config/coreboot/kgpe-d16-rdimm_2mb/target.cfg
rename to config/coreboot/kgpe_d16_rdimm_2mb/target.cfg
diff --git a/config/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode b/config/coreboot/kgpe_d16_udimm_16mb/config/libgfxinit_txtmode
similarity index 100%
rename from config/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode
rename to config/coreboot/kgpe_d16_udimm_16mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/kgpe-d16-udimm_16mb/target.cfg b/config/coreboot/kgpe_d16_udimm_16mb/target.cfg
similarity index 100%
rename from config/coreboot/kgpe-d16-udimm_16mb/target.cfg
rename to config/coreboot/kgpe_d16_udimm_16mb/target.cfg
diff --git a/config/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode b/config/coreboot/kgpe_d16_udimm_2mb/config/libgfxinit_txtmode
similarity index 100%
rename from config/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode
rename to config/coreboot/kgpe_d16_udimm_2mb/config/libgfxinit_txtmode
diff --git a/config/coreboot/kgpe-d16-udimm_2mb/target.cfg b/config/coreboot/kgpe_d16_udimm_2mb/target.cfg
similarity index 100%
rename from config/coreboot/kgpe-d16-udimm_2mb/target.cfg
rename to config/coreboot/kgpe_d16_udimm_2mb/target.cfg