diff --git a/arch/arm/dts/kirkwood-km_kirkwood.dts b/arch/arm/dts/kirkwood-km_kirkwood.dts
index b2c0209f5d..30d57bc4aa 100644
--- a/arch/arm/dts/kirkwood-km_kirkwood.dts
+++ b/arch/arm/dts/kirkwood-km_kirkwood.dts
@@ -6,8 +6,8 @@
 #include "kirkwood-km_common.dtsi"
 
 / {
-	model = "Keymile Kirkwood Reference Design";
-	compatible = "keymile,km_kirkwood", "marvell,kirkwood-98DX4122", "marvell,kirkwood";
+	model = "ABB wcom Kirkwood Reference Design";
+	compatible = "wcom,km_kirkwood", "marvell,kirkwood-98DX4122", "marvell,kirkwood";
 
 	memory {
 		device_type = "memory";
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 2f68092f82..94dca3f21d 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -79,7 +79,7 @@ source "board/buffalo/lsxl/Kconfig"
 source "board/cloudengines/pogo_e02/Kconfig"
 source "board/d-link/dns325/Kconfig"
 source "board/iomega/iconnect/Kconfig"
-source "board/keymile/Kconfig"
+source "board/wcom/Kconfig"
 source "board/LaCie/net2big_v2/Kconfig"
 source "board/LaCie/netspace_v2/Kconfig"
 source "board/raidsonic/ib62x0/Kconfig"
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 5d7650294d..0ebb0ed727 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -336,11 +336,11 @@ source "board/freescale/mpc8349itx/Kconfig"
 source "board/freescale/mpc837xemds/Kconfig"
 source "board/freescale/mpc837xerdb/Kconfig"
 source "board/ids/ids8313/Kconfig"
-source "board/keymile/Kconfig"
 source "board/mpc8308_p1m/Kconfig"
 source "board/sbc8349/Kconfig"
 source "board/tqc/tqm834x/Kconfig"
 source "board/ve8313/Kconfig"
+source "board/wcom/Kconfig"
 source "board/gdsys/mpc8308/Kconfig"
 
 endmenu
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 8cc82f80b4..1f687a89ff 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -1616,10 +1616,10 @@ source "board/freescale/t208xrdb/Kconfig"
 source "board/freescale/t4qds/Kconfig"
 source "board/freescale/t4rdb/Kconfig"
 source "board/gdsys/p1022/Kconfig"
-source "board/keymile/Kconfig"
 source "board/sbc8548/Kconfig"
 source "board/socrates/Kconfig"
 source "board/varisys/cyrus/Kconfig"
+source "board/wcom/Kconfig"
 source "board/xes/xpedite520x/Kconfig"
 source "board/xes/xpedite537x/Kconfig"
 source "board/xes/xpedite550x/Kconfig"
diff --git a/board/keymile/Kconfig b/board/wcom/Kconfig
similarity index 95%
rename from board/keymile/Kconfig
rename to board/wcom/Kconfig
index 634dbbe097..5e8322a841 100644
--- a/board/keymile/Kconfig
+++ b/board/wcom/Kconfig
@@ -114,9 +114,9 @@ config SYS_IVM_EEPROM_PAGE_LEN
 	help
 	  Page size of inventory in EEPROM.
 
-source "board/keymile/km83xx/Kconfig"
-source "board/keymile/kmp204x/Kconfig"
-source "board/keymile/km_arm/Kconfig"
+source "board/wcom/wcom83xx/Kconfig"
+source "board/wcom/kmp204x/Kconfig"
+source "board/wcom/wcom_arm/Kconfig"
 
 endmenu
 
diff --git a/board/keymile/common/common.c b/board/wcom/common/common.c
similarity index 100%
rename from board/keymile/common/common.c
rename to board/wcom/common/common.c
diff --git a/board/keymile/common/common.h b/board/wcom/common/common.h
similarity index 100%
rename from board/keymile/common/common.h
rename to board/wcom/common/common.h
diff --git a/board/keymile/common/ivm.c b/board/wcom/common/ivm.c
similarity index 100%
rename from board/keymile/common/ivm.c
rename to board/wcom/common/ivm.c
diff --git a/board/keymile/common/qrio.c b/board/wcom/common/qrio.c
similarity index 98%
rename from board/keymile/common/qrio.c
rename to board/wcom/common/qrio.c
index 0cb33663aa..22da25361a 100644
--- a/board/keymile/common/qrio.c
+++ b/board/wcom/common/qrio.c
@@ -230,7 +230,7 @@ void qrio_uprstreq(u8 mode)
 	out_8(qrio_base + RSTCFG_OFF, rstcfg);
 }
 
-/* I2C deblocking uses the algorithm defined in board/keymile/common/common.c
+/* I2C deblocking uses the algorithm defined in board/wcom/common/common.c
  * 2 dedicated QRIO GPIOs externally pull the SCL and SDA lines
  * For I2C only the low state is activly driven and high state is pulled-up
  * by a resistor. Therefore the deblock GPIOs are used
diff --git a/board/keymile/common/qrio.h b/board/wcom/common/qrio.h
similarity index 100%
rename from board/keymile/common/qrio.h
rename to board/wcom/common/qrio.h
diff --git a/board/keymile/kmp204x/Kconfig b/board/wcom/kmp204x/Kconfig
similarity index 93%
rename from board/keymile/kmp204x/Kconfig
rename to board/wcom/kmp204x/Kconfig
index f74d4295c7..3897658748 100644
--- a/board/keymile/kmp204x/Kconfig
+++ b/board/wcom/kmp204x/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "kmp204x"
 
 config SYS_VENDOR
-	default "keymile"
+	default "wcom"
 
 config SYS_CONFIG_NAME
 	default "kmp204x"
diff --git a/board/keymile/kmp204x/MAINTAINERS b/board/wcom/kmp204x/MAINTAINERS
similarity index 84%
rename from board/keymile/kmp204x/MAINTAINERS
rename to board/wcom/kmp204x/MAINTAINERS
index fb3aefdd37..3741c5faeb 100644
--- a/board/keymile/kmp204x/MAINTAINERS
+++ b/board/wcom/kmp204x/MAINTAINERS
@@ -1,6 +1,6 @@
 KMP204X BOARD
 M:	Valentin Longchamp <valentin.longchamp at ch.abb.com>
 S:	Maintained
-F:	board/keymile/kmp204x/
+F:	board/wcom/kmp204x/
 F:	include/configs/kmp204x.h
 F:	configs/kmcoge4_defconfig
diff --git a/board/keymile/kmp204x/Makefile b/board/wcom/kmp204x/Makefile
similarity index 100%
rename from board/keymile/kmp204x/Makefile
rename to board/wcom/kmp204x/Makefile
diff --git a/board/keymile/kmp204x/ddr.c b/board/wcom/kmp204x/ddr.c
similarity index 100%
rename from board/keymile/kmp204x/ddr.c
rename to board/wcom/kmp204x/ddr.c
diff --git a/board/keymile/kmp204x/eth.c b/board/wcom/kmp204x/eth.c
similarity index 100%
rename from board/keymile/kmp204x/eth.c
rename to board/wcom/kmp204x/eth.c
diff --git a/board/keymile/kmp204x/kmp204x.c b/board/wcom/kmp204x/kmp204x.c
similarity index 100%
rename from board/keymile/kmp204x/kmp204x.c
rename to board/wcom/kmp204x/kmp204x.c
diff --git a/board/keymile/kmp204x/kmp204x.h b/board/wcom/kmp204x/kmp204x.h
similarity index 100%
rename from board/keymile/kmp204x/kmp204x.h
rename to board/wcom/kmp204x/kmp204x.h
diff --git a/board/keymile/kmp204x/law.c b/board/wcom/kmp204x/law.c
similarity index 100%
rename from board/keymile/kmp204x/law.c
rename to board/wcom/kmp204x/law.c
diff --git a/board/keymile/kmp204x/pbi.cfg b/board/wcom/kmp204x/pbi.cfg
similarity index 100%
rename from board/keymile/kmp204x/pbi.cfg
rename to board/wcom/kmp204x/pbi.cfg
diff --git a/board/keymile/kmp204x/pci.c b/board/wcom/kmp204x/pci.c
similarity index 100%
rename from board/keymile/kmp204x/pci.c
rename to board/wcom/kmp204x/pci.c
diff --git a/board/keymile/kmp204x/rcw_kmp204x.cfg b/board/wcom/kmp204x/rcw_kmp204x.cfg
similarity index 100%
rename from board/keymile/kmp204x/rcw_kmp204x.cfg
rename to board/wcom/kmp204x/rcw_kmp204x.cfg
diff --git a/board/keymile/kmp204x/tlb.c b/board/wcom/kmp204x/tlb.c
similarity index 100%
rename from board/keymile/kmp204x/tlb.c
rename to board/wcom/kmp204x/tlb.c
diff --git a/board/keymile/scripts/README b/board/wcom/scripts/README
similarity index 93%
rename from board/keymile/scripts/README
rename to board/wcom/scripts/README
index dd935b2c6c..e06e6bed3c 100644
--- a/board/keymile/scripts/README
+++ b/board/wcom/scripts/README
@@ -1,6 +1,6 @@
 These scripts are needed for our development usecases. Copy this directory
 into your tftp root directory to be able to use this scripts.
-cp -r <u-boot-repo>/board/keymile/scripts <your_tftp_root>/
+cp -r <u-boot-repo>/board/wcom/scripts <your_tftp_root>/
 
 To load and configure these usecase, two environment variables in the u-boot
 default environment must be parsed:
diff --git a/board/keymile/scripts/develop-arm.txt b/board/wcom/scripts/develop-arm.txt
similarity index 100%
rename from board/keymile/scripts/develop-arm.txt
rename to board/wcom/scripts/develop-arm.txt
diff --git a/board/keymile/scripts/develop-common.txt b/board/wcom/scripts/develop-common.txt
similarity index 100%
rename from board/keymile/scripts/develop-common.txt
rename to board/wcom/scripts/develop-common.txt
diff --git a/board/keymile/scripts/develop-ppc_82xx.txt b/board/wcom/scripts/develop-ppc_82xx.txt
similarity index 100%
rename from board/keymile/scripts/develop-ppc_82xx.txt
rename to board/wcom/scripts/develop-ppc_82xx.txt
diff --git a/board/keymile/scripts/develop-ppc_8xx.txt b/board/wcom/scripts/develop-ppc_8xx.txt
similarity index 100%
rename from board/keymile/scripts/develop-ppc_8xx.txt
rename to board/wcom/scripts/develop-ppc_8xx.txt
diff --git a/board/keymile/scripts/ramfs-arm.txt b/board/wcom/scripts/ramfs-arm.txt
similarity index 100%
rename from board/keymile/scripts/ramfs-arm.txt
rename to board/wcom/scripts/ramfs-arm.txt
diff --git a/board/keymile/scripts/ramfs-common.txt b/board/wcom/scripts/ramfs-common.txt
similarity index 100%
rename from board/keymile/scripts/ramfs-common.txt
rename to board/wcom/scripts/ramfs-common.txt
diff --git a/board/keymile/scripts/ramfs-ppc_82xx.txt b/board/wcom/scripts/ramfs-ppc_82xx.txt
similarity index 100%
rename from board/keymile/scripts/ramfs-ppc_82xx.txt
rename to board/wcom/scripts/ramfs-ppc_82xx.txt
diff --git a/board/keymile/scripts/ramfs-ppc_8xx.txt b/board/wcom/scripts/ramfs-ppc_8xx.txt
similarity index 100%
rename from board/keymile/scripts/ramfs-ppc_8xx.txt
rename to board/wcom/scripts/ramfs-ppc_8xx.txt
diff --git a/board/keymile/km83xx/Kconfig b/board/wcom/wcom83xx/Kconfig
similarity index 85%
rename from board/keymile/km83xx/Kconfig
rename to board/wcom/wcom83xx/Kconfig
index 1011cc8b2c..7c2b3eeac4 100644
--- a/board/keymile/km83xx/Kconfig
+++ b/board/wcom/wcom83xx/Kconfig
@@ -1,10 +1,10 @@
 if TARGET_KMETER1
 
 config SYS_BOARD
-	default "km83xx"
+	default "wcom83xx"
 
 config SYS_VENDOR
-	default "keymile"
+	default "wcom"
 
 config SYS_CONFIG_NAME
 	default "kmeter1"
@@ -21,10 +21,10 @@ endif
 if TARGET_KMCOGE5NE
 
 config SYS_BOARD
-	default "km83xx"
+	default "wcom83xx"
 
 config SYS_VENDOR
-	default "keymile"
+	default "wcom"
 
 config SYS_CONFIG_NAME
 	default "kmcoge5ne"
@@ -41,10 +41,10 @@ endif
 if TARGET_KMTEGR1
 
 config SYS_BOARD
-	default "km83xx"
+	default "wcom83xx"
 
 config SYS_VENDOR
-	default "keymile"
+	default "wcom"
 
 config SYS_CONFIG_NAME
 	default "kmtegr1"
@@ -60,10 +60,10 @@ endif
 if TARGET_SUVD3
 
 config SYS_BOARD
-	default "km83xx"
+	default "wcom83xx"
 
 config SYS_VENDOR
-	default "keymile"
+	default "wcom"
 
 config SYS_CONFIG_NAME
 	default "suvd3"
@@ -79,10 +79,10 @@ endif
 if TARGET_TUXX1
 
 config SYS_BOARD
-	default "km83xx"
+	default "wcom83xx"
 
 config SYS_VENDOR
-	default "keymile"
+	default "wcom"
 
 config SYS_CONFIG_NAME
 	default "tuxx1"
@@ -98,10 +98,10 @@ endif
 if TARGET_KMSUPX5
 
 config SYS_BOARD
-	default "km83xx"
+	default "wcom83xx"
 
 config SYS_VENDOR
-	default "keymile"
+	default "wcom"
 
 config SYS_CONFIG_NAME
 	default "kmsupx5"
@@ -117,10 +117,10 @@ endif
 if TARGET_TUGE1
 
 config SYS_BOARD
-	default "km83xx"
+	default "wcom83xx"
 
 config SYS_VENDOR
-	default "keymile"
+	default "wcom"
 
 config SYS_CONFIG_NAME
 	default "tuge1"
@@ -136,10 +136,10 @@ endif
 if TARGET_KMOPTI2
 
 config SYS_BOARD
-	default "km83xx"
+	default "wcom83xx"
 
 config SYS_VENDOR
-	default "keymile"
+	default "wcom"
 
 config SYS_CONFIG_NAME
 	default "kmopti2"
@@ -155,10 +155,10 @@ endif
 if TARGET_KMTEPR2
 
 config SYS_BOARD
-	default "km83xx"
+	default "wcom83xx"
 
 config SYS_VENDOR
-	default "keymile"
+	default "wcom"
 
 config SYS_CONFIG_NAME
 	default "kmtepr2"
diff --git a/board/keymile/km83xx/MAINTAINERS b/board/wcom/wcom83xx/MAINTAINERS
similarity index 94%
rename from board/keymile/km83xx/MAINTAINERS
rename to board/wcom/wcom83xx/MAINTAINERS
index d2af983073..114c3451b6 100644
--- a/board/keymile/km83xx/MAINTAINERS
+++ b/board/wcom/wcom83xx/MAINTAINERS
@@ -1,7 +1,7 @@
 KM83XX BOARD
 M:	Holger Brunck <holger.brunck at ch.abb.com>
 S:	Maintained
-F:	board/keymile/km83xx/
+F:	board/wcom/wcom83xx/
 F:	include/configs/km8360.h
 F:	configs/kmcoge5ne_defconfig
 F:	configs/kmeter1_defconfig
diff --git a/board/keymile/km83xx/Makefile b/board/wcom/wcom83xx/Makefile
similarity index 62%
rename from board/keymile/km83xx/Makefile
rename to board/wcom/wcom83xx/Makefile
index 0aef654987..375cbd8330 100644
--- a/board/keymile/km83xx/Makefile
+++ b/board/wcom/wcom83xx/Makefile
@@ -3,4 +3,4 @@
 # (C) Copyright 2006
 # Wolfgang Denk, DENX Software Engineering, wd at denx.de.
 
-obj-y	+= km83xx.o ../common/common.o ../common/ivm.o km83xx_i2c.o
+obj-y	+= wcom83xx.o ../common/common.o ../common/ivm.o wcom83xx_i2c.o
diff --git a/board/keymile/km83xx/README.kmeter1 b/board/wcom/wcom83xx/README.kmeter1
similarity index 100%
rename from board/keymile/km83xx/README.kmeter1
rename to board/wcom/wcom83xx/README.kmeter1
diff --git a/board/keymile/km83xx/km83xx.c b/board/wcom/wcom83xx/wcom83xx.c
similarity index 100%
rename from board/keymile/km83xx/km83xx.c
rename to board/wcom/wcom83xx/wcom83xx.c
diff --git a/board/keymile/km83xx/km83xx_i2c.c b/board/wcom/wcom83xx/wcom83xx_i2c.c
similarity index 100%
rename from board/keymile/km83xx/km83xx_i2c.c
rename to board/wcom/wcom83xx/wcom83xx_i2c.c
diff --git a/board/keymile/km_arm/Kconfig b/board/wcom/wcom_arm/Kconfig
similarity index 96%
rename from board/keymile/km_arm/Kconfig
rename to board/wcom/wcom_arm/Kconfig
index 4b21db8573..cde677aee8 100644
--- a/board/keymile/km_arm/Kconfig
+++ b/board/wcom/wcom_arm/Kconfig
@@ -42,10 +42,10 @@ endmenu
 if TARGET_KM_KIRKWOOD
 
 config SYS_BOARD
-	default "km_arm"
+	default "wcom_arm"
 
 config SYS_VENDOR
-	default "keymile"
+	default "wcom"
 
 config SYS_CONFIG_NAME
 	default "km_kirkwood"
diff --git a/board/keymile/km_arm/MAINTAINERS b/board/wcom/wcom_arm/MAINTAINERS
similarity index 92%
rename from board/keymile/km_arm/MAINTAINERS
rename to board/wcom/wcom_arm/MAINTAINERS
index 3eeb509060..ea996b254d 100644
--- a/board/keymile/km_arm/MAINTAINERS
+++ b/board/wcom/wcom_arm/MAINTAINERS
@@ -1,7 +1,7 @@
 KM_ARM BOARD
 M:	Valentin Longchamp <valentin.longchamp at ch.abb.com>
 S:	Maintained
-F:	board/keymile/km_arm/
+F:	board/wcom/wcom_arm/
 F:	include/configs/km_kirkwood.h
 F:	configs/km_kirkwood_defconfig
 F:	configs/km_kirkwood_128m16_defconfig
diff --git a/board/keymile/km_arm/Makefile b/board/wcom/wcom_arm/Makefile
similarity index 78%
rename from board/keymile/km_arm/Makefile
rename to board/wcom/wcom_arm/Makefile
index 79ccc763eb..b937cde282 100644
--- a/board/keymile/km_arm/Makefile
+++ b/board/wcom/wcom_arm/Makefile
@@ -4,7 +4,7 @@
 # Marvell Semiconductor <www.marvell.com>
 # Prafulla Wadaskar <prafulla at marvell.com>
 
-obj-y	:= km_arm.o ../common/common.o ../common/ivm.o
+obj-y	:= wcom_arm.o ../common/common.o ../common/ivm.o
 
 ifdef CONFIG_KM_FPGA_CONFIG
 obj-y	+= fpga_config.o
diff --git a/board/keymile/km_arm/fpga_config.c b/board/wcom/wcom_arm/fpga_config.c
similarity index 100%
rename from board/keymile/km_arm/fpga_config.c
rename to board/wcom/wcom_arm/fpga_config.c
diff --git a/board/keymile/km_arm/kwbimage-memphis.cfg b/board/wcom/wcom_arm/kwbimage-memphis.cfg
similarity index 100%
rename from board/keymile/km_arm/kwbimage-memphis.cfg
rename to board/wcom/wcom_arm/kwbimage-memphis.cfg
diff --git a/board/keymile/km_arm/kwbimage.cfg b/board/wcom/wcom_arm/kwbimage.cfg
similarity index 100%
rename from board/keymile/km_arm/kwbimage.cfg
rename to board/wcom/wcom_arm/kwbimage.cfg
diff --git a/board/keymile/km_arm/kwbimage_128M16_1.cfg b/board/wcom/wcom_arm/kwbimage_128M16_1.cfg
similarity index 100%
rename from board/keymile/km_arm/kwbimage_128M16_1.cfg
rename to board/wcom/wcom_arm/kwbimage_128M16_1.cfg
diff --git a/board/keymile/km_arm/kwbimage_256M8_1.cfg b/board/wcom/wcom_arm/kwbimage_256M8_1.cfg
similarity index 100%
rename from board/keymile/km_arm/kwbimage_256M8_1.cfg
rename to board/wcom/wcom_arm/kwbimage_256M8_1.cfg
diff --git a/board/keymile/km_arm/km_arm.c b/board/wcom/wcom_arm/wcom_arm.c
similarity index 100%
rename from board/keymile/km_arm/km_arm.c
rename to board/wcom/wcom_arm/wcom_arm.c
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index 2470037f18..d1bbea806c 100644
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -7,7 +7,7 @@ CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x0
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
-CONFIG_IDENT_STRING="\nKeymile Kirkwood 128M16"
+CONFIG_IDENT_STRING="\nABB Kirkwood 128M16"
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16"
 CONFIG_MISC_INIT_R=y
 CONFIG_VERSION_VARIABLE=y
diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index 283b117a28..ba049f3ca6 100644
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -7,7 +7,7 @@ CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x0
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
-CONFIG_IDENT_STRING="\nKeymile Kirkwood"
+CONFIG_IDENT_STRING="\nABB Kirkwood"
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD"
 CONFIG_MISC_INIT_R=y
 CONFIG_VERSION_VARIABLE=y
diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index 1fa0312d08..dce1b97044 100644
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -8,7 +8,7 @@ CONFIG_KM_FPGA_CONFIG=y
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x0
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
-CONFIG_IDENT_STRING="\nKeymile Kirkwood PCI"
+CONFIG_IDENT_STRING="\nABB Kirkwood PCI"
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI"
 CONFIG_MISC_INIT_R=y
 CONFIG_VERSION_VARIABLE=y
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index f712193b0d..fcda7392ff 100644
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -11,7 +11,7 @@ CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_ENV_OFFSET=0xC0000
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
-CONFIG_IDENT_STRING="\nKeymile COGE5UN"
+CONFIG_IDENT_STRING="\nABB COGE5UN"
 CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN"
 CONFIG_MISC_INIT_R=y
 CONFIG_VERSION_VARIABLE=y
diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index b5167e736e..0e61ee8eae 100644
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -11,7 +11,7 @@ CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_ENV_OFFSET=0xC0000
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
-CONFIG_IDENT_STRING="\nKeymile NUSA"
+CONFIG_IDENT_STRING="\nABB NUSA"
 CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA"
 CONFIG_MISC_INIT_R=y
 CONFIG_VERSION_VARIABLE=y
diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h
index 82c2a12922..2ee1411280 100644
--- a/include/configs/km_kirkwood.h
+++ b/include/configs/km_kirkwood.h
@@ -65,11 +65,11 @@
 #endif
 
 /* include common defines/options for all arm based Keymile boards */
-#include "km/km_arm.h"
+#include "wcom/wcom_arm.h"
 
 #if defined(CONFIG_KM_PIGGY4_88E6352)
 /*
- * Some keymile boards like mgcoge5un & nusa1 have their PIGGY4 connected via
+ * Some wcom boards like mgcoge5un & nusa1 have their PIGGY4 connected via
  * an Marvell 88E6352 simple switch.
  * In this case we have to change the default settings for the etherent mac.
  * There is NO ethernet phy. The ARM and Switch are conencted directly over
@@ -100,7 +100,7 @@
 
 #ifdef CONFIG_KM_PIGGY4_88E6061
 /*
- * Some keymile boards like mgcoge5un have their PIGGY4 connected via
+ * Some wcom boards like mgcoge5un have their PIGGY4 connected via
  * an Marvell 88E6061 simple switch.
  * In this case we have to change the default settings for the
  * ethernet phy connected to the kirkwood.
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index cdfb280aee..247ca9cdf4 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -18,11 +18,11 @@
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
 #define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
 
-/* include common defines/options for all Keymile boards */
-#include "km/keymile-common.h"
-#include "km/km-powerpc.h"
-#include "km/km-mpc83xx.h"
-#include "km/km-mpc8360.h"
+/* include common defines/options for all wcom boards */
+#include "wcom/wcom-common.h"
+#include "wcom/wcom-powerpc.h"
+#include "wcom/wcom-mpc83xx.h"
+#include "wcom/wcom-mpc8360.h"
 
 /*
  * System Clock Setup
diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 4245875e39..34db9a36f9 100644
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -10,11 +10,11 @@
 
 #define CONFIG_HOSTNAME		"kmeter1"
 
-/* include common defines/options for all Keymile boards */
-#include "km/keymile-common.h"
-#include "km/km-powerpc.h"
-#include "km/km-mpc83xx.h"
-#include "km/km-mpc8360.h"
+/* include common defines/options for all wcom boards */
+#include "wcom/wcom-common.h"
+#include "wcom/wcom-powerpc.h"
+#include "wcom/wcom-mpc83xx.h"
+#include "wcom/wcom-mpc8360.h"
 
 #define CONFIG_SYS_DDR_CS0_CONFIG	(CSCONFIG_EN | CSCONFIG_AP | \
 					 CSCONFIG_ROW_BIT_13 | \
diff --git a/include/configs/kmopti2.h b/include/configs/kmopti2.h
index 5050c70303..c684222d52 100644
--- a/include/configs/kmopti2.h
+++ b/include/configs/kmopti2.h
@@ -25,10 +25,10 @@
  */
 #define CONFIG_HOSTNAME		"kmopti2"
 
-/* include common defines/options for all Keymile boards */
-#include "km/keymile-common.h"
-#include "km/km-powerpc.h"
-#include "km/km-mpc83xx.h"
-#include "km/km-mpc832x.h"
+/* include common defines/options for all wcom boards */
+#include "wcom/wcom-common.h"
+#include "wcom/wcom-powerpc.h"
+#include "wcom/wcom-mpc83xx.h"
+#include "wcom/wcom-mpc832x.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/kmp204x.h b/include/configs/kmp204x.h
index 0224ac4148..479dbff0c7 100644
--- a/include/configs/kmp204x.h
+++ b/include/configs/kmp204x.h
@@ -24,14 +24,14 @@
 #define CONFIG_NAND_ECC_BCH
 
 /* common KM defines */
-#include "km/keymile-common.h"
+#include "km/wcom-common.h"
 
 #define CONFIG_SYS_RAMBOOT
 #define CONFIG_RAMBOOT_PBL
 #define CONFIG_RAMBOOT_TEXT_BASE	CONFIG_SYS_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS	0xfffffffc
-#define CONFIG_SYS_FSL_PBL_PBI board/keymile/kmp204x/pbi.cfg
-#define CONFIG_SYS_FSL_PBL_RCW board/keymile/kmp204x/rcw_kmp204x.cfg
+#define CONFIG_SYS_FSL_PBL_PBI board/wcom/kmp204x/pbi.cfg
+#define CONFIG_SYS_FSL_PBL_RCW board/wcom/kmp204x/rcw_kmp204x.cfg
 
 /* High Level Configuration Options */
 #define CONFIG_SYS_BOOK3E_HV		/* Category E.HV supported */
@@ -368,7 +368,7 @@ int get_scl(void);
  * Environment Configuration
  */
 #define CONFIG_ENV_OVERWRITE
-#ifndef CONFIG_KM_DEF_ENV		/* if not set by keymile-common.h */
+#ifndef CONFIG_KM_DEF_ENV		/* if not set by wcom-common.h */
 #define CONFIG_KM_DEF_ENV "km-common=empty\0"
 #endif
 
diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h
index e3de6c61e7..985ce07658 100644
--- a/include/configs/kmsupx5.h
+++ b/include/configs/kmsupx5.h
@@ -25,10 +25,10 @@
  */
 #define CONFIG_HOSTNAME		"kmsupx5"
 
-/* include common defines/options for all Keymile boards */
-#include "km/keymile-common.h"
-#include "km/km-powerpc.h"
-#include "km/km-mpc83xx.h"
-#include "km/km-mpc832x.h"
+/* include common defines/options for all wcom boards */
+#include "wcom/wcom-common.h"
+#include "wcom/wcom-powerpc.h"
+#include "wcom/wcom-mpc83xx.h"
+#include "wcom/wcom-mpc832x.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/kmtegr1.h b/include/configs/kmtegr1.h
index bdd35cc7fb..effda04114 100644
--- a/include/configs/kmtegr1.h
+++ b/include/configs/kmtegr1.h
@@ -46,11 +46,11 @@
 		| SICR_1_FEC2_FEC2    \
 	)
 
