diff --git a/ChangeLog b/ChangeLog
index fe4ae65a..199b1b99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 26 11:33:28 CEST 2002 Daniel Veillard <daniel@veillard.com>
+
+	* python/generator.py python/libxml2class.txt: fixed a stupid error
+	  breaking the python API
+
 Thu Sep 26 00:31:46 CEST 2002 Daniel Veillard <daniel@veillard.com>
 
 	* trio.c trio.h triodef.h trionan.c trionan.h triop.h
diff --git a/python/generator.py b/python/generator.py
index ed3196d4..a8a1b870 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -672,9 +672,9 @@ def nameFixup(name, classe, type, file):
     elif name[0:20] == "xmlParserInputBuffer" and file != "python":
         func = name[20:]
         func = string.lower(func[0:1]) + func[1:]
-    elif name[0:9] == "xmlRegexp":
+    elif name[0:9] == "xmlRegexp" and file == "xmlregexp":
         func = "regexp" + name[9:]
-    elif name[0:6] == "xmlReg":
+    elif name[0:6] == "xmlReg" and file == "xmlregexp":
         func = "regexp" + name[6:]
     elif name[0:11] == "xmlACatalog":
         func = name[11:]
diff --git a/python/libxml2class.txt b/python/libxml2class.txt
index 0340fb66..cae9a436 100644
--- a/python/libxml2class.txt
+++ b/python/libxml2class.txt
@@ -123,7 +123,7 @@ dumpMemory()
 htmlCreatePushParser()
 htmlSAXParseFile()
 newNode()
-regexpisterErrorHandler()
+registerErrorHandler()
 setEntityLoader()
 
 # functions from module tree
@@ -158,9 +158,9 @@ iOFTPMatch()
 iOHTTPMatch()
 normalizeWindowsPath()
 parserGetDirectory()
-regexpisterDefaultInputCallbacks()
-regexpisterDefaultOutputCallbacks()
-regexpisterHTTPPostCallbacks()
+registerDefaultInputCallbacks()
+registerDefaultOutputCallbacks()
+registerHTTPPostCallbacks()
 
 # functions from module xmlregexp
 regexpCompile()
@@ -734,7 +734,7 @@ Class xpathContext()
     setContextNode()
 
     # functions from module python
-    regexpisterXPathFunction()
+    registerXPathFunction()
 
     # functions from module xpath
     xpathEval()