finally, pyside needs to be renamed in the XML files

The XML names like "PySide.QtCore" go into the binaries for import, so it is necessary
to change them all. There are also hundreds of Python files which must bechanged, as well.

33 files changed, 51 insertions, 51 deletions

diff --git a/PySide2/QtConcurrent/typesystem_concurrent.xml b/PySide2/QtConcurrent/typesystem_concurrent.xml
index 83f5aca96..7df4b0f22 100644
--- a/PySide2/QtConcurrent/typesystem_concurrent.xml
+++ b/PySide2/QtConcurrent/typesystem_concurrent.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtConcurrent">
+<typesystem package="PySide2.QtConcurrent">
   <load-typesystem name="typesystem_core.xml" generate="no"/>
 
   <!-- Qt5: this is currently the minimum possible QtConcurrent support, by just extracting
diff --git a/PySide2/QtCore/typesystem_core.xml.in b/PySide2/QtCore/typesystem_core.xml.in
index 499dcdc8d..f0e894bbc 100644
--- a/PySide2/QtCore/typesystem_core.xml.in
+++ b/PySide2/QtCore/typesystem_core.xml.in
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtCore">
+<typesystem package="PySide2.QtCore">
     <load-typesystem name="typesystem_core_@AUTO_OS@.xml" generate="yes"/>
     <load-typesystem name="typesystem_core_common.xml" generate="yes"/>
 </typesystem>
diff --git a/PySide2/QtCore/typesystem_core_common.xml b/PySide2/QtCore/typesystem_core_common.xml
index 539e2137d..de6004c49 100644
--- a/PySide2/QtCore/typesystem_core_common.xml
+++ b/PySide2/QtCore/typesystem_core_common.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtCore">
+<typesystem package="PySide2.QtCore">
     <load-typesystem name="typesystem_templates.xml" generate="no"/>
 
     <custom-type name="str" />
@@ -547,7 +547,7 @@
 
   <primitive-type name="QVariantMap" target-lang-api-name="PyDict"/>
   <inject-code class="target" position="end">
-  Shiboken::Conversions::registerConverterName(SbkPySide_QtCoreTypeConverters[SBK_QTCORE_QMAP_QSTRING_QVARIANT_IDX], "QVariantMap");
+  Shiboken::Conversions::registerConverterName(SbkPySide2_QtCoreTypeConverters[SBK_QTCORE_QMAP_QSTRING_QVARIANT_IDX], "QVariantMap");
   </inject-code>
 
   <inject-code class="native" position="beginning">
@@ -1002,9 +1002,9 @@
 
   <!--signal/slot-->
   <inject-code class="target" position="end">
-    Shiboken::Conversions::registerConverterName(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], "unicode");
-    Shiboken::Conversions::registerConverterName(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], "str");
-    Shiboken::Conversions::registerConverterName(SbkPySide_QtCoreTypeConverters[SBK_QTCORE_QLIST_QVARIANT_IDX], "QVariantList");
+    Shiboken::Conversions::registerConverterName(SbkPySide2_QtCoreTypeConverters[SBK_QSTRING_IDX], "unicode");
+    Shiboken::Conversions::registerConverterName(SbkPySide2_QtCoreTypeConverters[SBK_QSTRING_IDX], "str");
+    Shiboken::Conversions::registerConverterName(SbkPySide2_QtCoreTypeConverters[SBK_QTCORE_QLIST_QVARIANT_IDX], "QVariantList");
 
     PySide::init(module);
     Py_AtExit(QtCoreModuleExit);
@@ -4059,7 +4059,7 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
     </modify-function>
 
     <!-- FIXME: the proper signature for this added function would be something like
-         addTransition(PySide.QtCore.Signal, QAbstractState*)
+         addTransition(PySide2.QtCore.Signal, QAbstractState*)
          but that depends on bug #362. -->
     <add-function signature="addTransition(PyObject*, QAbstractState*)" return-type="QSignalTransition*">
       <modify-argument index="return">
