4 files changed, 6 insertions, 6 deletions
diff --git a/src/mainboard/olpc/btest/chip.h b/src/mainboard/olpc/btest/chip.h
index 615ed8d2ac..e168812d0e 100644
--- a/src/mainboard/olpc/btest/chip.h
+++ b/src/mainboard/olpc/btest/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_olpc_btest_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_olpc_btest_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/olpc/btest/mainboard.c b/src/mainboard/olpc/btest/mainboard.c
index acedff8d6e..40e363f49a 100644
--- a/src/mainboard/olpc/btest/mainboard.c
+++ b/src/mainboard/olpc/btest/mainboard.c
@@ -131,7 +131,7 @@ static void enable_dev(struct device *dev)
         dev->ops->init = init;
 }
 
-struct chip_operations mainboard_olpc_btest_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("OLPC btest Mainboard")
         .enable_dev = enable_dev,
 };
diff --git a/src/mainboard/olpc/rev_a/chip.h b/src/mainboard/olpc/rev_a/chip.h
index 34c0959a48..e168812d0e 100644
--- a/src/mainboard/olpc/rev_a/chip.h
+++ b/src/mainboard/olpc/rev_a/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_olpc_rev_a_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_olpc_rev_a_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/olpc/rev_a/mainboard.c b/src/mainboard/olpc/rev_a/mainboard.c
index a89abb505a..604f34ccfd 100644
--- a/src/mainboard/olpc/rev_a/mainboard.c
+++ b/src/mainboard/olpc/rev_a/mainboard.c
@@ -102,7 +102,7 @@ static void enable_dev(struct device *dev)
         dev->ops->init = init;
 }
 
-struct chip_operations mainboard_olpc_rev_a_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("OLPC rev_a Mainboard")
         .enable_dev = enable_dev,
 };