diff --git a/src/mainboard/advantech/som_gx533c/mainboard.c b/src/mainboard/advantech/som_gx533c/mainboard.c
index fb81b0df12..31d03455b4 100644
--- a/src/mainboard/advantech/som_gx533c/mainboard.c
+++ b/src/mainboard/advantech/som_gx533c/mainboard.c
@@ -7,6 +7,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_advantech_som_gx533c_ops = {
-	CHIP_NAME("Advantech SOM GX DB533-C mainboard ")
+	CHIP_NAME("Advantech SOM GX DB533-C mainboard")
 };
 
diff --git a/src/mainboard/amd/quartet/mainboard.c b/src/mainboard/amd/quartet/mainboard.c
index e72ff2c43a..df09391c5a 100644
--- a/src/mainboard/amd/quartet/mainboard.c
+++ b/src/mainboard/amd/quartet/mainboard.c
@@ -7,5 +7,5 @@
 
 
 struct chip_operations mainboard_amd_quartet_ops = {
-	CHIP_NAME("AMD Quartet mainboard ")
+	CHIP_NAME("AMD Quartet mainboard")
 };
diff --git a/src/mainboard/amd/rumba/mainboard.c b/src/mainboard/amd/rumba/mainboard.c
index 614b87154c..6b8151221c 100644
--- a/src/mainboard/amd/rumba/mainboard.c
+++ b/src/mainboard/amd/rumba/mainboard.c
@@ -37,7 +37,7 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_amd_rumba_ops = {
-	CHIP_NAME("AMD Rumba mainboard ")
+	CHIP_NAME("AMD Rumba mainboard")
         .enable_dev = enable_dev,
 };
 
diff --git a/src/mainboard/amd/serenade/mainboard.c b/src/mainboard/amd/serenade/mainboard.c
index ab3a800b52..00e44be4c9 100644
--- a/src/mainboard/amd/serenade/mainboard.c
+++ b/src/mainboard/amd/serenade/mainboard.c
@@ -6,5 +6,5 @@
 #include "chip.h"
 
 struct chip_operations mainboard_amd_serenade_ops = {
-	CHIP_NAME("AMD Serenade mainboard ")
+	CHIP_NAME("AMD Serenade mainboard")
 };
diff --git a/src/mainboard/amd/serengeti_cheetah/mainboard.c b/src/mainboard/amd/serengeti_cheetah/mainboard.c
index 7f5929693a..317bea3211 100644
--- a/src/mainboard/amd/serengeti_cheetah/mainboard.c
+++ b/src/mainboard/amd/serengeti_cheetah/mainboard.c
@@ -7,6 +7,6 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_amd_serengeti_cheetah_ops = {
-	CHIP_NAME("AMD serengeti_cheetah mainboard")
+	CHIP_NAME("AMD Serengeti Cheetah mainboard")
 };
 #endif
diff --git a/src/mainboard/amd/serengeti_leopard/mainboard.c b/src/mainboard/amd/serengeti_leopard/mainboard.c
index 50de2fe0e3..27ec27d948 100644
--- a/src/mainboard/amd/serengeti_leopard/mainboard.c
+++ b/src/mainboard/amd/serengeti_leopard/mainboard.c
@@ -7,6 +7,6 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_amd_serengeti_leopard_ops = {
-	CHIP_NAME("AMD serengeti_leopard mainboard")
+	CHIP_NAME("AMD Serengeti Leopard mainboard")
 };
 #endif
diff --git a/src/mainboard/arima/hdama/mainboard.c b/src/mainboard/arima/hdama/mainboard.c
index 69b738e2b4..e59d6b4882 100644
--- a/src/mainboard/arima/hdama/mainboard.c
+++ b/src/mainboard/arima/hdama/mainboard.c
@@ -11,6 +11,6 @@
 
 
 struct chip_operations mainboard_arima_hdama_ops = {
-	CHIP_NAME("Arima Hdama mainboard")
+	CHIP_NAME("Arima HDAMA mainboard")
 };
 
diff --git a/src/mainboard/artecgroup/dbe61/mainboard.c b/src/mainboard/artecgroup/dbe61/mainboard.c
index 5a8fb6b469..83fd121397 100644
--- a/src/mainboard/artecgroup/dbe61/mainboard.c
+++ b/src/mainboard/artecgroup/dbe61/mainboard.c
@@ -39,7 +39,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_artecgroup_dbe61_ops = {
-	CHIP_NAME("artecgroup dbe61 mainboard ")
+	CHIP_NAME("Artec Group dbe61 mainboard")
         .enable_dev = enable_dev,
-
 };
