diff --git a/README.u2 b/README.u2
index e77092b22..6f978a3db 100644
--- a/README.u2
+++ b/README.u2
@@ -83,17 +83,17 @@ kernel.
 For the examples below, we use the User Mode U-Boot implementation, which
 is a port of U-Boot to the Linux userspace. This makes it possible to
 test drive the code without having real hardware. So for this test
-scenario, ARCH=linux is the valid architecture selection. This currently
+scenario, ARCH=sandbox is the valid architecture selection. This currently
 only works on ia32 hosts and partly on x86-64.
 
 Selection of the architecture and the cross compiler can be done in two
 ways. You can either specify it using the environment variables ARCH
 and CROSS_COMPILE, or you can create the soft links cross_arch and
-cross_compile pointing to your architecture and compiler. For ARCH=linux
+cross_compile pointing to your architecture and compiler. For ARCH=sandbox
 we do not need a cross compiler so it is sufficient to specify the
 architecture:
 
-  # ln -s linux cross_arch
+  # ln -s sandbox cross_arch
 
 In order to configure the various aspects of U-Boot, start the U-Boot
 configuration system:
@@ -103,7 +103,7 @@ configuration system:
 This command starts a menu box and lets you select all the different
 options available for your architecture. Once the configuration was
 finished (you can simulate this by using the standard demo config file
-with 'make linux_defconfig'), there is a .config file in the toplevel
+with 'make sandbox_defconfig'), there is a .config file in the toplevel
 directory of the sourcode.
 
 Once U-Boot is configured, we can start the compilation
diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile
index 5c7db6ddd..7f8b6bac8 100644
--- a/arch/sandbox/Makefile
+++ b/arch/sandbox/Makefile
@@ -4,10 +4,10 @@ CPPFLAGS += -fno-builtin -ffreestanding -nostdinc -Wall \
 	-fno-strict-aliasing
 
 
-machine-y	   := linux
+machine-y	   := sandbox
 
-BOARD:= arch/linux/lib
-board-y := linux
+BOARD:= arch/sandbox/lib
+board-y := sandbox
 
 TEXT_BASE = $(CONFIG_TEXT_BASE)
 
@@ -49,25 +49,25 @@ export ELF_FORMAT ELF_ARCH SUBARCH
 #	them changed.  We use .arch to indicate when they were updated
 #	last, otherwise make uses the target directory mtime.
 
-include/asm-linux/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf
-	@echo '  SYMLINK include/asm-linux/arch -> include/asm-linux/$(INCDIR)'
+include/asm-sandbox/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf
+	@echo '  SYMLINK include/asm-sandbox/arch -> include/asm-sandbox/$(INCDIR)'
 ifneq ($(KBUILD_SRC),)
-	$(Q)mkdir -p include/asm-linux
-	$(Q)ln -fsn $(srctree)/include/asm-linux/$(INCDIR) include/asm-linux/arch
+	$(Q)mkdir -p include/asm-sandbox
+	$(Q)ln -fsn $(srctree)/include/asm-sandbox/$(INCDIR) include/asm-sandbox/arch
 else
-	$(Q)ln -fsn $(INCDIR) include/asm-linux/arch
+	$(Q)ln -fsn $(INCDIR) include/asm-sandbox/arch
 endif
 	@touch $@
 
 archprepare: maketools
 
 PHONY += maketools
-maketools: include/asm-linux/.arch
+maketools: include/asm-sandbox/.arch
 
 cmd_uboot__ = $(CC) -o $@ -Wl,-T,$(uboot-lds) \
 	-Wl,--start-group $(uboot-common) -Wl,--end-group \
 	-lrt -Wl,-rpath,/lib -lrt -lpthread
 
-common-y += arch/linux/lib/ arch/linux/board/
+common-y += arch/sandbox/lib/ arch/sandbox/board/
 
