python: Rename all PyTypeObject's to conform to PEP 7.

This is the first step towards implementing coding guidelines for the
C++ code and providing an usable C++ API.

15 files changed, 177 insertions, 177 deletions

diff --git a/python/acquire.cc b/python/acquire.cc
index 054956ea..4329e790 100644
--- a/python/acquire.cc
+++ b/python/acquire.cc
@@ -140,7 +140,7 @@ static void AcquireItemDealloc(PyObject *self) {
 
 
 
-PyTypeObject AcquireItemType =
+PyTypeObject PyAcquireItem_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.AcquireItem",         // tp_name
@@ -238,7 +238,7 @@ static PyObject *PkgAcquireGetItems(PyObject *Self,void*)
         I != fetcher->ItemsEnd(); I++)
    {
       PyAcquireItemObject *Obj;
-      Obj = CppOwnedPyObject_NEW<pkgAcquire::Item*>(Self,&AcquireItemType,*I);
+      Obj = CppOwnedPyObject_NEW<pkgAcquire::Item*>(Self,&PyAcquireItem_Type,*I);
       Obj->NoDelete = true;
       PyList_Append(List,Obj);
       ((PyAcquireObject *)Self)->items.push_back(Obj);
@@ -305,7 +305,7 @@ static char *doc_PkgAcquire = "Acquire(progress) -> Acquire() object.\n\n"
     "specify a apt.progress.FetchProgress() object, which will display the\n"
     "progress of the fetching.";
 
-PyTypeObject PkgAcquireType =
+PyTypeObject PyAcquire_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.Acquire",                   // tp_name
@@ -354,7 +354,7 @@ PyObject *GetAcquire(PyObject *Self,PyObject *Args)
 {
     PyErr_WarnEx(PyExc_DeprecationWarning,"apt_pkg.GetAcquire() is deprecated."
                  " Please see apt_pkg.Acquire() for the replacement.", 1);
-    return PkgAcquireNew(&PkgAcquireType,Args,0);
+    return PkgAcquireNew(&PyAcquire_Type,Args,0);
 }
 #endif
 
@@ -369,7 +369,7 @@ static PyObject *PkgAcquireFileNew(PyTypeObject *type, PyObject *Args, PyObject
                       "destdir", "destfile", NULL};
 
    if (PyArg_ParseTupleAndKeywords(Args, kwds, "O!s|sissss", kwlist,
-				   &PkgAcquireType, &pyfetcher, &uri, &md5,
+				   &PyAcquire_Type, &pyfetcher, &uri, &md5,
 				   &size, &descr, &shortDescr, &destDir, &destFile) == 0)
       return 0;
 
@@ -397,7 +397,7 @@ static char *doc_PkgAcquireFile =
     "The parameter *owner* refers to an apt_pkg.Acquire() object. You can use\n"
     "*destdir* OR *destfile* to specify the destination directory/file.";
 
-PyTypeObject PkgAcquireFileType =
+PyTypeObject PyAcquireFile_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.AcquireFile",                // tp_name
@@ -432,7 +432,7 @@ PyTypeObject PkgAcquireFileType =
    0,                                   // tp_methods
    0,                                   // tp_members
    0,                   // tp_getset
-   &AcquireItemType,                    // tp_base
+   &PyAcquireItem_Type,                    // tp_base
    0,                                   // tp_dict
    0,                                   // tp_descr_get
    0,                                   // tp_descr_set
@@ -459,7 +459,7 @@ PyObject *GetPkgAcqFile(PyObject *Self, PyObject *Args, PyObject * kwds)
                       "destDir", "destFile", NULL};
 
    if (PyArg_ParseTupleAndKeywords(Args, kwds, "O!s|sissss", kwlist,
-				   &PkgAcquireType, &pyfetcher, &uri, &md5,
+				   &PyAcquire_Type, &pyfetcher, &uri, &md5,
 				   &size, &descr, &shortDescr, &destDir, &destFile) == 0)
       return 0;
 
@@ -472,7 +472,7 @@ PyObject *GetPkgAcqFile(PyObject *Self, PyObject *Args, PyObject * kwds)
 				   shortDescr,
 				   destDir,
 				   destFile); // short-desc
-   CppPyObject<pkgAcqFile*> *AcqFileObj =   CppPyObject_NEW<pkgAcqFile*>(&PkgAcquireFileType);
+   CppPyObject<pkgAcqFile*> *AcqFileObj =   CppPyObject_NEW<pkgAcqFile*>(&PyAcquireFile_Type);
    AcqFileObj->Object = af;
    AcqFileObj->NoDelete = true;
 
diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc
index 4c0fd5ed..d236820a 100644
--- a/python/apt_pkgmodule.cc
+++ b/python/apt_pkgmodule.cc
@@ -36,7 +36,7 @@ static PyObject *newConfiguration(PyObject *self,PyObject *args)
 {
    PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.newConfiguration() is "
                 "deprecated. Use apt_pkg.Configuration() instead.", 1);
-   return CppPyObject_NEW<Configuration>(&ConfigurationType);
+   return CppPyObject_NEW<Configuration>(&PyConfiguration_Type);
 }
 #endif
 									/*}}}*/
