rename U-Boot-v2 project to barebox

This has been done with the following script:

find -path ./.git -prune -o -type f -print0 | xargs -0 -r sed -i \
	-e 's/u2boot/barebox/g' \
	-e 's/U2Boot/barebox/g' \
	-e 's/U-boot V2/barebox/g' \
	-e 's/u-boot v2/barebox/g' \
	-e 's/U-Boot V2/barebox/g' \
	-e 's/U-Boot-v2/barebox/g' \
	-e 's/U_BOOT/BAREBOX/g' \
	-e 's/UBOOT/BAREBOX/g' \
	-e 's/uboot/barebox/g' \
	-e 's/u-boot/barebox/g' \
	-e 's/u_boot/barebox/g' \
	-e 's/U-Boot/barebox/g' \
	-e 's/U-boot/barebox/g' \
	-e 's/U-BOOT/barebox/g'

find -path ./.git -prune -o \( -name "*u-boot*" -o -name "*uboot*" -o -name "*u_boot*" \) -print0 | \
	xargs -0 -r rename 's/u[-_]?boot/barebox/'

It needs some manual fixup following in the next patch

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

57 files changed, 150 insertions, 150 deletions

diff --git a/board/a9m2410/env/config b/board/a9m2410/env/config
index 7dbd544e24..79150ce017 100644
--- a/board/a9m2410/env/config
+++ b/board/a9m2410/env/config
@@ -12,10 +12,10 @@ autoboot_timeout=3
 nfsroot="/nfsexport/OSELAS.BSP-Hesch-TMU-1/platform-FS_A9M2410/root"
 bootargs="console=ttySAC0,38400"
 
-nand_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)"
+nand_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)"
 rootpart_nand="/dev/mtdblock3"
 
-# use 'dhcp' to do dhcp in uboot and in kernel
+# use 'dhcp' to do dhcp in barebox and in kernel
 #ip=dhcp
 
 # or set your networking parameters here
diff --git a/board/a9m2440/env/config b/board/a9m2440/env/config
index 2667c0f23e..936c35f9a9 100644
--- a/board/a9m2440/env/config
+++ b/board/a9m2440/env/config
@@ -12,10 +12,10 @@ autoboot_timeout=3
 nfsroot="/nfsexport/OSELAS.BSP-Hesch-TMU-1/platform-FS_A9M2440/root"
 bootargs="console=ttySAC0,38400"
 
-nand_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)"
+nand_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)"
 rootpart_nand="/dev/mtdblock3"
 
-# use 'dhcp' to do dhcp in uboot and in kernel
+# use 'dhcp' to do dhcp in barebox and in kernel
 #ip=dhcp
 
 # or set your networking parameters here
diff --git a/board/at91sam9260ek/env/config b/board/at91sam9260ek/env/config
index c9b0e0ea91..71d6f88cfe 100644
--- a/board/at91sam9260ek/env/config
+++ b/board/at91sam9260ek/env/config
@@ -4,7 +4,7 @@
 kernel=net
 root=net
 
-# use 'dhcp' todo dhcp in uboot and in kernel
+# use 'dhcp' todo dhcp in barebox and in kernel
 ip=dhcp
 
 #
diff --git a/board/at91sam9263ek/env/bin/init b/board/at91sam9263ek/env/bin/init
index 3b57482654..eaa298d651 100644
--- a/board/at91sam9263ek/env/bin/init
+++ b/board/at91sam9263ek/env/bin/init
@@ -30,7 +30,7 @@ if [ $? != 0 ]; then
 	echo
 	echo "type update_kernel nor [<imagename>] to update kernel into flash"
 	echo "type update_root nor [<imagename>] to update rootfs into flash"
-	echo "type update_uboot_xmodem nor to update uboot into flash"
+	echo "type update_barebox_xmodem nor to update barebox into flash"
 	echo
 	exit
 fi
diff --git a/board/at91sam9263ek/env/bin/update_uboot_xmodem b/board/at91sam9263ek/env/bin/update_barebox_xmodem
index b4feb74263..39818b585c 100644
--- a/board/at91sam9263ek/env/bin/update_uboot_xmodem
+++ b/board/at91sam9263ek/env/bin/update_barebox_xmodem
@@ -3,15 +3,15 @@
 . /env/config
 
 if [ x$1 = xnand ]; then
-	part=/dev/nand0.uboot
+	part=/dev/nand0.barebox
 elif [ x$1 = xnor ]; then
-	part=/dev/nor0.uboot
+	part=/dev/nor0.barebox
 else
 	echo "usage: $0 nor|nand"
 	exit 1
 fi
 
-loadb -f uboot.bin -c
+loadb -f barebox.bin -c
 
 unprotect $part
 echo
@@ -19,8 +19,8 @@ echo "erasing partition $part"
 erase $part
 
 echo
-echo "flashing uboot.bin to $part"
+echo "flashing barebox.bin to $part"
 echo
-cp uboot.bin $part
-crc32 -f uboot.bin
+cp barebox.bin $part
+crc32 -f barebox.bin
 crc32 -f $part
diff --git a/board/at91sam9263ek/env/config b/board/at91sam9263ek/env/config
index 5349bc359e..4b322ad4df 100644
--- a/board/at91sam9263ek/env/config
+++ b/board/at91sam9263ek/env/config
@@ -12,13 +12,13 @@ autoboot_timeout=3
 nfsroot=""
 bootargs="console=ttyS0,115200"
 
-nor_parts="256k(uboot)ro,64k(ubootenv),1536k(kernel),-(root)"
+nor_parts="256k(barebox)ro,64k(bareboxenv),1536k(kernel),-(root)"
 rootpart_nor="/dev/mtdblock3"
 
