15 files changed, 22 insertions, 23 deletions
diff --git a/sources/pyside6/PySide6/QtQml/pysideqmlvolatilebool.cpp b/sources/pyside6/PySide6/QtQml/pysideqmlvolatilebool.cpp
index 8e1482bbb..d5c2e9206 100644
--- a/sources/pyside6/PySide6/QtQml/pysideqmlvolatilebool.cpp
+++ b/sources/pyside6/PySide6/QtQml/pysideqmlvolatilebool.cpp
@@ -151,6 +151,5 @@ void initQtQmlVolatileBool(PyObject *module)
 
     auto *obQmlVolatileBoolType = reinterpret_cast<PyObject *>(qmlVolatileBoolType);
     Py_INCREF(obQmlVolatileBoolType);
-    PyModule_AddObject(module, PepType_GetNameStr(qmlVolatileBoolType),
-                       obQmlVolatileBoolType);
+    PepModule_AddType(module, qmlVolatileBoolType);
 }
diff --git a/sources/pyside6/PySide6/glue/qtmultimedia.cpp b/sources/pyside6/PySide6/glue/qtmultimedia.cpp
index 32d9c27e2..251a46e90 100644
--- a/sources/pyside6/PySide6/glue/qtmultimedia.cpp
+++ b/sources/pyside6/PySide6/glue/qtmultimedia.cpp
@@ -25,5 +25,5 @@ const auto size = %CPPSELF.byteCount();
 // @snippet qtaudio-namespace-compatibility-alias
 auto *obType = reinterpret_cast<PyObject *>(pyType);
 Py_INCREF(obType);
-PyModule_AddObject(module, "QtAudio", obType);
+PepModule_AddType(module, pyType);
 // @snippet qtaudio-namespace-compatibility-alias
diff --git a/sources/pyside6/libpyside/class_property.cpp b/sources/pyside6/libpyside/class_property.cpp
index ee273c018..2e1001be2 100644
--- a/sources/pyside6/libpyside/class_property.cpp
+++ b/sources/pyside6/libpyside/class_property.cpp
@@ -174,7 +174,7 @@ void init(PyObject *module)
 
     auto *obClassPropertyType = reinterpret_cast<PyObject *>(classPropertyType);
     Py_INCREF(obClassPropertyType);
-    PyModule_AddObject(module, "PyClassProperty", obClassPropertyType);
+    PepModule_AddType(module, classPropertyType);
 }
 
 } // namespace PySide::ClassProperty
diff --git a/sources/pyside6/libpyside/pysideclassinfo.cpp b/sources/pyside6/libpyside/pysideclassinfo.cpp
index baef4fdde..429a9c600 100644
--- a/sources/pyside6/libpyside/pysideclassinfo.cpp
+++ b/sources/pyside6/libpyside/pysideclassinfo.cpp
@@ -119,7 +119,7 @@ void init(PyObject *module)
     auto *classInfoType = PySideClassInfo_TypeF();
     auto *obClassInfoType  = reinterpret_cast<PyObject *>(classInfoType);
     Py_INCREF(obClassInfoType);
-    PyModule_AddObject(module, "ClassInfo", obClassInfoType);
+    PepModule_AddType(module, classInfoType);
 }
 
 bool checkType(PyObject *pyObj)
diff --git a/sources/pyside6/libpyside/pysidemetafunction.cpp b/sources/pyside6/libpyside/pysidemetafunction.cpp
index ce8e42674..fa321c5b6 100644
--- a/sources/pyside6/libpyside/pysidemetafunction.cpp
+++ b/sources/pyside6/libpyside/pysidemetafunction.cpp
@@ -88,7 +88,7 @@ void init(PyObject *module)
     auto *metaFunctionType = PySideMetaFunction_TypeF();
     auto *obMetaFunctionType = reinterpret_cast<PyObject *>(metaFunctionType);
     Py_INCREF(obMetaFunctionType);
-    PyModule_AddObject(module, "MetaFunction", obMetaFunctionType);
+    PepModule_AddType(module, metaFunctionType);
 }
 
 PySideMetaFunction *newObject(QObject *source, int methodIndex)
diff --git a/sources/pyside6/libpyside/pysideproperty.cpp b/sources/pyside6/libpyside/pysideproperty.cpp
index b1b96e057..1cea7d53d 100644
--- a/sources/pyside6/libpyside/pysideproperty.cpp
+++ b/sources/pyside6/libpyside/pysideproperty.cpp
@@ -505,7 +505,7 @@ void init(PyObject *module)
 
     auto *obPropertyType = reinterpret_cast<PyObject *>(propertyType);
     Py_INCREF(obPropertyType);
-    PyModule_AddObject(module, "Property", obPropertyType);
+    PepModule_AddType(module, propertyType);
 }
 
 bool checkType(PyObject *pyObj)
diff --git a/sources/pyside6/libpyside/pysidesignal.cpp b/sources/pyside6/libpyside/pysidesignal.cpp
index b13a4da07..fdb15040c 100644
--- a/sources/pyside6/libpyside/pysidesignal.cpp
+++ b/sources/pyside6/libpyside/pysidesignal.cpp
@@ -911,21 +911,21 @@ void init(PyObject *module)
         return;
     auto *obMetaSignalType = reinterpret_cast<PyObject *>(metaSignalType);
     Py_INCREF(obMetaSignalType);