-/* include common defines/options for all Keymile boards */
-#include "km/keymile-common.h"
-#include "km/km-powerpc.h"
-#include "km/km-mpc83xx.h"
-#include "km/km-mpc8309.h"
+/* include common defines/options for all wcom boards */
+#include "wcom/wcom-common.h"
+#include "wcom/wcom-powerpc.h"
+#include "wcom/wcom-mpc83xx.h"
+#include "wcom/wcom-mpc8309.h"
 
 /* must be after the include because KMBEC_FPGA is otherwise undefined */
 #define CONFIG_SYS_NAND_BASE CONFIG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */
diff --git a/include/configs/kmtepr2.h b/include/configs/kmtepr2.h
index a4ceb1c50d..6fba43b1a0 100644
--- a/include/configs/kmtepr2.h
+++ b/include/configs/kmtepr2.h
@@ -25,10 +25,10 @@
  */
 #define CONFIG_HOSTNAME         "kmtepr2"
 
-/* include common defines/options for all Keymile boards */
-#include "km/keymile-common.h"
-#include "km/km-powerpc.h"
-#include "km/km-mpc83xx.h"
-#include "km/km-mpc832x.h"
+/* include common defines/options for all wcom boards */
+#include "wcom/wcom-common.h"
+#include "wcom/wcom-powerpc.h"
+#include "wcom/wcom-mpc83xx.h"
+#include "wcom/wcom-mpc832x.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h
index d74707971b..c8d4f35db9 100644
--- a/include/configs/suvd3.h
+++ b/include/configs/suvd3.h
@@ -22,11 +22,11 @@
 
 #define CONFIG_HOSTNAME		"suvd3"
 
