8 files changed, 12 insertions, 12 deletions
diff --git a/src/mainboard/intel/jarrell/chip.h b/src/mainboard/intel/jarrell/chip.h
index 7cc59091bd..b6e23b2688 100644
--- a/src/mainboard/intel/jarrell/chip.h
+++ b/src/mainboard/intel/jarrell/chip.h
@@ -1,5 +1,5 @@
-struct chip_operations mainboard_intel_jarrell_ops;
+struct chip_operations mainboard_ops;
 
-struct mainboard_intel_jarrell_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/intel/jarrell/mainboard.c b/src/mainboard/intel/jarrell/mainboard.c
index f7b58ac3f0..ba2bfc5017 100644
--- a/src/mainboard/intel/jarrell/mainboard.c
+++ b/src/mainboard/intel/jarrell/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_intel_e7520_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Intel Jarell Mainboard")
 };
 
diff --git a/src/mainboard/intel/mtarvon/chip.h b/src/mainboard/intel/mtarvon/chip.h
index c61616dfd5..4921b7bfcc 100644
--- a/src/mainboard/intel/mtarvon/chip.h
+++ b/src/mainboard/intel/mtarvon/chip.h
@@ -18,8 +18,8 @@
  *
  */
 
-struct chip_operations mainboard_intel_mtarvon_ops;
+struct chip_operations mainboard_ops;
 
-struct mainboard_intel_mtarvon_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/intel/mtarvon/mainboard.c b/src/mainboard/intel/mtarvon/mainboard.c
index 2ff158caa2..26111f5412 100644
--- a/src/mainboard/intel/mtarvon/mainboard.c
+++ b/src/mainboard/intel/mtarvon/mainboard.c
@@ -21,7 +21,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_intel_mtarvon_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Intel Mt. Arvon Mainboard")
 };
 
diff --git a/src/mainboard/intel/truxton/chip.h b/src/mainboard/intel/truxton/chip.h
index f1100b9f3c..4921b7bfcc 100644
--- a/src/mainboard/intel/truxton/chip.h
+++ b/src/mainboard/intel/truxton/chip.h
@@ -18,8 +18,8 @@
  *
  */
 
-struct chip_operations mainboard_intel_truxton_ops;
+struct chip_operations mainboard_ops;
 
-struct mainboard_intel_truxton_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/intel/truxton/mainboard.c b/src/mainboard/intel/truxton/mainboard.c
index e0f3def295..78a16a92b5 100644
--- a/src/mainboard/intel/truxton/mainboard.c
+++ b/src/mainboard/intel/truxton/mainboard.c
@@ -21,7 +21,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_intel_truxton_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Intel Truxton Mainboard")
 };
 
diff --git a/src/mainboard/intel/xe7501devkit/chip.h b/src/mainboard/intel/xe7501devkit/chip.h
index 12a9127ff2..af1397bd0f 100644
--- a/src/mainboard/intel/xe7501devkit/chip.h
+++ b/src/mainboard/intel/xe7501devkit/chip.h
@@ -1,6 +1,6 @@
 extern unsigned char _vgarom_start[];
 
-extern struct chip_operations mainboard_intel_xe7501devkit_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_intel_xe7501devkit_config {
+struct mainboard_config {
 };
diff --git a/src/mainboard/intel/xe7501devkit/mainboard.c b/src/mainboard/intel/xe7501devkit/mainboard.c
index 923878291a..1d0a1d09c8 100644
--- a/src/mainboard/intel/xe7501devkit/mainboard.c
+++ b/src/mainboard/intel/xe7501devkit/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_intel_xe7501devkit_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Intel Xeon E7501 DevKit Mainboard")
 };
 #endif