3 files changed, 10 insertions, 10 deletions
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