@@ -556,9 +556,9 @@ extern "C" void initapt_pkg()
 #endif
 {
    // Finalize our types to add slots, etc.
-   if (PyType_Ready(&ConfigurationPtrType) == -1) INIT_ERROR;
-   if (PyType_Ready(&ConfigurationSubType) == -1) INIT_ERROR;
-   if (PyType_Ready(&PkgCacheFileType) == -1) INIT_ERROR;
+   if (PyType_Ready(&PyConfigurationPtr_Type) == -1) INIT_ERROR;
+   if (PyType_Ready(&PyConfigurationSub_Type) == -1) INIT_ERROR;
+   if (PyType_Ready(&PyCacheFile_Type) == -1) INIT_ERROR;
 
    // Initialize the module
    #if PY_MAJOR_VERSION >= 3
@@ -568,7 +568,7 @@ extern "C" void initapt_pkg()
    #endif
 
    // Global variable linked to the global configuration class
-   CppPyObject<Configuration *> *Config = CppPyObject_NEW<Configuration *>(&ConfigurationPtrType);
+   CppPyObject<Configuration *> *Config = CppPyObject_NEW<Configuration *>(&PyConfigurationPtr_Type);
    Config->Object = _config;
    PyModule_AddObject(Module,"config",Config);
    #ifdef COMPAT_0_7
@@ -578,43 +578,43 @@ extern "C" void initapt_pkg()
 
    // Add our classes.
    /* ============================ tag.cc ============================ */
-   ADDTYPE(Module,"TagSection",&TagSecType);
-   ADDTYPE(Module,"TagFile",&TagFileType);
+   ADDTYPE(Module,"TagSection",&PyTagSection_Type);
+   ADDTYPE(Module,"TagFile",&PyTagFile_Type);
    /* ============================ acquire.cc ============================ */
-   ADDTYPE(Module,"Acquire",&PkgAcquireType);
-   ADDTYPE(Module,"AcquireFile",&PkgAcquireFileType);
-   ADDTYPE(Module,"AcquireItem",&AcquireItemType); // NO __new__()
+   ADDTYPE(Module,"Acquire",&PyAcquire_Type);
+   ADDTYPE(Module,"AcquireFile",&PyAcquireFile_Type);
+   ADDTYPE(Module,"AcquireItem",&PyAcquireItem_Type); // NO __new__()
    /* ============================ cache.cc ============================ */
-   ADDTYPE(Module,"Cache",&PkgCacheType);
-   ADDTYPE(Module,"Dependency",&DependencyType); // NO __new__()
-   ADDTYPE(Module,"Description",&DescriptionType); // NO __new__()
-   ADDTYPE(Module,"PackageFile",&PackageFileType); // NO __new__()
-   ADDTYPE(Module,"PackageList",&PkgListType);  // NO __new__(), internal
-   ADDTYPE(Module,"DependencyList",&RDepListType); // NO __new__(), internal
-   ADDTYPE(Module,"Package",&PackageType); // NO __new__()
-   ADDTYPE(Module,"Version",&VersionType); // NO __new__()
+   ADDTYPE(Module,"Cache",&PyCache_Type);
+   ADDTYPE(Module,"Dependency",&PyDependency_Type); // NO __new__()
+   ADDTYPE(Module,"Description",&PyDescription_Type); // NO __new__()
+   ADDTYPE(Module,"PackageFile",&PyPackageFile_Type); // NO __new__()
+   ADDTYPE(Module,"PackageList",&PyPackageList_Type);  // NO __new__(), internal
+   ADDTYPE(Module,"DependencyList",&PyDependencyList_Type); // NO __new__(), internal
+   ADDTYPE(Module,"Package",&PyPackage_Type); // NO __new__()
+   ADDTYPE(Module,"Version",&PyVersion_Type); // NO __new__()
    /* ============================ cdrom.cc ============================ */
-   ADDTYPE(Module,"Cdrom",&PkgCdromType);
+   ADDTYPE(Module,"Cdrom",&PyCdrom_Type);
    /* ========================= configuration.cc ========================= */
-   ADDTYPE(Module,"Configuration",&ConfigurationType);
-   //ADDTYPE(Module,"ConfigurationSub",&ConfigurationSubType); // NO __new__()
-   //ADDTYPE(Module,"ConfigurationPtr",&ConfigurationPtrType); // NO __new__()
+   ADDTYPE(Module,"Configuration",&PyConfiguration_Type);
+   //ADDTYPE(Module,"ConfigurationSub",&PyConfigurationSub_Type); // NO __new__()
+   //ADDTYPE(Module,"ConfigurationPtr",&PyConfigurationPtr_Type); // NO __new__()
    /* ========================= depcache.cc ========================= */
-   ADDTYPE(Module,"ActionGroup",&PkgActionGroupType);
-   ADDTYPE(Module,"DepCache",&PkgDepCacheType);
-   ADDTYPE(Module,"ProblemResolver",&PkgProblemResolverType);
+   ADDTYPE(Module,"ActionGroup",&PyActionGroup_Type);
+   ADDTYPE(Module,"DepCache",&PyDepCache_Type);
+   ADDTYPE(Module,"ProblemResolver",&PyProblemResolver_Type);
    /* ========================= indexfile.cc ========================= */
-   ADDTYPE(Module,"PackageIndexFile",&PackageIndexFileType); // NO __new__()
+   ADDTYPE(Module,"PackageIndexFile",&PyPackageIndexFile_Type); // NO __new__()
    /* ========================= metaindex.cc ========================= */
-   ADDTYPE(Module,"MetaIndex",&MetaIndexType); // NO __new__()
+   ADDTYPE(Module,"MetaIndex",&PyMetaIndex_Type); // NO __new__()
    /* ========================= pkgmanager.cc ========================= */
-   ADDTYPE(Module,"PackageManager",&PkgManagerType);
+   ADDTYPE(Module,"PackageManager",&PyPackageManager_Type);
    /* ========================= pkgrecords.cc ========================= */
-   ADDTYPE(Module,"PackageRecords",&PkgRecordsType);
+   ADDTYPE(Module,"PackageRecords",&PyPackageRecords_Type);
    /* ========================= pkgsrcrecords.cc ========================= */
-   ADDTYPE(Module,"SourceRecords",&PkgSrcRecordsType);
+   ADDTYPE(Module,"SourceRecords",&PySourceRecords_Type);
    /* ========================= sourcelist.cc ========================= */
-   ADDTYPE(Module,"SourceList",&PkgSourceListType);
+   ADDTYPE(Module,"SourceList",&PySourceList_Type);
    ADDTYPE(Module,"IndexRecords",&PyIndexRecords_Type);
    ADDTYPE(Module,"HashString",&PyHashString_Type);
    ADDTYPE(Module,"Policy",&PyPolicy_Type);
diff --git a/python/apt_pkgmodule.h b/python/apt_pkgmodule.h
index 1a2f1a1a..7b835ca8 100644
--- a/python/apt_pkgmodule.h
+++ b/python/apt_pkgmodule.h
@@ -14,13 +14,13 @@
 #include <apt-pkg/hashes.h>
 
 // Configuration Stuff
-#define Configuration_Check(op) ((op)->ob_type == &ConfigurationType || \
-                                 (op)->ob_type == &ConfigurationPtrType || \
-                                 (op)->ob_type == &ConfigurationSubType)
-extern PyTypeObject ConfigurationType;
-extern PyTypeObject ConfigurationPtrType;
-extern PyTypeObject ConfigurationSubType;
-extern PyTypeObject VersionType;
+#define Configuration_Check(op) ((op)->ob_type == &PyConfiguration_Type || \
+                                 (op)->ob_type == &PyConfigurationPtr_Type || \
+                                 (op)->ob_type == &PyConfigurationSub_Type)
+extern PyTypeObject PyConfiguration_Type;
+extern PyTypeObject PyConfigurationPtr_Type;
+extern PyTypeObject PyConfigurationSub_Type;
+extern PyTypeObject PyVersion_Type;
 
 extern char *doc_LoadConfig;
 extern char *doc_LoadConfigISC;
@@ -32,8 +32,8 @@ PyObject *LoadConfigDir(PyObject *Self,PyObject *Args);
 PyObject *ParseCommandLine(PyObject *Self,PyObject *Args);
 
 // Tag File Stuff
-extern PyTypeObject TagSecType;
-extern PyTypeObject TagFileType;
+extern PyTypeObject PyTagSection_Type;
+extern PyTypeObject PyTagFile_Type;
 extern char *doc_ParseSection;
 extern char *doc_ParseTagFile;
 extern char *doc_RewriteSection;
@@ -54,58 +54,58 @@ PyObject *StrStrToTime(PyObject *self,PyObject *Args);
 PyObject *StrCheckDomainList(PyObject *Self,PyObject *Args);
 
 // Cache Stuff
-extern PyTypeObject PkgCacheType;
-extern PyTypeObject PkgCacheFileType;
-extern PyTypeObject PkgListType;
-extern PyTypeObject DescriptionType;
-extern PyTypeObject PackageType;
-extern PyTypeObject PackageFileType;
-extern PyTypeObject DependencyType;
-extern PyTypeObject RDepListType;
+extern PyTypeObject PyCache_Type;
+extern PyTypeObject PyCacheFile_Type;
+extern PyTypeObject PyPackageList_Type;
+extern PyTypeObject PyDescription_Type;
+extern PyTypeObject PyPackage_Type;
+extern PyTypeObject PyPackageFile_Type;
+extern PyTypeObject PyDependency_Type;
+extern PyTypeObject PyDependencyList_Type;
 PyObject *TmpGetCache(PyObject *Self,PyObject *Args);
 
 // DepCache