-#nand_parts="256k(uboot)ro,64k(ubootenv),1536k(kernel),-(root)"
+#nand_parts="256k(barebox)ro,64k(bareboxenv),1536k(kernel),-(root)"
 #rootpart_nand="/dev/mtdblock7"
 
-# use 'dhcp' to do dhcp in uboot and in kernel
+# use 'dhcp' to do dhcp in barebox and in kernel
 ip=dhcp
 
 # or set your networking parameters here
diff --git a/board/board.dox b/board/board.dox
index 466fc591ed..12eff17be1 100644
--- a/board/board.dox
+++ b/board/board.dox
@@ -1,7 +1,7 @@
 /** @page dev_board Adapting a new Board
 
-To add a new board to U-Boot a few steps must be done, to extend and modify
-the U-Boot source tree.
+To add a new board to barebox a few steps must be done, to extend and modify
+the barebox source tree.
 
 @section board_add_files Files/Directories to be added
 
@@ -58,9 +58,9 @@ at the right architecture.
 
 @note Consider to use an unique page lable.
 
-@subsection board_lscript board/\<boardname\>/u-boot.ld.S
+@subsection board_lscript board/\<boardname\>/barebox.ld.S
 
-If your board needs a special binary U-Boot layout, you can provide a local
+If your board needs a special binary barebox layout, you can provide a local
 board linker script file. This will replace the generic one provided by your
 architecture or CPU support.
 
diff --git a/board/eco920/config.h b/board/eco920/config.h
index 9aa7dde98e..3fb8beb8c3 100644
--- a/board/eco920/config.h
+++ b/board/eco920/config.h
@@ -83,7 +83,7 @@
 
 #define	CONFIG_EXTRA_ENV_SETTINGS											\
 	"mtdids=nor0=physmap-flash.0\0"											\
-	"mtdparts=mtdparts=physmap-flash.0:128k(uboot)ro,128k(env),1536k(kernel),-(jffs2)\0"				\
+	"mtdparts=mtdparts=physmap-flash.0:128k(barebox)ro,128k(env),1536k(kernel),-(jffs2)\0"				\
 	"bootargs_base=setenv bootargs console=ttyAT0,115200\0"								\
 	"bootargs_nfs=setenv bootargs $(bootargs) root=/dev/nfs ip=dhcp nfsroot=$(serverip):$(nfsrootfs),v3,tcp\0"	\
 	"bootargs_mtd=setenv bootargs $(bootargs) $(mtdparts)\0"							\
@@ -113,7 +113,7 @@
 #define CFG_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 #define	CFG_LONGHELP				/* undef to save memory		*/
-#define CFG_PROMPT		"uboot> "	/* Monitor Command Prompt */
+#define CFG_PROMPT		"barebox> "	/* Monitor Command Prompt */
 #define CFG_CBSIZE		1024		/* Console I/O Buffer Size */
 #define CFG_MAXARGS		32		/* max number of command args */
 #define CFG_PBSIZE		(CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
diff --git a/board/eukrea_cpuimx27/env/config b/board/eukrea_cpuimx27/env/config
index 2547fb115b..183787e5ca 100644
--- a/board/eukrea_cpuimx27/env/config
+++ b/board/eukrea_cpuimx27/env/config
@@ -13,7 +13,7 @@ autoboot_timeout=3
 video="CMO-QVGA"
 bootargs="console=ttymxc0,115200 fec_mac=$eth0.ethaddr rtc-pcf8563.probe=0,0x51 video=mxcfb:$video"
 
-nor_parts="256k(uboot)ro,128k(ubootenv),1792k(kernel),-(root)"
+nor_parts="256k(barebox)ro,128k(bareboxenv),1792k(kernel),-(root)"
 rootpart_nor="/dev/mtdblock3"
 
 nand_parts="-(nand)"
@@ -21,7 +21,7 @@ rootpart_nand=""
 
 nfsroot=""
 
-# use 'dhcp' to do dhcp in uboot and in kernel
+# use 'dhcp' to do dhcp in barebox and in kernel
 ip=dhcp
 
 # or set your networking parameters here
diff --git a/board/eukrea_cpuimx27/lowlevel_init.S b/board/eukrea_cpuimx27/lowlevel_init.S
index 5cab984e34..4622af88af 100644
--- a/board/eukrea_cpuimx27/lowlevel_init.S
+++ b/board/eukrea_cpuimx27/lowlevel_init.S
@@ -129,7 +129,7 @@ copy_loop:
 
 	ldr	pc, =1f			/* Jump to SDRAM                    */
 1:
-	bl	nand_boot		/* Load U-Boot from NAND Flash      */
+	bl	nand_boot		/* Load barebox from NAND Flash      */
 
 	ldr	r1, =IMX_NFC_BASE - TEXT_BASE
 	sub	r10, r10, r1		/* adjust return address from NFC SRAM */