diff --git a/src/mainboard/asus/p2b/mainboard.c b/src/mainboard/asus/p2b/mainboard.c
index 94966aa689..98fe4d92a1 100644
--- a/src/mainboard/asus/p2b/mainboard.c
+++ b/src/mainboard/asus/p2b/mainboard.c
@@ -7,6 +7,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_asus_p2b_ops = {
-	CHIP_NAME("ASUS P2B mainboard ")
+	CHIP_NAME("ASUS P2B mainboard")
 };
 
diff --git a/src/mainboard/bitworks/ims/mainboard.c b/src/mainboard/bitworks/ims/mainboard.c
index 28f46e700b..53b092c26b 100644
--- a/src/mainboard/bitworks/ims/mainboard.c
+++ b/src/mainboard/bitworks/ims/mainboard.c
@@ -7,6 +7,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_bitworks_ims_ops = {
-	CHIP_NAME("Bitworks IMS mainboard ")
+	CHIP_NAME("Bitworks IMS mainboard")
 };
 
diff --git a/src/mainboard/broadcom/blast/mainboard.c b/src/mainboard/broadcom/blast/mainboard.c
index a5350cdaac..256144da45 100644
--- a/src/mainboard/broadcom/blast/mainboard.c
+++ b/src/mainboard/broadcom/blast/mainboard.c
@@ -7,6 +7,6 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_broadcom_blast_ops = {
-	CHIP_NAME("Broadcom blast mainboard")
+	CHIP_NAME("Broadcom Blast mainboard")
 };
 #endif
diff --git a/src/mainboard/dell/s1850/mainboard.c b/src/mainboard/dell/s1850/mainboard.c
index b82e1b968d..d20ba0c328 100644
--- a/src/mainboard/dell/s1850/mainboard.c
+++ b/src/mainboard/dell/s1850/mainboard.c
@@ -7,6 +7,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_dell_s1850_ops = {
-	CHIP_NAME("Dell S1850")
+	CHIP_NAME("Dell S1850 mainboard")
 };
 
diff --git a/src/mainboard/densitron/dpx114/mainboard.c b/src/mainboard/densitron/dpx114/mainboard.c
index f973012ca0..7861f31f30 100644
--- a/src/mainboard/densitron/dpx114/mainboard.c
+++ b/src/mainboard/densitron/dpx114/mainboard.c
@@ -6,6 +6,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_densitron_dpx114_ops = {
-	CHIP_NAME("Densitron DPX114 mainboard ")
+	CHIP_NAME("Densitron DPX114 mainboard")
 };
 
diff --git a/src/mainboard/digitallogic/adl855pc/mainboard.c b/src/mainboard/digitallogic/adl855pc/mainboard.c
index a818240be1..a9c03bcbc5 100644
--- a/src/mainboard/digitallogic/adl855pc/mainboard.c
+++ b/src/mainboard/digitallogic/adl855pc/mainboard.c
@@ -6,6 +6,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_digitallogic_adl855pc_ops = {
-	CHIP_NAME("Digital Logic ADL855PC mainboard ")
+	CHIP_NAME("DIGITAL-LOGIC ADL855PC mainboard")
 };
 
diff --git a/src/mainboard/digitallogic/msm586seg/mainboard.c b/src/mainboard/digitallogic/msm586seg/mainboard.c
index 13f28f43b7..63cf2884d2 100644
--- a/src/mainboard/digitallogic/msm586seg/mainboard.c
+++ b/src/mainboard/digitallogic/msm586seg/mainboard.c
@@ -142,7 +142,7 @@ static void enable_dev(struct device *dev) {
 	
 }
 struct chip_operations mainboard_digitallogic_msm586seg_ops = {
-	CHIP_NAME("Digital Logic MSM586SEG mainboard ")
+	CHIP_NAME("DIGITAL-LOGIC MSM586SEG mainboard")
 	.enable_dev = enable_dev
 };
 