-extern PyTypeObject PkgDepCacheType;
+extern PyTypeObject PyDepCache_Type;
 PyObject *GetDepCache(PyObject *Self,PyObject *Args);
 
 // pkgProblemResolver
-extern PyTypeObject PkgProblemResolverType;
+extern PyTypeObject PyProblemResolver_Type;
 PyObject *GetPkgProblemResolver(PyObject *Self, PyObject *Args);
 PyObject *GetPkgActionGroup(PyObject *Self, PyObject *Args);
 
-extern PyTypeObject PkgActionGroupType;
+extern PyTypeObject PyActionGroup_Type;
 // cdrom
-extern PyTypeObject PkgCdromType;
+extern PyTypeObject PyCdrom_Type;
 PyObject *GetCdrom(PyObject *Self,PyObject *Args);
 
 // acquire
-extern PyTypeObject AcquireItemType;
-extern PyTypeObject PkgAcquireType;
-extern PyTypeObject PkgAcquireFileType;
+extern PyTypeObject PyAcquireItem_Type;
+extern PyTypeObject PyAcquire_Type;
+extern PyTypeObject PyAcquireFile_Type;
 extern char *doc_GetPkgAcqFile;
 PyObject *GetAcquire(PyObject *Self,PyObject *Args);
 PyObject *GetPkgAcqFile(PyObject *Self, PyObject *Args, PyObject *kwds);
 
 // packagemanager
-extern PyTypeObject PkgManagerType;
+extern PyTypeObject PyPackageManager_Type;
 PyObject *GetPkgManager(PyObject *Self,PyObject *Args);
 
 
 // PkgRecords Stuff
-extern PyTypeObject PkgRecordsType;
-extern PyTypeObject PkgSrcRecordsType;
+extern PyTypeObject PyPackageRecords_Type;
+extern PyTypeObject PySourceRecords_Type;
 PyObject *GetPkgRecords(PyObject *Self,PyObject *Args);
 PyObject *GetPkgSrcRecords(PyObject *Self,PyObject *Args);
 
 // pkgSourceList
-extern PyTypeObject PkgSourceListType;
+extern PyTypeObject PySourceList_Type;
 PyObject *GetPkgSourceList(PyObject *Self,PyObject *Args);
 
 // pkgSourceList
-extern PyTypeObject PackageIndexFileType;
+extern PyTypeObject PyPackageIndexFile_Type;
 
 // metaIndex
-extern PyTypeObject MetaIndexType;
+extern PyTypeObject PyMetaIndex_Type;
 
 // HashString
 PyObject *PyHashString_FromCpp(HashString *obj);
diff --git a/python/cache.cc b/python/cache.cc
index 40d7b18a..d3a8a949 100644
--- a/python/cache.cc
+++ b/python/cache.cc
@@ -62,7 +62,7 @@ static PyObject *CreateProvides(PyObject *Owner,pkgCache::PrvIterator I)
    {
       PyObject *Obj;
       PyObject *Ver;
-      Ver = CppOwnedPyObject_NEW<pkgCache::VerIterator>(Owner,&VersionType,
+      Ver = CppOwnedPyObject_NEW<pkgCache::VerIterator>(Owner,&PyVersion_Type,
 							I.OwnerVer());
       Obj = Py_BuildValue("ssN",I.ParentPkg().Name(),I.ProvideVersion(),
 			  Ver);
@@ -150,7 +150,7 @@ static PyMethodDef PkgCacheMethods[] =
 
 static PyObject *PkgCacheGetPackages(PyObject *Self, void*) {
    pkgCache *Cache = GetCpp<pkgCache *>(Self);
-   return CppOwnedPyObject_NEW<PkgListStruct>(Self,&PkgListType,Cache->PkgBegin());
+   return CppOwnedPyObject_NEW<PkgListStruct>(Self,&PyPackageList_Type,Cache->PkgBegin());
 }
 
 static PyObject *PkgCacheGetPackageCount(PyObject *Self, void*) {
@@ -188,7 +188,7 @@ static PyObject *PkgCacheGetFileList(PyObject *Self, void*) {
    for (pkgCache::PkgFileIterator I = Cache->FileBegin(); I.end() == false; I++)
    {
       PyObject *Obj;
-      Obj = CppOwnedPyObject_NEW<pkgCache::PkgFileIterator>(Self,&PackageFileType,I);
+      Obj = CppOwnedPyObject_NEW<pkgCache::PkgFileIterator>(Self,&PyPackageFile_Type,I);
       PyList_Append(List,Obj);
       Py_DECREF(Obj);
    }
@@ -238,7 +238,7 @@ static PyObject *CacheMapOp(PyObject *Self,PyObject *Arg)
       return 0;
    }
 
-   return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(Self,&PackageType,Pkg);
+   return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(Self,&PyPackage_Type,Pkg);
 }
 
 static PyObject *PkgCacheNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
@@ -279,7 +279,7 @@ static PyObject *PkgCacheNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
    }
 
    CppOwnedPyObject<pkgCacheFile*> *CacheFileObj =
-	   CppOwnedPyObject_NEW<pkgCacheFile*>(0,&PkgCacheFileType, Cache);
+	   CppOwnedPyObject_NEW<pkgCacheFile*>(0,&PyCacheFile_Type, Cache);
 
    CppOwnedPyObject<pkgCache *> *CacheObj =
 	   CppOwnedPyObject_NEW<pkgCache *>(CacheFileObj,type,
@@ -299,7 +299,7 @@ static char *doc_PkgCache = "Cache([progress]) -> Cache() object.\n\n"
     "If not specified, the progress is displayed in simple text form.";
 
 static PyMappingMethods CacheMap = {0,CacheMapOp,0};
-PyTypeObject PkgCacheType =
+PyTypeObject PyCache_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.Cache",                     // tp_name
@@ -346,7 +346,7 @@ PyTypeObject PkgCacheType =
 									/*}}}*/
 // PkgCacheFile Class							/*{{{*/
 // ---------------------------------------------------------------------
-PyTypeObject PkgCacheFileType =
+PyTypeObject PyCacheFile_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "pkgCacheFile",                      // tp_name
@@ -404,7 +404,7 @@ static PyObject *PkgListItem(PyObject *iSelf,Py_ssize_t Index)
       }
    }
 
-   return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(GetOwner<PkgListStruct>(iSelf),&PackageType,
+   return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(GetOwner<PkgListStruct>(iSelf),&PyPackage_Type,
 						      Self.Iter);
 }
 
@@ -419,7 +419,7 @@ static PySequenceMethods PkgListSeq =
    0                 // assign slice
 };
 
-PyTypeObject PkgListType =
+PyTypeObject PyPackageList_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.PackageList",               // tp_name
@@ -457,7 +457,7 @@ PyTypeObject PkgListType =
 MkGet(PackageGetName,PyString_FromString(Pkg.Name()));
 MkGet(PackageGetSection,Safe_FromString(Pkg.Section()));
 MkGet(PackageGetRevDependsList,CppOwnedPyObject_NEW<RDepListStruct>(Owner,
-                               &RDepListType, Pkg.RevDependsList()));
+                               &PyDependencyList_Type, Pkg.RevDependsList()));
 MkGet(PackageGetProvidesList,CreateProvides(Owner,Pkg.ProvidesList()));
 MkGet(PackageGetSelectedState,Py_BuildValue("i",Pkg->SelectedState));
 MkGet(PackageGetInstState,Py_BuildValue("i",Pkg->InstState));