diff --git a/board/freescale-mx25-3-stack/3stack.c b/board/freescale-mx25-3-stack/3stack.c
index 3ee87e355b..3a528fa365 100644
--- a/board/freescale-mx25-3-stack/3stack.c
+++ b/board/freescale-mx25-3-stack/3stack.c
@@ -80,7 +80,7 @@ struct mx25_nand_flash_header __flash_header mx25_3ds_header = {
 
 extern unsigned long __bss_start;
 
-unsigned long __image_len u_boot_len = 0x40000; 
+unsigned long __image_len barebox_len = 0x40000;
 
 static struct fec_platform_data fec_info = {
 	.xcv_type	= RMII,
@@ -208,7 +208,7 @@ static int imx25_devices_init(void)
 #endif
 
 	/* FEC does only work when the CPLD is initialized.
-	 * Currently we do not do this in U-Boot, so it
+	 * Currently we do not do this in barebox, so it
 	 * does only work when Linux has been started after
 	 * the last powercycle.
 	 */
diff --git a/board/freescale-mx25-3-stack/env/config b/board/freescale-mx25-3-stack/env/config
index 149619a5ac..a5e492e339 100644
--- a/board/freescale-mx25-3-stack/env/config
+++ b/board/freescale-mx25-3-stack/env/config
@@ -12,13 +12,13 @@ autoboot_timeout=3
 nfsroot="/ptx/work/octopus/rsc/svn/oselas/bsp/phytec/phyCORE-i.MX27/OSELAS.BSP-Phytec-phyCORE-i.MX27-trunk/root"
 bootargs="console=ttymxc0,115200"
 
-nor_parts="256k(uboot)ro,128k(ubootenv),2048k(kernel),-(root)"
+nor_parts="256k(barebox)ro,128k(bareboxenv),2048k(kernel),-(root)"
 rootpart_nor="/dev/mtdblock3"
 
-nand_parts="256k(uboot)ro,128k(ubootenv),2048k(kernel),108416k(root),-(kernel1)"
+nand_parts="256k(barebox)ro,128k(bareboxenv),2048k(kernel),108416k(root),-(kernel1)"
 rootpart_nand="/dev/mtdblock7"
 
-# use 'dhcp' to do dhcp in uboot and in kernel
+# use 'dhcp' to do dhcp in barebox and in kernel
 #ip=dhcp
 
 # or set your networking parameters here
diff --git a/board/freescale-mx25-3-stack/lowlevel_init.S b/board/freescale-mx25-3-stack/lowlevel_init.S
index d622bd3628..bf03390c15 100644
--- a/board/freescale-mx25-3-stack/lowlevel_init.S
+++ b/board/freescale-mx25-3-stack/lowlevel_init.S
@@ -129,7 +129,7 @@ copy_loop:
 
 	ldr	pc, =1f			/* Jump to SDRAM                    */
 1:
-	bl	nand_boot		/* Load U-Boot from NAND Flash      */
+	bl	nand_boot		/* Load barebox from NAND Flash      */
 
 	ldr	r1, =IMX_NFC_BASE - TEXT_BASE
 	sub	r10, r10, r1		/* adjust return address from NFC SRAM */
diff --git a/board/freescale-mx35-3-stack/3stack.c b/board/freescale-mx35-3-stack/3stack.c
index efaa6d4a38..77dcf7a0c9 100644
--- a/board/freescale-mx35-3-stack/3stack.c
+++ b/board/freescale-mx35-3-stack/3stack.c
@@ -19,7 +19,7 @@
  *
  * Derived from:
  *
- * * mx35_3stack.c - board file for u-boot-v1
+ * * mx35_3stack.c - board file for barebox-v1
  *   Copyright (C) 2007, Guennadi Liakhovetski <lg@denx.de>
  *   (C) Copyright 2008-2009 Freescale Semiconductor, Inc.
  *
diff --git a/board/freescale-mx35-3-stack/env/config b/board/freescale-mx35-3-stack/env/config
index d6afdfbeba..9fcb3dc7b9 100644
--- a/board/freescale-mx35-3-stack/env/config
+++ b/board/freescale-mx35-3-stack/env/config
@@ -12,13 +12,13 @@ autoboot_timeout=3
 nfsroot="/ptx/work/octopus/rsc/svn/oselas/bsp/phytec/phyCORE-i.MX27/OSELAS.BSP-Phytec-phyCORE-i.MX27-trunk/root"
 bootargs="console=ttymxc0,115200"
 
-nor_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)"
+nor_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)"
 rootpart_nor="/dev/mtdblock3"
 
-nand_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)"
+nand_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)"
 rootpart_nand="/dev/mtdblock7"
 
-# use 'dhcp' to do dhcp in uboot and in kernel
+# use 'dhcp' to do dhcp in barebox and in kernel
 ip=dhcp
 
 # or set your networking parameters here
diff --git a/board/freescale-mx35-3-stack/flash_header.c b/board/freescale-mx35-3-stack/flash_header.c
index a2496a52d0..968a948a8d 100644
--- a/board/freescale-mx35-3-stack/flash_header.c
+++ b/board/freescale-mx35-3-stack/flash_header.c
@@ -45,5 +45,5 @@ struct imx_flash_header __flash_header_0x400 flash_header = {
 	.dcd_block_len		= sizeof (dcd_entry),
 };
 
-unsigned long __image_len_0x400 u_boot_len = 0x40000;
+unsigned long __image_len_0x400 barebox_len = 0x40000;
 
diff --git a/board/freescale-mx35-3-stack/lowlevel_init.S b/board/freescale-mx35-3-stack/lowlevel_init.S
index a00d2af056..4e0a10293d 100644
--- a/board/freescale-mx35-3-stack/lowlevel_init.S
+++ b/board/freescale-mx35-3-stack/lowlevel_init.S
@@ -175,7 +175,7 @@ copy_loop:
 
 	ldr	pc, =1f			/* Jump to SDRAM                    */
 1:
-	bl	nand_boot		/* Load U-Boot from NAND Flash      */
+	bl	nand_boot		/* Load barebox from NAND Flash      */
 
 	/* rebase the return address */
 	ldr	r1, =IMX_NFC_BASE - TEXT_BASE
diff --git a/board/imx27ads/env/config b/board/imx27ads/env/config
index a14906a253..f18a86b7c1 100644
--- a/board/imx27ads/env/config
+++ b/board/imx27ads/env/config
@@ -4,7 +4,7 @@
 kernel=net
 root=net
 
-# use 'dhcp' todo dhcp in uboot and in kernel
+# use 'dhcp' todo dhcp in barebox and in kernel
 ip=dhcp
 
 eth0.ipaddr=192.168.23.164
@@ -20,6 +20,6 @@ autoboot_timeout=3
 nfsroot="/tmp/imx27ads"
 bootargs="console=ttymxc0,115200"
 