-    PyModule_AddObject(module, "MetaSignal", obMetaSignalType);
+    PepModule_AddType(module, metaSignalType);
 
     auto *signalType = PySideSignal_TypeF();
     if (InitSignatureStrings(signalType, Signal_SignatureStrings) < 0)
         return;
     auto *obSignalType = reinterpret_cast<PyObject *>(signalType);
     Py_INCREF(obSignalType);
-    PyModule_AddObject(module, "Signal", obSignalType);
+    PepModule_AddType(module, signalType);
 
     auto *signalInstanceType = PySideSignalInstance_TypeF();
     if (InitSignatureStrings(signalInstanceType, SignalInstance_SignatureStrings) < 0)
         return;
     auto *obSignalInstanceType = reinterpret_cast<PyObject *>(signalInstanceType);
     Py_INCREF(obSignalInstanceType);
-    PyModule_AddObject(module, "SignalInstance", obSignalInstanceType);
+    PepModule_AddType(module, signalInstanceType);
 }
 
 bool checkType(PyObject *pyObj)
diff --git a/sources/pyside6/libpyside/pysideslot.cpp b/sources/pyside6/libpyside/pysideslot.cpp
index f21459a78..44f0f4d06 100644
--- a/sources/pyside6/libpyside/pysideslot.cpp
+++ b/sources/pyside6/libpyside/pysideslot.cpp
@@ -183,7 +183,7 @@ void init(PyObject *module)
 
     auto *obSlotType = reinterpret_cast<PyObject *>(slotType);
     Py_INCREF(obSlotType);
-    PyModule_AddObject(module, "Slot", obSlotType);
+    PepModule_AddType(module, slotType);
 }
 
 } // namespace PySide::Slot
diff --git a/sources/pyside6/libpysideqml/pysideqmlattached.cpp b/sources/pyside6/libpysideqml/pysideqmlattached.cpp
index 4b6666d8a..133010148 100644
--- a/sources/pyside6/libpysideqml/pysideqmlattached.cpp
+++ b/sources/pyside6/libpysideqml/pysideqmlattached.cpp
@@ -59,7 +59,7 @@ static PyTypeObject *createPySideQmlAttachedType()
         PySide::ClassDecorator::Methods<PySideQmlAttachedPrivate>::typeSlots();
 
     PyType_Spec PySideQmlAttachedType_spec = {
-        "2:PySide6.QtCore.qmlAttached",
+        "2:PySide6.QtCore.QmlAttached",
         sizeof(PySideClassDecorator),
         0,
         Py_TPFLAGS_DEFAULT,
@@ -172,7 +172,7 @@ void initQmlAttached(PyObject *module)
 
     auto *obQmlAttachedType = reinterpret_cast<PyObject *>(qmlAttachedType);
     Py_INCREF(obQmlAttachedType);
-    PyModule_AddObject(module, "QmlAttached", obQmlAttachedType);
+    PepModule_AddType(module, qmlAttachedType);
 }
 
 PySide::Qml::QmlExtensionInfo qmlAttachedInfo(PyTypeObject *t,
diff --git a/sources/pyside6/libpysideqml/pysideqmlextended.cpp b/sources/pyside6/libpysideqml/pysideqmlextended.cpp
index 6d49bdc54..598c20d91 100644
--- a/sources/pyside6/libpysideqml/pysideqmlextended.cpp
+++ b/sources/pyside6/libpysideqml/pysideqmlextended.cpp
@@ -55,7 +55,7 @@ static PyTypeObject *createPySideQmlExtendedType()
         PySide::ClassDecorator::Methods<PySideQmlExtendedPrivate>::typeSlots();
 
     PyType_Spec PySideQmlExtendedType_spec = {
-        "2:PySide6.QtCore.qmlExtended",
+        "2:PySide6.QtCore.QmlExtended",
         sizeof(PySideClassDecorator),
         0,
         Py_TPFLAGS_DEFAULT,
@@ -127,7 +127,7 @@ void initQmlExtended(PyObject *module)
 
     auto *obQmlExtendedType = reinterpret_cast<PyObject *>(qmlExtendedType);
     Py_INCREF(obQmlExtendedType);
-    PyModule_AddObject(module, "QmlExtended", obQmlExtendedType);
+    PepModule_AddType(module, qmlExtendedType);
 }
 
 PySide::Qml::QmlExtensionInfo qmlExtendedInfo(PyObject *t,
diff --git a/sources/pyside6/libpysideqml/pysideqmlforeign.cpp b/sources/pyside6/libpysideqml/pysideqmlforeign.cpp
index 7ac798030..e56eb1b2a 100644
--- a/sources/pyside6/libpysideqml/pysideqmlforeign.cpp
+++ b/sources/pyside6/libpysideqml/pysideqmlforeign.cpp
@@ -57,7 +57,7 @@ static PyTypeObject *createPySideQmlForeignType()
         PySide::ClassDecorator::Methods<PySideQmlForeignPrivate>::typeSlots();
 
     PyType_Spec PySideQmlForeignType_spec = {
-        "2:PySide6.QtCore.qmlForeign",
+        "2:PySide6.QtCore.QmlForeign",
         sizeof(PySideClassDecorator),
         0,
         Py_TPFLAGS_DEFAULT,
@@ -89,7 +89,7 @@ void initQmlForeign(PyObject *module)
 
     auto *obForeignType = reinterpret_cast<PyObject *>(foreignType);
     Py_INCREF(obForeignType);
-    PyModule_AddObject(module, "QmlForeign", obForeignType);
+    PepModule_AddType(module, foreignType);
 }
 
 } // namespace PySide::Qml
diff --git a/sources/pyside6/libpysideqml/pysideqmllistproperty.cpp b/sources/pyside6/libpysideqml/pysideqmllistproperty.cpp
index adad4cb99..792df25d6 100644
--- a/sources/pyside6/libpysideqml/pysideqmllistproperty.cpp
+++ b/sources/pyside6/libpysideqml/pysideqmllistproperty.cpp
@@ -309,7 +309,7 @@ void initQtQmlListProperty(PyObject *module)
     auto *propertyListType = PropertyList_TypeF();
     auto *obPropertyListType = reinterpret_cast<PyObject *>(propertyListType);
     Py_INCREF(obPropertyListType);
-    PyModule_AddObject(module, PepType_GetNameStr(propertyListType), obPropertyListType);
+    PepModule_AddType(module, propertyListType);
 }
 
 } // namespace PySide::Qml
