24 files changed, 16 insertions, 16 deletions
diff --git a/src/mainboard/iwill/DK8S2/chip.h b/src/mainboard/iwill/DK8S2/chip.h
deleted file mode 100644
index 402cd5e6d2..0000000000
--- a/src/mainboard/iwill/DK8S2/chip.h
+++ /dev/null
@@ -1,5 +0,0 @@
-extern struct chip_operations mainboard_Iwill_DK8S2_ops;
-
-struct mainboard_Iwill_DK8S2_config {
-	int nothing;
-};
diff --git a/src/mainboard/iwill/DK8X/chip.h b/src/mainboard/iwill/DK8X/chip.h
deleted file mode 100644
index 7710024cca..0000000000
--- a/src/mainboard/iwill/DK8X/chip.h
+++ /dev/null
@@ -1,5 +0,0 @@
-extern struct chip_operations mainboard_Iwill_DK8X_ops;
-
-struct mainboard_Iwill_DK8X_config {
-	int nothing;
-};
diff --git a/src/mainboard/iwill/DK8X/Config.lb b/src/mainboard/iwill/dk8X/Config.lb
index a7ae47449d..a7ae47449d 100644
--- a/src/mainboard/iwill/DK8X/Config.lb
+++ b/src/mainboard/iwill/dk8X/Config.lb
diff --git a/src/mainboard/iwill/DK8X/Options.lb b/src/mainboard/iwill/dk8X/Options.lb
index 6265e72fe1..6265e72fe1 100644
--- a/src/mainboard/iwill/DK8X/Options.lb
+++ b/src/mainboard/iwill/dk8X/Options.lb
diff --git a/src/mainboard/iwill/DK8X/auto.c b/src/mainboard/iwill/dk8X/auto.c
index 52dfb87074..52dfb87074 100644
--- a/src/mainboard/iwill/DK8X/auto.c
+++ b/src/mainboard/iwill/dk8X/auto.c
diff --git a/src/mainboard/iwill/dk8X/chip.h b/src/mainboard/iwill/dk8X/chip.h
new file mode 100644
index 0000000000..4057cfa204
--- /dev/null
+++ b/src/mainboard/iwill/dk8X/chip.h
@@ -0,0 +1,5 @@
+extern struct chip_operations mainboard_iwill_dk8x_ops;
+
+struct mainboard_iwill_dk8x_config {
+	int nothing;
+};
diff --git a/src/mainboard/iwill/DK8S2/cmos.layout b/src/mainboard/iwill/dk8X/cmos.layout
index 5eb88b9a5a..5eb88b9a5a 100644
--- a/src/mainboard/iwill/DK8S2/cmos.layout
+++ b/src/mainboard/iwill/dk8X/cmos.layout
diff --git a/src/mainboard/iwill/DK8S2/failover.c b/src/mainboard/iwill/dk8X/failover.c
index 262fdd60bd..262fdd60bd 100644
--- a/src/mainboard/iwill/DK8S2/failover.c
+++ b/src/mainboard/iwill/dk8X/failover.c
diff --git a/src/mainboard/iwill/DK8X/irq_tables.c b/src/mainboard/iwill/dk8X/irq_tables.c
index 6322c3df21..6322c3df21 100644
--- a/src/mainboard/iwill/DK8X/irq_tables.c
+++ b/src/mainboard/iwill/dk8X/irq_tables.c
diff --git a/src/mainboard/iwill/DK8X/mainboard.c b/src/mainboard/iwill/dk8X/mainboard.c
index a1b05d0943..b4bcfb25e8 100644
--- a/src/mainboard/iwill/DK8X/mainboard.c
+++ b/src/mainboard/iwill/dk8X/mainboard.c
@@ -5,7 +5,7 @@
 #include <device/pci_ops.h>
 #include "chip.h"
 
