diff --git a/v2/tools/builtin.jam b/v2/tools/builtin.jam
index 3866f18b4..eaf1a077d 100644
--- a/v2/tools/builtin.jam
+++ b/v2/tools/builtin.jam
@@ -551,7 +551,7 @@ class prebuilt-lib-generator : generator
 generators.register 
   [ new prebuilt-lib-generator builtin.prebuilt : : LIB : <file> ] ;
 
-generators.override builtin.lib-generator : builtin.prebuilt ;
+generators.override builtin.prebuilt : builtin.lib-generator ;
 
     
 class compile-action : action 
diff --git a/v2/tools/como-linux.jam b/v2/tools/como-linux.jam
index 09bb26f56..c6e6a23fe 100644
--- a/v2/tools/como-linux.jam
+++ b/v2/tools/como-linux.jam
@@ -20,7 +20,7 @@ feature.extend-subfeature toolset como : platform : linux ;
 
 toolset.inherit-generators como-linux 
      <toolset>como <toolset-como:platform>linux : unix ;
-generators.override builtin.lib-generator : como-linux.prebuilt ;     
+generators.override como-linux.prebuilt : builtin.lib-generator ;     
 generators.override como-linux.searched-lib-generator : searched-lib-generator ;
 toolset.inherit-flags como-linux : unix ;
 toolset.inherit-rules como-linux : gcc ;
diff --git a/v2/tools/darwin.jam b/v2/tools/darwin.jam
index 8348a2506..842138836 100644
--- a/v2/tools/darwin.jam
+++ b/v2/tools/darwin.jam
@@ -16,7 +16,7 @@ import generators ;
 toolset.register darwin ;
 import gcc ;
 toolset.inherit-generators darwin : gcc ;
-generators.override builtin.lib-generator : darwin.prebuilt ;
+generators.override darwin.prebuilt : builtin.lib-generator ;
 generators.override darwin.searched-lib-generator : searched-lib-generator ;
 toolset.inherit-rules darwin : gcc ;
 toolset.inherit-flags darwin : gcc ;
diff --git a/v2/tools/gcc.jam b/v2/tools/gcc.jam
index 7fcfaccd0..d6f863bf4 100644
--- a/v2/tools/gcc.jam
+++ b/v2/tools/gcc.jam
@@ -21,7 +21,7 @@ feature.extend toolset : gcc ;
 
 import unix ;
 toolset.inherit-generators gcc : unix : unix.link unix.link.dll ;
-generators.override builtin.lib-generator : gcc.prebuilt ;
+generators.override gcc.prebuilt : builtin.lib-generator ; 
 toolset.inherit-flags gcc : unix ;
 toolset.inherit-rules gcc : unix ;
 
diff --git a/v2/tools/intel-linux.jam b/v2/tools/intel-linux.jam
index 4249832af..905f899b0 100644
--- a/v2/tools/intel-linux.jam
+++ b/v2/tools/intel-linux.jam
@@ -18,7 +18,7 @@ feature.extend-subfeature toolset intel : platform : linux ;
 
 toolset.inherit-generators intel-linux 
      <toolset>intel <toolset-intel:platform>linux : gcc ;
-generators.override builtin.lib-generator : intel-linux.prebuilt ;     
+generators.override intel-linux.prebuilt : builtin.lib-generator ;
 generators.override intel-linux.prebuilt : builtin.prebuilt ;
 generators.override intel-linux.searched-lib-generator : searched-lib-generator ;
 
diff --git a/v2/tools/sun.jam b/v2/tools/sun.jam
index 61e181df4..0c951a35f 100644
--- a/v2/tools/sun.jam
+++ b/v2/tools/sun.jam
@@ -14,7 +14,7 @@ import common ;
 
 feature.extend toolset : sun ;
 toolset.inherit  sun : unix ;
-generators.override builtin.lib-generator : sun.prebuilt ;
+generators.override sun.prebuilt : builtin.lib-generator ;
 generators.override sun.searched-lib-generator : searched-lib-generator ;
 feature.subfeature toolset sun : version ;
 
diff --git a/v2/tools/unix.jam b/v2/tools/unix.jam
index 29f869488..75949851a 100644
--- a/v2/tools/unix.jam
+++ b/v2/tools/unix.jam
@@ -138,7 +138,7 @@ generators.register
   [ new unix-prebuilt-lib-generator unix.prebuilt : : LIB 
       : <file> <toolset>unix ] ;
 
-generators.override builtin.lib-generator : unix.prebuilt ;
+generators.override unix.prebuilt : builtin.lib-generator ;
 
 
 # Declare generators
diff --git a/v2/tools/vacpp.jam b/v2/tools/vacpp.jam
index 8a7b32bb0..0e3e546eb 100644
--- a/v2/tools/vacpp.jam
+++ b/v2/tools/vacpp.jam
@@ -15,7 +15,7 @@ import generators ;
 
 feature.extend toolset : vacpp ;
 toolset.inherit vacpp : unix ;
-generators.override builtin.lib-generator : vacpp.prebuilt ;
+generators.override vacpp.prebuilt : builtin.lib-generator ;
 generators.override vacpp.searched-lib-generator : searched-lib-generator ;
 feature.subfeature toolset vacpp : version ;