diff --git a/PySide2/QtCore/typesystem_core_mac.xml b/PySide2/QtCore/typesystem_core_mac.xml
index 003363cae..439648b98 100644
--- a/PySide2/QtCore/typesystem_core_mac.xml
+++ b/PySide2/QtCore/typesystem_core_mac.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtCore">
+<typesystem package="PySide2.QtCore">
   <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject" />
   <!-- Qt5: had to move QAbstractEventDispatcher into os-specific files because of Windows -->
   <object-type name="QAbstractEventDispatcher">
diff --git a/PySide2/QtCore/typesystem_core_win.xml b/PySide2/QtCore/typesystem_core_win.xml
index 6b8b20312..c0a439e5d 100644
--- a/PySide2/QtCore/typesystem_core_win.xml
+++ b/PySide2/QtCore/typesystem_core_win.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtCore">
+<typesystem package="PySide2.QtCore">
   <extra-includes>
     <include file-name="windows.h" location="global"/>
   </extra-includes>
diff --git a/PySide2/QtCore/typesystem_core_x11.xml b/PySide2/QtCore/typesystem_core_x11.xml
index 8fa3a6d2c..0fc72032e 100644
--- a/PySide2/QtCore/typesystem_core_x11.xml
+++ b/PySide2/QtCore/typesystem_core_x11.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtCore">
+<typesystem package="PySide2.QtCore">
   <primitive-type name="Qt::HANDLE" target-lang-api-name="PyLong">
     <!-- FIXME APIExtractor or shiboken do not support multiple includes by primitive type -->
     <!-- Qt5: XXX move this to QtGui <include file-name="QTextDocument" location="global"/> -->
diff --git a/PySide2/QtDeclarative/pysideqmlregistertype.cpp b/PySide2/QtDeclarative/pysideqmlregistertype.cpp
index 5b09d4673..28d10c37f 100644
--- a/PySide2/QtDeclarative/pysideqmlregistertype.cpp
+++ b/PySide2/QtDeclarative/pysideqmlregistertype.cpp
@@ -260,8 +260,8 @@ void propListAppender(QDeclarativeListProperty<QDeclarativeItem>* propList, QDec
     Shiboken::GilState state;
 
     Shiboken::AutoDecRef args(PyTuple_New(2));
-    PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], propList->object));
-    PyTuple_SET_ITEM(args, 1, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtDeclarativeTypes[SBK_QDECLARATIVEITEM_IDX], item));
+    PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide2_QtCoreTypes[SBK_QOBJECT_IDX], propList->object));
+    PyTuple_SET_ITEM(args, 1, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide2_QtDeclarativeTypes[SBK_QDECLARATIVEITEM_IDX], item));
 
     DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data);
     Shiboken::AutoDecRef retVal(PyObject_CallObject(data->append, args));
@@ -276,7 +276,7 @@ int propListCount(QDeclarativeListProperty<QDeclarativeItem>* propList)
     Shiboken::GilState state;
 
     Shiboken::AutoDecRef args(PyTuple_New(1));
-    PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], propList->object));
+    PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide2_QtCoreTypes[SBK_QOBJECT_IDX], propList->object));
 
     DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data);
     Shiboken::AutoDecRef retVal(PyObject_CallObject(data->count, args));
@@ -297,7 +297,7 @@ QDeclarativeItem* propListAt(QDeclarativeListProperty<QDeclarativeItem>* propLis
     Shiboken::GilState state;
 
     Shiboken::AutoDecRef args(PyTuple_New(2));
-    PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], propList->object));
+    PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide2_QtCoreTypes[SBK_QOBJECT_IDX], propList->object));
     PyTuple_SET_ITEM(args, 1, Shiboken::Conversions::copyToPython(Shiboken::Conversions::PrimitiveTypeConverter<int>(), &index));
 
     DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data);