-mtdparts="128k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)"
+mtdparts="128k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)"
 rootpart="/dev/mtdblock3"
 
diff --git a/board/imx27ads/lowlevel_init.S b/board/imx27ads/lowlevel_init.S
index 2d079b6156..df12aead00 100644
--- a/board/imx27ads/lowlevel_init.S
+++ b/board/imx27ads/lowlevel_init.S
@@ -82,7 +82,7 @@ MODE_REG_VAL0		.long 0x00000000 // system/external device dependent data
 NORMAL_MODE		.long 0x00000000 // system/external device dependent data (SMODE=000)
 .endm
 
-.macro sdram_init_uboot
+.macro sdram_init_barebox
 	/* configure 16 bit nor flash on cs0 */
 	writel(0x0000CC03, 0xd8002000)
 	writel(0xa0330D01, 0xd8002004)
diff --git a/board/ipe337/Makefile b/board/ipe337/Makefile
index e161238123..172dfb688c 100644
--- a/board/ipe337/Makefile
+++ b/board/ipe337/Makefile
@@ -1,4 +1,4 @@
 obj-y += ipe337.o
 obj-y += cmd_alternate.o
 
-extra-y += u-boot.lds
+extra-y += barebox.lds
diff --git a/board/ipe337/u-boot.lds.S b/board/ipe337/barebox.lds.S
index 09240edbe3..4299b8208b 100644
--- a/board/ipe337/u-boot.lds.S
+++ b/board/ipe337/barebox.lds.S
@@ -1,5 +1,5 @@
 /*
- * U-boot - u-boot.lds.S
+ * barebox - barebox.lds.S
  *
  * Copyright (c) 2005-2007 Analog Device Inc.
  *
@@ -26,7 +26,7 @@
  */
 
 #include <config.h>
-#include <asm-generic/u-boot.lds.h>
+#include <asm-generic/barebox.lds.h>
 
 OUTPUT_ARCH("bfin")
 SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib);
@@ -67,16 +67,16 @@ SECTIONS
 	.got : { *(.got) }
 
 	. = .;
-	___u_boot_cmd_start = .;
-	.u_boot_cmd : { U_BOOT_CMDS }
-	___u_boot_cmd_end = .;
+	___barebox_cmd_start = .;
+	.barebox_cmd : { BAREBOX_CMDS }
+	___barebox_cmd_end = .;
 
-	___u_boot_initcalls_start = .;
-	.u_boot_initcalls : { INITCALLS }
-	___u_boot_initcalls_end = .;
+	___barebox_initcalls_start = .;
+	.barebox_initcalls : { INITCALLS }
+	___barebox_initcalls_end = .;
 
 	___usymtab_start = .;
-	__usymtab : { U_BOOT_SYMS }
+	__usymtab : { BAREBOX_SYMS }
 	___usymtab_end = .;
 
 	. = ALIGN(4);
diff --git a/board/ipe337/cmd_alternate.c b/board/ipe337/cmd_alternate.c
index 78ed77c2dd..538f0bfd67 100644
--- a/board/ipe337/cmd_alternate.c
+++ b/board/ipe337/cmd_alternate.c
@@ -48,9 +48,9 @@ static const __maybe_unused char cmd_alternate_help[] =
 "Usage: alternate <file>"
 "\n";
 
-U_BOOT_CMD_START(alternate)
+BAREBOX_CMD_START(alternate)
 	.cmd		= do_alternate,
 	.usage		= "count zero bits in a file",
-	U_BOOT_CMD_HELP(cmd_alternate_help)
-U_BOOT_CMD_END
+	BAREBOX_CMD_HELP(cmd_alternate_help)
+BAREBOX_CMD_END
 
diff --git a/board/ipe337/env/bin/init b/board/ipe337/env/bin/init
index 9ca41d6152..e864dc5a42 100644
--- a/board/ipe337/env/bin/init
+++ b/board/ipe337/env/bin/init
@@ -15,7 +15,7 @@ if [ $? != 0 ]; then
 	echo "Type update_system [<imagename>] to update rootfs into flash."
 	echo "Type update_application [<imagename>] to update applications into flash."
 	echo "Type update_persistent [<imagename>] to update persistent into flash."
-	echo "Type update_ubootenv [<imagename>] to update ubootenv into flash (use with care!)."
+	echo "Type update_bareboxenv [<imagename>] to update bareboxenv into flash (use with care!)."
 	echo "Type reset_ageing to initialize the ageing partittion (use with care!)."
 	echo
 	exit
diff --git a/board/ipe337/env/bin/update_ubootenv b/board/ipe337/env/bin/update_bareboxenv
index 301072ff5e..b0a32c626b 100644
--- a/board/ipe337/env/bin/update_ubootenv
+++ b/board/ipe337/env/bin/update_bareboxenv
@@ -3,6 +3,6 @@
 . /env/config
 
 image=$envimage
-part=/dev/nor0.ubootenv
+part=/dev/nor0.bareboxenv
 
 . /env/bin/_update $1
diff --git a/board/ipe337/env/config b/board/ipe337/env/config
index 39a47ff00b..7c5ee76e30 100644
--- a/board/ipe337/env/config
+++ b/board/ipe337/env/config
@@ -4,7 +4,7 @@
 kernel=net
 root=net
 
-# use 'dhcp' todo dhcp in uboot and in kernel
+# use 'dhcp' todo dhcp in barebox and in kernel
 #ip=dhcp
 
 eth0.ipaddr=192.168.23.164
@@ -23,5 +23,5 @@ autoboot_timeout=1
 nfsroot="/ptx/work/octopus/wsa/svn/OSELAS.BSP-Pipetronix-ipe337-trunk/root"
 bootargs="console=ttyBF0,115200"
 