diff --git a/src/mainboard/digitallogic/msm800sev/mainboard.c b/src/mainboard/digitallogic/msm800sev/mainboard.c
index a16dc7bfd9..2cd090bc03 100644
--- a/src/mainboard/digitallogic/msm800sev/mainboard.c
+++ b/src/mainboard/digitallogic/msm800sev/mainboard.c
@@ -62,7 +62,7 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_digitallogic_msm800sev_ops = {
-	CHIP_NAME("digitallogip msm800sev mainboard ")
+	CHIP_NAME("DIGITAL-LOGIC MSM800SEV mainboard")
         .enable_dev = enable_dev,
-
 };
+
diff --git a/src/mainboard/eaglelion/5bcm/mainboard.c b/src/mainboard/eaglelion/5bcm/mainboard.c
index b83a23932c..c0d76fc1b2 100644
--- a/src/mainboard/eaglelion/5bcm/mainboard.c
+++ b/src/mainboard/eaglelion/5bcm/mainboard.c
@@ -7,6 +7,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_eaglelion_5bcm_ops = {
-	CHIP_NAME("Eaglelion 5BCM mainboard ")
+	CHIP_NAME("Eaglelion 5BCM mainboard")
 };
 
diff --git a/src/mainboard/emulation/qemu-i386/mainboard.c b/src/mainboard/emulation/qemu-i386/mainboard.c
index 83ea657a78..eb5818466e 100644
--- a/src/mainboard/emulation/qemu-i386/mainboard.c
+++ b/src/mainboard/emulation/qemu-i386/mainboard.c
@@ -6,6 +6,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_emulation_qemu_i386_ops = {
-	CHIP_NAME("qemu mainboard ")
+	CHIP_NAME("QEMU mainboard")
 };
 
diff --git a/src/mainboard/ibm/e325/mainboard.c b/src/mainboard/ibm/e325/mainboard.c
index 2ace7c3e21..4b224b9308 100644
--- a/src/mainboard/ibm/e325/mainboard.c
+++ b/src/mainboard/ibm/e325/mainboard.c
@@ -6,5 +6,5 @@
 #include "chip.h"
 
 struct chip_operations mainboard_ibm_e325_ops = {
-	CHIP_NAME("IBM E325 mainboard ")
+	CHIP_NAME("IBM eServer 325 mainboard")
 };
diff --git a/src/mainboard/ibm/e326/mainboard.c b/src/mainboard/ibm/e326/mainboard.c
index 9eb3d9ef45..4102b5a853 100644
--- a/src/mainboard/ibm/e326/mainboard.c
+++ b/src/mainboard/ibm/e326/mainboard.c
@@ -6,5 +6,5 @@
 #include "chip.h"
 
 struct chip_operations mainboard_ibm_e326_ops = {
-	CHIP_NAME("IBM E326 mainboard ")
+	CHIP_NAME("IBM eServer 326 mainboard")
 };
diff --git a/src/mainboard/intel/jarrell/mainboard.c b/src/mainboard/intel/jarrell/mainboard.c
index 9b25e0adeb..3d47248646 100644
--- a/src/mainboard/intel/jarrell/mainboard.c
+++ b/src/mainboard/intel/jarrell/mainboard.c
@@ -8,6 +8,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_intel_e7520_ops = {
-	CHIP_NAME("Intel Jarell mainboard ")
+	CHIP_NAME("Intel Jarell mainboard")
 };
 
diff --git a/src/mainboard/iwill/dk8_htx/mainboard.c b/src/mainboard/iwill/dk8_htx/mainboard.c
index 3d979c95a9..8664c5c08c 100644
--- a/src/mainboard/iwill/dk8_htx/mainboard.c
+++ b/src/mainboard/iwill/dk8_htx/mainboard.c
@@ -7,6 +7,6 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_iwill_dk8_htx_ops = {
-	CHIP_NAME("Iwill DK8-HTX mainboard")
+	CHIP_NAME("IWILL DK8-HTX mainboard")
 };
 #endif
diff --git a/src/mainboard/iwill/dk8s2/mainboard.c b/src/mainboard/iwill/dk8s2/mainboard.c
index abfbb29bd7..38c225de7b 100644
--- a/src/mainboard/iwill/dk8s2/mainboard.c
+++ b/src/mainboard/iwill/dk8s2/mainboard.c
@@ -6,6 +6,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_iwill_dk8s2_ops = {
-	CHIP_NAME("Iwill DK8S2 mainboard")
+	CHIP_NAME("IWILL DK8S2 mainboard")
 };
 
