6 files changed, 9 insertions, 9 deletions
diff --git a/src/mainboard/digitallogic/adl855pc/chip.h b/src/mainboard/digitallogic/adl855pc/chip.h
index 0ed8089561..e168812d0e 100644
--- a/src/mainboard/digitallogic/adl855pc/chip.h
+++ b/src/mainboard/digitallogic/adl855pc/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_digitallogic_adl855pc_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_digitallogic_adl855pc_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/digitallogic/adl855pc/mainboard.c b/src/mainboard/digitallogic/adl855pc/mainboard.c
index 2e0e332ee1..c6ab63e182 100644
--- a/src/mainboard/digitallogic/adl855pc/mainboard.c
+++ b/src/mainboard/digitallogic/adl855pc/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_digitallogic_adl855pc_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("DIGITAL-LOGIC ADL855PC Mainboard")
 };
 
diff --git a/src/mainboard/digitallogic/msm586seg/chip.h b/src/mainboard/digitallogic/msm586seg/chip.h
index fa064d48f3..ceb8af100a 100644
--- a/src/mainboard/digitallogic/msm586seg/chip.h
+++ b/src/mainboard/digitallogic/msm586seg/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_digitallogic_msm586seg_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_digitallogic_msm586seg_config {
+struct mainboard_config {
 
 };
diff --git a/src/mainboard/digitallogic/msm586seg/mainboard.c b/src/mainboard/digitallogic/msm586seg/mainboard.c
index f898218c77..b64a927bd7 100644
--- a/src/mainboard/digitallogic/msm586seg/mainboard.c
+++ b/src/mainboard/digitallogic/msm586seg/mainboard.c
@@ -141,7 +141,7 @@ static void enable_dev(struct device *dev) {
 
 	
 }
-struct chip_operations mainboard_digitallogic_msm586seg_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("DIGITAL-LOGIC MSM586SEG Mainboard")
 	.enable_dev = enable_dev
 };
diff --git a/src/mainboard/digitallogic/msm800sev/chip.h b/src/mainboard/digitallogic/msm800sev/chip.h
index 908ea93bef..e168812d0e 100644
--- a/src/mainboard/digitallogic/msm800sev/chip.h
+++ b/src/mainboard/digitallogic/msm800sev/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_digitallogic_msm800sev_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_digitallogic_msm800sev_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/digitallogic/msm800sev/mainboard.c b/src/mainboard/digitallogic/msm800sev/mainboard.c
index ffe95b234b..2d3c3c4b51 100644
--- a/src/mainboard/digitallogic/msm800sev/mainboard.c
+++ b/src/mainboard/digitallogic/msm800sev/mainboard.c
@@ -32,7 +32,7 @@ static void enable_dev(struct device *dev)
         dev->ops->init = init;
 }
 
-struct chip_operations mainboard_digitallogic_msm800sev_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("DIGITAL-LOGIC MSM800SEV Mainboard")
         .enable_dev = enable_dev,
 };