-mtdparts="128k(uboot)ro,128k(ubootenv),128k(ageing),1280k(kernel0),1280k(kernel1),8704k(system0),8704k(system1),8320k(application),4096k(persistent)"
+mtdparts="128k(barebox)ro,128k(bareboxenv),128k(ageing),1280k(kernel0),1280k(kernel1),8704k(system0),8704k(system1),8320k(application),4096k(persistent)"
 ageing=/dev/nor0.ageing
diff --git a/board/kp_ukd_r1_num/Makefile b/board/kp_ukd_r1_num/Makefile
index 5852031092..65f2a02fca 100644
--- a/board/kp_ukd_r1_num/Makefile
+++ b/board/kp_ukd_r1_num/Makefile
@@ -2,20 +2,20 @@
 # (C) Copyright 2007 Carsten Schlote <schlote@vahanus.net>
 # See file CREDITS for list of people who contributed to this project.
 #
-# This file is part of U-Boot V2.
+# This file is part of barebox.
 #
-# U-Boot V2 is free software: you can redistribute it and/or modify
+# barebox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# U-Boot V2 is distributed in the hope that it will be useful,
+# barebox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+# along with barebox.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # The build system allows to split everything into distinct files covering an
diff --git a/board/kp_ukd_r1_num/env/config b/board/kp_ukd_r1_num/env/config
index 5beed3c9ca..14958ba1df 100644
--- a/board/kp_ukd_r1_num/env/config
+++ b/board/kp_ukd_r1_num/env/config
@@ -4,7 +4,7 @@
 kernel=net
 root=net
 
-# use 'dhcp' todo dhcp in uboot and in kernel
+# use 'dhcp' todo dhcp in barebox and in kernel
 ip=dhcp
 
 #
diff --git a/board/kp_ukd_r1_num/highlevel_init.c b/board/kp_ukd_r1_num/highlevel_init.c
index a0d4a621ac..3a88cd68c7 100644
--- a/board/kp_ukd_r1_num/highlevel_init.c
+++ b/board/kp_ukd_r1_num/highlevel_init.c
@@ -2,20 +2,20 @@
  * (C) 2007,2008 konzeptpark, Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/board/kp_ukd_r1_num/kp_ukd_r1_num.c b/board/kp_ukd_r1_num/kp_ukd_r1_num.c
index a9052e196c..9bf1713cc4 100644
--- a/board/kp_ukd_r1_num/kp_ukd_r1_num.c
+++ b/board/kp_ukd_r1_num/kp_ukd_r1_num.c
@@ -2,20 +2,20 @@
  * (C) 2007 konzeptpark, Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/board/kp_ukd_r1_num/lowlevel_init.c b/board/kp_ukd_r1_num/lowlevel_init.c
index 7770e101de..b3de505c24 100644
--- a/board/kp_ukd_r1_num/lowlevel_init.c
+++ b/board/kp_ukd_r1_num/lowlevel_init.c
@@ -2,20 +2,20 @@
  * (C) 2007 konzeptpark, Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/board/kp_ukd_r1_num/pci-stubs.c b/board/kp_ukd_r1_num/pci-stubs.c
index 4993284c0c..b7ab7c7d72 100644
--- a/board/kp_ukd_r1_num/pci-stubs.c
+++ b/board/kp_ukd_r1_num/pci-stubs.c
@@ -2,20 +2,20 @@
  * (C) 2007,2008 Carsten Schlote <schlote@vahanus.net>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/board/mmccpu/env/config b/board/mmccpu/env/config
index de92684484..5367cd9f56 100644
--- a/board/mmccpu/env/config
+++ b/board/mmccpu/env/config
@@ -13,14 +13,14 @@ nfsroot="/home/kschwinne/src/pengutronix/OSELAS.BSP-Bucyrus-Grabowski-trunk/plat
 
 bootargs="console=ttyS0,115200 mmccpu=p299"
 
-#nor_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)"
-nor_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),10240k(root),10240k(rootbu),-(data)"
+#nor_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)"
+nor_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),10240k(root),10240k(rootbu),-(data)"
 rootpart_nor="/dev/mtdblock3"
 
-#nand_parts="256k(uboot)ro,64k(ubootenv),1536k(kernel),-(root)"
+#nand_parts="256k(barebox)ro,64k(bareboxenv),1536k(kernel),-(root)"
 #rootpart_nand="/dev/mtdblock7"
 
-# use 'dhcp' to do dhcp in uboot and in kernel
+# use 'dhcp' to do dhcp in barebox and in kernel
 ip=dhcp
 
 # or set your networking parameters here
diff --git a/board/omap/board-sdp343x.c b/board/omap/board-sdp343x.c
index 0841df0f2d..1e88e397d9 100644
--- a/board/omap/board-sdp343x.c
+++ b/board/omap/board-sdp343x.c
@@ -19,7 +19,7 @@
  * Run time initialization includes
  * @li serial @ref serial_ns16550.c driver device definition
  *
- * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz
  */
 /*
  * (C) Copyright 2006-2008
@@ -142,7 +142,7 @@ static void sdrc_init(void)
  * @brief Do the pin muxing required for Board operation.
  *
  * See @ref MUX_VAL for description of the muxing mode. Since some versions
- * of Linux depend on all pin muxing being done at U-Boot level, we may need to
+ * of Linux depend on all pin muxing being done at barebox level, we may need to
  * enable CONFIG_MACH_OMAP_ADVANCED_MUX to enable the full fledged pin muxing.
  *
  * @return void
diff --git a/board/pcm030/Makefile b/board/pcm030/Makefile
index bc830dfb73..e7d744bfb4 100644
--- a/board/pcm030/Makefile
+++ b/board/pcm030/Makefile
@@ -1,2 +1,2 @@
 obj-y += pcm030.o
-extra-y += u-boot.lds
+extra-y += barebox.lds
diff --git a/board/pcm030/u-boot.lds.S b/board/pcm030/barebox.lds.S
index 29ab0ed692..ab99335675 100644
--- a/board/pcm030/u-boot.lds.S
+++ b/board/pcm030/barebox.lds.S
@@ -21,7 +21,7 @@
  * MA 02111-1307 USA
  */
 
