diff --git a/ChangeLog b/ChangeLog
index db34be40..cd1e474f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-14  Federico Di Gregorio  <fog@debian.org>
+
+	* psycopg/*.c: changed the names of most of the psycopg's built-in
+	types to replect their position in the psycopg._psycopg module.
+
 2004-12-10  Federico Di Gregorio  <fog@debian.org>
 
 	* psycopg/cursor_type.c: now *all* write or async accesses to the
diff --git a/psycopg/adapter_binary.c b/psycopg/adapter_binary.c
index 8976b4f1..d8629d4d 100644
--- a/psycopg/adapter_binary.c
+++ b/psycopg/adapter_binary.c
@@ -263,7 +263,7 @@ binary_repr(binaryObject *self)
 PyTypeObject binaryType = {
     PyObject_HEAD_INIT(NULL)
     0,
-    "psycopg.Binary",
+    "psycopg._psycopg.Binary",
     sizeof(binaryObject),
     0,
     binary_dealloc, /*tp_dealloc*/
diff --git a/psycopg/adapter_datetime.c b/psycopg/adapter_datetime.c
index 03729bad..36051b59 100644
--- a/psycopg/adapter_datetime.c
+++ b/psycopg/adapter_datetime.c
@@ -181,7 +181,7 @@ pydatetime_repr(pydatetimeObject *self)
 PyTypeObject pydatetimeType = {
     PyObject_HEAD_INIT(NULL)
     0,
-    "psycopg.datetime",
+    "psycopg._psycopg.datetime",
     sizeof(pydatetimeObject),
     0,
     pydatetime_dealloc, /*tp_dealloc*/
diff --git a/psycopg/adapter_mxdatetime.c b/psycopg/adapter_mxdatetime.c
index aa7f78f2..6b4e0c36 100644
--- a/psycopg/adapter_mxdatetime.c
+++ b/psycopg/adapter_mxdatetime.c
@@ -157,7 +157,7 @@ mxdatetime_repr(mxdatetimeObject *self)
 PyTypeObject mxdatetimeType = {
     PyObject_HEAD_INIT(NULL)
     0,
-    "psycopg.MxDateTime",
+    "psycopg._psycopg.MxDateTime",
     sizeof(mxdatetimeObject),
     0,
     mxdatetime_dealloc, /*tp_dealloc*/
diff --git a/psycopg/adapter_pboolean.c b/psycopg/adapter_pboolean.c
index d4c89163..268c9386 100644
--- a/psycopg/adapter_pboolean.c
+++ b/psycopg/adapter_pboolean.c
@@ -148,7 +148,7 @@ pboolean_repr(pbooleanObject *self)
 PyTypeObject pbooleanType = {
     PyObject_HEAD_INIT(NULL)
     0,
-    "psycopg.Boolean",
+    "psycopg._psycopg.Boolean",
     sizeof(pbooleanObject),
     0,
     pboolean_dealloc, /*tp_dealloc*/
diff --git a/psycopg/adapter_qstring.c b/psycopg/adapter_qstring.c
index 3a92e6be..c3ae503f 100644
--- a/psycopg/adapter_qstring.c
+++ b/psycopg/adapter_qstring.c
@@ -280,7 +280,7 @@ qstring_repr(qstringObject *self)
 PyTypeObject qstringType = {
     PyObject_HEAD_INIT(NULL)
     0,
-    "psycopg.QuotedString",
+    "psycopg._psycopg.QuotedString",
     sizeof(qstringObject),
     0,
     qstring_dealloc, /*tp_dealloc*/
diff --git a/psycopg/connection_type.c b/psycopg/connection_type.c
index d1bb978c..aab39a79 100644
--- a/psycopg/connection_type.c
+++ b/psycopg/connection_type.c
@@ -335,7 +335,7 @@ connection_repr(connectionObject *self)
 PyTypeObject connectionType = {
     PyObject_HEAD_INIT(NULL)
     0,
-    "psycopg.connection",
+    "psycopg._psycopg.connection",
     sizeof(connectionObject),
     0,
     connection_dealloc, /*tp_dealloc*/
diff --git a/psycopg/cursor_type.c b/psycopg/cursor_type.c
index 1bb1894b..2051d854 100644
--- a/psycopg/cursor_type.c
+++ b/psycopg/cursor_type.c
@@ -1174,7 +1174,7 @@ cursor_repr(cursorObject *self)
 PyTypeObject cursorType = {
     PyObject_HEAD_INIT(NULL)
     0,
-    "psycopg.cursor",
+    "psycopg._psycopg.cursor",
     sizeof(cursorObject),
     0,
     cursor_dealloc, /*tp_dealloc*/
diff --git a/psycopg/microprotocols_proto.c b/psycopg/microprotocols_proto.c
index 0c63e2c2..9f2d29e5 100644
--- a/psycopg/microprotocols_proto.c
+++ b/psycopg/microprotocols_proto.c
@@ -154,7 +154,7 @@ isqlquote_del(PyObject* self)
 PyTypeObject isqlquoteType = {
     PyObject_HEAD_INIT(NULL)
     0,
-    "psycopg.ISQLQuote",
+    "psycopg._psycopg.ISQLQuote",
     sizeof(isqlquoteObject),
     0,
     isqlquote_dealloc, /*tp_dealloc*/