-/* include common defines/options for all Keymile boards */
-#include "km/keymile-common.h"
-#include "km/km-powerpc.h"
-#include "km/km-mpc83xx.h"
-#include "km/km-mpc832x.h"
+/* include common defines/options for all wcom boards */
+#include "wcom/wcom-common.h"
+#include "wcom/wcom-powerpc.h"
+#include "wcom/wcom-mpc83xx.h"
+#include "wcom/wcom-mpc832x.h"
 
 #define CONFIG_SYS_MAMR	(MxMR_GPL_x4DIS | \
 			 0x0000c000 | \
diff --git a/include/configs/tuge1.h b/include/configs/tuge1.h
index d43ccbe8dd..d8af33e901 100644
--- a/include/configs/tuge1.h
+++ b/include/configs/tuge1.h
@@ -25,10 +25,10 @@
  */
 #define CONFIG_HOSTNAME		"tuge1"
 
-/* include common defines/options for all Keymile boards */
-#include "km/keymile-common.h"
-#include "km/km-powerpc.h"
-#include "km/km-mpc83xx.h"
-#include "km/km-mpc832x.h"
+/* include common defines/options for all wcom boards */
+#include "wcom/wcom-common.h"
+#include "wcom/wcom-powerpc.h"
+#include "wcom/wcom-mpc83xx.h"
+#include "wcom/wcom-mpc832x.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index f5a9f1284a..8f32e6849d 100644
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -25,11 +25,11 @@
  */
 #define CONFIG_HOSTNAME		"tuxx1"
 