-#include <asm-generic/u-boot.lds.h>
+#include <asm-generic/barebox.lds.h>
 
 OUTPUT_ARCH("powerpc")
 /* Do we need any of these for elf?
@@ -30,7 +30,7 @@ SECTIONS
 {
   . = TEXT_BASE;
 
-  /* Read-only sections, merged into text segment: */ 
+  /* Read-only sections, merged into text segment: */
   .interp : { *(.interp) }
   .hash          : { *(.hash)		}
   .dynsym        : { *(.dynsym)		}
@@ -96,17 +96,17 @@ SECTIONS
   PROVIDE (edata = .);
 
   . = .;
-  __u_boot_cmd_start = .;
-  .u_boot_cmd : { U_BOOT_CMDS }
-  __u_boot_cmd_end = .;
+  __barebox_cmd_start = .;
+  .barebox_cmd : { BAREBOX_CMDS }
+  __barebox_cmd_end = .;
 
-  __u_boot_initcalls_start = .;
-  .u_boot_initcalls : { INITCALLS }
-  __u_boot_initcalls_end = .;
-  __initcall_entries = (__u_boot_initcalls_end - __u_boot_initcalls_start) >> 2;
+  __barebox_initcalls_start = .;
+  .barebox_initcalls : { INITCALLS }
+  __barebox_initcalls_end = .;
+  __initcall_entries = (__barebox_initcalls_end - __barebox_initcalls_start) >> 2;
 
   __usymtab_start = .;
-  __usymtab : { U_BOOT_SYMS }
+  __usymtab : { BAREBOX_SYMS }
   __usymtab_end = .;
 
   __early_init_data_begin = .;
diff --git a/board/pcm037/env/config b/board/pcm037/env/config
index 008925540d..fb1f5afddb 100644
--- a/board/pcm037/env/config
+++ b/board/pcm037/env/config
@@ -12,13 +12,13 @@ autoboot_timeout=3
 nfsroot="/ptx/work/octopus/rsc/svn/oselas/bsp/phytec/phyCORE-i.MX27/OSELAS.BSP-Phytec-phyCORE-i.MX27-trunk/root"
 bootargs="console=ttymxc0,115200"
 
-nor_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)"
+nor_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)"
 rootpart_nor="/dev/mtdblock3"
 
-nand_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)"
+nand_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)"
 rootpart_nand="/dev/mtdblock7"
 
-# use 'dhcp' to do dhcp in uboot and in kernel
+# use 'dhcp' to do dhcp in barebox and in kernel
 ip=dhcp
 
 # or set your networking parameters here
diff --git a/board/pcm037/lowlevel_init.S b/board/pcm037/lowlevel_init.S
index a32d375dde..8988db23a2 100644
--- a/board/pcm037/lowlevel_init.S
+++ b/board/pcm037/lowlevel_init.S
@@ -156,7 +156,7 @@ copy_loop:
 
 	ldr	pc, =1f			/* Jump to SDRAM                    */
 1:
-	bl	nand_boot		/* Load U-Boot from NAND Flash      */
+	bl	nand_boot		/* Load barebox from NAND Flash      */
 
 	ldr	r1, =IMX_NFC_BASE - TEXT_BASE
 	sub	r10, r10, r1		/* adjust return address from NFC SRAM */
diff --git a/board/pcm038/env/config b/board/pcm038/env/config
index d6afdfbeba..9fcb3dc7b9 100644
--- a/board/pcm038/env/config
+++ b/board/pcm038/env/config
@@ -12,13 +12,13 @@ autoboot_timeout=3
 nfsroot="/ptx/work/octopus/rsc/svn/oselas/bsp/phytec/phyCORE-i.MX27/OSELAS.BSP-Phytec-phyCORE-i.MX27-trunk/root"
 bootargs="console=ttymxc0,115200"
 
-nor_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)"
+nor_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)"
 rootpart_nor="/dev/mtdblock3"
 
-nand_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)"
+nand_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)"
 rootpart_nand="/dev/mtdblock7"
 
-# use 'dhcp' to do dhcp in uboot and in kernel
+# use 'dhcp' to do dhcp in barebox and in kernel
 ip=dhcp
 
 # or set your networking parameters here
diff --git a/board/pcm038/lowlevel_init.S b/board/pcm038/lowlevel_init.S
index 759ecd77a9..a5ceb26f5b 100644
--- a/board/pcm038/lowlevel_init.S
+++ b/board/pcm038/lowlevel_init.S
@@ -98,7 +98,7 @@ copy_loop:
 
 	ldr	pc, =1f			/* Jump to SDRAM                    */
 1:
-	bl	nand_boot		/* Load U-Boot from NAND Flash      */
+	bl	nand_boot		/* Load barebox from NAND Flash      */
 
 	ldr	r1, =IMX_NFC_BASE - TEXT_BASE
 	sub	r10, r10, r1		/* adjust return address from NFC SRAM */
diff --git a/board/pcm043/env/config b/board/pcm043/env/config
index 3558c3a119..c1ab234e63 100644
--- a/board/pcm043/env/config
+++ b/board/pcm043/env/config
@@ -12,12 +12,12 @@ autoboot_timeout=3
 nfsroot="/path/to/nfs_root"
 bootargs="console=ttymxc0,115200"
 
-nor_parts="256k(uboot)ro,128k(ubootenv),2048k(kernel),-(root)"
+nor_parts="256k(barebox)ro,128k(bareboxenv),2048k(kernel),-(root)"
 rootpart_nor="/dev/mtdblock3"