@@ -307,7 +307,7 @@ QDeclarativeItem* propListAt(QDeclarativeListProperty<QDeclarativeItem>* propLis
     if (PyErr_Occurred())
         PyErr_Print();
     else if (PyType_IsSubtype(Py_TYPE(retVal), data->type))
-        Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QDECLARATIVEITEM_IDX], retVal, &result);
+        Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkPySide2_QtCoreTypes[SBK_QDECLARATIVEITEM_IDX], retVal, &result);
     return result;
 }
 
@@ -317,7 +317,7 @@ void propListClear(QDeclarativeListProperty<QDeclarativeItem>* propList)
     Shiboken::GilState state;
 
     Shiboken::AutoDecRef args(PyTuple_New(1));
-    PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], propList->object));
+    PyTuple_SET_ITEM(args, 0, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkPySide2_QtCoreTypes[SBK_QOBJECT_IDX], propList->object));
 
     DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(propList->data);
     Shiboken::AutoDecRef retVal(PyObject_CallObject(data->clear, args));
@@ -334,7 +334,7 @@ static void propListMetaCall(PySideProperty* pp, PyObject* self, QMetaObject::Ca
 
     DeclarativeListProperty* data = reinterpret_cast<DeclarativeListProperty*>(PySide::Property::userData(pp));
     QObject* qobj;
-    Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkPySide_QtCoreTypes[SBK_QOBJECT_IDX], self, &qobj);
+    Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkPySide2_QtCoreTypes[SBK_QOBJECT_IDX], self, &qobj);
     QDeclarativeListProperty<QDeclarativeItem> declProp(qobj, data, &propListAppender);
 
     if (data->count)
diff --git a/PySide2/QtDeclarative/typesystem_declarative.xml b/PySide2/QtDeclarative/typesystem_declarative.xml
index 228f7287e..d6c5022ef 100644
--- a/PySide2/QtDeclarative/typesystem_declarative.xml
+++ b/PySide2/QtDeclarative/typesystem_declarative.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtDeclarative">
+<typesystem package="PySide2.QtDeclarative">
     <load-typesystem name="typesystem_core.xml" generate="no"/>
     <load-typesystem name="typesystem_network.xml" generate="no"/>
     <load-typesystem name="typesystem_widgets.xml" generate="no"/>
diff --git a/PySide2/QtGui/typesystem_gui.xml.in b/PySide2/QtGui/typesystem_gui.xml.in
index 8c5cfa9a5..8e2d23cbd 100644
--- a/PySide2/QtGui/typesystem_gui.xml.in
+++ b/PySide2/QtGui/typesystem_gui.xml.in
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtGui">
+<typesystem package="PySide2.QtGui">
     <load-typesystem name="typesystem_core.xml" generate="no"/>
     <load-typesystem name="typesystem_gui_@AUTO_OS@.xml" generate="yes"/>
     <load-typesystem name="typesystem_gui_common.xml" generate="yes"/>
diff --git a/PySide2/QtGui/typesystem_gui_common.xml b/PySide2/QtGui/typesystem_gui_common.xml
index 62aa03cd1..e0ddb1f0a 100644
--- a/PySide2/QtGui/typesystem_gui_common.xml
+++ b/PySide2/QtGui/typesystem_gui_common.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtGui">
+<typesystem package="PySide2.QtGui">
   <load-typesystem name="typesystem_core.xml" generate="no"/>
 
   <template name="QFontCharFix">
@@ -892,7 +892,7 @@
         {
             qreal r, g, b, a;
             %CPPSELF.getRgbF(&amp;r, &amp;g, &amp;b, &amp;a);
-            QString repr = QString().sprintf("PySide.QtGui.QColor.fromRgbF(%.6f, %.6f, %.6f, %.6f)", r, g, b, a);
+            QString repr = QString().sprintf("PySide2.QtGui.QColor.fromRgbF(%.6f, %.6f, %.6f, %.6f)", r, g, b, a);
             %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr));
             break;
         }
