diff --git a/src/tools/qt5.jam b/src/tools/qt5.jam
index 2ae3a0f27..32852a0c4 100644
--- a/src/tools/qt5.jam
+++ b/src/tools/qt5.jam
@@ -219,10 +219,10 @@ rule init ( prefix : version ? : condition * : namespace ? : infix ? : full_bin
 
         # The OBJ result type is a fake here too.
         generators.register [ new moc-h-5-generator
-            qt5.moc.inc : MOCCABLE_CPP : OBJ : <allow>qt5 ] ;
+            qt5.moc.inc : MOCCABLE5_CPP : OBJ : <allow>qt5 ] ;
 
         generators.register [ new moc-inc-5-generator
-            qt5.moc.inc : MOCCABLE_H : OBJ : <allow>qt5 ] ;
+            qt5.moc.inc : MOCCABLE5_H : OBJ : <allow>qt5 ] ;
 
         # Generates .cpp files from .qrc files.
         generators.register-standard qt5.rcc : QRC : CPP(qrc_%) : <allow>qt5 ;
@@ -518,7 +518,7 @@ class moc-h-5-generator : generator
 
     rule run ( project name ? : property-set : sources * )
     {
-        if ! $(sources[2]) && [ $(sources[1]).type ] = MOCCABLE_CPP
+        if ! $(sources[2]) && [ $(sources[1]).type ] = MOCCABLE5_CPP
         {
             name = [ $(sources[0]).name ] ;
             name = $(name:B) ;
@@ -553,7 +553,7 @@ class moc-inc-5-generator : generator
 
     rule run ( project name ? : property-set : sources * )
     {
-        if ! $(sources[2]) && [ $(sources[1]).type ] = MOCCABLE_H
+        if ! $(sources[2]) && [ $(sources[1]).type ] = MOCCABLE5_H
         {
             name = [ $(sources[0]).name ] ;
             name = $(name:B) ;
diff --git a/src/tools/types/qt.jam b/src/tools/types/qt.jam
index 6d1dfbd42..4951063e3 100644
--- a/src/tools/types/qt.jam
+++ b/src/tools/types/qt.jam
@@ -6,5 +6,7 @@ type UI : ui ;
 type QRC : qrc ;
 type MOCCABLE_CPP ;
 type MOCCABLE_H ;
+type MOCCABLE5_CPP ;
+type MOCCABLE5_H ;
 # Result of running moc.
 type MOC : moc : H ;