@@ -479,7 +479,7 @@ static PyObject *PackageGetVersionList(PyObject *Self,void*)
    for (pkgCache::VerIterator I = Pkg.VersionList(); I.end() == false; I++)
    {
       PyObject *Obj;
-      Obj = CppOwnedPyObject_NEW<pkgCache::VerIterator>(Owner,&VersionType,I);
+      Obj = CppOwnedPyObject_NEW<pkgCache::VerIterator>(Owner,&PyVersion_Type,I);
       PyList_Append(List,Obj);
       Py_DECREF(Obj);
    }
@@ -494,7 +494,7 @@ static PyObject *PackageGetCurrentVer(PyObject *Self,void*)
       Py_INCREF(Py_None);
       return Py_None;
    }
-   return CppOwnedPyObject_NEW<pkgCache::VerIterator>(Owner,&VersionType,
+   return CppOwnedPyObject_NEW<pkgCache::VerIterator>(Owner,&PyVersion_Type,
 							 Pkg.CurrentVer());
 }
 
@@ -541,7 +541,7 @@ static PyObject *PackageRepr(PyObject *Self)
    return PyString_FromString(S);
 }
 
-PyTypeObject PackageType =
+PyTypeObject PyPackage_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.Package",                 // tp_name
@@ -599,7 +599,7 @@ static PyObject *DescriptionGetFileList(PyObject *Self,void*)
    {
       PyObject *DescFile;
       PyObject *Obj;
-      DescFile = CppOwnedPyObject_NEW<pkgCache::PkgFileIterator>(Owner,&PackageFileType,I.File());
+      DescFile = CppOwnedPyObject_NEW<pkgCache::PkgFileIterator>(Owner,&PyPackageFile_Type,I.File());
       Obj = Py_BuildValue("Nl",DescFile,I.Index());
       PyList_Append(List,Obj);
       Py_DECREF(Obj);
@@ -629,7 +629,7 @@ static PyObject *DescriptionRepr(PyObject *Self)
    return PyString_FromString(S);
 }
 