@@ -900,7 +900,7 @@
         {
             qreal h, s, v, a;
             %CPPSELF.getHsvF(&amp;h, &amp;s, &amp;v, &amp;a);
-            QString repr = QString().sprintf("PySide.QtGui.QColor.fromHsvF(%.6f, %.6f, %.6f, %.6f)", h, s, v, a);
+            QString repr = QString().sprintf("PySide2.QtGui.QColor.fromHsvF(%.6f, %.6f, %.6f, %.6f)", h, s, v, a);
             %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr));
             break;
         }
@@ -908,7 +908,7 @@
         {
             qreal c, m, y, k, a;
             %CPPSELF.getCmykF(&amp;c, &amp;m, &amp;y, &amp;k, &amp;a);
-            QString repr = QString().sprintf("PySide.QtGui.QColor.fromCmykF(%.6f, %.6f, %.6f, %.6f, %.6f)", c, m, y, k, a);
+            QString repr = QString().sprintf("PySide2.QtGui.QColor.fromCmykF(%.6f, %.6f, %.6f, %.6f, %.6f)", c, m, y, k, a);
             %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr));
             break;
         }
@@ -917,14 +917,14 @@
         {
             qreal h, s, l, a;
             %CPPSELF.getHslF(&amp;h, &amp;s, &amp;l, &amp;a);
-            QString repr = QString().sprintf("PySide.QtGui.QColor.fromHslF(%.6f, %.6f, %.6f, %.6f)", h, s, l, a);
+            QString repr = QString().sprintf("PySide2.QtGui.QColor.fromHslF(%.6f, %.6f, %.6f, %.6f)", h, s, l, a);
             %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr));
             break;
         }
         #endif
         default:
         {
-            %PYARG_0 = Shiboken::String::fromCString("PySide.QtGui.QColor()");
+            %PYARG_0 = Shiboken::String::fromCString("PySide2.QtGui.QColor()");
         }
      }
   </template>
@@ -1681,7 +1681,7 @@
         } else {
             PyErr_Format(PyExc_TypeError, "Invalid return value in function %s, expected %s, got %s.",
                         "QValidator.validate",
-                        "PySide.QtGui.QValidator.State, (PySide.QtGui.QValidator.State,), (PySide.QtGui.QValidator.State, unicode) or (PySide.QtGui.QValidator.State, unicode, int)",
+                        "PySide2.QtGui.QValidator.State, (PySide2.QtGui.QValidator.State,), (PySide2.QtGui.QValidator.State, unicode) or (PySide2.QtGui.QValidator.State, unicode, int)",
                         pyResult->ob_type->tp_name);
             return QValidator::State();
         }
diff --git a/PySide2/QtGui/typesystem_gui_mac.xml b/PySide2/QtGui/typesystem_gui_mac.xml
index a3b5e9a24..a3a48f418 100644
--- a/PySide2/QtGui/typesystem_gui_mac.xml
+++ b/PySide2/QtGui/typesystem_gui_mac.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtGui">
+<typesystem package="PySide2.QtGui">
   <rejection class="*" function-name="qt_mac_set_cursor"/>
   <rejection class="*" function-name="macMenu"/>
 
diff --git a/PySide2/QtGui/typesystem_gui_win.xml b/PySide2/QtGui/typesystem_gui_win.xml
index b100b6738..0687b75c7 100644
--- a/PySide2/QtGui/typesystem_gui_win.xml
+++ b/PySide2/QtGui/typesystem_gui_win.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtGui">
+<typesystem package="PySide2.QtGui">
   <primitive-type name="WId" target-lang-api-name="PyObject">
     <conversion-rule>
         <native-to-target>