diff --git a/src/mainboard/iwill/dk8x/mainboard.c b/src/mainboard/iwill/dk8x/mainboard.c
index b4bcfb25e8..97cd0edae2 100644
--- a/src/mainboard/iwill/dk8x/mainboard.c
+++ b/src/mainboard/iwill/dk8x/mainboard.c
@@ -6,6 +6,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_iwill_dk8x_ops = {
-	CHIP_NAME("Iwill DK8X mainboard")
+	CHIP_NAME("IWILL DK8X mainboard")
 };
 
diff --git a/src/mainboard/lippert/frontrunner/mainboard.c b/src/mainboard/lippert/frontrunner/mainboard.c
index 66251b793d..4ee0f5aba1 100644
--- a/src/mainboard/lippert/frontrunner/mainboard.c
+++ b/src/mainboard/lippert/frontrunner/mainboard.c
@@ -7,6 +7,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_lippert_frontrunner_ops = {
-	CHIP_NAME("Lippert frontrunner mainboard ")
+	CHIP_NAME("Lippert Cool Frontrunner mainboard")
 };
 
diff --git a/src/mainboard/olpc/btest/mainboard.c b/src/mainboard/olpc/btest/mainboard.c
index 922073c81d..0f4be07dcc 100644
--- a/src/mainboard/olpc/btest/mainboard.c
+++ b/src/mainboard/olpc/btest/mainboard.c
@@ -131,7 +131,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_olpc_btest_ops = {
-	CHIP_NAME("olpc btest mainboard ")
+	CHIP_NAME("OLPC btest mainboard")
         .enable_dev = enable_dev,
-
 };
diff --git a/src/mainboard/olpc/rev_a/mainboard.c b/src/mainboard/olpc/rev_a/mainboard.c
index 50698d5001..89c741cf79 100644
--- a/src/mainboard/olpc/rev_a/mainboard.c
+++ b/src/mainboard/olpc/rev_a/mainboard.c
@@ -103,7 +103,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_olpc_rev_a_ops = {
-	CHIP_NAME("olpc rev_a mainboard ")
+	CHIP_NAME("OLPC rev_a mainboard")
         .enable_dev = enable_dev,
-
 };
diff --git a/src/mainboard/sunw/ultra40/mainboard.c b/src/mainboard/sunw/ultra40/mainboard.c
index 80f14e3fc4..6c8b8af773 100644
--- a/src/mainboard/sunw/ultra40/mainboard.c
+++ b/src/mainboard/sunw/ultra40/mainboard.c
@@ -7,6 +7,6 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_sunw_ultra40_ops = {
-	CHIP_NAME("Sun ultra40 mainboard")
+	CHIP_NAME("Sun Ultra 40 mainboard")
 };
 #endif
diff --git a/src/mainboard/supermicro/x6dai_g/mainboard.c b/src/mainboard/supermicro/x6dai_g/mainboard.c
index bf741989ee..4c15048482 100644
--- a/src/mainboard/supermicro/x6dai_g/mainboard.c
+++ b/src/mainboard/supermicro/x6dai_g/mainboard.c
@@ -7,6 +7,6 @@
 #include "chip.h"
 
 struct chip_operations supermicro_x6dai_g_ops = {
-	CHIP_NAME("Supermicro X6DAI_G mainboard ")
+	CHIP_NAME("Supermicro X6DAi-G mainboard")
 };
 
diff --git a/src/mainboard/supermicro/x6dhe_g/mainboard.c b/src/mainboard/supermicro/x6dhe_g/mainboard.c
index 6cb224f498..ab53efca70 100644
--- a/src/mainboard/supermicro/x6dhe_g/mainboard.c
+++ b/src/mainboard/supermicro/x6dhe_g/mainboard.c
@@ -7,6 +7,6 @@
 #include "chip.h"
 
 struct chip_operations supermicro_x6dhe_g_ops = {
-    CHIP_NAME("Supermicro X6DHE_G mainboard")
+    CHIP_NAME("Supermicro X6DHE-G mainboard")
 };
 