-PyTypeObject DescriptionType =
+PyTypeObject PyDescription_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.Description",               // tp_name
@@ -711,7 +711,7 @@ static PyObject *MakeDepends(PyObject *Owner,pkgCache::VerIterator &Ver,
       {
 	 PyObject *Obj;
 	 if (AsObj == true)
-	    Obj = CppOwnedPyObject_NEW<pkgCache::DepIterator>(Owner,&DependencyType,
+	    Obj = CppOwnedPyObject_NEW<pkgCache::DepIterator>(Owner,&PyDependency_Type,
 							 Start);
 	 else
 	 {
@@ -763,7 +763,7 @@ static PyObject *VersionGetFileList(PyObject *Self, void*) {
    {
       PyObject *PkgFile;
       PyObject *Obj;
-      PkgFile = CppOwnedPyObject_NEW<pkgCache::PkgFileIterator>(Owner,&PackageFileType,I.File());
+      PkgFile = CppOwnedPyObject_NEW<pkgCache::PkgFileIterator>(Owner,&PyPackageFile_Type,I.File());
       Obj = Py_BuildValue("Nl",PkgFile,I.Index());
       PyList_Append(List,Obj);
       Py_DECREF(Obj);
@@ -783,7 +783,7 @@ static PyObject *VersionGetDependsList(PyObject *Self, void*) {
 }
 static PyObject *VersionGetParentPkg(PyObject *Self, void*) {
    PyObject *Owner = GetOwner<pkgCache::VerIterator>(Self);
-   return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(Owner,&PackageType,
+   return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(Owner,&PyPackage_Type,
                                                       Version_GetVer(Self).ParentPkg());
 }
 static PyObject *VersionGetProvidesList(PyObject *Self, void*) {
@@ -815,7 +815,7 @@ static PyObject *VersionGetTranslatedDescription(PyObject *Self, void*) {
    pkgCache::VerIterator &Ver = GetCpp<pkgCache::VerIterator>(Self);
    PyObject *Owner = GetOwner<pkgCache::VerIterator>(Self);
    return CppOwnedPyObject_NEW<pkgCache::DescIterator>(Owner,
-                    &DescriptionType,
+                    &PyDescription_Type,
                     Ver.TranslatedDescription());
 }
 
@@ -889,7 +889,7 @@ static PyGetSetDef VersionGetSet[] = {
    {}
 };
 
-PyTypeObject VersionType =
+PyTypeObject PyVersion_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.Version",                   // tp_name
@@ -1051,7 +1051,7 @@ static PyGetSetDef PackageFileGetSet[] = {
   {}
 };
 
-PyTypeObject PackageFileType = {
+PyTypeObject PyPackageFile_Type = {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.PackageFile",                                // tp_name
    sizeof(CppOwnedPyObject<pkgCache::PkgFileIterator>),  // tp_basicsize
@@ -1113,7 +1113,7 @@ static PyObject *DepSmartTargetPkg(PyObject *Self,PyObject *Args)
       return Py_None;
    }
 
-   return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(Owner,&PackageType,P);
+   return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(Owner,&PyPackage_Type,P);
 }
 
 static PyObject *DepAllTargets(PyObject *Self,PyObject *Args)
@@ -1129,7 +1129,7 @@ static PyObject *DepAllTargets(PyObject *Self,PyObject *Args)
    for (pkgCache::Version **I = Vers; *I != 0; I++)
    {
       PyObject *Obj;
-      Obj = CppOwnedPyObject_NEW<pkgCache::VerIterator>(Owner,&VersionType,
+      Obj = CppOwnedPyObject_NEW<pkgCache::VerIterator>(Owner,&PyVersion_Type,
 							pkgCache::VerIterator(*Dep.Cache(),*I));
       PyList_Append(List,Obj);
       Py_DECREF(Obj);
@@ -1163,7 +1163,7 @@ static PyObject *DependencyGetTargetPkg(PyObject *Self,void*)
 {
    pkgCache::DepIterator &Dep = GetCpp<pkgCache::DepIterator>(Self);
    PyObject *Owner = GetOwner<pkgCache::DepIterator>(Self);
-   return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(Owner,&PackageType,
+   return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(Owner,&PyPackage_Type,
                                                       Dep.TargetPkg());
 }
 
@@ -1171,7 +1171,7 @@ static PyObject *DependencyGetParentVer(PyObject *Self,void*)
 {
    pkgCache::DepIterator &Dep = GetCpp<pkgCache::DepIterator>(Self);
    PyObject *Owner = GetOwner<pkgCache::DepIterator>(Self);
-   return CppOwnedPyObject_NEW<pkgCache::VerIterator>(Owner,&VersionType,
+   return CppOwnedPyObject_NEW<pkgCache::VerIterator>(Owner,&PyVersion_Type,
                                                       Dep.ParentVer());
 }
 
@@ -1179,7 +1179,7 @@ static PyObject *DependencyGetParentPkg(PyObject *Self,void*)
 {
    pkgCache::DepIterator &Dep = GetCpp<pkgCache::DepIterator>(Self);
    PyObject *Owner = GetOwner<pkgCache::DepIterator>(Self);
-   return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(Owner,&PackageType,
+   return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(Owner,&PyPackage_Type,
                                                       Dep.ParentPkg());
 }
 
@@ -1222,7 +1222,7 @@ static PyGetSetDef DependencyGetSet[] = {
 };
 
 
-PyTypeObject DependencyType =
+PyTypeObject PyDependency_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.Dependency",                // tp_name
@@ -1293,7 +1293,7 @@ static PyObject *RDepListItem(PyObject *iSelf,Py_ssize_t Index)
    }
 
    return CppOwnedPyObject_NEW<pkgCache::DepIterator>(GetOwner<RDepListStruct>(iSelf),
-						      &DependencyType,Self.Iter);
+						      &PyDependency_Type,Self.Iter);
 }
 
 static PySequenceMethods RDepListSeq =
@@ -1307,7 +1307,7 @@ static PySequenceMethods RDepListSeq =
    0                 // assign slice
 };
 
-PyTypeObject RDepListType =
+PyTypeObject PyDependencyList_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.DependencyList",             // tp_name
@@ -1343,6 +1343,6 @@ PyObject *TmpGetCache(PyObject *Self,PyObject *Args)
 {
     PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetCache() is deprecated. "
                  "Please see apt_pkg.Cache() for the replacement.", 1);
-    return PkgCacheNew(&PkgCacheType,Args,0);
+    return PkgCacheNew(&PyCache_Type,Args,0);
 }
 #endif
diff --git a/python/cdrom.cc b/python/cdrom.cc
index b5b87758..84d7179f 100644
--- a/python/cdrom.cc
+++ b/python/cdrom.cc
@@ -77,7 +77,7 @@ static PyObject *PkgCdromNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
 }
 
 
-PyTypeObject PkgCdromType =
+PyTypeObject PyCdrom_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.Cdrom",                     // tp_name
@@ -126,7 +126,7 @@ PyObject *GetCdrom(PyObject *Self,PyObject *Args)
 {
    PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetCdrom() is deprecated. "
                  "Please see apt_pkg.Cdrom() for the replacement.", 1);
-   return PkgCdromNew(&PkgCdromType,Args,0);
+   return PkgCdromNew(&PyCdrom_Type,Args,0);
 }
 #endif
 
diff --git a/python/configuration.cc b/python/configuration.cc
index 07f55957..c7d7d796 100644
--- a/python/configuration.cc
+++ b/python/configuration.cc
@@ -49,7 +49,7 @@ void CnfSubFree(PyObject *Obj)
 /* */
 static inline Configuration &GetSelf(PyObject *Obj)
 {
-   if (Obj->ob_type == &ConfigurationPtrType)
+   if (Obj->ob_type == &PyConfigurationPtr_Type)
       return *GetCpp<Configuration *>(Obj);
    return GetCpp<Configuration>(Obj);
 }
@@ -161,8 +161,8 @@ static PyObject *CnfSubTree(PyObject *Self,PyObject *Args)
    }
 
    // Create a new sub configuration.
-   SubConfiguration *New = (SubConfiguration*)(&ConfigurationSubType)
-                           ->tp_alloc(&ConfigurationSubType,0);
+   SubConfiguration *New = (SubConfiguration*)(&PyConfigurationSub_Type)
+                           ->tp_alloc(&PyConfigurationSub_Type,0);
    new (&New->Object) Configuration(Itm);
    New->Owner = Self;
    Py_INCREF(Self);
@@ -501,7 +501,7 @@ static PyObject *CnfNew(PyTypeObject *type, PyObject *args, PyObject *kwds) {
 // Type for a Normal Configuration object
 static PySequenceMethods ConfigurationSeq = {0,0,0,0,0,0,0,CnfContains,0,0};
 static PyMappingMethods ConfigurationMap = {0,CnfMap,CnfMapSet};
-PyTypeObject ConfigurationType =
+PyTypeObject PyConfiguration_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.Configuration",             // tp_name
@@ -545,7 +545,7 @@ PyTypeObject ConfigurationType =
    CnfNew,                              // tp_new
 };
 
-PyTypeObject ConfigurationPtrType =
+PyTypeObject PyConfigurationPtr_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.ConfigurationPtr",          // tp_name
@@ -578,10 +578,10 @@ PyTypeObject ConfigurationPtrType =
    CnfMethods,                          // tp_methods
    0,                                   // tp_members
    0,                                   // tp_getset
-   &ConfigurationType,                  // tp_base
+   &PyConfiguration_Type,                  // tp_base
 };
 
-PyTypeObject ConfigurationSubType =
+PyTypeObject PyConfigurationSub_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.ConfigurationSub",     // tp_name
@@ -614,6 +614,6 @@ PyTypeObject ConfigurationSubType =
    CnfMethods,                          // tp_methods
    0,                                   // tp_members
    0,                                   // tp_getset
-   &ConfigurationType,                  // tp_base
+   &PyConfiguration_Type,                  // tp_base
 };
 
diff --git a/python/depcache.cc b/python/depcache.cc
index 68ca3a3b..2d72a82a 100644
--- a/python/depcache.cc
+++ b/python/depcache.cc
@@ -190,8 +190,8 @@ static PyObject *PkgDepCacheSetCandidateVer(PyObject *Self,PyObject *Args)
    PyObject *PackageObj;
    PyObject *VersionObj;
    if (PyArg_ParseTuple(Args,"O!O!",
-			&PackageType, &PackageObj,
-			&VersionType, &VersionObj) == 0)
+			&PyPackage_Type, &PackageObj,
+			&PyVersion_Type, &VersionObj) == 0)
       return 0;
 
    pkgCache::VerIterator &I = GetCpp<pkgCache::VerIterator>(VersionObj);
@@ -208,7 +208,7 @@ static PyObject *PkgDepCacheGetCandidateVer(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
    PyObject *PackageObj;
    PyObject *CandidateObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -219,7 +219,7 @@ static PyObject *PkgDepCacheGetCandidateVer(PyObject *Self,PyObject *Args)
       Py_INCREF(Py_None);
       return Py_None;
    }
-   CandidateObj = CppOwnedPyObject_NEW<pkgCache::VerIterator>(PackageObj,&VersionType,I);
+   CandidateObj = CppOwnedPyObject_NEW<pkgCache::VerIterator>(PackageObj,&PyVersion_Type,I);
 
    return CandidateObj;
 }