diff --git a/PySide2/QtGui/typesystem_gui_x11.xml b/PySide2/QtGui/typesystem_gui_x11.xml
index 5d70c47ec..7cbb8953b 100644
--- a/PySide2/QtGui/typesystem_gui_x11.xml
+++ b/PySide2/QtGui/typesystem_gui_x11.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtGui">
+<typesystem package="PySide2.QtGui">
 
   <rejection class="" function-name="qt_x11_getX11InfoForWindow"/>
   <rejection class="QX11Info" field-name="x11data"/>
diff --git a/PySide2/QtHelp/typesystem_help.xml b/PySide2/QtHelp/typesystem_help.xml
index bfe506eec..a788bdf83 100644
--- a/PySide2/QtHelp/typesystem_help.xml
+++ b/PySide2/QtHelp/typesystem_help.xml
@@ -19,7 +19,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
 
-<typesystem package="PySide.QtHelp">
+<typesystem package="PySide2.QtHelp">
     <load-typesystem name="typesystem_widgets.xml" generate="no" />
 
     <value-type name="QHelpContentItem">
diff --git a/PySide2/QtMultimedia/typesystem_multimedia.xml b/PySide2/QtMultimedia/typesystem_multimedia.xml
index 3dd644336..7b173090e 100644
--- a/PySide2/QtMultimedia/typesystem_multimedia.xml
+++ b/PySide2/QtMultimedia/typesystem_multimedia.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtMultimedia">
+<typesystem package="PySide2.QtMultimedia">
   <load-typesystem name="typesystem_core.xml" generate="no" />
   <load-typesystem name="typesystem_gui.xml" generate="no" />
   <load-typesystem name="typesystem_network.xml" generate="no" />
diff --git a/PySide2/QtNetwork/typesystem_network.xml b/PySide2/QtNetwork/typesystem_network.xml
index c88fac9d4..ad5db74bd 100644
--- a/PySide2/QtNetwork/typesystem_network.xml
+++ b/PySide2/QtNetwork/typesystem_network.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtNetwork">
+<typesystem package="PySide2.QtNetwork">
   <load-typesystem name="typesystem_core.xml" generate="no"/>
 
     <namespace-type name="QSsl">
diff --git a/PySide2/QtOpenGL/typesystem_opengl.xml b/PySide2/QtOpenGL/typesystem_opengl.xml
index 1988b5355..145c16713 100644
--- a/PySide2/QtOpenGL/typesystem_opengl.xml
+++ b/PySide2/QtOpenGL/typesystem_opengl.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtOpenGL">
+<typesystem package="PySide2.QtOpenGL">
   <load-typesystem name="typesystem_gui.xml" generate="no" />
 
   <primitive-type name="GLbitfield"/>
diff --git a/PySide2/QtPrintSupport/typesystem_printsupport.xml b/PySide2/QtPrintSupport/typesystem_printsupport.xml
index 73376eae9..fb0d64a4e 100644
--- a/PySide2/QtPrintSupport/typesystem_printsupport.xml
+++ b/PySide2/QtPrintSupport/typesystem_printsupport.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtPrintSupport">
+<typesystem package="PySide2.QtPrintSupport">
     <load-typesystem name="typesystem_widgets.xml" generate="no" />
 
   <object-type name="QPageSetupDialog">
diff --git a/PySide2/QtScript/typesystem_script.xml b/PySide2/QtScript/typesystem_script.xml
index 9cce25e9d..2fe032c4e 100644
--- a/PySide2/QtScript/typesystem_script.xml
+++ b/PySide2/QtScript/typesystem_script.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtScript">
+<typesystem package="PySide2.QtScript">
     <load-typesystem name="typesystem_core.xml" generate="no" />
 
     <object-type name="QScriptable"/>
diff --git a/PySide2/QtScriptTools/typesystem_scripttools.xml b/PySide2/QtScriptTools/typesystem_scripttools.xml
index 67b515c6f..ea3e3dcdc 100644
--- a/PySide2/QtScriptTools/typesystem_scripttools.xml
+++ b/PySide2/QtScriptTools/typesystem_scripttools.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtScriptTools">
+<typesystem package="PySide2.QtScriptTools">
     <load-typesystem name="typesystem_script.xml" generate="no" />
     <load-typesystem name="typesystem_gui.xml" generate="no" />
 