-/* include common defines/options for all Keymile boards */
-#include "km/keymile-common.h"
-#include "km/km-powerpc.h"
-#include "km/km-mpc83xx.h"
-#include "km/km-mpc832x.h"
+/* include common defines/options for all wcom boards */
+#include "wcom/wcom-common.h"
+#include "wcom/wcom-powerpc.h"
+#include "wcom/wcom-mpc83xx.h"
+#include "wcom/wcom-mpc832x.h"
 
 #define CONFIG_SYS_MAMR		(MxMR_GPL_x4DIS | \
 				 0x0000c000 | \
diff --git a/include/configs/km/keymile-common.h b/include/configs/wcom/wcom-common.h
similarity index 99%
rename from include/configs/km/keymile-common.h
rename to include/configs/wcom/wcom-common.h
index e690d8f39d..899441198a 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/wcom/wcom-common.h
@@ -30,7 +30,7 @@
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-/* UBI Support for all Keymile boards */
+/* UBI Support for all wcom boards */
 #define CONFIG_MTD_CONCAT
 
 #ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS
diff --git a/include/configs/km/km-mpc8309.h b/include/configs/wcom/wcom-mpc8309.h
similarity index 100%
rename from include/configs/km/km-mpc8309.h
rename to include/configs/wcom/wcom-mpc8309.h
diff --git a/include/configs/km/km-mpc832x.h b/include/configs/wcom/wcom-mpc832x.h
similarity index 100%
rename from include/configs/km/km-mpc832x.h
rename to include/configs/wcom/wcom-mpc832x.h
diff --git a/include/configs/km/km-mpc8360.h b/include/configs/wcom/wcom-mpc8360.h
similarity index 100%
rename from include/configs/km/km-mpc8360.h
rename to include/configs/wcom/wcom-mpc8360.h
diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/wcom/wcom-mpc83xx.h
similarity index 98%
rename from include/configs/km/km-mpc83xx.h
rename to include/configs/wcom/wcom-mpc83xx.h
index dfb78c50f4..109e899525 100644
--- a/include/configs/km/km-mpc83xx.h
+++ b/include/configs/wcom/wcom-mpc83xx.h
@@ -112,7 +112,7 @@
  * Environment Configuration
  */
 #define CONFIG_ENV_OVERWRITE
