diff --git a/Jamroot b/Jamroot
index 7a3f19f..bc937ff 100644
--- a/Jamroot
+++ b/Jamroot
@@ -9,7 +9,7 @@
 
 # Usage:
 #
-#   bjam [options] [properties] [install|stage]
+#   b2 [options] [properties] [install|stage]
 #
 #   Builds and installs Boost.
 #
diff --git a/tools/build/v2/bootstrap.sh b/tools/build/v2/bootstrap.sh
index 5083551..a510757 100755
--- a/tools/build/v2/bootstrap.sh
+++ b/tools/build/v2/bootstrap.sh
@@ -8,9 +8,9 @@
 
 # boostinspect:notab - Tabs are required for the Makefile.
 
-BJAM=""
+B2=""
 TOOLSET=""
-BJAM_CONFIG=""
+B2_CONFIG=""
 
 for option
 do
@@ -42,7 +42,7 @@ Defaults for the options are specified in brackets.
 
 Configuration:
   -h, --help                display this help and exit
-  --with-bjam=BJAM          use existing Boost.Jam executable (bjam)
+  --with-b2=B2              use existing Boost.Build executable (b2)
                             [automatically built]
   --with-toolset=TOOLSET    use specific Boost.Build toolset
                             [automatically detected]
@@ -92,8 +92,8 @@ esac
 
 rm -f config.log
 
-# Build bjam
-if test "x$BJAM" = x; then
+# Build b2
+if test "x$B2" = x; then
   echo -n "Bootstrapping the build engine with toolset $TOOLSET... "
   pwd=`pwd`
   (cd "$my_dir/engine" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1
@@ -105,9 +105,9 @@ if test "x$BJAM" = x; then
   fi
   cd "$pwd"
   arch=`cd $my_dir/engine && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..`
-  BJAM="$my_dir/engine/$arch/b2"
-  echo "engine/$arch/bjam"
-  cp "$BJAM" .
+  B2="$my_dir/engine/$arch/b2"
+  echo "engine/$arch/b2"
+  cp "$B2" .
   cp "$my_dir/engine/$arch/bjam" .
 fi
 
diff --git a/tools/build/v2/kernel/bootstrap.jam b/tools/build/v2/kernel/bootstrap.jam
index c4dcf94..c4320dc 100644
--- a/tools/build/v2/kernel/bootstrap.jam
+++ b/tools/build/v2/kernel/bootstrap.jam
@@ -63,7 +63,7 @@ module .ENVIRON
     if ! $(TMPNAME)
     {
         ECHO "error: no @() functionality found" ;
-        ECHO "error: your version of bjam is likely out of date" ;
+        ECHO "error: your version of b2 is likely out of date" ;
         ECHO "error: please get a fresh version from SVN." ;
         EXIT ;
     }
@@ -76,7 +76,7 @@ if "\n" = "n"
     {
         ECHO "warning: escape sequences are not supported" ;
         ECHO "warning: this will cause major misbehaviour on cygwin" ;
-        ECHO "warning: your version of bjam is likely out of date" ;
+        ECHO "warning: your version of b2 is likely out of date" ;
         ECHO "warning: please get a fresh version from SVN." ;
     }
 }
diff --git a/tools/build/v2/util/doc.jam b/tools/build/v2/util/doc.jam
index 284ec1d..d38675d 100644
--- a/tools/build/v2/util/doc.jam
+++ b/tools/build/v2/util/doc.jam
@@ -246,7 +246,7 @@ local rule print-help-top ( )
 {
     print.section "General command line usage" ;
 
-    print.text "    bjam [options] [properties] [targets]
+    print.text "    b2 [options] [properties] [targets]
 
   Options, properties and targets can be specified in any order.
       " ;
@@ -281,8 +281,8 @@ local rule print-help-top ( )
 #
 local rule print-help-usage ( )
 {
-    print.section "Boost.Jam Usage"
-        "bjam [ options... ] targets..."
+    print.section "Boost.Build Usage"
+        "b2 [ options... ] targets..."
         ;
     print.list-start ;
     print.list-item -a;
@@ -306,9 +306,9 @@ local rule print-help-usage ( )
     print.list-item -tx;
         Rebuild the target '"x"', even if it is up-to-date. ;
     print.list-item -v;
-        Display the version of bjam. ;
+        Display the version of b2. ;
     print.list-item --x;
-        Any option not explicitly handled by Boost.Jam remains available to
+        Any option not explicitly handled by Boost.Build remains available to
         build scripts using the '"ARGV"' variable. ;
     print.list-item -dn;
         Enables output of diagnostic messages. The debug level '"n"' and all