diff --git a/v2/doc/Jamfile.v2 b/v2/doc/jamfile.jam
similarity index 100%
rename from v2/doc/Jamfile.v2
rename to v2/doc/jamfile.jam
diff --git a/v2/example/customization/Jamfile b/v2/example/customization/jamfile.jam
similarity index 100%
rename from v2/example/customization/Jamfile
rename to v2/example/customization/jamfile.jam
diff --git a/v2/example/customization/project-root.jam b/v2/example/customization/jamroot.jam
similarity index 100%
rename from v2/example/customization/project-root.jam
rename to v2/example/customization/jamroot.jam
diff --git a/v2/example/generate/Jamroot b/v2/example/generate/jamroot.jam
similarity index 100%
rename from v2/example/generate/Jamroot
rename to v2/example/generate/jamroot.jam
diff --git a/v2/example/generator/Jamroot b/v2/example/generator/jamroot.jam
similarity index 100%
rename from v2/example/generator/Jamroot
rename to v2/example/generator/jamroot.jam
diff --git a/v2/example/gettext/Jamfile b/v2/example/gettext/jamfile.jam
similarity index 100%
rename from v2/example/gettext/Jamfile
rename to v2/example/gettext/jamfile.jam
diff --git a/v2/example/gettext/project-root.jam b/v2/example/gettext/jamroot.jam
similarity index 100%
rename from v2/example/gettext/project-root.jam
rename to v2/example/gettext/jamroot.jam
diff --git a/v2/example/hello/Jamroot b/v2/example/hello/jamroot.jam
similarity index 100%
rename from v2/example/hello/Jamroot
rename to v2/example/hello/jamroot.jam
diff --git a/v2/example/libraries/app/Jamfile b/v2/example/libraries/app/jamfile.jam
similarity index 100%
rename from v2/example/libraries/app/Jamfile
rename to v2/example/libraries/app/jamfile.jam
diff --git a/v2/example/libraries/Jamroot b/v2/example/libraries/jamroot.jam
similarity index 100%
rename from v2/example/libraries/Jamroot
rename to v2/example/libraries/jamroot.jam
diff --git a/v2/example/libraries/util/foo/Jamfile b/v2/example/libraries/util/foo/jamfile.jam
similarity index 100%
rename from v2/example/libraries/util/foo/Jamfile
rename to v2/example/libraries/util/foo/jamfile.jam
diff --git a/v2/example/pch/Jamroot b/v2/example/pch/jamroot.jam
similarity index 100%
rename from v2/example/pch/Jamroot
rename to v2/example/pch/jamroot.jam
diff --git a/v2/example/python_modules/Jamroot b/v2/example/python_modules/jamroot.jam
similarity index 100%
rename from v2/example/python_modules/Jamroot
rename to v2/example/python_modules/jamroot.jam
diff --git a/v2/example/qt/qt3/hello/Jamroot b/v2/example/qt/qt3/hello/jamroot.jam
similarity index 100%
rename from v2/example/qt/qt3/hello/Jamroot
rename to v2/example/qt/qt3/hello/jamroot.jam
diff --git a/v2/example/qt/qt3/moccable-cpp/Jamroot b/v2/example/qt/qt3/moccable-cpp/jamroot.jam
similarity index 100%
rename from v2/example/qt/qt3/moccable-cpp/Jamroot
rename to v2/example/qt/qt3/moccable-cpp/jamroot.jam
diff --git a/v2/example/qt/qt3/uic/Jamroot b/v2/example/qt/qt3/uic/jamroot.jam
similarity index 100%
rename from v2/example/qt/qt3/uic/Jamroot
rename to v2/example/qt/qt3/uic/jamroot.jam
diff --git a/v2/example/qt/qt4/hello/Jamroot b/v2/example/qt/qt4/hello/jamroot.jam
similarity index 100%
rename from v2/example/qt/qt4/hello/Jamroot
rename to v2/example/qt/qt4/hello/jamroot.jam
diff --git a/v2/example/qt/qt4/moccable-cpp/Jamroot b/v2/example/qt/qt4/moccable-cpp/jamroot.jam
similarity index 100%
rename from v2/example/qt/qt4/moccable-cpp/Jamroot
rename to v2/example/qt/qt4/moccable-cpp/jamroot.jam
diff --git a/v2/example/qt/qt4/uic/Jamroot b/v2/example/qt/qt4/uic/jamroot.jam
similarity index 100%
rename from v2/example/qt/qt4/uic/Jamroot
rename to v2/example/qt/qt4/uic/jamroot.jam
diff --git a/v2/example/variant/Jamfile b/v2/example/variant/Jamfile
deleted file mode 100644
index 8ae5990d0..000000000
--- a/v2/example/variant/Jamfile
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2004 Vladimir Prus 
-# Distributed under the Boost Software License, Version 1.0. 
-# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
-
-
-# By default, build the project with two variants
-# we've defined in project-root.jam
-project
-    : default-build crazy super_release
-    ;
-
-exe a : a.cpp libs//l ;
-
diff --git a/v2/example/variant/jamfile.jam b/v2/example/variant/jamfile.jam
new file mode 100644
index 000000000..9f8c580be
--- /dev/null
+++ b/v2/example/variant/jamfile.jam
@@ -0,0 +1,11 @@
+# Copyright 2004 Vladimir Prus
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
+
+
+# By default, build the project with the two variants we have defined in
+# jamroot.jam.
+
+project : default-build crazy super_release ;
+
+exe a : a.cpp libs//l ;
diff --git a/v2/example/variant/project-root.jam b/v2/example/variant/jamroot.jam
similarity index 100%
rename from v2/example/variant/project-root.jam
rename to v2/example/variant/jamroot.jam
diff --git a/v2/example/variant/libs/Jamfile b/v2/example/variant/libs/jamfile.jam
similarity index 100%
rename from v2/example/variant/libs/Jamfile
rename to v2/example/variant/libs/jamfile.jam
diff --git a/v2/example/variant/readme.txt b/v2/example/variant/readme.txt
index 119cdafd9..5ab1b938a 100644
--- a/v2/example/variant/readme.txt
+++ b/v2/example/variant/readme.txt
@@ -1,11 +1,11 @@
-Copyright 2004 Vladimir Prus 
-Distributed under the Boost Software License, Version 1.0. 
-(See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+Copyright 2004 Vladimir Prus
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
 
 
-This example shows how user can create his own build variants.
-Two variants are defined: "crazy", which is just random combination
-of properties, and "super-release", which is inherited from "release",
-and differs by a single define.
+This example shows how user can create his own build variants. Two variants are
+defined: "crazy", which is just a random combination of properties, and
+"super-release", which is inherited from "release", and differs by a single
+define.
 
-See the project-root.jam for the definitions.
+See the jamroot.jam for the definitions.
diff --git a/v2/example/versioned/project-root.jam b/v2/example/versioned/jamroot.jam
similarity index 100%
rename from v2/example/versioned/project-root.jam
rename to v2/example/versioned/jamroot.jam
diff --git a/v2/roll.sh b/v2/roll.sh
index 5bbc4af69..c162b8d17 100755
--- a/v2/roll.sh
+++ b/v2/roll.sh
@@ -26,7 +26,7 @@ rm -rf example/versioned
 find . -maxdepth 1 -type f | egrep -v "boost-build.jam|timestamp.txt|roll.sh|bootstrap.jam|build-system.jam|boost_build.png|index.html|hacking.txt|site-config.jam|user-config.jam" | xargs rm -f
 
 # Build the documentation
-touch doc/project-root.jam
+touch doc/jamroot.jam
 export BOOST_BUILD_PATH=`pwd`
 cd doc
 /home/ghost/Work/Boost/boost-svn/tools/jam/src/bin.linuxx86/bjam --v2