-nand_parts="256k(uboot)ro,128k(ubootenv),2048k(kernel),-(root)"
+nand_parts="256k(barebox)ro,128k(bareboxenv),2048k(kernel),-(root)"
 rootpart_nand="/dev/mtdblock3"
 
-# use 'dhcp' to do dhcp in uboot and in kernel
+# use 'dhcp' to do dhcp in barebox and in kernel
 ip=dhcp
 
 # or set your networking parameters here
diff --git a/board/pcm043/lowlevel_init.S b/board/pcm043/lowlevel_init.S
index 56ebae4335..9df064cb49 100644
--- a/board/pcm043/lowlevel_init.S
+++ b/board/pcm043/lowlevel_init.S
@@ -219,7 +219,7 @@ copy_loop:
 
 	ldr	pc, =1f			/* Jump to SDRAM                    */
 1:
-	bl	nand_boot		/* Load U-Boot from NAND Flash      */
+	bl	nand_boot		/* Load barebox from NAND Flash      */
 
 	/* rebase the return address */
 	ldr	r1, =IMX_NFC_BASE - TEXT_BASE
diff --git a/board/pcm043/pcm043.c b/board/pcm043/pcm043.c
index cbd910a214..d93ef80c95 100644
--- a/board/pcm043/pcm043.c
+++ b/board/pcm043/pcm043.c
@@ -383,11 +383,11 @@ static const __maybe_unused char cmd_cpufreq_help[] =
 "\n"
 "Set CPU frequency to <freq> MHz\n";
 
-U_BOOT_CMD_START(cpufreq)
+BAREBOX_CMD_START(cpufreq)
 	.cmd            = do_cpufreq,
 	.usage          = "adjust CPU frequency",
-	U_BOOT_CMD_HELP(cmd_cpufreq_help)
-U_BOOT_CMD_END
+	BAREBOX_CMD_HELP(cmd_cpufreq_help)
+BAREBOX_CMD_END
 
 #ifdef CONFIG_NAND_IMX_BOOT
 void __bare_init nand_boot(void)
diff --git a/board/phycard-i.MX27/env/config b/board/phycard-i.MX27/env/config
index c0e63c13c6..6a93580da4 100644
--- a/board/phycard-i.MX27/env/config
+++ b/board/phycard-i.MX27/env/config
@@ -12,10 +12,10 @@ autoboot_timeout=3
 nfsroot="/tmp/root"
 bootargs="console=ttymxc0,115200"
 
-nand_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)"
+nand_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)"
 rootpart_nand="/dev/mtdblock3"
 
-# use 'dhcp' to do dhcp in uboot and in kernel
+# use 'dhcp' to do dhcp in barebox and in kernel
 ip=dhcp
 
 # or set your networking parameters here
diff --git a/board/phycard-i.MX27/lowlevel_init.S b/board/phycard-i.MX27/lowlevel_init.S
index e99dbcfd3a..9349581165 100644
--- a/board/phycard-i.MX27/lowlevel_init.S
+++ b/board/phycard-i.MX27/lowlevel_init.S
@@ -116,7 +116,7 @@ copy_loop:
 
 	ldr	pc, =1f			/* Jump to SDRAM                    */
 1:
-	bl	nand_boot		/* Load U-Boot from NAND Flash      */
+	bl	nand_boot		/* Load barebox from NAND Flash      */
 
 	ldr	r1, =IMX_NFC_BASE - TEXT_BASE
 	sub	r10, r10, r1		/* adjust return address from NFC SRAM */
diff --git a/board/phycore_mcf54xx/Makefile b/board/phycore_mcf54xx/Makefile
index 97f13fd60b..054123fe75 100644
--- a/board/phycore_mcf54xx/Makefile
+++ b/board/phycore_mcf54xx/Makefile
@@ -2,20 +2,20 @@
 # (C) Copyright 2007 Carsten Schlote <schlote@vahanus.net>
 # See file CREDITS for list of people who contributed to this project.
 #
-# This file is part of U-Boot V2.
+# This file is part of barebox.
 #
-# U-Boot V2 is free software: you can redistribute it and/or modify
+# barebox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# U-Boot V2 is distributed in the hope that it will be useful,
+# barebox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+# along with barebox.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # The build system allows to split everything into distinct files covering an
diff --git a/board/phycore_mcf54xx/env/config b/board/phycore_mcf54xx/env/config
index abc81b5362..58550625d2 100644
--- a/board/phycore_mcf54xx/env/config
+++ b/board/phycore_mcf54xx/env/config
@@ -4,7 +4,7 @@
 kernel=net
 root=net
 
-# use 'dhcp' todo dhcp in uboot and in kernel
+# use 'dhcp' todo dhcp in barebox and in kernel
 ip=dhcp
 
 #
diff --git a/board/phycore_mcf54xx/highlevel_init.c b/board/phycore_mcf54xx/highlevel_init.c
index a0d4a621ac..3a88cd68c7 100644
--- a/board/phycore_mcf54xx/highlevel_init.c
+++ b/board/phycore_mcf54xx/highlevel_init.c
@@ -2,20 +2,20 @@
  * (C) 2007,2008 konzeptpark, Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/board/phycore_mcf54xx/lowlevel_init.c b/board/phycore_mcf54xx/lowlevel_init.c
index 2f8e9dae26..2837e3ed67 100644
--- a/board/phycore_mcf54xx/lowlevel_init.c
+++ b/board/phycore_mcf54xx/lowlevel_init.c
@@ -2,20 +2,20 @@
  * (C) 2007 konzeptpark, Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/board/phycore_mcf54xx/pci-stubs.c b/board/phycore_mcf54xx/pci-stubs.c
