diff --git a/scripts/mkqtdecl_common/produce.rb b/scripts/mkqtdecl_common/produce.rb
index 3223f5e69..161f9c6f5 100755
--- a/scripts/mkqtdecl_common/produce.rb
+++ b/scripts/mkqtdecl_common/produce.rb
@@ -1660,8 +1660,8 @@ END
     end
 
     ofile.puts("static gsi::ClassExt<#{pname}> inject_#{clsn}_#{en}_Enum_in_parent (decl_#{clsn}_#{en}_Enum.defs ());")
-    ofile.puts("static gsi::ClassExt<#{pname}> decl_#{clsn}_#{en}_Enum_as_child (decl_#{clsn}_#{en}_Enum, \"#{modn}\", \"#{en}\");")
-    ofile.puts("static gsi::ClassExt<#{pname}> decl_#{clsn}_#{en}_Enums_as_child (decl_#{clsn}_#{en}_Enums, \"#{modn}\", \"QFlags_#{en}\");")
+    ofile.puts("static gsi::ClassExt<#{pname}> decl_#{clsn}_#{en}_Enum_as_child (decl_#{clsn}_#{en}_Enum, \"#{en}\");")
+    ofile.puts("static gsi::ClassExt<#{pname}> decl_#{clsn}_#{en}_Enums_as_child (decl_#{clsn}_#{en}_Enums, \"QFlags_#{en}\");")
 
     ofile.puts("")
     ofile.puts("}")
@@ -2299,7 +2299,7 @@ END
           pcls = o.myself + "::" + pcls
         end
 
-        ofile.puts("gsi::ClassExt<#{pcls}> decl_#{clsn}_as_child (decl_#{clsn}, \"#{modn}\", \"#{cclsn}\");")
+        ofile.puts("gsi::ClassExt<#{pcls}> decl_#{clsn}_as_child (decl_#{clsn}, \"#{cclsn}\");")
 
       end
 
@@ -2812,7 +2812,7 @@ END
           pcls = o.myself + "::" + pcls
         end
 
-        ofile.puts("gsi::ClassExt<#{pcls}> decl_#{clsn}_as_child (decl_#{clsn}_Adaptor, \"#{modn}\", \"#{cclsn}\");")
+        ofile.puts("gsi::ClassExt<#{pcls}> decl_#{clsn}_as_child (decl_#{clsn}_Adaptor, \"#{cclsn}\");")
 
       end
 
@@ -3023,7 +3023,7 @@ END
       extfile.puts("#define HDR_gsi#{modn}Externals")
       extfile.puts("")
 
-      extfile.puts("#include \"gsiClassBase.h\"")
+      extfile.puts("#include \"gsiClass.h\"")
       extfile.puts("#include \"gsi#{modn}Common.h\"")
       extfile.puts("")
 
diff --git a/src/db/db/built-in-macros/pcell_declaration_helper.lym b/src/db/db/built-in-macros/pcell_declaration_helper.lym
index b0674e5b2..8689a942c 100644
--- a/src/db/db/built-in-macros/pcell_declaration_helper.lym
+++ b/src/db/db/built-in-macros/pcell_declaration_helper.lym
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <klayout-macro>
  <description/>
- <doc>@class PCellDeclarationHelper &lt; PCellDeclaration
+ <doc>@class [db] PCellDeclarationHelper &lt; PCellDeclaration
 @brief A helper class to simplify the declaration of a PCell (Ruby version)
 
 This class provides adds some convenience to the PCell declaration based
diff --git a/src/db/db/built-in-pymacros/pcell_declaration_helper.lym b/src/db/db/built-in-pymacros/pcell_declaration_helper.lym
index f867865dc..3632806fd 100644
--- a/src/db/db/built-in-pymacros/pcell_declaration_helper.lym
+++ b/src/db/db/built-in-pymacros/pcell_declaration_helper.lym
@@ -5,7 +5,7 @@
  <category>pymacros</category>
  <prolog/>
  <epilog/>
- <doc>@class PCellDeclarationHelper &lt; PCellDeclaration
+ <doc>@class [db] PCellDeclarationHelper &lt; PCellDeclaration
 @brief A helper class to simplify the declaration of a PCell (Python version)
 
 This class provides adds some convenience to the PCell declaration based
diff --git a/src/gsi/gsi/gsiClass.h b/src/gsi/gsi/gsiClass.h
index d3c29b79d..4c314f425 100644
--- a/src/gsi/gsi/gsiClass.h
+++ b/src/gsi/gsi/gsiClass.h
@@ -24,6 +24,7 @@
 #ifndef _HDR_gsiClass
 #define _HDR_gsiClass
 
+#include "gsiClassBase.h"
 #include "gsiObject.h"
 
 #include "tlTypeTraits.h"
@@ -578,10 +579,9 @@ public:
    *  This feature is not quite useful usually and is reserved for special use cases
    *  such as including enums into a declaration namespace.
    */
-  ClassExt (const ClassBase &import, const std::string &module, const std::string &name, const std::string &doc = std::string ())
+  ClassExt (const ClassBase &import, const std::string &name, const std::string &doc = std::string ())
     : ClassBase (doc, Methods ()), mp_declaration (&import)
   {
-    set_module (module);
     set_name (name);
   }
 
diff --git a/src/gsi/gsi/gsiClassBase.h b/src/gsi/gsi/gsiClassBase.h
index 7cd80dbf9..a1bdb3c90 100644
--- a/src/gsi/gsi/gsiClassBase.h
+++ b/src/gsi/gsi/gsiClassBase.h
@@ -33,7 +33,8 @@
 
 #include "gsiExpression.h"
 #include "gsiObject.h"
-#include "gsiSerialisation.h"
+#include "gsiIterators.h"
+#include "gsiCallback.h"
 #include "gsiMethods.h"
 
 #include <list>
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQCoreApplication.cc b/src/gsiqt/qt4/QtCore/gsiDeclQCoreApplication.cc
index b2ade12fd..b54c2bfc6 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQCoreApplication.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQCoreApplication.cc
@@ -1456,8 +1456,8 @@ static gsi::QFlagsClass<QCoreApplication::Encoding > decl_QCoreApplication_Encod
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QCoreApplication> inject_QCoreApplication_Encoding_Enum_in_parent (decl_QCoreApplication_Encoding_Enum.defs ());
-static gsi::ClassExt<QCoreApplication> decl_QCoreApplication_Encoding_Enum_as_child (decl_QCoreApplication_Encoding_Enum, "QtCore", "Encoding");
-static gsi::ClassExt<QCoreApplication> decl_QCoreApplication_Encoding_Enums_as_child (decl_QCoreApplication_Encoding_Enums, "QtCore", "QFlags_Encoding");
+static gsi::ClassExt<QCoreApplication> decl_QCoreApplication_Encoding_Enum_as_child (decl_QCoreApplication_Encoding_Enum, "Encoding");
+static gsi::ClassExt<QCoreApplication> decl_QCoreApplication_Encoding_Enums_as_child (decl_QCoreApplication_Encoding_Enums, "QFlags_Encoding");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQCryptographicHash.cc b/src/gsiqt/qt4/QtCore/gsiDeclQCryptographicHash.cc
index 450aeb73a..a6e42854b 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQCryptographicHash.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQCryptographicHash.cc
@@ -191,8 +191,8 @@ static gsi::QFlagsClass<QCryptographicHash::Algorithm > decl_QCryptographicHash_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QCryptographicHash> inject_QCryptographicHash_Algorithm_Enum_in_parent (decl_QCryptographicHash_Algorithm_Enum.defs ());
-static gsi::ClassExt<QCryptographicHash> decl_QCryptographicHash_Algorithm_Enum_as_child (decl_QCryptographicHash_Algorithm_Enum, "QtCore", "Algorithm");
-static gsi::ClassExt<QCryptographicHash> decl_QCryptographicHash_Algorithm_Enums_as_child (decl_QCryptographicHash_Algorithm_Enums, "QtCore", "QFlags_Algorithm");
+static gsi::ClassExt<QCryptographicHash> decl_QCryptographicHash_Algorithm_Enum_as_child (decl_QCryptographicHash_Algorithm_Enum, "Algorithm");
+static gsi::ClassExt<QCryptographicHash> decl_QCryptographicHash_Algorithm_Enums_as_child (decl_QCryptographicHash_Algorithm_Enums, "QFlags_Algorithm");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQDataStream.cc b/src/gsiqt/qt4/QtCore/gsiDeclQDataStream.cc
index 87cead6d6..13edd65e1 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQDataStream.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQDataStream.cc
@@ -737,8 +737,8 @@ static gsi::QFlagsClass<QDataStream::ByteOrder > decl_QDataStream_ByteOrder_Enum
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QDataStream> inject_QDataStream_ByteOrder_Enum_in_parent (decl_QDataStream_ByteOrder_Enum.defs ());
-static gsi::ClassExt<QDataStream> decl_QDataStream_ByteOrder_Enum_as_child (decl_QDataStream_ByteOrder_Enum, "QtCore", "ByteOrder");
-static gsi::ClassExt<QDataStream> decl_QDataStream_ByteOrder_Enums_as_child (decl_QDataStream_ByteOrder_Enums, "QtCore", "QFlags_ByteOrder");
+static gsi::ClassExt<QDataStream> decl_QDataStream_ByteOrder_Enum_as_child (decl_QDataStream_ByteOrder_Enum, "ByteOrder");
+static gsi::ClassExt<QDataStream> decl_QDataStream_ByteOrder_Enums_as_child (decl_QDataStream_ByteOrder_Enums, "QFlags_ByteOrder");
 
 }
 
@@ -757,8 +757,8 @@ static gsi::QFlagsClass<QDataStream::FloatingPointPrecision > decl_QDataStream_F
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QDataStream> inject_QDataStream_FloatingPointPrecision_Enum_in_parent (decl_QDataStream_FloatingPointPrecision_Enum.defs ());
-static gsi::ClassExt<QDataStream> decl_QDataStream_FloatingPointPrecision_Enum_as_child (decl_QDataStream_FloatingPointPrecision_Enum, "QtCore", "FloatingPointPrecision");
-static gsi::ClassExt<QDataStream> decl_QDataStream_FloatingPointPrecision_Enums_as_child (decl_QDataStream_FloatingPointPrecision_Enums, "QtCore", "QFlags_FloatingPointPrecision");
+static gsi::ClassExt<QDataStream> decl_QDataStream_FloatingPointPrecision_Enum_as_child (decl_QDataStream_FloatingPointPrecision_Enum, "FloatingPointPrecision");
+static gsi::ClassExt<QDataStream> decl_QDataStream_FloatingPointPrecision_Enums_as_child (decl_QDataStream_FloatingPointPrecision_Enums, "QFlags_FloatingPointPrecision");
 
 }
 
@@ -778,8 +778,8 @@ static gsi::QFlagsClass<QDataStream::Status > decl_QDataStream_Status_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QDataStream> inject_QDataStream_Status_Enum_in_parent (decl_QDataStream_Status_Enum.defs ());
-static gsi::ClassExt<QDataStream> decl_QDataStream_Status_Enum_as_child (decl_QDataStream_Status_Enum, "QtCore", "Status");
-static gsi::ClassExt<QDataStream> decl_QDataStream_Status_Enums_as_child (decl_QDataStream_Status_Enums, "QtCore", "QFlags_Status");
+static gsi::ClassExt<QDataStream> decl_QDataStream_Status_Enum_as_child (decl_QDataStream_Status_Enum, "Status");
+static gsi::ClassExt<QDataStream> decl_QDataStream_Status_Enums_as_child (decl_QDataStream_Status_Enums, "QFlags_Status");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQDate.cc b/src/gsiqt/qt4/QtCore/gsiDeclQDate.cc
index 92ef33723..c5cb12ab3 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQDate.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQDate.cc
@@ -966,8 +966,8 @@ static gsi::QFlagsClass<QDate::MonthNameType > decl_QDate_MonthNameType_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QDate> inject_QDate_MonthNameType_Enum_in_parent (decl_QDate_MonthNameType_Enum.defs ());
-static gsi::ClassExt<QDate> decl_QDate_MonthNameType_Enum_as_child (decl_QDate_MonthNameType_Enum, "QtCore", "MonthNameType");
-static gsi::ClassExt<QDate> decl_QDate_MonthNameType_Enums_as_child (decl_QDate_MonthNameType_Enums, "QtCore", "QFlags_MonthNameType");
+static gsi::ClassExt<QDate> decl_QDate_MonthNameType_Enum_as_child (decl_QDate_MonthNameType_Enum, "MonthNameType");
+static gsi::ClassExt<QDate> decl_QDate_MonthNameType_Enums_as_child (decl_QDate_MonthNameType_Enums, "QFlags_MonthNameType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQDir.cc b/src/gsiqt/qt4/QtCore/gsiDeclQDir.cc
index 5b29015a5..92fb35315 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQDir.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQDir.cc
@@ -1372,8 +1372,8 @@ static gsi::QFlagsClass<QDir::Filter > decl_QDir_Filter_Enums ("QtCore", "QDir_Q
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QDir> inject_QDir_Filter_Enum_in_parent (decl_QDir_Filter_Enum.defs ());
-static gsi::ClassExt<QDir> decl_QDir_Filter_Enum_as_child (decl_QDir_Filter_Enum, "QtCore", "Filter");
-static gsi::ClassExt<QDir> decl_QDir_Filter_Enums_as_child (decl_QDir_Filter_Enums, "QtCore", "QFlags_Filter");
+static gsi::ClassExt<QDir> decl_QDir_Filter_Enum_as_child (decl_QDir_Filter_Enum, "Filter");
+static gsi::ClassExt<QDir> decl_QDir_Filter_Enums_as_child (decl_QDir_Filter_Enums, "QFlags_Filter");
 
 }
 
@@ -1402,8 +1402,8 @@ static gsi::QFlagsClass<QDir::SortFlag > decl_QDir_SortFlag_Enums ("QtCore", "QD
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QDir> inject_QDir_SortFlag_Enum_in_parent (decl_QDir_SortFlag_Enum.defs ());
-static gsi::ClassExt<QDir> decl_QDir_SortFlag_Enum_as_child (decl_QDir_SortFlag_Enum, "QtCore", "SortFlag");
-static gsi::ClassExt<QDir> decl_QDir_SortFlag_Enums_as_child (decl_QDir_SortFlag_Enums, "QtCore", "QFlags_SortFlag");
+static gsi::ClassExt<QDir> decl_QDir_SortFlag_Enum_as_child (decl_QDir_SortFlag_Enum, "SortFlag");
+static gsi::ClassExt<QDir> decl_QDir_SortFlag_Enums_as_child (decl_QDir_SortFlag_Enums, "QFlags_SortFlag");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQEasingCurve.cc b/src/gsiqt/qt4/QtCore/gsiDeclQEasingCurve.cc
index 3921e51b8..f3f44522c 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQEasingCurve.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQEasingCurve.cc
@@ -382,8 +382,8 @@ static gsi::QFlagsClass<QEasingCurve::Type > decl_QEasingCurve_Type_Enums ("QtCo
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QEasingCurve> inject_QEasingCurve_Type_Enum_in_parent (decl_QEasingCurve_Type_Enum.defs ());
-static gsi::ClassExt<QEasingCurve> decl_QEasingCurve_Type_Enum_as_child (decl_QEasingCurve_Type_Enum, "QtCore", "Type");
-static gsi::ClassExt<QEasingCurve> decl_QEasingCurve_Type_Enums_as_child (decl_QEasingCurve_Type_Enums, "QtCore", "QFlags_Type");
+static gsi::ClassExt<QEasingCurve> decl_QEasingCurve_Type_Enum_as_child (decl_QEasingCurve_Type_Enum, "Type");
+static gsi::ClassExt<QEasingCurve> decl_QEasingCurve_Type_Enums_as_child (decl_QEasingCurve_Type_Enums, "QFlags_Type");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQEvent.cc b/src/gsiqt/qt4/QtCore/gsiDeclQEvent.cc
index 08a421f86..a3d3c285a 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQEvent.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQEvent.cc
@@ -400,8 +400,8 @@ static gsi::QFlagsClass<QEvent::Type > decl_QEvent_Type_Enums ("QtCore", "QEvent
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QEvent> inject_QEvent_Type_Enum_in_parent (decl_QEvent_Type_Enum.defs ());
-static gsi::ClassExt<QEvent> decl_QEvent_Type_Enum_as_child (decl_QEvent_Type_Enum, "QtCore", "Type");
-static gsi::ClassExt<QEvent> decl_QEvent_Type_Enums_as_child (decl_QEvent_Type_Enums, "QtCore", "QFlags_Type");
+static gsi::ClassExt<QEvent> decl_QEvent_Type_Enum_as_child (decl_QEvent_Type_Enum, "Type");
+static gsi::ClassExt<QEvent> decl_QEvent_Type_Enums_as_child (decl_QEvent_Type_Enums, "QFlags_Type");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQEventLoop.cc b/src/gsiqt/qt4/QtCore/gsiDeclQEventLoop.cc
index 8d1f036e6..db4148e95 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQEventLoop.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQEventLoop.cc
@@ -708,8 +708,8 @@ static gsi::QFlagsClass<QEventLoop::ProcessEventsFlag > decl_QEventLoop_ProcessE
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QEventLoop> inject_QEventLoop_ProcessEventsFlag_Enum_in_parent (decl_QEventLoop_ProcessEventsFlag_Enum.defs ());
-static gsi::ClassExt<QEventLoop> decl_QEventLoop_ProcessEventsFlag_Enum_as_child (decl_QEventLoop_ProcessEventsFlag_Enum, "QtCore", "ProcessEventsFlag");
-static gsi::ClassExt<QEventLoop> decl_QEventLoop_ProcessEventsFlag_Enums_as_child (decl_QEventLoop_ProcessEventsFlag_Enums, "QtCore", "QFlags_ProcessEventsFlag");
+static gsi::ClassExt<QEventLoop> decl_QEventLoop_ProcessEventsFlag_Enum_as_child (decl_QEventLoop_ProcessEventsFlag_Enum, "ProcessEventsFlag");
+static gsi::ClassExt<QEventLoop> decl_QEventLoop_ProcessEventsFlag_Enums_as_child (decl_QEventLoop_ProcessEventsFlag_Enums, "QFlags_ProcessEventsFlag");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQFile.cc b/src/gsiqt/qt4/QtCore/gsiDeclQFile.cc
index 9da87101e..0ebcf61de 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQFile.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQFile.cc
@@ -941,8 +941,8 @@ static gsi::QFlagsClass<QFile::FileError > decl_QFile_FileError_Enums ("QtCore",
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFile> inject_QFile_FileError_Enum_in_parent (decl_QFile_FileError_Enum.defs ());
-static gsi::ClassExt<QFile> decl_QFile_FileError_Enum_as_child (decl_QFile_FileError_Enum, "QtCore", "FileError");
-static gsi::ClassExt<QFile> decl_QFile_FileError_Enums_as_child (decl_QFile_FileError_Enums, "QtCore", "QFlags_FileError");
+static gsi::ClassExt<QFile> decl_QFile_FileError_Enum_as_child (decl_QFile_FileError_Enum, "FileError");
+static gsi::ClassExt<QFile> decl_QFile_FileError_Enums_as_child (decl_QFile_FileError_Enums, "QFlags_FileError");
 
 }
 
@@ -971,8 +971,8 @@ static gsi::QFlagsClass<QFile::Permission > decl_QFile_Permission_Enums ("QtCore
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFile> inject_QFile_Permission_Enum_in_parent (decl_QFile_Permission_Enum.defs ());
-static gsi::ClassExt<QFile> decl_QFile_Permission_Enum_as_child (decl_QFile_Permission_Enum, "QtCore", "Permission");
-static gsi::ClassExt<QFile> decl_QFile_Permission_Enums_as_child (decl_QFile_Permission_Enums, "QtCore", "QFlags_Permission");
+static gsi::ClassExt<QFile> decl_QFile_Permission_Enum_as_child (decl_QFile_Permission_Enum, "Permission");
+static gsi::ClassExt<QFile> decl_QFile_Permission_Enums_as_child (decl_QFile_Permission_Enums, "QFlags_Permission");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQIODevice.cc b/src/gsiqt/qt4/QtCore/gsiDeclQIODevice.cc
index 9c48ea408..027febba8 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQIODevice.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQIODevice.cc
@@ -699,8 +699,8 @@ static gsi::QFlagsClass<QIODevice::OpenModeFlag > decl_QIODevice_OpenModeFlag_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QIODevice> inject_QIODevice_OpenModeFlag_Enum_in_parent (decl_QIODevice_OpenModeFlag_Enum.defs ());
-static gsi::ClassExt<QIODevice> decl_QIODevice_OpenModeFlag_Enum_as_child (decl_QIODevice_OpenModeFlag_Enum, "QtCore", "OpenModeFlag");
-static gsi::ClassExt<QIODevice> decl_QIODevice_OpenModeFlag_Enums_as_child (decl_QIODevice_OpenModeFlag_Enums, "QtCore", "QFlags_OpenModeFlag");
+static gsi::ClassExt<QIODevice> decl_QIODevice_OpenModeFlag_Enum_as_child (decl_QIODevice_OpenModeFlag_Enum, "OpenModeFlag");
+static gsi::ClassExt<QIODevice> decl_QIODevice_OpenModeFlag_Enums_as_child (decl_QIODevice_OpenModeFlag_Enums, "QFlags_OpenModeFlag");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQLibrary.cc b/src/gsiqt/qt4/QtCore/gsiDeclQLibrary.cc
index e65feee9b..897b56cb9 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQLibrary.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQLibrary.cc
@@ -977,8 +977,8 @@ static gsi::QFlagsClass<QLibrary::LoadHint > decl_QLibrary_LoadHint_Enums ("QtCo
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QLibrary> inject_QLibrary_LoadHint_Enum_in_parent (decl_QLibrary_LoadHint_Enum.defs ());
-static gsi::ClassExt<QLibrary> decl_QLibrary_LoadHint_Enum_as_child (decl_QLibrary_LoadHint_Enum, "QtCore", "LoadHint");
-static gsi::ClassExt<QLibrary> decl_QLibrary_LoadHint_Enums_as_child (decl_QLibrary_LoadHint_Enums, "QtCore", "QFlags_LoadHint");
+static gsi::ClassExt<QLibrary> decl_QLibrary_LoadHint_Enum_as_child (decl_QLibrary_LoadHint_Enum, "LoadHint");
+static gsi::ClassExt<QLibrary> decl_QLibrary_LoadHint_Enums_as_child (decl_QLibrary_LoadHint_Enums, "QFlags_LoadHint");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQLibraryInfo.cc b/src/gsiqt/qt4/QtCore/gsiDeclQLibraryInfo.cc
index 7a1d0ad25..3a88da1c9 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQLibraryInfo.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQLibraryInfo.cc
@@ -163,8 +163,8 @@ static gsi::QFlagsClass<QLibraryInfo::LibraryLocation > decl_QLibraryInfo_Librar
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QLibraryInfo> inject_QLibraryInfo_LibraryLocation_Enum_in_parent (decl_QLibraryInfo_LibraryLocation_Enum.defs ());
-static gsi::ClassExt<QLibraryInfo> decl_QLibraryInfo_LibraryLocation_Enum_as_child (decl_QLibraryInfo_LibraryLocation_Enum, "QtCore", "LibraryLocation");
-static gsi::ClassExt<QLibraryInfo> decl_QLibraryInfo_LibraryLocation_Enums_as_child (decl_QLibraryInfo_LibraryLocation_Enums, "QtCore", "QFlags_LibraryLocation");
+static gsi::ClassExt<QLibraryInfo> decl_QLibraryInfo_LibraryLocation_Enum_as_child (decl_QLibraryInfo_LibraryLocation_Enum, "LibraryLocation");
+static gsi::ClassExt<QLibraryInfo> decl_QLibraryInfo_LibraryLocation_Enums_as_child (decl_QLibraryInfo_LibraryLocation_Enums, "QFlags_LibraryLocation");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQLineF.cc b/src/gsiqt/qt4/QtCore/gsiDeclQLineF.cc
index 2cada2934..f70aa6483 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQLineF.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQLineF.cc
@@ -756,8 +756,8 @@ static gsi::QFlagsClass<QLineF::IntersectType > decl_QLineF_IntersectType_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QLineF> inject_QLineF_IntersectType_Enum_in_parent (decl_QLineF_IntersectType_Enum.defs ());
-static gsi::ClassExt<QLineF> decl_QLineF_IntersectType_Enum_as_child (decl_QLineF_IntersectType_Enum, "QtCore", "IntersectType");
-static gsi::ClassExt<QLineF> decl_QLineF_IntersectType_Enums_as_child (decl_QLineF_IntersectType_Enums, "QtCore", "QFlags_IntersectType");
+static gsi::ClassExt<QLineF> decl_QLineF_IntersectType_Enum_as_child (decl_QLineF_IntersectType_Enum, "IntersectType");
+static gsi::ClassExt<QLineF> decl_QLineF_IntersectType_Enums_as_child (decl_QLineF_IntersectType_Enums, "QFlags_IntersectType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQLocale.cc b/src/gsiqt/qt4/QtCore/gsiDeclQLocale.cc
index 95aa62863..efdda9641 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQLocale.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQLocale.cc
@@ -1612,8 +1612,8 @@ static gsi::QFlagsClass<QLocale::Country > decl_QLocale_Country_Enums ("QtCore",
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QLocale> inject_QLocale_Country_Enum_in_parent (decl_QLocale_Country_Enum.defs ());
-static gsi::ClassExt<QLocale> decl_QLocale_Country_Enum_as_child (decl_QLocale_Country_Enum, "QtCore", "Country");
-static gsi::ClassExt<QLocale> decl_QLocale_Country_Enums_as_child (decl_QLocale_Country_Enums, "QtCore", "QFlags_Country");
+static gsi::ClassExt<QLocale> decl_QLocale_Country_Enum_as_child (decl_QLocale_Country_Enum, "Country");
+static gsi::ClassExt<QLocale> decl_QLocale_Country_Enums_as_child (decl_QLocale_Country_Enums, "QFlags_Country");
 
 }
 
@@ -1633,8 +1633,8 @@ static gsi::QFlagsClass<QLocale::FormatType > decl_QLocale_FormatType_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QLocale> inject_QLocale_FormatType_Enum_in_parent (decl_QLocale_FormatType_Enum.defs ());
-static gsi::ClassExt<QLocale> decl_QLocale_FormatType_Enum_as_child (decl_QLocale_FormatType_Enum, "QtCore", "FormatType");
-static gsi::ClassExt<QLocale> decl_QLocale_FormatType_Enums_as_child (decl_QLocale_FormatType_Enums, "QtCore", "QFlags_FormatType");
+static gsi::ClassExt<QLocale> decl_QLocale_FormatType_Enum_as_child (decl_QLocale_FormatType_Enum, "FormatType");
+static gsi::ClassExt<QLocale> decl_QLocale_FormatType_Enums_as_child (decl_QLocale_FormatType_Enums, "QFlags_FormatType");
 
 }
 
@@ -1819,8 +1819,8 @@ static gsi::QFlagsClass<QLocale::Language > decl_QLocale_Language_Enums ("QtCore
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QLocale> inject_QLocale_Language_Enum_in_parent (decl_QLocale_Language_Enum.defs ());
-static gsi::ClassExt<QLocale> decl_QLocale_Language_Enum_as_child (decl_QLocale_Language_Enum, "QtCore", "Language");
-static gsi::ClassExt<QLocale> decl_QLocale_Language_Enums_as_child (decl_QLocale_Language_Enums, "QtCore", "QFlags_Language");
+static gsi::ClassExt<QLocale> decl_QLocale_Language_Enum_as_child (decl_QLocale_Language_Enum, "Language");
+static gsi::ClassExt<QLocale> decl_QLocale_Language_Enums_as_child (decl_QLocale_Language_Enums, "QFlags_Language");
 
 }
 
@@ -1839,8 +1839,8 @@ static gsi::QFlagsClass<QLocale::MeasurementSystem > decl_QLocale_MeasurementSys
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QLocale> inject_QLocale_MeasurementSystem_Enum_in_parent (decl_QLocale_MeasurementSystem_Enum.defs ());
-static gsi::ClassExt<QLocale> decl_QLocale_MeasurementSystem_Enum_as_child (decl_QLocale_MeasurementSystem_Enum, "QtCore", "MeasurementSystem");
-static gsi::ClassExt<QLocale> decl_QLocale_MeasurementSystem_Enums_as_child (decl_QLocale_MeasurementSystem_Enums, "QtCore", "QFlags_MeasurementSystem");
+static gsi::ClassExt<QLocale> decl_QLocale_MeasurementSystem_Enum_as_child (decl_QLocale_MeasurementSystem_Enum, "MeasurementSystem");
+static gsi::ClassExt<QLocale> decl_QLocale_MeasurementSystem_Enums_as_child (decl_QLocale_MeasurementSystem_Enums, "QFlags_MeasurementSystem");
 
 }
 
@@ -1859,8 +1859,8 @@ static gsi::QFlagsClass<QLocale::NumberOption > decl_QLocale_NumberOption_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QLocale> inject_QLocale_NumberOption_Enum_in_parent (decl_QLocale_NumberOption_Enum.defs ());
-static gsi::ClassExt<QLocale> decl_QLocale_NumberOption_Enum_as_child (decl_QLocale_NumberOption_Enum, "QtCore", "NumberOption");
-static gsi::ClassExt<QLocale> decl_QLocale_NumberOption_Enums_as_child (decl_QLocale_NumberOption_Enums, "QtCore", "QFlags_NumberOption");
+static gsi::ClassExt<QLocale> decl_QLocale_NumberOption_Enum_as_child (decl_QLocale_NumberOption_Enum, "NumberOption");
+static gsi::ClassExt<QLocale> decl_QLocale_NumberOption_Enums_as_child (decl_QLocale_NumberOption_Enums, "QFlags_NumberOption");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQMetaMethod.cc b/src/gsiqt/qt4/QtCore/gsiDeclQMetaMethod.cc
index 071934d59..4d83cf93e 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQMetaMethod.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQMetaMethod.cc
@@ -247,8 +247,8 @@ static gsi::QFlagsClass<QMetaMethod::Access > decl_QMetaMethod_Access_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QMetaMethod> inject_QMetaMethod_Access_Enum_in_parent (decl_QMetaMethod_Access_Enum.defs ());
-static gsi::ClassExt<QMetaMethod> decl_QMetaMethod_Access_Enum_as_child (decl_QMetaMethod_Access_Enum, "QtCore", "Access");
-static gsi::ClassExt<QMetaMethod> decl_QMetaMethod_Access_Enums_as_child (decl_QMetaMethod_Access_Enums, "QtCore", "QFlags_Access");
+static gsi::ClassExt<QMetaMethod> decl_QMetaMethod_Access_Enum_as_child (decl_QMetaMethod_Access_Enum, "Access");
+static gsi::ClassExt<QMetaMethod> decl_QMetaMethod_Access_Enums_as_child (decl_QMetaMethod_Access_Enums, "QFlags_Access");
 
 }
 
@@ -269,8 +269,8 @@ static gsi::QFlagsClass<QMetaMethod::MethodType > decl_QMetaMethod_MethodType_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QMetaMethod> inject_QMetaMethod_MethodType_Enum_in_parent (decl_QMetaMethod_MethodType_Enum.defs ());
-static gsi::ClassExt<QMetaMethod> decl_QMetaMethod_MethodType_Enum_as_child (decl_QMetaMethod_MethodType_Enum, "QtCore", "MethodType");
-static gsi::ClassExt<QMetaMethod> decl_QMetaMethod_MethodType_Enums_as_child (decl_QMetaMethod_MethodType_Enums, "QtCore", "QFlags_MethodType");
+static gsi::ClassExt<QMetaMethod> decl_QMetaMethod_MethodType_Enum_as_child (decl_QMetaMethod_MethodType_Enum, "MethodType");
+static gsi::ClassExt<QMetaMethod> decl_QMetaMethod_MethodType_Enums_as_child (decl_QMetaMethod_MethodType_Enums, "QFlags_MethodType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQMutex.cc b/src/gsiqt/qt4/QtCore/gsiDeclQMutex.cc
index a61b3ca44..0b08ed8cb 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQMutex.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQMutex.cc
@@ -159,8 +159,8 @@ static gsi::QFlagsClass<QMutex::RecursionMode > decl_QMutex_RecursionMode_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QMutex> inject_QMutex_RecursionMode_Enum_in_parent (decl_QMutex_RecursionMode_Enum.defs ());
-static gsi::ClassExt<QMutex> decl_QMutex_RecursionMode_Enum_as_child (decl_QMutex_RecursionMode_Enum, "QtCore", "RecursionMode");
-static gsi::ClassExt<QMutex> decl_QMutex_RecursionMode_Enums_as_child (decl_QMutex_RecursionMode_Enums, "QtCore", "QFlags_RecursionMode");
+static gsi::ClassExt<QMutex> decl_QMutex_RecursionMode_Enum_as_child (decl_QMutex_RecursionMode_Enum, "RecursionMode");
+static gsi::ClassExt<QMutex> decl_QMutex_RecursionMode_Enums_as_child (decl_QMutex_RecursionMode_Enums, "QFlags_RecursionMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQProcess.cc b/src/gsiqt/qt4/QtCore/gsiDeclQProcess.cc
index 6d9d3f979..7685dcbbe 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQProcess.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQProcess.cc
@@ -1074,8 +1074,8 @@ static gsi::QFlagsClass<QProcess::ExitStatus > decl_QProcess_ExitStatus_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QProcess> inject_QProcess_ExitStatus_Enum_in_parent (decl_QProcess_ExitStatus_Enum.defs ());
-static gsi::ClassExt<QProcess> decl_QProcess_ExitStatus_Enum_as_child (decl_QProcess_ExitStatus_Enum, "QtCore", "ExitStatus");
-static gsi::ClassExt<QProcess> decl_QProcess_ExitStatus_Enums_as_child (decl_QProcess_ExitStatus_Enums, "QtCore", "QFlags_ExitStatus");
+static gsi::ClassExt<QProcess> decl_QProcess_ExitStatus_Enum_as_child (decl_QProcess_ExitStatus_Enum, "ExitStatus");
+static gsi::ClassExt<QProcess> decl_QProcess_ExitStatus_Enums_as_child (decl_QProcess_ExitStatus_Enums, "QFlags_ExitStatus");
 
 }
 
@@ -1094,8 +1094,8 @@ static gsi::QFlagsClass<QProcess::ProcessChannel > decl_QProcess_ProcessChannel_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QProcess> inject_QProcess_ProcessChannel_Enum_in_parent (decl_QProcess_ProcessChannel_Enum.defs ());
-static gsi::ClassExt<QProcess> decl_QProcess_ProcessChannel_Enum_as_child (decl_QProcess_ProcessChannel_Enum, "QtCore", "ProcessChannel");
-static gsi::ClassExt<QProcess> decl_QProcess_ProcessChannel_Enums_as_child (decl_QProcess_ProcessChannel_Enums, "QtCore", "QFlags_ProcessChannel");
+static gsi::ClassExt<QProcess> decl_QProcess_ProcessChannel_Enum_as_child (decl_QProcess_ProcessChannel_Enum, "ProcessChannel");
+static gsi::ClassExt<QProcess> decl_QProcess_ProcessChannel_Enums_as_child (decl_QProcess_ProcessChannel_Enums, "QFlags_ProcessChannel");
 
 }
 
@@ -1115,8 +1115,8 @@ static gsi::QFlagsClass<QProcess::ProcessChannelMode > decl_QProcess_ProcessChan
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QProcess> inject_QProcess_ProcessChannelMode_Enum_in_parent (decl_QProcess_ProcessChannelMode_Enum.defs ());
-static gsi::ClassExt<QProcess> decl_QProcess_ProcessChannelMode_Enum_as_child (decl_QProcess_ProcessChannelMode_Enum, "QtCore", "ProcessChannelMode");
-static gsi::ClassExt<QProcess> decl_QProcess_ProcessChannelMode_Enums_as_child (decl_QProcess_ProcessChannelMode_Enums, "QtCore", "QFlags_ProcessChannelMode");
+static gsi::ClassExt<QProcess> decl_QProcess_ProcessChannelMode_Enum_as_child (decl_QProcess_ProcessChannelMode_Enum, "ProcessChannelMode");
+static gsi::ClassExt<QProcess> decl_QProcess_ProcessChannelMode_Enums_as_child (decl_QProcess_ProcessChannelMode_Enums, "QFlags_ProcessChannelMode");
 
 }
 
@@ -1139,8 +1139,8 @@ static gsi::QFlagsClass<QProcess::ProcessError > decl_QProcess_ProcessError_Enum
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QProcess> inject_QProcess_ProcessError_Enum_in_parent (decl_QProcess_ProcessError_Enum.defs ());
-static gsi::ClassExt<QProcess> decl_QProcess_ProcessError_Enum_as_child (decl_QProcess_ProcessError_Enum, "QtCore", "ProcessError");
-static gsi::ClassExt<QProcess> decl_QProcess_ProcessError_Enums_as_child (decl_QProcess_ProcessError_Enums, "QtCore", "QFlags_ProcessError");
+static gsi::ClassExt<QProcess> decl_QProcess_ProcessError_Enum_as_child (decl_QProcess_ProcessError_Enum, "ProcessError");
+static gsi::ClassExt<QProcess> decl_QProcess_ProcessError_Enums_as_child (decl_QProcess_ProcessError_Enums, "QFlags_ProcessError");
 
 }
 
@@ -1160,8 +1160,8 @@ static gsi::QFlagsClass<QProcess::ProcessState > decl_QProcess_ProcessState_Enum
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QProcess> inject_QProcess_ProcessState_Enum_in_parent (decl_QProcess_ProcessState_Enum.defs ());
-static gsi::ClassExt<QProcess> decl_QProcess_ProcessState_Enum_as_child (decl_QProcess_ProcessState_Enum, "QtCore", "ProcessState");
-static gsi::ClassExt<QProcess> decl_QProcess_ProcessState_Enums_as_child (decl_QProcess_ProcessState_Enums, "QtCore", "QFlags_ProcessState");
+static gsi::ClassExt<QProcess> decl_QProcess_ProcessState_Enum_as_child (decl_QProcess_ProcessState_Enum, "ProcessState");
+static gsi::ClassExt<QProcess> decl_QProcess_ProcessState_Enums_as_child (decl_QProcess_ProcessState_Enums, "QFlags_ProcessState");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQReadWriteLock.cc b/src/gsiqt/qt4/QtCore/gsiDeclQReadWriteLock.cc
index ff6acb3ff..fe07c43c9 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQReadWriteLock.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQReadWriteLock.cc
@@ -228,8 +228,8 @@ static gsi::QFlagsClass<QReadWriteLock::RecursionMode > decl_QReadWriteLock_Recu
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QReadWriteLock> inject_QReadWriteLock_RecursionMode_Enum_in_parent (decl_QReadWriteLock_RecursionMode_Enum.defs ());
-static gsi::ClassExt<QReadWriteLock> decl_QReadWriteLock_RecursionMode_Enum_as_child (decl_QReadWriteLock_RecursionMode_Enum, "QtCore", "RecursionMode");
-static gsi::ClassExt<QReadWriteLock> decl_QReadWriteLock_RecursionMode_Enums_as_child (decl_QReadWriteLock_RecursionMode_Enums, "QtCore", "QFlags_RecursionMode");
+static gsi::ClassExt<QReadWriteLock> decl_QReadWriteLock_RecursionMode_Enum_as_child (decl_QReadWriteLock_RecursionMode_Enum, "RecursionMode");
+static gsi::ClassExt<QReadWriteLock> decl_QReadWriteLock_RecursionMode_Enums_as_child (decl_QReadWriteLock_RecursionMode_Enums, "QFlags_RecursionMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQRegExp.cc b/src/gsiqt/qt4/QtCore/gsiDeclQRegExp.cc
index e638d413b..dce90ff82 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQRegExp.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQRegExp.cc
@@ -656,8 +656,8 @@ static gsi::QFlagsClass<QRegExp::CaretMode > decl_QRegExp_CaretMode_Enums ("QtCo
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QRegExp> inject_QRegExp_CaretMode_Enum_in_parent (decl_QRegExp_CaretMode_Enum.defs ());
-static gsi::ClassExt<QRegExp> decl_QRegExp_CaretMode_Enum_as_child (decl_QRegExp_CaretMode_Enum, "QtCore", "CaretMode");
-static gsi::ClassExt<QRegExp> decl_QRegExp_CaretMode_Enums_as_child (decl_QRegExp_CaretMode_Enums, "QtCore", "QFlags_CaretMode");
+static gsi::ClassExt<QRegExp> decl_QRegExp_CaretMode_Enum_as_child (decl_QRegExp_CaretMode_Enum, "CaretMode");
+static gsi::ClassExt<QRegExp> decl_QRegExp_CaretMode_Enums_as_child (decl_QRegExp_CaretMode_Enums, "QFlags_CaretMode");
 
 }
 
@@ -680,8 +680,8 @@ static gsi::QFlagsClass<QRegExp::PatternSyntax > decl_QRegExp_PatternSyntax_Enum
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QRegExp> inject_QRegExp_PatternSyntax_Enum_in_parent (decl_QRegExp_PatternSyntax_Enum.defs ());
-static gsi::ClassExt<QRegExp> decl_QRegExp_PatternSyntax_Enum_as_child (decl_QRegExp_PatternSyntax_Enum, "QtCore", "PatternSyntax");
-static gsi::ClassExt<QRegExp> decl_QRegExp_PatternSyntax_Enums_as_child (decl_QRegExp_PatternSyntax_Enums, "QtCore", "QFlags_PatternSyntax");
+static gsi::ClassExt<QRegExp> decl_QRegExp_PatternSyntax_Enum_as_child (decl_QRegExp_PatternSyntax_Enum, "PatternSyntax");
+static gsi::ClassExt<QRegExp> decl_QRegExp_PatternSyntax_Enums_as_child (decl_QRegExp_PatternSyntax_Enums, "QFlags_PatternSyntax");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQSettings.cc b/src/gsiqt/qt4/QtCore/gsiDeclQSettings.cc
index bcd240eee..0fbd45029 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQSettings.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQSettings.cc
@@ -1320,8 +1320,8 @@ static gsi::QFlagsClass<QSettings::Format > decl_QSettings_Format_Enums ("QtCore
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSettings> inject_QSettings_Format_Enum_in_parent (decl_QSettings_Format_Enum.defs ());
-static gsi::ClassExt<QSettings> decl_QSettings_Format_Enum_as_child (decl_QSettings_Format_Enum, "QtCore", "Format");
-static gsi::ClassExt<QSettings> decl_QSettings_Format_Enums_as_child (decl_QSettings_Format_Enums, "QtCore", "QFlags_Format");
+static gsi::ClassExt<QSettings> decl_QSettings_Format_Enum_as_child (decl_QSettings_Format_Enum, "Format");
+static gsi::ClassExt<QSettings> decl_QSettings_Format_Enums_as_child (decl_QSettings_Format_Enums, "QFlags_Format");
 
 }
 
@@ -1340,8 +1340,8 @@ static gsi::QFlagsClass<QSettings::Scope > decl_QSettings_Scope_Enums ("QtCore",
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSettings> inject_QSettings_Scope_Enum_in_parent (decl_QSettings_Scope_Enum.defs ());
-static gsi::ClassExt<QSettings> decl_QSettings_Scope_Enum_as_child (decl_QSettings_Scope_Enum, "QtCore", "Scope");
-static gsi::ClassExt<QSettings> decl_QSettings_Scope_Enums_as_child (decl_QSettings_Scope_Enums, "QtCore", "QFlags_Scope");
+static gsi::ClassExt<QSettings> decl_QSettings_Scope_Enum_as_child (decl_QSettings_Scope_Enum, "Scope");
+static gsi::ClassExt<QSettings> decl_QSettings_Scope_Enums_as_child (decl_QSettings_Scope_Enums, "QFlags_Scope");
 
 }
 
@@ -1361,8 +1361,8 @@ static gsi::QFlagsClass<QSettings::Status > decl_QSettings_Status_Enums ("QtCore
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSettings> inject_QSettings_Status_Enum_in_parent (decl_QSettings_Status_Enum.defs ());
-static gsi::ClassExt<QSettings> decl_QSettings_Status_Enum_as_child (decl_QSettings_Status_Enum, "QtCore", "Status");
-static gsi::ClassExt<QSettings> decl_QSettings_Status_Enums_as_child (decl_QSettings_Status_Enums, "QtCore", "QFlags_Status");
+static gsi::ClassExt<QSettings> decl_QSettings_Status_Enum_as_child (decl_QSettings_Status_Enum, "Status");
+static gsi::ClassExt<QSettings> decl_QSettings_Status_Enums_as_child (decl_QSettings_Status_Enums, "QFlags_Status");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQSocketNotifier.cc b/src/gsiqt/qt4/QtCore/gsiDeclQSocketNotifier.cc
index 758ee3492..1a9a62bcb 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQSocketNotifier.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQSocketNotifier.cc
@@ -669,8 +669,8 @@ static gsi::QFlagsClass<QSocketNotifier::Type > decl_QSocketNotifier_Type_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSocketNotifier> inject_QSocketNotifier_Type_Enum_in_parent (decl_QSocketNotifier_Type_Enum.defs ());
-static gsi::ClassExt<QSocketNotifier> decl_QSocketNotifier_Type_Enum_as_child (decl_QSocketNotifier_Type_Enum, "QtCore", "Type");
-static gsi::ClassExt<QSocketNotifier> decl_QSocketNotifier_Type_Enums_as_child (decl_QSocketNotifier_Type_Enums, "QtCore", "QFlags_Type");
+static gsi::ClassExt<QSocketNotifier> decl_QSocketNotifier_Type_Enum_as_child (decl_QSocketNotifier_Type_Enum, "Type");
+static gsi::ClassExt<QSocketNotifier> decl_QSocketNotifier_Type_Enums_as_child (decl_QSocketNotifier_Type_Enums, "QFlags_Type");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQSystemLocale.cc b/src/gsiqt/qt4/QtCore/gsiDeclQSystemLocale.cc
index 4f5857206..27ee29d55 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQSystemLocale.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQSystemLocale.cc
@@ -260,8 +260,8 @@ static gsi::QFlagsClass<QSystemLocale::QueryType > decl_QSystemLocale_QueryType_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSystemLocale> inject_QSystemLocale_QueryType_Enum_in_parent (decl_QSystemLocale_QueryType_Enum.defs ());
-static gsi::ClassExt<QSystemLocale> decl_QSystemLocale_QueryType_Enum_as_child (decl_QSystemLocale_QueryType_Enum, "QtCore", "QueryType");
-static gsi::ClassExt<QSystemLocale> decl_QSystemLocale_QueryType_Enums_as_child (decl_QSystemLocale_QueryType_Enums, "QtCore", "QFlags_QueryType");
+static gsi::ClassExt<QSystemLocale> decl_QSystemLocale_QueryType_Enum_as_child (decl_QSystemLocale_QueryType_Enum, "QueryType");
+static gsi::ClassExt<QSystemLocale> decl_QSystemLocale_QueryType_Enums_as_child (decl_QSystemLocale_QueryType_Enums, "QFlags_QueryType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQTextCodec.cc b/src/gsiqt/qt4/QtCore/gsiDeclQTextCodec.cc
index d5efffda7..ccb8bf157 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQTextCodec.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQTextCodec.cc
@@ -785,8 +785,8 @@ static gsi::QFlagsClass<QTextCodec::ConversionFlag > decl_QTextCodec_ConversionF
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextCodec> inject_QTextCodec_ConversionFlag_Enum_in_parent (decl_QTextCodec_ConversionFlag_Enum.defs ());
-static gsi::ClassExt<QTextCodec> decl_QTextCodec_ConversionFlag_Enum_as_child (decl_QTextCodec_ConversionFlag_Enum, "QtCore", "ConversionFlag");
-static gsi::ClassExt<QTextCodec> decl_QTextCodec_ConversionFlag_Enums_as_child (decl_QTextCodec_ConversionFlag_Enums, "QtCore", "QFlags_ConversionFlag");
+static gsi::ClassExt<QTextCodec> decl_QTextCodec_ConversionFlag_Enum_as_child (decl_QTextCodec_ConversionFlag_Enum, "ConversionFlag");
+static gsi::ClassExt<QTextCodec> decl_QTextCodec_ConversionFlag_Enums_as_child (decl_QTextCodec_ConversionFlag_Enums, "QFlags_ConversionFlag");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQTextCodec_ConverterState.cc b/src/gsiqt/qt4/QtCore/gsiDeclQTextCodec_ConverterState.cc
index 5260d8ffb..b5bfea6fc 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQTextCodec_ConverterState.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQTextCodec_ConverterState.cc
@@ -69,7 +69,7 @@ gsi::Class<QTextCodec::ConverterState> decl_QTextCodec_ConverterState ("QtCore",
   methods_QTextCodec_ConverterState (),
   "@qt\n@brief Binding of QTextCodec::ConverterState");
 
-gsi::ClassExt<QTextCodec> decl_QTextCodec_ConverterState_as_child (decl_QTextCodec_ConverterState, "QtCore", "ConverterState");
+gsi::ClassExt<QTextCodec> decl_QTextCodec_ConverterState_as_child (decl_QTextCodec_ConverterState, "ConverterState");
 
 GSI_QTCORE_PUBLIC gsi::Class<QTextCodec::ConverterState> &qtdecl_QTextCodec_ConverterState () { return decl_QTextCodec_ConverterState; }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQTextStream.cc b/src/gsiqt/qt4/QtCore/gsiDeclQTextStream.cc
index 44669c356..403212f89 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQTextStream.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQTextStream.cc
@@ -1066,8 +1066,8 @@ static gsi::QFlagsClass<QTextStream::FieldAlignment > decl_QTextStream_FieldAlig
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextStream> inject_QTextStream_FieldAlignment_Enum_in_parent (decl_QTextStream_FieldAlignment_Enum.defs ());
-static gsi::ClassExt<QTextStream> decl_QTextStream_FieldAlignment_Enum_as_child (decl_QTextStream_FieldAlignment_Enum, "QtCore", "FieldAlignment");
-static gsi::ClassExt<QTextStream> decl_QTextStream_FieldAlignment_Enums_as_child (decl_QTextStream_FieldAlignment_Enums, "QtCore", "QFlags_FieldAlignment");
+static gsi::ClassExt<QTextStream> decl_QTextStream_FieldAlignment_Enum_as_child (decl_QTextStream_FieldAlignment_Enum, "FieldAlignment");
+static gsi::ClassExt<QTextStream> decl_QTextStream_FieldAlignment_Enums_as_child (decl_QTextStream_FieldAlignment_Enums, "QFlags_FieldAlignment");
 
 }
 
@@ -1089,8 +1089,8 @@ static gsi::QFlagsClass<QTextStream::NumberFlag > decl_QTextStream_NumberFlag_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextStream> inject_QTextStream_NumberFlag_Enum_in_parent (decl_QTextStream_NumberFlag_Enum.defs ());
-static gsi::ClassExt<QTextStream> decl_QTextStream_NumberFlag_Enum_as_child (decl_QTextStream_NumberFlag_Enum, "QtCore", "NumberFlag");
-static gsi::ClassExt<QTextStream> decl_QTextStream_NumberFlag_Enums_as_child (decl_QTextStream_NumberFlag_Enums, "QtCore", "QFlags_NumberFlag");
+static gsi::ClassExt<QTextStream> decl_QTextStream_NumberFlag_Enum_as_child (decl_QTextStream_NumberFlag_Enum, "NumberFlag");
+static gsi::ClassExt<QTextStream> decl_QTextStream_NumberFlag_Enums_as_child (decl_QTextStream_NumberFlag_Enums, "QFlags_NumberFlag");
 
 }
 
@@ -1110,8 +1110,8 @@ static gsi::QFlagsClass<QTextStream::RealNumberNotation > decl_QTextStream_RealN
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextStream> inject_QTextStream_RealNumberNotation_Enum_in_parent (decl_QTextStream_RealNumberNotation_Enum.defs ());
-static gsi::ClassExt<QTextStream> decl_QTextStream_RealNumberNotation_Enum_as_child (decl_QTextStream_RealNumberNotation_Enum, "QtCore", "RealNumberNotation");
-static gsi::ClassExt<QTextStream> decl_QTextStream_RealNumberNotation_Enums_as_child (decl_QTextStream_RealNumberNotation_Enums, "QtCore", "QFlags_RealNumberNotation");
+static gsi::ClassExt<QTextStream> decl_QTextStream_RealNumberNotation_Enum_as_child (decl_QTextStream_RealNumberNotation_Enum, "RealNumberNotation");
+static gsi::ClassExt<QTextStream> decl_QTextStream_RealNumberNotation_Enums_as_child (decl_QTextStream_RealNumberNotation_Enums, "QFlags_RealNumberNotation");
 
 }
 
@@ -1131,8 +1131,8 @@ static gsi::QFlagsClass<QTextStream::Status > decl_QTextStream_Status_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextStream> inject_QTextStream_Status_Enum_in_parent (decl_QTextStream_Status_Enum.defs ());
-static gsi::ClassExt<QTextStream> decl_QTextStream_Status_Enum_as_child (decl_QTextStream_Status_Enum, "QtCore", "Status");
-static gsi::ClassExt<QTextStream> decl_QTextStream_Status_Enums_as_child (decl_QTextStream_Status_Enums, "QtCore", "QFlags_Status");
+static gsi::ClassExt<QTextStream> decl_QTextStream_Status_Enum_as_child (decl_QTextStream_Status_Enum, "Status");
+static gsi::ClassExt<QTextStream> decl_QTextStream_Status_Enums_as_child (decl_QTextStream_Status_Enums, "QFlags_Status");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQThread.cc b/src/gsiqt/qt4/QtCore/gsiDeclQThread.cc
index 66cf4cd94..ff547f4bc 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQThread.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQThread.cc
@@ -1063,8 +1063,8 @@ static gsi::QFlagsClass<QThread::Priority > decl_QThread_Priority_Enums ("QtCore
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QThread> inject_QThread_Priority_Enum_in_parent (decl_QThread_Priority_Enum.defs ());
-static gsi::ClassExt<QThread> decl_QThread_Priority_Enum_as_child (decl_QThread_Priority_Enum, "QtCore", "Priority");
-static gsi::ClassExt<QThread> decl_QThread_Priority_Enums_as_child (decl_QThread_Priority_Enums, "QtCore", "QFlags_Priority");
+static gsi::ClassExt<QThread> decl_QThread_Priority_Enum_as_child (decl_QThread_Priority_Enum, "Priority");
+static gsi::ClassExt<QThread> decl_QThread_Priority_Enums_as_child (decl_QThread_Priority_Enums, "QFlags_Priority");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQTimeLine.cc b/src/gsiqt/qt4/QtCore/gsiDeclQTimeLine.cc
index 73dc16c25..a0412b439 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQTimeLine.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQTimeLine.cc
@@ -1256,8 +1256,8 @@ static gsi::QFlagsClass<QTimeLine::CurveShape > decl_QTimeLine_CurveShape_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTimeLine> inject_QTimeLine_CurveShape_Enum_in_parent (decl_QTimeLine_CurveShape_Enum.defs ());
-static gsi::ClassExt<QTimeLine> decl_QTimeLine_CurveShape_Enum_as_child (decl_QTimeLine_CurveShape_Enum, "QtCore", "CurveShape");
-static gsi::ClassExt<QTimeLine> decl_QTimeLine_CurveShape_Enums_as_child (decl_QTimeLine_CurveShape_Enums, "QtCore", "QFlags_CurveShape");
+static gsi::ClassExt<QTimeLine> decl_QTimeLine_CurveShape_Enum_as_child (decl_QTimeLine_CurveShape_Enum, "CurveShape");
+static gsi::ClassExt<QTimeLine> decl_QTimeLine_CurveShape_Enums_as_child (decl_QTimeLine_CurveShape_Enums, "QFlags_CurveShape");
 
 }
 
@@ -1276,8 +1276,8 @@ static gsi::QFlagsClass<QTimeLine::Direction > decl_QTimeLine_Direction_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTimeLine> inject_QTimeLine_Direction_Enum_in_parent (decl_QTimeLine_Direction_Enum.defs ());
-static gsi::ClassExt<QTimeLine> decl_QTimeLine_Direction_Enum_as_child (decl_QTimeLine_Direction_Enum, "QtCore", "Direction");
-static gsi::ClassExt<QTimeLine> decl_QTimeLine_Direction_Enums_as_child (decl_QTimeLine_Direction_Enums, "QtCore", "QFlags_Direction");
+static gsi::ClassExt<QTimeLine> decl_QTimeLine_Direction_Enum_as_child (decl_QTimeLine_Direction_Enum, "Direction");
+static gsi::ClassExt<QTimeLine> decl_QTimeLine_Direction_Enums_as_child (decl_QTimeLine_Direction_Enums, "QFlags_Direction");
 
 }
 
@@ -1297,8 +1297,8 @@ static gsi::QFlagsClass<QTimeLine::State > decl_QTimeLine_State_Enums ("QtCore",
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTimeLine> inject_QTimeLine_State_Enum_in_parent (decl_QTimeLine_State_Enum.defs ());
-static gsi::ClassExt<QTimeLine> decl_QTimeLine_State_Enum_as_child (decl_QTimeLine_State_Enum, "QtCore", "State");
-static gsi::ClassExt<QTimeLine> decl_QTimeLine_State_Enums_as_child (decl_QTimeLine_State_Enums, "QtCore", "QFlags_State");
+static gsi::ClassExt<QTimeLine> decl_QTimeLine_State_Enum_as_child (decl_QTimeLine_State_Enum, "State");
+static gsi::ClassExt<QTimeLine> decl_QTimeLine_State_Enums_as_child (decl_QTimeLine_State_Enums, "QFlags_State");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQUrl.cc b/src/gsiqt/qt4/QtCore/gsiDeclQUrl.cc
index f0fc1311a..59ec1d7d7 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQUrl.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQUrl.cc
@@ -1791,8 +1791,8 @@ static gsi::QFlagsClass<QUrl::FormattingOption > decl_QUrl_FormattingOption_Enum
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QUrl> inject_QUrl_FormattingOption_Enum_in_parent (decl_QUrl_FormattingOption_Enum.defs ());
-static gsi::ClassExt<QUrl> decl_QUrl_FormattingOption_Enum_as_child (decl_QUrl_FormattingOption_Enum, "QtCore", "FormattingOption");
-static gsi::ClassExt<QUrl> decl_QUrl_FormattingOption_Enums_as_child (decl_QUrl_FormattingOption_Enums, "QtCore", "QFlags_FormattingOption");
+static gsi::ClassExt<QUrl> decl_QUrl_FormattingOption_Enum_as_child (decl_QUrl_FormattingOption_Enum, "FormattingOption");
+static gsi::ClassExt<QUrl> decl_QUrl_FormattingOption_Enums_as_child (decl_QUrl_FormattingOption_Enums, "QFlags_FormattingOption");
 
 }
 
@@ -1811,8 +1811,8 @@ static gsi::QFlagsClass<QUrl::ParsingMode > decl_QUrl_ParsingMode_Enums ("QtCore
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QUrl> inject_QUrl_ParsingMode_Enum_in_parent (decl_QUrl_ParsingMode_Enum.defs ());
-static gsi::ClassExt<QUrl> decl_QUrl_ParsingMode_Enum_as_child (decl_QUrl_ParsingMode_Enum, "QtCore", "ParsingMode");
-static gsi::ClassExt<QUrl> decl_QUrl_ParsingMode_Enums_as_child (decl_QUrl_ParsingMode_Enums, "QtCore", "QFlags_ParsingMode");
+static gsi::ClassExt<QUrl> decl_QUrl_ParsingMode_Enum_as_child (decl_QUrl_ParsingMode_Enum, "ParsingMode");
+static gsi::ClassExt<QUrl> decl_QUrl_ParsingMode_Enums_as_child (decl_QUrl_ParsingMode_Enums, "QFlags_ParsingMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQt.cc b/src/gsiqt/qt4/QtCore/gsiDeclQt.cc
index bf8cd5d6b..4898b3cdf 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQt.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQt.cc
@@ -71,8 +71,8 @@ static gsi::QFlagsClass<Qt::AlignmentFlag > decl_Qt_AlignmentFlag_Enums ("QtCore
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_AlignmentFlag_Enum_in_parent (decl_Qt_AlignmentFlag_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_AlignmentFlag_Enum_as_child (decl_Qt_AlignmentFlag_Enum, "QtCore", "AlignmentFlag");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_AlignmentFlag_Enums_as_child (decl_Qt_AlignmentFlag_Enums, "QtCore", "QFlags_AlignmentFlag");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_AlignmentFlag_Enum_as_child (decl_Qt_AlignmentFlag_Enum, "AlignmentFlag");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_AlignmentFlag_Enums_as_child (decl_Qt_AlignmentFlag_Enums, "QFlags_AlignmentFlag");
 
 }
 
@@ -91,8 +91,8 @@ static gsi::QFlagsClass<Qt::AnchorAttribute > decl_Qt_AnchorAttribute_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_AnchorAttribute_Enum_in_parent (decl_Qt_AnchorAttribute_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_AnchorAttribute_Enum_as_child (decl_Qt_AnchorAttribute_Enum, "QtCore", "AnchorAttribute");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_AnchorAttribute_Enums_as_child (decl_Qt_AnchorAttribute_Enums, "QtCore", "QFlags_AnchorAttribute");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_AnchorAttribute_Enum_as_child (decl_Qt_AnchorAttribute_Enum, "AnchorAttribute");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_AnchorAttribute_Enums_as_child (decl_Qt_AnchorAttribute_Enums, "QFlags_AnchorAttribute");
 
 }
 
@@ -115,8 +115,8 @@ static gsi::QFlagsClass<Qt::AnchorPoint > decl_Qt_AnchorPoint_Enums ("QtCore", "
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_AnchorPoint_Enum_in_parent (decl_Qt_AnchorPoint_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_AnchorPoint_Enum_as_child (decl_Qt_AnchorPoint_Enum, "QtCore", "AnchorPoint");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_AnchorPoint_Enums_as_child (decl_Qt_AnchorPoint_Enums, "QtCore", "QFlags_AnchorPoint");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_AnchorPoint_Enum_as_child (decl_Qt_AnchorPoint_Enum, "AnchorPoint");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_AnchorPoint_Enums_as_child (decl_Qt_AnchorPoint_Enums, "QFlags_AnchorPoint");
 
 }
 
@@ -143,8 +143,8 @@ static gsi::QFlagsClass<Qt::ApplicationAttribute > decl_Qt_ApplicationAttribute_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_ApplicationAttribute_Enum_in_parent (decl_Qt_ApplicationAttribute_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ApplicationAttribute_Enum_as_child (decl_Qt_ApplicationAttribute_Enum, "QtCore", "ApplicationAttribute");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ApplicationAttribute_Enums_as_child (decl_Qt_ApplicationAttribute_Enums, "QtCore", "QFlags_ApplicationAttribute");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ApplicationAttribute_Enum_as_child (decl_Qt_ApplicationAttribute_Enum, "ApplicationAttribute");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ApplicationAttribute_Enums_as_child (decl_Qt_ApplicationAttribute_Enums, "QFlags_ApplicationAttribute");
 
 }
 
@@ -166,8 +166,8 @@ static gsi::QFlagsClass<Qt::ArrowType > decl_Qt_ArrowType_Enums ("QtCore", "Qt_Q
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_ArrowType_Enum_in_parent (decl_Qt_ArrowType_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ArrowType_Enum_as_child (decl_Qt_ArrowType_Enum, "QtCore", "ArrowType");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ArrowType_Enums_as_child (decl_Qt_ArrowType_Enums, "QtCore", "QFlags_ArrowType");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ArrowType_Enum_as_child (decl_Qt_ArrowType_Enum, "ArrowType");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ArrowType_Enums_as_child (decl_Qt_ArrowType_Enums, "QFlags_ArrowType");
 
 }
 
@@ -187,8 +187,8 @@ static gsi::QFlagsClass<Qt::AspectRatioMode > decl_Qt_AspectRatioMode_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_AspectRatioMode_Enum_in_parent (decl_Qt_AspectRatioMode_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_AspectRatioMode_Enum_as_child (decl_Qt_AspectRatioMode_Enum, "QtCore", "AspectRatioMode");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_AspectRatioMode_Enums_as_child (decl_Qt_AspectRatioMode_Enums, "QtCore", "QFlags_AspectRatioMode");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_AspectRatioMode_Enum_as_child (decl_Qt_AspectRatioMode_Enum, "AspectRatioMode");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_AspectRatioMode_Enums_as_child (decl_Qt_AspectRatioMode_Enums, "QFlags_AspectRatioMode");
 
 }
 
@@ -208,8 +208,8 @@ static gsi::QFlagsClass<Qt::Axis > decl_Qt_Axis_Enums ("QtCore", "Qt_QFlags_Axis
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_Axis_Enum_in_parent (decl_Qt_Axis_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_Axis_Enum_as_child (decl_Qt_Axis_Enum, "QtCore", "Axis");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_Axis_Enums_as_child (decl_Qt_Axis_Enums, "QtCore", "QFlags_Axis");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_Axis_Enum_as_child (decl_Qt_Axis_Enum, "Axis");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_Axis_Enums_as_child (decl_Qt_Axis_Enums, "QFlags_Axis");
 
 }
 
@@ -228,8 +228,8 @@ static gsi::QFlagsClass<Qt::BGMode > decl_Qt_BGMode_Enums ("QtCore", "Qt_QFlags_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_BGMode_Enum_in_parent (decl_Qt_BGMode_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_BGMode_Enum_as_child (decl_Qt_BGMode_Enum, "QtCore", "BGMode");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_BGMode_Enums_as_child (decl_Qt_BGMode_Enums, "QtCore", "QFlags_BGMode");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_BGMode_Enum_as_child (decl_Qt_BGMode_Enum, "BGMode");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_BGMode_Enums_as_child (decl_Qt_BGMode_Enums, "QFlags_BGMode");
 
 }
 
@@ -265,8 +265,8 @@ static gsi::QFlagsClass<Qt::BrushStyle > decl_Qt_BrushStyle_Enums ("QtCore", "Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_BrushStyle_Enum_in_parent (decl_Qt_BrushStyle_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_BrushStyle_Enum_as_child (decl_Qt_BrushStyle_Enum, "QtCore", "BrushStyle");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_BrushStyle_Enums_as_child (decl_Qt_BrushStyle_Enums, "QtCore", "QFlags_BrushStyle");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_BrushStyle_Enum_as_child (decl_Qt_BrushStyle_Enum, "BrushStyle");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_BrushStyle_Enums_as_child (decl_Qt_BrushStyle_Enums, "QFlags_BrushStyle");
 
 }
 
@@ -285,8 +285,8 @@ static gsi::QFlagsClass<Qt::CaseSensitivity > decl_Qt_CaseSensitivity_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_CaseSensitivity_Enum_in_parent (decl_Qt_CaseSensitivity_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_CaseSensitivity_Enum_as_child (decl_Qt_CaseSensitivity_Enum, "QtCore", "CaseSensitivity");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_CaseSensitivity_Enums_as_child (decl_Qt_CaseSensitivity_Enums, "QtCore", "QFlags_CaseSensitivity");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_CaseSensitivity_Enum_as_child (decl_Qt_CaseSensitivity_Enum, "CaseSensitivity");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_CaseSensitivity_Enums_as_child (decl_Qt_CaseSensitivity_Enums, "QFlags_CaseSensitivity");
 
 }
 
@@ -306,8 +306,8 @@ static gsi::QFlagsClass<Qt::CheckState > decl_Qt_CheckState_Enums ("QtCore", "Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_CheckState_Enum_in_parent (decl_Qt_CheckState_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_CheckState_Enum_as_child (decl_Qt_CheckState_Enum, "QtCore", "CheckState");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_CheckState_Enums_as_child (decl_Qt_CheckState_Enums, "QtCore", "QFlags_CheckState");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_CheckState_Enum_as_child (decl_Qt_CheckState_Enum, "CheckState");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_CheckState_Enums_as_child (decl_Qt_CheckState_Enums, "QFlags_CheckState");
 
 }
 
@@ -328,8 +328,8 @@ static gsi::QFlagsClass<Qt::ClipOperation > decl_Qt_ClipOperation_Enums ("QtCore
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_ClipOperation_Enum_in_parent (decl_Qt_ClipOperation_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ClipOperation_Enum_as_child (decl_Qt_ClipOperation_Enum, "QtCore", "ClipOperation");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ClipOperation_Enums_as_child (decl_Qt_ClipOperation_Enums, "QtCore", "QFlags_ClipOperation");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ClipOperation_Enum_as_child (decl_Qt_ClipOperation_Enum, "ClipOperation");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ClipOperation_Enums_as_child (decl_Qt_ClipOperation_Enums, "QFlags_ClipOperation");
 
 }
 
@@ -352,8 +352,8 @@ static gsi::QFlagsClass<Qt::ConnectionType > decl_Qt_ConnectionType_Enums ("QtCo
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_ConnectionType_Enum_in_parent (decl_Qt_ConnectionType_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ConnectionType_Enum_as_child (decl_Qt_ConnectionType_Enum, "QtCore", "ConnectionType");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ConnectionType_Enums_as_child (decl_Qt_ConnectionType_Enums, "QtCore", "QFlags_ConnectionType");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ConnectionType_Enum_as_child (decl_Qt_ConnectionType_Enum, "ConnectionType");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ConnectionType_Enums_as_child (decl_Qt_ConnectionType_Enums, "QFlags_ConnectionType");
 
 }
 
@@ -375,8 +375,8 @@ static gsi::QFlagsClass<Qt::ContextMenuPolicy > decl_Qt_ContextMenuPolicy_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_ContextMenuPolicy_Enum_in_parent (decl_Qt_ContextMenuPolicy_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ContextMenuPolicy_Enum_as_child (decl_Qt_ContextMenuPolicy_Enum, "QtCore", "ContextMenuPolicy");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ContextMenuPolicy_Enums_as_child (decl_Qt_ContextMenuPolicy_Enums, "QtCore", "QFlags_ContextMenuPolicy");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ContextMenuPolicy_Enum_as_child (decl_Qt_ContextMenuPolicy_Enum, "ContextMenuPolicy");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ContextMenuPolicy_Enums_as_child (decl_Qt_ContextMenuPolicy_Enums, "QFlags_ContextMenuPolicy");
 
 }
 
@@ -395,8 +395,8 @@ static gsi::QFlagsClass<Qt::CoordinateSystem > decl_Qt_CoordinateSystem_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_CoordinateSystem_Enum_in_parent (decl_Qt_CoordinateSystem_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_CoordinateSystem_Enum_as_child (decl_Qt_CoordinateSystem_Enum, "QtCore", "CoordinateSystem");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_CoordinateSystem_Enums_as_child (decl_Qt_CoordinateSystem_Enums, "QtCore", "QFlags_CoordinateSystem");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_CoordinateSystem_Enum_as_child (decl_Qt_CoordinateSystem_Enum, "CoordinateSystem");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_CoordinateSystem_Enums_as_child (decl_Qt_CoordinateSystem_Enums, "QFlags_CoordinateSystem");
 
 }
 
@@ -417,8 +417,8 @@ static gsi::QFlagsClass<Qt::Corner > decl_Qt_Corner_Enums ("QtCore", "Qt_QFlags_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_Corner_Enum_in_parent (decl_Qt_Corner_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_Corner_Enum_as_child (decl_Qt_Corner_Enum, "QtCore", "Corner");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_Corner_Enums_as_child (decl_Qt_Corner_Enums, "QtCore", "QFlags_Corner");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_Corner_Enum_as_child (decl_Qt_Corner_Enum, "Corner");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_Corner_Enums_as_child (decl_Qt_Corner_Enums, "QFlags_Corner");
 
 }
 
@@ -457,8 +457,8 @@ static gsi::QFlagsClass<Qt::CursorShape > decl_Qt_CursorShape_Enums ("QtCore", "
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_CursorShape_Enum_in_parent (decl_Qt_CursorShape_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_CursorShape_Enum_as_child (decl_Qt_CursorShape_Enum, "QtCore", "CursorShape");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_CursorShape_Enums_as_child (decl_Qt_CursorShape_Enums, "QtCore", "QFlags_CursorShape");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_CursorShape_Enum_as_child (decl_Qt_CursorShape_Enum, "CursorShape");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_CursorShape_Enums_as_child (decl_Qt_CursorShape_Enums, "QFlags_CursorShape");
 
 }
 
@@ -484,8 +484,8 @@ static gsi::QFlagsClass<Qt::DateFormat > decl_Qt_DateFormat_Enums ("QtCore", "Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_DateFormat_Enum_in_parent (decl_Qt_DateFormat_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_DateFormat_Enum_as_child (decl_Qt_DateFormat_Enum, "QtCore", "DateFormat");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_DateFormat_Enums_as_child (decl_Qt_DateFormat_Enums, "QtCore", "QFlags_DateFormat");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_DateFormat_Enum_as_child (decl_Qt_DateFormat_Enum, "DateFormat");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_DateFormat_Enums_as_child (decl_Qt_DateFormat_Enums, "QFlags_DateFormat");
 
 }
 
@@ -509,8 +509,8 @@ static gsi::QFlagsClass<Qt::DayOfWeek > decl_Qt_DayOfWeek_Enums ("QtCore", "Qt_Q
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_DayOfWeek_Enum_in_parent (decl_Qt_DayOfWeek_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_DayOfWeek_Enum_as_child (decl_Qt_DayOfWeek_Enum, "QtCore", "DayOfWeek");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_DayOfWeek_Enums_as_child (decl_Qt_DayOfWeek_Enums, "QtCore", "QFlags_DayOfWeek");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_DayOfWeek_Enum_as_child (decl_Qt_DayOfWeek_Enum, "DayOfWeek");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_DayOfWeek_Enums_as_child (decl_Qt_DayOfWeek_Enums, "QFlags_DayOfWeek");
 
 }
 
@@ -534,8 +534,8 @@ static gsi::QFlagsClass<Qt::DockWidgetArea > decl_Qt_DockWidgetArea_Enums ("QtCo
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_DockWidgetArea_Enum_in_parent (decl_Qt_DockWidgetArea_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_DockWidgetArea_Enum_as_child (decl_Qt_DockWidgetArea_Enum, "QtCore", "DockWidgetArea");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_DockWidgetArea_Enums_as_child (decl_Qt_DockWidgetArea_Enums, "QtCore", "QFlags_DockWidgetArea");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_DockWidgetArea_Enum_as_child (decl_Qt_DockWidgetArea_Enum, "DockWidgetArea");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_DockWidgetArea_Enums_as_child (decl_Qt_DockWidgetArea_Enums, "QFlags_DockWidgetArea");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQtCoreAdd.cc b/src/gsiqt/qt4/QtCore/gsiDeclQtCoreAdd.cc
index 1d8c9b986..d656beab7 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQtCoreAdd.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQtCoreAdd.cc
@@ -46,11 +46,11 @@ namespace gsi_qt
 class QVariant_Namespace { };
 
 //  A dummy namespace "QVariant"
-gsi::Class<QVariant_Namespace> decl_QVariant_Namespace ("Qt", "QVariant",
+gsi::Class<QVariant_Namespace> decl_QVariant_Namespace ("QtCore", "QVariant",
   gsi::Methods(),
   "@qt\n@brief This class represents the QVariant namespace");
 
-static gsi::Enum<QVariant::Type> decl_QVariant_Type_Enum ("Qt", "QVariant_Type",
+static gsi::Enum<QVariant::Type> decl_QVariant_Type_Enum ("QtCore", "QVariant_Type",
     gsi::enum_const ("Invalid", QVariant::Invalid, "@brief Enum constant QVariant::Invalid") +
     gsi::enum_const ("Bool", QVariant::Bool, "@brief Enum constant QVariant::Bool") +
     gsi::enum_const ("Int", QVariant::Int, "@brief Enum constant QVariant::Int") +
@@ -109,18 +109,18 @@ static gsi::Enum<QVariant::Type> decl_QVariant_Type_Enum ("Qt", "QVariant_Type",
     gsi::enum_const ("LastType", QVariant::LastType, "@brief Enum constant QVariant::LastType"),
   "@qt\n@brief This class represents the QVariant::Type enum");
 
-static gsi::QFlagsClass<QVariant::Type> decl_QVariant_Type_Enums ("QVariant_QFlags_Type",
+static gsi::QFlagsClass<QVariant::Type> decl_QVariant_Type_Enums ("QtCore", "QVariant_QFlags_Type",
   "@qt\n@brief This class represents the QFlags<QVariant::Type> flag set");
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QVariant_Namespace> inject_QVariant_Type_Enum_in_parent (decl_QVariant_Type_Enum.defs ());
-static gsi::ClassExt<QVariant_Namespace> decl_QVariant_Type_Enum_as_child (decl_QVariant_Type_Enum, "Qt", "Type");
-static gsi::ClassExt<QVariant_Namespace> decl_QVariant_Type_Enums_as_child (decl_QVariant_Type_Enums, "Qt", "QFlags_Type");
+static gsi::ClassExt<QVariant_Namespace> decl_QVariant_Type_Enum_as_child (decl_QVariant_Type_Enum, "Type");
+static gsi::ClassExt<QVariant_Namespace> decl_QVariant_Type_Enums_as_child (decl_QVariant_Type_Enums, "QFlags_Type");
 
 // ------------------------------------------------------------
 //  Declarations for QPair<QString, QString>
 
-gsi::Class<QPair<QString, QString> > decl_QString_QPair ("Qt", "QPair_QString_QString",
+gsi::Class<QPair<QString, QString> > decl_QString_QPair ("QtCore", "QPair_QString_QString",
   qt_gsi::pair_decl<QString, QString>::methods (),
   "@qt\\n@brief Represents a QPair<QString, QString>"
 );
@@ -128,7 +128,7 @@ gsi::Class<QPair<QString, QString> > decl_QString_QPair ("Qt", "QPair_QString_QS
 // ------------------------------------------------------------
 //  Declarations for QPair<QByteArray, QByteArray>
 
-gsi::Class<QPair<QByteArray, QByteArray> > decl_QByteArray_QPair ("Qt", "QPair_QByteArray_QByteArray",
+gsi::Class<QPair<QByteArray, QByteArray> > decl_QByteArray_QPair ("QtCore", "QPair_QByteArray_QByteArray",
   qt_gsi::pair_decl<QByteArray, QByteArray>::methods (),
   "@qt\\n@brief Represents a QPair<QString, QString>"
 );
@@ -136,7 +136,7 @@ gsi::Class<QPair<QByteArray, QByteArray> > decl_QByteArray_QPair ("Qt", "QPair_Q
 // ------------------------------------------------------------
 //  Declarations for QPair<double, double>
 
-gsi::Class<QPair<double, double> > decl_double_QPair ("Qt", "QPair_double_double",
+gsi::Class<QPair<double, double> > decl_double_QPair ("QtCore", "QPair_double_double",
   qt_gsi::pair_decl<double, double>::methods (),
   "@qt\\n@brief Represents a QPair<double, double>"
 );
@@ -144,7 +144,7 @@ gsi::Class<QPair<double, double> > decl_double_QPair ("Qt", "QPair_double_double
 // ------------------------------------------------------------
 //  Declarations for QPair<double, QPointf>
 
-gsi::Class<QPair<double, QPointF> > decl_double_QPointF_QPair ("Qt", "QPair_double_QPointF",
+gsi::Class<QPair<double, QPointF> > decl_double_QPointF_QPair ("QtCore", "QPair_double_QPointF",
   qt_gsi::pair_decl<double, QPointF>::methods (),
   "@qt\\n@brief Represents a QPair<double, QPointF>"
 );
@@ -152,7 +152,7 @@ gsi::Class<QPair<double, QPointF> > decl_double_QPointF_QPair ("Qt", "QPair_doub
 // ------------------------------------------------------------
 //  Declarations for QPair<double, QColor>
 
-gsi::Class<QPair<double, QColor> > decl_double_QColor_QPair ("Qt", "QPair_double_QColor",
+gsi::Class<QPair<double, QColor> > decl_double_QColor_QPair ("QtCore", "QPair_double_QColor",
   qt_gsi::pair_decl<double, QColor>::methods (),
   "@qt\\n@brief Represents a QPair<double, QColor>"
 );
@@ -160,7 +160,7 @@ gsi::Class<QPair<double, QColor> > decl_double_QColor_QPair ("Qt", "QPair_double
 // ------------------------------------------------------------
 //  Declarations for QPair<int, int>
 
-gsi::Class<QPair<int, int> > decl_int_int_QPair ("Qt", "QPair_int_int",
+gsi::Class<QPair<int, int> > decl_int_int_QPair ("QtCore", "QPair_int_int",
   qt_gsi::pair_decl<int, int>::methods (),
   "@qt\\n@brief Represents a QPair<int, int>"
 );
@@ -168,7 +168,7 @@ gsi::Class<QPair<int, int> > decl_int_int_QPair ("Qt", "QPair_int_int",
 // ------------------------------------------------------------
 //  Declarations for QPair<QString, QSizeF>
 
-gsi::Class<QPair<QString, QSizeF> > decl_QString_QSizeF_QPair ("Qt", "QPair_QString_QSizeF",
+gsi::Class<QPair<QString, QSizeF> > decl_QString_QSizeF_QPair ("QtCore", "QPair_QString_QSizeF",
   qt_gsi::pair_decl<QString, QSizeF>::methods (),
   "@qt\\n@brief Represents a QPair<QString, QSizeF>"
 );
@@ -176,7 +176,7 @@ gsi::Class<QPair<QString, QSizeF> > decl_QString_QSizeF_QPair ("Qt", "QPair_QStr
 // ------------------------------------------------------------
 //  Declarations for QPair<double, QVariant>
 
-gsi::Class<QPair<double, QVariant> > decl_double_QVariant_QPair ("Qt", "QPair_double_QVariant",
+gsi::Class<QPair<double, QVariant> > decl_double_QVariant_QPair ("QtCore", "QPair_double_QVariant",
   qt_gsi::pair_decl<double, QVariant>::methods (),
   "@qt\\n@brief Represents a QPair<double, QVariant>"
 );
@@ -195,7 +195,7 @@ static gsi::QFlagsClass<Qt::HitTestAccuracy > decl_Qt_HitTestAccuracy_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_HitTestAccuracy_Enum_in_parent (decl_Qt_HitTestAccuracy_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_HitTestAccuracy_Enum_as_child (decl_Qt_HitTestAccuracy_Enum, "QtCore", "HitTestAccuracy");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_HitTestAccuracy_Enums_as_child (decl_Qt_HitTestAccuracy_Enums, "QtCore", "QFlags_HitTestAccuracy");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_HitTestAccuracy_Enum_as_child (decl_Qt_HitTestAccuracy_Enum, "HitTestAccuracy");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_HitTestAccuracy_Enums_as_child (decl_Qt_HitTestAccuracy_Enums, "QFlags_HitTestAccuracy");
 
 }
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQt_1.cc b/src/gsiqt/qt4/QtCore/gsiDeclQt_1.cc
index 76c7347f6..0f3eec9bf 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQt_1.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQt_1.cc
@@ -52,8 +52,8 @@ static gsi::QFlagsClass<Qt::DockWidgetAreaSizes > decl_Qt_DockWidgetAreaSizes_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_DockWidgetAreaSizes_Enum_in_parent (decl_Qt_DockWidgetAreaSizes_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_DockWidgetAreaSizes_Enum_as_child (decl_Qt_DockWidgetAreaSizes_Enum, "QtCore", "DockWidgetAreaSizes");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_DockWidgetAreaSizes_Enums_as_child (decl_Qt_DockWidgetAreaSizes_Enums, "QtCore", "QFlags_DockWidgetAreaSizes");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_DockWidgetAreaSizes_Enum_as_child (decl_Qt_DockWidgetAreaSizes_Enum, "DockWidgetAreaSizes");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_DockWidgetAreaSizes_Enums_as_child (decl_Qt_DockWidgetAreaSizes_Enums, "QFlags_DockWidgetAreaSizes");
 
 }
 
@@ -76,8 +76,8 @@ static gsi::QFlagsClass<Qt::DropAction > decl_Qt_DropAction_Enums ("QtCore", "Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_DropAction_Enum_in_parent (decl_Qt_DropAction_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_DropAction_Enum_as_child (decl_Qt_DropAction_Enum, "QtCore", "DropAction");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_DropAction_Enums_as_child (decl_Qt_DropAction_Enums, "QtCore", "QFlags_DropAction");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_DropAction_Enum_as_child (decl_Qt_DropAction_Enum, "DropAction");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_DropAction_Enums_as_child (decl_Qt_DropAction_Enums, "QFlags_DropAction");
 
 }
 
@@ -97,8 +97,8 @@ static gsi::QFlagsClass<Qt::EventPriority > decl_Qt_EventPriority_Enums ("QtCore
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_EventPriority_Enum_in_parent (decl_Qt_EventPriority_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_EventPriority_Enum_as_child (decl_Qt_EventPriority_Enum, "QtCore", "EventPriority");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_EventPriority_Enums_as_child (decl_Qt_EventPriority_Enums, "QtCore", "QFlags_EventPriority");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_EventPriority_Enum_as_child (decl_Qt_EventPriority_Enum, "EventPriority");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_EventPriority_Enums_as_child (decl_Qt_EventPriority_Enums, "QFlags_EventPriority");
 
 }
 
@@ -117,8 +117,8 @@ static gsi::QFlagsClass<Qt::FillRule > decl_Qt_FillRule_Enums ("QtCore", "Qt_QFl
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_FillRule_Enum_in_parent (decl_Qt_FillRule_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_FillRule_Enum_as_child (decl_Qt_FillRule_Enum, "QtCore", "FillRule");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_FillRule_Enums_as_child (decl_Qt_FillRule_Enums, "QtCore", "QFlags_FillRule");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_FillRule_Enum_as_child (decl_Qt_FillRule_Enum, "FillRule");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_FillRule_Enums_as_child (decl_Qt_FillRule_Enums, "QFlags_FillRule");
 
 }
 
@@ -140,8 +140,8 @@ static gsi::QFlagsClass<Qt::FocusPolicy > decl_Qt_FocusPolicy_Enums ("QtCore", "
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_FocusPolicy_Enum_in_parent (decl_Qt_FocusPolicy_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_FocusPolicy_Enum_as_child (decl_Qt_FocusPolicy_Enum, "QtCore", "FocusPolicy");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_FocusPolicy_Enums_as_child (decl_Qt_FocusPolicy_Enums, "QtCore", "QFlags_FocusPolicy");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_FocusPolicy_Enum_as_child (decl_Qt_FocusPolicy_Enum, "FocusPolicy");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_FocusPolicy_Enums_as_child (decl_Qt_FocusPolicy_Enums, "QFlags_FocusPolicy");
 
 }
 
@@ -167,8 +167,8 @@ static gsi::QFlagsClass<Qt::FocusReason > decl_Qt_FocusReason_Enums ("QtCore", "
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_FocusReason_Enum_in_parent (decl_Qt_FocusReason_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_FocusReason_Enum_as_child (decl_Qt_FocusReason_Enum, "QtCore", "FocusReason");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_FocusReason_Enums_as_child (decl_Qt_FocusReason_Enums, "QtCore", "QFlags_FocusReason");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_FocusReason_Enum_as_child (decl_Qt_FocusReason_Enum, "FocusReason");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_FocusReason_Enums_as_child (decl_Qt_FocusReason_Enums, "QFlags_FocusReason");
 
 }
 
@@ -187,8 +187,8 @@ static gsi::QFlagsClass<Qt::GestureFlag > decl_Qt_GestureFlag_Enums ("QtCore", "
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_GestureFlag_Enum_in_parent (decl_Qt_GestureFlag_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_GestureFlag_Enum_as_child (decl_Qt_GestureFlag_Enum, "QtCore", "GestureFlag");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_GestureFlag_Enums_as_child (decl_Qt_GestureFlag_Enums, "QtCore", "QFlags_GestureFlag");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_GestureFlag_Enum_as_child (decl_Qt_GestureFlag_Enum, "GestureFlag");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_GestureFlag_Enums_as_child (decl_Qt_GestureFlag_Enums, "QFlags_GestureFlag");
 
 }
 
@@ -210,8 +210,8 @@ static gsi::QFlagsClass<Qt::GestureState > decl_Qt_GestureState_Enums ("QtCore",
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_GestureState_Enum_in_parent (decl_Qt_GestureState_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_GestureState_Enum_as_child (decl_Qt_GestureState_Enum, "QtCore", "GestureState");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_GestureState_Enums_as_child (decl_Qt_GestureState_Enums, "QtCore", "QFlags_GestureState");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_GestureState_Enum_as_child (decl_Qt_GestureState_Enum, "GestureState");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_GestureState_Enums_as_child (decl_Qt_GestureState_Enums, "QFlags_GestureState");
 
 }
 
@@ -235,8 +235,8 @@ static gsi::QFlagsClass<Qt::GestureType > decl_Qt_GestureType_Enums ("QtCore", "
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_GestureType_Enum_in_parent (decl_Qt_GestureType_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_GestureType_Enum_as_child (decl_Qt_GestureType_Enum, "QtCore", "GestureType");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_GestureType_Enums_as_child (decl_Qt_GestureType_Enums, "QtCore", "QFlags_GestureType");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_GestureType_Enum_as_child (decl_Qt_GestureType_Enum, "GestureType");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_GestureType_Enums_as_child (decl_Qt_GestureType_Enums, "QFlags_GestureType");
 
 }
 
@@ -273,8 +273,8 @@ static gsi::QFlagsClass<Qt::GlobalColor > decl_Qt_GlobalColor_Enums ("QtCore", "
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_GlobalColor_Enum_in_parent (decl_Qt_GlobalColor_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_GlobalColor_Enum_as_child (decl_Qt_GlobalColor_Enum, "QtCore", "GlobalColor");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_GlobalColor_Enums_as_child (decl_Qt_GlobalColor_Enums, "QtCore", "QFlags_GlobalColor");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_GlobalColor_Enum_as_child (decl_Qt_GlobalColor_Enum, "GlobalColor");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_GlobalColor_Enums_as_child (decl_Qt_GlobalColor_Enums, "QFlags_GlobalColor");
 
 }
 
@@ -309,8 +309,8 @@ static gsi::QFlagsClass<Qt::ImageConversionFlag > decl_Qt_ImageConversionFlag_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_ImageConversionFlag_Enum_in_parent (decl_Qt_ImageConversionFlag_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ImageConversionFlag_Enum_as_child (decl_Qt_ImageConversionFlag_Enum, "QtCore", "ImageConversionFlag");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ImageConversionFlag_Enums_as_child (decl_Qt_ImageConversionFlag_Enums, "QtCore", "QFlags_ImageConversionFlag");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ImageConversionFlag_Enum_as_child (decl_Qt_ImageConversionFlag_Enum, "ImageConversionFlag");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ImageConversionFlag_Enums_as_child (decl_Qt_ImageConversionFlag_Enums, "QFlags_ImageConversionFlag");
 
 }
 
@@ -328,8 +328,8 @@ static gsi::QFlagsClass<Qt::Initialization > decl_Qt_Initialization_Enums ("QtCo
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_Initialization_Enum_in_parent (decl_Qt_Initialization_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_Initialization_Enum_as_child (decl_Qt_Initialization_Enum, "QtCore", "Initialization");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_Initialization_Enums_as_child (decl_Qt_Initialization_Enums, "QtCore", "QFlags_Initialization");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_Initialization_Enum_as_child (decl_Qt_Initialization_Enum, "Initialization");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_Initialization_Enums_as_child (decl_Qt_Initialization_Enums, "QFlags_Initialization");
 
 }
 
@@ -361,8 +361,8 @@ static gsi::QFlagsClass<Qt::InputMethodHint > decl_Qt_InputMethodHint_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_InputMethodHint_Enum_in_parent (decl_Qt_InputMethodHint_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_InputMethodHint_Enum_as_child (decl_Qt_InputMethodHint_Enum, "QtCore", "InputMethodHint");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_InputMethodHint_Enums_as_child (decl_Qt_InputMethodHint_Enums, "QtCore", "QFlags_InputMethodHint");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_InputMethodHint_Enum_as_child (decl_Qt_InputMethodHint_Enum, "InputMethodHint");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_InputMethodHint_Enums_as_child (decl_Qt_InputMethodHint_Enums, "QFlags_InputMethodHint");
 
 }
 
@@ -386,8 +386,8 @@ static gsi::QFlagsClass<Qt::InputMethodQuery > decl_Qt_InputMethodQuery_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_InputMethodQuery_Enum_in_parent (decl_Qt_InputMethodQuery_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_InputMethodQuery_Enum_as_child (decl_Qt_InputMethodQuery_Enum, "QtCore", "InputMethodQuery");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_InputMethodQuery_Enums_as_child (decl_Qt_InputMethodQuery_Enums, "QtCore", "QFlags_InputMethodQuery");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_InputMethodQuery_Enum_as_child (decl_Qt_InputMethodQuery_Enum, "InputMethodQuery");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_InputMethodQuery_Enums_as_child (decl_Qt_InputMethodQuery_Enums, "QFlags_InputMethodQuery");
 
 }
 
@@ -426,8 +426,8 @@ static gsi::QFlagsClass<Qt::ItemDataRole > decl_Qt_ItemDataRole_Enums ("QtCore",
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_ItemDataRole_Enum_in_parent (decl_Qt_ItemDataRole_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ItemDataRole_Enum_as_child (decl_Qt_ItemDataRole_Enum, "QtCore", "ItemDataRole");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ItemDataRole_Enums_as_child (decl_Qt_ItemDataRole_Enums, "QtCore", "QFlags_ItemDataRole");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ItemDataRole_Enum_as_child (decl_Qt_ItemDataRole_Enum, "ItemDataRole");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ItemDataRole_Enums_as_child (decl_Qt_ItemDataRole_Enums, "QFlags_ItemDataRole");
 
 }
 
@@ -452,8 +452,8 @@ static gsi::QFlagsClass<Qt::ItemFlag > decl_Qt_ItemFlag_Enums ("QtCore", "Qt_QFl
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_ItemFlag_Enum_in_parent (decl_Qt_ItemFlag_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ItemFlag_Enum_as_child (decl_Qt_ItemFlag_Enum, "QtCore", "ItemFlag");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ItemFlag_Enums_as_child (decl_Qt_ItemFlag_Enums, "QtCore", "QFlags_ItemFlag");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ItemFlag_Enum_as_child (decl_Qt_ItemFlag_Enum, "ItemFlag");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ItemFlag_Enums_as_child (decl_Qt_ItemFlag_Enums, "QFlags_ItemFlag");
 
 }
 
@@ -474,8 +474,8 @@ static gsi::QFlagsClass<Qt::ItemSelectionMode > decl_Qt_ItemSelectionMode_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_ItemSelectionMode_Enum_in_parent (decl_Qt_ItemSelectionMode_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ItemSelectionMode_Enum_as_child (decl_Qt_ItemSelectionMode_Enum, "QtCore", "ItemSelectionMode");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ItemSelectionMode_Enums_as_child (decl_Qt_ItemSelectionMode_Enums, "QtCore", "QFlags_ItemSelectionMode");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ItemSelectionMode_Enum_as_child (decl_Qt_ItemSelectionMode_Enum, "ItemSelectionMode");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ItemSelectionMode_Enums_as_child (decl_Qt_ItemSelectionMode_Enums, "QFlags_ItemSelectionMode");
 
 }
 
@@ -901,8 +901,8 @@ static gsi::QFlagsClass<Qt::Key > decl_Qt_Key_Enums ("QtCore", "Qt_QFlags_Key",
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_Key_Enum_in_parent (decl_Qt_Key_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_Key_Enum_as_child (decl_Qt_Key_Enum, "QtCore", "Key");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_Key_Enums_as_child (decl_Qt_Key_Enums, "QtCore", "QFlags_Key");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_Key_Enum_as_child (decl_Qt_Key_Enum, "Key");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_Key_Enums_as_child (decl_Qt_Key_Enums, "QFlags_Key");
 
 }
 
@@ -927,8 +927,8 @@ static gsi::QFlagsClass<Qt::KeyboardModifier > decl_Qt_KeyboardModifier_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_KeyboardModifier_Enum_in_parent (decl_Qt_KeyboardModifier_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_KeyboardModifier_Enum_as_child (decl_Qt_KeyboardModifier_Enum, "QtCore", "KeyboardModifier");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_KeyboardModifier_Enums_as_child (decl_Qt_KeyboardModifier_Enums, "QtCore", "QFlags_KeyboardModifier");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_KeyboardModifier_Enum_as_child (decl_Qt_KeyboardModifier_Enum, "KeyboardModifier");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_KeyboardModifier_Enums_as_child (decl_Qt_KeyboardModifier_Enums, "QFlags_KeyboardModifier");
 
 }
 
@@ -947,8 +947,8 @@ static gsi::QFlagsClass<Qt::LayoutDirection > decl_Qt_LayoutDirection_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_LayoutDirection_Enum_in_parent (decl_Qt_LayoutDirection_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_LayoutDirection_Enum_as_child (decl_Qt_LayoutDirection_Enum, "QtCore", "LayoutDirection");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_LayoutDirection_Enums_as_child (decl_Qt_LayoutDirection_Enums, "QtCore", "QFlags_LayoutDirection");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_LayoutDirection_Enum_as_child (decl_Qt_LayoutDirection_Enum, "LayoutDirection");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_LayoutDirection_Enums_as_child (decl_Qt_LayoutDirection_Enums, "QFlags_LayoutDirection");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQt_2.cc b/src/gsiqt/qt4/QtCore/gsiDeclQt_2.cc
index 6e29e0852..2df193044 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQt_2.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQt_2.cc
@@ -53,8 +53,8 @@ static gsi::QFlagsClass<Qt::MaskMode > decl_Qt_MaskMode_Enums ("QtCore", "Qt_QFl
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_MaskMode_Enum_in_parent (decl_Qt_MaskMode_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_MaskMode_Enum_as_child (decl_Qt_MaskMode_Enum, "QtCore", "MaskMode");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_MaskMode_Enums_as_child (decl_Qt_MaskMode_Enums, "QtCore", "QFlags_MaskMode");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_MaskMode_Enum_as_child (decl_Qt_MaskMode_Enum, "MaskMode");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_MaskMode_Enums_as_child (decl_Qt_MaskMode_Enums, "QFlags_MaskMode");
 
 }
 
@@ -81,8 +81,8 @@ static gsi::QFlagsClass<Qt::MatchFlag > decl_Qt_MatchFlag_Enums ("QtCore", "Qt_Q
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_MatchFlag_Enum_in_parent (decl_Qt_MatchFlag_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_MatchFlag_Enum_as_child (decl_Qt_MatchFlag_Enum, "QtCore", "MatchFlag");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_MatchFlag_Enums_as_child (decl_Qt_MatchFlag_Enums, "QtCore", "QFlags_MatchFlag");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_MatchFlag_Enum_as_child (decl_Qt_MatchFlag_Enum, "MatchFlag");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_MatchFlag_Enums_as_child (decl_Qt_MatchFlag_Enums, "QFlags_MatchFlag");
 
 }
 
@@ -105,8 +105,8 @@ static gsi::QFlagsClass<Qt::Modifier > decl_Qt_Modifier_Enums ("QtCore", "Qt_QFl
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_Modifier_Enum_in_parent (decl_Qt_Modifier_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_Modifier_Enum_as_child (decl_Qt_Modifier_Enum, "QtCore", "Modifier");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_Modifier_Enums_as_child (decl_Qt_Modifier_Enums, "QtCore", "QFlags_Modifier");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_Modifier_Enum_as_child (decl_Qt_Modifier_Enum, "Modifier");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_Modifier_Enums_as_child (decl_Qt_Modifier_Enums, "QFlags_Modifier");
 
 }
 
@@ -130,8 +130,8 @@ static gsi::QFlagsClass<Qt::MouseButton > decl_Qt_MouseButton_Enums ("QtCore", "
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_MouseButton_Enum_in_parent (decl_Qt_MouseButton_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_MouseButton_Enum_as_child (decl_Qt_MouseButton_Enum, "QtCore", "MouseButton");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_MouseButton_Enums_as_child (decl_Qt_MouseButton_Enums, "QtCore", "QFlags_MouseButton");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_MouseButton_Enum_as_child (decl_Qt_MouseButton_Enum, "MouseButton");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_MouseButton_Enums_as_child (decl_Qt_MouseButton_Enums, "QFlags_MouseButton");
 
 }
 
@@ -153,8 +153,8 @@ static gsi::QFlagsClass<Qt::NavigationMode > decl_Qt_NavigationMode_Enums ("QtCo
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_NavigationMode_Enum_in_parent (decl_Qt_NavigationMode_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_NavigationMode_Enum_as_child (decl_Qt_NavigationMode_Enum, "QtCore", "NavigationMode");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_NavigationMode_Enums_as_child (decl_Qt_NavigationMode_Enums, "QtCore", "QFlags_NavigationMode");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_NavigationMode_Enum_as_child (decl_Qt_NavigationMode_Enum, "NavigationMode");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_NavigationMode_Enums_as_child (decl_Qt_NavigationMode_Enums, "QFlags_NavigationMode");
 
 }
 
@@ -173,8 +173,8 @@ static gsi::QFlagsClass<Qt::Orientation > decl_Qt_Orientation_Enums ("QtCore", "
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_Orientation_Enum_in_parent (decl_Qt_Orientation_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_Orientation_Enum_as_child (decl_Qt_Orientation_Enum, "QtCore", "Orientation");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_Orientation_Enums_as_child (decl_Qt_Orientation_Enums, "QtCore", "QFlags_Orientation");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_Orientation_Enum_as_child (decl_Qt_Orientation_Enum, "Orientation");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_Orientation_Enums_as_child (decl_Qt_Orientation_Enums, "QFlags_Orientation");
 
 }
 
@@ -195,8 +195,8 @@ static gsi::QFlagsClass<Qt::PenCapStyle > decl_Qt_PenCapStyle_Enums ("QtCore", "
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_PenCapStyle_Enum_in_parent (decl_Qt_PenCapStyle_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_PenCapStyle_Enum_as_child (decl_Qt_PenCapStyle_Enum, "QtCore", "PenCapStyle");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_PenCapStyle_Enums_as_child (decl_Qt_PenCapStyle_Enums, "QtCore", "QFlags_PenCapStyle");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_PenCapStyle_Enum_as_child (decl_Qt_PenCapStyle_Enum, "PenCapStyle");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_PenCapStyle_Enums_as_child (decl_Qt_PenCapStyle_Enums, "QFlags_PenCapStyle");
 
 }
 
@@ -218,8 +218,8 @@ static gsi::QFlagsClass<Qt::PenJoinStyle > decl_Qt_PenJoinStyle_Enums ("QtCore",
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_PenJoinStyle_Enum_in_parent (decl_Qt_PenJoinStyle_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_PenJoinStyle_Enum_as_child (decl_Qt_PenJoinStyle_Enum, "QtCore", "PenJoinStyle");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_PenJoinStyle_Enums_as_child (decl_Qt_PenJoinStyle_Enums, "QtCore", "QFlags_PenJoinStyle");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_PenJoinStyle_Enum_as_child (decl_Qt_PenJoinStyle_Enum, "PenJoinStyle");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_PenJoinStyle_Enums_as_child (decl_Qt_PenJoinStyle_Enums, "QFlags_PenJoinStyle");
 
 }
 
@@ -244,8 +244,8 @@ static gsi::QFlagsClass<Qt::PenStyle > decl_Qt_PenStyle_Enums ("QtCore", "Qt_QFl
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_PenStyle_Enum_in_parent (decl_Qt_PenStyle_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_PenStyle_Enum_as_child (decl_Qt_PenStyle_Enum, "QtCore", "PenStyle");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_PenStyle_Enums_as_child (decl_Qt_PenStyle_Enums, "QtCore", "QFlags_PenStyle");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_PenStyle_Enum_as_child (decl_Qt_PenStyle_Enum, "PenStyle");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_PenStyle_Enums_as_child (decl_Qt_PenStyle_Enums, "QFlags_PenStyle");
 
 }
 
@@ -265,8 +265,8 @@ static gsi::QFlagsClass<Qt::ScrollBarPolicy > decl_Qt_ScrollBarPolicy_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_ScrollBarPolicy_Enum_in_parent (decl_Qt_ScrollBarPolicy_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ScrollBarPolicy_Enum_as_child (decl_Qt_ScrollBarPolicy_Enum, "QtCore", "ScrollBarPolicy");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ScrollBarPolicy_Enums_as_child (decl_Qt_ScrollBarPolicy_Enums, "QtCore", "QFlags_ScrollBarPolicy");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ScrollBarPolicy_Enum_as_child (decl_Qt_ScrollBarPolicy_Enum, "ScrollBarPolicy");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ScrollBarPolicy_Enums_as_child (decl_Qt_ScrollBarPolicy_Enums, "QFlags_ScrollBarPolicy");
 
 }
 
@@ -287,8 +287,8 @@ static gsi::QFlagsClass<Qt::ShortcutContext > decl_Qt_ShortcutContext_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_ShortcutContext_Enum_in_parent (decl_Qt_ShortcutContext_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ShortcutContext_Enum_as_child (decl_Qt_ShortcutContext_Enum, "QtCore", "ShortcutContext");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ShortcutContext_Enums_as_child (decl_Qt_ShortcutContext_Enums, "QtCore", "QFlags_ShortcutContext");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ShortcutContext_Enum_as_child (decl_Qt_ShortcutContext_Enum, "ShortcutContext");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ShortcutContext_Enums_as_child (decl_Qt_ShortcutContext_Enums, "QFlags_ShortcutContext");
 
 }
 
@@ -310,8 +310,8 @@ static gsi::QFlagsClass<Qt::SizeHint > decl_Qt_SizeHint_Enums ("QtCore", "Qt_QFl
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_SizeHint_Enum_in_parent (decl_Qt_SizeHint_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_SizeHint_Enum_as_child (decl_Qt_SizeHint_Enum, "QtCore", "SizeHint");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_SizeHint_Enums_as_child (decl_Qt_SizeHint_Enums, "QtCore", "QFlags_SizeHint");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_SizeHint_Enum_as_child (decl_Qt_SizeHint_Enum, "SizeHint");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_SizeHint_Enums_as_child (decl_Qt_SizeHint_Enums, "QFlags_SizeHint");
 
 }
 
@@ -330,8 +330,8 @@ static gsi::QFlagsClass<Qt::SizeMode > decl_Qt_SizeMode_Enums ("QtCore", "Qt_QFl
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_SizeMode_Enum_in_parent (decl_Qt_SizeMode_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_SizeMode_Enum_as_child (decl_Qt_SizeMode_Enum, "QtCore", "SizeMode");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_SizeMode_Enums_as_child (decl_Qt_SizeMode_Enums, "QtCore", "QFlags_SizeMode");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_SizeMode_Enum_as_child (decl_Qt_SizeMode_Enum, "SizeMode");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_SizeMode_Enums_as_child (decl_Qt_SizeMode_Enums, "QFlags_SizeMode");
 
 }
 
@@ -350,8 +350,8 @@ static gsi::QFlagsClass<Qt::SortOrder > decl_Qt_SortOrder_Enums ("QtCore", "Qt_Q
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_SortOrder_Enum_in_parent (decl_Qt_SortOrder_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_SortOrder_Enum_as_child (decl_Qt_SortOrder_Enum, "QtCore", "SortOrder");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_SortOrder_Enums_as_child (decl_Qt_SortOrder_Enums, "QtCore", "QFlags_SortOrder");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_SortOrder_Enum_as_child (decl_Qt_SortOrder_Enum, "SortOrder");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_SortOrder_Enums_as_child (decl_Qt_SortOrder_Enums, "QFlags_SortOrder");
 
 }
 
@@ -372,8 +372,8 @@ static gsi::QFlagsClass<Qt::TextElideMode > decl_Qt_TextElideMode_Enums ("QtCore
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_TextElideMode_Enum_in_parent (decl_Qt_TextElideMode_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_TextElideMode_Enum_as_child (decl_Qt_TextElideMode_Enum, "QtCore", "TextElideMode");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_TextElideMode_Enums_as_child (decl_Qt_TextElideMode_Enums, "QtCore", "QFlags_TextElideMode");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_TextElideMode_Enum_as_child (decl_Qt_TextElideMode_Enum, "TextElideMode");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_TextElideMode_Enums_as_child (decl_Qt_TextElideMode_Enums, "QFlags_TextElideMode");
 
 }
 
@@ -403,8 +403,8 @@ static gsi::QFlagsClass<Qt::TextFlag > decl_Qt_TextFlag_Enums ("QtCore", "Qt_QFl
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_TextFlag_Enum_in_parent (decl_Qt_TextFlag_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_TextFlag_Enum_as_child (decl_Qt_TextFlag_Enum, "QtCore", "TextFlag");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_TextFlag_Enums_as_child (decl_Qt_TextFlag_Enums, "QtCore", "QFlags_TextFlag");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_TextFlag_Enum_as_child (decl_Qt_TextFlag_Enum, "TextFlag");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_TextFlag_Enums_as_child (decl_Qt_TextFlag_Enums, "QFlags_TextFlag");
 
 }
 
@@ -425,8 +425,8 @@ static gsi::QFlagsClass<Qt::TextFormat > decl_Qt_TextFormat_Enums ("QtCore", "Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_TextFormat_Enum_in_parent (decl_Qt_TextFormat_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_TextFormat_Enum_as_child (decl_Qt_TextFormat_Enum, "QtCore", "TextFormat");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_TextFormat_Enums_as_child (decl_Qt_TextFormat_Enums, "QtCore", "QFlags_TextFormat");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_TextFormat_Enum_as_child (decl_Qt_TextFormat_Enum, "TextFormat");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_TextFormat_Enums_as_child (decl_Qt_TextFormat_Enums, "QFlags_TextFormat");
 
 }
 
@@ -451,8 +451,8 @@ static gsi::QFlagsClass<Qt::TextInteractionFlag > decl_Qt_TextInteractionFlag_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_TextInteractionFlag_Enum_in_parent (decl_Qt_TextInteractionFlag_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_TextInteractionFlag_Enum_as_child (decl_Qt_TextInteractionFlag_Enum, "QtCore", "TextInteractionFlag");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_TextInteractionFlag_Enums_as_child (decl_Qt_TextInteractionFlag_Enums, "QtCore", "QFlags_TextInteractionFlag");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_TextInteractionFlag_Enum_as_child (decl_Qt_TextInteractionFlag_Enum, "TextInteractionFlag");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_TextInteractionFlag_Enums_as_child (decl_Qt_TextInteractionFlag_Enums, "QFlags_TextInteractionFlag");
 
 }
 
@@ -472,8 +472,8 @@ static gsi::QFlagsClass<Qt::TileRule > decl_Qt_TileRule_Enums ("QtCore", "Qt_QFl
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_TileRule_Enum_in_parent (decl_Qt_TileRule_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_TileRule_Enum_as_child (decl_Qt_TileRule_Enum, "QtCore", "TileRule");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_TileRule_Enums_as_child (decl_Qt_TileRule_Enums, "QtCore", "QFlags_TileRule");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_TileRule_Enum_as_child (decl_Qt_TileRule_Enum, "TileRule");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_TileRule_Enums_as_child (decl_Qt_TileRule_Enums, "QFlags_TileRule");
 
 }
 
@@ -493,8 +493,8 @@ static gsi::QFlagsClass<Qt::TimeSpec > decl_Qt_TimeSpec_Enums ("QtCore", "Qt_QFl
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_TimeSpec_Enum_in_parent (decl_Qt_TimeSpec_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_TimeSpec_Enum_as_child (decl_Qt_TimeSpec_Enum, "QtCore", "TimeSpec");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_TimeSpec_Enums_as_child (decl_Qt_TimeSpec_Enums, "QtCore", "QFlags_TimeSpec");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_TimeSpec_Enum_as_child (decl_Qt_TimeSpec_Enum, "TimeSpec");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_TimeSpec_Enums_as_child (decl_Qt_TimeSpec_Enums, "QFlags_TimeSpec");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQt_3.cc b/src/gsiqt/qt4/QtCore/gsiDeclQt_3.cc
index e389a5dc4..f4461b24d 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQt_3.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQt_3.cc
@@ -58,8 +58,8 @@ static gsi::QFlagsClass<Qt::ToolBarArea > decl_Qt_ToolBarArea_Enums ("QtCore", "
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_ToolBarArea_Enum_in_parent (decl_Qt_ToolBarArea_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ToolBarArea_Enum_as_child (decl_Qt_ToolBarArea_Enum, "QtCore", "ToolBarArea");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ToolBarArea_Enums_as_child (decl_Qt_ToolBarArea_Enums, "QtCore", "QFlags_ToolBarArea");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ToolBarArea_Enum_as_child (decl_Qt_ToolBarArea_Enum, "ToolBarArea");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ToolBarArea_Enums_as_child (decl_Qt_ToolBarArea_Enums, "QFlags_ToolBarArea");
 
 }
 
@@ -77,8 +77,8 @@ static gsi::QFlagsClass<Qt::ToolBarAreaSizes > decl_Qt_ToolBarAreaSizes_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_ToolBarAreaSizes_Enum_in_parent (decl_Qt_ToolBarAreaSizes_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ToolBarAreaSizes_Enum_as_child (decl_Qt_ToolBarAreaSizes_Enum, "QtCore", "ToolBarAreaSizes");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ToolBarAreaSizes_Enums_as_child (decl_Qt_ToolBarAreaSizes_Enums, "QtCore", "QFlags_ToolBarAreaSizes");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ToolBarAreaSizes_Enum_as_child (decl_Qt_ToolBarAreaSizes_Enum, "ToolBarAreaSizes");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ToolBarAreaSizes_Enums_as_child (decl_Qt_ToolBarAreaSizes_Enums, "QFlags_ToolBarAreaSizes");
 
 }
 
@@ -100,8 +100,8 @@ static gsi::QFlagsClass<Qt::ToolButtonStyle > decl_Qt_ToolButtonStyle_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_ToolButtonStyle_Enum_in_parent (decl_Qt_ToolButtonStyle_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ToolButtonStyle_Enum_as_child (decl_Qt_ToolButtonStyle_Enum, "QtCore", "ToolButtonStyle");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_ToolButtonStyle_Enums_as_child (decl_Qt_ToolButtonStyle_Enums, "QtCore", "QFlags_ToolButtonStyle");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ToolButtonStyle_Enum_as_child (decl_Qt_ToolButtonStyle_Enum, "ToolButtonStyle");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_ToolButtonStyle_Enums_as_child (decl_Qt_ToolButtonStyle_Enums, "QFlags_ToolButtonStyle");
 
 }
 
@@ -124,8 +124,8 @@ static gsi::QFlagsClass<Qt::TouchPointState > decl_Qt_TouchPointState_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_TouchPointState_Enum_in_parent (decl_Qt_TouchPointState_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_TouchPointState_Enum_as_child (decl_Qt_TouchPointState_Enum, "QtCore", "TouchPointState");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_TouchPointState_Enums_as_child (decl_Qt_TouchPointState_Enums, "QtCore", "QFlags_TouchPointState");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_TouchPointState_Enum_as_child (decl_Qt_TouchPointState_Enum, "TouchPointState");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_TouchPointState_Enums_as_child (decl_Qt_TouchPointState_Enums, "QFlags_TouchPointState");
 
 }
 
@@ -144,8 +144,8 @@ static gsi::QFlagsClass<Qt::TransformationMode > decl_Qt_TransformationMode_Enum
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_TransformationMode_Enum_in_parent (decl_Qt_TransformationMode_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_TransformationMode_Enum_as_child (decl_Qt_TransformationMode_Enum, "QtCore", "TransformationMode");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_TransformationMode_Enums_as_child (decl_Qt_TransformationMode_Enums, "QtCore", "QFlags_TransformationMode");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_TransformationMode_Enum_as_child (decl_Qt_TransformationMode_Enum, "TransformationMode");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_TransformationMode_Enums_as_child (decl_Qt_TransformationMode_Enums, "QFlags_TransformationMode");
 
 }
 
@@ -169,8 +169,8 @@ static gsi::QFlagsClass<Qt::UIEffect > decl_Qt_UIEffect_Enums ("QtCore", "Qt_QFl
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_UIEffect_Enum_in_parent (decl_Qt_UIEffect_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_UIEffect_Enum_as_child (decl_Qt_UIEffect_Enum, "QtCore", "UIEffect");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_UIEffect_Enums_as_child (decl_Qt_UIEffect_Enums, "QtCore", "QFlags_UIEffect");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_UIEffect_Enum_as_child (decl_Qt_UIEffect_Enum, "UIEffect");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_UIEffect_Enums_as_child (decl_Qt_UIEffect_Enums, "QFlags_UIEffect");
 
 }
 
@@ -299,8 +299,8 @@ static gsi::QFlagsClass<Qt::WidgetAttribute > decl_Qt_WidgetAttribute_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_WidgetAttribute_Enum_in_parent (decl_Qt_WidgetAttribute_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_WidgetAttribute_Enum_as_child (decl_Qt_WidgetAttribute_Enum, "QtCore", "WidgetAttribute");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_WidgetAttribute_Enums_as_child (decl_Qt_WidgetAttribute_Enums, "QtCore", "QFlags_WidgetAttribute");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_WidgetAttribute_Enum_as_child (decl_Qt_WidgetAttribute_Enum, "WidgetAttribute");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_WidgetAttribute_Enums_as_child (decl_Qt_WidgetAttribute_Enums, "QFlags_WidgetAttribute");
 
 }
 
@@ -327,8 +327,8 @@ static gsi::QFlagsClass<Qt::WindowFrameSection > decl_Qt_WindowFrameSection_Enum
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_WindowFrameSection_Enum_in_parent (decl_Qt_WindowFrameSection_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_WindowFrameSection_Enum_as_child (decl_Qt_WindowFrameSection_Enum, "QtCore", "WindowFrameSection");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_WindowFrameSection_Enums_as_child (decl_Qt_WindowFrameSection_Enums, "QtCore", "QFlags_WindowFrameSection");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_WindowFrameSection_Enum_as_child (decl_Qt_WindowFrameSection_Enum, "WindowFrameSection");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_WindowFrameSection_Enums_as_child (decl_Qt_WindowFrameSection_Enums, "QFlags_WindowFrameSection");
 
 }
 
@@ -348,8 +348,8 @@ static gsi::QFlagsClass<Qt::WindowModality > decl_Qt_WindowModality_Enums ("QtCo
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_WindowModality_Enum_in_parent (decl_Qt_WindowModality_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_WindowModality_Enum_as_child (decl_Qt_WindowModality_Enum, "QtCore", "WindowModality");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_WindowModality_Enums_as_child (decl_Qt_WindowModality_Enums, "QtCore", "QFlags_WindowModality");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_WindowModality_Enum_as_child (decl_Qt_WindowModality_Enum, "WindowModality");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_WindowModality_Enums_as_child (decl_Qt_WindowModality_Enums, "QFlags_WindowModality");
 
 }
 
@@ -371,8 +371,8 @@ static gsi::QFlagsClass<Qt::WindowState > decl_Qt_WindowState_Enums ("QtCore", "
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_WindowState_Enum_in_parent (decl_Qt_WindowState_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_WindowState_Enum_as_child (decl_Qt_WindowState_Enum, "QtCore", "WindowState");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_WindowState_Enums_as_child (decl_Qt_WindowState_Enums, "QtCore", "QFlags_WindowState");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_WindowState_Enum_as_child (decl_Qt_WindowState_Enum, "WindowState");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_WindowState_Enums_as_child (decl_Qt_WindowState_Enums, "QFlags_WindowState");
 
 }
 
@@ -418,8 +418,8 @@ static gsi::QFlagsClass<Qt::WindowType > decl_Qt_WindowType_Enums ("QtCore", "Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<Qt_Namespace> inject_Qt_WindowType_Enum_in_parent (decl_Qt_WindowType_Enum.defs ());
-static gsi::ClassExt<Qt_Namespace> decl_Qt_WindowType_Enum_as_child (decl_Qt_WindowType_Enum, "QtCore", "WindowType");
-static gsi::ClassExt<Qt_Namespace> decl_Qt_WindowType_Enums_as_child (decl_Qt_WindowType_Enums, "QtCore", "QFlags_WindowType");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_WindowType_Enum_as_child (decl_Qt_WindowType_Enum, "WindowType");
+static gsi::ClassExt<Qt_Namespace> decl_Qt_WindowType_Enums_as_child (decl_Qt_WindowType_Enums, "QFlags_WindowType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtCore/gsiQtExternals.h b/src/gsiqt/qt4/QtCore/gsiQtExternals.h
index 25745f8f1..0a84e8d8d 100644
--- a/src/gsiqt/qt4/QtCore/gsiQtExternals.h
+++ b/src/gsiqt/qt4/QtCore/gsiQtExternals.h
@@ -30,7 +30,7 @@
 #if !defined(HDR_gsiQtCoreExternals)
 #define HDR_gsiQtCoreExternals
 
-#include "gsiClassBase.h"
+#include "gsiClass.h"
 #include "gsiQtCoreCommon.h"
 
 class QAbstractItemModel;
diff --git a/src/gsiqt/qt4/QtDesigner/gsiQtExternals.h b/src/gsiqt/qt4/QtDesigner/gsiQtExternals.h
index 2ded53743..57bef5200 100644
--- a/src/gsiqt/qt4/QtDesigner/gsiQtExternals.h
+++ b/src/gsiqt/qt4/QtDesigner/gsiQtExternals.h
@@ -30,7 +30,7 @@
 #if !defined(HDR_gsiQtDesignerExternals)
 #define HDR_gsiQtDesignerExternals
 
-#include "gsiClassBase.h"
+#include "gsiClass.h"
 #include "gsiQtDesignerCommon.h"
 
 class QAbstractFormBuilder;
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQAbstractItemDelegate.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractItemDelegate.cc
index ede206aa2..e91c8052a 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQAbstractItemDelegate.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractItemDelegate.cc
@@ -1236,8 +1236,8 @@ static gsi::QFlagsClass<QAbstractItemDelegate::EndEditHint > decl_QAbstractItemD
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractItemDelegate> inject_QAbstractItemDelegate_EndEditHint_Enum_in_parent (decl_QAbstractItemDelegate_EndEditHint_Enum.defs ());
-static gsi::ClassExt<QAbstractItemDelegate> decl_QAbstractItemDelegate_EndEditHint_Enum_as_child (decl_QAbstractItemDelegate_EndEditHint_Enum, "QtGui", "EndEditHint");
-static gsi::ClassExt<QAbstractItemDelegate> decl_QAbstractItemDelegate_EndEditHint_Enums_as_child (decl_QAbstractItemDelegate_EndEditHint_Enums, "QtGui", "QFlags_EndEditHint");
+static gsi::ClassExt<QAbstractItemDelegate> decl_QAbstractItemDelegate_EndEditHint_Enum_as_child (decl_QAbstractItemDelegate_EndEditHint_Enum, "EndEditHint");
+static gsi::ClassExt<QAbstractItemDelegate> decl_QAbstractItemDelegate_EndEditHint_Enums_as_child (decl_QAbstractItemDelegate_EndEditHint_Enums, "QFlags_EndEditHint");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQAbstractItemView.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractItemView.cc
index 56fa54d23..904f015ee 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQAbstractItemView.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractItemView.cc
@@ -6020,8 +6020,8 @@ static gsi::QFlagsClass<QAbstractItemView::DragDropMode > decl_QAbstractItemView
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractItemView> inject_QAbstractItemView_DragDropMode_Enum_in_parent (decl_QAbstractItemView_DragDropMode_Enum.defs ());
-static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_DragDropMode_Enum_as_child (decl_QAbstractItemView_DragDropMode_Enum, "QtGui", "DragDropMode");
-static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_DragDropMode_Enums_as_child (decl_QAbstractItemView_DragDropMode_Enums, "QtGui", "QFlags_DragDropMode");
+static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_DragDropMode_Enum_as_child (decl_QAbstractItemView_DragDropMode_Enum, "DragDropMode");
+static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_DragDropMode_Enums_as_child (decl_QAbstractItemView_DragDropMode_Enums, "QFlags_DragDropMode");
 
 }
 
@@ -6045,8 +6045,8 @@ static gsi::QFlagsClass<QAbstractItemView::EditTrigger > decl_QAbstractItemView_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractItemView> inject_QAbstractItemView_EditTrigger_Enum_in_parent (decl_QAbstractItemView_EditTrigger_Enum.defs ());
-static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_EditTrigger_Enum_as_child (decl_QAbstractItemView_EditTrigger_Enum, "QtGui", "EditTrigger");
-static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_EditTrigger_Enums_as_child (decl_QAbstractItemView_EditTrigger_Enums, "QtGui", "QFlags_EditTrigger");
+static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_EditTrigger_Enum_as_child (decl_QAbstractItemView_EditTrigger_Enum, "EditTrigger");
+static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_EditTrigger_Enums_as_child (decl_QAbstractItemView_EditTrigger_Enums, "QFlags_EditTrigger");
 
 }
 
@@ -6067,8 +6067,8 @@ static gsi::QFlagsClass<QAbstractItemView::ScrollHint > decl_QAbstractItemView_S
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractItemView> inject_QAbstractItemView_ScrollHint_Enum_in_parent (decl_QAbstractItemView_ScrollHint_Enum.defs ());
-static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_ScrollHint_Enum_as_child (decl_QAbstractItemView_ScrollHint_Enum, "QtGui", "ScrollHint");
-static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_ScrollHint_Enums_as_child (decl_QAbstractItemView_ScrollHint_Enums, "QtGui", "QFlags_ScrollHint");
+static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_ScrollHint_Enum_as_child (decl_QAbstractItemView_ScrollHint_Enum, "ScrollHint");
+static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_ScrollHint_Enums_as_child (decl_QAbstractItemView_ScrollHint_Enums, "QFlags_ScrollHint");
 
 }
 
@@ -6087,8 +6087,8 @@ static gsi::QFlagsClass<QAbstractItemView::ScrollMode > decl_QAbstractItemView_S
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractItemView> inject_QAbstractItemView_ScrollMode_Enum_in_parent (decl_QAbstractItemView_ScrollMode_Enum.defs ());
-static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_ScrollMode_Enum_as_child (decl_QAbstractItemView_ScrollMode_Enum, "QtGui", "ScrollMode");
-static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_ScrollMode_Enums_as_child (decl_QAbstractItemView_ScrollMode_Enums, "QtGui", "QFlags_ScrollMode");
+static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_ScrollMode_Enum_as_child (decl_QAbstractItemView_ScrollMode_Enum, "ScrollMode");
+static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_ScrollMode_Enums_as_child (decl_QAbstractItemView_ScrollMode_Enums, "QFlags_ScrollMode");
 
 }
 
@@ -6108,8 +6108,8 @@ static gsi::QFlagsClass<QAbstractItemView::SelectionBehavior > decl_QAbstractIte
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractItemView> inject_QAbstractItemView_SelectionBehavior_Enum_in_parent (decl_QAbstractItemView_SelectionBehavior_Enum.defs ());
-static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_SelectionBehavior_Enum_as_child (decl_QAbstractItemView_SelectionBehavior_Enum, "QtGui", "SelectionBehavior");
-static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_SelectionBehavior_Enums_as_child (decl_QAbstractItemView_SelectionBehavior_Enums, "QtGui", "QFlags_SelectionBehavior");
+static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_SelectionBehavior_Enum_as_child (decl_QAbstractItemView_SelectionBehavior_Enum, "SelectionBehavior");
+static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_SelectionBehavior_Enums_as_child (decl_QAbstractItemView_SelectionBehavior_Enums, "QFlags_SelectionBehavior");
 
 }
 
@@ -6131,8 +6131,8 @@ static gsi::QFlagsClass<QAbstractItemView::SelectionMode > decl_QAbstractItemVie
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractItemView> inject_QAbstractItemView_SelectionMode_Enum_in_parent (decl_QAbstractItemView_SelectionMode_Enum.defs ());
-static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_SelectionMode_Enum_as_child (decl_QAbstractItemView_SelectionMode_Enum, "QtGui", "SelectionMode");
-static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_SelectionMode_Enums_as_child (decl_QAbstractItemView_SelectionMode_Enums, "QtGui", "QFlags_SelectionMode");
+static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_SelectionMode_Enum_as_child (decl_QAbstractItemView_SelectionMode_Enum, "SelectionMode");
+static gsi::ClassExt<QAbstractItemView> decl_QAbstractItemView_SelectionMode_Enums_as_child (decl_QAbstractItemView_SelectionMode_Enums, "QFlags_SelectionMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQAbstractPrintDialog.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractPrintDialog.cc
index d19759f92..c604a56de 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQAbstractPrintDialog.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractPrintDialog.cc
@@ -2973,8 +2973,8 @@ static gsi::QFlagsClass<QAbstractPrintDialog::PrintDialogOption > decl_QAbstract
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractPrintDialog> inject_QAbstractPrintDialog_PrintDialogOption_Enum_in_parent (decl_QAbstractPrintDialog_PrintDialogOption_Enum.defs ());
-static gsi::ClassExt<QAbstractPrintDialog> decl_QAbstractPrintDialog_PrintDialogOption_Enum_as_child (decl_QAbstractPrintDialog_PrintDialogOption_Enum, "QtGui", "PrintDialogOption");
-static gsi::ClassExt<QAbstractPrintDialog> decl_QAbstractPrintDialog_PrintDialogOption_Enums_as_child (decl_QAbstractPrintDialog_PrintDialogOption_Enums, "QtGui", "QFlags_PrintDialogOption");
+static gsi::ClassExt<QAbstractPrintDialog> decl_QAbstractPrintDialog_PrintDialogOption_Enum_as_child (decl_QAbstractPrintDialog_PrintDialogOption_Enum, "PrintDialogOption");
+static gsi::ClassExt<QAbstractPrintDialog> decl_QAbstractPrintDialog_PrintDialogOption_Enums_as_child (decl_QAbstractPrintDialog_PrintDialogOption_Enums, "QFlags_PrintDialogOption");
 
 }
 
@@ -2994,8 +2994,8 @@ static gsi::QFlagsClass<QAbstractPrintDialog::PrintRange > decl_QAbstractPrintDi
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractPrintDialog> inject_QAbstractPrintDialog_PrintRange_Enum_in_parent (decl_QAbstractPrintDialog_PrintRange_Enum.defs ());
-static gsi::ClassExt<QAbstractPrintDialog> decl_QAbstractPrintDialog_PrintRange_Enum_as_child (decl_QAbstractPrintDialog_PrintRange_Enum, "QtGui", "PrintRange");
-static gsi::ClassExt<QAbstractPrintDialog> decl_QAbstractPrintDialog_PrintRange_Enums_as_child (decl_QAbstractPrintDialog_PrintRange_Enums, "QtGui", "QFlags_PrintRange");
+static gsi::ClassExt<QAbstractPrintDialog> decl_QAbstractPrintDialog_PrintRange_Enum_as_child (decl_QAbstractPrintDialog_PrintRange_Enum, "PrintRange");
+static gsi::ClassExt<QAbstractPrintDialog> decl_QAbstractPrintDialog_PrintRange_Enums_as_child (decl_QAbstractPrintDialog_PrintRange_Enums, "QFlags_PrintRange");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQAbstractSlider.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractSlider.cc
index 97549f22c..e82c3bc41 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQAbstractSlider.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractSlider.cc
@@ -3136,8 +3136,8 @@ static gsi::QFlagsClass<QAbstractSlider::SliderAction > decl_QAbstractSlider_Sli
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractSlider> inject_QAbstractSlider_SliderAction_Enum_in_parent (decl_QAbstractSlider_SliderAction_Enum.defs ());
-static gsi::ClassExt<QAbstractSlider> decl_QAbstractSlider_SliderAction_Enum_as_child (decl_QAbstractSlider_SliderAction_Enum, "QtGui", "SliderAction");
-static gsi::ClassExt<QAbstractSlider> decl_QAbstractSlider_SliderAction_Enums_as_child (decl_QAbstractSlider_SliderAction_Enums, "QtGui", "QFlags_SliderAction");
+static gsi::ClassExt<QAbstractSlider> decl_QAbstractSlider_SliderAction_Enum_as_child (decl_QAbstractSlider_SliderAction_Enum, "SliderAction");
+static gsi::ClassExt<QAbstractSlider> decl_QAbstractSlider_SliderAction_Enums_as_child (decl_QAbstractSlider_SliderAction_Enums, "QFlags_SliderAction");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQAbstractSpinBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractSpinBox.cc
index 8662518c7..c09ecb456 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQAbstractSpinBox.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractSpinBox.cc
@@ -3319,8 +3319,8 @@ static gsi::QFlagsClass<QAbstractSpinBox::ButtonSymbols > decl_QAbstractSpinBox_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractSpinBox> inject_QAbstractSpinBox_ButtonSymbols_Enum_in_parent (decl_QAbstractSpinBox_ButtonSymbols_Enum.defs ());
-static gsi::ClassExt<QAbstractSpinBox> decl_QAbstractSpinBox_ButtonSymbols_Enum_as_child (decl_QAbstractSpinBox_ButtonSymbols_Enum, "QtGui", "ButtonSymbols");
-static gsi::ClassExt<QAbstractSpinBox> decl_QAbstractSpinBox_ButtonSymbols_Enums_as_child (decl_QAbstractSpinBox_ButtonSymbols_Enums, "QtGui", "QFlags_ButtonSymbols");
+static gsi::ClassExt<QAbstractSpinBox> decl_QAbstractSpinBox_ButtonSymbols_Enum_as_child (decl_QAbstractSpinBox_ButtonSymbols_Enum, "ButtonSymbols");
+static gsi::ClassExt<QAbstractSpinBox> decl_QAbstractSpinBox_ButtonSymbols_Enums_as_child (decl_QAbstractSpinBox_ButtonSymbols_Enums, "QFlags_ButtonSymbols");
 
 }
 
@@ -3339,8 +3339,8 @@ static gsi::QFlagsClass<QAbstractSpinBox::CorrectionMode > decl_QAbstractSpinBox
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractSpinBox> inject_QAbstractSpinBox_CorrectionMode_Enum_in_parent (decl_QAbstractSpinBox_CorrectionMode_Enum.defs ());
-static gsi::ClassExt<QAbstractSpinBox> decl_QAbstractSpinBox_CorrectionMode_Enum_as_child (decl_QAbstractSpinBox_CorrectionMode_Enum, "QtGui", "CorrectionMode");
-static gsi::ClassExt<QAbstractSpinBox> decl_QAbstractSpinBox_CorrectionMode_Enums_as_child (decl_QAbstractSpinBox_CorrectionMode_Enums, "QtGui", "QFlags_CorrectionMode");
+static gsi::ClassExt<QAbstractSpinBox> decl_QAbstractSpinBox_CorrectionMode_Enum_as_child (decl_QAbstractSpinBox_CorrectionMode_Enum, "CorrectionMode");
+static gsi::ClassExt<QAbstractSpinBox> decl_QAbstractSpinBox_CorrectionMode_Enums_as_child (decl_QAbstractSpinBox_CorrectionMode_Enums, "QFlags_CorrectionMode");
 
 }
 
@@ -3360,8 +3360,8 @@ static gsi::QFlagsClass<QAbstractSpinBox::StepEnabledFlag > decl_QAbstractSpinBo
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractSpinBox> inject_QAbstractSpinBox_StepEnabledFlag_Enum_in_parent (decl_QAbstractSpinBox_StepEnabledFlag_Enum.defs ());
-static gsi::ClassExt<QAbstractSpinBox> decl_QAbstractSpinBox_StepEnabledFlag_Enum_as_child (decl_QAbstractSpinBox_StepEnabledFlag_Enum, "QtGui", "StepEnabledFlag");
-static gsi::ClassExt<QAbstractSpinBox> decl_QAbstractSpinBox_StepEnabledFlag_Enums_as_child (decl_QAbstractSpinBox_StepEnabledFlag_Enums, "QtGui", "QFlags_StepEnabledFlag");
+static gsi::ClassExt<QAbstractSpinBox> decl_QAbstractSpinBox_StepEnabledFlag_Enum_as_child (decl_QAbstractSpinBox_StepEnabledFlag_Enum, "StepEnabledFlag");
+static gsi::ClassExt<QAbstractSpinBox> decl_QAbstractSpinBox_StepEnabledFlag_Enums_as_child (decl_QAbstractSpinBox_StepEnabledFlag_Enums, "QFlags_StepEnabledFlag");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc
index e796c9d46..ed7b06755 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc
@@ -65,7 +65,7 @@ gsi::Class<QAbstractTextDocumentLayout::PaintContext> decl_QAbstractTextDocument
   methods_QAbstractTextDocumentLayout_PaintContext (),
   "@qt\n@brief Binding of QAbstractTextDocumentLayout::PaintContext");
 
-gsi::ClassExt<QAbstractTextDocumentLayout> decl_QAbstractTextDocumentLayout_PaintContext_as_child (decl_QAbstractTextDocumentLayout_PaintContext, "QtGui", "PaintContext");
+gsi::ClassExt<QAbstractTextDocumentLayout> decl_QAbstractTextDocumentLayout_PaintContext_as_child (decl_QAbstractTextDocumentLayout_PaintContext, "PaintContext");
 
 GSI_QTGUI_PUBLIC gsi::Class<QAbstractTextDocumentLayout::PaintContext> &qtdecl_QAbstractTextDocumentLayout_PaintContext () { return decl_QAbstractTextDocumentLayout_PaintContext; }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout_Selection.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout_Selection.cc
index 0ec2ec0e6..6011bc485 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout_Selection.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout_Selection.cc
@@ -65,7 +65,7 @@ gsi::Class<QAbstractTextDocumentLayout::Selection> decl_QAbstractTextDocumentLay
   methods_QAbstractTextDocumentLayout_Selection (),
   "@qt\n@brief Binding of QAbstractTextDocumentLayout::Selection");
 
-gsi::ClassExt<QAbstractTextDocumentLayout> decl_QAbstractTextDocumentLayout_Selection_as_child (decl_QAbstractTextDocumentLayout_Selection, "QtGui", "Selection");
+gsi::ClassExt<QAbstractTextDocumentLayout> decl_QAbstractTextDocumentLayout_Selection_as_child (decl_QAbstractTextDocumentLayout_Selection, "Selection");
 
 GSI_QTGUI_PUBLIC gsi::Class<QAbstractTextDocumentLayout::Selection> &qtdecl_QAbstractTextDocumentLayout_Selection () { return decl_QAbstractTextDocumentLayout_Selection; }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQAccessible.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAccessible.cc
index 650ea97f6..85cd2c72b 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQAccessible.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQAccessible.cc
@@ -221,8 +221,8 @@ static gsi::QFlagsClass<QAccessible::Event > decl_QAccessible_Event_Enums ("QtGu
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAccessible> inject_QAccessible_Event_Enum_in_parent (decl_QAccessible_Event_Enum.defs ());
-static gsi::ClassExt<QAccessible> decl_QAccessible_Event_Enum_as_child (decl_QAccessible_Event_Enum, "QtGui", "Event");
-static gsi::ClassExt<QAccessible> decl_QAccessible_Event_Enums_as_child (decl_QAccessible_Event_Enums, "QtGui", "QFlags_Event");
+static gsi::ClassExt<QAccessible> decl_QAccessible_Event_Enum_as_child (decl_QAccessible_Event_Enum, "Event");
+static gsi::ClassExt<QAccessible> decl_QAccessible_Event_Enums_as_child (decl_QAccessible_Event_Enums, "QFlags_Event");
 
 }
 
@@ -244,8 +244,8 @@ static gsi::QFlagsClass<QAccessible::Method > decl_QAccessible_Method_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAccessible> inject_QAccessible_Method_Enum_in_parent (decl_QAccessible_Method_Enum.defs ());
-static gsi::ClassExt<QAccessible> decl_QAccessible_Method_Enum_as_child (decl_QAccessible_Method_Enum, "QtGui", "Method");
-static gsi::ClassExt<QAccessible> decl_QAccessible_Method_Enums_as_child (decl_QAccessible_Method_Enums, "QtGui", "QFlags_Method");
+static gsi::ClassExt<QAccessible> decl_QAccessible_Method_Enum_as_child (decl_QAccessible_Method_Enum, "Method");
+static gsi::ClassExt<QAccessible> decl_QAccessible_Method_Enums_as_child (decl_QAccessible_Method_Enums, "QFlags_Method");
 
 }
 
@@ -282,8 +282,8 @@ static gsi::QFlagsClass<QAccessible::RelationFlag > decl_QAccessible_RelationFla
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAccessible> inject_QAccessible_RelationFlag_Enum_in_parent (decl_QAccessible_RelationFlag_Enum.defs ());
-static gsi::ClassExt<QAccessible> decl_QAccessible_RelationFlag_Enum_as_child (decl_QAccessible_RelationFlag_Enum, "QtGui", "RelationFlag");
-static gsi::ClassExt<QAccessible> decl_QAccessible_RelationFlag_Enums_as_child (decl_QAccessible_RelationFlag_Enums, "QtGui", "QFlags_RelationFlag");
+static gsi::ClassExt<QAccessible> decl_QAccessible_RelationFlag_Enum_as_child (decl_QAccessible_RelationFlag_Enum, "RelationFlag");
+static gsi::ClassExt<QAccessible> decl_QAccessible_RelationFlag_Enums_as_child (decl_QAccessible_RelationFlag_Enums, "QFlags_RelationFlag");
 
 }
 
@@ -364,8 +364,8 @@ static gsi::QFlagsClass<QAccessible::Role > decl_QAccessible_Role_Enums ("QtGui"
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAccessible> inject_QAccessible_Role_Enum_in_parent (decl_QAccessible_Role_Enum.defs ());
-static gsi::ClassExt<QAccessible> decl_QAccessible_Role_Enum_as_child (decl_QAccessible_Role_Enum, "QtGui", "Role");
-static gsi::ClassExt<QAccessible> decl_QAccessible_Role_Enums_as_child (decl_QAccessible_Role_Enums, "QtGui", "QFlags_Role");
+static gsi::ClassExt<QAccessible> decl_QAccessible_Role_Enum_as_child (decl_QAccessible_Role_Enum, "Role");
+static gsi::ClassExt<QAccessible> decl_QAccessible_Role_Enums_as_child (decl_QAccessible_Role_Enums, "QFlags_Role");
 
 }
 
@@ -412,8 +412,8 @@ static gsi::QFlagsClass<QAccessible::StateFlag > decl_QAccessible_StateFlag_Enum
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAccessible> inject_QAccessible_StateFlag_Enum_in_parent (decl_QAccessible_StateFlag_Enum.defs ());
-static gsi::ClassExt<QAccessible> decl_QAccessible_StateFlag_Enum_as_child (decl_QAccessible_StateFlag_Enum, "QtGui", "StateFlag");
-static gsi::ClassExt<QAccessible> decl_QAccessible_StateFlag_Enums_as_child (decl_QAccessible_StateFlag_Enums, "QtGui", "QFlags_StateFlag");
+static gsi::ClassExt<QAccessible> decl_QAccessible_StateFlag_Enum_as_child (decl_QAccessible_StateFlag_Enum, "StateFlag");
+static gsi::ClassExt<QAccessible> decl_QAccessible_StateFlag_Enums_as_child (decl_QAccessible_StateFlag_Enums, "QFlags_StateFlag");
 
 }
 
@@ -436,8 +436,8 @@ static gsi::QFlagsClass<QAccessible::Text > decl_QAccessible_Text_Enums ("QtGui"
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAccessible> inject_QAccessible_Text_Enum_in_parent (decl_QAccessible_Text_Enum.defs ());
-static gsi::ClassExt<QAccessible> decl_QAccessible_Text_Enum_as_child (decl_QAccessible_Text_Enum, "QtGui", "Text");
-static gsi::ClassExt<QAccessible> decl_QAccessible_Text_Enums_as_child (decl_QAccessible_Text_Enums, "QtGui", "QFlags_Text");
+static gsi::ClassExt<QAccessible> decl_QAccessible_Text_Enum_as_child (decl_QAccessible_Text_Enum, "Text");
+static gsi::ClassExt<QAccessible> decl_QAccessible_Text_Enums_as_child (decl_QAccessible_Text_Enums, "QFlags_Text");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQAction.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAction.cc
index 73b923b03..6121a3719 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQAction.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQAction.cc
@@ -1746,8 +1746,8 @@ static gsi::QFlagsClass<QAction::ActionEvent > decl_QAction_ActionEvent_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAction> inject_QAction_ActionEvent_Enum_in_parent (decl_QAction_ActionEvent_Enum.defs ());
-static gsi::ClassExt<QAction> decl_QAction_ActionEvent_Enum_as_child (decl_QAction_ActionEvent_Enum, "QtGui", "ActionEvent");
-static gsi::ClassExt<QAction> decl_QAction_ActionEvent_Enums_as_child (decl_QAction_ActionEvent_Enums, "QtGui", "QFlags_ActionEvent");
+static gsi::ClassExt<QAction> decl_QAction_ActionEvent_Enum_as_child (decl_QAction_ActionEvent_Enum, "ActionEvent");
+static gsi::ClassExt<QAction> decl_QAction_ActionEvent_Enums_as_child (decl_QAction_ActionEvent_Enums, "QFlags_ActionEvent");
 
 }
 
@@ -1771,8 +1771,8 @@ static gsi::QFlagsClass<QAction::MenuRole > decl_QAction_MenuRole_Enums ("QtGui"
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAction> inject_QAction_MenuRole_Enum_in_parent (decl_QAction_MenuRole_Enum.defs ());
-static gsi::ClassExt<QAction> decl_QAction_MenuRole_Enum_as_child (decl_QAction_MenuRole_Enum, "QtGui", "MenuRole");
-static gsi::ClassExt<QAction> decl_QAction_MenuRole_Enums_as_child (decl_QAction_MenuRole_Enums, "QtGui", "QFlags_MenuRole");
+static gsi::ClassExt<QAction> decl_QAction_MenuRole_Enum_as_child (decl_QAction_MenuRole_Enum, "MenuRole");
+static gsi::ClassExt<QAction> decl_QAction_MenuRole_Enums_as_child (decl_QAction_MenuRole_Enums, "QFlags_MenuRole");
 
 }
 
@@ -1792,8 +1792,8 @@ static gsi::QFlagsClass<QAction::Priority > decl_QAction_Priority_Enums ("QtGui"
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAction> inject_QAction_Priority_Enum_in_parent (decl_QAction_Priority_Enum.defs ());
-static gsi::ClassExt<QAction> decl_QAction_Priority_Enum_as_child (decl_QAction_Priority_Enum, "QtGui", "Priority");
-static gsi::ClassExt<QAction> decl_QAction_Priority_Enums_as_child (decl_QAction_Priority_Enums, "QtGui", "QFlags_Priority");
+static gsi::ClassExt<QAction> decl_QAction_Priority_Enum_as_child (decl_QAction_Priority_Enum, "Priority");
+static gsi::ClassExt<QAction> decl_QAction_Priority_Enums_as_child (decl_QAction_Priority_Enums, "QFlags_Priority");
 
 }
 
@@ -1814,8 +1814,8 @@ static gsi::QFlagsClass<QAction::SoftKeyRole > decl_QAction_SoftKeyRole_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAction> inject_QAction_SoftKeyRole_Enum_in_parent (decl_QAction_SoftKeyRole_Enum.defs ());
-static gsi::ClassExt<QAction> decl_QAction_SoftKeyRole_Enum_as_child (decl_QAction_SoftKeyRole_Enum, "QtGui", "SoftKeyRole");
-static gsi::ClassExt<QAction> decl_QAction_SoftKeyRole_Enums_as_child (decl_QAction_SoftKeyRole_Enums, "QtGui", "QFlags_SoftKeyRole");
+static gsi::ClassExt<QAction> decl_QAction_SoftKeyRole_Enum_as_child (decl_QAction_SoftKeyRole_Enum, "SoftKeyRole");
+static gsi::ClassExt<QAction> decl_QAction_SoftKeyRole_Enums_as_child (decl_QAction_SoftKeyRole_Enums, "QFlags_SoftKeyRole");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQApplication.cc b/src/gsiqt/qt4/QtGui/gsiDeclQApplication.cc
index 3978a6207..f772337b7 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQApplication.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQApplication.cc
@@ -2118,8 +2118,8 @@ static gsi::QFlagsClass<QApplication::Type > decl_QApplication_Type_Enums ("QtGu
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QApplication> inject_QApplication_Type_Enum_in_parent (decl_QApplication_Type_Enum.defs ());
-static gsi::ClassExt<QApplication> decl_QApplication_Type_Enum_as_child (decl_QApplication_Type_Enum, "QtGui", "Type");
-static gsi::ClassExt<QApplication> decl_QApplication_Type_Enums_as_child (decl_QApplication_Type_Enums, "QtGui", "QFlags_Type");
+static gsi::ClassExt<QApplication> decl_QApplication_Type_Enum_as_child (decl_QApplication_Type_Enum, "Type");
+static gsi::ClassExt<QApplication> decl_QApplication_Type_Enums_as_child (decl_QApplication_Type_Enums, "QFlags_Type");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQBoxLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQBoxLayout.cc
index 1f51b60b5..ff6d32eb3 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQBoxLayout.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQBoxLayout.cc
@@ -2107,8 +2107,8 @@ static gsi::QFlagsClass<QBoxLayout::Direction > decl_QBoxLayout_Direction_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QBoxLayout> inject_QBoxLayout_Direction_Enum_in_parent (decl_QBoxLayout_Direction_Enum.defs ());
-static gsi::ClassExt<QBoxLayout> decl_QBoxLayout_Direction_Enum_as_child (decl_QBoxLayout_Direction_Enum, "QtGui", "Direction");
-static gsi::ClassExt<QBoxLayout> decl_QBoxLayout_Direction_Enums_as_child (decl_QBoxLayout_Direction_Enums, "QtGui", "QFlags_Direction");
+static gsi::ClassExt<QBoxLayout> decl_QBoxLayout_Direction_Enum_as_child (decl_QBoxLayout_Direction_Enum, "Direction");
+static gsi::ClassExt<QBoxLayout> decl_QBoxLayout_Direction_Enums_as_child (decl_QBoxLayout_Direction_Enums, "QFlags_Direction");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQCalendarWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQCalendarWidget.cc
index 117ad93c3..f875f4580 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQCalendarWidget.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQCalendarWidget.cc
@@ -3434,8 +3434,8 @@ static gsi::QFlagsClass<QCalendarWidget::HorizontalHeaderFormat > decl_QCalendar
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QCalendarWidget> inject_QCalendarWidget_HorizontalHeaderFormat_Enum_in_parent (decl_QCalendarWidget_HorizontalHeaderFormat_Enum.defs ());
-static gsi::ClassExt<QCalendarWidget> decl_QCalendarWidget_HorizontalHeaderFormat_Enum_as_child (decl_QCalendarWidget_HorizontalHeaderFormat_Enum, "QtGui", "HorizontalHeaderFormat");
-static gsi::ClassExt<QCalendarWidget> decl_QCalendarWidget_HorizontalHeaderFormat_Enums_as_child (decl_QCalendarWidget_HorizontalHeaderFormat_Enums, "QtGui", "QFlags_HorizontalHeaderFormat");
+static gsi::ClassExt<QCalendarWidget> decl_QCalendarWidget_HorizontalHeaderFormat_Enum_as_child (decl_QCalendarWidget_HorizontalHeaderFormat_Enum, "HorizontalHeaderFormat");
+static gsi::ClassExt<QCalendarWidget> decl_QCalendarWidget_HorizontalHeaderFormat_Enums_as_child (decl_QCalendarWidget_HorizontalHeaderFormat_Enums, "QFlags_HorizontalHeaderFormat");
 
 }
 
@@ -3454,8 +3454,8 @@ static gsi::QFlagsClass<QCalendarWidget::SelectionMode > decl_QCalendarWidget_Se
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QCalendarWidget> inject_QCalendarWidget_SelectionMode_Enum_in_parent (decl_QCalendarWidget_SelectionMode_Enum.defs ());
-static gsi::ClassExt<QCalendarWidget> decl_QCalendarWidget_SelectionMode_Enum_as_child (decl_QCalendarWidget_SelectionMode_Enum, "QtGui", "SelectionMode");
-static gsi::ClassExt<QCalendarWidget> decl_QCalendarWidget_SelectionMode_Enums_as_child (decl_QCalendarWidget_SelectionMode_Enums, "QtGui", "QFlags_SelectionMode");
+static gsi::ClassExt<QCalendarWidget> decl_QCalendarWidget_SelectionMode_Enum_as_child (decl_QCalendarWidget_SelectionMode_Enum, "SelectionMode");
+static gsi::ClassExt<QCalendarWidget> decl_QCalendarWidget_SelectionMode_Enums_as_child (decl_QCalendarWidget_SelectionMode_Enums, "QFlags_SelectionMode");
 
 }
 
@@ -3474,8 +3474,8 @@ static gsi::QFlagsClass<QCalendarWidget::VerticalHeaderFormat > decl_QCalendarWi
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QCalendarWidget> inject_QCalendarWidget_VerticalHeaderFormat_Enum_in_parent (decl_QCalendarWidget_VerticalHeaderFormat_Enum.defs ());
-static gsi::ClassExt<QCalendarWidget> decl_QCalendarWidget_VerticalHeaderFormat_Enum_as_child (decl_QCalendarWidget_VerticalHeaderFormat_Enum, "QtGui", "VerticalHeaderFormat");
-static gsi::ClassExt<QCalendarWidget> decl_QCalendarWidget_VerticalHeaderFormat_Enums_as_child (decl_QCalendarWidget_VerticalHeaderFormat_Enums, "QtGui", "QFlags_VerticalHeaderFormat");
+static gsi::ClassExt<QCalendarWidget> decl_QCalendarWidget_VerticalHeaderFormat_Enum_as_child (decl_QCalendarWidget_VerticalHeaderFormat_Enum, "VerticalHeaderFormat");
+static gsi::ClassExt<QCalendarWidget> decl_QCalendarWidget_VerticalHeaderFormat_Enums_as_child (decl_QCalendarWidget_VerticalHeaderFormat_Enums, "QFlags_VerticalHeaderFormat");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQClipboard.cc b/src/gsiqt/qt4/QtGui/gsiDeclQClipboard.cc
index 388588c8e..85e31fd33 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQClipboard.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQClipboard.cc
@@ -496,8 +496,8 @@ static gsi::QFlagsClass<QClipboard::Mode > decl_QClipboard_Mode_Enums ("QtGui",
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QClipboard> inject_QClipboard_Mode_Enum_in_parent (decl_QClipboard_Mode_Enum.defs ());
-static gsi::ClassExt<QClipboard> decl_QClipboard_Mode_Enum_as_child (decl_QClipboard_Mode_Enum, "QtGui", "Mode");
-static gsi::ClassExt<QClipboard> decl_QClipboard_Mode_Enums_as_child (decl_QClipboard_Mode_Enums, "QtGui", "QFlags_Mode");
+static gsi::ClassExt<QClipboard> decl_QClipboard_Mode_Enum_as_child (decl_QClipboard_Mode_Enum, "Mode");
+static gsi::ClassExt<QClipboard> decl_QClipboard_Mode_Enums_as_child (decl_QClipboard_Mode_Enums, "QFlags_Mode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQColor.cc b/src/gsiqt/qt4/QtGui/gsiDeclQColor.cc
index 9deb140f8..8bb48d459 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQColor.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQColor.cc
@@ -2070,8 +2070,8 @@ static gsi::QFlagsClass<QColor::Spec > decl_QColor_Spec_Enums ("QtGui", "QColor_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QColor> inject_QColor_Spec_Enum_in_parent (decl_QColor_Spec_Enum.defs ());
-static gsi::ClassExt<QColor> decl_QColor_Spec_Enum_as_child (decl_QColor_Spec_Enum, "QtGui", "Spec");
-static gsi::ClassExt<QColor> decl_QColor_Spec_Enums_as_child (decl_QColor_Spec_Enums, "QtGui", "QFlags_Spec");
+static gsi::ClassExt<QColor> decl_QColor_Spec_Enum_as_child (decl_QColor_Spec_Enum, "Spec");
+static gsi::ClassExt<QColor> decl_QColor_Spec_Enums_as_child (decl_QColor_Spec_Enums, "QFlags_Spec");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQColorDialog.cc b/src/gsiqt/qt4/QtGui/gsiDeclQColorDialog.cc
index a80ebeaad..ab1136436 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQColorDialog.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQColorDialog.cc
@@ -3093,8 +3093,8 @@ static gsi::QFlagsClass<QColorDialog::ColorDialogOption > decl_QColorDialog_Colo
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QColorDialog> inject_QColorDialog_ColorDialogOption_Enum_in_parent (decl_QColorDialog_ColorDialogOption_Enum.defs ());
-static gsi::ClassExt<QColorDialog> decl_QColorDialog_ColorDialogOption_Enum_as_child (decl_QColorDialog_ColorDialogOption_Enum, "QtGui", "ColorDialogOption");
-static gsi::ClassExt<QColorDialog> decl_QColorDialog_ColorDialogOption_Enums_as_child (decl_QColorDialog_ColorDialogOption_Enums, "QtGui", "QFlags_ColorDialogOption");
+static gsi::ClassExt<QColorDialog> decl_QColorDialog_ColorDialogOption_Enum_as_child (decl_QColorDialog_ColorDialogOption_Enum, "ColorDialogOption");
+static gsi::ClassExt<QColorDialog> decl_QColorDialog_ColorDialogOption_Enums_as_child (decl_QColorDialog_ColorDialogOption_Enums, "QFlags_ColorDialogOption");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQColormap.cc b/src/gsiqt/qt4/QtGui/gsiDeclQColormap.cc
index daf9225bb..c33777907 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQColormap.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQColormap.cc
@@ -252,8 +252,8 @@ static gsi::QFlagsClass<QColormap::Mode > decl_QColormap_Mode_Enums ("QtGui", "Q
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QColormap> inject_QColormap_Mode_Enum_in_parent (decl_QColormap_Mode_Enum.defs ());
-static gsi::ClassExt<QColormap> decl_QColormap_Mode_Enum_as_child (decl_QColormap_Mode_Enum, "QtGui", "Mode");
-static gsi::ClassExt<QColormap> decl_QColormap_Mode_Enums_as_child (decl_QColormap_Mode_Enums, "QtGui", "QFlags_Mode");
+static gsi::ClassExt<QColormap> decl_QColormap_Mode_Enum_as_child (decl_QColormap_Mode_Enum, "Mode");
+static gsi::ClassExt<QColormap> decl_QColormap_Mode_Enums_as_child (decl_QColormap_Mode_Enums, "QFlags_Mode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQComboBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQComboBox.cc
index e544507a6..6167f5a82 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQComboBox.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQComboBox.cc
@@ -4025,8 +4025,8 @@ static gsi::QFlagsClass<QComboBox::InsertPolicy > decl_QComboBox_InsertPolicy_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QComboBox> inject_QComboBox_InsertPolicy_Enum_in_parent (decl_QComboBox_InsertPolicy_Enum.defs ());
-static gsi::ClassExt<QComboBox> decl_QComboBox_InsertPolicy_Enum_as_child (decl_QComboBox_InsertPolicy_Enum, "QtGui", "InsertPolicy");
-static gsi::ClassExt<QComboBox> decl_QComboBox_InsertPolicy_Enums_as_child (decl_QComboBox_InsertPolicy_Enums, "QtGui", "QFlags_InsertPolicy");
+static gsi::ClassExt<QComboBox> decl_QComboBox_InsertPolicy_Enum_as_child (decl_QComboBox_InsertPolicy_Enum, "InsertPolicy");
+static gsi::ClassExt<QComboBox> decl_QComboBox_InsertPolicy_Enums_as_child (decl_QComboBox_InsertPolicy_Enums, "QFlags_InsertPolicy");
 
 }
 
@@ -4047,8 +4047,8 @@ static gsi::QFlagsClass<QComboBox::SizeAdjustPolicy > decl_QComboBox_SizeAdjustP
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QComboBox> inject_QComboBox_SizeAdjustPolicy_Enum_in_parent (decl_QComboBox_SizeAdjustPolicy_Enum.defs ());
-static gsi::ClassExt<QComboBox> decl_QComboBox_SizeAdjustPolicy_Enum_as_child (decl_QComboBox_SizeAdjustPolicy_Enum, "QtGui", "SizeAdjustPolicy");
-static gsi::ClassExt<QComboBox> decl_QComboBox_SizeAdjustPolicy_Enums_as_child (decl_QComboBox_SizeAdjustPolicy_Enums, "QtGui", "QFlags_SizeAdjustPolicy");
+static gsi::ClassExt<QComboBox> decl_QComboBox_SizeAdjustPolicy_Enum_as_child (decl_QComboBox_SizeAdjustPolicy_Enum, "SizeAdjustPolicy");
+static gsi::ClassExt<QComboBox> decl_QComboBox_SizeAdjustPolicy_Enums_as_child (decl_QComboBox_SizeAdjustPolicy_Enums, "QFlags_SizeAdjustPolicy");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQCompleter.cc b/src/gsiqt/qt4/QtGui/gsiDeclQCompleter.cc
index 7a6ff5b63..e755c55c0 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQCompleter.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQCompleter.cc
@@ -1395,8 +1395,8 @@ static gsi::QFlagsClass<QCompleter::CompletionMode > decl_QCompleter_CompletionM
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QCompleter> inject_QCompleter_CompletionMode_Enum_in_parent (decl_QCompleter_CompletionMode_Enum.defs ());
-static gsi::ClassExt<QCompleter> decl_QCompleter_CompletionMode_Enum_as_child (decl_QCompleter_CompletionMode_Enum, "QtGui", "CompletionMode");
-static gsi::ClassExt<QCompleter> decl_QCompleter_CompletionMode_Enums_as_child (decl_QCompleter_CompletionMode_Enums, "QtGui", "QFlags_CompletionMode");
+static gsi::ClassExt<QCompleter> decl_QCompleter_CompletionMode_Enum_as_child (decl_QCompleter_CompletionMode_Enum, "CompletionMode");
+static gsi::ClassExt<QCompleter> decl_QCompleter_CompletionMode_Enums_as_child (decl_QCompleter_CompletionMode_Enums, "QFlags_CompletionMode");
 
 }
 
@@ -1416,8 +1416,8 @@ static gsi::QFlagsClass<QCompleter::ModelSorting > decl_QCompleter_ModelSorting_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QCompleter> inject_QCompleter_ModelSorting_Enum_in_parent (decl_QCompleter_ModelSorting_Enum.defs ());
-static gsi::ClassExt<QCompleter> decl_QCompleter_ModelSorting_Enum_as_child (decl_QCompleter_ModelSorting_Enum, "QtGui", "ModelSorting");
-static gsi::ClassExt<QCompleter> decl_QCompleter_ModelSorting_Enums_as_child (decl_QCompleter_ModelSorting_Enums, "QtGui", "QFlags_ModelSorting");
+static gsi::ClassExt<QCompleter> decl_QCompleter_ModelSorting_Enum_as_child (decl_QCompleter_ModelSorting_Enum, "ModelSorting");
+static gsi::ClassExt<QCompleter> decl_QCompleter_ModelSorting_Enums_as_child (decl_QCompleter_ModelSorting_Enums, "QFlags_ModelSorting");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQContextMenuEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQContextMenuEvent.cc
index 49eb514de..b1cf5be31 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQContextMenuEvent.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQContextMenuEvent.cc
@@ -304,8 +304,8 @@ static gsi::QFlagsClass<QContextMenuEvent::Reason > decl_QContextMenuEvent_Reaso
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QContextMenuEvent> inject_QContextMenuEvent_Reason_Enum_in_parent (decl_QContextMenuEvent_Reason_Enum.defs ());
-static gsi::ClassExt<QContextMenuEvent> decl_QContextMenuEvent_Reason_Enum_as_child (decl_QContextMenuEvent_Reason_Enum, "QtGui", "Reason");
-static gsi::ClassExt<QContextMenuEvent> decl_QContextMenuEvent_Reason_Enums_as_child (decl_QContextMenuEvent_Reason_Enums, "QtGui", "QFlags_Reason");
+static gsi::ClassExt<QContextMenuEvent> decl_QContextMenuEvent_Reason_Enum_as_child (decl_QContextMenuEvent_Reason_Enum, "Reason");
+static gsi::ClassExt<QContextMenuEvent> decl_QContextMenuEvent_Reason_Enums_as_child (decl_QContextMenuEvent_Reason_Enums, "QFlags_Reason");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQDataWidgetMapper.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDataWidgetMapper.cc
index c8ea7082e..46d42f199 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQDataWidgetMapper.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQDataWidgetMapper.cc
@@ -1132,8 +1132,8 @@ static gsi::QFlagsClass<QDataWidgetMapper::SubmitPolicy > decl_QDataWidgetMapper
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QDataWidgetMapper> inject_QDataWidgetMapper_SubmitPolicy_Enum_in_parent (decl_QDataWidgetMapper_SubmitPolicy_Enum.defs ());
-static gsi::ClassExt<QDataWidgetMapper> decl_QDataWidgetMapper_SubmitPolicy_Enum_as_child (decl_QDataWidgetMapper_SubmitPolicy_Enum, "QtGui", "SubmitPolicy");
-static gsi::ClassExt<QDataWidgetMapper> decl_QDataWidgetMapper_SubmitPolicy_Enums_as_child (decl_QDataWidgetMapper_SubmitPolicy_Enums, "QtGui", "QFlags_SubmitPolicy");
+static gsi::ClassExt<QDataWidgetMapper> decl_QDataWidgetMapper_SubmitPolicy_Enum_as_child (decl_QDataWidgetMapper_SubmitPolicy_Enum, "SubmitPolicy");
+static gsi::ClassExt<QDataWidgetMapper> decl_QDataWidgetMapper_SubmitPolicy_Enums_as_child (decl_QDataWidgetMapper_SubmitPolicy_Enums, "QFlags_SubmitPolicy");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQDateTimeEdit.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDateTimeEdit.cc
index 332d3b894..b82beefbe 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQDateTimeEdit.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQDateTimeEdit.cc
@@ -3902,8 +3902,8 @@ static gsi::QFlagsClass<QDateTimeEdit::Section > decl_QDateTimeEdit_Section_Enum
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QDateTimeEdit> inject_QDateTimeEdit_Section_Enum_in_parent (decl_QDateTimeEdit_Section_Enum.defs ());
-static gsi::ClassExt<QDateTimeEdit> decl_QDateTimeEdit_Section_Enum_as_child (decl_QDateTimeEdit_Section_Enum, "QtGui", "Section");
-static gsi::ClassExt<QDateTimeEdit> decl_QDateTimeEdit_Section_Enums_as_child (decl_QDateTimeEdit_Section_Enums, "QtGui", "QFlags_Section");
+static gsi::ClassExt<QDateTimeEdit> decl_QDateTimeEdit_Section_Enum_as_child (decl_QDateTimeEdit_Section_Enum, "Section");
+static gsi::ClassExt<QDateTimeEdit> decl_QDateTimeEdit_Section_Enums_as_child (decl_QDateTimeEdit_Section_Enums, "QFlags_Section");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQDesktopServices.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDesktopServices.cc
index fc8a102b7..acf7ff3e0 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQDesktopServices.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQDesktopServices.cc
@@ -204,8 +204,8 @@ static gsi::QFlagsClass<QDesktopServices::StandardLocation > decl_QDesktopServic
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QDesktopServices> inject_QDesktopServices_StandardLocation_Enum_in_parent (decl_QDesktopServices_StandardLocation_Enum.defs ());
-static gsi::ClassExt<QDesktopServices> decl_QDesktopServices_StandardLocation_Enum_as_child (decl_QDesktopServices_StandardLocation_Enum, "QtGui", "StandardLocation");
-static gsi::ClassExt<QDesktopServices> decl_QDesktopServices_StandardLocation_Enums_as_child (decl_QDesktopServices_StandardLocation_Enums, "QtGui", "QFlags_StandardLocation");
+static gsi::ClassExt<QDesktopServices> decl_QDesktopServices_StandardLocation_Enum_as_child (decl_QDesktopServices_StandardLocation_Enum, "StandardLocation");
+static gsi::ClassExt<QDesktopServices> decl_QDesktopServices_StandardLocation_Enums_as_child (decl_QDesktopServices_StandardLocation_Enums, "QFlags_StandardLocation");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQDialogButtonBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDialogButtonBox.cc
index 781a426bb..9b9faceb2 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQDialogButtonBox.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQDialogButtonBox.cc
@@ -2906,8 +2906,8 @@ static gsi::QFlagsClass<QDialogButtonBox::ButtonRole > decl_QDialogButtonBox_But
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QDialogButtonBox> inject_QDialogButtonBox_ButtonRole_Enum_in_parent (decl_QDialogButtonBox_ButtonRole_Enum.defs ());
-static gsi::ClassExt<QDialogButtonBox> decl_QDialogButtonBox_ButtonRole_Enum_as_child (decl_QDialogButtonBox_ButtonRole_Enum, "QtGui", "ButtonRole");
-static gsi::ClassExt<QDialogButtonBox> decl_QDialogButtonBox_ButtonRole_Enums_as_child (decl_QDialogButtonBox_ButtonRole_Enums, "QtGui", "QFlags_ButtonRole");
+static gsi::ClassExt<QDialogButtonBox> decl_QDialogButtonBox_ButtonRole_Enum_as_child (decl_QDialogButtonBox_ButtonRole_Enum, "ButtonRole");
+static gsi::ClassExt<QDialogButtonBox> decl_QDialogButtonBox_ButtonRole_Enums_as_child (decl_QDialogButtonBox_ButtonRole_Enums, "QFlags_ButtonRole");
 
 }
 
@@ -2945,8 +2945,8 @@ static gsi::QFlagsClass<QDialogButtonBox::StandardButton > decl_QDialogButtonBox
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QDialogButtonBox> inject_QDialogButtonBox_StandardButton_Enum_in_parent (decl_QDialogButtonBox_StandardButton_Enum.defs ());
-static gsi::ClassExt<QDialogButtonBox> decl_QDialogButtonBox_StandardButton_Enum_as_child (decl_QDialogButtonBox_StandardButton_Enum, "QtGui", "StandardButton");
-static gsi::ClassExt<QDialogButtonBox> decl_QDialogButtonBox_StandardButton_Enums_as_child (decl_QDialogButtonBox_StandardButton_Enums, "QtGui", "QFlags_StandardButton");
+static gsi::ClassExt<QDialogButtonBox> decl_QDialogButtonBox_StandardButton_Enum_as_child (decl_QDialogButtonBox_StandardButton_Enum, "StandardButton");
+static gsi::ClassExt<QDialogButtonBox> decl_QDialogButtonBox_StandardButton_Enums_as_child (decl_QDialogButtonBox_StandardButton_Enums, "QFlags_StandardButton");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQDirIterator.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDirIterator.cc
index 3f5dc3396..b356dff45 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQDirIterator.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQDirIterator.cc
@@ -345,8 +345,8 @@ static gsi::QFlagsClass<QDirIterator::IteratorFlag > decl_QDirIterator_IteratorF
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QDirIterator> inject_QDirIterator_IteratorFlag_Enum_in_parent (decl_QDirIterator_IteratorFlag_Enum.defs ());
-static gsi::ClassExt<QDirIterator> decl_QDirIterator_IteratorFlag_Enum_as_child (decl_QDirIterator_IteratorFlag_Enum, "QtGui", "IteratorFlag");
-static gsi::ClassExt<QDirIterator> decl_QDirIterator_IteratorFlag_Enums_as_child (decl_QDirIterator_IteratorFlag_Enums, "QtGui", "QFlags_IteratorFlag");
+static gsi::ClassExt<QDirIterator> decl_QDirIterator_IteratorFlag_Enum_as_child (decl_QDirIterator_IteratorFlag_Enum, "IteratorFlag");
+static gsi::ClassExt<QDirIterator> decl_QDirIterator_IteratorFlag_Enums_as_child (decl_QDirIterator_IteratorFlag_Enums, "QFlags_IteratorFlag");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQDockWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDockWidget.cc
index 393d201b9..6b1a0d83b 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQDockWidget.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQDockWidget.cc
@@ -2869,8 +2869,8 @@ static gsi::QFlagsClass<QDockWidget::DockWidgetFeature > decl_QDockWidget_DockWi
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QDockWidget> inject_QDockWidget_DockWidgetFeature_Enum_in_parent (decl_QDockWidget_DockWidgetFeature_Enum.defs ());
-static gsi::ClassExt<QDockWidget> decl_QDockWidget_DockWidgetFeature_Enum_as_child (decl_QDockWidget_DockWidgetFeature_Enum, "QtGui", "DockWidgetFeature");
-static gsi::ClassExt<QDockWidget> decl_QDockWidget_DockWidgetFeature_Enums_as_child (decl_QDockWidget_DockWidgetFeature_Enums, "QtGui", "QFlags_DockWidgetFeature");
+static gsi::ClassExt<QDockWidget> decl_QDockWidget_DockWidgetFeature_Enum_as_child (decl_QDockWidget_DockWidgetFeature_Enum, "DockWidgetFeature");
+static gsi::ClassExt<QDockWidget> decl_QDockWidget_DockWidgetFeature_Enums_as_child (decl_QDockWidget_DockWidgetFeature_Enums, "QFlags_DockWidgetFeature");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQDoubleValidator.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDoubleValidator.cc
index 1003affe6..d376d4e04 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQDoubleValidator.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQDoubleValidator.cc
@@ -928,8 +928,8 @@ static gsi::QFlagsClass<QDoubleValidator::Notation > decl_QDoubleValidator_Notat
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QDoubleValidator> inject_QDoubleValidator_Notation_Enum_in_parent (decl_QDoubleValidator_Notation_Enum.defs ());
-static gsi::ClassExt<QDoubleValidator> decl_QDoubleValidator_Notation_Enum_as_child (decl_QDoubleValidator_Notation_Enum, "QtGui", "Notation");
-static gsi::ClassExt<QDoubleValidator> decl_QDoubleValidator_Notation_Enums_as_child (decl_QDoubleValidator_Notation_Enums, "QtGui", "QFlags_Notation");
+static gsi::ClassExt<QDoubleValidator> decl_QDoubleValidator_Notation_Enum_as_child (decl_QDoubleValidator_Notation_Enum, "Notation");
+static gsi::ClassExt<QDoubleValidator> decl_QDoubleValidator_Notation_Enums_as_child (decl_QDoubleValidator_Notation_Enums, "QFlags_Notation");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQFileDialog.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFileDialog.cc
index 0758522c2..2cdc9efb4 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQFileDialog.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQFileDialog.cc
@@ -3997,8 +3997,8 @@ static gsi::QFlagsClass<QFileDialog::AcceptMode > decl_QFileDialog_AcceptMode_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFileDialog> inject_QFileDialog_AcceptMode_Enum_in_parent (decl_QFileDialog_AcceptMode_Enum.defs ());
-static gsi::ClassExt<QFileDialog> decl_QFileDialog_AcceptMode_Enum_as_child (decl_QFileDialog_AcceptMode_Enum, "QtGui", "AcceptMode");
-static gsi::ClassExt<QFileDialog> decl_QFileDialog_AcceptMode_Enums_as_child (decl_QFileDialog_AcceptMode_Enums, "QtGui", "QFlags_AcceptMode");
+static gsi::ClassExt<QFileDialog> decl_QFileDialog_AcceptMode_Enum_as_child (decl_QFileDialog_AcceptMode_Enum, "AcceptMode");
+static gsi::ClassExt<QFileDialog> decl_QFileDialog_AcceptMode_Enums_as_child (decl_QFileDialog_AcceptMode_Enums, "QFlags_AcceptMode");
 
 }
 
@@ -4020,8 +4020,8 @@ static gsi::QFlagsClass<QFileDialog::DialogLabel > decl_QFileDialog_DialogLabel_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFileDialog> inject_QFileDialog_DialogLabel_Enum_in_parent (decl_QFileDialog_DialogLabel_Enum.defs ());
-static gsi::ClassExt<QFileDialog> decl_QFileDialog_DialogLabel_Enum_as_child (decl_QFileDialog_DialogLabel_Enum, "QtGui", "DialogLabel");
-static gsi::ClassExt<QFileDialog> decl_QFileDialog_DialogLabel_Enums_as_child (decl_QFileDialog_DialogLabel_Enums, "QtGui", "QFlags_DialogLabel");
+static gsi::ClassExt<QFileDialog> decl_QFileDialog_DialogLabel_Enum_as_child (decl_QFileDialog_DialogLabel_Enum, "DialogLabel");
+static gsi::ClassExt<QFileDialog> decl_QFileDialog_DialogLabel_Enums_as_child (decl_QFileDialog_DialogLabel_Enums, "QFlags_DialogLabel");
 
 }
 
@@ -4043,8 +4043,8 @@ static gsi::QFlagsClass<QFileDialog::FileMode > decl_QFileDialog_FileMode_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFileDialog> inject_QFileDialog_FileMode_Enum_in_parent (decl_QFileDialog_FileMode_Enum.defs ());
-static gsi::ClassExt<QFileDialog> decl_QFileDialog_FileMode_Enum_as_child (decl_QFileDialog_FileMode_Enum, "QtGui", "FileMode");
-static gsi::ClassExt<QFileDialog> decl_QFileDialog_FileMode_Enums_as_child (decl_QFileDialog_FileMode_Enums, "QtGui", "QFlags_FileMode");
+static gsi::ClassExt<QFileDialog> decl_QFileDialog_FileMode_Enum_as_child (decl_QFileDialog_FileMode_Enum, "FileMode");
+static gsi::ClassExt<QFileDialog> decl_QFileDialog_FileMode_Enums_as_child (decl_QFileDialog_FileMode_Enums, "QFlags_FileMode");
 
 }
 
@@ -4068,8 +4068,8 @@ static gsi::QFlagsClass<QFileDialog::Option > decl_QFileDialog_Option_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFileDialog> inject_QFileDialog_Option_Enum_in_parent (decl_QFileDialog_Option_Enum.defs ());
-static gsi::ClassExt<QFileDialog> decl_QFileDialog_Option_Enum_as_child (decl_QFileDialog_Option_Enum, "QtGui", "Option");
-static gsi::ClassExt<QFileDialog> decl_QFileDialog_Option_Enums_as_child (decl_QFileDialog_Option_Enums, "QtGui", "QFlags_Option");
+static gsi::ClassExt<QFileDialog> decl_QFileDialog_Option_Enum_as_child (decl_QFileDialog_Option_Enum, "Option");
+static gsi::ClassExt<QFileDialog> decl_QFileDialog_Option_Enums_as_child (decl_QFileDialog_Option_Enums, "QFlags_Option");
 
 }
 
@@ -4088,8 +4088,8 @@ static gsi::QFlagsClass<QFileDialog::ViewMode > decl_QFileDialog_ViewMode_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFileDialog> inject_QFileDialog_ViewMode_Enum_in_parent (decl_QFileDialog_ViewMode_Enum.defs ());
-static gsi::ClassExt<QFileDialog> decl_QFileDialog_ViewMode_Enum_as_child (decl_QFileDialog_ViewMode_Enum, "QtGui", "ViewMode");
-static gsi::ClassExt<QFileDialog> decl_QFileDialog_ViewMode_Enums_as_child (decl_QFileDialog_ViewMode_Enums, "QtGui", "QFlags_ViewMode");
+static gsi::ClassExt<QFileDialog> decl_QFileDialog_ViewMode_Enum_as_child (decl_QFileDialog_ViewMode_Enum, "ViewMode");
+static gsi::ClassExt<QFileDialog> decl_QFileDialog_ViewMode_Enums_as_child (decl_QFileDialog_ViewMode_Enums, "QFlags_ViewMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQFileIconProvider.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFileIconProvider.cc
index 977e793ff..c4e2561c4 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQFileIconProvider.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQFileIconProvider.cc
@@ -305,8 +305,8 @@ static gsi::QFlagsClass<QFileIconProvider::IconType > decl_QFileIconProvider_Ico
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFileIconProvider> inject_QFileIconProvider_IconType_Enum_in_parent (decl_QFileIconProvider_IconType_Enum.defs ());
-static gsi::ClassExt<QFileIconProvider> decl_QFileIconProvider_IconType_Enum_as_child (decl_QFileIconProvider_IconType_Enum, "QtGui", "IconType");
-static gsi::ClassExt<QFileIconProvider> decl_QFileIconProvider_IconType_Enums_as_child (decl_QFileIconProvider_IconType_Enums, "QtGui", "QFlags_IconType");
+static gsi::ClassExt<QFileIconProvider> decl_QFileIconProvider_IconType_Enum_as_child (decl_QFileIconProvider_IconType_Enum, "IconType");
+static gsi::ClassExt<QFileIconProvider> decl_QFileIconProvider_IconType_Enums_as_child (decl_QFileIconProvider_IconType_Enums, "QFlags_IconType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQFont.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFont.cc
index 5228c6e2e..0c4a1293e 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQFont.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQFont.cc
@@ -1382,8 +1382,8 @@ static gsi::QFlagsClass<QFont::Capitalization > decl_QFont_Capitalization_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFont> inject_QFont_Capitalization_Enum_in_parent (decl_QFont_Capitalization_Enum.defs ());
-static gsi::ClassExt<QFont> decl_QFont_Capitalization_Enum_as_child (decl_QFont_Capitalization_Enum, "QtGui", "Capitalization");
-static gsi::ClassExt<QFont> decl_QFont_Capitalization_Enums_as_child (decl_QFont_Capitalization_Enums, "QtGui", "QFlags_Capitalization");
+static gsi::ClassExt<QFont> decl_QFont_Capitalization_Enum_as_child (decl_QFont_Capitalization_Enum, "Capitalization");
+static gsi::ClassExt<QFont> decl_QFont_Capitalization_Enums_as_child (decl_QFont_Capitalization_Enums, "QFlags_Capitalization");
 
 }
 
@@ -1402,8 +1402,8 @@ static gsi::QFlagsClass<QFont::SpacingType > decl_QFont_SpacingType_Enums ("QtGu
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFont> inject_QFont_SpacingType_Enum_in_parent (decl_QFont_SpacingType_Enum.defs ());
-static gsi::ClassExt<QFont> decl_QFont_SpacingType_Enum_as_child (decl_QFont_SpacingType_Enum, "QtGui", "SpacingType");
-static gsi::ClassExt<QFont> decl_QFont_SpacingType_Enums_as_child (decl_QFont_SpacingType_Enums, "QtGui", "QFlags_SpacingType");
+static gsi::ClassExt<QFont> decl_QFont_SpacingType_Enum_as_child (decl_QFont_SpacingType_Enum, "SpacingType");
+static gsi::ClassExt<QFont> decl_QFont_SpacingType_Enums_as_child (decl_QFont_SpacingType_Enums, "QFlags_SpacingType");
 
 }
 
@@ -1423,8 +1423,8 @@ static gsi::QFlagsClass<QFont::Style > decl_QFont_Style_Enums ("QtGui", "QFont_Q
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFont> inject_QFont_Style_Enum_in_parent (decl_QFont_Style_Enum.defs ());
-static gsi::ClassExt<QFont> decl_QFont_Style_Enum_as_child (decl_QFont_Style_Enum, "QtGui", "Style");
-static gsi::ClassExt<QFont> decl_QFont_Style_Enums_as_child (decl_QFont_Style_Enums, "QtGui", "QFlags_Style");
+static gsi::ClassExt<QFont> decl_QFont_Style_Enum_as_child (decl_QFont_Style_Enum, "Style");
+static gsi::ClassExt<QFont> decl_QFont_Style_Enums_as_child (decl_QFont_Style_Enums, "QFlags_Style");
 
 }
 
@@ -1451,8 +1451,8 @@ static gsi::QFlagsClass<QFont::StyleHint > decl_QFont_StyleHint_Enums ("QtGui",
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFont> inject_QFont_StyleHint_Enum_in_parent (decl_QFont_StyleHint_Enum.defs ());
-static gsi::ClassExt<QFont> decl_QFont_StyleHint_Enum_as_child (decl_QFont_StyleHint_Enum, "QtGui", "StyleHint");
-static gsi::ClassExt<QFont> decl_QFont_StyleHint_Enums_as_child (decl_QFont_StyleHint_Enums, "QtGui", "QFlags_StyleHint");
+static gsi::ClassExt<QFont> decl_QFont_StyleHint_Enum_as_child (decl_QFont_StyleHint_Enum, "StyleHint");
+static gsi::ClassExt<QFont> decl_QFont_StyleHint_Enums_as_child (decl_QFont_StyleHint_Enums, "QFlags_StyleHint");
 
 }
 
@@ -1480,8 +1480,8 @@ static gsi::QFlagsClass<QFont::StyleStrategy > decl_QFont_StyleStrategy_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFont> inject_QFont_StyleStrategy_Enum_in_parent (decl_QFont_StyleStrategy_Enum.defs ());
-static gsi::ClassExt<QFont> decl_QFont_StyleStrategy_Enum_as_child (decl_QFont_StyleStrategy_Enum, "QtGui", "StyleStrategy");
-static gsi::ClassExt<QFont> decl_QFont_StyleStrategy_Enums_as_child (decl_QFont_StyleStrategy_Enums, "QtGui", "QFlags_StyleStrategy");
+static gsi::ClassExt<QFont> decl_QFont_StyleStrategy_Enum_as_child (decl_QFont_StyleStrategy_Enum, "StyleStrategy");
+static gsi::ClassExt<QFont> decl_QFont_StyleStrategy_Enums_as_child (decl_QFont_StyleStrategy_Enums, "QFlags_StyleStrategy");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQFontComboBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFontComboBox.cc
index a62b21a68..28bcf6793 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQFontComboBox.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQFontComboBox.cc
@@ -2881,8 +2881,8 @@ static gsi::QFlagsClass<QFontComboBox::FontFilter > decl_QFontComboBox_FontFilte
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFontComboBox> inject_QFontComboBox_FontFilter_Enum_in_parent (decl_QFontComboBox_FontFilter_Enum.defs ());
-static gsi::ClassExt<QFontComboBox> decl_QFontComboBox_FontFilter_Enum_as_child (decl_QFontComboBox_FontFilter_Enum, "QtGui", "FontFilter");
-static gsi::ClassExt<QFontComboBox> decl_QFontComboBox_FontFilter_Enums_as_child (decl_QFontComboBox_FontFilter_Enums, "QtGui", "QFlags_FontFilter");
+static gsi::ClassExt<QFontComboBox> decl_QFontComboBox_FontFilter_Enum_as_child (decl_QFontComboBox_FontFilter_Enum, "FontFilter");
+static gsi::ClassExt<QFontComboBox> decl_QFontComboBox_FontFilter_Enums_as_child (decl_QFontComboBox_FontFilter_Enums, "QFlags_FontFilter");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQFontDatabase.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFontDatabase.cc
index 257768b08..6264e347c 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQFontDatabase.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQFontDatabase.cc
@@ -638,8 +638,8 @@ static gsi::QFlagsClass<QFontDatabase::WritingSystem > decl_QFontDatabase_Writin
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFontDatabase> inject_QFontDatabase_WritingSystem_Enum_in_parent (decl_QFontDatabase_WritingSystem_Enum.defs ());
-static gsi::ClassExt<QFontDatabase> decl_QFontDatabase_WritingSystem_Enum_as_child (decl_QFontDatabase_WritingSystem_Enum, "QtGui", "WritingSystem");
-static gsi::ClassExt<QFontDatabase> decl_QFontDatabase_WritingSystem_Enums_as_child (decl_QFontDatabase_WritingSystem_Enums, "QtGui", "QFlags_WritingSystem");
+static gsi::ClassExt<QFontDatabase> decl_QFontDatabase_WritingSystem_Enum_as_child (decl_QFontDatabase_WritingSystem_Enum, "WritingSystem");
+static gsi::ClassExt<QFontDatabase> decl_QFontDatabase_WritingSystem_Enums_as_child (decl_QFontDatabase_WritingSystem_Enums, "QFlags_WritingSystem");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQFontDialog.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFontDialog.cc
index 7284d1cd4..aaf87f747 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQFontDialog.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQFontDialog.cc
@@ -2995,8 +2995,8 @@ static gsi::QFlagsClass<QFontDialog::FontDialogOption > decl_QFontDialog_FontDia
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFontDialog> inject_QFontDialog_FontDialogOption_Enum_in_parent (decl_QFontDialog_FontDialogOption_Enum.defs ());
-static gsi::ClassExt<QFontDialog> decl_QFontDialog_FontDialogOption_Enum_as_child (decl_QFontDialog_FontDialogOption_Enum, "QtGui", "FontDialogOption");
-static gsi::ClassExt<QFontDialog> decl_QFontDialog_FontDialogOption_Enums_as_child (decl_QFontDialog_FontDialogOption_Enums, "QtGui", "QFlags_FontDialogOption");
+static gsi::ClassExt<QFontDialog> decl_QFontDialog_FontDialogOption_Enum_as_child (decl_QFontDialog_FontDialogOption_Enum, "FontDialogOption");
+static gsi::ClassExt<QFontDialog> decl_QFontDialog_FontDialogOption_Enums_as_child (decl_QFontDialog_FontDialogOption_Enums, "QFlags_FontDialogOption");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQFormLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFormLayout.cc
index 8ee21650b..ad5f00822 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQFormLayout.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQFormLayout.cc
@@ -2402,8 +2402,8 @@ static gsi::QFlagsClass<QFormLayout::FieldGrowthPolicy > decl_QFormLayout_FieldG
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFormLayout> inject_QFormLayout_FieldGrowthPolicy_Enum_in_parent (decl_QFormLayout_FieldGrowthPolicy_Enum.defs ());
-static gsi::ClassExt<QFormLayout> decl_QFormLayout_FieldGrowthPolicy_Enum_as_child (decl_QFormLayout_FieldGrowthPolicy_Enum, "QtGui", "FieldGrowthPolicy");
-static gsi::ClassExt<QFormLayout> decl_QFormLayout_FieldGrowthPolicy_Enums_as_child (decl_QFormLayout_FieldGrowthPolicy_Enums, "QtGui", "QFlags_FieldGrowthPolicy");
+static gsi::ClassExt<QFormLayout> decl_QFormLayout_FieldGrowthPolicy_Enum_as_child (decl_QFormLayout_FieldGrowthPolicy_Enum, "FieldGrowthPolicy");
+static gsi::ClassExt<QFormLayout> decl_QFormLayout_FieldGrowthPolicy_Enums_as_child (decl_QFormLayout_FieldGrowthPolicy_Enums, "QFlags_FieldGrowthPolicy");
 
 }
 
@@ -2423,8 +2423,8 @@ static gsi::QFlagsClass<QFormLayout::ItemRole > decl_QFormLayout_ItemRole_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFormLayout> inject_QFormLayout_ItemRole_Enum_in_parent (decl_QFormLayout_ItemRole_Enum.defs ());
-static gsi::ClassExt<QFormLayout> decl_QFormLayout_ItemRole_Enum_as_child (decl_QFormLayout_ItemRole_Enum, "QtGui", "ItemRole");
-static gsi::ClassExt<QFormLayout> decl_QFormLayout_ItemRole_Enums_as_child (decl_QFormLayout_ItemRole_Enums, "QtGui", "QFlags_ItemRole");
+static gsi::ClassExt<QFormLayout> decl_QFormLayout_ItemRole_Enum_as_child (decl_QFormLayout_ItemRole_Enum, "ItemRole");
+static gsi::ClassExt<QFormLayout> decl_QFormLayout_ItemRole_Enums_as_child (decl_QFormLayout_ItemRole_Enums, "QFlags_ItemRole");
 
 }
 
@@ -2444,8 +2444,8 @@ static gsi::QFlagsClass<QFormLayout::RowWrapPolicy > decl_QFormLayout_RowWrapPol
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFormLayout> inject_QFormLayout_RowWrapPolicy_Enum_in_parent (decl_QFormLayout_RowWrapPolicy_Enum.defs ());
-static gsi::ClassExt<QFormLayout> decl_QFormLayout_RowWrapPolicy_Enum_as_child (decl_QFormLayout_RowWrapPolicy_Enum, "QtGui", "RowWrapPolicy");
-static gsi::ClassExt<QFormLayout> decl_QFormLayout_RowWrapPolicy_Enums_as_child (decl_QFormLayout_RowWrapPolicy_Enums, "QtGui", "QFlags_RowWrapPolicy");
+static gsi::ClassExt<QFormLayout> decl_QFormLayout_RowWrapPolicy_Enum_as_child (decl_QFormLayout_RowWrapPolicy_Enum, "RowWrapPolicy");
+static gsi::ClassExt<QFormLayout> decl_QFormLayout_RowWrapPolicy_Enums_as_child (decl_QFormLayout_RowWrapPolicy_Enums, "QFlags_RowWrapPolicy");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQFrame.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFrame.cc
index 67b79a1aa..f5ae5ac42 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQFrame.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQFrame.cc
@@ -2723,8 +2723,8 @@ static gsi::QFlagsClass<QFrame::Shadow > decl_QFrame_Shadow_Enums ("QtGui", "QFr
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFrame> inject_QFrame_Shadow_Enum_in_parent (decl_QFrame_Shadow_Enum.defs ());
-static gsi::ClassExt<QFrame> decl_QFrame_Shadow_Enum_as_child (decl_QFrame_Shadow_Enum, "QtGui", "Shadow");
-static gsi::ClassExt<QFrame> decl_QFrame_Shadow_Enums_as_child (decl_QFrame_Shadow_Enums, "QtGui", "QFlags_Shadow");
+static gsi::ClassExt<QFrame> decl_QFrame_Shadow_Enum_as_child (decl_QFrame_Shadow_Enum, "Shadow");
+static gsi::ClassExt<QFrame> decl_QFrame_Shadow_Enums_as_child (decl_QFrame_Shadow_Enums, "QFlags_Shadow");
 
 }
 
@@ -2748,8 +2748,8 @@ static gsi::QFlagsClass<QFrame::Shape > decl_QFrame_Shape_Enums ("QtGui", "QFram
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFrame> inject_QFrame_Shape_Enum_in_parent (decl_QFrame_Shape_Enum.defs ());
-static gsi::ClassExt<QFrame> decl_QFrame_Shape_Enum_as_child (decl_QFrame_Shape_Enum, "QtGui", "Shape");
-static gsi::ClassExt<QFrame> decl_QFrame_Shape_Enums_as_child (decl_QFrame_Shape_Enums, "QtGui", "QFlags_Shape");
+static gsi::ClassExt<QFrame> decl_QFrame_Shape_Enum_as_child (decl_QFrame_Shape_Enum, "Shape");
+static gsi::ClassExt<QFrame> decl_QFrame_Shape_Enums_as_child (decl_QFrame_Shape_Enums, "QFlags_Shape");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQGesture.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGesture.cc
index 7b206c2fd..164de202b 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQGesture.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQGesture.cc
@@ -707,8 +707,8 @@ static gsi::QFlagsClass<QGesture::GestureCancelPolicy > decl_QGesture_GestureCan
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGesture> inject_QGesture_GestureCancelPolicy_Enum_in_parent (decl_QGesture_GestureCancelPolicy_Enum.defs ());
-static gsi::ClassExt<QGesture> decl_QGesture_GestureCancelPolicy_Enum_as_child (decl_QGesture_GestureCancelPolicy_Enum, "QtGui", "GestureCancelPolicy");
-static gsi::ClassExt<QGesture> decl_QGesture_GestureCancelPolicy_Enums_as_child (decl_QGesture_GestureCancelPolicy_Enums, "QtGui", "QFlags_GestureCancelPolicy");
+static gsi::ClassExt<QGesture> decl_QGesture_GestureCancelPolicy_Enum_as_child (decl_QGesture_GestureCancelPolicy_Enum, "GestureCancelPolicy");
+static gsi::ClassExt<QGesture> decl_QGesture_GestureCancelPolicy_Enums_as_child (decl_QGesture_GestureCancelPolicy_Enums, "QFlags_GestureCancelPolicy");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQGestureRecognizer.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGestureRecognizer.cc
index fb7dedcd3..fab030f25 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQGestureRecognizer.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQGestureRecognizer.cc
@@ -365,8 +365,8 @@ static gsi::QFlagsClass<QGestureRecognizer::ResultFlag > decl_QGestureRecognizer
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGestureRecognizer> inject_QGestureRecognizer_ResultFlag_Enum_in_parent (decl_QGestureRecognizer_ResultFlag_Enum.defs ());
-static gsi::ClassExt<QGestureRecognizer> decl_QGestureRecognizer_ResultFlag_Enum_as_child (decl_QGestureRecognizer_ResultFlag_Enum, "QtGui", "ResultFlag");
-static gsi::ClassExt<QGestureRecognizer> decl_QGestureRecognizer_ResultFlag_Enums_as_child (decl_QGestureRecognizer_ResultFlag_Enums, "QtGui", "QFlags_ResultFlag");
+static gsi::ClassExt<QGestureRecognizer> decl_QGestureRecognizer_ResultFlag_Enum_as_child (decl_QGestureRecognizer_ResultFlag_Enum, "ResultFlag");
+static gsi::ClassExt<QGestureRecognizer> decl_QGestureRecognizer_ResultFlag_Enums_as_child (decl_QGestureRecognizer_ResultFlag_Enums, "QFlags_ResultFlag");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQGradient.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGradient.cc
index 470fe3c28..287f86443 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQGradient.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQGradient.cc
@@ -335,8 +335,8 @@ static gsi::QFlagsClass<QGradient::CoordinateMode > decl_QGradient_CoordinateMod
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGradient> inject_QGradient_CoordinateMode_Enum_in_parent (decl_QGradient_CoordinateMode_Enum.defs ());
-static gsi::ClassExt<QGradient> decl_QGradient_CoordinateMode_Enum_as_child (decl_QGradient_CoordinateMode_Enum, "QtGui", "CoordinateMode");
-static gsi::ClassExt<QGradient> decl_QGradient_CoordinateMode_Enums_as_child (decl_QGradient_CoordinateMode_Enums, "QtGui", "QFlags_CoordinateMode");
+static gsi::ClassExt<QGradient> decl_QGradient_CoordinateMode_Enum_as_child (decl_QGradient_CoordinateMode_Enum, "CoordinateMode");
+static gsi::ClassExt<QGradient> decl_QGradient_CoordinateMode_Enums_as_child (decl_QGradient_CoordinateMode_Enums, "QFlags_CoordinateMode");
 
 }
 
@@ -355,8 +355,8 @@ static gsi::QFlagsClass<QGradient::InterpolationMode > decl_QGradient_Interpolat
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGradient> inject_QGradient_InterpolationMode_Enum_in_parent (decl_QGradient_InterpolationMode_Enum.defs ());
-static gsi::ClassExt<QGradient> decl_QGradient_InterpolationMode_Enum_as_child (decl_QGradient_InterpolationMode_Enum, "QtGui", "InterpolationMode");
-static gsi::ClassExt<QGradient> decl_QGradient_InterpolationMode_Enums_as_child (decl_QGradient_InterpolationMode_Enums, "QtGui", "QFlags_InterpolationMode");
+static gsi::ClassExt<QGradient> decl_QGradient_InterpolationMode_Enum_as_child (decl_QGradient_InterpolationMode_Enum, "InterpolationMode");
+static gsi::ClassExt<QGradient> decl_QGradient_InterpolationMode_Enums_as_child (decl_QGradient_InterpolationMode_Enums, "QFlags_InterpolationMode");
 
 }
 
@@ -376,8 +376,8 @@ static gsi::QFlagsClass<QGradient::Spread > decl_QGradient_Spread_Enums ("QtGui"
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGradient> inject_QGradient_Spread_Enum_in_parent (decl_QGradient_Spread_Enum.defs ());
-static gsi::ClassExt<QGradient> decl_QGradient_Spread_Enum_as_child (decl_QGradient_Spread_Enum, "QtGui", "Spread");
-static gsi::ClassExt<QGradient> decl_QGradient_Spread_Enums_as_child (decl_QGradient_Spread_Enums, "QtGui", "QFlags_Spread");
+static gsi::ClassExt<QGradient> decl_QGradient_Spread_Enum_as_child (decl_QGradient_Spread_Enum, "Spread");
+static gsi::ClassExt<QGradient> decl_QGradient_Spread_Enums_as_child (decl_QGradient_Spread_Enums, "QFlags_Spread");
 
 }
 
@@ -398,8 +398,8 @@ static gsi::QFlagsClass<QGradient::Type > decl_QGradient_Type_Enums ("QtGui", "Q
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGradient> inject_QGradient_Type_Enum_in_parent (decl_QGradient_Type_Enum.defs ());
-static gsi::ClassExt<QGradient> decl_QGradient_Type_Enum_as_child (decl_QGradient_Type_Enum, "QtGui", "Type");
-static gsi::ClassExt<QGradient> decl_QGradient_Type_Enums_as_child (decl_QGradient_Type_Enums, "QtGui", "QFlags_Type");
+static gsi::ClassExt<QGradient> decl_QGradient_Type_Enum_as_child (decl_QGradient_Type_Enum, "Type");
+static gsi::ClassExt<QGradient> decl_QGradient_Type_Enums_as_child (decl_QGradient_Type_Enums, "QFlags_Type");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsBlurEffect.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsBlurEffect.cc
index c44ea6687..8d56f95cb 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsBlurEffect.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsBlurEffect.cc
@@ -989,8 +989,8 @@ static gsi::QFlagsClass<QGraphicsBlurEffect::BlurHint > decl_QGraphicsBlurEffect
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGraphicsBlurEffect> inject_QGraphicsBlurEffect_BlurHint_Enum_in_parent (decl_QGraphicsBlurEffect_BlurHint_Enum.defs ());
-static gsi::ClassExt<QGraphicsBlurEffect> decl_QGraphicsBlurEffect_BlurHint_Enum_as_child (decl_QGraphicsBlurEffect_BlurHint_Enum, "QtGui", "BlurHint");
-static gsi::ClassExt<QGraphicsBlurEffect> decl_QGraphicsBlurEffect_BlurHint_Enums_as_child (decl_QGraphicsBlurEffect_BlurHint_Enums, "QtGui", "QFlags_BlurHint");
+static gsi::ClassExt<QGraphicsBlurEffect> decl_QGraphicsBlurEffect_BlurHint_Enum_as_child (decl_QGraphicsBlurEffect_BlurHint_Enum, "BlurHint");
+static gsi::ClassExt<QGraphicsBlurEffect> decl_QGraphicsBlurEffect_BlurHint_Enums_as_child (decl_QGraphicsBlurEffect_BlurHint_Enums, "QFlags_BlurHint");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsEffect.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsEffect.cc
index 98df2fa09..87e7f3a24 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsEffect.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsEffect.cc
@@ -935,8 +935,8 @@ static gsi::QFlagsClass<QGraphicsEffect::ChangeFlag > decl_QGraphicsEffect_Chang
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGraphicsEffect> inject_QGraphicsEffect_ChangeFlag_Enum_in_parent (decl_QGraphicsEffect_ChangeFlag_Enum.defs ());
-static gsi::ClassExt<QGraphicsEffect> decl_QGraphicsEffect_ChangeFlag_Enum_as_child (decl_QGraphicsEffect_ChangeFlag_Enum, "QtGui", "ChangeFlag");
-static gsi::ClassExt<QGraphicsEffect> decl_QGraphicsEffect_ChangeFlag_Enums_as_child (decl_QGraphicsEffect_ChangeFlag_Enums, "QtGui", "QFlags_ChangeFlag");
+static gsi::ClassExt<QGraphicsEffect> decl_QGraphicsEffect_ChangeFlag_Enum_as_child (decl_QGraphicsEffect_ChangeFlag_Enum, "ChangeFlag");
+static gsi::ClassExt<QGraphicsEffect> decl_QGraphicsEffect_ChangeFlag_Enums_as_child (decl_QGraphicsEffect_ChangeFlag_Enums, "QFlags_ChangeFlag");
 
 }
 
@@ -956,8 +956,8 @@ static gsi::QFlagsClass<QGraphicsEffect::PixmapPadMode > decl_QGraphicsEffect_Pi
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGraphicsEffect> inject_QGraphicsEffect_PixmapPadMode_Enum_in_parent (decl_QGraphicsEffect_PixmapPadMode_Enum.defs ());
-static gsi::ClassExt<QGraphicsEffect> decl_QGraphicsEffect_PixmapPadMode_Enum_as_child (decl_QGraphicsEffect_PixmapPadMode_Enum, "QtGui", "PixmapPadMode");
-static gsi::ClassExt<QGraphicsEffect> decl_QGraphicsEffect_PixmapPadMode_Enums_as_child (decl_QGraphicsEffect_PixmapPadMode_Enums, "QtGui", "QFlags_PixmapPadMode");
+static gsi::ClassExt<QGraphicsEffect> decl_QGraphicsEffect_PixmapPadMode_Enum_as_child (decl_QGraphicsEffect_PixmapPadMode_Enum, "PixmapPadMode");
+static gsi::ClassExt<QGraphicsEffect> decl_QGraphicsEffect_PixmapPadMode_Enums_as_child (decl_QGraphicsEffect_PixmapPadMode_Enums, "QFlags_PixmapPadMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsItem.cc
index 94d1341fd..2fda27680 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsItem.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsItem.cc
@@ -5503,8 +5503,8 @@ static gsi::QFlagsClass<QGraphicsItem::CacheMode > decl_QGraphicsItem_CacheMode_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGraphicsItem> inject_QGraphicsItem_CacheMode_Enum_in_parent (decl_QGraphicsItem_CacheMode_Enum.defs ());
-static gsi::ClassExt<QGraphicsItem> decl_QGraphicsItem_CacheMode_Enum_as_child (decl_QGraphicsItem_CacheMode_Enum, "QtGui", "CacheMode");
-static gsi::ClassExt<QGraphicsItem> decl_QGraphicsItem_CacheMode_Enums_as_child (decl_QGraphicsItem_CacheMode_Enums, "QtGui", "QFlags_CacheMode");
+static gsi::ClassExt<QGraphicsItem> decl_QGraphicsItem_CacheMode_Enum_as_child (decl_QGraphicsItem_CacheMode_Enum, "CacheMode");
+static gsi::ClassExt<QGraphicsItem> decl_QGraphicsItem_CacheMode_Enums_as_child (decl_QGraphicsItem_CacheMode_Enums, "QFlags_CacheMode");
 
 }
 
@@ -5549,8 +5549,8 @@ static gsi::QFlagsClass<QGraphicsItem::GraphicsItemChange > decl_QGraphicsItem_G
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGraphicsItem> inject_QGraphicsItem_GraphicsItemChange_Enum_in_parent (decl_QGraphicsItem_GraphicsItemChange_Enum.defs ());
-static gsi::ClassExt<QGraphicsItem> decl_QGraphicsItem_GraphicsItemChange_Enum_as_child (decl_QGraphicsItem_GraphicsItemChange_Enum, "QtGui", "GraphicsItemChange");
-static gsi::ClassExt<QGraphicsItem> decl_QGraphicsItem_GraphicsItemChange_Enums_as_child (decl_QGraphicsItem_GraphicsItemChange_Enums, "QtGui", "QFlags_GraphicsItemChange");
+static gsi::ClassExt<QGraphicsItem> decl_QGraphicsItem_GraphicsItemChange_Enum_as_child (decl_QGraphicsItem_GraphicsItemChange_Enum, "GraphicsItemChange");
+static gsi::ClassExt<QGraphicsItem> decl_QGraphicsItem_GraphicsItemChange_Enums_as_child (decl_QGraphicsItem_GraphicsItemChange_Enums, "QFlags_GraphicsItemChange");
 
 }
 
@@ -5584,8 +5584,8 @@ static gsi::QFlagsClass<QGraphicsItem::GraphicsItemFlag > decl_QGraphicsItem_Gra
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGraphicsItem> inject_QGraphicsItem_GraphicsItemFlag_Enum_in_parent (decl_QGraphicsItem_GraphicsItemFlag_Enum.defs ());
-static gsi::ClassExt<QGraphicsItem> decl_QGraphicsItem_GraphicsItemFlag_Enum_as_child (decl_QGraphicsItem_GraphicsItemFlag_Enum, "QtGui", "GraphicsItemFlag");
-static gsi::ClassExt<QGraphicsItem> decl_QGraphicsItem_GraphicsItemFlag_Enums_as_child (decl_QGraphicsItem_GraphicsItemFlag_Enums, "QtGui", "QFlags_GraphicsItemFlag");
+static gsi::ClassExt<QGraphicsItem> decl_QGraphicsItem_GraphicsItemFlag_Enum_as_child (decl_QGraphicsItem_GraphicsItemFlag_Enum, "GraphicsItemFlag");
+static gsi::ClassExt<QGraphicsItem> decl_QGraphicsItem_GraphicsItemFlag_Enums_as_child (decl_QGraphicsItem_GraphicsItemFlag_Enums, "QFlags_GraphicsItemFlag");
 
 }
 
@@ -5605,8 +5605,8 @@ static gsi::QFlagsClass<QGraphicsItem::PanelModality > decl_QGraphicsItem_PanelM
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGraphicsItem> inject_QGraphicsItem_PanelModality_Enum_in_parent (decl_QGraphicsItem_PanelModality_Enum.defs ());
-static gsi::ClassExt<QGraphicsItem> decl_QGraphicsItem_PanelModality_Enum_as_child (decl_QGraphicsItem_PanelModality_Enum, "QtGui", "PanelModality");
-static gsi::ClassExt<QGraphicsItem> decl_QGraphicsItem_PanelModality_Enums_as_child (decl_QGraphicsItem_PanelModality_Enums, "QtGui", "QFlags_PanelModality");
+static gsi::ClassExt<QGraphicsItem> decl_QGraphicsItem_PanelModality_Enum_as_child (decl_QGraphicsItem_PanelModality_Enum, "PanelModality");
+static gsi::ClassExt<QGraphicsItem> decl_QGraphicsItem_PanelModality_Enums_as_child (decl_QGraphicsItem_PanelModality_Enums, "QFlags_PanelModality");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsPixmapItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsPixmapItem.cc
index 081773538..f3d7c01ef 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsPixmapItem.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsPixmapItem.cc
@@ -2035,8 +2035,8 @@ static gsi::QFlagsClass<QGraphicsPixmapItem::ShapeMode > decl_QGraphicsPixmapIte
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGraphicsPixmapItem> inject_QGraphicsPixmapItem_ShapeMode_Enum_in_parent (decl_QGraphicsPixmapItem_ShapeMode_Enum.defs ());
-static gsi::ClassExt<QGraphicsPixmapItem> decl_QGraphicsPixmapItem_ShapeMode_Enum_as_child (decl_QGraphicsPixmapItem_ShapeMode_Enum, "QtGui", "ShapeMode");
-static gsi::ClassExt<QGraphicsPixmapItem> decl_QGraphicsPixmapItem_ShapeMode_Enums_as_child (decl_QGraphicsPixmapItem_ShapeMode_Enums, "QtGui", "QFlags_ShapeMode");
+static gsi::ClassExt<QGraphicsPixmapItem> decl_QGraphicsPixmapItem_ShapeMode_Enum_as_child (decl_QGraphicsPixmapItem_ShapeMode_Enum, "ShapeMode");
+static gsi::ClassExt<QGraphicsPixmapItem> decl_QGraphicsPixmapItem_ShapeMode_Enums_as_child (decl_QGraphicsPixmapItem_ShapeMode_Enums, "QFlags_ShapeMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsScene.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsScene.cc
index 4a469f13e..1e1d44c1e 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsScene.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsScene.cc
@@ -3411,8 +3411,8 @@ static gsi::QFlagsClass<QGraphicsScene::ItemIndexMethod > decl_QGraphicsScene_It
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGraphicsScene> inject_QGraphicsScene_ItemIndexMethod_Enum_in_parent (decl_QGraphicsScene_ItemIndexMethod_Enum.defs ());
-static gsi::ClassExt<QGraphicsScene> decl_QGraphicsScene_ItemIndexMethod_Enum_as_child (decl_QGraphicsScene_ItemIndexMethod_Enum, "QtGui", "ItemIndexMethod");
-static gsi::ClassExt<QGraphicsScene> decl_QGraphicsScene_ItemIndexMethod_Enums_as_child (decl_QGraphicsScene_ItemIndexMethod_Enums, "QtGui", "QFlags_ItemIndexMethod");
+static gsi::ClassExt<QGraphicsScene> decl_QGraphicsScene_ItemIndexMethod_Enum_as_child (decl_QGraphicsScene_ItemIndexMethod_Enum, "ItemIndexMethod");
+static gsi::ClassExt<QGraphicsScene> decl_QGraphicsScene_ItemIndexMethod_Enums_as_child (decl_QGraphicsScene_ItemIndexMethod_Enums, "QFlags_ItemIndexMethod");
 
 }
 
@@ -3433,8 +3433,8 @@ static gsi::QFlagsClass<QGraphicsScene::SceneLayer > decl_QGraphicsScene_SceneLa
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGraphicsScene> inject_QGraphicsScene_SceneLayer_Enum_in_parent (decl_QGraphicsScene_SceneLayer_Enum.defs ());
-static gsi::ClassExt<QGraphicsScene> decl_QGraphicsScene_SceneLayer_Enum_as_child (decl_QGraphicsScene_SceneLayer_Enum, "QtGui", "SceneLayer");
-static gsi::ClassExt<QGraphicsScene> decl_QGraphicsScene_SceneLayer_Enums_as_child (decl_QGraphicsScene_SceneLayer_Enums, "QtGui", "QFlags_SceneLayer");
+static gsi::ClassExt<QGraphicsScene> decl_QGraphicsScene_SceneLayer_Enum_as_child (decl_QGraphicsScene_SceneLayer_Enum, "SceneLayer");
+static gsi::ClassExt<QGraphicsScene> decl_QGraphicsScene_SceneLayer_Enums_as_child (decl_QGraphicsScene_SceneLayer_Enums, "QFlags_SceneLayer");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneContextMenuEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneContextMenuEvent.cc
index 0bf945924..0831be2d7 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneContextMenuEvent.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneContextMenuEvent.cc
@@ -317,8 +317,8 @@ static gsi::QFlagsClass<QGraphicsSceneContextMenuEvent::Reason > decl_QGraphicsS
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGraphicsSceneContextMenuEvent> inject_QGraphicsSceneContextMenuEvent_Reason_Enum_in_parent (decl_QGraphicsSceneContextMenuEvent_Reason_Enum.defs ());
-static gsi::ClassExt<QGraphicsSceneContextMenuEvent> decl_QGraphicsSceneContextMenuEvent_Reason_Enum_as_child (decl_QGraphicsSceneContextMenuEvent_Reason_Enum, "QtGui", "Reason");
-static gsi::ClassExt<QGraphicsSceneContextMenuEvent> decl_QGraphicsSceneContextMenuEvent_Reason_Enums_as_child (decl_QGraphicsSceneContextMenuEvent_Reason_Enums, "QtGui", "QFlags_Reason");
+static gsi::ClassExt<QGraphicsSceneContextMenuEvent> decl_QGraphicsSceneContextMenuEvent_Reason_Enum_as_child (decl_QGraphicsSceneContextMenuEvent_Reason_Enum, "Reason");
+static gsi::ClassExt<QGraphicsSceneContextMenuEvent> decl_QGraphicsSceneContextMenuEvent_Reason_Enums_as_child (decl_QGraphicsSceneContextMenuEvent_Reason_Enums, "QFlags_Reason");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsView.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsView.cc
index 74c1ee9df..d686cadbb 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsView.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsView.cc
@@ -4451,8 +4451,8 @@ static gsi::QFlagsClass<QGraphicsView::CacheModeFlag > decl_QGraphicsView_CacheM
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGraphicsView> inject_QGraphicsView_CacheModeFlag_Enum_in_parent (decl_QGraphicsView_CacheModeFlag_Enum.defs ());
-static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_CacheModeFlag_Enum_as_child (decl_QGraphicsView_CacheModeFlag_Enum, "QtGui", "CacheModeFlag");
-static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_CacheModeFlag_Enums_as_child (decl_QGraphicsView_CacheModeFlag_Enums, "QtGui", "QFlags_CacheModeFlag");
+static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_CacheModeFlag_Enum_as_child (decl_QGraphicsView_CacheModeFlag_Enum, "CacheModeFlag");
+static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_CacheModeFlag_Enums_as_child (decl_QGraphicsView_CacheModeFlag_Enums, "QFlags_CacheModeFlag");
 
 }
 
@@ -4472,8 +4472,8 @@ static gsi::QFlagsClass<QGraphicsView::DragMode > decl_QGraphicsView_DragMode_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGraphicsView> inject_QGraphicsView_DragMode_Enum_in_parent (decl_QGraphicsView_DragMode_Enum.defs ());
-static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_DragMode_Enum_as_child (decl_QGraphicsView_DragMode_Enum, "QtGui", "DragMode");
-static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_DragMode_Enums_as_child (decl_QGraphicsView_DragMode_Enums, "QtGui", "QFlags_DragMode");
+static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_DragMode_Enum_as_child (decl_QGraphicsView_DragMode_Enum, "DragMode");
+static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_DragMode_Enums_as_child (decl_QGraphicsView_DragMode_Enums, "QFlags_DragMode");
 
 }
 
@@ -4494,8 +4494,8 @@ static gsi::QFlagsClass<QGraphicsView::OptimizationFlag > decl_QGraphicsView_Opt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGraphicsView> inject_QGraphicsView_OptimizationFlag_Enum_in_parent (decl_QGraphicsView_OptimizationFlag_Enum.defs ());
-static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_OptimizationFlag_Enum_as_child (decl_QGraphicsView_OptimizationFlag_Enum, "QtGui", "OptimizationFlag");
-static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_OptimizationFlag_Enums_as_child (decl_QGraphicsView_OptimizationFlag_Enums, "QtGui", "QFlags_OptimizationFlag");
+static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_OptimizationFlag_Enum_as_child (decl_QGraphicsView_OptimizationFlag_Enum, "OptimizationFlag");
+static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_OptimizationFlag_Enums_as_child (decl_QGraphicsView_OptimizationFlag_Enums, "QFlags_OptimizationFlag");
 
 }
 
@@ -4515,8 +4515,8 @@ static gsi::QFlagsClass<QGraphicsView::ViewportAnchor > decl_QGraphicsView_Viewp
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGraphicsView> inject_QGraphicsView_ViewportAnchor_Enum_in_parent (decl_QGraphicsView_ViewportAnchor_Enum.defs ());
-static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_ViewportAnchor_Enum_as_child (decl_QGraphicsView_ViewportAnchor_Enum, "QtGui", "ViewportAnchor");
-static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_ViewportAnchor_Enums_as_child (decl_QGraphicsView_ViewportAnchor_Enums, "QtGui", "QFlags_ViewportAnchor");
+static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_ViewportAnchor_Enum_as_child (decl_QGraphicsView_ViewportAnchor_Enum, "ViewportAnchor");
+static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_ViewportAnchor_Enums_as_child (decl_QGraphicsView_ViewportAnchor_Enums, "QFlags_ViewportAnchor");
 
 }
 
@@ -4538,8 +4538,8 @@ static gsi::QFlagsClass<QGraphicsView::ViewportUpdateMode > decl_QGraphicsView_V
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QGraphicsView> inject_QGraphicsView_ViewportUpdateMode_Enum_in_parent (decl_QGraphicsView_ViewportUpdateMode_Enum.defs ());
-static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_ViewportUpdateMode_Enum_as_child (decl_QGraphicsView_ViewportUpdateMode_Enum, "QtGui", "ViewportUpdateMode");
-static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_ViewportUpdateMode_Enums_as_child (decl_QGraphicsView_ViewportUpdateMode_Enums, "QtGui", "QFlags_ViewportUpdateMode");
+static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_ViewportUpdateMode_Enum_as_child (decl_QGraphicsView_ViewportUpdateMode_Enum, "ViewportUpdateMode");
+static gsi::ClassExt<QGraphicsView> decl_QGraphicsView_ViewportUpdateMode_Enums_as_child (decl_QGraphicsView_ViewportUpdateMode_Enums, "QFlags_ViewportUpdateMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQHeaderView.cc b/src/gsiqt/qt4/QtGui/gsiDeclQHeaderView.cc
index 1f56293cd..f5568bc98 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQHeaderView.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQHeaderView.cc
@@ -6465,8 +6465,8 @@ static gsi::QFlagsClass<QHeaderView::ResizeMode > decl_QHeaderView_ResizeMode_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QHeaderView> inject_QHeaderView_ResizeMode_Enum_in_parent (decl_QHeaderView_ResizeMode_Enum.defs ());
-static gsi::ClassExt<QHeaderView> decl_QHeaderView_ResizeMode_Enum_as_child (decl_QHeaderView_ResizeMode_Enum, "QtGui", "ResizeMode");
-static gsi::ClassExt<QHeaderView> decl_QHeaderView_ResizeMode_Enums_as_child (decl_QHeaderView_ResizeMode_Enums, "QtGui", "QFlags_ResizeMode");
+static gsi::ClassExt<QHeaderView> decl_QHeaderView_ResizeMode_Enum_as_child (decl_QHeaderView_ResizeMode_Enum, "ResizeMode");
+static gsi::ClassExt<QHeaderView> decl_QHeaderView_ResizeMode_Enums_as_child (decl_QHeaderView_ResizeMode_Enums, "QFlags_ResizeMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQIcon.cc b/src/gsiqt/qt4/QtGui/gsiDeclQIcon.cc
index d6a1837e1..617d4923d 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQIcon.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQIcon.cc
@@ -673,8 +673,8 @@ static gsi::QFlagsClass<QIcon::Mode > decl_QIcon_Mode_Enums ("QtGui", "QIcon_QFl
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QIcon> inject_QIcon_Mode_Enum_in_parent (decl_QIcon_Mode_Enum.defs ());
-static gsi::ClassExt<QIcon> decl_QIcon_Mode_Enum_as_child (decl_QIcon_Mode_Enum, "QtGui", "Mode");
-static gsi::ClassExt<QIcon> decl_QIcon_Mode_Enums_as_child (decl_QIcon_Mode_Enums, "QtGui", "QFlags_Mode");
+static gsi::ClassExt<QIcon> decl_QIcon_Mode_Enum_as_child (decl_QIcon_Mode_Enum, "Mode");
+static gsi::ClassExt<QIcon> decl_QIcon_Mode_Enums_as_child (decl_QIcon_Mode_Enums, "QFlags_Mode");
 
 }
 
@@ -693,8 +693,8 @@ static gsi::QFlagsClass<QIcon::State > decl_QIcon_State_Enums ("QtGui", "QIcon_Q
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QIcon> inject_QIcon_State_Enum_in_parent (decl_QIcon_State_Enum.defs ());
-static gsi::ClassExt<QIcon> decl_QIcon_State_Enum_as_child (decl_QIcon_State_Enum, "QtGui", "State");
-static gsi::ClassExt<QIcon> decl_QIcon_State_Enums_as_child (decl_QIcon_State_Enums, "QtGui", "QFlags_State");
+static gsi::ClassExt<QIcon> decl_QIcon_State_Enum_as_child (decl_QIcon_State_Enum, "State");
+static gsi::ClassExt<QIcon> decl_QIcon_State_Enums_as_child (decl_QIcon_State_Enums, "QFlags_State");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQImage.cc b/src/gsiqt/qt4/QtGui/gsiDeclQImage.cc
index c63688fe6..5fe982de0 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQImage.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQImage.cc
@@ -2054,8 +2054,8 @@ static gsi::QFlagsClass<QImage::Format > decl_QImage_Format_Enums ("QtGui", "QIm
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QImage> inject_QImage_Format_Enum_in_parent (decl_QImage_Format_Enum.defs ());
-static gsi::ClassExt<QImage> decl_QImage_Format_Enum_as_child (decl_QImage_Format_Enum, "QtGui", "Format");
-static gsi::ClassExt<QImage> decl_QImage_Format_Enums_as_child (decl_QImage_Format_Enums, "QtGui", "QFlags_Format");
+static gsi::ClassExt<QImage> decl_QImage_Format_Enum_as_child (decl_QImage_Format_Enum, "Format");
+static gsi::ClassExt<QImage> decl_QImage_Format_Enums_as_child (decl_QImage_Format_Enums, "QFlags_Format");
 
 }
 
@@ -2074,8 +2074,8 @@ static gsi::QFlagsClass<QImage::InvertMode > decl_QImage_InvertMode_Enums ("QtGu
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QImage> inject_QImage_InvertMode_Enum_in_parent (decl_QImage_InvertMode_Enum.defs ());
-static gsi::ClassExt<QImage> decl_QImage_InvertMode_Enum_as_child (decl_QImage_InvertMode_Enum, "QtGui", "InvertMode");
-static gsi::ClassExt<QImage> decl_QImage_InvertMode_Enums_as_child (decl_QImage_InvertMode_Enums, "QtGui", "QFlags_InvertMode");
+static gsi::ClassExt<QImage> decl_QImage_InvertMode_Enum_as_child (decl_QImage_InvertMode_Enum, "InvertMode");
+static gsi::ClassExt<QImage> decl_QImage_InvertMode_Enums_as_child (decl_QImage_InvertMode_Enums, "QFlags_InvertMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQImageIOHandler.cc b/src/gsiqt/qt4/QtGui/gsiDeclQImageIOHandler.cc
index 06951b658..946b486c0 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQImageIOHandler.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQImageIOHandler.cc
@@ -1025,8 +1025,8 @@ static gsi::QFlagsClass<QImageIOHandler::ImageOption > decl_QImageIOHandler_Imag
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QImageIOHandler> inject_QImageIOHandler_ImageOption_Enum_in_parent (decl_QImageIOHandler_ImageOption_Enum.defs ());
-static gsi::ClassExt<QImageIOHandler> decl_QImageIOHandler_ImageOption_Enum_as_child (decl_QImageIOHandler_ImageOption_Enum, "QtGui", "ImageOption");
-static gsi::ClassExt<QImageIOHandler> decl_QImageIOHandler_ImageOption_Enums_as_child (decl_QImageIOHandler_ImageOption_Enums, "QtGui", "QFlags_ImageOption");
+static gsi::ClassExt<QImageIOHandler> decl_QImageIOHandler_ImageOption_Enum_as_child (decl_QImageIOHandler_ImageOption_Enum, "ImageOption");
+static gsi::ClassExt<QImageIOHandler> decl_QImageIOHandler_ImageOption_Enums_as_child (decl_QImageIOHandler_ImageOption_Enums, "QFlags_ImageOption");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQImageIOPlugin.cc b/src/gsiqt/qt4/QtGui/gsiDeclQImageIOPlugin.cc
index 30f339cc4..c27ffc417 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQImageIOPlugin.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQImageIOPlugin.cc
@@ -761,8 +761,8 @@ static gsi::QFlagsClass<QImageIOPlugin::Capability > decl_QImageIOPlugin_Capabil
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QImageIOPlugin> inject_QImageIOPlugin_Capability_Enum_in_parent (decl_QImageIOPlugin_Capability_Enum.defs ());
-static gsi::ClassExt<QImageIOPlugin> decl_QImageIOPlugin_Capability_Enum_as_child (decl_QImageIOPlugin_Capability_Enum, "QtGui", "Capability");
-static gsi::ClassExt<QImageIOPlugin> decl_QImageIOPlugin_Capability_Enums_as_child (decl_QImageIOPlugin_Capability_Enums, "QtGui", "QFlags_Capability");
+static gsi::ClassExt<QImageIOPlugin> decl_QImageIOPlugin_Capability_Enum_as_child (decl_QImageIOPlugin_Capability_Enum, "Capability");
+static gsi::ClassExt<QImageIOPlugin> decl_QImageIOPlugin_Capability_Enums_as_child (decl_QImageIOPlugin_Capability_Enums, "QFlags_Capability");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQImageReader.cc b/src/gsiqt/qt4/QtGui/gsiDeclQImageReader.cc
index c1eac4b6d..7d4c29b5c 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQImageReader.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQImageReader.cc
@@ -869,8 +869,8 @@ static gsi::QFlagsClass<QImageReader::ImageReaderError > decl_QImageReader_Image
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QImageReader> inject_QImageReader_ImageReaderError_Enum_in_parent (decl_QImageReader_ImageReaderError_Enum.defs ());
-static gsi::ClassExt<QImageReader> decl_QImageReader_ImageReaderError_Enum_as_child (decl_QImageReader_ImageReaderError_Enum, "QtGui", "ImageReaderError");
-static gsi::ClassExt<QImageReader> decl_QImageReader_ImageReaderError_Enums_as_child (decl_QImageReader_ImageReaderError_Enums, "QtGui", "QFlags_ImageReaderError");
+static gsi::ClassExt<QImageReader> decl_QImageReader_ImageReaderError_Enum_as_child (decl_QImageReader_ImageReaderError_Enum, "ImageReaderError");
+static gsi::ClassExt<QImageReader> decl_QImageReader_ImageReaderError_Enums_as_child (decl_QImageReader_ImageReaderError_Enums, "QFlags_ImageReaderError");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQImageWriter.cc b/src/gsiqt/qt4/QtGui/gsiDeclQImageWriter.cc
index d16df1183..f7b4af7b7 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQImageWriter.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQImageWriter.cc
@@ -521,8 +521,8 @@ static gsi::QFlagsClass<QImageWriter::ImageWriterError > decl_QImageWriter_Image
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QImageWriter> inject_QImageWriter_ImageWriterError_Enum_in_parent (decl_QImageWriter_ImageWriterError_Enum.defs ());
-static gsi::ClassExt<QImageWriter> decl_QImageWriter_ImageWriterError_Enum_as_child (decl_QImageWriter_ImageWriterError_Enum, "QtGui", "ImageWriterError");
-static gsi::ClassExt<QImageWriter> decl_QImageWriter_ImageWriterError_Enums_as_child (decl_QImageWriter_ImageWriterError_Enums, "QtGui", "QFlags_ImageWriterError");
+static gsi::ClassExt<QImageWriter> decl_QImageWriter_ImageWriterError_Enum_as_child (decl_QImageWriter_ImageWriterError_Enum, "ImageWriterError");
+static gsi::ClassExt<QImageWriter> decl_QImageWriter_ImageWriterError_Enums_as_child (decl_QImageWriter_ImageWriterError_Enums, "QFlags_ImageWriterError");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQInputContext.cc b/src/gsiqt/qt4/QtGui/gsiDeclQInputContext.cc
index 930bd1829..0ec1ea542 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQInputContext.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQInputContext.cc
@@ -1260,8 +1260,8 @@ static gsi::QFlagsClass<QInputContext::StandardFormat > decl_QInputContext_Stand
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QInputContext> inject_QInputContext_StandardFormat_Enum_in_parent (decl_QInputContext_StandardFormat_Enum.defs ());
-static gsi::ClassExt<QInputContext> decl_QInputContext_StandardFormat_Enum_as_child (decl_QInputContext_StandardFormat_Enum, "QtGui", "StandardFormat");
-static gsi::ClassExt<QInputContext> decl_QInputContext_StandardFormat_Enums_as_child (decl_QInputContext_StandardFormat_Enums, "QtGui", "QFlags_StandardFormat");
+static gsi::ClassExt<QInputContext> decl_QInputContext_StandardFormat_Enum_as_child (decl_QInputContext_StandardFormat_Enum, "StandardFormat");
+static gsi::ClassExt<QInputContext> decl_QInputContext_StandardFormat_Enums_as_child (decl_QInputContext_StandardFormat_Enums, "QFlags_StandardFormat");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQInputDialog.cc b/src/gsiqt/qt4/QtGui/gsiDeclQInputDialog.cc
index 67b855db4..74f16e431 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQInputDialog.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQInputDialog.cc
@@ -3859,8 +3859,8 @@ static gsi::QFlagsClass<QInputDialog::InputDialogOption > decl_QInputDialog_Inpu
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QInputDialog> inject_QInputDialog_InputDialogOption_Enum_in_parent (decl_QInputDialog_InputDialogOption_Enum.defs ());
-static gsi::ClassExt<QInputDialog> decl_QInputDialog_InputDialogOption_Enum_as_child (decl_QInputDialog_InputDialogOption_Enum, "QtGui", "InputDialogOption");
-static gsi::ClassExt<QInputDialog> decl_QInputDialog_InputDialogOption_Enums_as_child (decl_QInputDialog_InputDialogOption_Enums, "QtGui", "QFlags_InputDialogOption");
+static gsi::ClassExt<QInputDialog> decl_QInputDialog_InputDialogOption_Enum_as_child (decl_QInputDialog_InputDialogOption_Enum, "InputDialogOption");
+static gsi::ClassExt<QInputDialog> decl_QInputDialog_InputDialogOption_Enums_as_child (decl_QInputDialog_InputDialogOption_Enums, "QFlags_InputDialogOption");
 
 }
 
@@ -3880,8 +3880,8 @@ static gsi::QFlagsClass<QInputDialog::InputMode > decl_QInputDialog_InputMode_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QInputDialog> inject_QInputDialog_InputMode_Enum_in_parent (decl_QInputDialog_InputMode_Enum.defs ());
-static gsi::ClassExt<QInputDialog> decl_QInputDialog_InputMode_Enum_as_child (decl_QInputDialog_InputMode_Enum, "QtGui", "InputMode");
-static gsi::ClassExt<QInputDialog> decl_QInputDialog_InputMode_Enums_as_child (decl_QInputDialog_InputMode_Enums, "QtGui", "QFlags_InputMode");
+static gsi::ClassExt<QInputDialog> decl_QInputDialog_InputMode_Enum_as_child (decl_QInputDialog_InputMode_Enum, "InputMode");
+static gsi::ClassExt<QInputDialog> decl_QInputDialog_InputMode_Enums_as_child (decl_QInputDialog_InputMode_Enums, "QFlags_InputMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQInputMethodEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQInputMethodEvent.cc
index dc5ca9d0f..c40dfce61 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQInputMethodEvent.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQInputMethodEvent.cc
@@ -240,8 +240,8 @@ static gsi::QFlagsClass<QInputMethodEvent::AttributeType > decl_QInputMethodEven
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QInputMethodEvent> inject_QInputMethodEvent_AttributeType_Enum_in_parent (decl_QInputMethodEvent_AttributeType_Enum.defs ());
-static gsi::ClassExt<QInputMethodEvent> decl_QInputMethodEvent_AttributeType_Enum_as_child (decl_QInputMethodEvent_AttributeType_Enum, "QtGui", "AttributeType");
-static gsi::ClassExt<QInputMethodEvent> decl_QInputMethodEvent_AttributeType_Enums_as_child (decl_QInputMethodEvent_AttributeType_Enums, "QtGui", "QFlags_AttributeType");
+static gsi::ClassExt<QInputMethodEvent> decl_QInputMethodEvent_AttributeType_Enum_as_child (decl_QInputMethodEvent_AttributeType_Enum, "AttributeType");
+static gsi::ClassExt<QInputMethodEvent> decl_QInputMethodEvent_AttributeType_Enums_as_child (decl_QInputMethodEvent_AttributeType_Enums, "QFlags_AttributeType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQInputMethodEvent_Attribute.cc b/src/gsiqt/qt4/QtGui/gsiDeclQInputMethodEvent_Attribute.cc
index 026a13680..406e68321 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQInputMethodEvent_Attribute.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQInputMethodEvent_Attribute.cc
@@ -78,7 +78,7 @@ gsi::Class<QInputMethodEvent::Attribute> decl_QInputMethodEvent_Attribute ("QtGu
   methods_QInputMethodEvent_Attribute (),
   "@qt\n@brief Binding of QInputMethodEvent::Attribute");
 
-gsi::ClassExt<QInputMethodEvent> decl_QInputMethodEvent_Attribute_as_child (decl_QInputMethodEvent_Attribute, "QtGui", "Attribute");
+gsi::ClassExt<QInputMethodEvent> decl_QInputMethodEvent_Attribute_as_child (decl_QInputMethodEvent_Attribute, "Attribute");
 
 GSI_QTGUI_PUBLIC gsi::Class<QInputMethodEvent::Attribute> &qtdecl_QInputMethodEvent_Attribute () { return decl_QInputMethodEvent_Attribute; }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQItemSelectionModel.cc b/src/gsiqt/qt4/QtGui/gsiDeclQItemSelectionModel.cc
index 9ed71004b..c37e28a3c 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQItemSelectionModel.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQItemSelectionModel.cc
@@ -1266,8 +1266,8 @@ static gsi::QFlagsClass<QItemSelectionModel::SelectionFlag > decl_QItemSelection
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QItemSelectionModel> inject_QItemSelectionModel_SelectionFlag_Enum_in_parent (decl_QItemSelectionModel_SelectionFlag_Enum.defs ());
-static gsi::ClassExt<QItemSelectionModel> decl_QItemSelectionModel_SelectionFlag_Enum_as_child (decl_QItemSelectionModel_SelectionFlag_Enum, "QtGui", "SelectionFlag");
-static gsi::ClassExt<QItemSelectionModel> decl_QItemSelectionModel_SelectionFlag_Enums_as_child (decl_QItemSelectionModel_SelectionFlag_Enums, "QtGui", "QFlags_SelectionFlag");
+static gsi::ClassExt<QItemSelectionModel> decl_QItemSelectionModel_SelectionFlag_Enum_as_child (decl_QItemSelectionModel_SelectionFlag_Enum, "SelectionFlag");
+static gsi::ClassExt<QItemSelectionModel> decl_QItemSelectionModel_SelectionFlag_Enums_as_child (decl_QItemSelectionModel_SelectionFlag_Enums, "QFlags_SelectionFlag");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQKeySequence.cc b/src/gsiqt/qt4/QtGui/gsiDeclQKeySequence.cc
index d6bdb2038..a1e655873 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQKeySequence.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQKeySequence.cc
@@ -485,8 +485,8 @@ static gsi::QFlagsClass<QKeySequence::SequenceFormat > decl_QKeySequence_Sequenc
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QKeySequence> inject_QKeySequence_SequenceFormat_Enum_in_parent (decl_QKeySequence_SequenceFormat_Enum.defs ());
-static gsi::ClassExt<QKeySequence> decl_QKeySequence_SequenceFormat_Enum_as_child (decl_QKeySequence_SequenceFormat_Enum, "QtGui", "SequenceFormat");
-static gsi::ClassExt<QKeySequence> decl_QKeySequence_SequenceFormat_Enums_as_child (decl_QKeySequence_SequenceFormat_Enums, "QtGui", "QFlags_SequenceFormat");
+static gsi::ClassExt<QKeySequence> decl_QKeySequence_SequenceFormat_Enum_as_child (decl_QKeySequence_SequenceFormat_Enum, "SequenceFormat");
+static gsi::ClassExt<QKeySequence> decl_QKeySequence_SequenceFormat_Enums_as_child (decl_QKeySequence_SequenceFormat_Enums, "QFlags_SequenceFormat");
 
 }
 
@@ -506,8 +506,8 @@ static gsi::QFlagsClass<QKeySequence::SequenceMatch > decl_QKeySequence_Sequence
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QKeySequence> inject_QKeySequence_SequenceMatch_Enum_in_parent (decl_QKeySequence_SequenceMatch_Enum.defs ());
-static gsi::ClassExt<QKeySequence> decl_QKeySequence_SequenceMatch_Enum_as_child (decl_QKeySequence_SequenceMatch_Enum, "QtGui", "SequenceMatch");
-static gsi::ClassExt<QKeySequence> decl_QKeySequence_SequenceMatch_Enums_as_child (decl_QKeySequence_SequenceMatch_Enums, "QtGui", "QFlags_SequenceMatch");
+static gsi::ClassExt<QKeySequence> decl_QKeySequence_SequenceMatch_Enum_as_child (decl_QKeySequence_SequenceMatch_Enum, "SequenceMatch");
+static gsi::ClassExt<QKeySequence> decl_QKeySequence_SequenceMatch_Enums_as_child (decl_QKeySequence_SequenceMatch_Enums, "QFlags_SequenceMatch");
 
 }
 
@@ -590,8 +590,8 @@ static gsi::QFlagsClass<QKeySequence::StandardKey > decl_QKeySequence_StandardKe
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QKeySequence> inject_QKeySequence_StandardKey_Enum_in_parent (decl_QKeySequence_StandardKey_Enum.defs ());
-static gsi::ClassExt<QKeySequence> decl_QKeySequence_StandardKey_Enum_as_child (decl_QKeySequence_StandardKey_Enum, "QtGui", "StandardKey");
-static gsi::ClassExt<QKeySequence> decl_QKeySequence_StandardKey_Enums_as_child (decl_QKeySequence_StandardKey_Enums, "QtGui", "QFlags_StandardKey");
+static gsi::ClassExt<QKeySequence> decl_QKeySequence_StandardKey_Enum_as_child (decl_QKeySequence_StandardKey_Enum, "StandardKey");
+static gsi::ClassExt<QKeySequence> decl_QKeySequence_StandardKey_Enums_as_child (decl_QKeySequence_StandardKey_Enums, "QFlags_StandardKey");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQLCDNumber.cc b/src/gsiqt/qt4/QtGui/gsiDeclQLCDNumber.cc
index 8d58ca2ba..20c958f0b 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQLCDNumber.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQLCDNumber.cc
@@ -2921,8 +2921,8 @@ static gsi::QFlagsClass<QLCDNumber::Mode > decl_QLCDNumber_Mode_Enums ("QtGui",
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QLCDNumber> inject_QLCDNumber_Mode_Enum_in_parent (decl_QLCDNumber_Mode_Enum.defs ());
-static gsi::ClassExt<QLCDNumber> decl_QLCDNumber_Mode_Enum_as_child (decl_QLCDNumber_Mode_Enum, "QtGui", "Mode");
-static gsi::ClassExt<QLCDNumber> decl_QLCDNumber_Mode_Enums_as_child (decl_QLCDNumber_Mode_Enums, "QtGui", "QFlags_Mode");
+static gsi::ClassExt<QLCDNumber> decl_QLCDNumber_Mode_Enum_as_child (decl_QLCDNumber_Mode_Enum, "Mode");
+static gsi::ClassExt<QLCDNumber> decl_QLCDNumber_Mode_Enums_as_child (decl_QLCDNumber_Mode_Enums, "QFlags_Mode");
 
 }
 
@@ -2942,8 +2942,8 @@ static gsi::QFlagsClass<QLCDNumber::SegmentStyle > decl_QLCDNumber_SegmentStyle_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QLCDNumber> inject_QLCDNumber_SegmentStyle_Enum_in_parent (decl_QLCDNumber_SegmentStyle_Enum.defs ());
-static gsi::ClassExt<QLCDNumber> decl_QLCDNumber_SegmentStyle_Enum_as_child (decl_QLCDNumber_SegmentStyle_Enum, "QtGui", "SegmentStyle");
-static gsi::ClassExt<QLCDNumber> decl_QLCDNumber_SegmentStyle_Enums_as_child (decl_QLCDNumber_SegmentStyle_Enums, "QtGui", "QFlags_SegmentStyle");
+static gsi::ClassExt<QLCDNumber> decl_QLCDNumber_SegmentStyle_Enum_as_child (decl_QLCDNumber_SegmentStyle_Enum, "SegmentStyle");
+static gsi::ClassExt<QLCDNumber> decl_QLCDNumber_SegmentStyle_Enums_as_child (decl_QLCDNumber_SegmentStyle_Enums, "QFlags_SegmentStyle");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQLayout.cc
index bab5cd869..f1bf9d4d2 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQLayout.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQLayout.cc
@@ -2278,8 +2278,8 @@ static gsi::QFlagsClass<QLayout::SizeConstraint > decl_QLayout_SizeConstraint_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QLayout> inject_QLayout_SizeConstraint_Enum_in_parent (decl_QLayout_SizeConstraint_Enum.defs ());
-static gsi::ClassExt<QLayout> decl_QLayout_SizeConstraint_Enum_as_child (decl_QLayout_SizeConstraint_Enum, "QtGui", "SizeConstraint");
-static gsi::ClassExt<QLayout> decl_QLayout_SizeConstraint_Enums_as_child (decl_QLayout_SizeConstraint_Enums, "QtGui", "QFlags_SizeConstraint");
+static gsi::ClassExt<QLayout> decl_QLayout_SizeConstraint_Enum_as_child (decl_QLayout_SizeConstraint_Enum, "SizeConstraint");
+static gsi::ClassExt<QLayout> decl_QLayout_SizeConstraint_Enums_as_child (decl_QLayout_SizeConstraint_Enums, "QFlags_SizeConstraint");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQLineEdit.cc b/src/gsiqt/qt4/QtGui/gsiDeclQLineEdit.cc
index 6a1c2e124..deaf7078d 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQLineEdit.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQLineEdit.cc
@@ -3774,8 +3774,8 @@ static gsi::QFlagsClass<QLineEdit::EchoMode > decl_QLineEdit_EchoMode_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QLineEdit> inject_QLineEdit_EchoMode_Enum_in_parent (decl_QLineEdit_EchoMode_Enum.defs ());
-static gsi::ClassExt<QLineEdit> decl_QLineEdit_EchoMode_Enum_as_child (decl_QLineEdit_EchoMode_Enum, "QtGui", "EchoMode");
-static gsi::ClassExt<QLineEdit> decl_QLineEdit_EchoMode_Enums_as_child (decl_QLineEdit_EchoMode_Enums, "QtGui", "QFlags_EchoMode");
+static gsi::ClassExt<QLineEdit> decl_QLineEdit_EchoMode_Enum_as_child (decl_QLineEdit_EchoMode_Enum, "EchoMode");
+static gsi::ClassExt<QLineEdit> decl_QLineEdit_EchoMode_Enums_as_child (decl_QLineEdit_EchoMode_Enums, "QFlags_EchoMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQListView.cc b/src/gsiqt/qt4/QtGui/gsiDeclQListView.cc
index 1685c5748..cebead7ef 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQListView.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQListView.cc
@@ -5543,8 +5543,8 @@ static gsi::QFlagsClass<QListView::Flow > decl_QListView_Flow_Enums ("QtGui", "Q
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QListView> inject_QListView_Flow_Enum_in_parent (decl_QListView_Flow_Enum.defs ());
-static gsi::ClassExt<QListView> decl_QListView_Flow_Enum_as_child (decl_QListView_Flow_Enum, "QtGui", "Flow");
-static gsi::ClassExt<QListView> decl_QListView_Flow_Enums_as_child (decl_QListView_Flow_Enums, "QtGui", "QFlags_Flow");
+static gsi::ClassExt<QListView> decl_QListView_Flow_Enum_as_child (decl_QListView_Flow_Enum, "Flow");
+static gsi::ClassExt<QListView> decl_QListView_Flow_Enums_as_child (decl_QListView_Flow_Enums, "QFlags_Flow");
 
 }
 
@@ -5563,8 +5563,8 @@ static gsi::QFlagsClass<QListView::LayoutMode > decl_QListView_LayoutMode_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QListView> inject_QListView_LayoutMode_Enum_in_parent (decl_QListView_LayoutMode_Enum.defs ());
-static gsi::ClassExt<QListView> decl_QListView_LayoutMode_Enum_as_child (decl_QListView_LayoutMode_Enum, "QtGui", "LayoutMode");
-static gsi::ClassExt<QListView> decl_QListView_LayoutMode_Enums_as_child (decl_QListView_LayoutMode_Enums, "QtGui", "QFlags_LayoutMode");
+static gsi::ClassExt<QListView> decl_QListView_LayoutMode_Enum_as_child (decl_QListView_LayoutMode_Enum, "LayoutMode");
+static gsi::ClassExt<QListView> decl_QListView_LayoutMode_Enums_as_child (decl_QListView_LayoutMode_Enums, "QFlags_LayoutMode");
 
 }
 
@@ -5584,8 +5584,8 @@ static gsi::QFlagsClass<QListView::Movement > decl_QListView_Movement_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QListView> inject_QListView_Movement_Enum_in_parent (decl_QListView_Movement_Enum.defs ());
-static gsi::ClassExt<QListView> decl_QListView_Movement_Enum_as_child (decl_QListView_Movement_Enum, "QtGui", "Movement");
-static gsi::ClassExt<QListView> decl_QListView_Movement_Enums_as_child (decl_QListView_Movement_Enums, "QtGui", "QFlags_Movement");
+static gsi::ClassExt<QListView> decl_QListView_Movement_Enum_as_child (decl_QListView_Movement_Enum, "Movement");
+static gsi::ClassExt<QListView> decl_QListView_Movement_Enums_as_child (decl_QListView_Movement_Enums, "QFlags_Movement");
 
 }
 
@@ -5604,8 +5604,8 @@ static gsi::QFlagsClass<QListView::ResizeMode > decl_QListView_ResizeMode_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QListView> inject_QListView_ResizeMode_Enum_in_parent (decl_QListView_ResizeMode_Enum.defs ());
-static gsi::ClassExt<QListView> decl_QListView_ResizeMode_Enum_as_child (decl_QListView_ResizeMode_Enum, "QtGui", "ResizeMode");
-static gsi::ClassExt<QListView> decl_QListView_ResizeMode_Enums_as_child (decl_QListView_ResizeMode_Enums, "QtGui", "QFlags_ResizeMode");
+static gsi::ClassExt<QListView> decl_QListView_ResizeMode_Enum_as_child (decl_QListView_ResizeMode_Enum, "ResizeMode");
+static gsi::ClassExt<QListView> decl_QListView_ResizeMode_Enums_as_child (decl_QListView_ResizeMode_Enums, "QFlags_ResizeMode");
 
 }
 
@@ -5624,8 +5624,8 @@ static gsi::QFlagsClass<QListView::ViewMode > decl_QListView_ViewMode_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QListView> inject_QListView_ViewMode_Enum_in_parent (decl_QListView_ViewMode_Enum.defs ());
-static gsi::ClassExt<QListView> decl_QListView_ViewMode_Enum_as_child (decl_QListView_ViewMode_Enum, "QtGui", "ViewMode");
-static gsi::ClassExt<QListView> decl_QListView_ViewMode_Enums_as_child (decl_QListView_ViewMode_Enums, "QtGui", "QFlags_ViewMode");
+static gsi::ClassExt<QListView> decl_QListView_ViewMode_Enum_as_child (decl_QListView_ViewMode_Enum, "ViewMode");
+static gsi::ClassExt<QListView> decl_QListView_ViewMode_Enums_as_child (decl_QListView_ViewMode_Enums, "QFlags_ViewMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQMainWindow.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMainWindow.cc
index fef42133b..f1a3af77d 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQMainWindow.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQMainWindow.cc
@@ -3547,8 +3547,8 @@ static gsi::QFlagsClass<QMainWindow::DockOption > decl_QMainWindow_DockOption_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QMainWindow> inject_QMainWindow_DockOption_Enum_in_parent (decl_QMainWindow_DockOption_Enum.defs ());
-static gsi::ClassExt<QMainWindow> decl_QMainWindow_DockOption_Enum_as_child (decl_QMainWindow_DockOption_Enum, "QtGui", "DockOption");
-static gsi::ClassExt<QMainWindow> decl_QMainWindow_DockOption_Enums_as_child (decl_QMainWindow_DockOption_Enums, "QtGui", "QFlags_DockOption");
+static gsi::ClassExt<QMainWindow> decl_QMainWindow_DockOption_Enum_as_child (decl_QMainWindow_DockOption_Enum, "DockOption");
+static gsi::ClassExt<QMainWindow> decl_QMainWindow_DockOption_Enums_as_child (decl_QMainWindow_DockOption_Enums, "QFlags_DockOption");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQMdiArea.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMdiArea.cc
index fa98a87f4..ed626a3c2 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQMdiArea.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQMdiArea.cc
@@ -3174,8 +3174,8 @@ static gsi::QFlagsClass<QMdiArea::AreaOption > decl_QMdiArea_AreaOption_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QMdiArea> inject_QMdiArea_AreaOption_Enum_in_parent (decl_QMdiArea_AreaOption_Enum.defs ());
-static gsi::ClassExt<QMdiArea> decl_QMdiArea_AreaOption_Enum_as_child (decl_QMdiArea_AreaOption_Enum, "QtGui", "AreaOption");
-static gsi::ClassExt<QMdiArea> decl_QMdiArea_AreaOption_Enums_as_child (decl_QMdiArea_AreaOption_Enums, "QtGui", "QFlags_AreaOption");
+static gsi::ClassExt<QMdiArea> decl_QMdiArea_AreaOption_Enum_as_child (decl_QMdiArea_AreaOption_Enum, "AreaOption");
+static gsi::ClassExt<QMdiArea> decl_QMdiArea_AreaOption_Enums_as_child (decl_QMdiArea_AreaOption_Enums, "QFlags_AreaOption");
 
 }
 
@@ -3194,8 +3194,8 @@ static gsi::QFlagsClass<QMdiArea::ViewMode > decl_QMdiArea_ViewMode_Enums ("QtGu
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QMdiArea> inject_QMdiArea_ViewMode_Enum_in_parent (decl_QMdiArea_ViewMode_Enum.defs ());
-static gsi::ClassExt<QMdiArea> decl_QMdiArea_ViewMode_Enum_as_child (decl_QMdiArea_ViewMode_Enum, "QtGui", "ViewMode");
-static gsi::ClassExt<QMdiArea> decl_QMdiArea_ViewMode_Enums_as_child (decl_QMdiArea_ViewMode_Enums, "QtGui", "QFlags_ViewMode");
+static gsi::ClassExt<QMdiArea> decl_QMdiArea_ViewMode_Enum_as_child (decl_QMdiArea_ViewMode_Enum, "ViewMode");
+static gsi::ClassExt<QMdiArea> decl_QMdiArea_ViewMode_Enums_as_child (decl_QMdiArea_ViewMode_Enums, "QFlags_ViewMode");
 
 }
 
@@ -3215,8 +3215,8 @@ static gsi::QFlagsClass<QMdiArea::WindowOrder > decl_QMdiArea_WindowOrder_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QMdiArea> inject_QMdiArea_WindowOrder_Enum_in_parent (decl_QMdiArea_WindowOrder_Enum.defs ());
-static gsi::ClassExt<QMdiArea> decl_QMdiArea_WindowOrder_Enum_as_child (decl_QMdiArea_WindowOrder_Enum, "QtGui", "WindowOrder");
-static gsi::ClassExt<QMdiArea> decl_QMdiArea_WindowOrder_Enums_as_child (decl_QMdiArea_WindowOrder_Enums, "QtGui", "QFlags_WindowOrder");
+static gsi::ClassExt<QMdiArea> decl_QMdiArea_WindowOrder_Enum_as_child (decl_QMdiArea_WindowOrder_Enum, "WindowOrder");
+static gsi::ClassExt<QMdiArea> decl_QMdiArea_WindowOrder_Enums_as_child (decl_QMdiArea_WindowOrder_Enums, "QFlags_WindowOrder");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQMdiSubWindow.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMdiSubWindow.cc
index 474fcc6a1..114d9d4a6 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQMdiSubWindow.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQMdiSubWindow.cc
@@ -2820,8 +2820,8 @@ static gsi::QFlagsClass<QMdiSubWindow::SubWindowOption > decl_QMdiSubWindow_SubW
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QMdiSubWindow> inject_QMdiSubWindow_SubWindowOption_Enum_in_parent (decl_QMdiSubWindow_SubWindowOption_Enum.defs ());
-static gsi::ClassExt<QMdiSubWindow> decl_QMdiSubWindow_SubWindowOption_Enum_as_child (decl_QMdiSubWindow_SubWindowOption_Enum, "QtGui", "SubWindowOption");
-static gsi::ClassExt<QMdiSubWindow> decl_QMdiSubWindow_SubWindowOption_Enums_as_child (decl_QMdiSubWindow_SubWindowOption_Enums, "QtGui", "QFlags_SubWindowOption");
+static gsi::ClassExt<QMdiSubWindow> decl_QMdiSubWindow_SubWindowOption_Enum_as_child (decl_QMdiSubWindow_SubWindowOption_Enum, "SubWindowOption");
+static gsi::ClassExt<QMdiSubWindow> decl_QMdiSubWindow_SubWindowOption_Enums_as_child (decl_QMdiSubWindow_SubWindowOption_Enums, "QFlags_SubWindowOption");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQMessageBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMessageBox.cc
index 539cea96b..9e465c22a 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQMessageBox.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQMessageBox.cc
@@ -3678,8 +3678,8 @@ static gsi::QFlagsClass<QMessageBox::ButtonRole > decl_QMessageBox_ButtonRole_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QMessageBox> inject_QMessageBox_ButtonRole_Enum_in_parent (decl_QMessageBox_ButtonRole_Enum.defs ());
-static gsi::ClassExt<QMessageBox> decl_QMessageBox_ButtonRole_Enum_as_child (decl_QMessageBox_ButtonRole_Enum, "QtGui", "ButtonRole");
-static gsi::ClassExt<QMessageBox> decl_QMessageBox_ButtonRole_Enums_as_child (decl_QMessageBox_ButtonRole_Enums, "QtGui", "QFlags_ButtonRole");
+static gsi::ClassExt<QMessageBox> decl_QMessageBox_ButtonRole_Enum_as_child (decl_QMessageBox_ButtonRole_Enum, "ButtonRole");
+static gsi::ClassExt<QMessageBox> decl_QMessageBox_ButtonRole_Enums_as_child (decl_QMessageBox_ButtonRole_Enums, "QFlags_ButtonRole");
 
 }
 
@@ -3701,8 +3701,8 @@ static gsi::QFlagsClass<QMessageBox::Icon > decl_QMessageBox_Icon_Enums ("QtGui"
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QMessageBox> inject_QMessageBox_Icon_Enum_in_parent (decl_QMessageBox_Icon_Enum.defs ());
-static gsi::ClassExt<QMessageBox> decl_QMessageBox_Icon_Enum_as_child (decl_QMessageBox_Icon_Enum, "QtGui", "Icon");
-static gsi::ClassExt<QMessageBox> decl_QMessageBox_Icon_Enums_as_child (decl_QMessageBox_Icon_Enums, "QtGui", "QFlags_Icon");
+static gsi::ClassExt<QMessageBox> decl_QMessageBox_Icon_Enum_as_child (decl_QMessageBox_Icon_Enum, "Icon");
+static gsi::ClassExt<QMessageBox> decl_QMessageBox_Icon_Enums_as_child (decl_QMessageBox_Icon_Enums, "QFlags_Icon");
 
 }
 
@@ -3746,8 +3746,8 @@ static gsi::QFlagsClass<QMessageBox::StandardButton > decl_QMessageBox_StandardB
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QMessageBox> inject_QMessageBox_StandardButton_Enum_in_parent (decl_QMessageBox_StandardButton_Enum.defs ());
-static gsi::ClassExt<QMessageBox> decl_QMessageBox_StandardButton_Enum_as_child (decl_QMessageBox_StandardButton_Enum, "QtGui", "StandardButton");
-static gsi::ClassExt<QMessageBox> decl_QMessageBox_StandardButton_Enums_as_child (decl_QMessageBox_StandardButton_Enums, "QtGui", "QFlags_StandardButton");
+static gsi::ClassExt<QMessageBox> decl_QMessageBox_StandardButton_Enum_as_child (decl_QMessageBox_StandardButton_Enum, "StandardButton");
+static gsi::ClassExt<QMessageBox> decl_QMessageBox_StandardButton_Enums_as_child (decl_QMessageBox_StandardButton_Enums, "QFlags_StandardButton");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQMovie.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMovie.cc
index 6a94a919c..0f48725c8 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQMovie.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQMovie.cc
@@ -1359,8 +1359,8 @@ static gsi::QFlagsClass<QMovie::CacheMode > decl_QMovie_CacheMode_Enums ("QtGui"
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QMovie> inject_QMovie_CacheMode_Enum_in_parent (decl_QMovie_CacheMode_Enum.defs ());
-static gsi::ClassExt<QMovie> decl_QMovie_CacheMode_Enum_as_child (decl_QMovie_CacheMode_Enum, "QtGui", "CacheMode");
-static gsi::ClassExt<QMovie> decl_QMovie_CacheMode_Enums_as_child (decl_QMovie_CacheMode_Enums, "QtGui", "QFlags_CacheMode");
+static gsi::ClassExt<QMovie> decl_QMovie_CacheMode_Enum_as_child (decl_QMovie_CacheMode_Enum, "CacheMode");
+static gsi::ClassExt<QMovie> decl_QMovie_CacheMode_Enums_as_child (decl_QMovie_CacheMode_Enums, "QFlags_CacheMode");
 
 }
 
@@ -1380,8 +1380,8 @@ static gsi::QFlagsClass<QMovie::MovieState > decl_QMovie_MovieState_Enums ("QtGu
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QMovie> inject_QMovie_MovieState_Enum_in_parent (decl_QMovie_MovieState_Enum.defs ());
-static gsi::ClassExt<QMovie> decl_QMovie_MovieState_Enum_as_child (decl_QMovie_MovieState_Enum, "QtGui", "MovieState");
-static gsi::ClassExt<QMovie> decl_QMovie_MovieState_Enums_as_child (decl_QMovie_MovieState_Enums, "QtGui", "QFlags_MovieState");
+static gsi::ClassExt<QMovie> decl_QMovie_MovieState_Enum_as_child (decl_QMovie_MovieState_Enum, "MovieState");
+static gsi::ClassExt<QMovie> decl_QMovie_MovieState_Enums_as_child (decl_QMovie_MovieState_Enums, "QFlags_MovieState");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQPageSetupDialog.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPageSetupDialog.cc
index 4e9c04313..d70e843bc 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQPageSetupDialog.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQPageSetupDialog.cc
@@ -528,8 +528,8 @@ static gsi::QFlagsClass<QPageSetupDialog::PageSetupDialogOption > decl_QPageSetu
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPageSetupDialog> inject_QPageSetupDialog_PageSetupDialogOption_Enum_in_parent (decl_QPageSetupDialog_PageSetupDialogOption_Enum.defs ());
-static gsi::ClassExt<QPageSetupDialog> decl_QPageSetupDialog_PageSetupDialogOption_Enum_as_child (decl_QPageSetupDialog_PageSetupDialogOption_Enum, "QtGui", "PageSetupDialogOption");
-static gsi::ClassExt<QPageSetupDialog> decl_QPageSetupDialog_PageSetupDialogOption_Enums_as_child (decl_QPageSetupDialog_PageSetupDialogOption_Enums, "QtGui", "QFlags_PageSetupDialogOption");
+static gsi::ClassExt<QPageSetupDialog> decl_QPageSetupDialog_PageSetupDialogOption_Enum_as_child (decl_QPageSetupDialog_PageSetupDialogOption_Enum, "PageSetupDialogOption");
+static gsi::ClassExt<QPageSetupDialog> decl_QPageSetupDialog_PageSetupDialogOption_Enums_as_child (decl_QPageSetupDialog_PageSetupDialogOption_Enums, "QFlags_PageSetupDialogOption");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQPaintDevice.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPaintDevice.cc
index 4e4934d43..211e21c02 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQPaintDevice.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQPaintDevice.cc
@@ -410,8 +410,8 @@ static gsi::QFlagsClass<QPaintDevice::PaintDeviceMetric > decl_QPaintDevice_Pain
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPaintDevice> inject_QPaintDevice_PaintDeviceMetric_Enum_in_parent (decl_QPaintDevice_PaintDeviceMetric_Enum.defs ());
-static gsi::ClassExt<QPaintDevice> decl_QPaintDevice_PaintDeviceMetric_Enum_as_child (decl_QPaintDevice_PaintDeviceMetric_Enum, "QtGui", "PaintDeviceMetric");
-static gsi::ClassExt<QPaintDevice> decl_QPaintDevice_PaintDeviceMetric_Enums_as_child (decl_QPaintDevice_PaintDeviceMetric_Enums, "QtGui", "QFlags_PaintDeviceMetric");
+static gsi::ClassExt<QPaintDevice> decl_QPaintDevice_PaintDeviceMetric_Enum_as_child (decl_QPaintDevice_PaintDeviceMetric_Enum, "PaintDeviceMetric");
+static gsi::ClassExt<QPaintDevice> decl_QPaintDevice_PaintDeviceMetric_Enums_as_child (decl_QPaintDevice_PaintDeviceMetric_Enums, "QFlags_PaintDeviceMetric");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQPaintEngine.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPaintEngine.cc
index dd05fdfa7..9255cef48 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQPaintEngine.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQPaintEngine.cc
@@ -1205,8 +1205,8 @@ static gsi::QFlagsClass<QPaintEngine::DirtyFlag > decl_QPaintEngine_DirtyFlag_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPaintEngine> inject_QPaintEngine_DirtyFlag_Enum_in_parent (decl_QPaintEngine_DirtyFlag_Enum.defs ());
-static gsi::ClassExt<QPaintEngine> decl_QPaintEngine_DirtyFlag_Enum_as_child (decl_QPaintEngine_DirtyFlag_Enum, "QtGui", "DirtyFlag");
-static gsi::ClassExt<QPaintEngine> decl_QPaintEngine_DirtyFlag_Enums_as_child (decl_QPaintEngine_DirtyFlag_Enums, "QtGui", "QFlags_DirtyFlag");
+static gsi::ClassExt<QPaintEngine> decl_QPaintEngine_DirtyFlag_Enum_as_child (decl_QPaintEngine_DirtyFlag_Enum, "DirtyFlag");
+static gsi::ClassExt<QPaintEngine> decl_QPaintEngine_DirtyFlag_Enums_as_child (decl_QPaintEngine_DirtyFlag_Enums, "QFlags_DirtyFlag");
 
 }
 
@@ -1243,8 +1243,8 @@ static gsi::QFlagsClass<QPaintEngine::PaintEngineFeature > decl_QPaintEngine_Pai
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPaintEngine> inject_QPaintEngine_PaintEngineFeature_Enum_in_parent (decl_QPaintEngine_PaintEngineFeature_Enum.defs ());
-static gsi::ClassExt<QPaintEngine> decl_QPaintEngine_PaintEngineFeature_Enum_as_child (decl_QPaintEngine_PaintEngineFeature_Enum, "QtGui", "PaintEngineFeature");
-static gsi::ClassExt<QPaintEngine> decl_QPaintEngine_PaintEngineFeature_Enums_as_child (decl_QPaintEngine_PaintEngineFeature_Enums, "QtGui", "QFlags_PaintEngineFeature");
+static gsi::ClassExt<QPaintEngine> decl_QPaintEngine_PaintEngineFeature_Enum_as_child (decl_QPaintEngine_PaintEngineFeature_Enum, "PaintEngineFeature");
+static gsi::ClassExt<QPaintEngine> decl_QPaintEngine_PaintEngineFeature_Enums_as_child (decl_QPaintEngine_PaintEngineFeature_Enums, "QFlags_PaintEngineFeature");
 
 }
 
@@ -1279,8 +1279,8 @@ static gsi::QFlagsClass<QPaintEngine::Type > decl_QPaintEngine_Type_Enums ("QtGu
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPaintEngine> inject_QPaintEngine_Type_Enum_in_parent (decl_QPaintEngine_Type_Enum.defs ());
-static gsi::ClassExt<QPaintEngine> decl_QPaintEngine_Type_Enum_as_child (decl_QPaintEngine_Type_Enum, "QtGui", "Type");
-static gsi::ClassExt<QPaintEngine> decl_QPaintEngine_Type_Enums_as_child (decl_QPaintEngine_Type_Enums, "QtGui", "QFlags_Type");
+static gsi::ClassExt<QPaintEngine> decl_QPaintEngine_Type_Enum_as_child (decl_QPaintEngine_Type_Enum, "Type");
+static gsi::ClassExt<QPaintEngine> decl_QPaintEngine_Type_Enums_as_child (decl_QPaintEngine_Type_Enums, "QFlags_Type");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQPainter.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPainter.cc
index 3c67c859a..6f68f77ad 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQPainter.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQPainter.cc
@@ -4576,8 +4576,8 @@ static gsi::QFlagsClass<QPainter::CompositionMode > decl_QPainter_CompositionMod
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPainter> inject_QPainter_CompositionMode_Enum_in_parent (decl_QPainter_CompositionMode_Enum.defs ());
-static gsi::ClassExt<QPainter> decl_QPainter_CompositionMode_Enum_as_child (decl_QPainter_CompositionMode_Enum, "QtGui", "CompositionMode");
-static gsi::ClassExt<QPainter> decl_QPainter_CompositionMode_Enums_as_child (decl_QPainter_CompositionMode_Enums, "QtGui", "QFlags_CompositionMode");
+static gsi::ClassExt<QPainter> decl_QPainter_CompositionMode_Enum_as_child (decl_QPainter_CompositionMode_Enum, "CompositionMode");
+static gsi::ClassExt<QPainter> decl_QPainter_CompositionMode_Enums_as_child (decl_QPainter_CompositionMode_Enums, "QFlags_CompositionMode");
 
 }
 
@@ -4599,8 +4599,8 @@ static gsi::QFlagsClass<QPainter::RenderHint > decl_QPainter_RenderHint_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPainter> inject_QPainter_RenderHint_Enum_in_parent (decl_QPainter_RenderHint_Enum.defs ());
-static gsi::ClassExt<QPainter> decl_QPainter_RenderHint_Enum_as_child (decl_QPainter_RenderHint_Enum, "QtGui", "RenderHint");
-static gsi::ClassExt<QPainter> decl_QPainter_RenderHint_Enums_as_child (decl_QPainter_RenderHint_Enums, "QtGui", "QFlags_RenderHint");
+static gsi::ClassExt<QPainter> decl_QPainter_RenderHint_Enum_as_child (decl_QPainter_RenderHint_Enum, "RenderHint");
+static gsi::ClassExt<QPainter> decl_QPainter_RenderHint_Enums_as_child (decl_QPainter_RenderHint_Enums, "QFlags_RenderHint");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQPainterPath_Element.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPainterPath_Element.cc
index b7cbd6faf..dfe8b9935 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQPainterPath_Element.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQPainterPath_Element.cc
@@ -153,7 +153,7 @@ gsi::Class<QPainterPath::Element> decl_QPainterPath_Element ("QtGui", "QPainterP
   methods_QPainterPath_Element (),
   "@qt\n@brief Binding of QPainterPath::Element");
 
-gsi::ClassExt<QPainterPath> decl_QPainterPath_Element_as_child (decl_QPainterPath_Element, "QtGui", "Element");
+gsi::ClassExt<QPainterPath> decl_QPainterPath_Element_as_child (decl_QPainterPath_Element, "Element");
 
 GSI_QTGUI_PUBLIC gsi::Class<QPainterPath::Element> &qtdecl_QPainterPath_Element () { return decl_QPainterPath_Element; }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQPalette.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPalette.cc
index 790f67695..3df5de095 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQPalette.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQPalette.cc
@@ -1044,8 +1044,8 @@ static gsi::QFlagsClass<QPalette::ColorGroup > decl_QPalette_ColorGroup_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPalette> inject_QPalette_ColorGroup_Enum_in_parent (decl_QPalette_ColorGroup_Enum.defs ());
-static gsi::ClassExt<QPalette> decl_QPalette_ColorGroup_Enum_as_child (decl_QPalette_ColorGroup_Enum, "QtGui", "ColorGroup");
-static gsi::ClassExt<QPalette> decl_QPalette_ColorGroup_Enums_as_child (decl_QPalette_ColorGroup_Enums, "QtGui", "QFlags_ColorGroup");
+static gsi::ClassExt<QPalette> decl_QPalette_ColorGroup_Enum_as_child (decl_QPalette_ColorGroup_Enum, "ColorGroup");
+static gsi::ClassExt<QPalette> decl_QPalette_ColorGroup_Enums_as_child (decl_QPalette_ColorGroup_Enums, "QFlags_ColorGroup");
 
 }
 
@@ -1085,8 +1085,8 @@ static gsi::QFlagsClass<QPalette::ColorRole > decl_QPalette_ColorRole_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPalette> inject_QPalette_ColorRole_Enum_in_parent (decl_QPalette_ColorRole_Enum.defs ());
-static gsi::ClassExt<QPalette> decl_QPalette_ColorRole_Enum_as_child (decl_QPalette_ColorRole_Enum, "QtGui", "ColorRole");
-static gsi::ClassExt<QPalette> decl_QPalette_ColorRole_Enums_as_child (decl_QPalette_ColorRole_Enums, "QtGui", "QFlags_ColorRole");
+static gsi::ClassExt<QPalette> decl_QPalette_ColorRole_Enum_as_child (decl_QPalette_ColorRole_Enum, "ColorRole");
+static gsi::ClassExt<QPalette> decl_QPalette_ColorRole_Enums_as_child (decl_QPalette_ColorRole_Enums, "QFlags_ColorRole");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQPinchGesture.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPinchGesture.cc
index 0b1aebd0f..01e914278 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQPinchGesture.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQPinchGesture.cc
@@ -976,8 +976,8 @@ static gsi::QFlagsClass<QPinchGesture::ChangeFlag > decl_QPinchGesture_ChangeFla
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPinchGesture> inject_QPinchGesture_ChangeFlag_Enum_in_parent (decl_QPinchGesture_ChangeFlag_Enum.defs ());
-static gsi::ClassExt<QPinchGesture> decl_QPinchGesture_ChangeFlag_Enum_as_child (decl_QPinchGesture_ChangeFlag_Enum, "QtGui", "ChangeFlag");
-static gsi::ClassExt<QPinchGesture> decl_QPinchGesture_ChangeFlag_Enums_as_child (decl_QPinchGesture_ChangeFlag_Enums, "QtGui", "QFlags_ChangeFlag");
+static gsi::ClassExt<QPinchGesture> decl_QPinchGesture_ChangeFlag_Enum_as_child (decl_QPinchGesture_ChangeFlag_Enum, "ChangeFlag");
+static gsi::ClassExt<QPinchGesture> decl_QPinchGesture_ChangeFlag_Enums_as_child (decl_QPinchGesture_ChangeFlag_Enums, "QFlags_ChangeFlag");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQPlainTextEdit.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPlainTextEdit.cc
index 8d50725e5..eae6e21f1 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQPlainTextEdit.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQPlainTextEdit.cc
@@ -4269,8 +4269,8 @@ static gsi::QFlagsClass<QPlainTextEdit::LineWrapMode > decl_QPlainTextEdit_LineW
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPlainTextEdit> inject_QPlainTextEdit_LineWrapMode_Enum_in_parent (decl_QPlainTextEdit_LineWrapMode_Enum.defs ());
-static gsi::ClassExt<QPlainTextEdit> decl_QPlainTextEdit_LineWrapMode_Enum_as_child (decl_QPlainTextEdit_LineWrapMode_Enum, "QtGui", "LineWrapMode");
-static gsi::ClassExt<QPlainTextEdit> decl_QPlainTextEdit_LineWrapMode_Enums_as_child (decl_QPlainTextEdit_LineWrapMode_Enums, "QtGui", "QFlags_LineWrapMode");
+static gsi::ClassExt<QPlainTextEdit> decl_QPlainTextEdit_LineWrapMode_Enum_as_child (decl_QPlainTextEdit_LineWrapMode_Enum, "LineWrapMode");
+static gsi::ClassExt<QPlainTextEdit> decl_QPlainTextEdit_LineWrapMode_Enums_as_child (decl_QPlainTextEdit_LineWrapMode_Enums, "QFlags_LineWrapMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQPrintEngine.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPrintEngine.cc
index 79e4d7460..68a07f539 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQPrintEngine.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQPrintEngine.cc
@@ -494,8 +494,8 @@ static gsi::QFlagsClass<QPrintEngine::PrintEnginePropertyKey > decl_QPrintEngine
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPrintEngine> inject_QPrintEngine_PrintEnginePropertyKey_Enum_in_parent (decl_QPrintEngine_PrintEnginePropertyKey_Enum.defs ());
-static gsi::ClassExt<QPrintEngine> decl_QPrintEngine_PrintEnginePropertyKey_Enum_as_child (decl_QPrintEngine_PrintEnginePropertyKey_Enum, "QtGui", "PrintEnginePropertyKey");
-static gsi::ClassExt<QPrintEngine> decl_QPrintEngine_PrintEnginePropertyKey_Enums_as_child (decl_QPrintEngine_PrintEnginePropertyKey_Enums, "QtGui", "QFlags_PrintEnginePropertyKey");
+static gsi::ClassExt<QPrintEngine> decl_QPrintEngine_PrintEnginePropertyKey_Enum_as_child (decl_QPrintEngine_PrintEnginePropertyKey_Enum, "PrintEnginePropertyKey");
+static gsi::ClassExt<QPrintEngine> decl_QPrintEngine_PrintEnginePropertyKey_Enums_as_child (decl_QPrintEngine_PrintEnginePropertyKey_Enums, "QFlags_PrintEnginePropertyKey");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQPrintPreviewWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPrintPreviewWidget.cc
index c21f74a0c..315444196 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQPrintPreviewWidget.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQPrintPreviewWidget.cc
@@ -2969,8 +2969,8 @@ static gsi::QFlagsClass<QPrintPreviewWidget::ViewMode > decl_QPrintPreviewWidget
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPrintPreviewWidget> inject_QPrintPreviewWidget_ViewMode_Enum_in_parent (decl_QPrintPreviewWidget_ViewMode_Enum.defs ());
-static gsi::ClassExt<QPrintPreviewWidget> decl_QPrintPreviewWidget_ViewMode_Enum_as_child (decl_QPrintPreviewWidget_ViewMode_Enum, "QtGui", "ViewMode");
-static gsi::ClassExt<QPrintPreviewWidget> decl_QPrintPreviewWidget_ViewMode_Enums_as_child (decl_QPrintPreviewWidget_ViewMode_Enums, "QtGui", "QFlags_ViewMode");
+static gsi::ClassExt<QPrintPreviewWidget> decl_QPrintPreviewWidget_ViewMode_Enum_as_child (decl_QPrintPreviewWidget_ViewMode_Enum, "ViewMode");
+static gsi::ClassExt<QPrintPreviewWidget> decl_QPrintPreviewWidget_ViewMode_Enums_as_child (decl_QPrintPreviewWidget_ViewMode_Enums, "QFlags_ViewMode");
 
 }
 
@@ -2990,8 +2990,8 @@ static gsi::QFlagsClass<QPrintPreviewWidget::ZoomMode > decl_QPrintPreviewWidget
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPrintPreviewWidget> inject_QPrintPreviewWidget_ZoomMode_Enum_in_parent (decl_QPrintPreviewWidget_ZoomMode_Enum.defs ());
-static gsi::ClassExt<QPrintPreviewWidget> decl_QPrintPreviewWidget_ZoomMode_Enum_as_child (decl_QPrintPreviewWidget_ZoomMode_Enum, "QtGui", "ZoomMode");
-static gsi::ClassExt<QPrintPreviewWidget> decl_QPrintPreviewWidget_ZoomMode_Enums_as_child (decl_QPrintPreviewWidget_ZoomMode_Enums, "QtGui", "QFlags_ZoomMode");
+static gsi::ClassExt<QPrintPreviewWidget> decl_QPrintPreviewWidget_ZoomMode_Enum_as_child (decl_QPrintPreviewWidget_ZoomMode_Enum, "ZoomMode");
+static gsi::ClassExt<QPrintPreviewWidget> decl_QPrintPreviewWidget_ZoomMode_Enums_as_child (decl_QPrintPreviewWidget_ZoomMode_Enums, "QFlags_ZoomMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQPrinter.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPrinter.cc
index b1867d605..780e710a0 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQPrinter.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQPrinter.cc
@@ -1379,8 +1379,8 @@ static gsi::QFlagsClass<QPrinter::ColorMode > decl_QPrinter_ColorMode_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPrinter> inject_QPrinter_ColorMode_Enum_in_parent (decl_QPrinter_ColorMode_Enum.defs ());
-static gsi::ClassExt<QPrinter> decl_QPrinter_ColorMode_Enum_as_child (decl_QPrinter_ColorMode_Enum, "QtGui", "ColorMode");
-static gsi::ClassExt<QPrinter> decl_QPrinter_ColorMode_Enums_as_child (decl_QPrinter_ColorMode_Enums, "QtGui", "QFlags_ColorMode");
+static gsi::ClassExt<QPrinter> decl_QPrinter_ColorMode_Enum_as_child (decl_QPrinter_ColorMode_Enum, "ColorMode");
+static gsi::ClassExt<QPrinter> decl_QPrinter_ColorMode_Enums_as_child (decl_QPrinter_ColorMode_Enums, "QFlags_ColorMode");
 
 }
 
@@ -1401,8 +1401,8 @@ static gsi::QFlagsClass<QPrinter::DuplexMode > decl_QPrinter_DuplexMode_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPrinter> inject_QPrinter_DuplexMode_Enum_in_parent (decl_QPrinter_DuplexMode_Enum.defs ());
-static gsi::ClassExt<QPrinter> decl_QPrinter_DuplexMode_Enum_as_child (decl_QPrinter_DuplexMode_Enum, "QtGui", "DuplexMode");
-static gsi::ClassExt<QPrinter> decl_QPrinter_DuplexMode_Enums_as_child (decl_QPrinter_DuplexMode_Enums, "QtGui", "QFlags_DuplexMode");
+static gsi::ClassExt<QPrinter> decl_QPrinter_DuplexMode_Enum_as_child (decl_QPrinter_DuplexMode_Enum, "DuplexMode");
+static gsi::ClassExt<QPrinter> decl_QPrinter_DuplexMode_Enums_as_child (decl_QPrinter_DuplexMode_Enums, "QFlags_DuplexMode");
 
 }
 
@@ -1421,8 +1421,8 @@ static gsi::QFlagsClass<QPrinter::Orientation > decl_QPrinter_Orientation_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPrinter> inject_QPrinter_Orientation_Enum_in_parent (decl_QPrinter_Orientation_Enum.defs ());
-static gsi::ClassExt<QPrinter> decl_QPrinter_Orientation_Enum_as_child (decl_QPrinter_Orientation_Enum, "QtGui", "Orientation");
-static gsi::ClassExt<QPrinter> decl_QPrinter_Orientation_Enums_as_child (decl_QPrinter_Orientation_Enums, "QtGui", "QFlags_Orientation");
+static gsi::ClassExt<QPrinter> decl_QPrinter_Orientation_Enum_as_child (decl_QPrinter_Orientation_Enum, "Orientation");
+static gsi::ClassExt<QPrinter> decl_QPrinter_Orientation_Enums_as_child (decl_QPrinter_Orientation_Enums, "QFlags_Orientation");
 
 }
 
@@ -1442,8 +1442,8 @@ static gsi::QFlagsClass<QPrinter::OutputFormat > decl_QPrinter_OutputFormat_Enum
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPrinter> inject_QPrinter_OutputFormat_Enum_in_parent (decl_QPrinter_OutputFormat_Enum.defs ());
-static gsi::ClassExt<QPrinter> decl_QPrinter_OutputFormat_Enum_as_child (decl_QPrinter_OutputFormat_Enum, "QtGui", "OutputFormat");
-static gsi::ClassExt<QPrinter> decl_QPrinter_OutputFormat_Enums_as_child (decl_QPrinter_OutputFormat_Enums, "QtGui", "QFlags_OutputFormat");
+static gsi::ClassExt<QPrinter> decl_QPrinter_OutputFormat_Enum_as_child (decl_QPrinter_OutputFormat_Enum, "OutputFormat");
+static gsi::ClassExt<QPrinter> decl_QPrinter_OutputFormat_Enums_as_child (decl_QPrinter_OutputFormat_Enums, "QFlags_OutputFormat");
 
 }
 
@@ -1462,8 +1462,8 @@ static gsi::QFlagsClass<QPrinter::PageOrder > decl_QPrinter_PageOrder_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPrinter> inject_QPrinter_PageOrder_Enum_in_parent (decl_QPrinter_PageOrder_Enum.defs ());
-static gsi::ClassExt<QPrinter> decl_QPrinter_PageOrder_Enum_as_child (decl_QPrinter_PageOrder_Enum, "QtGui", "PageOrder");
-static gsi::ClassExt<QPrinter> decl_QPrinter_PageOrder_Enums_as_child (decl_QPrinter_PageOrder_Enums, "QtGui", "QFlags_PageOrder");
+static gsi::ClassExt<QPrinter> decl_QPrinter_PageOrder_Enum_as_child (decl_QPrinter_PageOrder_Enum, "PageOrder");
+static gsi::ClassExt<QPrinter> decl_QPrinter_PageOrder_Enums_as_child (decl_QPrinter_PageOrder_Enums, "QFlags_PageOrder");
 
 }
 
@@ -1513,8 +1513,8 @@ static gsi::QFlagsClass<QPrinter::PageSize > decl_QPrinter_PageSize_Enums ("QtGu
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPrinter> inject_QPrinter_PageSize_Enum_in_parent (decl_QPrinter_PageSize_Enum.defs ());
-static gsi::ClassExt<QPrinter> decl_QPrinter_PageSize_Enum_as_child (decl_QPrinter_PageSize_Enum, "QtGui", "PageSize");
-static gsi::ClassExt<QPrinter> decl_QPrinter_PageSize_Enums_as_child (decl_QPrinter_PageSize_Enums, "QtGui", "QFlags_PageSize");
+static gsi::ClassExt<QPrinter> decl_QPrinter_PageSize_Enum_as_child (decl_QPrinter_PageSize_Enum, "PageSize");
+static gsi::ClassExt<QPrinter> decl_QPrinter_PageSize_Enums_as_child (decl_QPrinter_PageSize_Enums, "QFlags_PageSize");
 
 }
 
@@ -1545,8 +1545,8 @@ static gsi::QFlagsClass<QPrinter::PaperSource > decl_QPrinter_PaperSource_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPrinter> inject_QPrinter_PaperSource_Enum_in_parent (decl_QPrinter_PaperSource_Enum.defs ());
-static gsi::ClassExt<QPrinter> decl_QPrinter_PaperSource_Enum_as_child (decl_QPrinter_PaperSource_Enum, "QtGui", "PaperSource");
-static gsi::ClassExt<QPrinter> decl_QPrinter_PaperSource_Enums_as_child (decl_QPrinter_PaperSource_Enums, "QtGui", "QFlags_PaperSource");
+static gsi::ClassExt<QPrinter> decl_QPrinter_PaperSource_Enum_as_child (decl_QPrinter_PaperSource_Enum, "PaperSource");
+static gsi::ClassExt<QPrinter> decl_QPrinter_PaperSource_Enums_as_child (decl_QPrinter_PaperSource_Enums, "QFlags_PaperSource");
 
 }
 
@@ -1566,8 +1566,8 @@ static gsi::QFlagsClass<QPrinter::PrintRange > decl_QPrinter_PrintRange_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPrinter> inject_QPrinter_PrintRange_Enum_in_parent (decl_QPrinter_PrintRange_Enum.defs ());
-static gsi::ClassExt<QPrinter> decl_QPrinter_PrintRange_Enum_as_child (decl_QPrinter_PrintRange_Enum, "QtGui", "PrintRange");
-static gsi::ClassExt<QPrinter> decl_QPrinter_PrintRange_Enums_as_child (decl_QPrinter_PrintRange_Enums, "QtGui", "QFlags_PrintRange");
+static gsi::ClassExt<QPrinter> decl_QPrinter_PrintRange_Enum_as_child (decl_QPrinter_PrintRange_Enum, "PrintRange");
+static gsi::ClassExt<QPrinter> decl_QPrinter_PrintRange_Enums_as_child (decl_QPrinter_PrintRange_Enums, "QFlags_PrintRange");
 
 }
 
@@ -1587,8 +1587,8 @@ static gsi::QFlagsClass<QPrinter::PrinterMode > decl_QPrinter_PrinterMode_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPrinter> inject_QPrinter_PrinterMode_Enum_in_parent (decl_QPrinter_PrinterMode_Enum.defs ());
-static gsi::ClassExt<QPrinter> decl_QPrinter_PrinterMode_Enum_as_child (decl_QPrinter_PrinterMode_Enum, "QtGui", "PrinterMode");
-static gsi::ClassExt<QPrinter> decl_QPrinter_PrinterMode_Enums_as_child (decl_QPrinter_PrinterMode_Enums, "QtGui", "QFlags_PrinterMode");
+static gsi::ClassExt<QPrinter> decl_QPrinter_PrinterMode_Enum_as_child (decl_QPrinter_PrinterMode_Enum, "PrinterMode");
+static gsi::ClassExt<QPrinter> decl_QPrinter_PrinterMode_Enums_as_child (decl_QPrinter_PrinterMode_Enums, "QFlags_PrinterMode");
 
 }
 
@@ -1609,8 +1609,8 @@ static gsi::QFlagsClass<QPrinter::PrinterState > decl_QPrinter_PrinterState_Enum
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPrinter> inject_QPrinter_PrinterState_Enum_in_parent (decl_QPrinter_PrinterState_Enum.defs ());
-static gsi::ClassExt<QPrinter> decl_QPrinter_PrinterState_Enum_as_child (decl_QPrinter_PrinterState_Enum, "QtGui", "PrinterState");
-static gsi::ClassExt<QPrinter> decl_QPrinter_PrinterState_Enums_as_child (decl_QPrinter_PrinterState_Enums, "QtGui", "QFlags_PrinterState");
+static gsi::ClassExt<QPrinter> decl_QPrinter_PrinterState_Enum_as_child (decl_QPrinter_PrinterState_Enum, "PrinterState");
+static gsi::ClassExt<QPrinter> decl_QPrinter_PrinterState_Enums_as_child (decl_QPrinter_PrinterState_Enums, "QFlags_PrinterState");
 
 }
 
@@ -1634,8 +1634,8 @@ static gsi::QFlagsClass<QPrinter::Unit > decl_QPrinter_Unit_Enums ("QtGui", "QPr
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QPrinter> inject_QPrinter_Unit_Enum_in_parent (decl_QPrinter_Unit_Enum.defs ());
-static gsi::ClassExt<QPrinter> decl_QPrinter_Unit_Enum_as_child (decl_QPrinter_Unit_Enum, "QtGui", "Unit");
-static gsi::ClassExt<QPrinter> decl_QPrinter_Unit_Enums_as_child (decl_QPrinter_Unit_Enums, "QtGui", "QFlags_Unit");
+static gsi::ClassExt<QPrinter> decl_QPrinter_Unit_Enum_as_child (decl_QPrinter_Unit_Enum, "Unit");
+static gsi::ClassExt<QPrinter> decl_QPrinter_Unit_Enums_as_child (decl_QPrinter_Unit_Enums, "QFlags_Unit");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQProgressBar.cc b/src/gsiqt/qt4/QtGui/gsiDeclQProgressBar.cc
index b8d45f08b..fc702ce33 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQProgressBar.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQProgressBar.cc
@@ -2945,8 +2945,8 @@ static gsi::QFlagsClass<QProgressBar::Direction > decl_QProgressBar_Direction_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QProgressBar> inject_QProgressBar_Direction_Enum_in_parent (decl_QProgressBar_Direction_Enum.defs ());
-static gsi::ClassExt<QProgressBar> decl_QProgressBar_Direction_Enum_as_child (decl_QProgressBar_Direction_Enum, "QtGui", "Direction");
-static gsi::ClassExt<QProgressBar> decl_QProgressBar_Direction_Enums_as_child (decl_QProgressBar_Direction_Enums, "QtGui", "QFlags_Direction");
+static gsi::ClassExt<QProgressBar> decl_QProgressBar_Direction_Enum_as_child (decl_QProgressBar_Direction_Enum, "Direction");
+static gsi::ClassExt<QProgressBar> decl_QProgressBar_Direction_Enums_as_child (decl_QProgressBar_Direction_Enums, "QFlags_Direction");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQRegion.cc b/src/gsiqt/qt4/QtGui/gsiDeclQRegion.cc
index 53b0c78b5..877e8ad6e 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQRegion.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQRegion.cc
@@ -1055,8 +1055,8 @@ static gsi::QFlagsClass<QRegion::RegionType > decl_QRegion_RegionType_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QRegion> inject_QRegion_RegionType_Enum_in_parent (decl_QRegion_RegionType_Enum.defs ());
-static gsi::ClassExt<QRegion> decl_QRegion_RegionType_Enum_as_child (decl_QRegion_RegionType_Enum, "QtGui", "RegionType");
-static gsi::ClassExt<QRegion> decl_QRegion_RegionType_Enums_as_child (decl_QRegion_RegionType_Enums, "QtGui", "QFlags_RegionType");
+static gsi::ClassExt<QRegion> decl_QRegion_RegionType_Enum_as_child (decl_QRegion_RegionType_Enum, "RegionType");
+static gsi::ClassExt<QRegion> decl_QRegion_RegionType_Enums_as_child (decl_QRegion_RegionType_Enums, "QFlags_RegionType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQRubberBand.cc b/src/gsiqt/qt4/QtGui/gsiDeclQRubberBand.cc
index 90334d031..026e4460c 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQRubberBand.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQRubberBand.cc
@@ -2620,8 +2620,8 @@ static gsi::QFlagsClass<QRubberBand::Shape > decl_QRubberBand_Shape_Enums ("QtGu
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QRubberBand> inject_QRubberBand_Shape_Enum_in_parent (decl_QRubberBand_Shape_Enum.defs ());
-static gsi::ClassExt<QRubberBand> decl_QRubberBand_Shape_Enum_as_child (decl_QRubberBand_Shape_Enum, "QtGui", "Shape");
-static gsi::ClassExt<QRubberBand> decl_QRubberBand_Shape_Enums_as_child (decl_QRubberBand_Shape_Enums, "QtGui", "QFlags_Shape");
+static gsi::ClassExt<QRubberBand> decl_QRubberBand_Shape_Enum_as_child (decl_QRubberBand_Shape_Enum, "Shape");
+static gsi::ClassExt<QRubberBand> decl_QRubberBand_Shape_Enums_as_child (decl_QRubberBand_Shape_Enums, "QFlags_Shape");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQSizePolicy.cc b/src/gsiqt/qt4/QtGui/gsiDeclQSizePolicy.cc
index fa55c8a1d..58b2ce762 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQSizePolicy.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQSizePolicy.cc
@@ -442,8 +442,8 @@ static gsi::QFlagsClass<QSizePolicy::ControlType > decl_QSizePolicy_ControlType_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSizePolicy> inject_QSizePolicy_ControlType_Enum_in_parent (decl_QSizePolicy_ControlType_Enum.defs ());
-static gsi::ClassExt<QSizePolicy> decl_QSizePolicy_ControlType_Enum_as_child (decl_QSizePolicy_ControlType_Enum, "QtGui", "ControlType");
-static gsi::ClassExt<QSizePolicy> decl_QSizePolicy_ControlType_Enums_as_child (decl_QSizePolicy_ControlType_Enums, "QtGui", "QFlags_ControlType");
+static gsi::ClassExt<QSizePolicy> decl_QSizePolicy_ControlType_Enum_as_child (decl_QSizePolicy_ControlType_Enum, "ControlType");
+static gsi::ClassExt<QSizePolicy> decl_QSizePolicy_ControlType_Enums_as_child (decl_QSizePolicy_ControlType_Enums, "QFlags_ControlType");
 
 }
 
@@ -467,8 +467,8 @@ static gsi::QFlagsClass<QSizePolicy::Policy > decl_QSizePolicy_Policy_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSizePolicy> inject_QSizePolicy_Policy_Enum_in_parent (decl_QSizePolicy_Policy_Enum.defs ());
-static gsi::ClassExt<QSizePolicy> decl_QSizePolicy_Policy_Enum_as_child (decl_QSizePolicy_Policy_Enum, "QtGui", "Policy");
-static gsi::ClassExt<QSizePolicy> decl_QSizePolicy_Policy_Enums_as_child (decl_QSizePolicy_Policy_Enums, "QtGui", "QFlags_Policy");
+static gsi::ClassExt<QSizePolicy> decl_QSizePolicy_Policy_Enum_as_child (decl_QSizePolicy_Policy_Enum, "Policy");
+static gsi::ClassExt<QSizePolicy> decl_QSizePolicy_Policy_Enums_as_child (decl_QSizePolicy_Policy_Enums, "QFlags_Policy");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQSlider.cc b/src/gsiqt/qt4/QtGui/gsiDeclQSlider.cc
index 3a00e487a..c7d97bac5 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQSlider.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQSlider.cc
@@ -2868,8 +2868,8 @@ static gsi::QFlagsClass<QSlider::TickPosition > decl_QSlider_TickPosition_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSlider> inject_QSlider_TickPosition_Enum_in_parent (decl_QSlider_TickPosition_Enum.defs ());
-static gsi::ClassExt<QSlider> decl_QSlider_TickPosition_Enum_as_child (decl_QSlider_TickPosition_Enum, "QtGui", "TickPosition");
-static gsi::ClassExt<QSlider> decl_QSlider_TickPosition_Enums_as_child (decl_QSlider_TickPosition_Enums, "QtGui", "QFlags_TickPosition");
+static gsi::ClassExt<QSlider> decl_QSlider_TickPosition_Enum_as_child (decl_QSlider_TickPosition_Enum, "TickPosition");
+static gsi::ClassExt<QSlider> decl_QSlider_TickPosition_Enums_as_child (decl_QSlider_TickPosition_Enums, "QFlags_TickPosition");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQStackedLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStackedLayout.cc
index 88c80197f..fa2d6ed47 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQStackedLayout.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQStackedLayout.cc
@@ -1820,8 +1820,8 @@ static gsi::QFlagsClass<QStackedLayout::StackingMode > decl_QStackedLayout_Stack
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QStackedLayout> inject_QStackedLayout_StackingMode_Enum_in_parent (decl_QStackedLayout_StackingMode_Enum.defs ());
-static gsi::ClassExt<QStackedLayout> decl_QStackedLayout_StackingMode_Enum_as_child (decl_QStackedLayout_StackingMode_Enum, "QtGui", "StackingMode");
-static gsi::ClassExt<QStackedLayout> decl_QStackedLayout_StackingMode_Enums_as_child (decl_QStackedLayout_StackingMode_Enums, "QtGui", "QFlags_StackingMode");
+static gsi::ClassExt<QStackedLayout> decl_QStackedLayout_StackingMode_Enum_as_child (decl_QStackedLayout_StackingMode_Enum, "StackingMode");
+static gsi::ClassExt<QStackedLayout> decl_QStackedLayout_StackingMode_Enums_as_child (decl_QStackedLayout_StackingMode_Enums, "QFlags_StackingMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQStyle.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyle.cc
index bb9fef8e6..a80491ffc 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQStyle.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyle.cc
@@ -2516,8 +2516,8 @@ static gsi::QFlagsClass<QStyle::ComplexControl > decl_QStyle_ComplexControl_Enum
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QStyle> inject_QStyle_ComplexControl_Enum_in_parent (decl_QStyle_ComplexControl_Enum.defs ());
-static gsi::ClassExt<QStyle> decl_QStyle_ComplexControl_Enum_as_child (decl_QStyle_ComplexControl_Enum, "QtGui", "ComplexControl");
-static gsi::ClassExt<QStyle> decl_QStyle_ComplexControl_Enums_as_child (decl_QStyle_ComplexControl_Enums, "QtGui", "QFlags_ComplexControl");
+static gsi::ClassExt<QStyle> decl_QStyle_ComplexControl_Enum_as_child (decl_QStyle_ComplexControl_Enum, "ComplexControl");
+static gsi::ClassExt<QStyle> decl_QStyle_ComplexControl_Enums_as_child (decl_QStyle_ComplexControl_Enums, "QFlags_ComplexControl");
 
 }
 
@@ -2560,8 +2560,8 @@ static gsi::QFlagsClass<QStyle::ContentsType > decl_QStyle_ContentsType_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QStyle> inject_QStyle_ContentsType_Enum_in_parent (decl_QStyle_ContentsType_Enum.defs ());
-static gsi::ClassExt<QStyle> decl_QStyle_ContentsType_Enum_as_child (decl_QStyle_ContentsType_Enum, "QtGui", "ContentsType");
-static gsi::ClassExt<QStyle> decl_QStyle_ContentsType_Enums_as_child (decl_QStyle_ContentsType_Enums, "QtGui", "QFlags_ContentsType");
+static gsi::ClassExt<QStyle> decl_QStyle_ContentsType_Enum_as_child (decl_QStyle_ContentsType_Enum, "ContentsType");
+static gsi::ClassExt<QStyle> decl_QStyle_ContentsType_Enums_as_child (decl_QStyle_ContentsType_Enums, "QFlags_ContentsType");
 
 }
 
@@ -2627,8 +2627,8 @@ static gsi::QFlagsClass<QStyle::ControlElement > decl_QStyle_ControlElement_Enum
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QStyle> inject_QStyle_ControlElement_Enum_in_parent (decl_QStyle_ControlElement_Enum.defs ());
-static gsi::ClassExt<QStyle> decl_QStyle_ControlElement_Enum_as_child (decl_QStyle_ControlElement_Enum, "QtGui", "ControlElement");
-static gsi::ClassExt<QStyle> decl_QStyle_ControlElement_Enums_as_child (decl_QStyle_ControlElement_Enums, "QtGui", "QFlags_ControlElement");
+static gsi::ClassExt<QStyle> decl_QStyle_ControlElement_Enum_as_child (decl_QStyle_ControlElement_Enum, "ControlElement");
+static gsi::ClassExt<QStyle> decl_QStyle_ControlElement_Enums_as_child (decl_QStyle_ControlElement_Enums, "QFlags_ControlElement");
 
 }
 
@@ -2740,8 +2740,8 @@ static gsi::QFlagsClass<QStyle::PixelMetric > decl_QStyle_PixelMetric_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QStyle> inject_QStyle_PixelMetric_Enum_in_parent (decl_QStyle_PixelMetric_Enum.defs ());
-static gsi::ClassExt<QStyle> decl_QStyle_PixelMetric_Enum_as_child (decl_QStyle_PixelMetric_Enum, "QtGui", "PixelMetric");
-static gsi::ClassExt<QStyle> decl_QStyle_PixelMetric_Enums_as_child (decl_QStyle_PixelMetric_Enums, "QtGui", "QFlags_PixelMetric");
+static gsi::ClassExt<QStyle> decl_QStyle_PixelMetric_Enum_as_child (decl_QStyle_PixelMetric_Enum, "PixelMetric");
+static gsi::ClassExt<QStyle> decl_QStyle_PixelMetric_Enums_as_child (decl_QStyle_PixelMetric_Enums, "QFlags_PixelMetric");
 
 }
 
@@ -2815,8 +2815,8 @@ static gsi::QFlagsClass<QStyle::PrimitiveElement > decl_QStyle_PrimitiveElement_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QStyle> inject_QStyle_PrimitiveElement_Enum_in_parent (decl_QStyle_PrimitiveElement_Enum.defs ());
-static gsi::ClassExt<QStyle> decl_QStyle_PrimitiveElement_Enum_as_child (decl_QStyle_PrimitiveElement_Enum, "QtGui", "PrimitiveElement");
-static gsi::ClassExt<QStyle> decl_QStyle_PrimitiveElement_Enums_as_child (decl_QStyle_PrimitiveElement_Enums, "QtGui", "QFlags_PrimitiveElement");
+static gsi::ClassExt<QStyle> decl_QStyle_PrimitiveElement_Enum_as_child (decl_QStyle_PrimitiveElement_Enum, "PrimitiveElement");
+static gsi::ClassExt<QStyle> decl_QStyle_PrimitiveElement_Enums_as_child (decl_QStyle_PrimitiveElement_Enums, "QFlags_PrimitiveElement");
 
 }
 
@@ -2903,8 +2903,8 @@ static gsi::QFlagsClass<QStyle::StandardPixmap > decl_QStyle_StandardPixmap_Enum
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QStyle> inject_QStyle_StandardPixmap_Enum_in_parent (decl_QStyle_StandardPixmap_Enum.defs ());
-static gsi::ClassExt<QStyle> decl_QStyle_StandardPixmap_Enum_as_child (decl_QStyle_StandardPixmap_Enum, "QtGui", "StandardPixmap");
-static gsi::ClassExt<QStyle> decl_QStyle_StandardPixmap_Enums_as_child (decl_QStyle_StandardPixmap_Enums, "QtGui", "QFlags_StandardPixmap");
+static gsi::ClassExt<QStyle> decl_QStyle_StandardPixmap_Enum_as_child (decl_QStyle_StandardPixmap_Enum, "StandardPixmap");
+static gsi::ClassExt<QStyle> decl_QStyle_StandardPixmap_Enums_as_child (decl_QStyle_StandardPixmap_Enums, "QFlags_StandardPixmap");
 
 }
 
@@ -3021,8 +3021,8 @@ static gsi::QFlagsClass<QStyle::StyleHint > decl_QStyle_StyleHint_Enums ("QtGui"
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QStyle> inject_QStyle_StyleHint_Enum_in_parent (decl_QStyle_StyleHint_Enum.defs ());
-static gsi::ClassExt<QStyle> decl_QStyle_StyleHint_Enum_as_child (decl_QStyle_StyleHint_Enum, "QtGui", "StyleHint");
-static gsi::ClassExt<QStyle> decl_QStyle_StyleHint_Enums_as_child (decl_QStyle_StyleHint_Enums, "QtGui", "QFlags_StyleHint");
+static gsi::ClassExt<QStyle> decl_QStyle_StyleHint_Enum_as_child (decl_QStyle_StyleHint_Enum, "StyleHint");
+static gsi::ClassExt<QStyle> decl_QStyle_StyleHint_Enums_as_child (decl_QStyle_StyleHint_Enums, "QFlags_StyleHint");
 
 }
 
@@ -3085,8 +3085,8 @@ static gsi::QFlagsClass<QStyle::SubControl > decl_QStyle_SubControl_Enums ("QtGu
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QStyle> inject_QStyle_SubControl_Enum_in_parent (decl_QStyle_SubControl_Enum.defs ());
-static gsi::ClassExt<QStyle> decl_QStyle_SubControl_Enum_as_child (decl_QStyle_SubControl_Enum, "QtGui", "SubControl");
-static gsi::ClassExt<QStyle> decl_QStyle_SubControl_Enums_as_child (decl_QStyle_SubControl_Enums, "QtGui", "QFlags_SubControl");
+static gsi::ClassExt<QStyle> decl_QStyle_SubControl_Enum_as_child (decl_QStyle_SubControl_Enum, "SubControl");
+static gsi::ClassExt<QStyle> decl_QStyle_SubControl_Enums_as_child (decl_QStyle_SubControl_Enums, "QFlags_SubControl");
 
 }
 
@@ -3169,8 +3169,8 @@ static gsi::QFlagsClass<QStyle::SubElement > decl_QStyle_SubElement_Enums ("QtGu
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QStyle> inject_QStyle_SubElement_Enum_in_parent (decl_QStyle_SubElement_Enum.defs ());
-static gsi::ClassExt<QStyle> decl_QStyle_SubElement_Enum_as_child (decl_QStyle_SubElement_Enum, "QtGui", "SubElement");
-static gsi::ClassExt<QStyle> decl_QStyle_SubElement_Enums_as_child (decl_QStyle_SubElement_Enums, "QtGui", "QFlags_SubElement");
+static gsi::ClassExt<QStyle> decl_QStyle_SubElement_Enum_as_child (decl_QStyle_SubElement_Enum, "SubElement");
+static gsi::ClassExt<QStyle> decl_QStyle_SubElement_Enums_as_child (decl_QStyle_SubElement_Enums, "QFlags_SubElement");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQSwipeGesture.cc b/src/gsiqt/qt4/QtGui/gsiDeclQSwipeGesture.cc
index cd22f00c8..d835ec3b2 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQSwipeGesture.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQSwipeGesture.cc
@@ -640,8 +640,8 @@ static gsi::QFlagsClass<QSwipeGesture::SwipeDirection > decl_QSwipeGesture_Swipe
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSwipeGesture> inject_QSwipeGesture_SwipeDirection_Enum_in_parent (decl_QSwipeGesture_SwipeDirection_Enum.defs ());
-static gsi::ClassExt<QSwipeGesture> decl_QSwipeGesture_SwipeDirection_Enum_as_child (decl_QSwipeGesture_SwipeDirection_Enum, "QtGui", "SwipeDirection");
-static gsi::ClassExt<QSwipeGesture> decl_QSwipeGesture_SwipeDirection_Enums_as_child (decl_QSwipeGesture_SwipeDirection_Enums, "QtGui", "QFlags_SwipeDirection");
+static gsi::ClassExt<QSwipeGesture> decl_QSwipeGesture_SwipeDirection_Enum_as_child (decl_QSwipeGesture_SwipeDirection_Enum, "SwipeDirection");
+static gsi::ClassExt<QSwipeGesture> decl_QSwipeGesture_SwipeDirection_Enums_as_child (decl_QSwipeGesture_SwipeDirection_Enums, "QFlags_SwipeDirection");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQSystemTrayIcon.cc b/src/gsiqt/qt4/QtGui/gsiDeclQSystemTrayIcon.cc
index 2e9d4b7fd..06956c685 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQSystemTrayIcon.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQSystemTrayIcon.cc
@@ -915,8 +915,8 @@ static gsi::QFlagsClass<QSystemTrayIcon::ActivationReason > decl_QSystemTrayIcon
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSystemTrayIcon> inject_QSystemTrayIcon_ActivationReason_Enum_in_parent (decl_QSystemTrayIcon_ActivationReason_Enum.defs ());
-static gsi::ClassExt<QSystemTrayIcon> decl_QSystemTrayIcon_ActivationReason_Enum_as_child (decl_QSystemTrayIcon_ActivationReason_Enum, "QtGui", "ActivationReason");
-static gsi::ClassExt<QSystemTrayIcon> decl_QSystemTrayIcon_ActivationReason_Enums_as_child (decl_QSystemTrayIcon_ActivationReason_Enums, "QtGui", "QFlags_ActivationReason");
+static gsi::ClassExt<QSystemTrayIcon> decl_QSystemTrayIcon_ActivationReason_Enum_as_child (decl_QSystemTrayIcon_ActivationReason_Enum, "ActivationReason");
+static gsi::ClassExt<QSystemTrayIcon> decl_QSystemTrayIcon_ActivationReason_Enums_as_child (decl_QSystemTrayIcon_ActivationReason_Enums, "QFlags_ActivationReason");
 
 }
 
@@ -937,8 +937,8 @@ static gsi::QFlagsClass<QSystemTrayIcon::MessageIcon > decl_QSystemTrayIcon_Mess
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSystemTrayIcon> inject_QSystemTrayIcon_MessageIcon_Enum_in_parent (decl_QSystemTrayIcon_MessageIcon_Enum.defs ());
-static gsi::ClassExt<QSystemTrayIcon> decl_QSystemTrayIcon_MessageIcon_Enum_as_child (decl_QSystemTrayIcon_MessageIcon_Enum, "QtGui", "MessageIcon");
-static gsi::ClassExt<QSystemTrayIcon> decl_QSystemTrayIcon_MessageIcon_Enums_as_child (decl_QSystemTrayIcon_MessageIcon_Enums, "QtGui", "QFlags_MessageIcon");
+static gsi::ClassExt<QSystemTrayIcon> decl_QSystemTrayIcon_MessageIcon_Enum_as_child (decl_QSystemTrayIcon_MessageIcon_Enum, "MessageIcon");
+static gsi::ClassExt<QSystemTrayIcon> decl_QSystemTrayIcon_MessageIcon_Enums_as_child (decl_QSystemTrayIcon_MessageIcon_Enums, "QFlags_MessageIcon");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTabBar.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTabBar.cc
index d73af1025..915d4feef 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTabBar.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTabBar.cc
@@ -3698,8 +3698,8 @@ static gsi::QFlagsClass<QTabBar::ButtonPosition > decl_QTabBar_ButtonPosition_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTabBar> inject_QTabBar_ButtonPosition_Enum_in_parent (decl_QTabBar_ButtonPosition_Enum.defs ());
-static gsi::ClassExt<QTabBar> decl_QTabBar_ButtonPosition_Enum_as_child (decl_QTabBar_ButtonPosition_Enum, "QtGui", "ButtonPosition");
-static gsi::ClassExt<QTabBar> decl_QTabBar_ButtonPosition_Enums_as_child (decl_QTabBar_ButtonPosition_Enums, "QtGui", "QFlags_ButtonPosition");
+static gsi::ClassExt<QTabBar> decl_QTabBar_ButtonPosition_Enum_as_child (decl_QTabBar_ButtonPosition_Enum, "ButtonPosition");
+static gsi::ClassExt<QTabBar> decl_QTabBar_ButtonPosition_Enums_as_child (decl_QTabBar_ButtonPosition_Enums, "QFlags_ButtonPosition");
 
 }
 
@@ -3719,8 +3719,8 @@ static gsi::QFlagsClass<QTabBar::SelectionBehavior > decl_QTabBar_SelectionBehav
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTabBar> inject_QTabBar_SelectionBehavior_Enum_in_parent (decl_QTabBar_SelectionBehavior_Enum.defs ());
-static gsi::ClassExt<QTabBar> decl_QTabBar_SelectionBehavior_Enum_as_child (decl_QTabBar_SelectionBehavior_Enum, "QtGui", "SelectionBehavior");
-static gsi::ClassExt<QTabBar> decl_QTabBar_SelectionBehavior_Enums_as_child (decl_QTabBar_SelectionBehavior_Enums, "QtGui", "QFlags_SelectionBehavior");
+static gsi::ClassExt<QTabBar> decl_QTabBar_SelectionBehavior_Enum_as_child (decl_QTabBar_SelectionBehavior_Enum, "SelectionBehavior");
+static gsi::ClassExt<QTabBar> decl_QTabBar_SelectionBehavior_Enums_as_child (decl_QTabBar_SelectionBehavior_Enums, "QFlags_SelectionBehavior");
 
 }
 
@@ -3745,8 +3745,8 @@ static gsi::QFlagsClass<QTabBar::Shape > decl_QTabBar_Shape_Enums ("QtGui", "QTa
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTabBar> inject_QTabBar_Shape_Enum_in_parent (decl_QTabBar_Shape_Enum.defs ());
-static gsi::ClassExt<QTabBar> decl_QTabBar_Shape_Enum_as_child (decl_QTabBar_Shape_Enum, "QtGui", "Shape");
-static gsi::ClassExt<QTabBar> decl_QTabBar_Shape_Enums_as_child (decl_QTabBar_Shape_Enums, "QtGui", "QFlags_Shape");
+static gsi::ClassExt<QTabBar> decl_QTabBar_Shape_Enum_as_child (decl_QTabBar_Shape_Enum, "Shape");
+static gsi::ClassExt<QTabBar> decl_QTabBar_Shape_Enums_as_child (decl_QTabBar_Shape_Enums, "QFlags_Shape");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTabWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTabWidget.cc
index dc77a1ab3..91eaaaca3 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTabWidget.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTabWidget.cc
@@ -3508,8 +3508,8 @@ static gsi::QFlagsClass<QTabWidget::TabPosition > decl_QTabWidget_TabPosition_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTabWidget> inject_QTabWidget_TabPosition_Enum_in_parent (decl_QTabWidget_TabPosition_Enum.defs ());
-static gsi::ClassExt<QTabWidget> decl_QTabWidget_TabPosition_Enum_as_child (decl_QTabWidget_TabPosition_Enum, "QtGui", "TabPosition");
-static gsi::ClassExt<QTabWidget> decl_QTabWidget_TabPosition_Enums_as_child (decl_QTabWidget_TabPosition_Enums, "QtGui", "QFlags_TabPosition");
+static gsi::ClassExt<QTabWidget> decl_QTabWidget_TabPosition_Enum_as_child (decl_QTabWidget_TabPosition_Enum, "TabPosition");
+static gsi::ClassExt<QTabWidget> decl_QTabWidget_TabPosition_Enums_as_child (decl_QTabWidget_TabPosition_Enums, "QFlags_TabPosition");
 
 }
 
@@ -3528,8 +3528,8 @@ static gsi::QFlagsClass<QTabWidget::TabShape > decl_QTabWidget_TabShape_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTabWidget> inject_QTabWidget_TabShape_Enum_in_parent (decl_QTabWidget_TabShape_Enum.defs ());
-static gsi::ClassExt<QTabWidget> decl_QTabWidget_TabShape_Enum_as_child (decl_QTabWidget_TabShape_Enum, "QtGui", "TabShape");
-static gsi::ClassExt<QTabWidget> decl_QTabWidget_TabShape_Enums_as_child (decl_QTabWidget_TabShape_Enums, "QtGui", "QFlags_TabShape");
+static gsi::ClassExt<QTabWidget> decl_QTabWidget_TabShape_Enum_as_child (decl_QTabWidget_TabShape_Enum, "TabShape");
+static gsi::ClassExt<QTabWidget> decl_QTabWidget_TabShape_Enums_as_child (decl_QTabWidget_TabShape_Enums, "QFlags_TabShape");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTabletEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTabletEvent.cc
index b2890326b..8fbfe54d5 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTabletEvent.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTabletEvent.cc
@@ -389,8 +389,8 @@ static gsi::QFlagsClass<QTabletEvent::PointerType > decl_QTabletEvent_PointerTyp
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTabletEvent> inject_QTabletEvent_PointerType_Enum_in_parent (decl_QTabletEvent_PointerType_Enum.defs ());
-static gsi::ClassExt<QTabletEvent> decl_QTabletEvent_PointerType_Enum_as_child (decl_QTabletEvent_PointerType_Enum, "QtGui", "PointerType");
-static gsi::ClassExt<QTabletEvent> decl_QTabletEvent_PointerType_Enums_as_child (decl_QTabletEvent_PointerType_Enums, "QtGui", "QFlags_PointerType");
+static gsi::ClassExt<QTabletEvent> decl_QTabletEvent_PointerType_Enum_as_child (decl_QTabletEvent_PointerType_Enum, "PointerType");
+static gsi::ClassExt<QTabletEvent> decl_QTabletEvent_PointerType_Enums_as_child (decl_QTabletEvent_PointerType_Enums, "QFlags_PointerType");
 
 }
 
@@ -414,8 +414,8 @@ static gsi::QFlagsClass<QTabletEvent::TabletDevice > decl_QTabletEvent_TabletDev
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTabletEvent> inject_QTabletEvent_TabletDevice_Enum_in_parent (decl_QTabletEvent_TabletDevice_Enum.defs ());
-static gsi::ClassExt<QTabletEvent> decl_QTabletEvent_TabletDevice_Enum_as_child (decl_QTabletEvent_TabletDevice_Enum, "QtGui", "TabletDevice");
-static gsi::ClassExt<QTabletEvent> decl_QTabletEvent_TabletDevice_Enums_as_child (decl_QTabletEvent_TabletDevice_Enums, "QtGui", "QFlags_TabletDevice");
+static gsi::ClassExt<QTabletEvent> decl_QTabletEvent_TabletDevice_Enum_as_child (decl_QTabletEvent_TabletDevice_Enum, "TabletDevice");
+static gsi::ClassExt<QTabletEvent> decl_QTabletEvent_TabletDevice_Enums_as_child (decl_QTabletEvent_TabletDevice_Enums, "QFlags_TabletDevice");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTextBlock_Iterator.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextBlock_Iterator.cc
index aff036890..6659c42a2 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTextBlock_Iterator.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextBlock_Iterator.cc
@@ -230,7 +230,7 @@ gsi::Class<QTextBlock::iterator> decl_QTextBlock_Iterator ("QtGui", "QTextBlock_
   methods_QTextBlock_Iterator (),
   "@qt\n@brief Binding of QTextBlock::iterator");
 
-gsi::ClassExt<QTextBlock> decl_QTextBlock_Iterator_as_child (decl_QTextBlock_Iterator, "QtGui", "Iterator");
+gsi::ClassExt<QTextBlock> decl_QTextBlock_Iterator_as_child (decl_QTextBlock_Iterator, "Iterator");
 
 GSI_QTGUI_PUBLIC gsi::Class<QTextBlock::iterator> &qtdecl_QTextBlock_Iterator () { return decl_QTextBlock_Iterator; }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTextCharFormat.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextCharFormat.cc
index b4671c811..f36402b99 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTextCharFormat.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextCharFormat.cc
@@ -1086,8 +1086,8 @@ static gsi::QFlagsClass<QTextCharFormat::UnderlineStyle > decl_QTextCharFormat_U
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextCharFormat> inject_QTextCharFormat_UnderlineStyle_Enum_in_parent (decl_QTextCharFormat_UnderlineStyle_Enum.defs ());
-static gsi::ClassExt<QTextCharFormat> decl_QTextCharFormat_UnderlineStyle_Enum_as_child (decl_QTextCharFormat_UnderlineStyle_Enum, "QtGui", "UnderlineStyle");
-static gsi::ClassExt<QTextCharFormat> decl_QTextCharFormat_UnderlineStyle_Enums_as_child (decl_QTextCharFormat_UnderlineStyle_Enums, "QtGui", "QFlags_UnderlineStyle");
+static gsi::ClassExt<QTextCharFormat> decl_QTextCharFormat_UnderlineStyle_Enum_as_child (decl_QTextCharFormat_UnderlineStyle_Enum, "UnderlineStyle");
+static gsi::ClassExt<QTextCharFormat> decl_QTextCharFormat_UnderlineStyle_Enums_as_child (decl_QTextCharFormat_UnderlineStyle_Enums, "QFlags_UnderlineStyle");
 
 }
 
@@ -1110,8 +1110,8 @@ static gsi::QFlagsClass<QTextCharFormat::VerticalAlignment > decl_QTextCharForma
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextCharFormat> inject_QTextCharFormat_VerticalAlignment_Enum_in_parent (decl_QTextCharFormat_VerticalAlignment_Enum.defs ());
-static gsi::ClassExt<QTextCharFormat> decl_QTextCharFormat_VerticalAlignment_Enum_as_child (decl_QTextCharFormat_VerticalAlignment_Enum, "QtGui", "VerticalAlignment");
-static gsi::ClassExt<QTextCharFormat> decl_QTextCharFormat_VerticalAlignment_Enums_as_child (decl_QTextCharFormat_VerticalAlignment_Enums, "QtGui", "QFlags_VerticalAlignment");
+static gsi::ClassExt<QTextCharFormat> decl_QTextCharFormat_VerticalAlignment_Enum_as_child (decl_QTextCharFormat_VerticalAlignment_Enum, "VerticalAlignment");
+static gsi::ClassExt<QTextCharFormat> decl_QTextCharFormat_VerticalAlignment_Enums_as_child (decl_QTextCharFormat_VerticalAlignment_Enums, "QFlags_VerticalAlignment");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTextCursor.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextCursor.cc
index 04aa881c9..7e2d3c9e9 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTextCursor.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextCursor.cc
@@ -1477,8 +1477,8 @@ static gsi::QFlagsClass<QTextCursor::MoveMode > decl_QTextCursor_MoveMode_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextCursor> inject_QTextCursor_MoveMode_Enum_in_parent (decl_QTextCursor_MoveMode_Enum.defs ());
-static gsi::ClassExt<QTextCursor> decl_QTextCursor_MoveMode_Enum_as_child (decl_QTextCursor_MoveMode_Enum, "QtGui", "MoveMode");
-static gsi::ClassExt<QTextCursor> decl_QTextCursor_MoveMode_Enums_as_child (decl_QTextCursor_MoveMode_Enums, "QtGui", "QFlags_MoveMode");
+static gsi::ClassExt<QTextCursor> decl_QTextCursor_MoveMode_Enum_as_child (decl_QTextCursor_MoveMode_Enum, "MoveMode");
+static gsi::ClassExt<QTextCursor> decl_QTextCursor_MoveMode_Enums_as_child (decl_QTextCursor_MoveMode_Enums, "QFlags_MoveMode");
 
 }
 
@@ -1520,8 +1520,8 @@ static gsi::QFlagsClass<QTextCursor::MoveOperation > decl_QTextCursor_MoveOperat
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextCursor> inject_QTextCursor_MoveOperation_Enum_in_parent (decl_QTextCursor_MoveOperation_Enum.defs ());
-static gsi::ClassExt<QTextCursor> decl_QTextCursor_MoveOperation_Enum_as_child (decl_QTextCursor_MoveOperation_Enum, "QtGui", "MoveOperation");
-static gsi::ClassExt<QTextCursor> decl_QTextCursor_MoveOperation_Enums_as_child (decl_QTextCursor_MoveOperation_Enums, "QtGui", "QFlags_MoveOperation");
+static gsi::ClassExt<QTextCursor> decl_QTextCursor_MoveOperation_Enum_as_child (decl_QTextCursor_MoveOperation_Enum, "MoveOperation");
+static gsi::ClassExt<QTextCursor> decl_QTextCursor_MoveOperation_Enums_as_child (decl_QTextCursor_MoveOperation_Enums, "QFlags_MoveOperation");
 
 }
 
@@ -1542,8 +1542,8 @@ static gsi::QFlagsClass<QTextCursor::SelectionType > decl_QTextCursor_SelectionT
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextCursor> inject_QTextCursor_SelectionType_Enum_in_parent (decl_QTextCursor_SelectionType_Enum.defs ());
-static gsi::ClassExt<QTextCursor> decl_QTextCursor_SelectionType_Enum_as_child (decl_QTextCursor_SelectionType_Enum, "QtGui", "SelectionType");
-static gsi::ClassExt<QTextCursor> decl_QTextCursor_SelectionType_Enums_as_child (decl_QTextCursor_SelectionType_Enums, "QtGui", "QFlags_SelectionType");
+static gsi::ClassExt<QTextCursor> decl_QTextCursor_SelectionType_Enum_as_child (decl_QTextCursor_SelectionType_Enum, "SelectionType");
+static gsi::ClassExt<QTextCursor> decl_QTextCursor_SelectionType_Enums_as_child (decl_QTextCursor_SelectionType_Enums, "QFlags_SelectionType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTextDocument.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextDocument.cc
index 4aca9541a..2fe29557e 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTextDocument.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextDocument.cc
@@ -2314,8 +2314,8 @@ static gsi::QFlagsClass<QTextDocument::FindFlag > decl_QTextDocument_FindFlag_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextDocument> inject_QTextDocument_FindFlag_Enum_in_parent (decl_QTextDocument_FindFlag_Enum.defs ());
-static gsi::ClassExt<QTextDocument> decl_QTextDocument_FindFlag_Enum_as_child (decl_QTextDocument_FindFlag_Enum, "QtGui", "FindFlag");
-static gsi::ClassExt<QTextDocument> decl_QTextDocument_FindFlag_Enums_as_child (decl_QTextDocument_FindFlag_Enums, "QtGui", "QFlags_FindFlag");
+static gsi::ClassExt<QTextDocument> decl_QTextDocument_FindFlag_Enum_as_child (decl_QTextDocument_FindFlag_Enum, "FindFlag");
+static gsi::ClassExt<QTextDocument> decl_QTextDocument_FindFlag_Enums_as_child (decl_QTextDocument_FindFlag_Enums, "QFlags_FindFlag");
 
 }
 
@@ -2334,8 +2334,8 @@ static gsi::QFlagsClass<QTextDocument::MetaInformation > decl_QTextDocument_Meta
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextDocument> inject_QTextDocument_MetaInformation_Enum_in_parent (decl_QTextDocument_MetaInformation_Enum.defs ());
-static gsi::ClassExt<QTextDocument> decl_QTextDocument_MetaInformation_Enum_as_child (decl_QTextDocument_MetaInformation_Enum, "QtGui", "MetaInformation");
-static gsi::ClassExt<QTextDocument> decl_QTextDocument_MetaInformation_Enums_as_child (decl_QTextDocument_MetaInformation_Enums, "QtGui", "QFlags_MetaInformation");
+static gsi::ClassExt<QTextDocument> decl_QTextDocument_MetaInformation_Enum_as_child (decl_QTextDocument_MetaInformation_Enum, "MetaInformation");
+static gsi::ClassExt<QTextDocument> decl_QTextDocument_MetaInformation_Enums_as_child (decl_QTextDocument_MetaInformation_Enums, "QFlags_MetaInformation");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTextEdit.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextEdit.cc
index 02b45b8fe..42086d3dd 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTextEdit.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextEdit.cc
@@ -4566,8 +4566,8 @@ static gsi::QFlagsClass<QTextEdit::AutoFormattingFlag > decl_QTextEdit_AutoForma
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextEdit> inject_QTextEdit_AutoFormattingFlag_Enum_in_parent (decl_QTextEdit_AutoFormattingFlag_Enum.defs ());
-static gsi::ClassExt<QTextEdit> decl_QTextEdit_AutoFormattingFlag_Enum_as_child (decl_QTextEdit_AutoFormattingFlag_Enum, "QtGui", "AutoFormattingFlag");
-static gsi::ClassExt<QTextEdit> decl_QTextEdit_AutoFormattingFlag_Enums_as_child (decl_QTextEdit_AutoFormattingFlag_Enums, "QtGui", "QFlags_AutoFormattingFlag");
+static gsi::ClassExt<QTextEdit> decl_QTextEdit_AutoFormattingFlag_Enum_as_child (decl_QTextEdit_AutoFormattingFlag_Enum, "AutoFormattingFlag");
+static gsi::ClassExt<QTextEdit> decl_QTextEdit_AutoFormattingFlag_Enums_as_child (decl_QTextEdit_AutoFormattingFlag_Enums, "QFlags_AutoFormattingFlag");
 
 }
 
@@ -4588,8 +4588,8 @@ static gsi::QFlagsClass<QTextEdit::LineWrapMode > decl_QTextEdit_LineWrapMode_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextEdit> inject_QTextEdit_LineWrapMode_Enum_in_parent (decl_QTextEdit_LineWrapMode_Enum.defs ());
-static gsi::ClassExt<QTextEdit> decl_QTextEdit_LineWrapMode_Enum_as_child (decl_QTextEdit_LineWrapMode_Enum, "QtGui", "LineWrapMode");
-static gsi::ClassExt<QTextEdit> decl_QTextEdit_LineWrapMode_Enums_as_child (decl_QTextEdit_LineWrapMode_Enums, "QtGui", "QFlags_LineWrapMode");
+static gsi::ClassExt<QTextEdit> decl_QTextEdit_LineWrapMode_Enum_as_child (decl_QTextEdit_LineWrapMode_Enum, "LineWrapMode");
+static gsi::ClassExt<QTextEdit> decl_QTextEdit_LineWrapMode_Enums_as_child (decl_QTextEdit_LineWrapMode_Enums, "QFlags_LineWrapMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTextEdit_ExtraSelection.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextEdit_ExtraSelection.cc
index d8bf8b96f..f9b24488a 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTextEdit_ExtraSelection.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextEdit_ExtraSelection.cc
@@ -65,7 +65,7 @@ gsi::Class<QTextEdit::ExtraSelection> decl_QTextEdit_ExtraSelection ("QtGui", "Q
   methods_QTextEdit_ExtraSelection (),
   "@qt\n@brief Binding of QTextEdit::ExtraSelection");
 
-gsi::ClassExt<QTextEdit> decl_QTextEdit_ExtraSelection_as_child (decl_QTextEdit_ExtraSelection, "QtGui", "ExtraSelection");
+gsi::ClassExt<QTextEdit> decl_QTextEdit_ExtraSelection_as_child (decl_QTextEdit_ExtraSelection, "ExtraSelection");
 
 GSI_QTGUI_PUBLIC gsi::Class<QTextEdit::ExtraSelection> &qtdecl_QTextEdit_ExtraSelection () { return decl_QTextEdit_ExtraSelection; }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTextFormat.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextFormat.cc
index 58e4a4c19..5be52459a 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTextFormat.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextFormat.cc
@@ -1014,8 +1014,8 @@ static gsi::QFlagsClass<QTextFormat::PageBreakFlag > decl_QTextFormat_PageBreakF
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextFormat> inject_QTextFormat_PageBreakFlag_Enum_in_parent (decl_QTextFormat_PageBreakFlag_Enum.defs ());
-static gsi::ClassExt<QTextFormat> decl_QTextFormat_PageBreakFlag_Enum_as_child (decl_QTextFormat_PageBreakFlag_Enum, "QtGui", "PageBreakFlag");
-static gsi::ClassExt<QTextFormat> decl_QTextFormat_PageBreakFlag_Enums_as_child (decl_QTextFormat_PageBreakFlag_Enums, "QtGui", "QFlags_PageBreakFlag");
+static gsi::ClassExt<QTextFormat> decl_QTextFormat_PageBreakFlag_Enum_as_child (decl_QTextFormat_PageBreakFlag_Enum, "PageBreakFlag");
+static gsi::ClassExt<QTextFormat> decl_QTextFormat_PageBreakFlag_Enums_as_child (decl_QTextFormat_PageBreakFlag_Enums, "QFlags_PageBreakFlag");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTextFrameFormat.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextFrameFormat.cc
index ab3f762c9..f38d53989 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTextFrameFormat.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextFrameFormat.cc
@@ -646,8 +646,8 @@ static gsi::QFlagsClass<QTextFrameFormat::BorderStyle > decl_QTextFrameFormat_Bo
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextFrameFormat> inject_QTextFrameFormat_BorderStyle_Enum_in_parent (decl_QTextFrameFormat_BorderStyle_Enum.defs ());
-static gsi::ClassExt<QTextFrameFormat> decl_QTextFrameFormat_BorderStyle_Enum_as_child (decl_QTextFrameFormat_BorderStyle_Enum, "QtGui", "BorderStyle");
-static gsi::ClassExt<QTextFrameFormat> decl_QTextFrameFormat_BorderStyle_Enums_as_child (decl_QTextFrameFormat_BorderStyle_Enums, "QtGui", "QFlags_BorderStyle");
+static gsi::ClassExt<QTextFrameFormat> decl_QTextFrameFormat_BorderStyle_Enum_as_child (decl_QTextFrameFormat_BorderStyle_Enum, "BorderStyle");
+static gsi::ClassExt<QTextFrameFormat> decl_QTextFrameFormat_BorderStyle_Enums_as_child (decl_QTextFrameFormat_BorderStyle_Enums, "QFlags_BorderStyle");
 
 }
 
@@ -667,8 +667,8 @@ static gsi::QFlagsClass<QTextFrameFormat::Position > decl_QTextFrameFormat_Posit
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextFrameFormat> inject_QTextFrameFormat_Position_Enum_in_parent (decl_QTextFrameFormat_Position_Enum.defs ());
-static gsi::ClassExt<QTextFrameFormat> decl_QTextFrameFormat_Position_Enum_as_child (decl_QTextFrameFormat_Position_Enum, "QtGui", "Position");
-static gsi::ClassExt<QTextFrameFormat> decl_QTextFrameFormat_Position_Enums_as_child (decl_QTextFrameFormat_Position_Enums, "QtGui", "QFlags_Position");
+static gsi::ClassExt<QTextFrameFormat> decl_QTextFrameFormat_Position_Enum_as_child (decl_QTextFrameFormat_Position_Enum, "Position");
+static gsi::ClassExt<QTextFrameFormat> decl_QTextFrameFormat_Position_Enums_as_child (decl_QTextFrameFormat_Position_Enums, "QFlags_Position");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTextFrame_Iterator.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextFrame_Iterator.cc
index 4e52bbda4..ece110cbe 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTextFrame_Iterator.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextFrame_Iterator.cc
@@ -283,7 +283,7 @@ gsi::Class<QTextFrame::iterator> decl_QTextFrame_Iterator ("QtGui", "QTextFrame_
   methods_QTextFrame_Iterator (),
   "@qt\n@brief Binding of QTextFrame::iterator");
 
-gsi::ClassExt<QTextFrame> decl_QTextFrame_Iterator_as_child (decl_QTextFrame_Iterator, "QtGui", "Iterator");
+gsi::ClassExt<QTextFrame> decl_QTextFrame_Iterator_as_child (decl_QTextFrame_Iterator, "Iterator");
 
 GSI_QTGUI_PUBLIC gsi::Class<QTextFrame::iterator> &qtdecl_QTextFrame_Iterator () { return decl_QTextFrame_Iterator; }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTextItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextItem.cc
index a0e488609..3c1bb41ff 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTextItem.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextItem.cc
@@ -185,8 +185,8 @@ static gsi::QFlagsClass<QTextItem::RenderFlag > decl_QTextItem_RenderFlag_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextItem> inject_QTextItem_RenderFlag_Enum_in_parent (decl_QTextItem_RenderFlag_Enum.defs ());
-static gsi::ClassExt<QTextItem> decl_QTextItem_RenderFlag_Enum_as_child (decl_QTextItem_RenderFlag_Enum, "QtGui", "RenderFlag");
-static gsi::ClassExt<QTextItem> decl_QTextItem_RenderFlag_Enums_as_child (decl_QTextItem_RenderFlag_Enums, "QtGui", "QFlags_RenderFlag");
+static gsi::ClassExt<QTextItem> decl_QTextItem_RenderFlag_Enum_as_child (decl_QTextItem_RenderFlag_Enum, "RenderFlag");
+static gsi::ClassExt<QTextItem> decl_QTextItem_RenderFlag_Enums_as_child (decl_QTextItem_RenderFlag_Enums, "QFlags_RenderFlag");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTextLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextLayout.cc
index 0970a13f1..cdbe5a8d7 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTextLayout.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextLayout.cc
@@ -799,8 +799,8 @@ static gsi::QFlagsClass<QTextLayout::CursorMode > decl_QTextLayout_CursorMode_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextLayout> inject_QTextLayout_CursorMode_Enum_in_parent (decl_QTextLayout_CursorMode_Enum.defs ());
-static gsi::ClassExt<QTextLayout> decl_QTextLayout_CursorMode_Enum_as_child (decl_QTextLayout_CursorMode_Enum, "QtGui", "CursorMode");
-static gsi::ClassExt<QTextLayout> decl_QTextLayout_CursorMode_Enums_as_child (decl_QTextLayout_CursorMode_Enums, "QtGui", "QFlags_CursorMode");
+static gsi::ClassExt<QTextLayout> decl_QTextLayout_CursorMode_Enum_as_child (decl_QTextLayout_CursorMode_Enum, "CursorMode");
+static gsi::ClassExt<QTextLayout> decl_QTextLayout_CursorMode_Enums_as_child (decl_QTextLayout_CursorMode_Enums, "QFlags_CursorMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTextLayout_FormatRange.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextLayout_FormatRange.cc
index 8a59aa378..4cbe7c962 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTextLayout_FormatRange.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextLayout_FormatRange.cc
@@ -65,7 +65,7 @@ gsi::Class<QTextLayout::FormatRange> decl_QTextLayout_FormatRange ("QtGui", "QTe
   methods_QTextLayout_FormatRange (),
   "@qt\n@brief Binding of QTextLayout::FormatRange");
 
-gsi::ClassExt<QTextLayout> decl_QTextLayout_FormatRange_as_child (decl_QTextLayout_FormatRange, "QtGui", "FormatRange");
+gsi::ClassExt<QTextLayout> decl_QTextLayout_FormatRange_as_child (decl_QTextLayout_FormatRange, "FormatRange");
 
 GSI_QTGUI_PUBLIC gsi::Class<QTextLayout::FormatRange> &qtdecl_QTextLayout_FormatRange () { return decl_QTextLayout_FormatRange; }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTextLength.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextLength.cc
index e9171c529..9b97d91e3 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTextLength.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextLength.cc
@@ -201,8 +201,8 @@ static gsi::QFlagsClass<QTextLength::Type > decl_QTextLength_Type_Enums ("QtGui"
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextLength> inject_QTextLength_Type_Enum_in_parent (decl_QTextLength_Type_Enum.defs ());
-static gsi::ClassExt<QTextLength> decl_QTextLength_Type_Enum_as_child (decl_QTextLength_Type_Enum, "QtGui", "Type");
-static gsi::ClassExt<QTextLength> decl_QTextLength_Type_Enums_as_child (decl_QTextLength_Type_Enums, "QtGui", "QFlags_Type");
+static gsi::ClassExt<QTextLength> decl_QTextLength_Type_Enum_as_child (decl_QTextLength_Type_Enum, "Type");
+static gsi::ClassExt<QTextLength> decl_QTextLength_Type_Enums_as_child (decl_QTextLength_Type_Enums, "QFlags_Type");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTextLine.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextLine.cc
index 9560e6ffd..88afd7d6d 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTextLine.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextLine.cc
@@ -548,8 +548,8 @@ static gsi::QFlagsClass<QTextLine::CursorPosition > decl_QTextLine_CursorPositio
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextLine> inject_QTextLine_CursorPosition_Enum_in_parent (decl_QTextLine_CursorPosition_Enum.defs ());
-static gsi::ClassExt<QTextLine> decl_QTextLine_CursorPosition_Enum_as_child (decl_QTextLine_CursorPosition_Enum, "QtGui", "CursorPosition");
-static gsi::ClassExt<QTextLine> decl_QTextLine_CursorPosition_Enums_as_child (decl_QTextLine_CursorPosition_Enums, "QtGui", "QFlags_CursorPosition");
+static gsi::ClassExt<QTextLine> decl_QTextLine_CursorPosition_Enum_as_child (decl_QTextLine_CursorPosition_Enum, "CursorPosition");
+static gsi::ClassExt<QTextLine> decl_QTextLine_CursorPosition_Enums_as_child (decl_QTextLine_CursorPosition_Enums, "QFlags_CursorPosition");
 
 }
 
@@ -568,8 +568,8 @@ static gsi::QFlagsClass<QTextLine::Edge > decl_QTextLine_Edge_Enums ("QtGui", "Q
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextLine> inject_QTextLine_Edge_Enum_in_parent (decl_QTextLine_Edge_Enum.defs ());
-static gsi::ClassExt<QTextLine> decl_QTextLine_Edge_Enum_as_child (decl_QTextLine_Edge_Enum, "QtGui", "Edge");
-static gsi::ClassExt<QTextLine> decl_QTextLine_Edge_Enums_as_child (decl_QTextLine_Edge_Enums, "QtGui", "QFlags_Edge");
+static gsi::ClassExt<QTextLine> decl_QTextLine_Edge_Enum_as_child (decl_QTextLine_Edge_Enum, "Edge");
+static gsi::ClassExt<QTextLine> decl_QTextLine_Edge_Enums_as_child (decl_QTextLine_Edge_Enums, "QFlags_Edge");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTextListFormat.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextListFormat.cc
index 70fe54424..9ee07337a 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTextListFormat.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextListFormat.cc
@@ -195,8 +195,8 @@ static gsi::QFlagsClass<QTextListFormat::Style > decl_QTextListFormat_Style_Enum
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextListFormat> inject_QTextListFormat_Style_Enum_in_parent (decl_QTextListFormat_Style_Enum.defs ());
-static gsi::ClassExt<QTextListFormat> decl_QTextListFormat_Style_Enum_as_child (decl_QTextListFormat_Style_Enum, "QtGui", "Style");
-static gsi::ClassExt<QTextListFormat> decl_QTextListFormat_Style_Enums_as_child (decl_QTextListFormat_Style_Enums, "QtGui", "QFlags_Style");
+static gsi::ClassExt<QTextListFormat> decl_QTextListFormat_Style_Enum_as_child (decl_QTextListFormat_Style_Enum, "Style");
+static gsi::ClassExt<QTextListFormat> decl_QTextListFormat_Style_Enums_as_child (decl_QTextListFormat_Style_Enums, "QFlags_Style");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTextOption.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextOption.cc
index 027238ff8..e7919f5db 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTextOption.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextOption.cc
@@ -444,8 +444,8 @@ static gsi::QFlagsClass<QTextOption::Flag > decl_QTextOption_Flag_Enums ("QtGui"
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextOption> inject_QTextOption_Flag_Enum_in_parent (decl_QTextOption_Flag_Enum.defs ());
-static gsi::ClassExt<QTextOption> decl_QTextOption_Flag_Enum_as_child (decl_QTextOption_Flag_Enum, "QtGui", "Flag");
-static gsi::ClassExt<QTextOption> decl_QTextOption_Flag_Enums_as_child (decl_QTextOption_Flag_Enums, "QtGui", "QFlags_Flag");
+static gsi::ClassExt<QTextOption> decl_QTextOption_Flag_Enum_as_child (decl_QTextOption_Flag_Enum, "Flag");
+static gsi::ClassExt<QTextOption> decl_QTextOption_Flag_Enums_as_child (decl_QTextOption_Flag_Enums, "QFlags_Flag");
 
 }
 
@@ -467,8 +467,8 @@ static gsi::QFlagsClass<QTextOption::WrapMode > decl_QTextOption_WrapMode_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTextOption> inject_QTextOption_WrapMode_Enum_in_parent (decl_QTextOption_WrapMode_Enum.defs ());
-static gsi::ClassExt<QTextOption> decl_QTextOption_WrapMode_Enum_as_child (decl_QTextOption_WrapMode_Enum, "QtGui", "WrapMode");
-static gsi::ClassExt<QTextOption> decl_QTextOption_WrapMode_Enums_as_child (decl_QTextOption_WrapMode_Enums, "QtGui", "QFlags_WrapMode");
+static gsi::ClassExt<QTextOption> decl_QTextOption_WrapMode_Enum_as_child (decl_QTextOption_WrapMode_Enum, "WrapMode");
+static gsi::ClassExt<QTextOption> decl_QTextOption_WrapMode_Enums_as_child (decl_QTextOption_WrapMode_Enums, "QFlags_WrapMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTextOption_Tab.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextOption_Tab.cc
index 07c53d6e5..2b9a5c8bb 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTextOption_Tab.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextOption_Tab.cc
@@ -105,7 +105,7 @@ gsi::Class<QTextOption::Tab> decl_QTextOption_Tab ("QtGui", "QTextOption_Tab",
   methods_QTextOption_Tab (),
   "@qt\n@brief Binding of QTextOption::Tab");
 
-gsi::ClassExt<QTextOption> decl_QTextOption_Tab_as_child (decl_QTextOption_Tab, "QtGui", "Tab");
+gsi::ClassExt<QTextOption> decl_QTextOption_Tab_as_child (decl_QTextOption_Tab, "Tab");
 
 GSI_QTGUI_PUBLIC gsi::Class<QTextOption::Tab> &qtdecl_QTextOption_Tab () { return decl_QTextOption_Tab; }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQToolButton.cc b/src/gsiqt/qt4/QtGui/gsiDeclQToolButton.cc
index 9e58e75ae..8131e6194 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQToolButton.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQToolButton.cc
@@ -2973,8 +2973,8 @@ static gsi::QFlagsClass<QToolButton::ToolButtonPopupMode > decl_QToolButton_Tool
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QToolButton> inject_QToolButton_ToolButtonPopupMode_Enum_in_parent (decl_QToolButton_ToolButtonPopupMode_Enum.defs ());
-static gsi::ClassExt<QToolButton> decl_QToolButton_ToolButtonPopupMode_Enum_as_child (decl_QToolButton_ToolButtonPopupMode_Enum, "QtGui", "ToolButtonPopupMode");
-static gsi::ClassExt<QToolButton> decl_QToolButton_ToolButtonPopupMode_Enums_as_child (decl_QToolButton_ToolButtonPopupMode_Enums, "QtGui", "QFlags_ToolButtonPopupMode");
+static gsi::ClassExt<QToolButton> decl_QToolButton_ToolButtonPopupMode_Enum_as_child (decl_QToolButton_ToolButtonPopupMode_Enum, "ToolButtonPopupMode");
+static gsi::ClassExt<QToolButton> decl_QToolButton_ToolButtonPopupMode_Enums_as_child (decl_QToolButton_ToolButtonPopupMode_Enums, "QFlags_ToolButtonPopupMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTouchEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTouchEvent.cc
index ff702b1c6..8c926a141 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTouchEvent.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTouchEvent.cc
@@ -307,8 +307,8 @@ static gsi::QFlagsClass<QTouchEvent::DeviceType > decl_QTouchEvent_DeviceType_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTouchEvent> inject_QTouchEvent_DeviceType_Enum_in_parent (decl_QTouchEvent_DeviceType_Enum.defs ());
-static gsi::ClassExt<QTouchEvent> decl_QTouchEvent_DeviceType_Enum_as_child (decl_QTouchEvent_DeviceType_Enum, "QtGui", "DeviceType");
-static gsi::ClassExt<QTouchEvent> decl_QTouchEvent_DeviceType_Enums_as_child (decl_QTouchEvent_DeviceType_Enums, "QtGui", "QFlags_DeviceType");
+static gsi::ClassExt<QTouchEvent> decl_QTouchEvent_DeviceType_Enum_as_child (decl_QTouchEvent_DeviceType_Enum, "DeviceType");
+static gsi::ClassExt<QTouchEvent> decl_QTouchEvent_DeviceType_Enums_as_child (decl_QTouchEvent_DeviceType_Enums, "QFlags_DeviceType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTouchEvent_TouchPoint.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTouchEvent_TouchPoint.cc
index e0a551d3f..df17f929e 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTouchEvent_TouchPoint.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTouchEvent_TouchPoint.cc
@@ -793,7 +793,7 @@ gsi::Class<QTouchEvent::TouchPoint> decl_QTouchEvent_TouchPoint ("QtGui", "QTouc
   methods_QTouchEvent_TouchPoint (),
   "@qt\n@brief Binding of QTouchEvent::TouchPoint");
 
-gsi::ClassExt<QTouchEvent> decl_QTouchEvent_TouchPoint_as_child (decl_QTouchEvent_TouchPoint, "QtGui", "TouchPoint");
+gsi::ClassExt<QTouchEvent> decl_QTouchEvent_TouchPoint_as_child (decl_QTouchEvent_TouchPoint, "TouchPoint");
 
 GSI_QTGUI_PUBLIC gsi::Class<QTouchEvent::TouchPoint> &qtdecl_QTouchEvent_TouchPoint () { return decl_QTouchEvent_TouchPoint; }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTransform.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTransform.cc
index 346be3ec1..5719f860e 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTransform.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTransform.cc
@@ -1386,8 +1386,8 @@ static gsi::QFlagsClass<QTransform::TransformationType > decl_QTransform_Transfo
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTransform> inject_QTransform_TransformationType_Enum_in_parent (decl_QTransform_TransformationType_Enum.defs ());
-static gsi::ClassExt<QTransform> decl_QTransform_TransformationType_Enum_as_child (decl_QTransform_TransformationType_Enum, "QtGui", "TransformationType");
-static gsi::ClassExt<QTransform> decl_QTransform_TransformationType_Enums_as_child (decl_QTransform_TransformationType_Enums, "QtGui", "QFlags_TransformationType");
+static gsi::ClassExt<QTransform> decl_QTransform_TransformationType_Enum_as_child (decl_QTransform_TransformationType_Enum, "TransformationType");
+static gsi::ClassExt<QTransform> decl_QTransform_TransformationType_Enums_as_child (decl_QTransform_TransformationType_Enums, "QFlags_TransformationType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTreeWidgetItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTreeWidgetItem.cc
index 86f0c7d72..69ce7db65 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTreeWidgetItem.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTreeWidgetItem.cc
@@ -1956,8 +1956,8 @@ static gsi::QFlagsClass<QTreeWidgetItem::ChildIndicatorPolicy > decl_QTreeWidget
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTreeWidgetItem> inject_QTreeWidgetItem_ChildIndicatorPolicy_Enum_in_parent (decl_QTreeWidgetItem_ChildIndicatorPolicy_Enum.defs ());
-static gsi::ClassExt<QTreeWidgetItem> decl_QTreeWidgetItem_ChildIndicatorPolicy_Enum_as_child (decl_QTreeWidgetItem_ChildIndicatorPolicy_Enum, "QtGui", "ChildIndicatorPolicy");
-static gsi::ClassExt<QTreeWidgetItem> decl_QTreeWidgetItem_ChildIndicatorPolicy_Enums_as_child (decl_QTreeWidgetItem_ChildIndicatorPolicy_Enums, "QtGui", "QFlags_ChildIndicatorPolicy");
+static gsi::ClassExt<QTreeWidgetItem> decl_QTreeWidgetItem_ChildIndicatorPolicy_Enum_as_child (decl_QTreeWidgetItem_ChildIndicatorPolicy_Enum, "ChildIndicatorPolicy");
+static gsi::ClassExt<QTreeWidgetItem> decl_QTreeWidgetItem_ChildIndicatorPolicy_Enums_as_child (decl_QTreeWidgetItem_ChildIndicatorPolicy_Enums, "QFlags_ChildIndicatorPolicy");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQTreeWidgetItemIterator.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTreeWidgetItemIterator.cc
index edb70bc4f..387994d07 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQTreeWidgetItemIterator.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQTreeWidgetItemIterator.cc
@@ -303,8 +303,8 @@ static gsi::QFlagsClass<QTreeWidgetItemIterator::IteratorFlag > decl_QTreeWidget
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QTreeWidgetItemIterator> inject_QTreeWidgetItemIterator_IteratorFlag_Enum_in_parent (decl_QTreeWidgetItemIterator_IteratorFlag_Enum.defs ());
-static gsi::ClassExt<QTreeWidgetItemIterator> decl_QTreeWidgetItemIterator_IteratorFlag_Enum_as_child (decl_QTreeWidgetItemIterator_IteratorFlag_Enum, "QtGui", "IteratorFlag");
-static gsi::ClassExt<QTreeWidgetItemIterator> decl_QTreeWidgetItemIterator_IteratorFlag_Enums_as_child (decl_QTreeWidgetItemIterator_IteratorFlag_Enums, "QtGui", "QFlags_IteratorFlag");
+static gsi::ClassExt<QTreeWidgetItemIterator> decl_QTreeWidgetItemIterator_IteratorFlag_Enum_as_child (decl_QTreeWidgetItemIterator_IteratorFlag_Enum, "IteratorFlag");
+static gsi::ClassExt<QTreeWidgetItemIterator> decl_QTreeWidgetItemIterator_IteratorFlag_Enums_as_child (decl_QTreeWidgetItemIterator_IteratorFlag_Enums, "QFlags_IteratorFlag");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQValidator.cc b/src/gsiqt/qt4/QtGui/gsiDeclQValidator.cc
index 0a3d86a2d..91c728a7d 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQValidator.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQValidator.cc
@@ -738,8 +738,8 @@ static gsi::QFlagsClass<QValidator::State > decl_QValidator_State_Enums ("QtGui"
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QValidator> inject_QValidator_State_Enum_in_parent (decl_QValidator_State_Enum.defs ());
-static gsi::ClassExt<QValidator> decl_QValidator_State_Enum_as_child (decl_QValidator_State_Enum, "QtGui", "State");
-static gsi::ClassExt<QValidator> decl_QValidator_State_Enums_as_child (decl_QValidator_State_Enums, "QtGui", "QFlags_State");
+static gsi::ClassExt<QValidator> decl_QValidator_State_Enum_as_child (decl_QValidator_State_Enum, "State");
+static gsi::ClassExt<QValidator> decl_QValidator_State_Enums_as_child (decl_QValidator_State_Enums, "QFlags_State");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQWidget.cc
index 9a1fa5a01..2d78e6c87 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQWidget.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQWidget.cc
@@ -7015,8 +7015,8 @@ static gsi::QFlagsClass<QWidget::RenderFlag > decl_QWidget_RenderFlag_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QWidget> inject_QWidget_RenderFlag_Enum_in_parent (decl_QWidget_RenderFlag_Enum.defs ());
-static gsi::ClassExt<QWidget> decl_QWidget_RenderFlag_Enum_as_child (decl_QWidget_RenderFlag_Enum, "QtGui", "RenderFlag");
-static gsi::ClassExt<QWidget> decl_QWidget_RenderFlag_Enums_as_child (decl_QWidget_RenderFlag_Enums, "QtGui", "QFlags_RenderFlag");
+static gsi::ClassExt<QWidget> decl_QWidget_RenderFlag_Enum_as_child (decl_QWidget_RenderFlag_Enum, "RenderFlag");
+static gsi::ClassExt<QWidget> decl_QWidget_RenderFlag_Enums_as_child (decl_QWidget_RenderFlag_Enums, "QFlags_RenderFlag");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQWizard.cc b/src/gsiqt/qt4/QtGui/gsiDeclQWizard.cc
index 5505b40cb..cb033def1 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQWizard.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQWizard.cc
@@ -3644,8 +3644,8 @@ static gsi::QFlagsClass<QWizard::WizardButton > decl_QWizard_WizardButton_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QWizard> inject_QWizard_WizardButton_Enum_in_parent (decl_QWizard_WizardButton_Enum.defs ());
-static gsi::ClassExt<QWizard> decl_QWizard_WizardButton_Enum_as_child (decl_QWizard_WizardButton_Enum, "QtGui", "WizardButton");
-static gsi::ClassExt<QWizard> decl_QWizard_WizardButton_Enums_as_child (decl_QWizard_WizardButton_Enums, "QtGui", "QFlags_WizardButton");
+static gsi::ClassExt<QWizard> decl_QWizard_WizardButton_Enum_as_child (decl_QWizard_WizardButton_Enum, "WizardButton");
+static gsi::ClassExt<QWizard> decl_QWizard_WizardButton_Enums_as_child (decl_QWizard_WizardButton_Enums, "QFlags_WizardButton");
 
 }
 
@@ -3678,8 +3678,8 @@ static gsi::QFlagsClass<QWizard::WizardOption > decl_QWizard_WizardOption_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QWizard> inject_QWizard_WizardOption_Enum_in_parent (decl_QWizard_WizardOption_Enum.defs ());
-static gsi::ClassExt<QWizard> decl_QWizard_WizardOption_Enum_as_child (decl_QWizard_WizardOption_Enum, "QtGui", "WizardOption");
-static gsi::ClassExt<QWizard> decl_QWizard_WizardOption_Enums_as_child (decl_QWizard_WizardOption_Enums, "QtGui", "QFlags_WizardOption");
+static gsi::ClassExt<QWizard> decl_QWizard_WizardOption_Enum_as_child (decl_QWizard_WizardOption_Enum, "WizardOption");
+static gsi::ClassExt<QWizard> decl_QWizard_WizardOption_Enums_as_child (decl_QWizard_WizardOption_Enums, "QFlags_WizardOption");
 
 }
 
@@ -3701,8 +3701,8 @@ static gsi::QFlagsClass<QWizard::WizardPixmap > decl_QWizard_WizardPixmap_Enums
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QWizard> inject_QWizard_WizardPixmap_Enum_in_parent (decl_QWizard_WizardPixmap_Enum.defs ());
-static gsi::ClassExt<QWizard> decl_QWizard_WizardPixmap_Enum_as_child (decl_QWizard_WizardPixmap_Enum, "QtGui", "WizardPixmap");
-static gsi::ClassExt<QWizard> decl_QWizard_WizardPixmap_Enums_as_child (decl_QWizard_WizardPixmap_Enums, "QtGui", "QFlags_WizardPixmap");
+static gsi::ClassExt<QWizard> decl_QWizard_WizardPixmap_Enum_as_child (decl_QWizard_WizardPixmap_Enum, "WizardPixmap");
+static gsi::ClassExt<QWizard> decl_QWizard_WizardPixmap_Enums_as_child (decl_QWizard_WizardPixmap_Enums, "QFlags_WizardPixmap");
 
 }
 
@@ -3724,8 +3724,8 @@ static gsi::QFlagsClass<QWizard::WizardStyle > decl_QWizard_WizardStyle_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QWizard> inject_QWizard_WizardStyle_Enum_in_parent (decl_QWizard_WizardStyle_Enum.defs ());
-static gsi::ClassExt<QWizard> decl_QWizard_WizardStyle_Enum_as_child (decl_QWizard_WizardStyle_Enum, "QtGui", "WizardStyle");
-static gsi::ClassExt<QWizard> decl_QWizard_WizardStyle_Enums_as_child (decl_QWizard_WizardStyle_Enums, "QtGui", "QFlags_WizardStyle");
+static gsi::ClassExt<QWizard> decl_QWizard_WizardStyle_Enum_as_child (decl_QWizard_WizardStyle_Enum, "WizardStyle");
+static gsi::ClassExt<QWizard> decl_QWizard_WizardStyle_Enums_as_child (decl_QWizard_WizardStyle_Enums, "QFlags_WizardStyle");
 
 }
 
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQtGuiAdd.cc b/src/gsiqt/qt4/QtGui/gsiDeclQtGuiAdd.cc
index c5b2207bb..21e083739 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQtGuiAdd.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQtGuiAdd.cc
@@ -32,7 +32,7 @@ namespace gsi_qt
 // ------------------------------------------------------------
 //  Declarations for QPair<QAccessibleInterface*, QAccessible::Relation>
 
-gsi::Class<QPair<QAccessibleInterface*, QAccessible::Relation> > decl_QAccessibleInterfacePtr_Relation_QPair ("Qt", "QPair_QAccessibleInterfacePtr_QAccessible_Relation",
+gsi::Class<QPair<QAccessibleInterface*, QAccessible::Relation> > decl_QAccessibleInterfacePtr_Relation_QPair ("QtGui", "QPair_QAccessibleInterfacePtr_QAccessible_Relation",
   qt_gsi::pair_decl<QAccessibleInterface*, QAccessible::Relation>::methods (),
   "@qt\\n@brief Represents a QPair<QAccessibleInterface*, QAccessible::Relation> >"
 );
diff --git a/src/gsiqt/qt4/QtGui/gsiQtExternals.h b/src/gsiqt/qt4/QtGui/gsiQtExternals.h
index a74049318..4512bb893 100644
--- a/src/gsiqt/qt4/QtGui/gsiQtExternals.h
+++ b/src/gsiqt/qt4/QtGui/gsiQtExternals.h
@@ -30,7 +30,7 @@
 #if !defined(HDR_gsiQtGuiExternals)
 #define HDR_gsiQtGuiExternals
 
-#include "gsiClassBase.h"
+#include "gsiClass.h"
 #include "gsiQtGuiCommon.h"
 
 class QAbstractButton;
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQAbstractSocket.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQAbstractSocket.cc
index 9b7d877ee..40244dc9d 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQAbstractSocket.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQAbstractSocket.cc
@@ -809,8 +809,8 @@ static gsi::QFlagsClass<QAbstractSocket::NetworkLayerProtocol > decl_QAbstractSo
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractSocket> inject_QAbstractSocket_NetworkLayerProtocol_Enum_in_parent (decl_QAbstractSocket_NetworkLayerProtocol_Enum.defs ());
-static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_NetworkLayerProtocol_Enum_as_child (decl_QAbstractSocket_NetworkLayerProtocol_Enum, "QtNetwork", "NetworkLayerProtocol");
-static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_NetworkLayerProtocol_Enums_as_child (decl_QAbstractSocket_NetworkLayerProtocol_Enums, "QtNetwork", "QFlags_NetworkLayerProtocol");
+static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_NetworkLayerProtocol_Enum_as_child (decl_QAbstractSocket_NetworkLayerProtocol_Enum, "NetworkLayerProtocol");
+static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_NetworkLayerProtocol_Enums_as_child (decl_QAbstractSocket_NetworkLayerProtocol_Enums, "QFlags_NetworkLayerProtocol");
 
 }
 
@@ -847,8 +847,8 @@ static gsi::QFlagsClass<QAbstractSocket::SocketError > decl_QAbstractSocket_Sock
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractSocket> inject_QAbstractSocket_SocketError_Enum_in_parent (decl_QAbstractSocket_SocketError_Enum.defs ());
-static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_SocketError_Enum_as_child (decl_QAbstractSocket_SocketError_Enum, "QtNetwork", "SocketError");
-static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_SocketError_Enums_as_child (decl_QAbstractSocket_SocketError_Enums, "QtNetwork", "QFlags_SocketError");
+static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_SocketError_Enum_as_child (decl_QAbstractSocket_SocketError_Enum, "SocketError");
+static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_SocketError_Enums_as_child (decl_QAbstractSocket_SocketError_Enums, "QFlags_SocketError");
 
 }
 
@@ -867,8 +867,8 @@ static gsi::QFlagsClass<QAbstractSocket::SocketOption > decl_QAbstractSocket_Soc
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractSocket> inject_QAbstractSocket_SocketOption_Enum_in_parent (decl_QAbstractSocket_SocketOption_Enum.defs ());
-static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_SocketOption_Enum_as_child (decl_QAbstractSocket_SocketOption_Enum, "QtNetwork", "SocketOption");
-static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_SocketOption_Enums_as_child (decl_QAbstractSocket_SocketOption_Enums, "QtNetwork", "QFlags_SocketOption");
+static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_SocketOption_Enum_as_child (decl_QAbstractSocket_SocketOption_Enum, "SocketOption");
+static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_SocketOption_Enums_as_child (decl_QAbstractSocket_SocketOption_Enums, "QFlags_SocketOption");
 
 }
 
@@ -892,8 +892,8 @@ static gsi::QFlagsClass<QAbstractSocket::SocketState > decl_QAbstractSocket_Sock
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractSocket> inject_QAbstractSocket_SocketState_Enum_in_parent (decl_QAbstractSocket_SocketState_Enum.defs ());
-static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_SocketState_Enum_as_child (decl_QAbstractSocket_SocketState_Enum, "QtNetwork", "SocketState");
-static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_SocketState_Enums_as_child (decl_QAbstractSocket_SocketState_Enums, "QtNetwork", "QFlags_SocketState");
+static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_SocketState_Enum_as_child (decl_QAbstractSocket_SocketState_Enum, "SocketState");
+static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_SocketState_Enums_as_child (decl_QAbstractSocket_SocketState_Enums, "QFlags_SocketState");
 
 }
 
@@ -913,8 +913,8 @@ static gsi::QFlagsClass<QAbstractSocket::SocketType > decl_QAbstractSocket_Socke
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QAbstractSocket> inject_QAbstractSocket_SocketType_Enum_in_parent (decl_QAbstractSocket_SocketType_Enum.defs ());
-static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_SocketType_Enum_as_child (decl_QAbstractSocket_SocketType_Enum, "QtNetwork", "SocketType");
-static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_SocketType_Enums_as_child (decl_QAbstractSocket_SocketType_Enums, "QtNetwork", "QFlags_SocketType");
+static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_SocketType_Enum_as_child (decl_QAbstractSocket_SocketType_Enum, "SocketType");
+static gsi::ClassExt<QAbstractSocket> decl_QAbstractSocket_SocketType_Enums_as_child (decl_QAbstractSocket_SocketType_Enums, "QFlags_SocketType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQFtp.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQFtp.cc
index 6bef89450..04501647a 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQFtp.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQFtp.cc
@@ -1299,8 +1299,8 @@ static gsi::QFlagsClass<QFtp::Command > decl_QFtp_Command_Enums ("QtNetwork", "Q
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFtp> inject_QFtp_Command_Enum_in_parent (decl_QFtp_Command_Enum.defs ());
-static gsi::ClassExt<QFtp> decl_QFtp_Command_Enum_as_child (decl_QFtp_Command_Enum, "QtNetwork", "Command");
-static gsi::ClassExt<QFtp> decl_QFtp_Command_Enums_as_child (decl_QFtp_Command_Enums, "QtNetwork", "QFlags_Command");
+static gsi::ClassExt<QFtp> decl_QFtp_Command_Enum_as_child (decl_QFtp_Command_Enum, "Command");
+static gsi::ClassExt<QFtp> decl_QFtp_Command_Enums_as_child (decl_QFtp_Command_Enums, "QFlags_Command");
 
 }
 
@@ -1322,8 +1322,8 @@ static gsi::QFlagsClass<QFtp::Error > decl_QFtp_Error_Enums ("QtNetwork", "QFtp_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFtp> inject_QFtp_Error_Enum_in_parent (decl_QFtp_Error_Enum.defs ());
-static gsi::ClassExt<QFtp> decl_QFtp_Error_Enum_as_child (decl_QFtp_Error_Enum, "QtNetwork", "Error");
-static gsi::ClassExt<QFtp> decl_QFtp_Error_Enums_as_child (decl_QFtp_Error_Enums, "QtNetwork", "QFlags_Error");
+static gsi::ClassExt<QFtp> decl_QFtp_Error_Enum_as_child (decl_QFtp_Error_Enum, "Error");
+static gsi::ClassExt<QFtp> decl_QFtp_Error_Enums_as_child (decl_QFtp_Error_Enums, "QFlags_Error");
 
 }
 
@@ -1346,8 +1346,8 @@ static gsi::QFlagsClass<QFtp::State > decl_QFtp_State_Enums ("QtNetwork", "QFtp_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFtp> inject_QFtp_State_Enum_in_parent (decl_QFtp_State_Enum.defs ());
-static gsi::ClassExt<QFtp> decl_QFtp_State_Enum_as_child (decl_QFtp_State_Enum, "QtNetwork", "State");
-static gsi::ClassExt<QFtp> decl_QFtp_State_Enums_as_child (decl_QFtp_State_Enums, "QtNetwork", "QFlags_State");
+static gsi::ClassExt<QFtp> decl_QFtp_State_Enum_as_child (decl_QFtp_State_Enum, "State");
+static gsi::ClassExt<QFtp> decl_QFtp_State_Enums_as_child (decl_QFtp_State_Enums, "QFlags_State");
 
 }
 
@@ -1366,8 +1366,8 @@ static gsi::QFlagsClass<QFtp::TransferMode > decl_QFtp_TransferMode_Enums ("QtNe
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFtp> inject_QFtp_TransferMode_Enum_in_parent (decl_QFtp_TransferMode_Enum.defs ());
-static gsi::ClassExt<QFtp> decl_QFtp_TransferMode_Enum_as_child (decl_QFtp_TransferMode_Enum, "QtNetwork", "TransferMode");
-static gsi::ClassExt<QFtp> decl_QFtp_TransferMode_Enums_as_child (decl_QFtp_TransferMode_Enums, "QtNetwork", "QFlags_TransferMode");
+static gsi::ClassExt<QFtp> decl_QFtp_TransferMode_Enum_as_child (decl_QFtp_TransferMode_Enum, "TransferMode");
+static gsi::ClassExt<QFtp> decl_QFtp_TransferMode_Enums_as_child (decl_QFtp_TransferMode_Enums, "QFlags_TransferMode");
 
 }
 
@@ -1386,8 +1386,8 @@ static gsi::QFlagsClass<QFtp::TransferType > decl_QFtp_TransferType_Enums ("QtNe
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QFtp> inject_QFtp_TransferType_Enum_in_parent (decl_QFtp_TransferType_Enum.defs ());
-static gsi::ClassExt<QFtp> decl_QFtp_TransferType_Enum_as_child (decl_QFtp_TransferType_Enum, "QtNetwork", "TransferType");
-static gsi::ClassExt<QFtp> decl_QFtp_TransferType_Enums_as_child (decl_QFtp_TransferType_Enums, "QtNetwork", "QFlags_TransferType");
+static gsi::ClassExt<QFtp> decl_QFtp_TransferType_Enum_as_child (decl_QFtp_TransferType_Enum, "TransferType");
+static gsi::ClassExt<QFtp> decl_QFtp_TransferType_Enums_as_child (decl_QFtp_TransferType_Enums, "QFlags_TransferType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQHostAddress.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQHostAddress.cc
index 6a113fe90..9f6765613 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQHostAddress.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQHostAddress.cc
@@ -511,8 +511,8 @@ static gsi::QFlagsClass<QHostAddress::SpecialAddress > decl_QHostAddress_Special
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QHostAddress> inject_QHostAddress_SpecialAddress_Enum_in_parent (decl_QHostAddress_SpecialAddress_Enum.defs ());
-static gsi::ClassExt<QHostAddress> decl_QHostAddress_SpecialAddress_Enum_as_child (decl_QHostAddress_SpecialAddress_Enum, "QtNetwork", "SpecialAddress");
-static gsi::ClassExt<QHostAddress> decl_QHostAddress_SpecialAddress_Enums_as_child (decl_QHostAddress_SpecialAddress_Enums, "QtNetwork", "QFlags_SpecialAddress");
+static gsi::ClassExt<QHostAddress> decl_QHostAddress_SpecialAddress_Enum_as_child (decl_QHostAddress_SpecialAddress_Enum, "SpecialAddress");
+static gsi::ClassExt<QHostAddress> decl_QHostAddress_SpecialAddress_Enums_as_child (decl_QHostAddress_SpecialAddress_Enums, "QFlags_SpecialAddress");
 
 }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQHostInfo.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQHostInfo.cc
index c1936f2eb..d3e67186f 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQHostInfo.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQHostInfo.cc
@@ -416,8 +416,8 @@ static gsi::QFlagsClass<QHostInfo::HostInfoError > decl_QHostInfo_HostInfoError_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QHostInfo> inject_QHostInfo_HostInfoError_Enum_in_parent (decl_QHostInfo_HostInfoError_Enum.defs ());
-static gsi::ClassExt<QHostInfo> decl_QHostInfo_HostInfoError_Enum_as_child (decl_QHostInfo_HostInfoError_Enum, "QtNetwork", "HostInfoError");
-static gsi::ClassExt<QHostInfo> decl_QHostInfo_HostInfoError_Enums_as_child (decl_QHostInfo_HostInfoError_Enums, "QtNetwork", "QFlags_HostInfoError");
+static gsi::ClassExt<QHostInfo> decl_QHostInfo_HostInfoError_Enum_as_child (decl_QHostInfo_HostInfoError_Enum, "HostInfoError");
+static gsi::ClassExt<QHostInfo> decl_QHostInfo_HostInfoError_Enums_as_child (decl_QHostInfo_HostInfoError_Enums, "QFlags_HostInfoError");
 
 }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQLocalSocket.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQLocalSocket.cc
index 542adad36..f4bee6457 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQLocalSocket.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQLocalSocket.cc
@@ -617,8 +617,8 @@ static gsi::QFlagsClass<QLocalSocket::LocalSocketError > decl_QLocalSocket_Local
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QLocalSocket> inject_QLocalSocket_LocalSocketError_Enum_in_parent (decl_QLocalSocket_LocalSocketError_Enum.defs ());
-static gsi::ClassExt<QLocalSocket> decl_QLocalSocket_LocalSocketError_Enum_as_child (decl_QLocalSocket_LocalSocketError_Enum, "QtNetwork", "LocalSocketError");
-static gsi::ClassExt<QLocalSocket> decl_QLocalSocket_LocalSocketError_Enums_as_child (decl_QLocalSocket_LocalSocketError_Enums, "QtNetwork", "QFlags_LocalSocketError");
+static gsi::ClassExt<QLocalSocket> decl_QLocalSocket_LocalSocketError_Enum_as_child (decl_QLocalSocket_LocalSocketError_Enum, "LocalSocketError");
+static gsi::ClassExt<QLocalSocket> decl_QLocalSocket_LocalSocketError_Enums_as_child (decl_QLocalSocket_LocalSocketError_Enums, "QFlags_LocalSocketError");
 
 }
 
@@ -639,8 +639,8 @@ static gsi::QFlagsClass<QLocalSocket::LocalSocketState > decl_QLocalSocket_Local
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QLocalSocket> inject_QLocalSocket_LocalSocketState_Enum_in_parent (decl_QLocalSocket_LocalSocketState_Enum.defs ());
-static gsi::ClassExt<QLocalSocket> decl_QLocalSocket_LocalSocketState_Enum_as_child (decl_QLocalSocket_LocalSocketState_Enum, "QtNetwork", "LocalSocketState");
-static gsi::ClassExt<QLocalSocket> decl_QLocalSocket_LocalSocketState_Enums_as_child (decl_QLocalSocket_LocalSocketState_Enums, "QtNetwork", "QFlags_LocalSocketState");
+static gsi::ClassExt<QLocalSocket> decl_QLocalSocket_LocalSocketState_Enum_as_child (decl_QLocalSocket_LocalSocketState_Enum, "LocalSocketState");
+static gsi::ClassExt<QLocalSocket> decl_QLocalSocket_LocalSocketState_Enums_as_child (decl_QLocalSocket_LocalSocketState_Enums, "QFlags_LocalSocketState");
 
 }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkAccessManager.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkAccessManager.cc
index ae0350199..41bf918d1 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkAccessManager.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkAccessManager.cc
@@ -1040,8 +1040,8 @@ static gsi::QFlagsClass<QNetworkAccessManager::Operation > decl_QNetworkAccessMa
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QNetworkAccessManager> inject_QNetworkAccessManager_Operation_Enum_in_parent (decl_QNetworkAccessManager_Operation_Enum.defs ());
-static gsi::ClassExt<QNetworkAccessManager> decl_QNetworkAccessManager_Operation_Enum_as_child (decl_QNetworkAccessManager_Operation_Enum, "QtNetwork", "Operation");
-static gsi::ClassExt<QNetworkAccessManager> decl_QNetworkAccessManager_Operation_Enums_as_child (decl_QNetworkAccessManager_Operation_Enums, "QtNetwork", "QFlags_Operation");
+static gsi::ClassExt<QNetworkAccessManager> decl_QNetworkAccessManager_Operation_Enum_as_child (decl_QNetworkAccessManager_Operation_Enum, "Operation");
+static gsi::ClassExt<QNetworkAccessManager> decl_QNetworkAccessManager_Operation_Enums_as_child (decl_QNetworkAccessManager_Operation_Enums, "QFlags_Operation");
 
 }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkCookie.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkCookie.cc
index 352586ffa..6e4ff5188 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkCookie.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkCookie.cc
@@ -488,8 +488,8 @@ static gsi::QFlagsClass<QNetworkCookie::RawForm > decl_QNetworkCookie_RawForm_En
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QNetworkCookie> inject_QNetworkCookie_RawForm_Enum_in_parent (decl_QNetworkCookie_RawForm_Enum.defs ());
-static gsi::ClassExt<QNetworkCookie> decl_QNetworkCookie_RawForm_Enum_as_child (decl_QNetworkCookie_RawForm_Enum, "QtNetwork", "RawForm");
-static gsi::ClassExt<QNetworkCookie> decl_QNetworkCookie_RawForm_Enums_as_child (decl_QNetworkCookie_RawForm_Enums, "QtNetwork", "QFlags_RawForm");
+static gsi::ClassExt<QNetworkCookie> decl_QNetworkCookie_RawForm_Enum_as_child (decl_QNetworkCookie_RawForm_Enum, "RawForm");
+static gsi::ClassExt<QNetworkCookie> decl_QNetworkCookie_RawForm_Enums_as_child (decl_QNetworkCookie_RawForm_Enums, "QFlags_RawForm");
 
 }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkInterface.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkInterface.cc
index ed1fffc1f..ec76a5beb 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkInterface.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkInterface.cc
@@ -315,8 +315,8 @@ static gsi::QFlagsClass<QNetworkInterface::InterfaceFlag > decl_QNetworkInterfac
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QNetworkInterface> inject_QNetworkInterface_InterfaceFlag_Enum_in_parent (decl_QNetworkInterface_InterfaceFlag_Enum.defs ());
-static gsi::ClassExt<QNetworkInterface> decl_QNetworkInterface_InterfaceFlag_Enum_as_child (decl_QNetworkInterface_InterfaceFlag_Enum, "QtNetwork", "InterfaceFlag");
-static gsi::ClassExt<QNetworkInterface> decl_QNetworkInterface_InterfaceFlag_Enums_as_child (decl_QNetworkInterface_InterfaceFlag_Enums, "QtNetwork", "QFlags_InterfaceFlag");
+static gsi::ClassExt<QNetworkInterface> decl_QNetworkInterface_InterfaceFlag_Enum_as_child (decl_QNetworkInterface_InterfaceFlag_Enum, "InterfaceFlag");
+static gsi::ClassExt<QNetworkInterface> decl_QNetworkInterface_InterfaceFlag_Enums_as_child (decl_QNetworkInterface_InterfaceFlag_Enums, "QFlags_InterfaceFlag");
 
 }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkProxy.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkProxy.cc
index 5e5eb73de..8c278099e 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkProxy.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkProxy.cc
@@ -491,8 +491,8 @@ static gsi::QFlagsClass<QNetworkProxy::Capability > decl_QNetworkProxy_Capabilit
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QNetworkProxy> inject_QNetworkProxy_Capability_Enum_in_parent (decl_QNetworkProxy_Capability_Enum.defs ());
-static gsi::ClassExt<QNetworkProxy> decl_QNetworkProxy_Capability_Enum_as_child (decl_QNetworkProxy_Capability_Enum, "QtNetwork", "Capability");
-static gsi::ClassExt<QNetworkProxy> decl_QNetworkProxy_Capability_Enums_as_child (decl_QNetworkProxy_Capability_Enums, "QtNetwork", "QFlags_Capability");
+static gsi::ClassExt<QNetworkProxy> decl_QNetworkProxy_Capability_Enum_as_child (decl_QNetworkProxy_Capability_Enum, "Capability");
+static gsi::ClassExt<QNetworkProxy> decl_QNetworkProxy_Capability_Enums_as_child (decl_QNetworkProxy_Capability_Enums, "QFlags_Capability");
 
 }
 
@@ -515,8 +515,8 @@ static gsi::QFlagsClass<QNetworkProxy::ProxyType > decl_QNetworkProxy_ProxyType_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QNetworkProxy> inject_QNetworkProxy_ProxyType_Enum_in_parent (decl_QNetworkProxy_ProxyType_Enum.defs ());
-static gsi::ClassExt<QNetworkProxy> decl_QNetworkProxy_ProxyType_Enum_as_child (decl_QNetworkProxy_ProxyType_Enum, "QtNetwork", "ProxyType");
-static gsi::ClassExt<QNetworkProxy> decl_QNetworkProxy_ProxyType_Enums_as_child (decl_QNetworkProxy_ProxyType_Enums, "QtNetwork", "QFlags_ProxyType");
+static gsi::ClassExt<QNetworkProxy> decl_QNetworkProxy_ProxyType_Enum_as_child (decl_QNetworkProxy_ProxyType_Enum, "ProxyType");
+static gsi::ClassExt<QNetworkProxy> decl_QNetworkProxy_ProxyType_Enums_as_child (decl_QNetworkProxy_ProxyType_Enums, "QFlags_ProxyType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkProxyQuery.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkProxyQuery.cc
index f488b4164..47a8af350 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkProxyQuery.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkProxyQuery.cc
@@ -468,8 +468,8 @@ static gsi::QFlagsClass<QNetworkProxyQuery::QueryType > decl_QNetworkProxyQuery_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QNetworkProxyQuery> inject_QNetworkProxyQuery_QueryType_Enum_in_parent (decl_QNetworkProxyQuery_QueryType_Enum.defs ());
-static gsi::ClassExt<QNetworkProxyQuery> decl_QNetworkProxyQuery_QueryType_Enum_as_child (decl_QNetworkProxyQuery_QueryType_Enum, "QtNetwork", "QueryType");
-static gsi::ClassExt<QNetworkProxyQuery> decl_QNetworkProxyQuery_QueryType_Enums_as_child (decl_QNetworkProxyQuery_QueryType_Enums, "QtNetwork", "QFlags_QueryType");
+static gsi::ClassExt<QNetworkProxyQuery> decl_QNetworkProxyQuery_QueryType_Enum_as_child (decl_QNetworkProxyQuery_QueryType_Enum, "QueryType");
+static gsi::ClassExt<QNetworkProxyQuery> decl_QNetworkProxyQuery_QueryType_Enums_as_child (decl_QNetworkProxyQuery_QueryType_Enums, "QFlags_QueryType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkReply.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkReply.cc
index af4129daa..308d88f2b 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkReply.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkReply.cc
@@ -593,8 +593,8 @@ static gsi::QFlagsClass<QNetworkReply::NetworkError > decl_QNetworkReply_Network
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QNetworkReply> inject_QNetworkReply_NetworkError_Enum_in_parent (decl_QNetworkReply_NetworkError_Enum.defs ());
-static gsi::ClassExt<QNetworkReply> decl_QNetworkReply_NetworkError_Enum_as_child (decl_QNetworkReply_NetworkError_Enum, "QtNetwork", "NetworkError");
-static gsi::ClassExt<QNetworkReply> decl_QNetworkReply_NetworkError_Enums_as_child (decl_QNetworkReply_NetworkError_Enums, "QtNetwork", "QFlags_NetworkError");
+static gsi::ClassExt<QNetworkReply> decl_QNetworkReply_NetworkError_Enum_as_child (decl_QNetworkReply_NetworkError_Enum, "NetworkError");
+static gsi::ClassExt<QNetworkReply> decl_QNetworkReply_NetworkError_Enums_as_child (decl_QNetworkReply_NetworkError_Enums, "QFlags_NetworkError");
 
 }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkRequest.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkRequest.cc
index 3319a3f39..77df592a5 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkRequest.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkRequest.cc
@@ -464,8 +464,8 @@ static gsi::QFlagsClass<QNetworkRequest::Attribute > decl_QNetworkRequest_Attrib
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QNetworkRequest> inject_QNetworkRequest_Attribute_Enum_in_parent (decl_QNetworkRequest_Attribute_Enum.defs ());
-static gsi::ClassExt<QNetworkRequest> decl_QNetworkRequest_Attribute_Enum_as_child (decl_QNetworkRequest_Attribute_Enum, "QtNetwork", "Attribute");
-static gsi::ClassExt<QNetworkRequest> decl_QNetworkRequest_Attribute_Enums_as_child (decl_QNetworkRequest_Attribute_Enums, "QtNetwork", "QFlags_Attribute");
+static gsi::ClassExt<QNetworkRequest> decl_QNetworkRequest_Attribute_Enum_as_child (decl_QNetworkRequest_Attribute_Enum, "Attribute");
+static gsi::ClassExt<QNetworkRequest> decl_QNetworkRequest_Attribute_Enums_as_child (decl_QNetworkRequest_Attribute_Enums, "QFlags_Attribute");
 
 }
 
@@ -488,8 +488,8 @@ static gsi::QFlagsClass<QNetworkRequest::KnownHeaders > decl_QNetworkRequest_Kno
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QNetworkRequest> inject_QNetworkRequest_KnownHeaders_Enum_in_parent (decl_QNetworkRequest_KnownHeaders_Enum.defs ());
-static gsi::ClassExt<QNetworkRequest> decl_QNetworkRequest_KnownHeaders_Enum_as_child (decl_QNetworkRequest_KnownHeaders_Enum, "QtNetwork", "KnownHeaders");
-static gsi::ClassExt<QNetworkRequest> decl_QNetworkRequest_KnownHeaders_Enums_as_child (decl_QNetworkRequest_KnownHeaders_Enums, "QtNetwork", "QFlags_KnownHeaders");
+static gsi::ClassExt<QNetworkRequest> decl_QNetworkRequest_KnownHeaders_Enum_as_child (decl_QNetworkRequest_KnownHeaders_Enum, "KnownHeaders");
+static gsi::ClassExt<QNetworkRequest> decl_QNetworkRequest_KnownHeaders_Enums_as_child (decl_QNetworkRequest_KnownHeaders_Enums, "QFlags_KnownHeaders");
 
 }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQSsl.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQSsl.cc
index 8dc0ad9eb..05108c5a2 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQSsl.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQSsl.cc
@@ -60,8 +60,8 @@ static gsi::QFlagsClass<QSsl::AlternateNameEntryType > decl_QSsl_AlternateNameEn
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSsl_Namespace> inject_QSsl_AlternateNameEntryType_Enum_in_parent (decl_QSsl_AlternateNameEntryType_Enum.defs ());
-static gsi::ClassExt<QSsl_Namespace> decl_QSsl_AlternateNameEntryType_Enum_as_child (decl_QSsl_AlternateNameEntryType_Enum, "QtNetwork", "AlternateNameEntryType");
-static gsi::ClassExt<QSsl_Namespace> decl_QSsl_AlternateNameEntryType_Enums_as_child (decl_QSsl_AlternateNameEntryType_Enums, "QtNetwork", "QFlags_AlternateNameEntryType");
+static gsi::ClassExt<QSsl_Namespace> decl_QSsl_AlternateNameEntryType_Enum_as_child (decl_QSsl_AlternateNameEntryType_Enum, "AlternateNameEntryType");
+static gsi::ClassExt<QSsl_Namespace> decl_QSsl_AlternateNameEntryType_Enums_as_child (decl_QSsl_AlternateNameEntryType_Enums, "QFlags_AlternateNameEntryType");
 
 }
 
@@ -80,8 +80,8 @@ static gsi::QFlagsClass<QSsl::EncodingFormat > decl_QSsl_EncodingFormat_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSsl_Namespace> inject_QSsl_EncodingFormat_Enum_in_parent (decl_QSsl_EncodingFormat_Enum.defs ());
-static gsi::ClassExt<QSsl_Namespace> decl_QSsl_EncodingFormat_Enum_as_child (decl_QSsl_EncodingFormat_Enum, "QtNetwork", "EncodingFormat");
-static gsi::ClassExt<QSsl_Namespace> decl_QSsl_EncodingFormat_Enums_as_child (decl_QSsl_EncodingFormat_Enums, "QtNetwork", "QFlags_EncodingFormat");
+static gsi::ClassExt<QSsl_Namespace> decl_QSsl_EncodingFormat_Enum_as_child (decl_QSsl_EncodingFormat_Enum, "EncodingFormat");
+static gsi::ClassExt<QSsl_Namespace> decl_QSsl_EncodingFormat_Enums_as_child (decl_QSsl_EncodingFormat_Enums, "QFlags_EncodingFormat");
 
 }
 
@@ -100,8 +100,8 @@ static gsi::QFlagsClass<QSsl::KeyAlgorithm > decl_QSsl_KeyAlgorithm_Enums ("QtNe
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSsl_Namespace> inject_QSsl_KeyAlgorithm_Enum_in_parent (decl_QSsl_KeyAlgorithm_Enum.defs ());
-static gsi::ClassExt<QSsl_Namespace> decl_QSsl_KeyAlgorithm_Enum_as_child (decl_QSsl_KeyAlgorithm_Enum, "QtNetwork", "KeyAlgorithm");
-static gsi::ClassExt<QSsl_Namespace> decl_QSsl_KeyAlgorithm_Enums_as_child (decl_QSsl_KeyAlgorithm_Enums, "QtNetwork", "QFlags_KeyAlgorithm");
+static gsi::ClassExt<QSsl_Namespace> decl_QSsl_KeyAlgorithm_Enum_as_child (decl_QSsl_KeyAlgorithm_Enum, "KeyAlgorithm");
+static gsi::ClassExt<QSsl_Namespace> decl_QSsl_KeyAlgorithm_Enums_as_child (decl_QSsl_KeyAlgorithm_Enums, "QFlags_KeyAlgorithm");
 
 }
 
@@ -120,8 +120,8 @@ static gsi::QFlagsClass<QSsl::KeyType > decl_QSsl_KeyType_Enums ("QtNetwork", "Q
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSsl_Namespace> inject_QSsl_KeyType_Enum_in_parent (decl_QSsl_KeyType_Enum.defs ());
-static gsi::ClassExt<QSsl_Namespace> decl_QSsl_KeyType_Enum_as_child (decl_QSsl_KeyType_Enum, "QtNetwork", "KeyType");
-static gsi::ClassExt<QSsl_Namespace> decl_QSsl_KeyType_Enums_as_child (decl_QSsl_KeyType_Enums, "QtNetwork", "QFlags_KeyType");
+static gsi::ClassExt<QSsl_Namespace> decl_QSsl_KeyType_Enum_as_child (decl_QSsl_KeyType_Enum, "KeyType");
+static gsi::ClassExt<QSsl_Namespace> decl_QSsl_KeyType_Enums_as_child (decl_QSsl_KeyType_Enums, "QFlags_KeyType");
 
 }
 
@@ -143,8 +143,8 @@ static gsi::QFlagsClass<QSsl::SslProtocol > decl_QSsl_SslProtocol_Enums ("QtNetw
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSsl_Namespace> inject_QSsl_SslProtocol_Enum_in_parent (decl_QSsl_SslProtocol_Enum.defs ());
-static gsi::ClassExt<QSsl_Namespace> decl_QSsl_SslProtocol_Enum_as_child (decl_QSsl_SslProtocol_Enum, "QtNetwork", "SslProtocol");
-static gsi::ClassExt<QSsl_Namespace> decl_QSsl_SslProtocol_Enums_as_child (decl_QSsl_SslProtocol_Enums, "QtNetwork", "QFlags_SslProtocol");
+static gsi::ClassExt<QSsl_Namespace> decl_QSsl_SslProtocol_Enum_as_child (decl_QSsl_SslProtocol_Enum, "SslProtocol");
+static gsi::ClassExt<QSsl_Namespace> decl_QSsl_SslProtocol_Enums_as_child (decl_QSsl_SslProtocol_Enums, "QFlags_SslProtocol");
 
 }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQSslCertificate.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslCertificate.cc
index 26ebee31c..6429c1977 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQSslCertificate.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslCertificate.cc
@@ -551,8 +551,8 @@ static gsi::QFlagsClass<QSslCertificate::SubjectInfo > decl_QSslCertificate_Subj
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSslCertificate> inject_QSslCertificate_SubjectInfo_Enum_in_parent (decl_QSslCertificate_SubjectInfo_Enum.defs ());
-static gsi::ClassExt<QSslCertificate> decl_QSslCertificate_SubjectInfo_Enum_as_child (decl_QSslCertificate_SubjectInfo_Enum, "QtNetwork", "SubjectInfo");
-static gsi::ClassExt<QSslCertificate> decl_QSslCertificate_SubjectInfo_Enums_as_child (decl_QSslCertificate_SubjectInfo_Enums, "QtNetwork", "QFlags_SubjectInfo");
+static gsi::ClassExt<QSslCertificate> decl_QSslCertificate_SubjectInfo_Enum_as_child (decl_QSslCertificate_SubjectInfo_Enum, "SubjectInfo");
+static gsi::ClassExt<QSslCertificate> decl_QSslCertificate_SubjectInfo_Enums_as_child (decl_QSslCertificate_SubjectInfo_Enums, "QFlags_SubjectInfo");
 
 }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQSslError.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslError.cc
index c33957aaa..a1bd8dd12 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQSslError.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslError.cc
@@ -280,8 +280,8 @@ static gsi::QFlagsClass<QSslError::SslError > decl_QSslError_SslError_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSslError> inject_QSslError_SslError_Enum_in_parent (decl_QSslError_SslError_Enum.defs ());
-static gsi::ClassExt<QSslError> decl_QSslError_SslError_Enum_as_child (decl_QSslError_SslError_Enum, "QtNetwork", "SslError");
-static gsi::ClassExt<QSslError> decl_QSslError_SslError_Enums_as_child (decl_QSslError_SslError_Enums, "QtNetwork", "QFlags_SslError");
+static gsi::ClassExt<QSslError> decl_QSslError_SslError_Enum_as_child (decl_QSslError_SslError_Enum, "SslError");
+static gsi::ClassExt<QSslError> decl_QSslError_SslError_Enums_as_child (decl_QSslError_SslError_Enums, "QFlags_SslError");
 
 }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQSslSocket.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslSocket.cc
index bea58b715..16f4135bb 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQSslSocket.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslSocket.cc
@@ -1423,8 +1423,8 @@ static gsi::QFlagsClass<QSslSocket::PeerVerifyMode > decl_QSslSocket_PeerVerifyM
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSslSocket> inject_QSslSocket_PeerVerifyMode_Enum_in_parent (decl_QSslSocket_PeerVerifyMode_Enum.defs ());
-static gsi::ClassExt<QSslSocket> decl_QSslSocket_PeerVerifyMode_Enum_as_child (decl_QSslSocket_PeerVerifyMode_Enum, "QtNetwork", "PeerVerifyMode");
-static gsi::ClassExt<QSslSocket> decl_QSslSocket_PeerVerifyMode_Enums_as_child (decl_QSslSocket_PeerVerifyMode_Enums, "QtNetwork", "QFlags_PeerVerifyMode");
+static gsi::ClassExt<QSslSocket> decl_QSslSocket_PeerVerifyMode_Enum_as_child (decl_QSslSocket_PeerVerifyMode_Enum, "PeerVerifyMode");
+static gsi::ClassExt<QSslSocket> decl_QSslSocket_PeerVerifyMode_Enums_as_child (decl_QSslSocket_PeerVerifyMode_Enums, "QFlags_PeerVerifyMode");
 
 }
 
@@ -1444,8 +1444,8 @@ static gsi::QFlagsClass<QSslSocket::SslMode > decl_QSslSocket_SslMode_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSslSocket> inject_QSslSocket_SslMode_Enum_in_parent (decl_QSslSocket_SslMode_Enum.defs ());
-static gsi::ClassExt<QSslSocket> decl_QSslSocket_SslMode_Enum_as_child (decl_QSslSocket_SslMode_Enum, "QtNetwork", "SslMode");
-static gsi::ClassExt<QSslSocket> decl_QSslSocket_SslMode_Enums_as_child (decl_QSslSocket_SslMode_Enums, "QtNetwork", "QFlags_SslMode");
+static gsi::ClassExt<QSslSocket> decl_QSslSocket_SslMode_Enum_as_child (decl_QSslSocket_SslMode_Enum, "SslMode");
+static gsi::ClassExt<QSslSocket> decl_QSslSocket_SslMode_Enums_as_child (decl_QSslSocket_SslMode_Enums, "QFlags_SslMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQUdpSocket.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQUdpSocket.cc
index ed377dd3f..b95756c5a 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQUdpSocket.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQUdpSocket.cc
@@ -401,8 +401,8 @@ static gsi::QFlagsClass<QUdpSocket::BindFlag > decl_QUdpSocket_BindFlag_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QUdpSocket> inject_QUdpSocket_BindFlag_Enum_in_parent (decl_QUdpSocket_BindFlag_Enum.defs ());
-static gsi::ClassExt<QUdpSocket> decl_QUdpSocket_BindFlag_Enum_as_child (decl_QUdpSocket_BindFlag_Enum, "QtNetwork", "BindFlag");
-static gsi::ClassExt<QUdpSocket> decl_QUdpSocket_BindFlag_Enums_as_child (decl_QUdpSocket_BindFlag_Enums, "QtNetwork", "QFlags_BindFlag");
+static gsi::ClassExt<QUdpSocket> decl_QUdpSocket_BindFlag_Enum_as_child (decl_QUdpSocket_BindFlag_Enum, "BindFlag");
+static gsi::ClassExt<QUdpSocket> decl_QUdpSocket_BindFlag_Enums_as_child (decl_QUdpSocket_BindFlag_Enums, "QFlags_BindFlag");
 
 }
 
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQtNetworkAdd.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQtNetworkAdd.cc
index 853de0baa..25f7c5097 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQtNetworkAdd.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQtNetworkAdd.cc
@@ -32,7 +32,7 @@ namespace gsi_qt
 // ------------------------------------------------------------
 //  Declarations for QPair<QHostAddress, int>
 
-gsi::Class<QPair<QHostAddress, int> > decl_QHostAddress_int_QPair ("Qt", "QPair_QHostAddress_int",
+gsi::Class<QPair<QHostAddress, int> > decl_QHostAddress_int_QPair ("QtNetwork", "QPair_QHostAddress_int",
   qt_gsi::pair_decl<QHostAddress, int>::methods (),
   "@qt\\n@brief Represents a QPair<QHostAddress, int>"
 );
diff --git a/src/gsiqt/qt4/QtNetwork/gsiQtExternals.h b/src/gsiqt/qt4/QtNetwork/gsiQtExternals.h
index dc5932a18..8def8e459 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiQtExternals.h
+++ b/src/gsiqt/qt4/QtNetwork/gsiQtExternals.h
@@ -30,7 +30,7 @@
 #if !defined(HDR_gsiQtNetworkExternals)
 #define HDR_gsiQtNetworkExternals
 
-#include "gsiClassBase.h"
+#include "gsiClass.h"
 #include "gsiQtNetworkCommon.h"
 
 class QAbstractNetworkCache;
diff --git a/src/gsiqt/qt4/QtSql/gsiDeclQSql.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSql.cc
index d1dd80f84..45884dcba 100644
--- a/src/gsiqt/qt4/QtSql/gsiDeclQSql.cc
+++ b/src/gsiqt/qt4/QtSql/gsiDeclQSql.cc
@@ -60,8 +60,8 @@ static gsi::QFlagsClass<QSql::Location > decl_QSql_Location_Enums ("QtSql", "QSq
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSql_Namespace> inject_QSql_Location_Enum_in_parent (decl_QSql_Location_Enum.defs ());
-static gsi::ClassExt<QSql_Namespace> decl_QSql_Location_Enum_as_child (decl_QSql_Location_Enum, "QtSql", "Location");
-static gsi::ClassExt<QSql_Namespace> decl_QSql_Location_Enums_as_child (decl_QSql_Location_Enums, "QtSql", "QFlags_Location");
+static gsi::ClassExt<QSql_Namespace> decl_QSql_Location_Enum_as_child (decl_QSql_Location_Enum, "Location");
+static gsi::ClassExt<QSql_Namespace> decl_QSql_Location_Enums_as_child (decl_QSql_Location_Enums, "QFlags_Location");
 
 }
 
@@ -82,8 +82,8 @@ static gsi::QFlagsClass<QSql::NumericalPrecisionPolicy > decl_QSql_NumericalPrec
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSql_Namespace> inject_QSql_NumericalPrecisionPolicy_Enum_in_parent (decl_QSql_NumericalPrecisionPolicy_Enum.defs ());
-static gsi::ClassExt<QSql_Namespace> decl_QSql_NumericalPrecisionPolicy_Enum_as_child (decl_QSql_NumericalPrecisionPolicy_Enum, "QtSql", "NumericalPrecisionPolicy");
-static gsi::ClassExt<QSql_Namespace> decl_QSql_NumericalPrecisionPolicy_Enums_as_child (decl_QSql_NumericalPrecisionPolicy_Enums, "QtSql", "QFlags_NumericalPrecisionPolicy");
+static gsi::ClassExt<QSql_Namespace> decl_QSql_NumericalPrecisionPolicy_Enum_as_child (decl_QSql_NumericalPrecisionPolicy_Enum, "NumericalPrecisionPolicy");
+static gsi::ClassExt<QSql_Namespace> decl_QSql_NumericalPrecisionPolicy_Enums_as_child (decl_QSql_NumericalPrecisionPolicy_Enums, "QFlags_NumericalPrecisionPolicy");
 
 }
 
@@ -104,8 +104,8 @@ static gsi::QFlagsClass<QSql::ParamTypeFlag > decl_QSql_ParamTypeFlag_Enums ("Qt
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSql_Namespace> inject_QSql_ParamTypeFlag_Enum_in_parent (decl_QSql_ParamTypeFlag_Enum.defs ());
-static gsi::ClassExt<QSql_Namespace> decl_QSql_ParamTypeFlag_Enum_as_child (decl_QSql_ParamTypeFlag_Enum, "QtSql", "ParamTypeFlag");
-static gsi::ClassExt<QSql_Namespace> decl_QSql_ParamTypeFlag_Enums_as_child (decl_QSql_ParamTypeFlag_Enums, "QtSql", "QFlags_ParamTypeFlag");
+static gsi::ClassExt<QSql_Namespace> decl_QSql_ParamTypeFlag_Enum_as_child (decl_QSql_ParamTypeFlag_Enum, "ParamTypeFlag");
+static gsi::ClassExt<QSql_Namespace> decl_QSql_ParamTypeFlag_Enums_as_child (decl_QSql_ParamTypeFlag_Enums, "QFlags_ParamTypeFlag");
 
 }
 
@@ -126,8 +126,8 @@ static gsi::QFlagsClass<QSql::TableType > decl_QSql_TableType_Enums ("QtSql", "Q
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSql_Namespace> inject_QSql_TableType_Enum_in_parent (decl_QSql_TableType_Enum.defs ());
-static gsi::ClassExt<QSql_Namespace> decl_QSql_TableType_Enum_as_child (decl_QSql_TableType_Enum, "QtSql", "TableType");
-static gsi::ClassExt<QSql_Namespace> decl_QSql_TableType_Enums_as_child (decl_QSql_TableType_Enums, "QtSql", "QFlags_TableType");
+static gsi::ClassExt<QSql_Namespace> decl_QSql_TableType_Enum_as_child (decl_QSql_TableType_Enum, "TableType");
+static gsi::ClassExt<QSql_Namespace> decl_QSql_TableType_Enums_as_child (decl_QSql_TableType_Enums, "QFlags_TableType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtSql/gsiDeclQSqlDriver.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlDriver.cc
index 70327015a..eb52ffa03 100644
--- a/src/gsiqt/qt4/QtSql/gsiDeclQSqlDriver.cc
+++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlDriver.cc
@@ -1957,8 +1957,8 @@ static gsi::QFlagsClass<QSqlDriver::DriverFeature > decl_QSqlDriver_DriverFeatur
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSqlDriver> inject_QSqlDriver_DriverFeature_Enum_in_parent (decl_QSqlDriver_DriverFeature_Enum.defs ());
-static gsi::ClassExt<QSqlDriver> decl_QSqlDriver_DriverFeature_Enum_as_child (decl_QSqlDriver_DriverFeature_Enum, "QtSql", "DriverFeature");
-static gsi::ClassExt<QSqlDriver> decl_QSqlDriver_DriverFeature_Enums_as_child (decl_QSqlDriver_DriverFeature_Enums, "QtSql", "QFlags_DriverFeature");
+static gsi::ClassExt<QSqlDriver> decl_QSqlDriver_DriverFeature_Enum_as_child (decl_QSqlDriver_DriverFeature_Enum, "DriverFeature");
+static gsi::ClassExt<QSqlDriver> decl_QSqlDriver_DriverFeature_Enums_as_child (decl_QSqlDriver_DriverFeature_Enums, "QFlags_DriverFeature");
 
 }
 
@@ -1977,8 +1977,8 @@ static gsi::QFlagsClass<QSqlDriver::IdentifierType > decl_QSqlDriver_IdentifierT
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSqlDriver> inject_QSqlDriver_IdentifierType_Enum_in_parent (decl_QSqlDriver_IdentifierType_Enum.defs ());
-static gsi::ClassExt<QSqlDriver> decl_QSqlDriver_IdentifierType_Enum_as_child (decl_QSqlDriver_IdentifierType_Enum, "QtSql", "IdentifierType");
-static gsi::ClassExt<QSqlDriver> decl_QSqlDriver_IdentifierType_Enums_as_child (decl_QSqlDriver_IdentifierType_Enums, "QtSql", "QFlags_IdentifierType");
+static gsi::ClassExt<QSqlDriver> decl_QSqlDriver_IdentifierType_Enum_as_child (decl_QSqlDriver_IdentifierType_Enum, "IdentifierType");
+static gsi::ClassExt<QSqlDriver> decl_QSqlDriver_IdentifierType_Enums_as_child (decl_QSqlDriver_IdentifierType_Enums, "QFlags_IdentifierType");
 
 }
 
@@ -2000,8 +2000,8 @@ static gsi::QFlagsClass<QSqlDriver::StatementType > decl_QSqlDriver_StatementTyp
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSqlDriver> inject_QSqlDriver_StatementType_Enum_in_parent (decl_QSqlDriver_StatementType_Enum.defs ());
-static gsi::ClassExt<QSqlDriver> decl_QSqlDriver_StatementType_Enum_as_child (decl_QSqlDriver_StatementType_Enum, "QtSql", "StatementType");
-static gsi::ClassExt<QSqlDriver> decl_QSqlDriver_StatementType_Enums_as_child (decl_QSqlDriver_StatementType_Enums, "QtSql", "QFlags_StatementType");
+static gsi::ClassExt<QSqlDriver> decl_QSqlDriver_StatementType_Enum_as_child (decl_QSqlDriver_StatementType_Enum, "StatementType");
+static gsi::ClassExt<QSqlDriver> decl_QSqlDriver_StatementType_Enums_as_child (decl_QSqlDriver_StatementType_Enums, "QFlags_StatementType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtSql/gsiDeclQSqlError.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlError.cc
index 699cd0c64..81b15afa7 100644
--- a/src/gsiqt/qt4/QtSql/gsiDeclQSqlError.cc
+++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlError.cc
@@ -321,8 +321,8 @@ static gsi::QFlagsClass<QSqlError::ErrorType > decl_QSqlError_ErrorType_Enums ("
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSqlError> inject_QSqlError_ErrorType_Enum_in_parent (decl_QSqlError_ErrorType_Enum.defs ());
-static gsi::ClassExt<QSqlError> decl_QSqlError_ErrorType_Enum_as_child (decl_QSqlError_ErrorType_Enum, "QtSql", "ErrorType");
-static gsi::ClassExt<QSqlError> decl_QSqlError_ErrorType_Enums_as_child (decl_QSqlError_ErrorType_Enums, "QtSql", "QFlags_ErrorType");
+static gsi::ClassExt<QSqlError> decl_QSqlError_ErrorType_Enum_as_child (decl_QSqlError_ErrorType_Enum, "ErrorType");
+static gsi::ClassExt<QSqlError> decl_QSqlError_ErrorType_Enums_as_child (decl_QSqlError_ErrorType_Enums, "QFlags_ErrorType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtSql/gsiDeclQSqlField.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlField.cc
index 9fc7ac5d7..067ef8af7 100644
--- a/src/gsiqt/qt4/QtSql/gsiDeclQSqlField.cc
+++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlField.cc
@@ -650,8 +650,8 @@ static gsi::QFlagsClass<QSqlField::RequiredStatus > decl_QSqlField_RequiredStatu
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSqlField> inject_QSqlField_RequiredStatus_Enum_in_parent (decl_QSqlField_RequiredStatus_Enum.defs ());
-static gsi::ClassExt<QSqlField> decl_QSqlField_RequiredStatus_Enum_as_child (decl_QSqlField_RequiredStatus_Enum, "QtSql", "RequiredStatus");
-static gsi::ClassExt<QSqlField> decl_QSqlField_RequiredStatus_Enums_as_child (decl_QSqlField_RequiredStatus_Enums, "QtSql", "QFlags_RequiredStatus");
+static gsi::ClassExt<QSqlField> decl_QSqlField_RequiredStatus_Enum_as_child (decl_QSqlField_RequiredStatus_Enum, "RequiredStatus");
+static gsi::ClassExt<QSqlField> decl_QSqlField_RequiredStatus_Enums_as_child (decl_QSqlField_RequiredStatus_Enums, "QFlags_RequiredStatus");
 
 }
 
diff --git a/src/gsiqt/qt4/QtSql/gsiDeclQSqlQuery.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlQuery.cc
index b631c7858..a6556d150 100644
--- a/src/gsiqt/qt4/QtSql/gsiDeclQSqlQuery.cc
+++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlQuery.cc
@@ -846,8 +846,8 @@ static gsi::QFlagsClass<QSqlQuery::BatchExecutionMode > decl_QSqlQuery_BatchExec
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSqlQuery> inject_QSqlQuery_BatchExecutionMode_Enum_in_parent (decl_QSqlQuery_BatchExecutionMode_Enum.defs ());
-static gsi::ClassExt<QSqlQuery> decl_QSqlQuery_BatchExecutionMode_Enum_as_child (decl_QSqlQuery_BatchExecutionMode_Enum, "QtSql", "BatchExecutionMode");
-static gsi::ClassExt<QSqlQuery> decl_QSqlQuery_BatchExecutionMode_Enums_as_child (decl_QSqlQuery_BatchExecutionMode_Enums, "QtSql", "QFlags_BatchExecutionMode");
+static gsi::ClassExt<QSqlQuery> decl_QSqlQuery_BatchExecutionMode_Enum_as_child (decl_QSqlQuery_BatchExecutionMode_Enum, "BatchExecutionMode");
+static gsi::ClassExt<QSqlQuery> decl_QSqlQuery_BatchExecutionMode_Enums_as_child (decl_QSqlQuery_BatchExecutionMode_Enums, "QFlags_BatchExecutionMode");
 
 }
 
diff --git a/src/gsiqt/qt4/QtSql/gsiDeclQSqlTableModel.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlTableModel.cc
index 86dc2a083..c988cb195 100644
--- a/src/gsiqt/qt4/QtSql/gsiDeclQSqlTableModel.cc
+++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlTableModel.cc
@@ -3790,8 +3790,8 @@ static gsi::QFlagsClass<QSqlTableModel::EditStrategy > decl_QSqlTableModel_EditS
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QSqlTableModel> inject_QSqlTableModel_EditStrategy_Enum_in_parent (decl_QSqlTableModel_EditStrategy_Enum.defs ());
-static gsi::ClassExt<QSqlTableModel> decl_QSqlTableModel_EditStrategy_Enum_as_child (decl_QSqlTableModel_EditStrategy_Enum, "QtSql", "EditStrategy");
-static gsi::ClassExt<QSqlTableModel> decl_QSqlTableModel_EditStrategy_Enums_as_child (decl_QSqlTableModel_EditStrategy_Enums, "QtSql", "QFlags_EditStrategy");
+static gsi::ClassExt<QSqlTableModel> decl_QSqlTableModel_EditStrategy_Enum_as_child (decl_QSqlTableModel_EditStrategy_Enum, "EditStrategy");
+static gsi::ClassExt<QSqlTableModel> decl_QSqlTableModel_EditStrategy_Enums_as_child (decl_QSqlTableModel_EditStrategy_Enums, "QFlags_EditStrategy");
 
 }
 
diff --git a/src/gsiqt/qt4/QtSql/gsiQtExternals.h b/src/gsiqt/qt4/QtSql/gsiQtExternals.h
index 3a57dc947..7a71b6a35 100644
--- a/src/gsiqt/qt4/QtSql/gsiQtExternals.h
+++ b/src/gsiqt/qt4/QtSql/gsiQtExternals.h
@@ -30,7 +30,7 @@
 #if !defined(HDR_gsiQtSqlExternals)
 #define HDR_gsiQtSqlExternals
 
-#include "gsiClassBase.h"
+#include "gsiClass.h"
 #include "gsiQtSqlCommon.h"
 
 class QSqlDatabase;
diff --git a/src/gsiqt/qt4/QtXml/gsiDeclQDomImplementation.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomImplementation.cc
index 14ea2946e..53ac02abb 100644
--- a/src/gsiqt/qt4/QtXml/gsiDeclQDomImplementation.cc
+++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomImplementation.cc
@@ -296,8 +296,8 @@ static gsi::QFlagsClass<QDomImplementation::InvalidDataPolicy > decl_QDomImpleme
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QDomImplementation> inject_QDomImplementation_InvalidDataPolicy_Enum_in_parent (decl_QDomImplementation_InvalidDataPolicy_Enum.defs ());
-static gsi::ClassExt<QDomImplementation> decl_QDomImplementation_InvalidDataPolicy_Enum_as_child (decl_QDomImplementation_InvalidDataPolicy_Enum, "QtXml", "InvalidDataPolicy");
-static gsi::ClassExt<QDomImplementation> decl_QDomImplementation_InvalidDataPolicy_Enums_as_child (decl_QDomImplementation_InvalidDataPolicy_Enums, "QtXml", "QFlags_InvalidDataPolicy");
+static gsi::ClassExt<QDomImplementation> decl_QDomImplementation_InvalidDataPolicy_Enum_as_child (decl_QDomImplementation_InvalidDataPolicy_Enum, "InvalidDataPolicy");
+static gsi::ClassExt<QDomImplementation> decl_QDomImplementation_InvalidDataPolicy_Enums_as_child (decl_QDomImplementation_InvalidDataPolicy_Enums, "QFlags_InvalidDataPolicy");
 
 }
 
diff --git a/src/gsiqt/qt4/QtXml/gsiDeclQDomNode.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomNode.cc
index 6ee1604b4..69be9ecb4 100644
--- a/src/gsiqt/qt4/QtXml/gsiDeclQDomNode.cc
+++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomNode.cc
@@ -1280,8 +1280,8 @@ static gsi::QFlagsClass<QDomNode::EncodingPolicy > decl_QDomNode_EncodingPolicy_
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QDomNode> inject_QDomNode_EncodingPolicy_Enum_in_parent (decl_QDomNode_EncodingPolicy_Enum.defs ());
-static gsi::ClassExt<QDomNode> decl_QDomNode_EncodingPolicy_Enum_as_child (decl_QDomNode_EncodingPolicy_Enum, "QtXml", "EncodingPolicy");
-static gsi::ClassExt<QDomNode> decl_QDomNode_EncodingPolicy_Enums_as_child (decl_QDomNode_EncodingPolicy_Enums, "QtXml", "QFlags_EncodingPolicy");
+static gsi::ClassExt<QDomNode> decl_QDomNode_EncodingPolicy_Enum_as_child (decl_QDomNode_EncodingPolicy_Enum, "EncodingPolicy");
+static gsi::ClassExt<QDomNode> decl_QDomNode_EncodingPolicy_Enums_as_child (decl_QDomNode_EncodingPolicy_Enums, "QFlags_EncodingPolicy");
 
 }
 
@@ -1312,8 +1312,8 @@ static gsi::QFlagsClass<QDomNode::NodeType > decl_QDomNode_NodeType_Enums ("QtXm
 
 //  Inject the declarations into the parent
 static gsi::ClassExt<QDomNode> inject_QDomNode_NodeType_Enum_in_parent (decl_QDomNode_NodeType_Enum.defs ());
-static gsi::ClassExt<QDomNode> decl_QDomNode_NodeType_Enum_as_child (decl_QDomNode_NodeType_Enum, "QtXml", "NodeType");
-static gsi::ClassExt<QDomNode> decl_QDomNode_NodeType_Enums_as_child (decl_QDomNode_NodeType_Enums, "QtXml", "QFlags_NodeType");
+static gsi::ClassExt<QDomNode> decl_QDomNode_NodeType_Enum_as_child (decl_QDomNode_NodeType_Enum, "NodeType");
+static gsi::ClassExt<QDomNode> decl_QDomNode_NodeType_Enums_as_child (decl_QDomNode_NodeType_Enums, "QFlags_NodeType");
 
 }
 
diff --git a/src/gsiqt/qt4/QtXml/gsiQtExternals.h b/src/gsiqt/qt4/QtXml/gsiQtExternals.h
index c0276bb71..aab65c016 100644
--- a/src/gsiqt/qt4/QtXml/gsiQtExternals.h
+++ b/src/gsiqt/qt4/QtXml/gsiQtExternals.h
@@ -30,7 +30,7 @@
 #if !defined(HDR_gsiQtXmlExternals)
 #define HDR_gsiQtXmlExternals
 
-#include "gsiClassBase.h"
+#include "gsiClass.h"
 #include "gsiQtXmlCommon.h"
 
 class QDomAttr;
diff --git a/src/klayout_main/klayout_main/klayout.cc b/src/klayout_main/klayout_main/klayout.cc
index ddeac70cb..80eb28fb0 100644
--- a/src/klayout_main/klayout_main/klayout.cc
+++ b/src/klayout_main/klayout_main/klayout.cc
@@ -34,6 +34,8 @@
 #include "pya.h"
 #include "gsiExternalMain.h"
 
+#include "tlArch.h"
+
 #include "version.h"
 
 //  required to force linking of the "ext" and "lib" module
@@ -45,6 +47,21 @@
 #include "drcForceLink.h"
 #endif
 
+//  pulls in the Qt GSI binding modules
+#include "gsiQtGuiExternals.h"
+#include "gsiQtCoreExternals.h"
+#include "gsiQtXmlExternals.h"
+#include "gsiQtSqlExternals.h"
+#include "gsiQtNetworkExternals.h"
+#include "gsiQtDesignerExternals.h"
+
+FORCE_LINK_GSI_QTCORE
+FORCE_LINK_GSI_QTGUI
+FORCE_LINK_GSI_QTXML
+FORCE_LINK_GSI_QTDESIGNER
+FORCE_LINK_GSI_QTNETWORK
+FORCE_LINK_GSI_QTSQL
+
 #include <QTranslator>
 #include <QLocale>
 #include <QTextCodec>
diff --git a/src/klayout_main/klayout_main/klayout_main.pro b/src/klayout_main/klayout_main/klayout_main.pro
index 043cf01bb..04e2030dc 100644
--- a/src/klayout_main/klayout_main/klayout_main.pro
+++ b/src/klayout_main/klayout_main/klayout_main.pro
@@ -20,3 +20,10 @@ RESOURCES = \
 win32 {
   RC_FILE = $$PWD/klayout.rc
 }
+
+INCLUDEPATH += $$QTBASIC_INC
+DEPENDPATH += $$QTBASIC_INC
+
+equals(HAVE_QTBINDINGS, "1") {
+  LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtXml -lklayout_QtNetwork -lklayout_QtSql -lklayout_QtDesigner
+}
diff --git a/src/lay/lay/lay.pro b/src/lay/lay/lay.pro
index 7a8f31e16..fcb3eedcd 100644
--- a/src/lay/lay/lay.pro
+++ b/src/lay/lay/lay.pro
@@ -192,7 +192,7 @@ INCLUDEPATH += $$QTBASIC_INC
 DEPENDPATH += $$QTBASIC_INC
 
 equals(HAVE_QTBINDINGS, "1") {
-  LIBS += -lklayout_qtbasic -lklayout_QtGui
+  LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtXml
 }
 
 INCLUDEPATH += $$RBA_INC
@@ -212,7 +212,3 @@ equals(HAVE_PYTHON, "1") {
 } else {
   LIBS += -lklayout_pyastub
 }
-
-equals(HAVE_QTBINDINGS, "1") {
-  LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtCore -lklayout_QtXml
-}
diff --git a/src/lay/lay/layGSIHelpProvider.cc b/src/lay/lay/layGSIHelpProvider.cc
index 5d30e8a4d..ede5ce477 100644
--- a/src/lay/lay/layGSIHelpProvider.cc
+++ b/src/lay/lay/layGSIHelpProvider.cc
@@ -44,6 +44,11 @@ namespace lay
 // --------------------------------------------------------------------------------------
 //  Some utilities
 
+static std::string module_doc_path (const std::string &m)
+{
+  return "/code/index.xml?module=" + m;
+}
+
 static std::string class_doc_path (const std::string &c)
 {
   return "/code/class_" + c + ".xml";
@@ -446,7 +451,12 @@ GSIHelpProvider::get (const std::string &path) const
 
   std::string text;
   if (url_path == QString::fromUtf8 ("/code/index.xml")) {
-    text = produce_class_index ();
+    if (url.hasQueryItem (QString::fromUtf8 ("module"))) {
+      QString module = url.queryItemValue (QString::fromUtf8 ("module"));
+      text = produce_class_index (module.toUtf8 ().constData ());
+    } else {
+      text = produce_class_index (0);
+    }
   } else if (class_doc_url.indexIn (url_path) == 0) {
     text = produce_class_doc (tl::to_string (class_doc_url.cap (1)));
   } else {
@@ -476,7 +486,7 @@ GSIHelpProvider::get (const std::string &path) const
 }
 
 static 
-void produce_doc_index (const gsi::ClassBase *cls, std::ostringstream &os, std::vector <std::pair <std::string, std::string> > &class_names, std::vector <std::pair <std::string, std::string> > &qt_class_names)
+void produce_doc_index (const gsi::ClassBase *cls, const std::string &module, std::ostringstream &os, std::vector <std::pair <std::string, std::pair<std::string, std::string> > > &class_names, std::vector <std::pair <std::string, std::pair<std::string, std::string> > > &qt_class_names)
 {
   DocumentationParser &doc = cls_documentation (cls);
   std::string qname = make_qualified_name (cls);
@@ -485,20 +495,20 @@ void produce_doc_index (const gsi::ClassBase *cls, std::ostringstream &os, std::
   //  (the last criterion avoids generating classes such as A::B_C)
   if (! doc.hidden) {
     if (! doc.qt_class) {
-      class_names.push_back (std::make_pair (qname, doc.brief_doc));
+      class_names.push_back (std::make_pair (qname, std::make_pair (module, doc.brief_doc)));
     } else {
-      qt_class_names.push_back (std::make_pair (qname, doc.brief_doc));
+      qt_class_names.push_back (std::make_pair (qname, std::make_pair (module, doc.brief_doc)));
     }
     os << "<topic-ref href=\"" << escape_xml (class_doc_path (qname)) << "\"/>" << std::endl;
   }
 
   for (tl::weak_collection<gsi::ClassBase>::const_iterator cc = cls->begin_child_classes (); cc != cls->end_child_classes (); ++cc) {
-    produce_doc_index (cc.operator-> (), os, class_names, qt_class_names);
+    produce_doc_index (cc.operator-> (), module, os, class_names, qt_class_names);
   }
 }
 
 std::string  
-GSIHelpProvider::produce_class_index () const
+GSIHelpProvider::produce_class_index (const char *module_name) const
 {
   std::ostringstream os;
 
@@ -506,12 +516,66 @@ GSIHelpProvider::produce_class_index () const
      << "<!DOCTYPE language SYSTEM \"klayout_doc.dtd\">" << std::endl
      << std::endl;
 
-  os << "<doc><title>" << tl::to_string (QObject::tr ("Class Index")) << "</title>" << std::endl;
+  os << "<doc>";
+  if (!module_name) {
+    os << "<title>" << tl::to_string (QObject::tr ("Class Index")) << "</title>" << std::endl;
+  } else {
+    os << "<title>" << tl::to_string (QObject::tr ("Class Index for Module ")) << module_name << "</title>" << std::endl;
+  }
 
-  std::vector <std::pair <std::string, std::string> > class_names;
-  std::vector <std::pair <std::string, std::string> > qt_class_names;
+  typedef std::vector <std::pair <std::string, std::pair<std::string, std::string> > > class_index_t;
+
+  class_index_t class_names;
+  class_index_t qt_class_names;
   for (gsi::ClassBase::class_iterator c = gsi::ClassBase::begin_classes (); c != gsi::ClassBase::end_classes (); ++c) {
-    produce_doc_index (&*c, os, class_names, qt_class_names);
+    produce_doc_index (&*c, c->module (), os, class_names, qt_class_names);
+  }
+
+  if (module_name) {
+
+    //  filter out the classes for this module
+    class_index_t filtered_class_names;
+    class_index_t filtered_qt_class_names;
+
+    for (class_index_t::iterator i = class_names.begin (); i != class_names.end (); ++i) {
+      if (i->second.first == module_name) {
+        filtered_class_names.push_back (*i);
+      }
+    }
+
+    for (class_index_t::iterator i = qt_class_names.begin (); i != qt_class_names.end (); ++i) {
+      if (i->second.first == module_name) {
+        filtered_qt_class_names.push_back (*i);
+      }
+    }
+
+    class_names.swap (filtered_class_names);
+    qt_class_names.swap (filtered_qt_class_names);
+
+  } else {
+
+    os << "<p>" << tl::to_string (QObject::tr ("Per-Module documentation:")) << "</p>";
+
+    std::set<std::string> mod_names;
+    std::set<std::string> qt_mod_names;
+
+    for (class_index_t::iterator i = class_names.begin (); i != class_names.end (); ++i) {
+      mod_names.insert (i->second.first);
+    }
+
+    for (class_index_t::iterator i = qt_class_names.begin (); i != qt_class_names.end (); ++i) {
+      qt_mod_names.insert (i->second.first);
+    }
+
+    os << "<ul>";
+    for (std::set<std::string>::const_iterator m = mod_names.begin (); m != mod_names.end (); ++m) {
+      os << "<li><a href=\"" << module_doc_path (*m) << "\">" << tl::to_string (QObject::tr ("Core Module")) << " " << *m << "</a></li>";
+    }
+    for (std::set<std::string>::const_iterator m = qt_mod_names.begin (); m != qt_mod_names.end (); ++m) {
+      os << "<li><a href=\"" << module_doc_path (*m) << "\">" << tl::to_string (QObject::tr ("Qt Module")) << " " << *m << "</a></li>";
+    }
+    os << "</ul>";
+
   }
 
   if (! qt_class_names.empty ()) {
@@ -525,9 +589,13 @@ GSIHelpProvider::produce_class_index () const
     os << "<h2>KLayout classes</h2>" << std::endl;
     os << "<table>" << std::endl;
     int n = 0;
-    for (std::vector <std::pair <std::string, std::string> >::const_iterator cc = class_names.begin (); cc != class_names.end (); ++cc, ++n) {
+    for (class_index_t::const_iterator cc = class_names.begin (); cc != class_names.end (); ++cc, ++n) {
       os << "<tr class=\"row" << (n % 2)  << "\">" << std::endl;
-      os << "<td><a href=\"" << escape_xml (class_doc_path (cc->first)) << "\">" << escape_xml (cc->first) << "</a></td><td>&nbsp;&nbsp;</td><td><nobr>" << escape_xml (cc->second) << "</nobr></td></tr>" << std::endl;
+      os << "<td><a href=\"" << escape_xml (class_doc_path (cc->first)) << "\">" << escape_xml (cc->first) << "</a></td>";
+      if (! module_name) {
+        os << "<td>&nbsp;&nbsp;&nbsp;<nobr><a href=\"" << module_doc_path (cc->second.first) << "\">" << escape_xml (cc->second.first) << "</a></nobr></td>";
+      }
+      os << "<td>&nbsp;&nbsp;&nbsp;<nobr>" << escape_xml (cc->second.second) << "</nobr></td></tr>" << std::endl;
     }
     os << "</table>" << std::endl;
 
@@ -540,9 +608,13 @@ GSIHelpProvider::produce_class_index () const
     os << "<a name=\"qtclasses\"/><h2>Qt classes</h2>" << std::endl;
     os << "<table>" << std::endl;
     int n = 0;
-    for (std::vector <std::pair <std::string, std::string> >::const_iterator cc = qt_class_names.begin (); cc != qt_class_names.end (); ++cc, ++n) {
+    for (class_index_t::const_iterator cc = qt_class_names.begin (); cc != qt_class_names.end (); ++cc, ++n) {
       os << "<tr class=\"row" << (n % 2)  << "\">" << std::endl;
-      os << "<td><a href=\"" << escape_xml (class_doc_path (cc->first)) << "\">" << escape_xml (cc->first) << "</a></td><td>&nbsp;&nbsp;</td><td><nobr>" << escape_xml (cc->second) << "</nobr></td></tr>" << std::endl;
+      os << "<td><a href=\"" << escape_xml (class_doc_path (cc->first)) << "\">" << escape_xml (cc->first) << "</a></td>";
+      if (! module_name) {
+        os << "<td>&nbsp;&nbsp;&nbsp;<nobr><a href=\"" << module_doc_path (cc->second.first) << "\">" << escape_xml (cc->second.first) << "</a></nobr></td>";
+      }
+      os << "<td>&nbsp;&nbsp;&nbsp;<nobr>" << escape_xml (cc->second.second) << "</nobr></td></tr>" << std::endl;
     }
     os << "</table>" << std::endl;
 
diff --git a/src/lay/lay/layGSIHelpProvider.h b/src/lay/lay/layGSIHelpProvider.h
index fe63be2c5..ee7f5f622 100644
--- a/src/lay/lay/layGSIHelpProvider.h
+++ b/src/lay/lay/layGSIHelpProvider.h
@@ -45,7 +45,7 @@ public:
 
 private:
   std::string produce_class_doc (const std::string &cls) const;
-  std::string produce_class_index () const;
+  std::string produce_class_index (const char *module_name) const;
 };
 
 }
diff --git a/src/lym/lym/lymMacro.cc b/src/lym/lym/lymMacro.cc
index e6c64c658..9e189da57 100644
--- a/src/lym/lym/lymMacro.cc
+++ b/src/lym/lym/lymMacro.cc
@@ -821,9 +821,10 @@ class ExternalClass
   : public gsi::ClassBase
 {
 public:
-  ExternalClass (const std::string &name, const std::string &category, const gsi::ClassBase *base, const std::string &doc, const gsi::Methods &mm)
+  ExternalClass (const std::string &module, const std::string &name, const std::string &category, const gsi::ClassBase *base, const std::string &doc, const gsi::Methods &mm)
     : gsi::ClassBase (doc, mm), m_category (category)
   {
+    set_module (module);
     set_name (name);
     set_base (base);
   }
@@ -856,6 +857,12 @@ void Macro::install_doc () const
       tl::Extractor ex (lines [i].c_str ());
       if (ex.test ("@class")) {
 
+        std::string module;
+        if (ex.test ("[")) {
+          ex.read_word_or_quoted (module);
+          ex.test ("]");
+        }
+
         std::string cls_name, super_cls_name;
         ex.read_word_or_quoted (cls_name);
         if (ex.test ("<")) {
@@ -906,7 +913,7 @@ void Macro::install_doc () const
         if (! cls) {
           //  create a new class declaration
           static tl::stable_vector<ExternalClass> ext_classes;
-          ExternalClass *ext_cls = new ExternalClass (cls_name, category (), super_cls, doc, gsi::Methods ()); 
+          ExternalClass *ext_cls = new ExternalClass (module, cls_name, category (), super_cls, doc, gsi::Methods ());
           ext_classes.push_back (ext_cls);
           cls = ext_cls;
         }
diff --git a/src/unit_tests/unit_tests.pro b/src/unit_tests/unit_tests.pro
index 68df3dffc..64ebcd6c1 100644
--- a/src/unit_tests/unit_tests.pro
+++ b/src/unit_tests/unit_tests.pro
@@ -23,3 +23,10 @@ HEADERS += \
 !win32 {
   LIBS += -ldl
 }
+
+INCLUDEPATH += $$QTBASIC_INC
+DEPENDPATH += $$QTBASIC_INC
+
+equals(HAVE_QTBINDINGS, "1") {
+  LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtXml
+}