diff --git a/PySide2/QtSql/typesystem_sql.xml b/PySide2/QtSql/typesystem_sql.xml
index 34ae52b2b..98db07825 100644
--- a/PySide2/QtSql/typesystem_sql.xml
+++ b/PySide2/QtSql/typesystem_sql.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtSql">
+<typesystem package="PySide2.QtSql">
   <load-typesystem name="typesystem_widgets.xml" generate="no"/>
 
   <rejection class="QSqlDriverCreator"/>
diff --git a/PySide2/QtSvg/typesystem_svg.xml b/PySide2/QtSvg/typesystem_svg.xml
index 58ab812fc..13b9851b8 100644
--- a/PySide2/QtSvg/typesystem_svg.xml
+++ b/PySide2/QtSvg/typesystem_svg.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtSvg">
+<typesystem package="PySide2.QtSvg">
   <load-typesystem name="typesystem_widgets.xml" generate="no"/>
 
   <object-type name="QSvgRenderer" />
diff --git a/PySide2/QtTest/typesystem_test.xml b/PySide2/QtTest/typesystem_test.xml
index 6e2c5bf19..bda8d82d6 100644
--- a/PySide2/QtTest/typesystem_test.xml
+++ b/PySide2/QtTest/typesystem_test.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtTest">
+<typesystem package="PySide2.QtTest">
   <load-typesystem name="typesystem_core.xml" generate="no"/>
   <load-typesystem name="typesystem_gui.xml" generate="no"/>
   <load-typesystem name="typesystem_widgets.xml" generate="no"/>
diff --git a/PySide2/QtUiTools/typesystem_uitools.xml b/PySide2/QtUiTools/typesystem_uitools.xml
index 16039c9ec..5b41878b9 100644
--- a/PySide2/QtUiTools/typesystem_uitools.xml
+++ b/PySide2/QtUiTools/typesystem_uitools.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtUiTools">
+<typesystem package="PySide2.QtUiTools">
     <load-typesystem name="typesystem_widgets.xml" generate="no" />
     <load-typesystem name="typesystem_xml.xml" generate="no" />
 
@@ -45,7 +45,7 @@
          &lt;http://www.pyside.org/docs/shiboken/wordsofadvice.html#duck-punching-and-virtual-methods>`_)
 
          Let's see an obvious example. If you want to create a new widget it's probable you'll end up
-         overriding :class:`~PySide.QtGui.QWidget`'s :meth:`~PySide.QtGui.QWidget.paintEvent` method.
+         overriding :class:`~PySide2.QtGui.QWidget`'s :meth:`~PySide2.QtGui.QWidget.paintEvent` method.
 
          .. code-block:: python
 
diff --git a/PySide2/QtWebKit/typesystem_webkit.xml b/PySide2/QtWebKit/typesystem_webkit.xml
index 84b82aaed..2e7c1b144 100644
--- a/PySide2/QtWebKit/typesystem_webkit.xml
+++ b/PySide2/QtWebKit/typesystem_webkit.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtWebKit">
+<typesystem package="PySide2.QtWebKit">
   <load-typesystem name="typesystem_core.xml" generate="no"/>
   <load-typesystem name="typesystem_gui.xml" generate="no"/>
   <load-typesystem name="typesystem_network.xml" generate="no"/>
diff --git a/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml b/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml
index e4e4f05b6..9b1cf396d 100644
--- a/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml
+++ b/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtWebKitWidgets">
+<typesystem package="PySide2.QtWebKitWidgets">
   <load-typesystem name="typesystem_core.xml" generate="no"/>
   <load-typesystem name="typesystem_gui.xml" generate="no"/>
   <load-typesystem name="typesystem_widgets.xml" generate="no"/>