index 4993284c0c..b7ab7c7d72 100644
--- a/board/phycore_mcf54xx/pci-stubs.c
+++ b/board/phycore_mcf54xx/pci-stubs.c
@@ -2,20 +2,20 @@
  * (C) 2007,2008 Carsten Schlote <schlote@vahanus.net>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/board/phycore_mcf54xx/phyCore_MCF54xx.c b/board/phycore_mcf54xx/phyCore_MCF54xx.c
index 68c2111fa8..b6eb311dd7 100644
--- a/board/phycore_mcf54xx/phyCore_MCF54xx.c
+++ b/board/phycore_mcf54xx/phyCore_MCF54xx.c
@@ -2,20 +2,20 @@
  * (C) 2007 konzeptpark, Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/board/pm9263/env/config b/board/pm9263/env/config
index 7cbff9476b..75132911c4 100644
--- a/board/pm9263/env/config
+++ b/board/pm9263/env/config
@@ -12,13 +12,13 @@ autoboot_timeout=3
 nfsroot="/ptx/work/octopus/mkl/bucyrus/OSELAS.BSP-Bucyrus-Grabowski-trunk/platform-Ronetix-PM9263/root"
 bootargs="console=ttyS0,115200"
 
-nor_parts="256k(uboot)ro,64k(ubootenv),1536k(kernel),-(root)"
+nor_parts="256k(barebox)ro,64k(bareboxenv),1536k(kernel),-(root)"
 rootpart_nor="/dev/mtdblock3"
 
-#nand_parts="256k(uboot)ro,64k(ubootenv),1536k(kernel),-(root)"
+#nand_parts="256k(barebox)ro,64k(bareboxenv),1536k(kernel),-(root)"
 #rootpart_nand="/dev/mtdblock7"
 
-# use 'dhcp' to do dhcp in uboot and in kernel
+# use 'dhcp' to do dhcp in barebox and in kernel
 ip=dhcp
 
 # or set your networking parameters here
diff --git a/board/sandbox/.gitignore b/board/sandbox/.gitignore
index 09f1be04eb..d1165788c9 100644
--- a/board/sandbox/.gitignore
+++ b/board/sandbox/.gitignore
@@ -1 +1 @@
-u-boot.lds
+barebox.lds
diff --git a/board/sandbox/Makefile b/board/sandbox/Makefile
index 0fdd2e3283..8abe5dde08 100644
--- a/board/sandbox/Makefile
+++ b/board/sandbox/Makefile
@@ -3,7 +3,7 @@ obj-y += clock.o
 obj-y += hostfile.o
 obj-y += console.o
 
-CPPFLAGS_u-boot.lds = -U$(SUBARCH) -DELF_ARCH=$(ELF_ARCH) \
+CPPFLAGS_barebox.lds = -U$(SUBARCH) -DELF_ARCH=$(ELF_ARCH) \
         -DELF_FORMAT="$(ELF_FORMAT)"
-extra-y += u-boot.lds
+extra-y += barebox.lds
 
diff --git a/board/sandbox/u-boot.lds.S b/board/sandbox/barebox.lds.S
index 25d42b1e5e..53e9f6021a 100644
--- a/board/sandbox/u-boot.lds.S
+++ b/board/sandbox/barebox.lds.S
@@ -1,4 +1,4 @@
-#include <asm-generic/u-boot.lds.h>
+#include <asm-generic/barebox.lds.h>
 
 OUTPUT_FORMAT(ELF_FORMAT)
 OUTPUT_ARCH(ELF_ARCH)
@@ -71,13 +71,13 @@ SECTIONS
   } =0x90909090
 
   . = ALIGN(64);
-  __u_boot_initcalls_start = .;
-  __u_boot_initcalls : { INITCALLS }
-  __u_boot_initcalls_end = .;
+  __barebox_initcalls_start = .;
+  __barebox_initcalls : { INITCALLS }
+  __barebox_initcalls_end = .;
   . = ALIGN(64);
-  __u_boot_cmd_start = .;
-  __u_boot_cmd : { U_BOOT_CMDS }
-  __u_boot_cmd_end = .;
+  __barebox_cmd_start = .;
+  __barebox_cmd : { BAREBOX_CMDS }
+  __barebox_cmd_end = .;
 
   PROVIDE (__etext = .);
   PROVIDE (_etext = .);
diff --git a/board/sandbox/clock.c b/board/sandbox/clock.c
index 7ad1f53e15..b15086432c 100644
--- a/board/sandbox/clock.c
+++ b/board/sandbox/clock.c
@@ -1,5 +1,5 @@
 /*
- * clock.c - wrapper between a U-Boot clocksource and linux
+ * clock.c - wrapper between a barebox clocksource and linux
  *
  * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
  *
diff --git a/board/sandbox/console.c b/board/sandbox/console.c
index 094521678a..2959e85c7a 100644
--- a/board/sandbox/console.c
+++ b/board/sandbox/console.c
@@ -25,7 +25,7 @@
 #include <mach/linux.h>
 #include <xfuncs.h>
 
-int u_boot_register_console(char *name, int stdinfd, int stdoutfd)
+int barebox_register_console(char *name, int stdinfd, int stdoutfd)
 {
 	struct device_d *dev;
 	struct linux_console_data *data;
diff --git a/board/sandbox/hostfile.c b/board/sandbox/hostfile.c
index f91601febb..ad625d7a6e 100644
--- a/board/sandbox/hostfile.c
+++ b/board/sandbox/hostfile.c
@@ -1,5 +1,5 @@
 /*
- * hostfile.c - use files from the host to simalute U-Boot devices
+ * hostfile.c - use files from the host to simalute barebox devices
  *
  * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
  *
@@ -97,7 +97,7 @@ static int hf_init(void)
 
 device_initcall(hf_init);
 
-int u_boot_register_filedev(struct hf_platform_data *hf)
+int barebox_register_filedev(struct hf_platform_data *hf)
 {
 	struct device_d *dev;