diff --git a/scripts/Makefile b/scripts/Makefile
index c0040d3..b567910 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -2,7 +2,7 @@
 # scripts contains sources for various helper programs used throughout
 # the kernel for the build process.
 # ---------------------------------------------------------------------------
-# kallsyms:      Find all symbols in vmlinux
+# kallsyms:      Find all symbols in uboot
 # pnmttologo:    Convert pnm files to logo files
 # conmakehash:   Create chartable
 # conmakehash:	 Create arrays for initializing the kernel console tables
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 69362d1..6d26dde 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -90,7 +90,7 @@
 _a_flags       = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(basetarget).o)
 _cpp_flags     = $(CPPFLAGS) $(EXTRA_CPPFLAGS) $(CPPFLAGS_$(@F))
 
-# If building the kernel in a separate objtree expand all occurrences
+# If building uboot in a separate objtree expand all occurrences
 # of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/').
 
 ifeq ($(KBUILD_SRC),)
diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile
index 2f60070..a0c0189 100644
--- a/scripts/basic/Makefile
+++ b/scripts/basic/Makefile
@@ -3,7 +3,7 @@
 # The programs listed herein is what is needed to do the basic stuff,
 # such as fix dependency file.
 # This initial step is needed to avoid files to be recompiled
-# when kernel configuration changes (which is what happens when
+# when uboot configuration changes (which is what happens when
 # .config is included by main Makefile.
 # ---------------------------------------------------------------------------
 # fixdep: 	 Used to generate dependency information during build process
diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c
index d6071cb..f71e106 100644
--- a/scripts/basic/docproc.c
+++ b/scripts/basic/docproc.c
@@ -1,6 +1,6 @@
 /*
  *	docproc is a simple preprocessor for the template files
- *      used as placeholders for the kernel internal documentation.
+ *      used as placeholders for the uboot internal documentation.
  *	docproc is used for documentation-frontend and
  *      dependency-generator.
  *	The two usages have in common that they require
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 4dcb886..2e2aad8 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -557,7 +557,7 @@
 	case ask_silent:
 		if (stat(".config", &tmpstat)) {
 			printf(_("***\n"
-				"*** You have not yet configured your kernel!\n"
+				"*** You have not yet configured uboot!\n"
 				"***\n"
 				"*** Please run some configurator (e.g. \"make oldconfig\" or\n"
 				"*** \"make menuconfig\" or \"make xconfig\").\n"
@@ -603,7 +603,7 @@
 	} else if (sym_change_count) {
 		name = getenv("KCONFIG_NOSILENTUPDATE");
 		if (name && *name) {
-			fprintf(stderr, _("\n*** Kernel configuration requires explicit update.\n\n"));
+			fprintf(stderr, _("\n*** uboot configuration requires explicit update.\n\n"));
 			return 1;
 		}
 	} else
@@ -614,12 +614,12 @@
 		check_conf(&rootmenu);
 	} while (conf_cnt);
 	if (conf_write(NULL)) {
-		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
+		fprintf(stderr, _("\n*** Error during writing of the uboot configuration.\n\n"));
 		return 1;
 	}
 skip_check:
 	if (input_mode == ask_silent && conf_write_autoconf()) {
-		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
+		fprintf(stderr, _("\n*** Error during writing of the uboot configuration.\n\n"));
 		return 1;
 	}
 
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 7b0d3a9..f80ec31 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -733,7 +733,7 @@
 {
 	GtkWidget *dialog;
 	const gchar *intro_text = _(
-	    "Welcome to gkc, the GTK+ graphical kernel configuration tool\n"
+	    "Welcome to gkc, the GTK+ graphical uboot configuration tool\n"
 	    "for Linux.\n"
 	    "For each option, a blank box indicates the feature is disabled, a\n"
 	    "check indicates it is enabled, and a dot indicates that it is to\n"
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped
index 92f87cc..20ee9be 100644
--- a/scripts/kconfig/lex.zconf.c_shipped
+++ b/scripts/kconfig/lex.zconf.c_shipped
@@ -2255,7 +2255,7 @@
  * ./name
  * $(srctree)/name
  * The latter is used when srctree is separate from objtree
- * when compiling the kernel.
+ * when compiling uboot.
  * Return NULL if file is not found.
  */
 FILE *zconf_fopen(const char *name)
diff --git a/scripts/mksysmap b/scripts/mksysmap
index 4390fab..67f0947 100644
--- a/scripts/mksysmap
+++ b/scripts/mksysmap
@@ -1,10 +1,10 @@
 #!/bin/sh -x
-# Based on the vmlinux file create the System.map file
+# Based on the uboot file create the System.map file
 # System.map is used by module-init tools and some debugging
 # tools to retrieve the actual addresses of symbols in the kernel.
 #
 # Usage
-# mksysmap vmlinux System.map
+# mksysmap uboot System.map
 
 
 #####