-#ifndef CONFIG_KM_DEF_ENV		/* if not set by keymile-common.h */
+#ifndef CONFIG_KM_DEF_ENV		/* if not set by wcom-common.h */
 #define CONFIG_KM_DEF_ENV "km-common=empty\0"
 #endif
 
diff --git a/include/configs/km/km-powerpc.h b/include/configs/wcom/wcom-powerpc.h
similarity index 100%
rename from include/configs/km/km-powerpc.h
rename to include/configs/wcom/wcom-powerpc.h
diff --git a/include/configs/km/km_arm.h b/include/configs/wcom/wcom_arm.h
similarity index 98%
rename from include/configs/km/km_arm.h
rename to include/configs/wcom/wcom_arm.h
index 156edfba22..cc88384b1a 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/wcom/wcom_arm.h
@@ -29,8 +29,8 @@
 
 #define CONFIG_NAND_ECC_BCH
 
-/* include common defines/options for all Keymile boards */
-#include "keymile-common.h"
+/* include common defines/options for all wcom boards */
+#include "wcom-common.h"
 
 /* Reserve 4 MB for malloc */
 #define CONFIG_SYS_MALLOC_LEN		(4 * 1024 * 1024)
diff --git a/tools/buildman/README b/tools/buildman/README
index c1ac0d0f58..2feb4f199a 100644
--- a/tools/buildman/README
+++ b/tools/buildman/README
@@ -1132,9 +1132,9 @@ Examples:
   - build all PowerPC boards manufactured by vendor "esd":
       MAKEALL -a powerpc -v esd
           ** buildman -b <branch> esd
-  - build all PowerPC boards manufactured either by "keymile" or "siemens":
-      MAKEALL -a powerpc -v keymile -v siemens
-          ** buildman -b <branch> keymile siemens
+  - build all PowerPC boards manufactured either by "wcom" or "siemens":
+      MAKEALL -a powerpc -v wcom -v siemens
+          ** buildman -b <branch> wcom siemens
   - build all Freescale boards with MPC83xx CPUs, plus all 4xx boards:
       MAKEALL -c mpc83xx -v freescale 4xx
           ** buildman -b <branch> mpc83xx freescale 4xx