-MRPROPER_FILES += include/asm-linux/arch
+MRPROPER_FILES += include/asm-sandbox/arch
diff --git a/arch/sandbox/configs/linux_defconfig b/arch/sandbox/configs/linux_defconfig
deleted file mode 100644
index 9a6f20a93..000000000
--- a/arch/sandbox/configs/linux_defconfig
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-trunk
-# Fri Jun 29 10:30:11 2007
-#
-CONFIG_LINUX=y
-CONFIG_ZLIB=y
-CONFIG_GREGORIAN_CALENDER=y
-
-#
-# General Settings
-#
-CONFIG_PROMPT="uboot> "
-CONFIG_BAUDRATE=115200
-CONFIG_CMDLINE_EDITING=y
-# CONFIG_AUTO_COMPLETE is not set
-# CONFIG_LONGHELP is not set
-CONFIG_CBSIZE=1024
-CONFIG_MAXARGS=16
-CONFIG_HUSH_PARSER=y
-CONFIG_PROMPT_HUSH_PS2="> "
-CONFIG_ZERO_BOOTDELAY_CHECK=y
-CONFIG_DYNAMIC_CRC_TABLE=y
-CONFIG_ERRNO_MESSAGES=y
-CONFIG_TIMESTAMP=y
-CONFIG_CONSOLE_ACTIVATE_FIRST=y
-# CONFIG_OF_FLAT_TREE is not set
-
-#
-# Commands
-#
-CONFIG_CMD_HELP=y
-
-#
-# scripting
-#
-# CONFIG_CMD_AUTOSCRIPT is not set
-CONFIG_CMD_EDIT=y
-CONFIG_CMD_EXEC=y
-CONFIG_CMD_SLEEP=y
-CONFIG_CMD_ENVIRONMENT=y
-CONFIG_CMD_ENV=y
-
-#
-# console
-#
-# CONFIG_CMD_CLEAR is not set
-# CONFIG_CMD_CONSOLE is not set
-CONFIG_CMD_ECHO=y
-# CONFIG_CMD_SPLASH is not set
-
-#
-# i2c
-#
-# CONFIG_CMD_I2C is not set
-
-#
-# memory
-#
-# CONFIG_CMD_LOADB is not set
-# CONFIG_CMD_LOADS is not set
-# CONFIG_CMD_MEMINFO is not set
-CONFIG_CMD_MEMORY=y
-# CONFIG_CMD_MTEST is not set
-
-#
-# network
-#
-# CONFIG_CMD_MII is not set
-
-#
-# flash
-#
-CONFIG_CMD_FLASH=y
-
-#
-# booting
-#
-# CONFIG_CMD_BOOTM is not set
-
-#
-# Debugging
-#
-CONFIG_NET=y
-CONFIG_NET_BOOTP=y
-CONFIG_NET_DHCP=y
-# CONFIG_NET_RARP is not set
-# CONFIG_NET_SNTP is not set
-# CONFIG_NET_NFS is not set
-CONFIG_NET_PING=y
-CONFIG_NET_TFTP=y
-
-#
-# Drivers
-#
-
-#
-# serial drivers
-#
-CONFIG_DRIVER_SERIAL_LINUX_COMSOLE=y
-
-#
-# Network drivers
-#
-CONFIG_DRIVER_NET_TAP=y
-
-#
-# video drivers
-#
-# CONFIG_DRIVER_VIDEO_S1D13706 is not set
-
-#
-# I2C drivers
-#
-
-#
-# USB host support
-#
-
-#
-# flash drivers
-#
-# CONFIG_DRIVER_CFI is not set
-# CONFIG_DRIVER_CFI_NEW is not set
-
-#
-# Filesystem support
-#
-CONFIG_FS_CRAMFS=y
diff --git a/include/asm-linux/arch-linux/hostfile.h b/include/asm-sandbox/arch-sandbox/hostfile.h
similarity index 100%
rename from include/asm-linux/arch-linux/hostfile.h
rename to include/asm-sandbox/arch-sandbox/hostfile.h
diff --git a/include/asm-linux/arch-linux/linux.h b/include/asm-sandbox/arch-sandbox/linux.h
similarity index 100%
rename from include/asm-linux/arch-linux/linux.h
rename to include/asm-sandbox/arch-sandbox/linux.h
diff --git a/include/asm-linux/byteorder.h b/include/asm-sandbox/byteorder.h
similarity index 100%
rename from include/asm-linux/byteorder.h
rename to include/asm-sandbox/byteorder.h
diff --git a/include/asm-linux/common.h b/include/asm-sandbox/common.h
similarity index 100%
rename from include/asm-linux/common.h
rename to include/asm-sandbox/common.h
diff --git a/include/asm-linux/global_data.h b/include/asm-sandbox/global_data.h
similarity index 100%
rename from include/asm-linux/global_data.h
rename to include/asm-sandbox/global_data.h
diff --git a/include/asm-linux/posix_types.h b/include/asm-sandbox/posix_types.h
similarity index 100%
rename from include/asm-linux/posix_types.h
rename to include/asm-sandbox/posix_types.h
diff --git a/include/asm-linux/processor.h b/include/asm-sandbox/processor.h
similarity index 100%
rename from include/asm-linux/processor.h
rename to include/asm-sandbox/processor.h
diff --git a/include/asm-linux/ptrace.h b/include/asm-sandbox/ptrace.h
similarity index 100%
rename from include/asm-linux/ptrace.h
rename to include/asm-sandbox/ptrace.h
diff --git a/include/asm-linux/string.h b/include/asm-sandbox/string.h
similarity index 100%
rename from include/asm-linux/string.h
rename to include/asm-sandbox/string.h
diff --git a/include/asm-linux/types.h b/include/asm-sandbox/types.h
similarity index 100%
rename from include/asm-linux/types.h
rename to include/asm-sandbox/types.h
diff --git a/include/asm-linux/u-boot.h b/include/asm-sandbox/u-boot.h
similarity index 100%
rename from include/asm-linux/u-boot.h
rename to include/asm-sandbox/u-boot.h
diff --git a/include/configs/linux.h b/include/configs/sandbox.h
similarity index 100%
rename from include/configs/linux.h
rename to include/configs/sandbox.h