diff --git a/src/mainboard/supermicro/x6dhe_g2/mainboard.c b/src/mainboard/supermicro/x6dhe_g2/mainboard.c
index dcdb6f642c..d1116943f3 100644
--- a/src/mainboard/supermicro/x6dhe_g2/mainboard.c
+++ b/src/mainboard/supermicro/x6dhe_g2/mainboard.c
@@ -7,6 +7,6 @@
 #include "chip.h"
 
 struct chip_operations supermicro_x6dhe_g2_ops = {
-    CHIP_NAME("Supermicro X6DHE_G2 mainboard")
+    CHIP_NAME("Supermicro X6DHE-G2 mainboard")
 };
 
diff --git a/src/mainboard/supermicro/x6dhr_ig/mainboard.c b/src/mainboard/supermicro/x6dhr_ig/mainboard.c
index cae000d5c7..63d883f8b6 100644
--- a/src/mainboard/supermicro/x6dhr_ig/mainboard.c
+++ b/src/mainboard/supermicro/x6dhr_ig/mainboard.c
@@ -7,6 +7,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_supermicro_x6dhr_ig_ops = {
-	CHIP_NAME("Supermicro x6dhr-ig")
+	CHIP_NAME("Supermicro X6DHR-iG mainboard")
 };
 
diff --git a/src/mainboard/supermicro/x6dhr_ig2/mainboard.c b/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
index c1891a222b..a687ffe231 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
+++ b/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
@@ -7,6 +7,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_supermicro_x6dhr_ig2_ops = {
-	CHIP_NAME("Supermicro x6dhr-ig2")
+	CHIP_NAME("Supermicro X6DHR-iG2 mainboard")
 };
 
diff --git a/src/mainboard/technologic/ts5300/mainboard.c b/src/mainboard/technologic/ts5300/mainboard.c
index d2a07e28c2..9c15d12ab1 100644
--- a/src/mainboard/technologic/ts5300/mainboard.c
+++ b/src/mainboard/technologic/ts5300/mainboard.c
@@ -149,7 +149,7 @@ static void enable_dev(struct device *dev) {
 }
 
 struct chip_operations mainboard_technologic_ts5300_ops = {
-	CHIP_NAME("Technologic Systems TS5300 mainboard ")
+	CHIP_NAME("Technologic Systems TS-5300 mainboard")
 	.enable_dev = enable_dev
 };
 