diff --git a/sources/pyside6/libpysideqml/pysideqmlnamedelement.cpp b/sources/pyside6/libpysideqml/pysideqmlnamedelement.cpp
index 0b3f7358a..3178f4339 100644
--- a/sources/pyside6/libpysideqml/pysideqmlnamedelement.cpp
+++ b/sources/pyside6/libpysideqml/pysideqmlnamedelement.cpp
@@ -41,7 +41,7 @@ PyTypeObject *createPySideQmlNamedElementType(void)
         PySide::ClassDecorator::Methods<PySideQmlNamedElementPrivate>::typeSlots();
 
     PyType_Spec PySideQmlNamedElementType_spec = {
-        "2:PySide6.QtCore.qmlNamedElement",
+        "2:PySide6.QtCore.QmlNamedElement",
         sizeof(PySideClassDecorator),
         0,
         Py_TPFLAGS_DEFAULT,
@@ -71,5 +71,5 @@ void initQmlNamedElement(PyObject *module)
 
     auto *obQmlNamedElementType = reinterpret_cast<PyObject *>(qmlNamedElementType);
     Py_INCREF(obQmlNamedElementType);
-    PyModule_AddObject(module, "QmlNamedElement", obQmlNamedElementType);
+    PepModule_AddType(module, qmlNamedElementType);
 }
diff --git a/sources/pyside6/libpysideqml/pysideqmluncreatable.cpp b/sources/pyside6/libpysideqml/pysideqmluncreatable.cpp
index b83fa88f5..2397fa61c 100644
--- a/sources/pyside6/libpysideqml/pysideqmluncreatable.cpp
+++ b/sources/pyside6/libpysideqml/pysideqmluncreatable.cpp
@@ -72,7 +72,7 @@ PyTypeObject *createPySideQmlUncreatableType(void)
         PySide::ClassDecorator::Methods<PySideQmlUncreatablePrivate>::typeSlots();
 
     PyType_Spec PySideQmlUncreatableType_spec = {
-        "2:PySide6.QtCore.qmlUncreatable",
+        "2:PySide6.QtCore.QmlUncreatable",
         sizeof(PySideClassDecorator),
         0,
         Py_TPFLAGS_DEFAULT,
@@ -102,7 +102,7 @@ void initQmlUncreatable(PyObject *module)
 
     auto *obQmlUncreatableType = reinterpret_cast<PyObject *>(qmlUncreatableType);
     Py_INCREF(obQmlUncreatableType);
-    PyModule_AddObject(module, "QmlUncreatable", obQmlUncreatableType);
+    PepModule_AddType(module, qmlUncreatableType);
 }
 
 void setUncreatableClassInfo(PyTypeObject *type, const QByteArray &reason)
diff --git a/sources/pyside6/libpysideremoteobjects/pysiderephandler.cpp b/sources/pyside6/libpysideremoteobjects/pysiderephandler.cpp
index b4ae71080..7ceb90586 100644
--- a/sources/pyside6/libpysideremoteobjects/pysiderephandler.cpp
+++ b/sources/pyside6/libpysideremoteobjects/pysiderephandler.cpp
@@ -444,7 +444,7 @@ void init(PyObject *module)
     auto *repType = PySideRepFile_TypeF();
     auto *obRepType = reinterpret_cast<PyObject *>(repType);
     Py_INCREF(obRepType);
-    PyModule_AddObject(module, "RepFile", obRepType);
+    PepModule_AddType(module, repType);
 
     // Add a test helper to verify type reference counting
     static PyMethodDef get_capsule_count_def = {