diff --git a/PySide2/QtWidgets/typesystem_widgets.xml.in b/PySide2/QtWidgets/typesystem_widgets.xml.in
index c7538dbcc..b0dd1948e 100644
--- a/PySide2/QtWidgets/typesystem_widgets.xml.in
+++ b/PySide2/QtWidgets/typesystem_widgets.xml.in
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtWidgets">
+<typesystem package="PySide2.QtWidgets">
     <load-typesystem name="typesystem_gui.xml" generate="no"/>
     <load-typesystem name="typesystem_widgets_@AUTO_OS@.xml" generate="yes"/>
     <load-typesystem name="typesystem_widgets_common.xml" generate="yes"/>
diff --git a/PySide2/QtWidgets/typesystem_widgets_common.xml b/PySide2/QtWidgets/typesystem_widgets_common.xml
index 0362a691d..0e1263376 100644
--- a/PySide2/QtWidgets/typesystem_widgets_common.xml
+++ b/PySide2/QtWidgets/typesystem_widgets_common.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtWidgets">
+<typesystem package="PySide2.QtWidgets">
   <load-typesystem name="typesystem_gui.xml" generate="no"/>
 
 
diff --git a/PySide2/QtWidgets/typesystem_widgets_mac.xml b/PySide2/QtWidgets/typesystem_widgets_mac.xml
index fbb1220b1..a51959e01 100644
--- a/PySide2/QtWidgets/typesystem_widgets_mac.xml
+++ b/PySide2/QtWidgets/typesystem_widgets_mac.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtWidgets">
+<typesystem package="PySide2.QtWidgets">
   <rejection class="*" function-name="qt_mac_set_cursor"/>
   <rejection class="*" function-name="macMenu"/>
 
diff --git a/PySide2/QtWidgets/typesystem_widgets_win.xml b/PySide2/QtWidgets/typesystem_widgets_win.xml
index 8521789c7..88a0b95b1 100644
--- a/PySide2/QtWidgets/typesystem_widgets_win.xml
+++ b/PySide2/QtWidgets/typesystem_widgets_win.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtWidgets">
+<typesystem package="PySide2.QtWidgets">
   <primitive-type name="WId" target-lang-api-name="PyObject">
     <conversion-rule>
         <native-to-target>
diff --git a/PySide2/QtWidgets/typesystem_widgets_x11.xml b/PySide2/QtWidgets/typesystem_widgets_x11.xml
index ca56332e7..94c1a64b9 100644
--- a/PySide2/QtWidgets/typesystem_widgets_x11.xml
+++ b/PySide2/QtWidgets/typesystem_widgets_x11.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtWidgets">
+<typesystem package="PySide2.QtWidgets">
 
   <rejection class="" function-name="qt_x11_getX11InfoForWindow"/>
   <rejection class="QX11Info" field-name="x11data"/>
diff --git a/PySide2/QtXml/typesystem_xml.xml b/PySide2/QtXml/typesystem_xml.xml
index feab9b1f8..f84adee95 100644
--- a/PySide2/QtXml/typesystem_xml.xml
+++ b/PySide2/QtXml/typesystem_xml.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtXml">
+<typesystem package="PySide2.QtXml">
     <load-typesystem name="typesystem_templates.xml" generate="no" />
     <load-typesystem name="typesystem_core.xml" generate="no" />
 
diff --git a/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml b/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml
index 34488fabe..0b859c3d5 100644
--- a/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml
+++ b/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml
@@ -18,7 +18,7 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<typesystem package="PySide.QtXmlPatterns">
+<typesystem package="PySide2.QtXmlPatterns">
     <load-typesystem name="typesystem_core.xml" generate="no"/>
 
     <object-type name="QXmlSchema" since="4.6" /> <!-- Qt scoped pointer does not allow declare this as value type -->