diff --git a/src/mainboard/tyan/s2735/mainboard.c b/src/mainboard/tyan/s2735/mainboard.c
index 61ddd8242a..666843f908 100644
--- a/src/mainboard/tyan/s2735/mainboard.c
+++ b/src/mainboard/tyan/s2735/mainboard.c
@@ -7,6 +7,6 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2735_ops = {
-	CHIP_NAME("Tyan s2735 mainboard")
+	CHIP_NAME("Tyan S2735 mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2850/mainboard.c b/src/mainboard/tyan/s2850/mainboard.c
index 8b96c5f0a6..3f298e4f69 100644
--- a/src/mainboard/tyan/s2850/mainboard.c
+++ b/src/mainboard/tyan/s2850/mainboard.c
@@ -7,6 +7,6 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2850_ops = {
-	CHIP_NAME("Tyan s2850 mainboard")
+	CHIP_NAME("Tyan S2850 mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2875/mainboard.c b/src/mainboard/tyan/s2875/mainboard.c
index 737178a492..3f8907a20c 100644
--- a/src/mainboard/tyan/s2875/mainboard.c
+++ b/src/mainboard/tyan/s2875/mainboard.c
@@ -7,6 +7,6 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2875_ops = {
-	CHIP_NAME("Tyan s2875 mainboard")
+	CHIP_NAME("Tyan S2875 mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2880/mainboard.c b/src/mainboard/tyan/s2880/mainboard.c
index 535ccdc530..0bcad7a5df 100644
--- a/src/mainboard/tyan/s2880/mainboard.c
+++ b/src/mainboard/tyan/s2880/mainboard.c
@@ -7,6 +7,6 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2880_ops = {
-	CHIP_NAME("Tyan s2880 mainboard")
+	CHIP_NAME("Tyan S2880 mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2881/mainboard.c b/src/mainboard/tyan/s2881/mainboard.c
index e96bd39051..f6dbf85292 100644
--- a/src/mainboard/tyan/s2881/mainboard.c
+++ b/src/mainboard/tyan/s2881/mainboard.c
@@ -7,6 +7,6 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2881_ops = {
-	CHIP_NAME("Tyan s2881 mainboard")
+	CHIP_NAME("Tyan S2881 mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2882/mainboard.c b/src/mainboard/tyan/s2882/mainboard.c
index 8ad4bec92c..43c9d2eb1b 100644
--- a/src/mainboard/tyan/s2882/mainboard.c
+++ b/src/mainboard/tyan/s2882/mainboard.c
@@ -7,6 +7,6 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2882_ops = {
-	CHIP_NAME("Tyan s2882 mainboard")
+	CHIP_NAME("Tyan S2882 mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2885/mainboard.c b/src/mainboard/tyan/s2885/mainboard.c
index 1f652c2cca..82d6724e8b 100644
--- a/src/mainboard/tyan/s2885/mainboard.c
+++ b/src/mainboard/tyan/s2885/mainboard.c
@@ -7,6 +7,6 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2885_ops = {
-	CHIP_NAME("Tyan s2885 mainboard")
+	CHIP_NAME("Tyan S2885 mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2891/mainboard.c b/src/mainboard/tyan/s2891/mainboard.c
index a547abfd66..b2d465e8f4 100644
--- a/src/mainboard/tyan/s2891/mainboard.c
+++ b/src/mainboard/tyan/s2891/mainboard.c
@@ -7,6 +7,6 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2891_ops = {
-	CHIP_NAME("Tyan s2891 mainboard")
+	CHIP_NAME("Tyan S2891 mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2892/mainboard.c b/src/mainboard/tyan/s2892/mainboard.c
index 32a2e609c9..1954260e4b 100644
--- a/src/mainboard/tyan/s2892/mainboard.c
+++ b/src/mainboard/tyan/s2892/mainboard.c
@@ -7,6 +7,6 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2892_ops = {
-	CHIP_NAME("Tyan s2892 mainboard")
+	CHIP_NAME("Tyan S2892 mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2895/mainboard.c b/src/mainboard/tyan/s2895/mainboard.c
index 044be53d61..541b2ef90d 100644
--- a/src/mainboard/tyan/s2895/mainboard.c
+++ b/src/mainboard/tyan/s2895/mainboard.c
@@ -7,6 +7,6 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2895_ops = {
-	CHIP_NAME("Tyan s2895 mainboard")
+	CHIP_NAME("Tyan S2895 mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s4880/mainboard.c b/src/mainboard/tyan/s4880/mainboard.c
index b13dd9f702..c4aa4cf46a 100644
--- a/src/mainboard/tyan/s4880/mainboard.c
+++ b/src/mainboard/tyan/s4880/mainboard.c
@@ -7,6 +7,6 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s4880_ops = {
-	CHIP_NAME("Tyan s4880 mainboard")
+	CHIP_NAME("Tyan S4880 mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s4882/mainboard.c b/src/mainboard/tyan/s4882/mainboard.c
index 9687ee313c..3b21360576 100644
--- a/src/mainboard/tyan/s4882/mainboard.c
+++ b/src/mainboard/tyan/s4882/mainboard.c
@@ -7,6 +7,6 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s4882_ops = {
-	CHIP_NAME("Tyan s4882 mainboard")
+	CHIP_NAME("Tyan S4882 mainboard")
 };
 #endif
diff --git a/src/mainboard/via/epia-m/mainboard.c b/src/mainboard/via/epia-m/mainboard.c
index da27732d63..dbeae2575b 100644
--- a/src/mainboard/via/epia-m/mainboard.c
+++ b/src/mainboard/via/epia-m/mainboard.c
@@ -41,6 +41,6 @@ void write_protect_vgabios(void)
 }
 
 struct chip_operations mainboard_via_epia_m_ops = {
-	CHIP_NAME("VIA EPIA-M mainboard ")
+	CHIP_NAME("VIA EPIA-M mainboard")
 };
 
diff --git a/src/mainboard/via/epia/mainboard.c b/src/mainboard/via/epia/mainboard.c
index 9f3326a930..5a52cf898c 100644
--- a/src/mainboard/via/epia/mainboard.c
+++ b/src/mainboard/via/epia/mainboard.c
@@ -7,6 +7,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_via_epia_ops = {
-	CHIP_NAME("VIA EPIA mainboard ")
+	CHIP_NAME("VIA EPIA mainboard")
 };