6 files changed, 9 insertions, 9 deletions
diff --git a/src/mainboard/iei/juki-511p/chip.h b/src/mainboard/iei/juki-511p/chip.h
index db99050efd..8c613a7cd0 100644
--- a/src/mainboard/iei/juki-511p/chip.h
+++ b/src/mainboard/iei/juki-511p/chip.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_iei_juki_511p_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_iei_juki_511p_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/iei/juki-511p/mainboard.c b/src/mainboard/iei/juki-511p/mainboard.c
index 0956a6193f..e44a07c230 100644
--- a/src/mainboard/iei/juki-511p/mainboard.c
+++ b/src/mainboard/iei/juki-511p/mainboard.c
@@ -26,6 +26,6 @@
 #include <arch/io.h>
 #include "chip.h"
 
-struct chip_operations mainboard_iei_juki_511p_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("IEI JUKI-511P Mainboard")
 };
diff --git a/src/mainboard/iei/nova4899r/chip.h b/src/mainboard/iei/nova4899r/chip.h
index 51403ae995..4092860b95 100644
--- a/src/mainboard/iei/nova4899r/chip.h
+++ b/src/mainboard/iei/nova4899r/chip.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_iei_nova4899r_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_iei_nova4899r_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/iei/nova4899r/mainboard.c b/src/mainboard/iei/nova4899r/mainboard.c
index 0a8a9177bb..7ca0a14214 100644
--- a/src/mainboard/iei/nova4899r/mainboard.c
+++ b/src/mainboard/iei/nova4899r/mainboard.c
@@ -26,6 +26,6 @@
 #include <arch/io.h>
 #include "chip.h"
 
-struct chip_operations mainboard_iei_nova4899r_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("IEI NOVA-4899R Mainboard")
 };
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/chip.h b/src/mainboard/iei/pcisa-lx-800-r10/chip.h
index ceaaafda42..8c613a7cd0 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/chip.h
+++ b/src/mainboard/iei/pcisa-lx-800-r10/chip.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_iei_pcisa_lx_800_r10_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_iei_pcisa_lx_800_r10_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/mainboard.c b/src/mainboard/iei/pcisa-lx-800-r10/mainboard.c
index c33eb0b7af..163e360737 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/mainboard.c
+++ b/src/mainboard/iei/pcisa-lx-800-r10/mainboard.c
@@ -20,6 +20,6 @@
 
 #include <device/device.h>
 
-struct chip_operations mainboard_iei_pcisa_lx_800_r10_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("IEI PCISA-LX-800-R10 Mainboard")
 };