diff --git a/MAINTAINERS b/MAINTAINERS
index 708ded7..ace42de 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1022,6 +1022,10 @@ Matthias Fuchs <matthias.fuchs@esd-electronics.com>
 
 	TASREG		MCF5249
 
+Jens Scharsig <esw@bus-elektronik.de>
+
+	eb_cpu5282	mfc5282
+
 TsiChung Liew <Tsi-Chung.Liew@freescale.com>
 
 	M52277EVB	mcf5227x
diff --git a/board/BuS/EB+MCF-EV123/Makefile b/board/BuS/eb_cpu5282/Makefile
similarity index 100%
rename from board/BuS/EB+MCF-EV123/Makefile
rename to board/BuS/eb_cpu5282/Makefile
diff --git a/board/BuS/EB+MCF-EV123/cfm_flash.c b/board/BuS/eb_cpu5282/cfm_flash.c
similarity index 100%
rename from board/BuS/EB+MCF-EV123/cfm_flash.c
rename to board/BuS/eb_cpu5282/cfm_flash.c
diff --git a/board/BuS/EB+MCF-EV123/cfm_flash.h b/board/BuS/eb_cpu5282/cfm_flash.h
similarity index 100%
rename from board/BuS/EB+MCF-EV123/cfm_flash.h
rename to board/BuS/eb_cpu5282/cfm_flash.h
diff --git a/board/BuS/EB+MCF-EV123/config.mk b/board/BuS/eb_cpu5282/config.mk
similarity index 100%
rename from board/BuS/EB+MCF-EV123/config.mk
rename to board/BuS/eb_cpu5282/config.mk
diff --git a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c b/board/BuS/eb_cpu5282/eb_cpu5282.c
similarity index 100%
rename from board/BuS/EB+MCF-EV123/EB+MCF-EV123.c
rename to board/BuS/eb_cpu5282/eb_cpu5282.c
diff --git a/board/BuS/EB+MCF-EV123/flash.c b/board/BuS/eb_cpu5282/flash.c
similarity index 100%
rename from board/BuS/EB+MCF-EV123/flash.c
rename to board/BuS/eb_cpu5282/flash.c
diff --git a/board/BuS/EB+MCF-EV123/u-boot.lds b/board/BuS/eb_cpu5282/u-boot.lds
similarity index 100%
rename from board/BuS/EB+MCF-EV123/u-boot.lds
rename to board/BuS/eb_cpu5282/u-boot.lds
diff --git a/boards.cfg b/boards.cfg
index 3cf75c3..e510406 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -304,8 +304,8 @@ M5235EVB                     m68k        mcf523x     m5235evb            freesca
 M5235EVB_Flash32             m68k        mcf523x     m5235evb            freescale      -           M5235EVB:NORFLASH_PS32BIT,SYS_TEXT_BASE=0xFFC00000
 cobra5272                    m68k        mcf52x2     cobra5272           -
 idmr                         m68k        mcf52x2
-EB-MCF-EV123                 m68k        mcf52x2     EB+MCF-EV123        BuS            -           EB+MCF-EV123:SYS_TEXT_BASE=0xFFE00000
-EB-MCF-EV123_internal        m68k        mcf52x2     EB+MCF-EV123        BuS            -           EB+MCF-EV123:SYS_TEXT_BASE=0xF0000000
+eb_cpu5282                   m68k        mcf52x2     eb_cpu5282          BuS            -           eb_cpu5282:SYS_TEXT_BASE=0xFFE00000
+eb_cpu5282_internal          m68k        mcf52x2     eb_cpu5282          BuS            -           eb_cpu5282:SYS_TEXT_BASE=0xF0000000
 TASREG                       m68k        mcf52x2     tasreg              esd
 M5208EVBE                    m68k        mcf52x2     m5208evbe           freescale
 M5249EVB                     m68k        mcf52x2     m5249evb            freescale
diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/eb_cpu5282.h
similarity index 97%
rename from include/configs/EB+MCF-EV123.h
rename to include/configs/eb_cpu5282.h
index 346b49c..ef9849d 100644
--- a/include/configs/EB+MCF-EV123.h
+++ b/include/configs/eb_cpu5282.h
@@ -1,5 +1,5 @@
 /*
- * Configuation settings for the BuS EB+MCF-EV123 boards.
+ * Configuation settings for the BuS EB+CPU5283 boards (aka EB+MCF-EV123)
  *
  * (C) Copyright 2005-2009 BuS Elektronik GmbH & Co.KG <esw@bus-elektonik.de>
  *
@@ -22,8 +22,8 @@
  * MA 02111-1307 USA
  */
 
-#ifndef _CONFIG_EB_MCF_EV123_H_
-#define _CONFIG_EB_MCF_EV123_H_
+#ifndef _CONFIG_EB_CPU5282_H_
+#define _CONFIG_EB_CPU5282_H_
 
 #undef CONFIG_SYS_HALT_BEFOR_RAM_JUMP
 
@@ -33,7 +33,6 @@
 
 #define	CONFIG_MCF52x2			/* define processor family */
 #define CONFIG_M5282			/* define processor type */
-#define CONFIG_EB_MCF_EV123
 
 #define CONFIG_MISC_INIT_R
 
@@ -92,7 +91,7 @@
 #define CONFIG_BOOTDELAY	5
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#define CONFIG_SYS_PROMPT	"\nEV123 U-Boot> "
+#define CONFIG_SYS_PROMPT	"\nEB+CPU5282> "
 #define	CONFIG_SYS_LONGHELP	1
 
 #if defined(CONFIG_CMD_KGDB)
