Use the canonical name of the vendors/devices and the

same format for all CHIP_NAME() entries in LinuxBIOS (Closes #20).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@linuxbios.org>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2490 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

110 files changed, 111 insertions, 111 deletions

diff --git a/src/cpu/amd/sc520/sc520.c b/src/cpu/amd/sc520/sc520.c
index 266021af5f..af418d37e3 100644
--- a/src/cpu/amd/sc520/sc520.c
+++ b/src/cpu/amd/sc520/sc520.c
@@ -265,6 +265,6 @@ static void enable_dev(struct device *dev)
 
 
 struct chip_operations cpu_amd_sc520_ops = {
-	CHIP_NAME("AMD SC520")
+	CHIP_NAME("AMD Elan SC520 CPU")
 	.enable_dev = enable_dev, 
 };
diff --git a/src/cpu/amd/socket_754/socket_754.c b/src/cpu/amd/socket_754/socket_754.c
index 7c4eaaf07d..8fdcf57465 100644
--- a/src/cpu/amd/socket_754/socket_754.c
+++ b/src/cpu/amd/socket_754/socket_754.c
@@ -3,5 +3,5 @@
 
 
 struct chip_operations cpu_amd_socket_754_ops = {
-	CHIP_NAME("socket 754")
+	CHIP_NAME("Socket 754 CPU")
 };
diff --git a/src/cpu/amd/socket_939/socket_939.c b/src/cpu/amd/socket_939/socket_939.c
index 2661bc4cd3..656375244e 100644
--- a/src/cpu/amd/socket_939/socket_939.c
+++ b/src/cpu/amd/socket_939/socket_939.c
@@ -2,5 +2,5 @@
 #include "chip.h"
 
 struct chip_operations cpu_amd_socket_939_ops = {
-	CHIP_NAME("socket 939")
+	CHIP_NAME("Socket 939 CPU")
 };
diff --git a/src/cpu/amd/socket_940/socket_940.c b/src/cpu/amd/socket_940/socket_940.c
index dc825a214f..54531ef4f3 100644
--- a/src/cpu/amd/socket_940/socket_940.c
+++ b/src/cpu/amd/socket_940/socket_940.c
@@ -2,5 +2,5 @@
 #include "chip.h"
 
 struct chip_operations cpu_amd_socket_940_ops = {
-	CHIP_NAME("socket 940")
+	CHIP_NAME("Socket 940 CPU")
 };
diff --git a/src/cpu/amd/socket_AM2/socket_AM2.c b/src/cpu/amd/socket_AM2/socket_AM2.c
index 0fd649d984..474e19dc86 100644
--- a/src/cpu/amd/socket_AM2/socket_AM2.c
+++ b/src/cpu/amd/socket_AM2/socket_AM2.c
@@ -2,5 +2,5 @@
 #include "chip.h"
 
 struct chip_operations cpu_amd_socket_AM2_ops = {
-	CHIP_NAME("socket AM2")
+	CHIP_NAME("Socket AM2 CPU")
 };
diff --git a/src/cpu/amd/socket_F/socket_F.c b/src/cpu/amd/socket_F/socket_F.c
index a4cbefe3ac..93db628f93 100644
--- a/src/cpu/amd/socket_F/socket_F.c
+++ b/src/cpu/amd/socket_F/socket_F.c
@@ -2,5 +2,5 @@
 #include "chip.h"
 
 struct chip_operations cpu_amd_socket_F_ops = {
-	CHIP_NAME("socket F")
+	CHIP_NAME("Socket F CPU")
 };
diff --git a/src/cpu/intel/slot_2/slot_2.c b/src/cpu/intel/slot_2/slot_2.c
index 19bbea8133..ddc2f3bed5 100644
--- a/src/cpu/intel/slot_2/slot_2.c
+++ b/src/cpu/intel/slot_2/slot_2.c
@@ -3,5 +3,5 @@
 
 
 struct chip_operations cpu_intel_slot_2_ops = {
-	CHIP_NAME("slot 2")
+	CHIP_NAME("Slot 2 CPU")
 };
diff --git a/src/cpu/intel/socket_PGA370/socket_PGA370.c b/src/cpu/intel/socket_PGA370/socket_PGA370.c
index 690e69d0a9..1fc62ba760 100644
--- a/src/cpu/intel/socket_PGA370/socket_PGA370.c
+++ b/src/cpu/intel/socket_PGA370/socket_PGA370.c
@@ -3,5 +3,5 @@
 
 
 struct chip_operations cpu_intel_socket_PGA370_ops = {
-	CHIP_NAME("socket PGA370")
+	CHIP_NAME("Socket PGA370 CPU")
 };
diff --git a/src/cpu/intel/socket_mPGA479M/socket_mPGA479M.c b/src/cpu/intel/socket_mPGA479M/socket_mPGA479M.c
index 56642c3857..de824b54fd 100644
--- a/src/cpu/intel/socket_mPGA479M/socket_mPGA479M.c
+++ b/src/cpu/intel/socket_mPGA479M/socket_mPGA479M.c
@@ -3,5 +3,5 @@
 
 
 struct chip_operations cpu_intel_socket_mPGA479M_ops = {
-	CHIP_NAME("socket mPGA479M")
+	CHIP_NAME("Socket mPGA479M CPU")
 };
diff --git a/src/cpu/intel/socket_mPGA603/socket_mPGA603_400Mhz.c b/src/cpu/intel/socket_mPGA603/socket_mPGA603_400Mhz.c
index fdb90e69e4..9154608df4 100644
--- a/src/cpu/intel/socket_mPGA603/socket_mPGA603_400Mhz.c
+++ b/src/cpu/intel/socket_mPGA603/socket_mPGA603_400Mhz.c
@@ -3,5 +3,5 @@
 
 
 struct chip_opertations cpu_intel_socket_mPGA603_ops = {
-	CHIP_NAME("socket mPGA603_400Mhz")
+	CHIP_NAME("Socket mPGA603 400Mhz CPU")
 };
diff --git a/src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c b/src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c
index aa79a41d1b..68f35b780f 100644
--- a/src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c
+++ b/src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c
@@ -3,5 +3,5 @@
 
 
 struct chip_operations cpu_intel_socket_mPGA604_533Mhz_ops = {
-	CHIP_NAME("socket mPGA604_533Mhz")
+	CHIP_NAME("Socket mPGA604 533Mhz CPU")
 };
diff --git a/src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c b/src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c
index 77ec2dc621..505965e70e 100644
--- a/src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c
+++ b/src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c
@@ -3,5 +3,5 @@
 
 
 struct chip_operations cpu_intel_socket_mPGA604_800Mhz_ops = {
-	CHIP_NAME("socket mPGA604_800Mhz")
+	CHIP_NAME("Socket mPGA604 800Mhz CPU")
 };
diff --git a/src/drivers/i2c/lm63/lm63.c b/src/drivers/i2c/lm63/lm63.c
index 01abadc420..e67409d01b 100644
--- a/src/drivers/i2c/lm63/lm63.c
+++ b/src/drivers/i2c/lm63/lm63.c
@@ -41,6 +41,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations drivers_i2c_lm63_ops = {
-	CHIP_NAME("lm63")
+	CHIP_NAME("National Semiconductor LM63")
 	.enable_dev = enable_dev, 
 };
diff --git a/src/mainboard/amd/quartet/mainboard.c b/src/mainboard/amd/quartet/mainboard.c
index 7e02e98dc1..d3bfb13308 100644
--- a/src/mainboard/amd/quartet/mainboard.c
+++ b/src/mainboard/amd/quartet/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 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 6b8151221c..47ba2897d0 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 3834d025bb..d0c911272d 100644
--- a/src/mainboard/amd/serenade/mainboard.c
+++ b/src/mainboard/amd/serenade/mainboard.c
@@ -2,6 +2,6 @@
 #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 5e1add27bc..73d962513b 100644
--- a/src/mainboard/amd/serengeti_cheetah/mainboard.c
+++ b/src/mainboard/amd/serengeti_cheetah/mainboard.c
@@ -3,7 +3,7 @@
 
 #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 a0ac927448..2002bd14de 100644
--- a/src/mainboard/amd/serengeti_leopard/mainboard.c
+++ b/src/mainboard/amd/serengeti_leopard/mainboard.c
@@ -3,7 +3,7 @@
 
 #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/amd/solo/mainboard.c b/src/mainboard/amd/solo/mainboard.c
index 32be49839e..4c482402c1 100644
--- a/src/mainboard/amd/solo/mainboard.c
+++ b/src/mainboard/amd/solo/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_amd_solo_ops = {
-	CHIP_NAME("AMD Solo7 mainboard")
+	CHIP_NAME("AMD Solo7 Mainboard")
 };
 
diff --git a/src/mainboard/arima/hdama/mainboard.c b/src/mainboard/arima/hdama/mainboard.c
index 12fc7f135a..d676f975ac 100644
--- a/src/mainboard/arima/hdama/mainboard.c
+++ b/src/mainboard/arima/hdama/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 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 83fd121397..0476400de0 100644
--- a/src/mainboard/artecgroup/dbe61/mainboard.c
+++ b/src/mainboard/artecgroup/dbe61/mainboard.c
@@ -39,6 +39,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_artecgroup_dbe61_ops = {
-	CHIP_NAME("Artec Group 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 434c5fb160..414ac44ac9 100644
--- a/src/mainboard/asus/p2b/mainboard.c
+++ b/src/mainboard/asus/p2b/mainboard.c
@@ -2,6 +2,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 c97598eb82..8da5632823 100644
--- a/src/mainboard/bitworks/ims/mainboard.c
+++ b/src/mainboard/bitworks/ims/mainboard.c
@@ -2,6 +2,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 574414c8c6..27909ecd81 100644
--- a/src/mainboard/broadcom/blast/mainboard.c
+++ b/src/mainboard/broadcom/blast/mainboard.c
@@ -3,7 +3,7 @@
 
 #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 1c751aa401..e969dd20f3 100644
--- a/src/mainboard/dell/s1850/mainboard.c
+++ b/src/mainboard/dell/s1850/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_dell_s1850_ops = {
-	CHIP_NAME("Dell S1850 mainboard")
+	CHIP_NAME("Dell S1850 Mainboard")
 };
 
diff --git a/src/mainboard/densitron/dpx114/mainboard.c b/src/mainboard/densitron/dpx114/mainboard.c
index 5f180dc82e..189e9b2788 100644
--- a/src/mainboard/densitron/dpx114/mainboard.c
+++ b/src/mainboard/densitron/dpx114/mainboard.c
@@ -2,6 +2,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 78046a217a..2e0e332ee1 100644
--- a/src/mainboard/digitallogic/adl855pc/mainboard.c
+++ b/src/mainboard/digitallogic/adl855pc/mainboard.c
@@ -2,6 +2,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 63cf2884d2..8e537958ae 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 2cd090bc03..8bc24a43a3 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("DIGITAL-LOGIC 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 0de9942b17..7048ad819a 100644
--- a/src/mainboard/eaglelion/5bcm/mainboard.c
+++ b/src/mainboard/eaglelion/5bcm/mainboard.c
@@ -2,6 +2,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 b6e328ea53..497f66eaa4 100644
--- a/src/mainboard/emulation/qemu-i386/mainboard.c
+++ b/src/mainboard/emulation/qemu-i386/mainboard.c
@@ -2,6 +2,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 464155e3e5..81aa594c19 100644
--- a/src/mainboard/ibm/e325/mainboard.c
+++ b/src/mainboard/ibm/e325/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_ibm_e325_ops = {
-	CHIP_NAME("IBM eServer 325 mainboard")
+	CHIP_NAME("IBM eServer 325 Mainboard")
 };
 
diff --git a/src/mainboard/ibm/e326/mainboard.c b/src/mainboard/ibm/e326/mainboard.c
index a6dd4a4083..0439a5b709 100644
--- a/src/mainboard/ibm/e326/mainboard.c
+++ b/src/mainboard/ibm/e326/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_ibm_e326_ops = {
-	CHIP_NAME("IBM eServer 326 mainboard")
+	CHIP_NAME("IBM eServer 326 Mainboard")
 };
 
diff --git a/src/mainboard/intel/jarrell/mainboard.c b/src/mainboard/intel/jarrell/mainboard.c
index 0b1eec585a..f7b58ac3f0 100644
--- a/src/mainboard/intel/jarrell/mainboard.c
+++ b/src/mainboard/intel/jarrell/mainboard.c
@@ -2,6 +2,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/intel/xe7501devkit/mainboard.c b/src/mainboard/intel/xe7501devkit/mainboard.c
index fd7404b5c4..923878291a 100644
--- a/src/mainboard/intel/xe7501devkit/mainboard.c
+++ b/src/mainboard/intel/xe7501devkit/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_intel_xe7501devkit_ops = {
-	CHIP_NAME("Intel Xeon E7501 DevKit mainboard")
+	CHIP_NAME("Intel Xeon E7501 DevKit Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/iwill/dk8_htx/Options.lb b/src/mainboard/iwill/dk8_htx/Options.lb
index 0387b5ac4c..993c01183f 100644
--- a/src/mainboard/iwill/dk8_htx/Options.lb
+++ b/src/mainboard/iwill/dk8_htx/Options.lb
@@ -230,7 +230,7 @@ default CONFIG_IOAPIC=1
 ## Clean up the motherboard id strings
 ##
 default MAINBOARD_PART_NUMBER="dk8_htx"
-default MAINBOARD_VENDOR="iwill"
+default MAINBOARD_VENDOR="IWILL"
 default MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x1022
 default MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x2b80
 
diff --git a/src/mainboard/iwill/dk8_htx/mainboard.c b/src/mainboard/iwill/dk8_htx/mainboard.c
index c49af62767..01cbe494a8 100644
--- a/src/mainboard/iwill/dk8_htx/mainboard.c
+++ b/src/mainboard/iwill/dk8_htx/mainboard.c
@@ -3,7 +3,7 @@
 
 #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 4b7a1ecdcc..b51ef18bad 100644
--- a/src/mainboard/iwill/dk8s2/mainboard.c
+++ b/src/mainboard/iwill/dk8s2/mainboard.c
@@ -2,6 +2,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 0e8a361539..18cb2b5b4f 100644
--- a/src/mainboard/iwill/dk8x/mainboard.c
+++ b/src/mainboard/iwill/dk8x/mainboard.c
@@ -2,6 +2,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 30fd7b130a..aa82ae1525 100644
--- a/src/mainboard/lippert/frontrunner/mainboard.c
+++ b/src/mainboard/lippert/frontrunner/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_lippert_frontrunner_ops = {
-	CHIP_NAME("Lippert Cool Frontrunner mainboard")
+	CHIP_NAME("Lippert Cool Frontrunner Mainboard")
 };
 
diff --git a/src/mainboard/newisys/khepri/Options.lb b/src/mainboard/newisys/khepri/Options.lb
index 90abf22839..69af4c8442 100644
--- a/src/mainboard/newisys/khepri/Options.lb
+++ b/src/mainboard/newisys/khepri/Options.lb
@@ -110,8 +110,8 @@ default CONFIG_IOAPIC=1
 ##
 ## Clean up the motherboard id strings
 ##
-default MAINBOARD_PART_NUMBER="KHEPRI"
-default MAINBOARD_VENDOR="NEWISYS"
+default MAINBOARD_PART_NUMBER="Khepri"
+default MAINBOARD_VENDOR="Newisys"
 
 ###
 ### LinuxBIOS layout values
diff --git a/src/mainboard/newisys/khepri/mainboard.c b/src/mainboard/newisys/khepri/mainboard.c
index 7aba8132ad..d5dfcbc05e 100644
--- a/src/mainboard/newisys/khepri/mainboard.c
+++ b/src/mainboard/newisys/khepri/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_newisys_khepri_ops = {
-	CHIP_NAME("Newisys 2100 mainboard")
+	CHIP_NAME("Newisys 2100 Mainboard")
 };
 
diff --git a/src/mainboard/olpc/btest/mainboard.c b/src/mainboard/olpc/btest/mainboard.c
index 0f4be07dcc..814d17751e 100644
--- a/src/mainboard/olpc/btest/mainboard.c
+++ b/src/mainboard/olpc/btest/mainboard.c
@@ -131,6 +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 89c741cf79..e9f5cabf10 100644
--- a/src/mainboard/olpc/rev_a/mainboard.c
+++ b/src/mainboard/olpc/rev_a/mainboard.c
@@ -103,6 +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 e4e1052a49..6660badb0e 100644
--- a/src/mainboard/sunw/ultra40/mainboard.c
+++ b/src/mainboard/sunw/ultra40/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_sunw_ultra40_ops = {
-	CHIP_NAME("Sun Ultra 40 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 e0a9b9d6ef..b32dbd560e 100644
--- a/src/mainboard/supermicro/x6dai_g/mainboard.c
+++ b/src/mainboard/supermicro/x6dai_g/mainboard.c
@@ -2,6 +2,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 d559977c9b..343c9bb7da 100644
--- a/src/mainboard/supermicro/x6dhe_g/mainboard.c
+++ b/src/mainboard/supermicro/x6dhe_g/mainboard.c
@@ -2,6 +2,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 ba3125615c..856dc8f53d 100644
--- a/src/mainboard/supermicro/x6dhe_g2/mainboard.c
+++ b/src/mainboard/supermicro/x6dhe_g2/mainboard.c
@@ -2,6 +2,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 b344a94cb4..59051de317 100644
--- a/src/mainboard/supermicro/x6dhr_ig/mainboard.c
+++ b/src/mainboard/supermicro/x6dhr_ig/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_supermicro_x6dhr_ig_ops = {
-	CHIP_NAME("Supermicro X6DHR-iG mainboard")
+	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 dfe4d9435b..b1cda733f4 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
+++ b/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_supermicro_x6dhr_ig2_ops = {
-	CHIP_NAME("Supermicro X6DHR-iG2 mainboard")
+	CHIP_NAME("Supermicro X6DHR-iG2 Mainboard")
 };
 
diff --git a/src/mainboard/technologic/ts5300/mainboard.c b/src/mainboard/technologic/ts5300/mainboard.c
index 9c15d12ab1..d4120c6467 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 TS-5300 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 a20db8c6d2..a460b77683 100644
--- a/src/mainboard/tyan/s2735/mainboard.c
+++ b/src/mainboard/tyan/s2735/mainboard.c
@@ -3,7 +3,7 @@
 
 #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 238c707fd5..c769cb52a1 100644
--- a/src/mainboard/tyan/s2850/mainboard.c
+++ b/src/mainboard/tyan/s2850/mainboard.c
@@ -3,7 +3,7 @@
 
 #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 dcbbe172ce..1f4a38bcb8 100644
--- a/src/mainboard/tyan/s2875/mainboard.c
+++ b/src/mainboard/tyan/s2875/mainboard.c
@@ -3,7 +3,7 @@
 
 #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 6197172934..20721c19ef 100644
--- a/src/mainboard/tyan/s2880/mainboard.c
+++ b/src/mainboard/tyan/s2880/mainboard.c
@@ -3,7 +3,7 @@
 
 #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 b17c4b12cd..e0aea30dd8 100644
--- a/src/mainboard/tyan/s2881/mainboard.c
+++ b/src/mainboard/tyan/s2881/mainboard.c
@@ -3,7 +3,7 @@
 
 #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 3475d709b0..89e81956ec 100644
--- a/src/mainboard/tyan/s2882/mainboard.c
+++ b/src/mainboard/tyan/s2882/mainboard.c
@@ -3,7 +3,7 @@
 
 #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 aca02f0d3b..6b1beadaf2 100644
--- a/src/mainboard/tyan/s2885/mainboard.c
+++ b/src/mainboard/tyan/s2885/mainboard.c
@@ -3,7 +3,7 @@
 
 #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 455e65a7f9..a396404b08 100644
--- a/src/mainboard/tyan/s2891/mainboard.c
+++ b/src/mainboard/tyan/s2891/mainboard.c
@@ -3,7 +3,7 @@
 
 #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 fc4c88953a..2aad2b3b42 100644
--- a/src/mainboard/tyan/s2892/mainboard.c
+++ b/src/mainboard/tyan/s2892/mainboard.c
@@ -3,7 +3,7 @@
 
 #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 1476702527..03514f11c6 100644
--- a/src/mainboard/tyan/s2895/mainboard.c
+++ b/src/mainboard/tyan/s2895/mainboard.c
@@ -3,7 +3,7 @@
 
 #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 dd7e3ede4c..c48c7e3e74 100644
--- a/src/mainboard/tyan/s4880/mainboard.c
+++ b/src/mainboard/tyan/s4880/mainboard.c
@@ -3,7 +3,7 @@
 
 #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 83371ee659..1d1d306e85 100644
--- a/src/mainboard/tyan/s4882/mainboard.c
+++ b/src/mainboard/tyan/s4882/mainboard.c
@@ -3,7 +3,7 @@
 
 #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 dbeae2575b..d48330ff4b 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 96a0988edb..4242dfa92f 100644
--- a/src/mainboard/via/epia/mainboard.c
+++ b/src/mainboard/via/epia/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_via_epia_ops = {
-	CHIP_NAME("VIA EPIA mainboard")
+	CHIP_NAME("VIA EPIA Mainboard")
 };
 
diff --git a/src/northbridge/amd/gx2/northbridge.c b/src/northbridge/amd/gx2/northbridge.c
index 1bb83868e3..41e9c957aa 100644
--- a/src/northbridge/amd/gx2/northbridge.c
+++ b/src/northbridge/amd/gx2/northbridge.c
@@ -531,6 +531,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations northbridge_amd_gx2_ops = {
-	CHIP_NAME("AMD GX2 Northbridge")
+	CHIP_NAME("AMD GX (previously GX2) Northbridge")
 	.enable_dev = enable_dev, 
 };
diff --git a/src/northbridge/ibm/cpc710/cpc710_northbridge.c b/src/northbridge/ibm/cpc710/cpc710_northbridge.c
index 2633dcd02c..d5f0cf30e8 100644
--- a/src/northbridge/ibm/cpc710/cpc710_northbridge.c
+++ b/src/northbridge/ibm/cpc710/cpc710_northbridge.c
@@ -98,6 +98,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations northbridge_ibm_cpc710_ops = {
-	CHIP_NAME("CPC710")
+	CHIP_NAME("IBM CPC710 Northbridge")
 	.enable_dev = enable_dev,
 };
diff --git a/src/northbridge/ibm/cpc925/cpc925_northbridge.c b/src/northbridge/ibm/cpc925/cpc925_northbridge.c
index 10e484b9ce..f8e6a0a81f 100644
--- a/src/northbridge/ibm/cpc925/cpc925_northbridge.c
+++ b/src/northbridge/ibm/cpc925/cpc925_northbridge.c
@@ -98,6 +98,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations northbridge_ibm_cpc925_ops = {
-	CHIP_NAME("CPC925")
+	CHIP_NAME("IBM CPC925 Northbridge")
 	.enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/e7501/northbridge.c b/src/northbridge/intel/e7501/northbridge.c
index ff5763265a..602913485d 100644
--- a/src/northbridge/intel/e7501/northbridge.c
+++ b/src/northbridge/intel/e7501/northbridge.c
@@ -187,6 +187,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations northbridge_intel_e7501_ops = {
-	CHIP_NAME("Intel E7501 northbridge")
+	CHIP_NAME("Intel E7501 Northbridge")
 	.enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c
index ed262c24b7..53ff5db609 100644
--- a/src/northbridge/intel/i440bx/northbridge.c
+++ b/src/northbridge/intel/i440bx/northbridge.c
@@ -181,6 +181,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations northbridge_intel_i440bx_ops = {
-	CHIP_NAME("Intel 440bx Northbridge")
+	CHIP_NAME("Intel 440BX Northbridge")
 	.enable_dev = enable_dev, 
 };
diff --git a/src/northbridge/intel/i855pm/northbridge.c b/src/northbridge/intel/i855pm/northbridge.c
index e612cf1efc..a0259e72f3 100644
--- a/src/northbridge/intel/i855pm/northbridge.c
+++ b/src/northbridge/intel/i855pm/northbridge.c
@@ -157,6 +157,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations northbridge_intel_i855pm_ops = {
-        CHIP_NAME("intel i855pm Northbridge")
+        CHIP_NAME("Intel 855PM Northbridge")
 	.enable_dev = enable_dev,
 };
diff --git a/src/northbridge/transmeta/tm5800/northbridge.c b/src/northbridge/transmeta/tm5800/northbridge.c
index 5ee97393e9..ddc4aa5106 100644
--- a/src/northbridge/transmeta/tm5800/northbridge.c
+++ b/src/northbridge/transmeta/tm5800/northbridge.c
@@ -150,6 +150,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations northbridge_transmeta_tm5800_control = {
-	CHIP_NAME("Transmeta tm5800 Northbridge")
+	CHIP_NAME("Transmeta TM5800 Northbridge")
 	.enable_dev = enable_dev, 
 };
diff --git a/src/northbridge/via/vt8601/northbridge.c b/src/northbridge/via/vt8601/northbridge.c
index cf8e82907c..6ca609b155 100644
--- a/src/northbridge/via/vt8601/northbridge.c
+++ b/src/northbridge/via/vt8601/northbridge.c
@@ -190,6 +190,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations northbridge_via_vt8601_ops = {
-	CHIP_NAME("VIA vt8601 Northbridge")
+	CHIP_NAME("VIA VT8601 Northbridge")
 	.enable_dev = enable_dev, 
 };
diff --git a/src/northbridge/via/vt8623/northbridge.c b/src/northbridge/via/vt8623/northbridge.c
index 7143c358da..3938f2f36c 100644
--- a/src/northbridge/via/vt8623/northbridge.c
+++ b/src/northbridge/via/vt8623/northbridge.c
@@ -364,6 +364,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations northbridge_via_vt8623_ops = {
-	CHIP_NAME("VIA vt8623 Northbridge")
+	CHIP_NAME("VIA VT8623 Northbridge")
 	.enable_dev = enable_dev,
 };
diff --git a/src/southbridge/amd/amd8111/amd8111.c b/src/southbridge/amd/amd8111/amd8111.c
index 32797041f3..f1a1862edb 100644
--- a/src/southbridge/amd/amd8111/amd8111.c
+++ b/src/southbridge/amd/amd8111/amd8111.c
@@ -65,7 +65,7 @@ void amd8111_enable(device_t dev)
 }
 
 struct chip_operations southbridge_amd_amd8111_ops = {
-	CHIP_NAME("AMD 8111")
+	CHIP_NAME("AMD-8111 Southbridge")
 	/* This only called when this device is listed in the 
 	* static device tree.
 	*/
diff --git a/src/southbridge/amd/cs5536/cs5536.c b/src/southbridge/amd/cs5536/cs5536.c
index d2fbe99644..47958dba6a 100644
--- a/src/southbridge/amd/cs5536/cs5536.c
+++ b/src/southbridge/amd/cs5536/cs5536.c
@@ -198,7 +198,7 @@ static struct pci_driver cs5536_pci_driver __pci_driver = {
 };
 
 struct chip_operations southbridge_amd_cs5536_ops = {
-	CHIP_NAME("AMD cs5536")
+	CHIP_NAME("AMD Geode CS5536 Southbridge")
 	/* This only called when this device is listed in the 
 	* static device tree.
 	*/
diff --git a/src/southbridge/amd/cs5536_lx/cs5536.c b/src/southbridge/amd/cs5536_lx/cs5536.c
index acc51667dc..5f93d24769 100644
--- a/src/southbridge/amd/cs5536_lx/cs5536.c
+++ b/src/southbridge/amd/cs5536_lx/cs5536.c
@@ -323,7 +323,7 @@ static struct pci_driver cs5536_lx_pci_driver __pci_driver = {
 };
 
 struct chip_operations southbridge_amd_cs5536_lx_ops = {
-	CHIP_NAME("AMD cs5536 (LX)")
+	CHIP_NAME("AMD Geode CS5536 (LX) Southbridge")
 	/* This only called when this device is listed in the 
 	* static device tree.
 	*/
diff --git a/src/southbridge/broadcom/bcm5785/bcm5785.c b/src/southbridge/broadcom/bcm5785/bcm5785.c
index ebb7e8e729..a1d3eaa8d1 100644
--- a/src/southbridge/broadcom/bcm5785/bcm5785.c
+++ b/src/southbridge/broadcom/bcm5785/bcm5785.c
@@ -75,6 +75,6 @@ void bcm5785_enable(device_t dev)
 }
 
 struct chip_operations southbridge_broadcom_bcm5785_ops = {
-	CHIP_NAME("Serverworks bcm5785")
+	CHIP_NAME("Serverworks BCM5785 Southbridge")
 	.enable_dev = bcm5785_enable,
 };
diff --git a/src/southbridge/intel/esb6300/esb6300.c b/src/southbridge/intel/esb6300/esb6300.c
index 3551a59ea6..162771d7dc 100644
--- a/src/southbridge/intel/esb6300/esb6300.c
+++ b/src/southbridge/intel/esb6300/esb6300.c
@@ -43,6 +43,6 @@ void esb6300_enable(device_t dev)
 }
 
 struct chip_operations southbridge_intel_esb6300_ops = {
-	CHIP_NAME("INTEL 6300ESB")
+	CHIP_NAME("Intel 6300ESB Southbridge")
 	.enable_dev = esb6300_enable,
 };
diff --git a/src/southbridge/intel/i82801ca/i82801ca.c b/src/southbridge/intel/i82801ca/i82801ca.c
index 11ac82c329..f416e363d4 100644
--- a/src/southbridge/intel/i82801ca/i82801ca.c
+++ b/src/southbridge/intel/i82801ca/i82801ca.c
@@ -48,6 +48,6 @@ void i82801ca_enable(device_t dev)
 }
 
 struct chip_operations southbridge_intel_i82801ca_ops = {
-	CHIP_NAME("Intel 82801ca Southbridge")
+	CHIP_NAME("Intel 82801CA Southbridge")
 	.enable_dev = i82801ca_enable,
 };
diff --git a/src/southbridge/intel/i82801dbm/i82801dbm.c b/src/southbridge/intel/i82801dbm/i82801dbm.c
index 1e49205f90..5b55bd92f6 100644
--- a/src/southbridge/intel/i82801dbm/i82801dbm.c
+++ b/src/southbridge/intel/i82801dbm/i82801dbm.c
@@ -60,6 +60,6 @@ void i82801dbm_enable(device_t dev)
 }
 
 struct chip_operations southbridge_intel_i82801dbm_control = {
-	CHIP_NAME("Intel 82801dbm Southbridge")
+	CHIP_NAME("Intel 82801DBM Southbridge")
 	.enable_dev = i82801dbm_enable,
 };
diff --git a/src/southbridge/intel/pxhd/pxhd_bridge.c b/src/southbridge/intel/pxhd/pxhd_bridge.c
index bceca29db9..e0cb02e3af 100644
--- a/src/southbridge/intel/pxhd/pxhd_bridge.c
+++ b/src/southbridge/intel/pxhd/pxhd_bridge.c
@@ -253,6 +253,6 @@ static struct pci_driver ioapic2_driver __pci_driver = {
 };
 
 struct chip_operations southbridge_intel_pxhd_ops = {
-	CHIP_NAME("PXHD")
+	CHIP_NAME("Intel PXHD Southbridge")
 	.enable_dev = pxhd_enable,
 };
diff --git a/src/southbridge/nvidia/ck804/ck804.c b/src/southbridge/nvidia/ck804/ck804.c
index a4b77c3596..6be237f753 100644
--- a/src/southbridge/nvidia/ck804/ck804.c
+++ b/src/southbridge/nvidia/ck804/ck804.c
@@ -192,6 +192,6 @@ void ck804_enable(device_t dev)
 }
 
 struct chip_operations southbridge_nvidia_ck804_ops = {
-	CHIP_NAME("Nvidia ck804")
+	CHIP_NAME("NVIDIA CK804 Southbridge")
 	.enable_dev = ck804_enable,
 };
diff --git a/src/southbridge/ricoh/rl5c476/rl5c476.c b/src/southbridge/ricoh/rl5c476/rl5c476.c
index f85a803fab..7a5813255a 100644
--- a/src/southbridge/ricoh/rl5c476/rl5c476.c
+++ b/src/southbridge/ricoh/rl5c476/rl5c476.c
@@ -212,6 +212,6 @@ void southbridge_init(device_t dev)
 }
 
 struct chip_operations southbridge_ricoh_rl5c476_ops = {
-	CHIP_NAME("RICOH RL5C476")
+	CHIP_NAME("Ricoh RL5C476 CardBus Controller")
 	.enable_dev    = southbridge_init,
 };
diff --git a/src/southbridge/via/vt8231/vt8231.c b/src/southbridge/via/vt8231/vt8231.c
index 514d0c0626..71874cba57 100644
--- a/src/southbridge/via/vt8231/vt8231.c
+++ b/src/southbridge/via/vt8231/vt8231.c
@@ -68,6 +68,6 @@ static void vt8231_enable(struct device *dev)
 }
 
 struct chip_operations southbridge_via_vt8231_ops = {
-	CHIP_NAME("VIA vt8231")
+	CHIP_NAME("VIA VT8231 Southbridge")
 	.enable_dev	= vt8231_enable,
 };
diff --git a/src/southbridge/via/vt8235/vt8235.c b/src/southbridge/via/vt8235/vt8235.c
index e6287ece9c..2d732142d9 100644
--- a/src/southbridge/via/vt8235/vt8235.c
+++ b/src/southbridge/via/vt8235/vt8235.c
@@ -92,6 +92,6 @@ static void vt8235_enable(struct device *dev)
 }
 
 struct chip_operations southbridge_via_vt8235_ops = {
-	CHIP_NAME("VIA vt8235")
+	CHIP_NAME("VIA VT8235 Southbridge")
 	.enable_dev = vt8235_enable,
 };
diff --git a/src/superio/ite/it8661f/superio.c b/src/superio/ite/it8661f/superio.c
index 3ddc0d65df..e0dd46b0d7 100644
--- a/src/superio/ite/it8661f/superio.c
+++ b/src/superio/ite/it8661f/superio.c
@@ -75,7 +75,7 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_ite_it8661f_ops = {
-	CHIP_NAME("ITE it8661f")
+	CHIP_NAME("ITE IT8661F Super I/O")
 	.enable_dev = enable_dev,
 };
 
diff --git a/src/superio/ite/it8671f/superio.c b/src/superio/ite/it8671f/superio.c
index d748f85bdf..885812ca3b 100644
--- a/src/superio/ite/it8671f/superio.c
+++ b/src/superio/ite/it8671f/superio.c
@@ -79,7 +79,7 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_ite_it8671f_ops = {
-	CHIP_NAME("ITE it8671f")
+	CHIP_NAME("ITE IT8671F Super I/O")
 	.enable_dev = enable_dev,
 };
 
diff --git a/src/superio/ite/it8673f/superio.c b/src/superio/ite/it8673f/superio.c
index 26296bc13f..63036e61f3 100644
--- a/src/superio/ite/it8673f/superio.c
+++ b/src/superio/ite/it8673f/superio.c
@@ -81,7 +81,7 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_ite_it8673f_ops = {
-	CHIP_NAME("ITE it8673f")
+	CHIP_NAME("ITE IT8673F Super I/O")
 	.enable_dev = enable_dev,
 };
 
diff --git a/src/superio/ite/it8705f/superio.c b/src/superio/ite/it8705f/superio.c
index f82b1d3379..de3640832f 100644
--- a/src/superio/ite/it8705f/superio.c
+++ b/src/superio/ite/it8705f/superio.c
@@ -82,7 +82,7 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_ite_it8705f_ops = {
-	CHIP_NAME("ITE it8705f")
+	CHIP_NAME("ITE IT8705F Super I/O")
 	.enable_dev = enable_dev,
 };
 
diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c
index fde5addfef..d49b94b7a1 100644
--- a/src/superio/ite/it8712f/superio.c
+++ b/src/superio/ite/it8712f/superio.c
@@ -87,7 +87,7 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_ite_it8712f_ops = {
-	CHIP_NAME("ITE it8712f")
+	CHIP_NAME("ITE IT8712F Super I/O")
 	.enable_dev = enable_dev,
 };
 
diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c
index ddf18c5e3e..edda47726c 100644
--- a/src/superio/ite/it8716f/superio.c
+++ b/src/superio/ite/it8716f/superio.c
@@ -87,7 +87,7 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_ite_it8716f_ops = {
-	CHIP_NAME("ITE it8716f")
+	CHIP_NAME("ITE IT8716F Super I/O")
 	.enable_dev = enable_dev,
 };
 
diff --git a/src/superio/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c
index fb7c8d12bf..0b91eab388 100644
--- a/src/superio/ite/it8718f/superio.c
+++ b/src/superio/ite/it8718f/superio.c
@@ -83,7 +83,7 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_ite_it8718f_ops = {
-	CHIP_NAME("ITE it8718f")
+	CHIP_NAME("ITE IT8718F Super I/O")
 	.enable_dev = enable_dev,
 };
 
diff --git a/src/superio/nsc/pc8374/superio.c b/src/superio/nsc/pc8374/superio.c
index 1ef3d29da3..ccbd0f2114 100644
--- a/src/superio/nsc/pc8374/superio.c
+++ b/src/superio/nsc/pc8374/superio.c
@@ -68,6 +68,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_nsc_pc8374_ops = {
-	CHIP_NAME("NSC 8374")
+	CHIP_NAME("NSC PC8374 Super I/O")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc87351/superio.c b/src/superio/nsc/pc87351/superio.c
index cdc19b2d2d..675b01c40e 100644
--- a/src/superio/nsc/pc87351/superio.c
+++ b/src/superio/nsc/pc87351/superio.c
@@ -75,6 +75,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_nsc_pc87351_ops = {
-	CHIP_NAME("NSC 87351")
+	CHIP_NAME("NSC PC87351 Super I/O")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index 2b017d5b73..c6dd896d81 100644
--- a/src/superio/nsc/pc87360/superio.c
+++ b/src/superio/nsc/pc87360/superio.c
@@ -71,6 +71,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_nsc_pc87360_ops = {
-	CHIP_NAME("NSC 87360")
+	CHIP_NAME("NSC PC87360 Super I/O")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c
index 732ad3fee1..1bec4100f8 100644
--- a/src/superio/nsc/pc87366/superio.c
+++ b/src/superio/nsc/pc87366/superio.c
@@ -71,6 +71,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_nsc_pc87366_ops = {
-	CHIP_NAME("NSC 87366")
+	CHIP_NAME("NSC PC87366 Super I/O")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c
index f7a679c6e2..364bbc32f7 100644
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -72,6 +72,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_nsc_pc87417_ops = {
-	CHIP_NAME("NSC pc87417")
+	CHIP_NAME("NSC PC87417 Super I/O")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc87427/superio.c b/src/superio/nsc/pc87427/superio.c
index 6f192f6631..0363a9e18f 100644
--- a/src/superio/nsc/pc87427/superio.c
+++ b/src/superio/nsc/pc87427/superio.c
@@ -72,6 +72,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_nsc_pc87427_ops = {
-	CHIP_NAME("NSC 87427")
+	CHIP_NAME("NSC PC87427 Super I/O")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc97307/superio.c b/src/superio/nsc/pc97307/superio.c
index b2de76a4c1..db954c9a0c 100644
--- a/src/superio/nsc/pc97307/superio.c
+++ b/src/superio/nsc/pc97307/superio.c
@@ -83,6 +83,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_nsc_pc97307_ops = {
-	CHIP_NAME("NSC 97307")
+	CHIP_NAME("NSC PC97307 Super I/O")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c
index 59a1214f7b..052e122a79 100644
--- a/src/superio/nsc/pc97317/superio.c
+++ b/src/superio/nsc/pc97317/superio.c
@@ -85,6 +85,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_nsc_pc97317_ops = {
-	CHIP_NAME("NSC 97317")
+	CHIP_NAME("NSC PC97317 Super I/O")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c
index c3d4f9a929..be9e8b434b 100644
--- a/src/superio/smsc/lpc47b272/superio.c
+++ b/src/superio/smsc/lpc47b272/superio.c
@@ -47,7 +47,7 @@ static void dump_pnp_device(device_t dev);
 
 
 struct chip_operations superio_smsc_lpc47b272_ops = {
-	CHIP_NAME("smsc lpc47b272")
+	CHIP_NAME("SMSC LPC47B272 Super I/O")
 	.enable_dev = enable_dev
 };
 
diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c
index ab9da13e93..6400b03c37 100644
--- a/src/superio/smsc/lpc47b397/superio.c
+++ b/src/superio/smsc/lpc47b397/superio.c
@@ -211,7 +211,7 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_smsc_lpc47b397_ops = {
-	CHIP_NAME("smsc lpc47b397")
+	CHIP_NAME("SMSC LPC47B397 Super I/O")
 	.enable_dev = enable_dev,
 };
 
diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index d808514bec..89d086401c 100644
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -48,7 +48,7 @@ static void dump_pnp_device(device_t dev);
 
 
 struct chip_operations superio_smsc_lpc47m10x_ops = {
-	CHIP_NAME("smsc lpc47m10x")
+	CHIP_NAME("SMSC LPC47M10x Super I/O")
 	.enable_dev = enable_dev
 };
 
diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c
index 419b3babeb..e7a5b5c0c9 100644
--- a/src/superio/smsc/lpc47n217/superio.c
+++ b/src/superio/smsc/lpc47n217/superio.c
@@ -53,7 +53,7 @@ static void pnp_exit_conf_state(device_t dev);
 
 
 struct chip_operations superio_smsc_lpc47n217_ops = {
-	CHIP_NAME("smsc lpc47n217")
+	CHIP_NAME("SMSC LPC47N217 Super I/O")
 	.enable_dev = enable_dev,
 };
 
diff --git a/src/superio/via/vt1211/vt1211.c b/src/superio/via/vt1211/vt1211.c
index 412b35490d..49e11ce039 100644
--- a/src/superio/via/vt1211/vt1211.c
+++ b/src/superio/via/vt1211/vt1211.c
@@ -217,6 +217,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_via_vt1211_ops = {
-	CHIP_NAME("VIA vt1211")
+	CHIP_NAME("VIA VT1211 Super I/O")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index 559bdf1189..93c5f6dac2 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -193,6 +193,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations superio_winbond_w83627hf_ops = {
-	CHIP_NAME("Winbond w83627hf")
+	CHIP_NAME("Winbond W83627HF Super I/O")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/winbond/w83627thf/superio.c b/src/superio/winbond/w83627thf/superio.c
index 4d4a120606..6b08f8746c 100644
--- a/src/superio/winbond/w83627thf/superio.c
+++ b/src/superio/winbond/w83627thf/superio.c
@@ -105,6 +105,6 @@ static void enable_dev(device_t dev)
 }
 
 struct chip_operations superio_winbond_w83627thf_ops = {
-	CHIP_NAME("Winbond w83627thf")
+	CHIP_NAME("Winbond W83627THF Super I/O")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c
index d9b6f65894..e7d155a701 100644
--- a/src/superio/winbond/w83977tf/superio.c
+++ b/src/superio/winbond/w83977tf/superio.c
@@ -109,6 +109,6 @@ static void enable_dev(device_t dev)
 }
 
 struct chip_operations superio_winbond_w83977tf_ops = {
-	CHIP_NAME("Winbond w83977tf")
+	CHIP_NAME("Winbond W83977TF Super I/O")
 	.enable_dev = enable_dev,
 };
diff --git a/targets/iwill/dk8s2/Config.lb b/targets/iwill/dk8s2/Config.lb
index efb0592847..6d01b31f08 100644
--- a/targets/iwill/dk8s2/Config.lb
+++ b/targets/iwill/dk8s2/Config.lb
@@ -53,7 +53,7 @@ option CONFIG_IOAPIC=1
 ### Clean up the motherboard id strings
 ###
 option MAINBOARD_PART_NUMBER="DK8S2"
-option MAINBOARD_VENDOR="Iwill"
+option MAINBOARD_VENDOR="IWILL"
 #
 ###
 ### Compute the location and size of where this firmware image