@@ -300,7 +300,7 @@ static PyObject *PkgDepCacheMarkKeep(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache*>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -316,7 +316,7 @@ static PyObject *PkgDepCacheSetReInstall(PyObject *Self,PyObject *Args)
 
    PyObject *PackageObj;
    char value = 0;
-   if (PyArg_ParseTuple(Args,"O!b",&PackageType,&PackageObj, &value) == 0)
+   if (PyArg_ParseTuple(Args,"O!b",&PyPackage_Type,&PackageObj, &value) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -333,7 +333,7 @@ static PyObject *PkgDepCacheMarkDelete(PyObject *Self,PyObject *Args)
 
    PyObject *PackageObj;
    char purge = 0;
-   if (PyArg_ParseTuple(Args,"O!|b",&PackageType,&PackageObj, &purge) == 0)
+   if (PyArg_ParseTuple(Args,"O!|b",&PyPackage_Type,&PackageObj, &purge) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -351,7 +351,7 @@ static PyObject *PkgDepCacheMarkInstall(PyObject *Self,PyObject *Args)
    PyObject *PackageObj;
    char autoInst=1;
    char fromUser=1;
-   if (PyArg_ParseTuple(Args,"O!|bb",&PackageType,&PackageObj,
+   if (PyArg_ParseTuple(Args,"O!|bb",&PyPackage_Type,&PackageObj,
 			&autoInst, &fromUser) == 0)
       return 0;
 
@@ -370,7 +370,7 @@ static PyObject *PkgDepCacheMarkAuto(PyObject *Self,PyObject *Args)
 
    PyObject *PackageObj;
    char value = 0;
-   if (PyArg_ParseTuple(Args,"O!b",&PackageType,&PackageObj, &value) == 0)
+   if (PyArg_ParseTuple(Args,"O!b",&PyPackage_Type,&PackageObj, &value) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -386,7 +386,7 @@ static PyObject *PkgDepCacheIsUpgradable(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -400,7 +400,7 @@ static PyObject *PkgDepCacheIsGarbage(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -414,7 +414,7 @@ static PyObject *PkgDepCacheIsAutoInstalled(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -428,7 +428,7 @@ static PyObject *PkgDepCacheIsNowBroken(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -442,7 +442,7 @@ static PyObject *PkgDepCacheIsInstBroken(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -457,7 +457,7 @@ static PyObject *PkgDepCacheMarkedInstall(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -472,7 +472,7 @@ static PyObject *PkgDepCacheMarkedUpgrade(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -486,7 +486,7 @@ static PyObject *PkgDepCacheMarkedDelete(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -500,7 +500,7 @@ static PyObject *PkgDepCacheMarkedKeep(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -514,7 +514,7 @@ static PyObject *PkgDepCacheMarkedDowngrade(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -528,7 +528,7 @@ static PyObject *PkgDepCacheMarkedReinstall(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -656,7 +656,7 @@ static PyObject *PkgDepCacheNew(PyTypeObject *type,PyObject *Args,PyObject *kwds
 {
    PyObject *Owner;
    static char *kwlist[] = {"cache", 0};
-   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PkgCacheType,
+   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PyCache_Type,
                                    &Owner) == 0)
       return 0;
 
@@ -680,7 +680,7 @@ static PyObject *PkgDepCacheNew(PyTypeObject *type,PyObject *Args,PyObject *kwds
 static char *doc_PkgDepCache = "DepCache(cache) -> DepCache() object\n\n"
     "A DepCache() holds extra information on the state of the packages.\n\n"
     "The parameter *cache* refers to an apt_pkg.Cache() object.";
-PyTypeObject PkgDepCacheType =
+PyTypeObject PyDepCache_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.DepCache",                  // tp_name
@@ -730,7 +730,7 @@ PyObject *GetDepCache(PyObject *Self,PyObject *Args)
 {
     PyErr_WarnEx(PyExc_DeprecationWarning,"apt_pkg.GetDepCache() is deprecated"
                  ". Please see apt_pkg.DepCache() for the replacement.",1);
-    return PkgDepCacheNew(&PkgDepCacheType,Args,0);
+    return PkgDepCacheNew(&PyDepCache_Type,Args,0);
 }
 #endif
 
@@ -745,7 +745,7 @@ static PyObject *PkgProblemResolverNew(PyTypeObject *type,PyObject *Args,PyObjec
 {
    PyObject *Owner;
    static char *kwlist[] = {"depcache",0};
-   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PkgDepCacheType,
+   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PyDepCache_Type,
                                    &Owner) == 0)
       return 0;
 
@@ -765,7 +765,7 @@ PyObject *GetPkgProblemResolver(PyObject *Self,PyObject *Args) {
     PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgProblemResolver() is"
                  " deprecated. Please see apt_pkg.ProblemResolver() for the "
                  "replacement.", 1);
-    return PkgProblemResolverNew(&PkgProblemResolverType,Args,0);
+    return PkgProblemResolverNew(&PyProblemResolver_Type,Args,0);
 }
 #endif
 
@@ -803,7 +803,7 @@ static PyObject *PkgProblemResolverProtect(PyObject *Self,PyObject *Args)
 {
    pkgProblemResolver *fixer = GetCpp<pkgProblemResolver *>(Self);
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
    fixer->Protect(Pkg);
@@ -815,7 +815,7 @@ static PyObject *PkgProblemResolverRemove(PyObject *Self,PyObject *Args)
 {
    pkgProblemResolver *fixer = GetCpp<pkgProblemResolver *>(Self);
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
    fixer->Remove(Pkg);
@@ -827,7 +827,7 @@ static PyObject *PkgProblemResolverClear(PyObject *Self,PyObject *Args)
 {
    pkgProblemResolver *fixer = GetCpp<pkgProblemResolver *>(Self);
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
    fixer->Clear(Pkg);
@@ -867,7 +867,7 @@ static PyMethodDef PkgProblemResolverMethods[] =
    {}
 };
 
-PyTypeObject PkgProblemResolverType =
+PyTypeObject PyProblemResolver_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.ProblemResolver",                       // tp_name
@@ -953,7 +953,7 @@ static PyObject *PkgActionGroupNew(PyTypeObject *type,PyObject *Args,PyObject *k
 {
    PyObject *Owner;
    static char *kwlist[] = {"depcache", 0};
-   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PkgDepCacheType,
+   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PyDepCache_Type,
                                    &Owner) == 0)
       return 0;
 
@@ -983,7 +983,7 @@ static char *doc_PkgActionGroup = "ActionGroup(depcache)\n\n"
     "automatically released from the cache.";
 
 
-PyTypeObject PkgActionGroupType =
+PyTypeObject PyActionGroup_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.ActionGroup",               // tp_name
@@ -1034,7 +1034,7 @@ PyObject *GetPkgActionGroup(PyObject *Self,PyObject *Args)
     PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgActionGroup() is "
                  "deprecated. Please see apt_pkg.ActionGroup() for the "
                  "replacement.", 1);
-    return PkgActionGroupNew(&PkgActionGroupType,Args,0);
+    return PkgActionGroupNew(&PyActionGroup_Type,Args,0);
 }
 #endif
 
diff --git a/python/indexfile.cc b/python/indexfile.cc
index f2180cd7..7bf646d0 100644
--- a/python/indexfile.cc
+++ b/python/indexfile.cc
@@ -88,7 +88,7 @@ static PyGetSetDef PackageIndexFileGetSet[] = {
     {}
 };
 
-PyTypeObject PackageIndexFileType =
+PyTypeObject PyPackageIndexFile_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.PackageIndexFile",          // tp_name
diff --git a/python/metaindex.cc b/python/metaindex.cc
index 195394d6..d67c0ada 100644
--- a/python/metaindex.cc
+++ b/python/metaindex.cc
@@ -38,7 +38,7 @@ static PyObject *MetaIndexGetIndexFiles(PyObject *Self,void*) {
         I != indexFiles->end(); I++)
     {
         CppOwnedPyObject<pkgIndexFile*> *Obj;
-        Obj = CppOwnedPyObject_NEW<pkgIndexFile*>(Self, &PackageIndexFileType,*I);
+        Obj = CppOwnedPyObject_NEW<pkgIndexFile*>(Self, &PyPackageIndexFile_Type,*I);
         // Do not delete pkgIndexFile*, they are managed by metaIndex.
         Obj->NoDelete = true;
         PyList_Append(List,Obj);
@@ -73,7 +73,7 @@ static PyObject *MetaIndexRepr(PyObject *Self)
     return PyString_FromString(S);
 }
 
-PyTypeObject MetaIndexType =
+PyTypeObject PyMetaIndex_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.MetaIndex",                    // tp_name
diff --git a/python/pkgmanager.cc b/python/pkgmanager.cc
index 9e9cc32d..f4f84a2b 100644
--- a/python/pkgmanager.cc
+++ b/python/pkgmanager.cc
@@ -24,7 +24,7 @@ static PyObject *PkgManagerNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
 {
    PyObject *Owner;
    char *kwlist[] = {"depcache",0};
-   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PkgDepCacheType,
+   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PyDepCache_Type,
                                    &Owner) == 0)
       return 0;
 
@@ -42,7 +42,7 @@ PyObject *GetPkgManager(PyObject *Self,PyObject *Args)
     PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPackageManager() is "
                  "deprecated. Please see apt_pkg.PackageManager() for the "
                  "replacement.", 1);
-    return PkgManagerNew(&PkgManagerType,Args,0);
+    return PkgManagerNew(&PyPackageManager_Type,Args,0);
 }
 #endif
 
@@ -53,9 +53,9 @@ static PyObject *PkgManagerGetArchives(PyObject *Self,PyObject *Args)
    PyObject *fetcher, *list, *recs;
 
    if (PyArg_ParseTuple(Args, "O!O!O!",
-			&PkgAcquireType,&fetcher,
-			&PkgSourceListType, &list,
-			&PkgRecordsType, &recs) == 0)
+			&PyAcquire_Type,&fetcher,
+			&PySourceList_Type, &list,
+			&PyPackageRecords_Type, &recs) == 0)
       return 0;
 
    pkgAcquire *s_fetcher = GetCpp<pkgAcquire*>(fetcher);
@@ -131,7 +131,7 @@ static PyGetSetDef PkgManagerGetSet[] = {
     {}
 };
 
-PyTypeObject PkgManagerType =
+PyTypeObject PyPackageManager_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.PackageManager",           // tp_name
diff --git a/python/pkgrecords.cc b/python/pkgrecords.cc
index 886bdb58..d34ba0d2 100644
--- a/python/pkgrecords.cc
+++ b/python/pkgrecords.cc
@@ -27,7 +27,7 @@ static PyObject *PkgRecordsLookup(PyObject *Self,PyObject *Args)
 
    PyObject *PkgFObj;
    long int Index;
-   if (PyArg_ParseTuple(Args,"(O!l)",&PackageFileType,&PkgFObj,&Index) == 0)
+   if (PyArg_ParseTuple(Args,"(O!l)",&PyPackageFile_Type,&PkgFObj,&Index) == 0)
       return 0;
 
    // Get the index and check to make sure it is reasonable
@@ -153,7 +153,7 @@ static PyObject *PkgRecordsNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
 {
    PyObject *Owner;
    char *kwlist[] = {"cache",0};
-   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PkgCacheType,
+   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PyCache_Type,
                                    &Owner) == 0)
       return 0;
 
@@ -161,7 +161,7 @@ static PyObject *PkgRecordsNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
 							      GetCpp<pkgCache *>(Owner)));
 }
 
-PyTypeObject PkgRecordsType =
+PyTypeObject PyPackageRecords_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.PackageRecords",                          // tp_name
@@ -215,6 +215,6 @@ PyObject *GetPkgRecords(PyObject *Self,PyObject *Args)
     PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgRecords() is "
                  "deprecated. Please see apt_pkg.Records() for the "
                  "replacement.", 1);
-    return PkgRecordsNew(&PkgRecordsType,Args,0);
+    return PkgRecordsNew(&PyPackageRecords_Type,Args,0);
 }
 #endif
diff --git a/python/pkgsrcrecords.cc b/python/pkgsrcrecords.cc
index 99711585..fbc9a293 100644
--- a/python/pkgsrcrecords.cc
+++ b/python/pkgsrcrecords.cc
@@ -124,7 +124,7 @@ static PyObject *PkgSrcRecordsGetIndex(PyObject *Self,void*) {
       return 0;
    const pkgIndexFile &tmp = Struct.Last->Index();
    CppOwnedPyObject<pkgIndexFile*> *PyObj;
-   PyObj = CppOwnedPyObject_NEW<pkgIndexFile*>(Self,&PackageIndexFileType,
+   PyObj = CppOwnedPyObject_NEW<pkgIndexFile*>(Self,&PyPackageIndexFile_Type,
                                               (pkgIndexFile*)&tmp);
    // Do not delete the pkgIndexFile*, it is managed by PkgSrcRecords::Parser.
    PyObj->NoDelete=true;
@@ -255,7 +255,7 @@ static PyObject *PkgSrcRecordsNew(PyTypeObject *type,PyObject *args,PyObject *kw
    return HandleErrors(CppPyObject_NEW<PkgSrcRecordsStruct>(type));
 }
 
-PyTypeObject PkgSrcRecordsType =
+PyTypeObject PySourceRecords_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.SourceRecords",     // tp_name
@@ -310,6 +310,6 @@ PyObject *GetPkgSrcRecords(PyObject *Self,PyObject *Args)
    if (PyArg_ParseTuple(Args,"") == 0)
       return 0;
 
-   return HandleErrors(CppPyObject_NEW<PkgSrcRecordsStruct>(&PkgSrcRecordsType));
+   return HandleErrors(CppPyObject_NEW<PkgSrcRecordsStruct>(&PySourceRecords_Type));
 }
 #endif
diff --git a/python/policy.cc b/python/policy.cc
index d086c4fc..faf53b38 100644
--- a/python/policy.cc
+++ b/python/policy.cc
@@ -29,7 +29,7 @@ static PyObject *Policy_NEW(PyTypeObject *type,PyObject *Args,
     char *kwlist[] = {"cache", NULL};
     if (PyArg_ParseTupleAndKeywords(Args, kwds, "O", kwlist, &cache) == 0)
         return 0;
-    if (!PyObject_TypeCheck(cache, &PkgCacheType)) {
+    if (!PyObject_TypeCheck(cache, &PyCache_Type)) {
         PyErr_SetString(PyExc_TypeError,"`cache` must be a apt_pkg.Cache().");
         return 0;
     }
@@ -43,7 +43,7 @@ static char *Policy_GetPriority_doc = "get_priority(package: apt_pkg.Package)"
 
 PyObject *Policy_GetPriority(PyObject *self, PyObject *arg) {
     pkgPolicy *policy = GetCpp<pkgPolicy *>(self);
-    if (PyObject_TypeCheck(arg, &PackageType)) {
+    if (PyObject_TypeCheck(arg, &PyPackage_Type)) {
         pkgCache::PkgIterator pkg = GetCpp<pkgCache::PkgIterator>(arg);
         return Py_BuildValue("i", policy->GetPriority(pkg));
     } else {
@@ -57,11 +57,11 @@ static char *Policy_GetCandidateVer_doc = "get_match(package: apt_pkg.Package)"
     "Get the best package for the job.";
 
 PyObject *Policy_GetCandidateVer(PyObject *self, PyObject *arg) {
-    if (PyObject_TypeCheck(arg, &PackageType)) {
+    if (PyObject_TypeCheck(arg, &PyPackage_Type)) {
         pkgPolicy *policy = GetCpp<pkgPolicy *>(self);
         pkgCache::PkgIterator pkg = GetCpp<pkgCache::PkgIterator>(arg);
         pkgCache::VerIterator ver = policy->GetCandidateVer(pkg);
-        return CppOwnedPyObject_NEW<pkgCache::VerIterator>(arg,&VersionType,
+        return CppOwnedPyObject_NEW<pkgCache::VerIterator>(arg,&PyVersion_Type,
                                                            ver);
     } else {
         PyErr_SetString(PyExc_TypeError,"Argument must be of Package().");
@@ -74,14 +74,14 @@ static char *Policy_GetMatch_doc = "get_match(package: apt_pkg.Package) -> "
     "Return a matching version for the given package.";
 
 static PyObject *Policy_GetMatch(PyObject *self, PyObject *arg) {
-    if (PyObject_TypeCheck(arg, &PackageType) == 0) {
+    if (PyObject_TypeCheck(arg, &PyPackage_Type) == 0) {
         PyErr_SetString(PyExc_TypeError,"Argument must be of Package().");
         return 0;
     }
     pkgPolicy *policy = GetCpp<pkgPolicy *>(self);
     pkgCache::PkgIterator pkg = GetCpp<pkgCache::PkgIterator>(arg);
     pkgCache::VerIterator ver = policy->GetMatch(pkg);
-    return CppOwnedPyObject_NEW<pkgCache::VerIterator>(arg,&VersionType,ver);
+    return CppOwnedPyObject_NEW<pkgCache::VerIterator>(arg,&PyVersion_Type,ver);
 }
 
 static char *Policy_ReadPinFile_doc = "read_pinfile(filename: str) -> bool\n\n"
diff --git a/python/sourcelist.cc b/python/sourcelist.cc
index beb249dc..e86f7fd3 100644
--- a/python/sourcelist.cc
+++ b/python/sourcelist.cc
@@ -28,20 +28,20 @@ static PyObject *PkgSourceListFindIndex(PyObject *Self,PyObject *Args)
    PyObject *pyPkgFileIter;
    CppOwnedPyObject<pkgIndexFile*> *pyPkgIndexFile;
 
-   if (PyArg_ParseTuple(Args, "O!", &PackageFileType,&pyPkgFileIter) == 0)
+   if (PyArg_ParseTuple(Args, "O!", &PyPackageFile_Type,&pyPkgFileIter) == 0)
       return 0;
 
    pkgCache::PkgFileIterator &i = GetCpp<pkgCache::PkgFileIterator>(pyPkgFileIter);
    pkgIndexFile *index;
    if(list->FindIndex(i, index))
    {
-      pyPkgIndexFile = CppOwnedPyObject_NEW<pkgIndexFile*>(pyPkgFileIter,&PackageIndexFileType,index);
+      pyPkgIndexFile = CppOwnedPyObject_NEW<pkgIndexFile*>(pyPkgFileIter,&PyPackageIndexFile_Type,index);
       // Do not delete the pkgIndexFile*, it is managed by pkgSourceList.
       pyPkgIndexFile->NoDelete = true;
       return pyPkgIndexFile;
    }
 
-   //&PackageIndexFileType,&pyPkgIndexFile)
+   //&PyPackageIndexFile_Type,&pyPkgIndexFile)
 
    Py_INCREF(Py_None);
    return Py_None;
@@ -63,7 +63,7 @@ static PyObject *PkgSourceListGetIndexes(PyObject *Self,PyObject *Args)
 
    PyObject *pyFetcher;
    char all = 0;
-   if (PyArg_ParseTuple(Args, "O!|b",&PkgAcquireType,&pyFetcher, &all) == 0)
+   if (PyArg_ParseTuple(Args, "O!|b",&PyAcquire_Type,&pyFetcher, &all) == 0)
       return 0;
 
    pkgAcquire *fetcher = GetCpp<pkgAcquire*>(pyFetcher);
@@ -93,7 +93,7 @@ static PyObject *PkgSourceListGetList(PyObject *Self,void*)
         I != list->end(); I++)
    {
       CppOwnedPyObject<metaIndex*> *Obj;
-      Obj = CppOwnedPyObject_NEW<metaIndex*>(Self, &MetaIndexType,*I);
+      Obj = CppOwnedPyObject_NEW<metaIndex*>(Self, &PyMetaIndex_Type,*I);
       // Never delete metaIndex*, they are managed by the pkgSourceList.
       Obj->NoDelete = true;
       PyList_Append(List,Obj);
@@ -118,7 +118,7 @@ static PyObject *PkgSourceListNew(PyTypeObject *type,PyObject *args,PyObject *kw
    return CppPyObject_NEW<pkgSourceList*>(type,new pkgSourceList());
 }
 
-PyTypeObject PkgSourceListType =
+PyTypeObject PySourceList_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.SourceList",                          // tp_name
@@ -168,6 +168,6 @@ PyObject *GetPkgSourceList(PyObject *Self,PyObject *Args)
    PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgSourceList() is "
                 "deprecated. Please see apt_pkg.SourceList() for the "
                 "replacement.", 1);
-   return PkgSourceListNew(&PkgSourceListType,Args,0);
+   return PkgSourceListNew(&PySourceList_Type,Args,0);
 }
 #endif
diff --git a/python/tag.cc b/python/tag.cc
index 2b71517d..573e8ce2 100644
--- a/python/tag.cc
+++ b/python/tag.cc
@@ -290,7 +290,7 @@ PyObject *ParseSection(PyObject *self,PyObject *Args)
    PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.ParseSection() is "
                 "deprecated. Please see apt_pkg.TagSection() for the "
                 "replacement.", 1);
-    return TagSecNew(&TagSecType,Args,0);
+    return TagSecNew(&PyTagSection_Type,Args,0);
 }
 #endif
 									/*}}}*/
@@ -315,7 +315,7 @@ static PyObject *TagFileNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
    new (&New->Object) pkgTagFile(&New->Fd);
 
    // Create the section
-   New->Section = (TagSecData*)(&TagSecType)->tp_alloc(&TagSecType, 0);
+   New->Section = (TagSecData*)(&PyTagSection_Type)->tp_alloc(&PyTagSection_Type, 0);
    new (&New->Section->Object) pkgTagSection();
    New->Section->Owner = New;
    Py_INCREF(New->Section->Owner);
@@ -329,7 +329,7 @@ PyObject *ParseTagFile(PyObject *self,PyObject *Args) {
    PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.ParseTagFile() is "
                 "deprecated. Please see apt_pkg.TagFile() for the "
                 "replacement.", 1);
-    return TagFileNew(&TagFileType,Args,0);
+    return TagFileNew(&PyTagFile_Type,Args,0);
 }
 #endif
 									/*}}}*/
@@ -357,7 +357,7 @@ PyObject *RewriteSection(PyObject *self,PyObject *Args)
    PyObject *Section;
    PyObject *Order;
    PyObject *Rewrite;
-   if (PyArg_ParseTuple(Args,"O!O!O!",&TagSecType,&Section,
+   if (PyArg_ParseTuple(Args,"O!O!O!",&PyTagSection_Type,&Section,
 			&PyList_Type,&Order,&PyList_Type,&Rewrite) == 0)
       return 0;
 
@@ -436,7 +436,7 @@ static char *doc_TagSec = "TagSection(text) -> Create a new object.\n\n"
    "header sections, like those in debian/control or Packages files.\n\n"
    "TagSection() behave like read-only dictionaries and also provide access\n"
    "to the functions provided by the C++ class (e.g. Find)";
-PyTypeObject TagSecType =
+PyTypeObject PyTagSection_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.TagSection",                // tp_name
@@ -522,7 +522,7 @@ static char *doc_TagFile = "TagFile(file) -> TagFile() object. \n\n"
    "a file descriptor (an integer)";
 
 // Type for a Tag File
-PyTypeObject TagFileType =
+PyTypeObject PyTagFile_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.TagFile",                   // tp_name