diff --git a/wxPython/wx/__init__.py b/wxPython/wx/__init__.py
index 13f57289b8..b225ae2036 100644
--- a/wxPython/wx/__init__.py
+++ b/wxPython/wx/__init__.py
@@ -1,41 +1,74 @@
 """wx package
 
-Provides a way to drop the wx prefix from wxPython objects."""
+Provides a way to drop the wx prefix from wxPython objects by
+dynamically loading and renaming objects from the real wxPython
+package.  This is the first phase of a transition to a new style of
+using wxPython.  For example:
+
+    import wx
+    class MyFrame(wx.Frame):
+        ...
+
+instead of:
+
+    from wxPython.wx import *
+    class MyFrame(wxFrame):
+        ...
+
+or:
+
+    from wxPython import wx
+    class MyFrame(wx.wxFrame):
+        ...
+
+
+Internally, this package contains only one function, called _rename,
+and one dictionary, called _newnames.  These are used by wx itself and
+by its sub-modules whenever they are imported.  The _rename function
+changes the names in the real wxPython module being imported according
+to the rules that have been decided, e.g. most wx prefixes are
+removed, and the new names are made visible in the wx package or
+sub-packages.
+
+The _newnames dictionary holds the set of new names (from wx and ALL
+sub-modules), keyed by the original name. This serves two purposes,
+duplicate old names in different modules are eliminated, the survivor
+being the name in wx itself; and the dictionary is accessible to
+external scripts whose purpose is to change occurrences of the
+corresponding names in application programs that use wx.
+
+"""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
 from wxPython import wx
 
-import types
+_newnames = {}
 
-d_new = globals()
-d_old = wx.__dict__
-
-for old, obj in d_old.items():
-    if type(obj) is types.ModuleType or old.startswith('_'):
-        # Skip modules and private names.
-        continue
-    new = old
-    if old.startswith('EVT_'):
-        # Leave name unmodified; add to the new wx namespace.
-        d_new[new] = obj
-    elif old.startswith('wxEVT_'):
-        # Leave name unmodified; add to the new wx namespace.
-        d_new[new] = obj
-    else:
-        if old.startswith('wx'):
-            # Remove the 'wx' prefix.
+def _rename(d_new, d_old, modulename=None):
+    " copy the names from d_old to d_new according to the rules"
+    global _newnames
+    import types
+    prefix = 'wx.'
+    if modulename:
+        prefix += modulename + '.'
+    for old, obj in d_old.items():
+        if type(obj) is types.ModuleType or old.startswith('_'):
+            # Skip modules and private names.
+            continue
+        if old.startswith('wx') and not old.startswith('wxEVT_'):
+            # remove all wx prefixes except wxEVT_
             new = old[2:]
-        # Add to the new wx package namespace.
-        d_new[new] = obj
+        else:
+            # add everything else unchanged
+            new = old
+        if _newnames.has_key(old):
+            d_new[new] = obj
+            _newnames[old] = prefix + new      # add fully qualified new name to lookup using old name as key
 
-del d_new
-del d_old
-del new
-del obj
-del old
-del types
+# rename the wx namespace itself
 
+_rename(globals(), wx.__dict__)
 del wx
+
diff --git a/wxPython/wx/calendar.py b/wxPython/wx/calendar.py
index ed4e5bde25..fbc543e4da 100644
--- a/wxPython/wx/calendar.py
+++ b/wxPython/wx/calendar.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython import calendar
-prefix.rename(d_new=globals(), d_old=calendar.__dict__)
+_rename(globals(), calendar.__dict__, modulename='calendar')
 del calendar
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/dllwidget.py b/wxPython/wx/dllwidget.py
new file mode 100644
index 0000000000..fc1ed89706
--- /dev/null
+++ b/wxPython/wx/dllwidget.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython import dllwidget
+_rename(globals(), dllwidget.__dict__, modulename='dllwidget')
+del dllwidget
+del _rename
diff --git a/wxPython/wx/gizmos.py b/wxPython/wx/gizmos.py
index 021355469d..24714962c5 100644
--- a/wxPython/wx/gizmos.py
+++ b/wxPython/wx/gizmos.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython import gizmos
-prefix.rename(d_new=globals(), d_old=gizmos.__dict__)
+_rename(globals(), gizmos.__dict__, modulename='gizmos')
 del gizmos
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/glcanvas.py b/wxPython/wx/glcanvas.py
index 879a8ed5e4..9807814a81 100644
--- a/wxPython/wx/glcanvas.py
+++ b/wxPython/wx/glcanvas.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython import glcanvas
-prefix.rename(d_new=globals(), d_old=glcanvas.__dict__)
+_rename(globals(), glcanvas.__dict__, modulename='glcanvas')
 del glcanvas
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/grid.py b/wxPython/wx/grid.py
index 9a8dc5a3a6..2b196ab084 100644
--- a/wxPython/wx/grid.py
+++ b/wxPython/wx/grid.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython import grid
-prefix.rename(d_new=globals(), d_old=grid.__dict__)
+_rename(globals(), grid.__dict__, modulename='grid')
 del grid
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/help.py b/wxPython/wx/help.py
index bb51b119d5..0a5923faf0 100644
--- a/wxPython/wx/help.py
+++ b/wxPython/wx/help.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython import help
-prefix.rename(d_new=globals(), d_old=help.__dict__)
+_rename(globals(), help.__dict__, modulename='help')
 del help
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/html.py b/wxPython/wx/html.py
index 4b56926e59..5627c53709 100644
--- a/wxPython/wx/html.py
+++ b/wxPython/wx/html.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython import html
-prefix.rename(d_new=globals(), d_old=html.__dict__)
+_rename(globals(), html.__dict__, modulename='html')
 del html
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/htmlhelp.py b/wxPython/wx/htmlhelp.py
deleted file mode 100644
index 1700bd3853..0000000000
--- a/wxPython/wx/htmlhelp.py
+++ /dev/null
@@ -1,15 +0,0 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
-
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
-__cvsid__ = "$Id$"
-__revision__ = "$Revision$"[11:-2]
-
-import wx
-from wx import prefix
-
-from wxPython import htmlhelp
-prefix.rename(d_new=globals(), d_old=htmlhelp.__dict__)
-del htmlhelp
-
-del prefix
-del wx
diff --git a/wxPython/wx/iewin.py b/wxPython/wx/iewin.py
index a1ec91aa15..b593683e5a 100644
--- a/wxPython/wx/iewin.py
+++ b/wxPython/wx/iewin.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython import iewin
-prefix.rename(d_new=globals(), d_old=iewin.__dict__)
+_rename(globals(), iewin.__dict__, modulename='iewin')
 del iewin
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/CDate.py b/wxPython/wx/lib/CDate.py
index a9f7921a0e..54b6434903 100644
--- a/wxPython/wx/lib/CDate.py
+++ b/wxPython/wx/lib/CDate.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
-from wxPython.lib import CDate as old
-prefix.rename(d_new=globals(), d_old=old.__dict__)
-del old
-
-del prefix
-del wx
+from wx import _rename
+from wxPython.lib import CDate
+_rename(globals(), CDate.__dict__, modulename='lib.CDate')
+del CDate
+del _rename
diff --git a/wxPython/wx/lib/ClickableHtmlWindow.py b/wxPython/wx/lib/ClickableHtmlWindow.py
index c6541d6159..dabee04345 100644
--- a/wxPython/wx/lib/ClickableHtmlWindow.py
+++ b/wxPython/wx/lib/ClickableHtmlWindow.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import ClickableHtmlWindow
-prefix.rename(d_new=globals(), d_old=ClickableHtmlWindow.__dict__)
+_rename(globals(), ClickableHtmlWindow.__dict__, modulename='lib.ClickableHtmlWindow')
 del ClickableHtmlWindow
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/ErrorDialogs.py b/wxPython/wx/lib/ErrorDialogs.py
index 2036fa6342..eb20380b30 100644
--- a/wxPython/wx/lib/ErrorDialogs.py
+++ b/wxPython/wx/lib/ErrorDialogs.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import ErrorDialogs
-prefix.rename(d_new=globals(), d_old=ErrorDialogs.__dict__)
+_rename(globals(), ErrorDialogs.__dict__, modulename='lib.ErrorDialogs')
 del ErrorDialogs
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/ErrorDialogs_wdr.py b/wxPython/wx/lib/ErrorDialogs_wdr.py
new file mode 100644
index 0000000000..ae07431b30
--- /dev/null
+++ b/wxPython/wx/lib/ErrorDialogs_wdr.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.lib import ErrorDialogs_wdr
+_rename(globals(), ErrorDialogs_wdr.__dict__, modulename='lib.ErrorDialogs_wdr')
+del ErrorDialogs_wdr
+del _rename
diff --git a/wxPython/wx/lib/PythonBitmaps.py b/wxPython/wx/lib/PythonBitmaps.py
index bf096d8a84..d54dbbef07 100644
--- a/wxPython/wx/lib/PythonBitmaps.py
+++ b/wxPython/wx/lib/PythonBitmaps.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
-from wxPython.lib import PythonBitmaps as old
-prefix.rename(d_new=globals(), d_old=old.__dict__)
-del old
-
-del prefix
-del wx
+from wx import _rename
+from wxPython.lib import PythonBitmaps
+_rename(globals(), PythonBitmaps.__dict__, modulename='lib.PythonBitmaps')
+del PythonBitmaps
+del _rename
diff --git a/wxPython/wx/lib/__init__.py b/wxPython/wx/lib/__init__.py
index b929a7db76..717d76b577 100644
--- a/wxPython/wx/lib/__init__.py
+++ b/wxPython/wx/lib/__init__.py
@@ -1 +1 @@
-# Python package.
+# Python package
diff --git a/wxPython/wx/lib/activexwrapper.py b/wxPython/wx/lib/activexwrapper.py
index ef3f2cdae1..b92e6ed3b1 100644
--- a/wxPython/wx/lib/activexwrapper.py
+++ b/wxPython/wx/lib/activexwrapper.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import activexwrapper
-prefix.rename(d_new=globals(), d_old=activexwrapper.__dict__)
+_rename(globals(), activexwrapper.__dict__, modulename='lib.activexwrapper')
 del activexwrapper
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/analogclock.py b/wxPython/wx/lib/analogclock.py
index 645522be39..f83fe1a29c 100644
--- a/wxPython/wx/lib/analogclock.py
+++ b/wxPython/wx/lib/analogclock.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import analogclock
-prefix.rename(d_new=globals(), d_old=analogclock.__dict__)
+_rename(globals(), analogclock.__dict__, modulename='lib.analogclock')
 del analogclock
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/anchors.py b/wxPython/wx/lib/anchors.py
index e020588c2d..779cb6f043 100644
--- a/wxPython/wx/lib/anchors.py
+++ b/wxPython/wx/lib/anchors.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import anchors
-prefix.rename(d_new=globals(), d_old=anchors.__dict__)
+_rename(globals(), anchors.__dict__, modulename='lib.anchors')
 del anchors
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/buttons.py b/wxPython/wx/lib/buttons.py
index 6dbb1d6e19..aa4f3742b0 100644
--- a/wxPython/wx/lib/buttons.py
+++ b/wxPython/wx/lib/buttons.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import buttons
-prefix.rename(d_new=globals(), d_old=buttons.__dict__)
+_rename(globals(), buttons.__dict__, modulename='lib.buttons')
 del buttons
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/calendar.py b/wxPython/wx/lib/calendar.py
index 57210df97f..8b5a466e1c 100644
--- a/wxPython/wx/lib/calendar.py
+++ b/wxPython/wx/lib/calendar.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import calendar
-prefix.rename(d_new=globals(), d_old=calendar.__dict__)
+_rename(globals(), calendar.__dict__, modulename='lib.calendar')
 del calendar
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/colourchooser/__init__.py b/wxPython/wx/lib/colourchooser/__init__.py
index b929a7db76..717d76b577 100644
--- a/wxPython/wx/lib/colourchooser/__init__.py
+++ b/wxPython/wx/lib/colourchooser/__init__.py
@@ -1 +1 @@
-# Python package.
+# Python package
diff --git a/wxPython/wx/lib/colourchooser/canvas.py b/wxPython/wx/lib/colourchooser/canvas.py
index 599295beb7..829909b48e 100644
--- a/wxPython/wx/lib/colourchooser/canvas.py
+++ b/wxPython/wx/lib/colourchooser/canvas.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib.colourchooser import canvas
-prefix.rename(d_new=globals(), d_old=canvas.__dict__)
+_rename(globals(), canvas.__dict__, modulename='lib.colourchooser.canvas')
 del canvas
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/colourchooser/intl.py b/wxPython/wx/lib/colourchooser/intl.py
index dd7710a315..2004276cad 100644
--- a/wxPython/wx/lib/colourchooser/intl.py
+++ b/wxPython/wx/lib/colourchooser/intl.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib.colourchooser import intl
-prefix.rename(d_new=globals(), d_old=intl.__dict__)
+_rename(globals(), intl.__dict__, modulename='lib.colourchooser.intl')
 del intl
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/colourchooser/pycolourbox.py b/wxPython/wx/lib/colourchooser/pycolourbox.py
index ca35b71091..d240cb83c9 100644
--- a/wxPython/wx/lib/colourchooser/pycolourbox.py
+++ b/wxPython/wx/lib/colourchooser/pycolourbox.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib.colourchooser import pycolourbox
-prefix.rename(d_new=globals(), d_old=pycolourbox.__dict__)
+_rename(globals(), pycolourbox.__dict__, modulename='lib.colourchooser.pycolourbox')
 del pycolourbox
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/colourchooser/pycolourchooser.py b/wxPython/wx/lib/colourchooser/pycolourchooser.py
index 573fcbec40..4b1049ef3b 100644
--- a/wxPython/wx/lib/colourchooser/pycolourchooser.py
+++ b/wxPython/wx/lib/colourchooser/pycolourchooser.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib.colourchooser import pycolourchooser
-prefix.rename(d_new=globals(), d_old=pycolourchooser.__dict__)
+_rename(globals(), pycolourchooser.__dict__, modulename='lib.colourchooser.pycolourchooser')
 del pycolourchooser
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/colourchooser/pycolourslider.py b/wxPython/wx/lib/colourchooser/pycolourslider.py
index 6e8c152bce..b737da9cbc 100644
--- a/wxPython/wx/lib/colourchooser/pycolourslider.py
+++ b/wxPython/wx/lib/colourchooser/pycolourslider.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib.colourchooser import pycolourslider
-prefix.rename(d_new=globals(), d_old=pycolourslider.__dict__)
+_rename(globals(), pycolourslider.__dict__, modulename='lib.colourchooser.pycolourslider')
 del pycolourslider
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/colourchooser/pypalette.py b/wxPython/wx/lib/colourchooser/pypalette.py
index 64c0575b99..e420d09a59 100644
--- a/wxPython/wx/lib/colourchooser/pypalette.py
+++ b/wxPython/wx/lib/colourchooser/pypalette.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib.colourchooser import pypalette
-prefix.rename(d_new=globals(), d_old=pypalette.__dict__)
+_rename(globals(), pypalette.__dict__, modulename='lib.colourchooser.pypalette')
 del pypalette
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/colourdb.py b/wxPython/wx/lib/colourdb.py
index 2de39c6168..ca11238ac9 100644
--- a/wxPython/wx/lib/colourdb.py
+++ b/wxPython/wx/lib/colourdb.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import colourdb
-prefix.rename(d_new=globals(), d_old=colourdb.__dict__)
+_rename(globals(), colourdb.__dict__, modulename='lib.colourdb')
 del colourdb
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/colourselect.py b/wxPython/wx/lib/colourselect.py
index c1dc19adf5..ac24ba0cb4 100644
--- a/wxPython/wx/lib/colourselect.py
+++ b/wxPython/wx/lib/colourselect.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import colourselect
-prefix.rename(d_new=globals(), d_old=colourselect.__dict__)
+_rename(globals(), colourselect.__dict__, modulename='lib.colourselect')
 del colourselect
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/dialogs.py b/wxPython/wx/lib/dialogs.py
index 140e771a9b..851f36ae06 100644
--- a/wxPython/wx/lib/dialogs.py
+++ b/wxPython/wx/lib/dialogs.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import dialogs
-prefix.rename(d_new=globals(), d_old=dialogs.__dict__)
+_rename(globals(), dialogs.__dict__, modulename='lib.dialogs')
 del dialogs
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/editor/__init__.py b/wxPython/wx/lib/editor/__init__.py
index b929a7db76..717d76b577 100644
--- a/wxPython/wx/lib/editor/__init__.py
+++ b/wxPython/wx/lib/editor/__init__.py
@@ -1 +1 @@
-# Python package.
+# Python package
diff --git a/wxPython/wx/lib/editor/editor.py b/wxPython/wx/lib/editor/editor.py
index 52319607bd..22ecac2614 100644
--- a/wxPython/wx/lib/editor/editor.py
+++ b/wxPython/wx/lib/editor/editor.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib.editor import editor
-prefix.rename(d_new=globals(), d_old=editor.__dict__)
+_rename(globals(), editor.__dict__, modulename='lib.editor.editor')
 del editor
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/editor/images.py b/wxPython/wx/lib/editor/images.py
index b8d6574118..8bbd370706 100644
--- a/wxPython/wx/lib/editor/images.py
+++ b/wxPython/wx/lib/editor/images.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib.editor import images
-prefix.rename(d_new=globals(), d_old=images.__dict__)
+_rename(globals(), images.__dict__, modulename='lib.editor.images')
 del images
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/editor/selection.py b/wxPython/wx/lib/editor/selection.py
index 44abc28ab9..cf3cebedc0 100644
--- a/wxPython/wx/lib/editor/selection.py
+++ b/wxPython/wx/lib/editor/selection.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib.editor import selection
-prefix.rename(d_new=globals(), d_old=selection.__dict__)
+_rename(globals(), selection.__dict__, modulename='lib.editor.selection')
 del selection
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/evtmgr.py b/wxPython/wx/lib/evtmgr.py
index 9e77330314..c010bf13f3 100644
--- a/wxPython/wx/lib/evtmgr.py
+++ b/wxPython/wx/lib/evtmgr.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import evtmgr
-prefix.rename(d_new=globals(), d_old=evtmgr.__dict__)
+_rename(globals(), evtmgr.__dict__, modulename='lib.evtmgr')
 del evtmgr
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/fancytext.py b/wxPython/wx/lib/fancytext.py
index a9e4f26d9f..dfabeb8610 100644
--- a/wxPython/wx/lib/fancytext.py
+++ b/wxPython/wx/lib/fancytext.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import fancytext
-prefix.rename(d_new=globals(), d_old=fancytext.__dict__)
+_rename(globals(), fancytext.__dict__, modulename='lib.fancytext')
 del fancytext
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/filebrowsebutton.py b/wxPython/wx/lib/filebrowsebutton.py
index 36ad6453d8..b8f48bd212 100644
--- a/wxPython/wx/lib/filebrowsebutton.py
+++ b/wxPython/wx/lib/filebrowsebutton.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import filebrowsebutton
-prefix.rename(d_new=globals(), d_old=filebrowsebutton.__dict__)
+_rename(globals(), filebrowsebutton.__dict__, modulename='lib.filebrowsebutton')
 del filebrowsebutton
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/floatbar.py b/wxPython/wx/lib/floatbar.py
index 9049d1c5b0..34c334b635 100644
--- a/wxPython/wx/lib/floatbar.py
+++ b/wxPython/wx/lib/floatbar.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
-from wxPython.lib import floatbar as old
-prefix.rename(d_new=globals(), d_old=old.__dict__)
-del old
-
-del prefix
-del wx
+from wx import _rename
+from wxPython.lib import floatbar
+_rename(globals(), floatbar.__dict__, modulename='lib.floatbar')
+del floatbar
+del _rename
diff --git a/wxPython/wx/lib/gridmovers.py b/wxPython/wx/lib/gridmovers.py
index b365e33656..55a3fa1baa 100644
--- a/wxPython/wx/lib/gridmovers.py
+++ b/wxPython/wx/lib/gridmovers.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import gridmovers
-prefix.rename(d_new=globals(), d_old=gridmovers.__dict__)
+_rename(globals(), gridmovers.__dict__, modulename='lib.gridmovers')
 del gridmovers
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/grids.py b/wxPython/wx/lib/grids.py
index e984e4c6f3..010c1b972a 100644
--- a/wxPython/wx/lib/grids.py
+++ b/wxPython/wx/lib/grids.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import grids
-prefix.rename(d_new=globals(), d_old=grids.__dict__)
+_rename(globals(), grids.__dict__, modulename='lib.grids')
 del grids
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/imagebrowser.py b/wxPython/wx/lib/imagebrowser.py
index 80bc50049f..9009641090 100644
--- a/wxPython/wx/lib/imagebrowser.py
+++ b/wxPython/wx/lib/imagebrowser.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import imagebrowser
-prefix.rename(d_new=globals(), d_old=imagebrowser.__dict__)
+_rename(globals(), imagebrowser.__dict__, modulename='lib.imagebrowser')
 del imagebrowser
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/imageutils.py b/wxPython/wx/lib/imageutils.py
index ccd700e1f4..be7de7e57b 100644
--- a/wxPython/wx/lib/imageutils.py
+++ b/wxPython/wx/lib/imageutils.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import imageutils
-prefix.rename(d_new=globals(), d_old=imageutils.__dict__)
+_rename(globals(), imageutils.__dict__, modulename='lib.imageutils')
 del imageutils
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/infoframe.py b/wxPython/wx/lib/infoframe.py
index 62089231d9..196bfabd66 100644
--- a/wxPython/wx/lib/infoframe.py
+++ b/wxPython/wx/lib/infoframe.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import infoframe
-prefix.rename(d_new=globals(), d_old=infoframe.__dict__)
+_rename(globals(), infoframe.__dict__, modulename='lib.infoframe')
 del infoframe
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/intctrl.py b/wxPython/wx/lib/intctrl.py
index 0290187504..f201a6fc74 100644
--- a/wxPython/wx/lib/intctrl.py
+++ b/wxPython/wx/lib/intctrl.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import intctrl
-prefix.rename(d_new=globals(), d_old=intctrl.__dict__)
+_rename(globals(), intctrl.__dict__, modulename='lib.intctrl')
 del intctrl
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/layoutf.py b/wxPython/wx/lib/layoutf.py
index 97c3129d5a..f1492446e7 100644
--- a/wxPython/wx/lib/layoutf.py
+++ b/wxPython/wx/lib/layoutf.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import layoutf
-prefix.rename(d_new=globals(), d_old=layoutf.__dict__)
+_rename(globals(), layoutf.__dict__, modulename='lib.layoutf')
 del layoutf
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/maskededit.py b/wxPython/wx/lib/maskededit.py
index fff5ae348b..61f751cd6c 100644
--- a/wxPython/wx/lib/maskededit.py
+++ b/wxPython/wx/lib/maskededit.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
-from wxPython.lib import maskededit as old
-prefix.rename(d_new=globals(), d_old=old.__dict__)
-del old
-
-del prefix
-del wx
+from wx import _rename
+from wxPython.lib import maskededit
+_rename(globals(), maskededit.__dict__, modulename='lib.maskededit')
+del maskededit
+del _rename
diff --git a/wxPython/wx/lib/mixins/__init__.py b/wxPython/wx/lib/mixins/__init__.py
index b929a7db76..717d76b577 100644
--- a/wxPython/wx/lib/mixins/__init__.py
+++ b/wxPython/wx/lib/mixins/__init__.py
@@ -1 +1 @@
-# Python package.
+# Python package
diff --git a/wxPython/wx/lib/mixins/grid.py b/wxPython/wx/lib/mixins/grid.py
index 4dce095727..a5d5c8cdf2 100644
--- a/wxPython/wx/lib/mixins/grid.py
+++ b/wxPython/wx/lib/mixins/grid.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib.mixins import grid
-prefix.rename(d_new=globals(), d_old=grid.__dict__)
+_rename(globals(), grid.__dict__, modulename='lib.mixins.grid')
 del grid
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/mixins/imagelist.py b/wxPython/wx/lib/mixins/imagelist.py
index d6143ec40c..1275fe2f03 100644
--- a/wxPython/wx/lib/mixins/imagelist.py
+++ b/wxPython/wx/lib/mixins/imagelist.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib.mixins import imagelist
-prefix.rename(d_new=globals(), d_old=imagelist.__dict__)
+_rename(globals(), imagelist.__dict__, modulename='lib.mixins.imagelist')
 del imagelist
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/mixins/listctrl.py b/wxPython/wx/lib/mixins/listctrl.py
index 06660353f6..88cc8860f7 100644
--- a/wxPython/wx/lib/mixins/listctrl.py
+++ b/wxPython/wx/lib/mixins/listctrl.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib.mixins import listctrl
-prefix.rename(d_new=globals(), d_old=listctrl.__dict__)
+_rename(globals(), listctrl.__dict__, modulename='lib.mixins.listctrl')
 del listctrl
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/mixins/rubberband.py b/wxPython/wx/lib/mixins/rubberband.py
index 924d931b0c..de0614becf 100644
--- a/wxPython/wx/lib/mixins/rubberband.py
+++ b/wxPython/wx/lib/mixins/rubberband.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib.mixins import rubberband
-prefix.rename(d_new=globals(), d_old=rubberband.__dict__)
+_rename(globals(), rubberband.__dict__, modulename='lib.mixins.rubberband')
 del rubberband
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/multisash.py b/wxPython/wx/lib/multisash.py
index 56a0f75c0d..b586275f73 100644
--- a/wxPython/wx/lib/multisash.py
+++ b/wxPython/wx/lib/multisash.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import multisash
-prefix.rename(d_new=globals(), d_old=multisash.__dict__)
+_rename(globals(), multisash.__dict__, modulename='lib.multisash')
 del multisash
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/mvctree.py b/wxPython/wx/lib/mvctree.py
index c70fffec31..cc1b6c94a7 100644
--- a/wxPython/wx/lib/mvctree.py
+++ b/wxPython/wx/lib/mvctree.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
-from wxPython.lib import mvctree as old
-prefix.rename(d_new=globals(), d_old=old.__dict__)
-del old
-
-del prefix
-del wx
+from wx import _rename
+from wxPython.lib import mvctree
+_rename(globals(), mvctree.__dict__, modulename='lib.mvctree')
+del mvctree
+del _rename
diff --git a/wxPython/wx/lib/popupctl.py b/wxPython/wx/lib/popupctl.py
index f7e541601b..860d3202fe 100644
--- a/wxPython/wx/lib/popupctl.py
+++ b/wxPython/wx/lib/popupctl.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import popupctl
-prefix.rename(d_new=globals(), d_old=popupctl.__dict__)
+_rename(globals(), popupctl.__dict__, modulename='lib.popupctl')
 del popupctl
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/printout.py b/wxPython/wx/lib/printout.py
index d89d0ad8a2..c927f0659d 100644
--- a/wxPython/wx/lib/printout.py
+++ b/wxPython/wx/lib/printout.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import printout
-prefix.rename(d_new=globals(), d_old=printout.__dict__)
+_rename(globals(), printout.__dict__, modulename='lib.printout')
 del printout
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/pubsub.py b/wxPython/wx/lib/pubsub.py
index 21966ef8d8..c2275bf65d 100644
--- a/wxPython/wx/lib/pubsub.py
+++ b/wxPython/wx/lib/pubsub.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
-from wxPython.lib import pubsub as old
-prefix.rename(d_new=globals(), d_old=old.__dict__)
-del old
-
-del prefix
-del wx
+from wx import _rename
+from wxPython.lib import pubsub
+_rename(globals(), pubsub.__dict__, modulename='lib.pubsub')
+del pubsub
+del _rename
diff --git a/wxPython/wx/lib/pyshell.py b/wxPython/wx/lib/pyshell.py
index fe75c21af4..cdfca52db3 100644
--- a/wxPython/wx/lib/pyshell.py
+++ b/wxPython/wx/lib/pyshell.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
-from wxPython.lib import pyshell as old
-prefix.rename(d_new=globals(), d_old=old.__dict__)
-del old
-
-del prefix
-del wx
+from wx import _rename
+from wxPython.lib import pyshell
+_rename(globals(), pyshell.__dict__, modulename='lib.pyshell')
+del pyshell
+del _rename
diff --git a/wxPython/wx/lib/rcsizer.py b/wxPython/wx/lib/rcsizer.py
index d52f19c438..b59b4c2876 100644
--- a/wxPython/wx/lib/rcsizer.py
+++ b/wxPython/wx/lib/rcsizer.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import rcsizer
-prefix.rename(d_new=globals(), d_old=rcsizer.__dict__)
+_rename(globals(), rcsizer.__dict__, modulename='lib.rcsizer')
 del rcsizer
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/rightalign.py b/wxPython/wx/lib/rightalign.py
index 69291bf3bd..e47e353d55 100644
--- a/wxPython/wx/lib/rightalign.py
+++ b/wxPython/wx/lib/rightalign.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import rightalign
-prefix.rename(d_new=globals(), d_old=rightalign.__dict__)
+_rename(globals(), rightalign.__dict__, modulename='lib.rightalign')
 del rightalign
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/rpcMixin.py b/wxPython/wx/lib/rpcMixin.py
index dd434b1576..8f4b66de98 100644
--- a/wxPython/wx/lib/rpcMixin.py
+++ b/wxPython/wx/lib/rpcMixin.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
-from wxPython.lib import rpcMixin as old
-prefix.rename(d_new=globals(), d_old=old.__dict__)
-del old
-
-del prefix
-del wx
+from wx import _rename
+from wxPython.lib import rpcMixin
+_rename(globals(), rpcMixin.__dict__, modulename='lib.rpcMixin')
+del rpcMixin
+del _rename
diff --git a/wxPython/wx/lib/scrolledpanel.py b/wxPython/wx/lib/scrolledpanel.py
index 3a32641d60..5c1d6a2648 100644
--- a/wxPython/wx/lib/scrolledpanel.py
+++ b/wxPython/wx/lib/scrolledpanel.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
-from wxPython.lib import scrolledpanel as old
-prefix.rename(d_new=globals(), d_old=old.__dict__)
-del old
-
-del prefix
-del wx
+from wx import _rename
+from wxPython.lib import scrolledpanel
+_rename(globals(), scrolledpanel.__dict__, modulename='lib.scrolledpanel')
+del scrolledpanel
+del _rename
diff --git a/wxPython/wx/lib/sheet.py b/wxPython/wx/lib/sheet.py
index 8b859bb6d2..b22fa83d62 100644
--- a/wxPython/wx/lib/sheet.py
+++ b/wxPython/wx/lib/sheet.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import sheet
-prefix.rename(d_new=globals(), d_old=sheet.__dict__)
+_rename(globals(), sheet.__dict__, modulename='lib.sheet')
 del sheet
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/shell.py b/wxPython/wx/lib/shell.py
index 150284ed73..b95f0e8041 100644
--- a/wxPython/wx/lib/shell.py
+++ b/wxPython/wx/lib/shell.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
-from wxPython.lib import shell as old
-prefix.rename(d_new=globals(), d_old=old.__dict__)
-del old
-
-del prefix
-del wx
+from wx import _rename
+from wxPython.lib import shell
+_rename(globals(), shell.__dict__, modulename='lib.shell')
+del shell
+del _rename
diff --git a/wxPython/wx/lib/splashscreen.py b/wxPython/wx/lib/splashscreen.py
index f983fffe02..2c14a2fa1a 100644
--- a/wxPython/wx/lib/splashscreen.py
+++ b/wxPython/wx/lib/splashscreen.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
-from wxPython.lib import splashscreen as old
-prefix.rename(d_new=globals(), d_old=old.__dict__)
-del old
-
-del prefix
-del wx
+from wx import _rename
+from wxPython.lib import splashscreen
+_rename(globals(), splashscreen.__dict__, modulename='lib.splashscreen')
+del splashscreen
+del _rename
diff --git a/wxPython/wx/lib/stattext.py b/wxPython/wx/lib/stattext.py
index 46c3f8de66..4c152232d4 100644
--- a/wxPython/wx/lib/stattext.py
+++ b/wxPython/wx/lib/stattext.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import stattext
-prefix.rename(d_new=globals(), d_old=stattext.__dict__)
+_rename(globals(), stattext.__dict__, modulename='lib.stattext')
 del stattext
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/throbber.py b/wxPython/wx/lib/throbber.py
index c663166e2e..1ee8406b2f 100644
--- a/wxPython/wx/lib/throbber.py
+++ b/wxPython/wx/lib/throbber.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import throbber
-prefix.rename(d_new=globals(), d_old=throbber.__dict__)
+_rename(globals(), throbber.__dict__, modulename='lib.throbber')
 del throbber
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/timectrl.py b/wxPython/wx/lib/timectrl.py
index 6a7abb84bf..d410de7d5b 100644
--- a/wxPython/wx/lib/timectrl.py
+++ b/wxPython/wx/lib/timectrl.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import timectrl
-prefix.rename(d_new=globals(), d_old=timectrl.__dict__)
+_rename(globals(), timectrl.__dict__, modulename='lib.timectrl')
 del timectrl
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/vtk.py b/wxPython/wx/lib/vtk.py
index edc6f1fda8..be31f4a23f 100644
--- a/wxPython/wx/lib/vtk.py
+++ b/wxPython/wx/lib/vtk.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
-from wxPython.lib import vtk as old
-prefix.rename(d_new=globals(), d_old=old.__dict__)
-del old
-
-del prefix
-del wx
+from wx import _rename
+from wxPython.lib import vtk
+_rename(globals(), vtk.__dict__, modulename='lib.vtk')
+del vtk
+del _rename
diff --git a/wxPython/wx/lib/wxPlotCanvas.py b/wxPython/wx/lib/wxPlotCanvas.py
index f2cccf2e32..02c1d8f3d4 100644
--- a/wxPython/wx/lib/wxPlotCanvas.py
+++ b/wxPython/wx/lib/wxPlotCanvas.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import wxPlotCanvas
-prefix.rename(d_new=globals(), d_old=wxPlotCanvas.__dict__)
+_rename(globals(), wxPlotCanvas.__dict__, modulename='lib.wxPlotCanvas')
 del wxPlotCanvas
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/lib/wxpTag.py b/wxPython/wx/lib/wxpTag.py
index 06efe39d94..03fca45e9e 100644
--- a/wxPython/wx/lib/wxpTag.py
+++ b/wxPython/wx/lib/wxpTag.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython.lib import wxpTag
-prefix.rename(d_new=globals(), d_old=wxpTag.__dict__)
+_rename(globals(), wxpTag.__dict__, modulename='lib.wxpTag')
 del wxpTag
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/ogl.py b/wxPython/wx/ogl.py
index 558c2fb9ef..1ac54fd4dc 100644
--- a/wxPython/wx/ogl.py
+++ b/wxPython/wx/ogl.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython import ogl
-prefix.rename(d_new=globals(), d_old=ogl.__dict__)
+_rename(globals(), ogl.__dict__, modulename='ogl')
 del ogl
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/prefix.py b/wxPython/wx/prefix.py
deleted file mode 100644
index f664818e1b..0000000000
--- a/wxPython/wx/prefix.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""Renaming utility.
-
-Provides a way to drop the wx prefix from wxPython objects."""
-
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
-__cvsid__ = "$Id$"
-__revision__ = "$Revision$"[11:-2]
-
-import types
-
-def rename(d_new, d_old):
-    for old, obj in d_old.items():
-        if type(obj) is types.ModuleType or old.startswith('_'):
-            # Skip modules and private names.
-            continue
-##         mod = d_old['__name__']
-##         if hasattr(obj, '__module__') and not obj.__module__.startswith(mod):
-##             # Skip objects imported from other modules, except those
-##             # related to the current module, such as stc_.
-##             continue
-        new = old
-        if old.startswith('EVT_') or old.startswith('wxEVT_'):
-            # Leave these names unmodified.
-            pass 
-        elif old.startswith('wx'):
-            new = old[2:]
-        if new:
-            d_new[new] = d_old[old]
diff --git a/wxPython/wx/py/PyAlaCarte.py b/wxPython/wx/py/PyAlaCarte.py
index 6d60dd0eff..64c8b6304e 100644
--- a/wxPython/wx/py/PyAlaCarte.py
+++ b/wxPython/wx/py/PyAlaCarte.py
@@ -1,3 +1,11 @@
-# Py is really located in the old namespace, but it doesn't need any
-# renaming done.
-from wxPython.py.PyAlaCarte import *
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import PyAlaCarte
+_rename(globals(), PyAlaCarte.__dict__, modulename='py.PyAlaCarte')
+del PyAlaCarte
+del _rename
diff --git a/wxPython/wx/py/PyAlaMode.py b/wxPython/wx/py/PyAlaMode.py
index 9417837fc3..6acf8f83e0 100644
--- a/wxPython/wx/py/PyAlaMode.py
+++ b/wxPython/wx/py/PyAlaMode.py
@@ -1,3 +1,11 @@
-# Py is really located in the old namespace, but it doesn't need any
-# renaming done.
-from wxPython.py.PyAlaMode import *
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import PyAlaMode
+_rename(globals(), PyAlaMode.__dict__, modulename='py.PyAlaMode')
+del PyAlaMode
+del _rename
diff --git a/wxPython/wx/py/PyCrust.py b/wxPython/wx/py/PyCrust.py
index 9571f7d73a..26b64d239d 100644
--- a/wxPython/wx/py/PyCrust.py
+++ b/wxPython/wx/py/PyCrust.py
@@ -1,3 +1,11 @@
-# Py is really located in the old namespace, but it doesn't need any
-# renaming done.
-from wxPython.py.PyCrust import *
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import PyCrust
+_rename(globals(), PyCrust.__dict__, modulename='py.PyCrust')
+del PyCrust
+del _rename
diff --git a/wxPython/wx/py/PyFilling.py b/wxPython/wx/py/PyFilling.py
index fa9e01db2a..e1c068b282 100644
--- a/wxPython/wx/py/PyFilling.py
+++ b/wxPython/wx/py/PyFilling.py
@@ -1,3 +1,11 @@
-# Py is really located in the old namespace, but it doesn't need any
-# renaming done.
-from wxPython.py.PyFilling import *
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import PyFilling
+_rename(globals(), PyFilling.__dict__, modulename='py.PyFilling')
+del PyFilling
+del _rename
diff --git a/wxPython/wx/py/PyShell.py b/wxPython/wx/py/PyShell.py
index 19df451e84..08a2ae9329 100644
--- a/wxPython/wx/py/PyShell.py
+++ b/wxPython/wx/py/PyShell.py
@@ -1,3 +1,11 @@
-# Py is really located in the old namespace, but it doesn't need any
-# renaming done.
-from wxPython.py.PyShell import *
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import PyShell
+_rename(globals(), PyShell.__dict__, modulename='py.PyShell')
+del PyShell
+del _rename
diff --git a/wxPython/wx/py/PyWrap.py b/wxPython/wx/py/PyWrap.py
index 352a79ff6a..7adba6c479 100644
--- a/wxPython/wx/py/PyWrap.py
+++ b/wxPython/wx/py/PyWrap.py
@@ -1,3 +1,11 @@
-# Py is really located in the old namespace, but it doesn't need any
-# renaming done.
-from wxPython.py.PyWrap import *
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import PyWrap
+_rename(globals(), PyWrap.__dict__, modulename='py.PyWrap')
+del PyWrap
+del _rename
diff --git a/wxPython/wx/py/__init__.py b/wxPython/wx/py/__init__.py
index 7efc5e89c1..717d76b577 100644
--- a/wxPython/wx/py/__init__.py
+++ b/wxPython/wx/py/__init__.py
@@ -1,3 +1 @@
-# Py is really located in the old namespace, but it doesn't need any
-# renaming done.
-from wxPython.py import *
+# Python package
diff --git a/wxPython/wx/py/buffer.py b/wxPython/wx/py/buffer.py
new file mode 100644
index 0000000000..2ce26d4bcf
--- /dev/null
+++ b/wxPython/wx/py/buffer.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import buffer
+_rename(globals(), buffer.__dict__, modulename='py.buffer')
+del buffer
+del _rename
diff --git a/wxPython/wx/py/crust.py b/wxPython/wx/py/crust.py
new file mode 100644
index 0000000000..b0337c5ba2
--- /dev/null
+++ b/wxPython/wx/py/crust.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import crust
+_rename(globals(), crust.__dict__, modulename='py.crust')
+del crust
+del _rename
diff --git a/wxPython/wx/py/dispatcher.py b/wxPython/wx/py/dispatcher.py
new file mode 100644
index 0000000000..9ce9935b8e
--- /dev/null
+++ b/wxPython/wx/py/dispatcher.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import dispatcher
+_rename(globals(), dispatcher.__dict__, modulename='py.dispatcher')
+del dispatcher
+del _rename
diff --git a/wxPython/wx/py/document.py b/wxPython/wx/py/document.py
new file mode 100644
index 0000000000..93f4d87cc9
--- /dev/null
+++ b/wxPython/wx/py/document.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import document
+_rename(globals(), document.__dict__, modulename='py.document')
+del document
+del _rename
diff --git a/wxPython/wx/py/editor.py b/wxPython/wx/py/editor.py
new file mode 100644
index 0000000000..02cb8f1f91
--- /dev/null
+++ b/wxPython/wx/py/editor.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import editor
+_rename(globals(), editor.__dict__, modulename='py.editor')
+del editor
+del _rename
diff --git a/wxPython/wx/py/editwindow.py b/wxPython/wx/py/editwindow.py
new file mode 100644
index 0000000000..f2b8ea7791
--- /dev/null
+++ b/wxPython/wx/py/editwindow.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import editwindow
+_rename(globals(), editwindow.__dict__, modulename='py.editwindow')
+del editwindow
+del _rename
diff --git a/wxPython/wx/py/filling.py b/wxPython/wx/py/filling.py
new file mode 100644
index 0000000000..db99a47f47
--- /dev/null
+++ b/wxPython/wx/py/filling.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import filling
+_rename(globals(), filling.__dict__, modulename='py.filling')
+del filling
+del _rename
diff --git a/wxPython/wx/py/frame.py b/wxPython/wx/py/frame.py
new file mode 100644
index 0000000000..deefe71e62
--- /dev/null
+++ b/wxPython/wx/py/frame.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import frame
+_rename(globals(), frame.__dict__, modulename='py.frame')
+del frame
+del _rename
diff --git a/wxPython/wx/py/images.py b/wxPython/wx/py/images.py
new file mode 100644
index 0000000000..d877918209
--- /dev/null
+++ b/wxPython/wx/py/images.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import images
+_rename(globals(), images.__dict__, modulename='py.images')
+del images
+del _rename
diff --git a/wxPython/wx/py/interpreter.py b/wxPython/wx/py/interpreter.py
new file mode 100644
index 0000000000..b92a9870bf
--- /dev/null
+++ b/wxPython/wx/py/interpreter.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import interpreter
+_rename(globals(), interpreter.__dict__, modulename='py.interpreter')
+del interpreter
+del _rename
diff --git a/wxPython/wx/py/introspect.py b/wxPython/wx/py/introspect.py
new file mode 100644
index 0000000000..132b4fe32e
--- /dev/null
+++ b/wxPython/wx/py/introspect.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import introspect
+_rename(globals(), introspect.__dict__, modulename='py.introspect')
+del introspect
+del _rename
diff --git a/wxPython/wx/py/pseudo.py b/wxPython/wx/py/pseudo.py
new file mode 100644
index 0000000000..2d296bbd85
--- /dev/null
+++ b/wxPython/wx/py/pseudo.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import pseudo
+_rename(globals(), pseudo.__dict__, modulename='py.pseudo')
+del pseudo
+del _rename
diff --git a/wxPython/wx/py/shell.py b/wxPython/wx/py/shell.py
new file mode 100644
index 0000000000..e6422e31fc
--- /dev/null
+++ b/wxPython/wx/py/shell.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import shell
+_rename(globals(), shell.__dict__, modulename='py.shell')
+del shell
+del _rename
diff --git a/wxPython/wx/py/version.py b/wxPython/wx/py/version.py
new file mode 100644
index 0000000000..008691a6b1
--- /dev/null
+++ b/wxPython/wx/py/version.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import version
+_rename(globals(), version.__dict__, modulename='py.version')
+del version
+del _rename
diff --git a/wxPython/wx/stc.py b/wxPython/wx/stc.py
index cd9405e034..50a0e58d0e 100644
--- a/wxPython/wx/stc.py
+++ b/wxPython/wx/stc.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython import stc
-prefix.rename(d_new=globals(), d_old=stc.__dict__)
+_rename(globals(), stc.__dict__, modulename='stc')
 del stc
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/tools/XRCed/__init__.py b/wxPython/wx/tools/XRCed/__init__.py
new file mode 100644
index 0000000000..717d76b577
--- /dev/null
+++ b/wxPython/wx/tools/XRCed/__init__.py
@@ -0,0 +1 @@
+# Python package
diff --git a/wxPython/wx/tools/XRCed/encode_bitmaps.py b/wxPython/wx/tools/XRCed/encode_bitmaps.py
new file mode 100644
index 0000000000..5ddbb9836a
--- /dev/null
+++ b/wxPython/wx/tools/XRCed/encode_bitmaps.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools.XRCed import encode_bitmaps
+_rename(globals(), encode_bitmaps.__dict__, modulename='tools.XRCed.encode_bitmaps')
+del encode_bitmaps
+del _rename
diff --git a/wxPython/wx/tools/XRCed/globals.py b/wxPython/wx/tools/XRCed/globals.py
new file mode 100644
index 0000000000..c0a4fe93aa
--- /dev/null
+++ b/wxPython/wx/tools/XRCed/globals.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools.XRCed import globals
+_rename(globals(), globals.__dict__, modulename='tools.XRCed.globals')
+del globals
+del _rename
diff --git a/wxPython/wx/tools/XRCed/images.py b/wxPython/wx/tools/XRCed/images.py
new file mode 100644
index 0000000000..29c98de0b0
--- /dev/null
+++ b/wxPython/wx/tools/XRCed/images.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools.XRCed import images
+_rename(globals(), images.__dict__, modulename='tools.XRCed.images')
+del images
+del _rename
diff --git a/wxPython/wx/tools/XRCed/panel.py b/wxPython/wx/tools/XRCed/panel.py
new file mode 100644
index 0000000000..3d0c4e4066
--- /dev/null
+++ b/wxPython/wx/tools/XRCed/panel.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools.XRCed import panel
+_rename(globals(), panel.__dict__, modulename='tools.XRCed.panel')
+del panel
+del _rename
diff --git a/wxPython/wx/tools/XRCed/params.py b/wxPython/wx/tools/XRCed/params.py
new file mode 100644
index 0000000000..6f3e37bae7
--- /dev/null
+++ b/wxPython/wx/tools/XRCed/params.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools.XRCed import params
+_rename(globals(), params.__dict__, modulename='tools.XRCed.params')
+del params
+del _rename
diff --git a/wxPython/wx/tools/XRCed/tools.py b/wxPython/wx/tools/XRCed/tools.py
new file mode 100644
index 0000000000..87f9f1eee8
--- /dev/null
+++ b/wxPython/wx/tools/XRCed/tools.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools.XRCed import tools
+_rename(globals(), tools.__dict__, modulename='tools.XRCed.tools')
+del tools
+del _rename
diff --git a/wxPython/wx/tools/XRCed/tree.py b/wxPython/wx/tools/XRCed/tree.py
new file mode 100644
index 0000000000..5f05f2ef5e
--- /dev/null
+++ b/wxPython/wx/tools/XRCed/tree.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools.XRCed import tree
+_rename(globals(), tree.__dict__, modulename='tools.XRCed.tree')
+del tree
+del _rename
diff --git a/wxPython/wx/tools/XRCed/undo.py b/wxPython/wx/tools/XRCed/undo.py
new file mode 100644
index 0000000000..f8a9893f4d
--- /dev/null
+++ b/wxPython/wx/tools/XRCed/undo.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools.XRCed import undo
+_rename(globals(), undo.__dict__, modulename='tools.XRCed.undo')
+del undo
+del _rename
diff --git a/wxPython/wx/tools/XRCed/xrced.py b/wxPython/wx/tools/XRCed/xrced.py
new file mode 100644
index 0000000000..47b754b3ba
--- /dev/null
+++ b/wxPython/wx/tools/XRCed/xrced.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools.XRCed import xrced
+_rename(globals(), xrced.__dict__, modulename='tools.XRCed.xrced')
+del xrced
+del _rename
diff --git a/wxPython/wx/tools/XRCed/xxx.py b/wxPython/wx/tools/XRCed/xxx.py
new file mode 100644
index 0000000000..acb17c15b4
--- /dev/null
+++ b/wxPython/wx/tools/XRCed/xxx.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools.XRCed import xxx
+_rename(globals(), xxx.__dict__, modulename='tools.XRCed.xxx')
+del xxx
+del _rename
diff --git a/wxPython/wx/tools/__init__.py b/wxPython/wx/tools/__init__.py
new file mode 100644
index 0000000000..717d76b577
--- /dev/null
+++ b/wxPython/wx/tools/__init__.py
@@ -0,0 +1 @@
+# Python package
diff --git a/wxPython/wx/tools/dbg.py b/wxPython/wx/tools/dbg.py
new file mode 100644
index 0000000000..6cc262f8de
--- /dev/null
+++ b/wxPython/wx/tools/dbg.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools import dbg
+_rename(globals(), dbg.__dict__, modulename='tools.dbg')
+del dbg
+del _rename
diff --git a/wxPython/wx/tools/helpviewer.py b/wxPython/wx/tools/helpviewer.py
new file mode 100644
index 0000000000..98bd0e24ba
--- /dev/null
+++ b/wxPython/wx/tools/helpviewer.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools import helpviewer
+_rename(globals(), helpviewer.__dict__, modulename='tools.helpviewer')
+del helpviewer
+del _rename
diff --git a/wxPython/wx/tools/img2img.py b/wxPython/wx/tools/img2img.py
new file mode 100644
index 0000000000..f155a65450
--- /dev/null
+++ b/wxPython/wx/tools/img2img.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools import img2img
+_rename(globals(), img2img.__dict__, modulename='tools.img2img')
+del img2img
+del _rename
diff --git a/wxPython/wx/tools/img2png.py b/wxPython/wx/tools/img2png.py
new file mode 100644
index 0000000000..5967f8a7ec
--- /dev/null
+++ b/wxPython/wx/tools/img2png.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools import img2png
+_rename(globals(), img2png.__dict__, modulename='tools.img2png')
+del img2png
+del _rename
diff --git a/wxPython/wx/tools/img2py.py b/wxPython/wx/tools/img2py.py
new file mode 100644
index 0000000000..de1d5e2a58
--- /dev/null
+++ b/wxPython/wx/tools/img2py.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools import img2py
+_rename(globals(), img2py.__dict__, modulename='tools.img2py')
+del img2py
+del _rename
diff --git a/wxPython/wx/tools/img2xpm.py b/wxPython/wx/tools/img2xpm.py
new file mode 100644
index 0000000000..ec59eb7a76
--- /dev/null
+++ b/wxPython/wx/tools/img2xpm.py
@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools import img2xpm
+_rename(globals(), img2xpm.__dict__, modulename='tools.img2xpm')
+del img2xpm
+del _rename
diff --git a/wxPython/wx/wizard.py b/wxPython/wx/wizard.py
index c995db1257..393b30775a 100644
--- a/wxPython/wx/wizard.py
+++ b/wxPython/wx/wizard.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython import wizard
-prefix.rename(d_new=globals(), d_old=wizard.__dict__)
+_rename(globals(), wizard.__dict__, modulename='wizard')
 del wizard
-
-del prefix
-del wx
+del _rename
diff --git a/wxPython/wx/xrc.py b/wxPython/wx/xrc.py
index 55d84ea8d6..c775d49810 100644
--- a/wxPython/wx/xrc.py
+++ b/wxPython/wx/xrc.py
@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
-from wx import prefix
-
+from wx import _rename
 from wxPython import xrc
-prefix.rename(d_new=globals(), d_old=xrc.__dict__)
+_rename(globals(), xrc.__dict__, modulename='xrc')
 del xrc
-
-del prefix
-del wx
+del _rename