-struct chip_operations mainboard_Iwill_DK8X_ops = {
+struct chip_operations mainboard_iwill_dk8x_ops = {
 	CHIP_NAME("Iwill DK8X mainboard")
 };
 
diff --git a/src/mainboard/iwill/DK8S2/mptable.c b/src/mainboard/iwill/dk8X/mptable.c
index 34e6037c21..34e6037c21 100644
--- a/src/mainboard/iwill/DK8S2/mptable.c
+++ b/src/mainboard/iwill/dk8X/mptable.c
diff --git a/src/mainboard/iwill/DK8S2/reset.c b/src/mainboard/iwill/dk8X/reset.c
index 3db3956ec6..3db3956ec6 100644
--- a/src/mainboard/iwill/DK8S2/reset.c
+++ b/src/mainboard/iwill/dk8X/reset.c
diff --git a/src/mainboard/iwill/dk8_htx/Options.lb b/src/mainboard/iwill/dk8_htx/Options.lb
index ac0127d738..0387b5ac4c 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/chip.h b/src/mainboard/iwill/dk8_htx/chip.h
index a0c950682b..6d6e90c515 100644
--- a/src/mainboard/iwill/dk8_htx/chip.h
+++ b/src/mainboard/iwill/dk8_htx/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_Iwill_dk8_htx_ops;
+extern struct chip_operations mainboard_iwill_dk8_htx_ops;
 
-struct mainboard_Iwill_dk8_htx_config {
+struct mainboard_iwill_dk8_htx_config {
 //	int fixup_scsi;
 //	int fixup_vga;
 };
diff --git a/src/mainboard/iwill/DK8S2/Config.lb b/src/mainboard/iwill/dk8s2/Config.lb
index 3086ab9d77..661411b4e8 100644
--- a/src/mainboard/iwill/DK8S2/Config.lb
+++ b/src/mainboard/iwill/dk8s2/Config.lb
@@ -130,7 +130,7 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
 dir /pc80
 config chip.h
 
-# config for Iwill/DK8S2
+# config for iwill/dk8s2
 chip northbridge/amd/amdk8/root_complex
 	device pci_domain 0 on
 		chip northbridge/amd/amdk8
diff --git a/src/mainboard/iwill/DK8S2/Options.lb b/src/mainboard/iwill/dk8s2/Options.lb
index c0a1043c16..c0a1043c16 100644
--- a/src/mainboard/iwill/DK8S2/Options.lb
+++ b/src/mainboard/iwill/dk8s2/Options.lb
diff --git a/src/mainboard/iwill/DK8S2/auto.c b/src/mainboard/iwill/dk8s2/auto.c
index 06b3e42cdf..06b3e42cdf 100644
--- a/src/mainboard/iwill/DK8S2/auto.c
+++ b/src/mainboard/iwill/dk8s2/auto.c
diff --git a/src/mainboard/iwill/dk8s2/chip.h b/src/mainboard/iwill/dk8s2/chip.h
new file mode 100644
index 0000000000..af9438c913
--- /dev/null
+++ b/src/mainboard/iwill/dk8s2/chip.h
@@ -0,0 +1,5 @@
+extern struct chip_operations mainboard_iwill_dk8s2_ops;
+
+struct mainboard_iwill_dk8s2_config {
+	int nothing;
+};
diff --git a/src/mainboard/iwill/DK8X/cmos.layout b/src/mainboard/iwill/dk8s2/cmos.layout
index 5eb88b9a5a..5eb88b9a5a 100644
--- a/src/mainboard/iwill/DK8X/cmos.layout
+++ b/src/mainboard/iwill/dk8s2/cmos.layout
diff --git a/src/mainboard/iwill/DK8X/failover.c b/src/mainboard/iwill/dk8s2/failover.c
index 262fdd60bd..262fdd60bd 100644
--- a/src/mainboard/iwill/DK8X/failover.c
+++ b/src/mainboard/iwill/dk8s2/failover.c
diff --git a/src/mainboard/iwill/DK8S2/irq_tables.c b/src/mainboard/iwill/dk8s2/irq_tables.c
index 28c90e0f85..28c90e0f85 100644
--- a/src/mainboard/iwill/DK8S2/irq_tables.c
+++ b/src/mainboard/iwill/dk8s2/irq_tables.c
diff --git a/src/mainboard/iwill/DK8S2/mainboard.c b/src/mainboard/iwill/dk8s2/mainboard.c
index 465eb3d6d0..abfbb29bd7 100644
--- a/src/mainboard/iwill/DK8S2/mainboard.c
+++ b/src/mainboard/iwill/dk8s2/mainboard.c
@@ -5,7 +5,7 @@
 #include <device/pci_ops.h>
 #include "chip.h"
 
-struct chip_operations mainboard_Iwill_DK8S2_ops = {
+struct chip_operations mainboard_iwill_dk8s2_ops = {
 	CHIP_NAME("Iwill DK8S2 mainboard")
 };
 
diff --git a/src/mainboard/iwill/DK8X/mptable.c b/src/mainboard/iwill/dk8s2/mptable.c
index 34e6037c21..34e6037c21 100644
--- a/src/mainboard/iwill/DK8X/mptable.c
+++ b/src/mainboard/iwill/dk8s2/mptable.c
diff --git a/src/mainboard/iwill/DK8X/reset.c b/src/mainboard/iwill/dk8s2/reset.c
index 3db3956ec6..3db3956ec6 100644
--- a/src/mainboard/iwill/DK8X/reset.c
+++ b/src/mainboard/iwill/dk8s2/reset.c