diff --git a/wxPython/demo/wxArtProvider.py b/wxPython/demo/ArtProvider.py
similarity index 100%
rename from wxPython/demo/wxArtProvider.py
rename to wxPython/demo/ArtProvider.py
diff --git a/wxPython/demo/wxButton.py b/wxPython/demo/Button.py
similarity index 100%
rename from wxPython/demo/wxButton.py
rename to wxPython/demo/Button.py
diff --git a/wxPython/demo/wxCalendar.py b/wxPython/demo/Calendar.py
similarity index 100%
rename from wxPython/demo/wxCalendar.py
rename to wxPython/demo/Calendar.py
diff --git a/wxPython/demo/wxCalendarCtrl.py b/wxPython/demo/CalendarCtrl.py
similarity index 100%
rename from wxPython/demo/wxCalendarCtrl.py
rename to wxPython/demo/CalendarCtrl.py
diff --git a/wxPython/demo/wxCheckBox.py b/wxPython/demo/CheckBox.py
similarity index 100%
rename from wxPython/demo/wxCheckBox.py
rename to wxPython/demo/CheckBox.py
diff --git a/wxPython/demo/wxCheckListBox.py b/wxPython/demo/CheckListBox.py
similarity index 100%
rename from wxPython/demo/wxCheckListBox.py
rename to wxPython/demo/CheckListBox.py
diff --git a/wxPython/demo/wxChoice.py b/wxPython/demo/Choice.py
similarity index 100%
rename from wxPython/demo/wxChoice.py
rename to wxPython/demo/Choice.py
diff --git a/wxPython/demo/ColourDB.py b/wxPython/demo/ColourDB.py
index 39e35fb296..3db76c0a06 100644
--- a/wxPython/demo/ColourDB.py
+++ b/wxPython/demo/ColourDB.py
@@ -141,8 +141,8 @@ class TestWindow(wx.ScrolledWindow):
         dc.EndDrawing()
 
 
-# On wxGTK there needs to be a panel under wxScrolledWindows if they are
-# going to be in a wxNotebook. And, in the demo, we are.
+# On wxGTK there needs to be a panel under wx.ScrolledWindows if they are
+# going to be in a wxNotebook. And, in this demo, we are.
 class TestPanel(wx.Panel):
     def __init__(self, parent):
         wx.Panel.__init__(self, parent, -1)
diff --git a/wxPython/demo/wxColourDialog.py b/wxPython/demo/ColourDialog.py
similarity index 100%
rename from wxPython/demo/wxColourDialog.py
rename to wxPython/demo/ColourDialog.py
diff --git a/wxPython/demo/wxComboBox.py b/wxPython/demo/ComboBox.py
similarity index 100%
rename from wxPython/demo/wxComboBox.py
rename to wxPython/demo/ComboBox.py
diff --git a/wxPython/demo/wxDialog.py b/wxPython/demo/Dialog.py
similarity index 100%
rename from wxPython/demo/wxDialog.py
rename to wxPython/demo/Dialog.py
diff --git a/wxPython/demo/wxDirDialog.py b/wxPython/demo/DirDialog.py
similarity index 100%
rename from wxPython/demo/wxDirDialog.py
rename to wxPython/demo/DirDialog.py
diff --git a/wxPython/demo/wxDragImage.py b/wxPython/demo/DragImage.py
similarity index 100%
rename from wxPython/demo/wxDragImage.py
rename to wxPython/demo/DragImage.py
diff --git a/wxPython/demo/wxDynamicSashWindow.py b/wxPython/demo/DynamicSashWindow.py
similarity index 100%
rename from wxPython/demo/wxDynamicSashWindow.py
rename to wxPython/demo/DynamicSashWindow.py
diff --git a/wxPython/demo/wxEditableListBox.py b/wxPython/demo/EditableListBox.py
similarity index 100%
rename from wxPython/demo/wxEditableListBox.py
rename to wxPython/demo/EditableListBox.py
diff --git a/wxPython/demo/wxEditor.py b/wxPython/demo/Editor.py
similarity index 100%
rename from wxPython/demo/wxEditor.py
rename to wxPython/demo/Editor.py
diff --git a/wxPython/demo/wxFileDialog.py b/wxPython/demo/FileDialog.py
similarity index 100%
rename from wxPython/demo/wxFileDialog.py
rename to wxPython/demo/FileDialog.py
diff --git a/wxPython/demo/wxFileDialog_Save.py b/wxPython/demo/FileDialog_Save.py
similarity index 100%
rename from wxPython/demo/wxFileDialog_Save.py
rename to wxPython/demo/FileDialog_Save.py
diff --git a/wxPython/demo/wxFileHistory.py b/wxPython/demo/FileHistory.py
similarity index 100%
rename from wxPython/demo/wxFileHistory.py
rename to wxPython/demo/FileHistory.py
diff --git a/wxPython/demo/wxFindReplaceDialog.py b/wxPython/demo/FindReplaceDialog.py
similarity index 100%
rename from wxPython/demo/wxFindReplaceDialog.py
rename to wxPython/demo/FindReplaceDialog.py
diff --git a/wxPython/demo/wxFloatBar.py b/wxPython/demo/FloatBar.py
similarity index 100%
rename from wxPython/demo/wxFloatBar.py
rename to wxPython/demo/FloatBar.py
diff --git a/wxPython/demo/wxFontDialog.py b/wxPython/demo/FontDialog.py
similarity index 100%
rename from wxPython/demo/wxFontDialog.py
rename to wxPython/demo/FontDialog.py
diff --git a/wxPython/demo/wxFrame.py b/wxPython/demo/Frame.py
similarity index 100%
rename from wxPython/demo/wxFrame.py
rename to wxPython/demo/Frame.py
diff --git a/wxPython/demo/wxGLCanvas.py b/wxPython/demo/GLCanvas.py
similarity index 100%
rename from wxPython/demo/wxGLCanvas.py
rename to wxPython/demo/GLCanvas.py
diff --git a/wxPython/demo/wxGauge.py b/wxPython/demo/Gauge.py
similarity index 100%
rename from wxPython/demo/wxGauge.py
rename to wxPython/demo/Gauge.py
diff --git a/wxPython/demo/wxGenericDirCtrl.py b/wxPython/demo/GenericDirCtrl.py
similarity index 100%
rename from wxPython/demo/wxGenericDirCtrl.py
rename to wxPython/demo/GenericDirCtrl.py
diff --git a/wxPython/demo/wxGrid.py b/wxPython/demo/Grid.py
similarity index 100%
rename from wxPython/demo/wxGrid.py
rename to wxPython/demo/Grid.py
diff --git a/wxPython/demo/wxGridBagSizer.py b/wxPython/demo/GridBagSizer.py
similarity index 100%
rename from wxPython/demo/wxGridBagSizer.py
rename to wxPython/demo/GridBagSizer.py
diff --git a/wxPython/demo/wxGrid_MegaExample.py b/wxPython/demo/Grid_MegaExample.py
similarity index 100%
rename from wxPython/demo/wxGrid_MegaExample.py
rename to wxPython/demo/Grid_MegaExample.py
diff --git a/wxPython/demo/wxHtmlWindow.py b/wxPython/demo/HtmlWindow.py
similarity index 100%
rename from wxPython/demo/wxHtmlWindow.py
rename to wxPython/demo/HtmlWindow.py
diff --git a/wxPython/demo/wxIEHtmlWin.py b/wxPython/demo/IEHtmlWin.py
similarity index 100%
rename from wxPython/demo/wxIEHtmlWin.py
rename to wxPython/demo/IEHtmlWin.py
diff --git a/wxPython/demo/wxImage.py b/wxPython/demo/Image.py
similarity index 100%
rename from wxPython/demo/wxImage.py
rename to wxPython/demo/Image.py
diff --git a/wxPython/demo/wxImageFromStream.py b/wxPython/demo/ImageFromStream.py
similarity index 100%
rename from wxPython/demo/wxImageFromStream.py
rename to wxPython/demo/ImageFromStream.py
diff --git a/wxPython/demo/wxIntCtrl.py b/wxPython/demo/IntCtrl.py
similarity index 100%
rename from wxPython/demo/wxIntCtrl.py
rename to wxPython/demo/IntCtrl.py
diff --git a/wxPython/demo/wxJoystick.py b/wxPython/demo/Joystick.py
similarity index 100%
rename from wxPython/demo/wxJoystick.py
rename to wxPython/demo/Joystick.py
diff --git a/wxPython/demo/wxKeyEvents.py b/wxPython/demo/KeyEvents.py
similarity index 100%
rename from wxPython/demo/wxKeyEvents.py
rename to wxPython/demo/KeyEvents.py
diff --git a/wxPython/demo/wxLEDNumberCtrl.py b/wxPython/demo/LEDNumberCtrl.py
similarity index 100%
rename from wxPython/demo/wxLEDNumberCtrl.py
rename to wxPython/demo/LEDNumberCtrl.py
diff --git a/wxPython/demo/wxLayoutConstraints.py b/wxPython/demo/LayoutConstraints.py
similarity index 100%
rename from wxPython/demo/wxLayoutConstraints.py
rename to wxPython/demo/LayoutConstraints.py
diff --git a/wxPython/demo/wxListBox.py b/wxPython/demo/ListBox.py
similarity index 100%
rename from wxPython/demo/wxListBox.py
rename to wxPython/demo/ListBox.py
diff --git a/wxPython/demo/wxListCtrl.py b/wxPython/demo/ListCtrl.py
similarity index 100%
rename from wxPython/demo/wxListCtrl.py
rename to wxPython/demo/ListCtrl.py
diff --git a/wxPython/demo/wxListCtrl_virtual.py b/wxPython/demo/ListCtrl_virtual.py
similarity index 100%
rename from wxPython/demo/wxListCtrl_virtual.py
rename to wxPython/demo/ListCtrl_virtual.py
diff --git a/wxPython/demo/wxListbook.py b/wxPython/demo/Listbook.py
similarity index 100%
rename from wxPython/demo/wxListbook.py
rename to wxPython/demo/Listbook.py
diff --git a/wxPython/demo/MDIDemo.py b/wxPython/demo/MDIDemo.py
index ad86693e55..190b5a4a5e 100644
--- a/wxPython/demo/MDIDemo.py
+++ b/wxPython/demo/MDIDemo.py
@@ -8,9 +8,9 @@
 
 import  wx
 
-# Importing wxScrolledWindow demo to make use of the MyCanvas 
+# Importing ScrolledWindow demo to make use of the MyCanvas 
 # class defined within.
-import  wxScrolledWindow 
+import  ScrolledWindow 
 import  images
 
 SHOW_BACKGROUND = 1
@@ -53,7 +53,7 @@ class MyParentFrame(wx.MDIParentFrame):
     def OnNewWindow(self, evt):
         self.winCount = self.winCount + 1
         win = wx.MDIChildFrame(self, -1, "Child Window: %d" % self.winCount)
-        canvas = wxScrolledWindow.MyCanvas(win)
+        canvas = ScrolledWindow.MyCanvas(win)
         win.Show(True)
 
 
diff --git a/wxPython/demo/MDISashDemo.py b/wxPython/demo/MDISashDemo.py
index 00cdc3d684..99faae0913 100644
--- a/wxPython/demo/MDISashDemo.py
+++ b/wxPython/demo/MDISashDemo.py
@@ -7,7 +7,7 @@
 
 import wx
 
-import wxScrolledWindow
+import ScrolledWindow
 
 #----------------------------------------------------------------------
 # There are better ways to do IDs, but this demo requires that the window
@@ -135,7 +135,7 @@ class MyParentFrame(wx.MDIParentFrame):
     def OnNewWindow(self, evt):
         self.winCount = self.winCount + 1
         win = wx.MDIChildFrame(self, -1, "Child Window: %d" % self.winCount)
-        canvas = wxScrolledWindow.MyCanvas(win)
+        canvas = ScrolledWindow.MyCanvas(win)
         win.Show(True)
 
 
diff --git a/wxPython/demo/wxMDIWindows.py b/wxPython/demo/MDIWindows.py
similarity index 100%
rename from wxPython/demo/wxMDIWindows.py
rename to wxPython/demo/MDIWindows.py
diff --git a/wxPython/demo/wxMVCTree.py b/wxPython/demo/MVCTree.py
similarity index 100%
rename from wxPython/demo/wxMVCTree.py
rename to wxPython/demo/MVCTree.py
diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index bd75b35f5b..b6c623007a 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -29,154 +29,154 @@ import images
 _treeList = [
     # new stuff
     ('Recent Additions', [
-        'wxVListBox',
-        'wxListbook',
-        'wxMaskedNumCtrl',
+        'VListBox',
+        'Listbook',
+        'MaskedNumCtrl',
         'FloatCanvas',
-        'wxXmlResourceSubclass',
-        'wxGridBagSizer',
+        'XmlResourceSubclass',
+        'GridBagSizer',
         'Cursor',
         'PyPlot',
         ]),
 
     # managed windows == things with a (optional) caption you can close
     ('Base Frames and Dialogs', [
-        'wxDialog',
-        'wxFrame',
-        'wxMDIWindows',
-        'wxMiniFrame',
-        'wxWizard',
+        'Dialog',
+        'Frame',
+        'MDIWindows',
+        'MiniFrame',
+        'Wizard',
         ]),
 
     # the common dialogs
     ('Common Dialogs', [
-        'wxColourDialog',
-        'wxDirDialog',
-        'wxFileDialog',
-        'wxFileDialog_Save',
-        'wxFindReplaceDialog',
-        'wxFontDialog',
-        'wxMessageDialog',
-        'wxPageSetupDialog',
-        'wxPrintDialog',
-        'wxProgressDialog',
-        'wxSingleChoiceDialog',
-        'wxTextEntryDialog',
+        'ColourDialog',
+        'DirDialog',
+        'FileDialog',
+        'FileDialog_Save',
+        'FindReplaceDialog',
+        'FontDialog',
+        'MessageDialog',
+        'PageSetupDialog',
+        'PrintDialog',
+        'ProgressDialog',
+        'SingleChoiceDialog',
+        'TextEntryDialog',
         ]),
 
     # dialogs from libraries
     ('More Dialogs', [
         'ErrorDialogs',
         'ImageBrowser',
-        'wxMultipleChoiceDialog',
-        'wxScrolledMessageDialog',
+        'MultipleChoiceDialog',
+        'ScrolledMessageDialog',
         ]),
 
     # core controls
     ('Core Windows/Controls', [
+        'Button',
+        'CheckBox',
+        'CheckListBox',
+        'Choice',
+        'ComboBox',
+        'Gauge',
+        'Grid',
+        'Grid_MegaExample',
+        'ListBox',
+        'ListCtrl',
+        'ListCtrl_virtual',
+        'Listbook',
+        'Menu',
+        'Notebook',
         'PopupMenu',
-        'wxButton',
-        'wxCheckBox',
-        'wxCheckListBox',
-        'wxChoice',
-        'wxComboBox',
-        'wxGauge',
-        'wxGrid',
-        'wxGrid_MegaExample',
-        'wxListbook',
-        'wxListBox',
-        'wxListCtrl',
-        'wxListCtrl_virtual',
-        'wxMenu',
-        'wxNotebook',
-        'wxPopupWindow',
-        'wxRadioBox',
-        'wxRadioButton',
-        'wxSashWindow',
-        'wxScrolledWindow',
-        'wxSlider',
-        'wxSpinButton',
-        'wxSpinCtrl',
-        'wxSplitterWindow',
-        'wxStaticBitmap',
-        'wxStaticText',
-        'wxStatusBar',
-        'wxTextCtrl',
-        'wxToggleButton',
-        'wxToolBar',
-        'wxTreeCtrl',
-        'wxValidator',
+        'PopupWindow',
+        'RadioBox',
+        'RadioButton',
+        'SashWindow',
+        'ScrolledWindow',
+        'Slider',
+        'SpinButton',
+        'SpinCtrl',
+        'SplitterWindow',
+        'StaticBitmap',
+        'StaticText',
+        'StatusBar',
+        'TextCtrl',
+        'ToggleButton',
+        'ToolBar',
+        'TreeCtrl',
+        'Validator',
         ]),
 
     ('Custom Controls', [
         'AnalogClockWindow',
         'ColourSelect',
+        'Editor',
         'GenericButtons',
-        'wxEditor',
-        'wxGenericDirCtrl',
-        'wxLEDNumberCtrl',
-        'wxMultiSash',
-        'wxPopupControl',
-        'wxPyColourChooser',
-        'wxTreeListCtrl',
+        'GenericDirCtrl',
+        'LEDNumberCtrl',
+        'MultiSash',
+        'PopupControl',
+        'PyColourChooser',
+        'TreeListCtrl',
     ]),
     
     # controls coming from other libraries
     ('More Windows/Controls', [
-        #'wxFloatBar',          deprecated
-        #'wxMVCTree',           deprecated
-        #'wxRightTextCtrl',     deprecated as we have wxTE_RIGHT now.
+        #'RightTextCtrl',     deprecated as we have wxTE_RIGHT now.
+        'Calendar',
+        'CalendarCtrl',
         'ContextHelp',
+        'DynamicSashWindow',
+        'EditableListBox',
         'FancyText',
-        'FloatCanvas',
         'FileBrowseButton',
+        'FloatBar',  
+        'FloatCanvas',
+        'HtmlWindow',
+        'IEHtmlWin',
+        'IntCtrl',
+        'MVCTree',   
         'MaskedEditControls',
-        'PyShell',
+        'MaskedNumCtrl',
+        'MimeTypesManager',
         'PyCrust',
         'PyPlot',
+        'PyShell',
+        'ScrolledPanel',
         'SplitTree',
+        'StyledTextCtrl_1',
+        'StyledTextCtrl_2',
         'TablePrint',
         'Throbber',
-        'wxCalendar',
-        'wxCalendarCtrl',
-        'wxDynamicSashWindow',
-        'wxEditableListBox',
-        'wxHtmlWindow',
-        'wxIEHtmlWin',
-        'wxIntCtrl',
-        'wxMimeTypesManager',
-        'wxMaskedNumCtrl',
-        'wxScrolledPanel',
-        'wxStyledTextCtrl_1',
-        'wxStyledTextCtrl_2',
-        'wxTimeCtrl',
-        'wxVListBox',
+        'TimeCtrl',
+        'VListBox',
         ]),
 
     # How to lay out the controls in a frame/dialog
     ('Window Layout', [
+        'GridBagSizer',
         'LayoutAnchors',
+        'LayoutConstraints',
         'Layoutf',
         'RowColSizer',
+        'ScrolledPanel',
         'Sizers',
-        'wxGridBagSizer',
-        'wxLayoutConstraints',
-        'wxScrolledPanel',
-        'wxXmlResource',
-        'wxXmlResourceHandler',
-        'wxXmlResourceSubclass',
+        'XmlResource',
+        'XmlResourceHandler',
+        'XmlResourceSubclass',
         ]),
 
     # ditto
     ('Process and Events', [
         'EventManager',
-        'infoframe',
+        'KeyEvents',
         'OOR',
+        'Process',
         'PythonEvents',
         'Threads',
-        'wxKeyEvents',
-        'wxProcess',
-        'wxTimer',
+        'Timer',
+        'infoframe',
         ]),
 
     # Clipboard and DnD
@@ -188,13 +188,13 @@ _treeList = [
 
     # Images
     ('Using Images', [
+        'ArtProvider',
         'Cursor',
+        'DragImage',
+        'Image',
+        'ImageFromStream',
+        'Mask',
         'Throbber',
-        'wxArtProvider',
-        'wxDragImage',
-        'wxImage',
-        'wxImageFromStream',
-        'wxMask',
         ]),
 
     # Other stuff
@@ -202,24 +202,24 @@ _treeList = [
         'ColourDB',
         'DialogUnits',
         'DrawXXXList',
+        'FileHistory',
         'FontEnumerator',
+        'Joystick',
         'NewNamespace',
+        'OGL',
         'PrintFramework',
         'ShapedWindow',
         'Throbber',
         'Unicode',
-        'wxFileHistory',
-        'wxJoystick',
-        'wxOGL',
-        'wxWave',
+        'Wave',
         ]),
 
     # need libs not coming with the demo
     ('Objects using an external library', [
         'ActiveXWrapper_Acrobat',
         'ActiveXWrapper_IE',
-        'wxGLCanvas',
-        #'wxPlotCanvas', # deprecated, use PyPlot
+        'GLCanvas',
+        #'PlotCanvas', # deprecated, use PyPlot
         ]),
 
 
@@ -253,14 +253,14 @@ class MyTP(wx.PyTipProvider):
 
 #---------------------------------------------------------------------------
 # A class to be used to display source code in the demo.  Try using the
-# wxSTC in the wxStyledTextCtrl_2 sample first, fall back to wxTextCtrl
+# wxSTC in the StyledTextCtrl_2 sample first, fall back to wxTextCtrl
 # if there is an error, such as the stc module not being present.
 #
 
 try:
     ##raise ImportError
     from wx import stc
-    from wxStyledTextCtrl_2 import PythonSTC
+    from StyledTextCtrl_2 import PythonSTC
     class DemoCodeViewer(PythonSTC):
         def __init__(self, parent, ID):
             PythonSTC.__init__(self, parent, ID)
diff --git a/wxPython/demo/wxMask.py b/wxPython/demo/Mask.py
similarity index 98%
rename from wxPython/demo/wxMask.py
rename to wxPython/demo/Mask.py
index ad35dfd9b5..8d5a43c58b 100644
--- a/wxPython/demo/wxMask.py
+++ b/wxPython/demo/Mask.py
@@ -95,7 +95,7 @@ class TestMaskWindow(wx.ScrolledWindow):
             i = i + 1
 
 
-# On wxGTK there needs to be a panel under wxScrolledWindows if they are
+# On wxGTK there needs to be a panel under wx.ScrolledWindows if they are
 # going to be in a wxNotebook...
 class TestPanel(wx.Panel):
     def __init__(self, parent, ID):
diff --git a/wxPython/demo/wxMaskedNumCtrl.py b/wxPython/demo/MaskedNumCtrl.py
similarity index 100%
rename from wxPython/demo/wxMaskedNumCtrl.py
rename to wxPython/demo/MaskedNumCtrl.py
diff --git a/wxPython/demo/wxMenu.py b/wxPython/demo/Menu.py
similarity index 100%
rename from wxPython/demo/wxMenu.py
rename to wxPython/demo/Menu.py
diff --git a/wxPython/demo/wxMessageDialog.py b/wxPython/demo/MessageDialog.py
similarity index 100%
rename from wxPython/demo/wxMessageDialog.py
rename to wxPython/demo/MessageDialog.py
diff --git a/wxPython/demo/wxMimeTypesManager.py b/wxPython/demo/MimeTypesManager.py
similarity index 100%
rename from wxPython/demo/wxMimeTypesManager.py
rename to wxPython/demo/MimeTypesManager.py
diff --git a/wxPython/demo/wxMiniFrame.py b/wxPython/demo/MiniFrame.py
similarity index 100%
rename from wxPython/demo/wxMiniFrame.py
rename to wxPython/demo/MiniFrame.py
diff --git a/wxPython/demo/wxMultiSash.py b/wxPython/demo/MultiSash.py
similarity index 100%
rename from wxPython/demo/wxMultiSash.py
rename to wxPython/demo/MultiSash.py
diff --git a/wxPython/demo/wxMultipleChoiceDialog.py b/wxPython/demo/MultipleChoiceDialog.py
similarity index 100%
rename from wxPython/demo/wxMultipleChoiceDialog.py
rename to wxPython/demo/MultipleChoiceDialog.py
diff --git a/wxPython/demo/wxNotebook.py b/wxPython/demo/Notebook.py
similarity index 96%
rename from wxPython/demo/wxNotebook.py
rename to wxPython/demo/Notebook.py
index 2b6b72315b..c9740ce678 100644
--- a/wxPython/demo/wxNotebook.py
+++ b/wxPython/demo/Notebook.py
@@ -9,8 +9,8 @@ import  wx
 
 import  ColorPanel
 import  GridSimple
-import  wxListCtrl
-import  wxScrolledWindow
+import  ListCtrl
+import  ScrolledWindow
 import  images
 
 #----------------------------------------------------------------------------
@@ -49,7 +49,7 @@ class TestNB(wx.Notebook):
         win = self.makeColorPanel(wx.RED)
         self.AddPage(win, "Red")
 
-        win = wxScrolledWindow.MyCanvas(self)
+        win = ScrolledWindow.MyCanvas(self)
         self.AddPage(win, 'ScrolledWindow')
 
         win = self.makeColorPanel(wx.GREEN)
@@ -58,7 +58,7 @@ class TestNB(wx.Notebook):
         win = GridSimple.SimpleGrid(self, log)
         self.AddPage(win, "Grid")
 
-        win = wxListCtrl.TestListCtrlPanel(self, log)
+        win = ListCtrl.TestListCtrlPanel(self, log)
         self.AddPage(win, 'List')
 
         win = self.makeColorPanel(wx.CYAN)
diff --git a/wxPython/demo/wxOGL.py b/wxPython/demo/OGL.py
similarity index 100%
rename from wxPython/demo/wxOGL.py
rename to wxPython/demo/OGL.py
diff --git a/wxPython/demo/wxPageSetupDialog.py b/wxPython/demo/PageSetupDialog.py
similarity index 100%
rename from wxPython/demo/wxPageSetupDialog.py
rename to wxPython/demo/PageSetupDialog.py
diff --git a/wxPython/demo/wxPlotCanvas.py b/wxPython/demo/PlotCanvas.py
similarity index 100%
rename from wxPython/demo/wxPlotCanvas.py
rename to wxPython/demo/PlotCanvas.py
diff --git a/wxPython/demo/wxPopupControl.py b/wxPython/demo/PopupControl.py
similarity index 100%
rename from wxPython/demo/wxPopupControl.py
rename to wxPython/demo/PopupControl.py
diff --git a/wxPython/demo/wxPopupWindow.py b/wxPython/demo/PopupWindow.py
similarity index 100%
rename from wxPython/demo/wxPopupWindow.py
rename to wxPython/demo/PopupWindow.py
diff --git a/wxPython/demo/wxPrintDialog.py b/wxPython/demo/PrintDialog.py
similarity index 100%
rename from wxPython/demo/wxPrintDialog.py
rename to wxPython/demo/PrintDialog.py
diff --git a/wxPython/demo/PrintFramework.py b/wxPython/demo/PrintFramework.py
index ce6c1ff603..ac9d3a1c57 100644
--- a/wxPython/demo/PrintFramework.py
+++ b/wxPython/demo/PrintFramework.py
@@ -6,7 +6,7 @@
 #
 
 import  wx
-import  wxScrolledWindow
+import  ScrolledWindow
 
 #----------------------------------------------------------------------
 
@@ -108,7 +108,7 @@ class TestPrintPanel(wx.Panel):
         self.printData.SetPaperId(wx.PAPER_LETTER)
 
         self.box = wx.BoxSizer(wx.VERTICAL)
-        self.canvas = wxScrolledWindow.MyCanvas(self)
+        self.canvas = ScrolledWindow.MyCanvas(self)
         self.box.Add(self.canvas, 1, wx.GROW)
 
         subbox = wx.BoxSizer(wx.HORIZONTAL)
diff --git a/wxPython/demo/wxProcess.py b/wxPython/demo/Process.py
similarity index 100%
rename from wxPython/demo/wxProcess.py
rename to wxPython/demo/Process.py
diff --git a/wxPython/demo/wxProgressDialog.py b/wxPython/demo/ProgressDialog.py
similarity index 100%
rename from wxPython/demo/wxProgressDialog.py
rename to wxPython/demo/ProgressDialog.py
diff --git a/wxPython/demo/wxPyColourChooser.py b/wxPython/demo/PyColourChooser.py
similarity index 100%
rename from wxPython/demo/wxPyColourChooser.py
rename to wxPython/demo/PyColourChooser.py
diff --git a/wxPython/demo/wxRadioBox.py b/wxPython/demo/RadioBox.py
similarity index 100%
rename from wxPython/demo/wxRadioBox.py
rename to wxPython/demo/RadioBox.py
diff --git a/wxPython/demo/wxRadioButton.py b/wxPython/demo/RadioButton.py
similarity index 100%
rename from wxPython/demo/wxRadioButton.py
rename to wxPython/demo/RadioButton.py
diff --git a/wxPython/demo/wxRightTextCtrl.py b/wxPython/demo/RightTextCtrl.py
similarity index 100%
rename from wxPython/demo/wxRightTextCtrl.py
rename to wxPython/demo/RightTextCtrl.py
diff --git a/wxPython/demo/wxSashWindow.py b/wxPython/demo/SashWindow.py
similarity index 100%
rename from wxPython/demo/wxSashWindow.py
rename to wxPython/demo/SashWindow.py
diff --git a/wxPython/demo/wxScrolledMessageDialog.py b/wxPython/demo/ScrolledMessageDialog.py
similarity index 100%
rename from wxPython/demo/wxScrolledMessageDialog.py
rename to wxPython/demo/ScrolledMessageDialog.py
diff --git a/wxPython/demo/wxScrolledPanel.py b/wxPython/demo/ScrolledPanel.py
similarity index 95%
rename from wxPython/demo/wxScrolledPanel.py
rename to wxPython/demo/ScrolledPanel.py
index c9fa69e05d..947051cf1a 100644
--- a/wxPython/demo/wxScrolledPanel.py
+++ b/wxPython/demo/ScrolledPanel.py
@@ -30,7 +30,7 @@ class TestPanel(scrolled.ScrolledPanel):
 
         vbox = wx.BoxSizer(wx.VERTICAL)
         desc = wx.StaticText(self, -1,
-                            "ScrolledPanel extends wxScrolledWindow, adding all "
+                            "ScrolledPanel extends wx.ScrolledWindow, adding all "
                             "the necessary bits to set up scroll handling for you.\n\n"
                             "Here are three fixed size examples of its use. The "
                             "demo panel for this sample is also using it -- the \nwxStaticLine"
@@ -118,9 +118,9 @@ def runTest(frame, nb, log):
 
 
 overview = """<html><body>
-ScrolledPanel fills a "hole" in the implementation of wxScrolledWindow,
+ScrolledPanel fills a "hole" in the implementation of wx.ScrolledWindow,
 providing automatic scrollbar and scrolling behavior and the tab traversal
-mangement that wxScrolledWindow lacks.
+mangement that wx.ScrolledWindow lacks.
 </body></html>
 """
 
diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/ScrolledWindow.py
similarity index 99%
rename from wxPython/demo/wxScrolledWindow.py
rename to wxPython/demo/ScrolledWindow.py
index 753835e374..411d73aee7 100644
--- a/wxPython/demo/wxScrolledWindow.py
+++ b/wxPython/demo/ScrolledWindow.py
@@ -199,7 +199,7 @@ class MyCanvas(wx.ScrolledWindow):
 
 
 ## This is an example of what to do for the EVT_MOUSEWHEEL event,
-## but since wxScrolledWindow does this already it's not
+## but since wx.ScrolledWindow does this already it's not
 ## necessary to do it ourselves. You would need to add an event table 
 ## entry to __init__() to direct wheelmouse events to this handler.
 
diff --git a/wxPython/demo/wxSingleChoiceDialog.py b/wxPython/demo/SingleChoiceDialog.py
similarity index 100%
rename from wxPython/demo/wxSingleChoiceDialog.py
rename to wxPython/demo/SingleChoiceDialog.py
diff --git a/wxPython/demo/wxSlider.py b/wxPython/demo/Slider.py
similarity index 100%
rename from wxPython/demo/wxSlider.py
rename to wxPython/demo/Slider.py
diff --git a/wxPython/demo/wxSpinButton.py b/wxPython/demo/SpinButton.py
similarity index 100%
rename from wxPython/demo/wxSpinButton.py
rename to wxPython/demo/SpinButton.py
diff --git a/wxPython/demo/wxSpinCtrl.py b/wxPython/demo/SpinCtrl.py
similarity index 100%
rename from wxPython/demo/wxSpinCtrl.py
rename to wxPython/demo/SpinCtrl.py
diff --git a/wxPython/demo/wxSplitterWindow.py b/wxPython/demo/SplitterWindow.py
similarity index 100%
rename from wxPython/demo/wxSplitterWindow.py
rename to wxPython/demo/SplitterWindow.py
diff --git a/wxPython/demo/wxStaticBitmap.py b/wxPython/demo/StaticBitmap.py
similarity index 100%
rename from wxPython/demo/wxStaticBitmap.py
rename to wxPython/demo/StaticBitmap.py
diff --git a/wxPython/demo/wxStaticText.py b/wxPython/demo/StaticText.py
similarity index 100%
rename from wxPython/demo/wxStaticText.py
rename to wxPython/demo/StaticText.py
diff --git a/wxPython/demo/wxStatusBar.py b/wxPython/demo/StatusBar.py
similarity index 100%
rename from wxPython/demo/wxStatusBar.py
rename to wxPython/demo/StatusBar.py
diff --git a/wxPython/demo/wxStyledTextCtrl_1.py b/wxPython/demo/StyledTextCtrl_1.py
similarity index 100%
rename from wxPython/demo/wxStyledTextCtrl_1.py
rename to wxPython/demo/StyledTextCtrl_1.py
diff --git a/wxPython/demo/wxStyledTextCtrl_2.py b/wxPython/demo/StyledTextCtrl_2.py
similarity index 100%
rename from wxPython/demo/wxStyledTextCtrl_2.py
rename to wxPython/demo/StyledTextCtrl_2.py
diff --git a/wxPython/demo/wxTextCtrl.py b/wxPython/demo/TextCtrl.py
similarity index 100%
rename from wxPython/demo/wxTextCtrl.py
rename to wxPython/demo/TextCtrl.py
diff --git a/wxPython/demo/wxTextEntryDialog.py b/wxPython/demo/TextEntryDialog.py
similarity index 100%
rename from wxPython/demo/wxTextEntryDialog.py
rename to wxPython/demo/TextEntryDialog.py
diff --git a/wxPython/demo/wxTimeCtrl.py b/wxPython/demo/TimeCtrl.py
similarity index 100%
rename from wxPython/demo/wxTimeCtrl.py
rename to wxPython/demo/TimeCtrl.py
diff --git a/wxPython/demo/wxTimer.py b/wxPython/demo/Timer.py
similarity index 100%
rename from wxPython/demo/wxTimer.py
rename to wxPython/demo/Timer.py
diff --git a/wxPython/demo/wxToggleButton.py b/wxPython/demo/ToggleButton.py
similarity index 100%
rename from wxPython/demo/wxToggleButton.py
rename to wxPython/demo/ToggleButton.py
diff --git a/wxPython/demo/wxToolBar.py b/wxPython/demo/ToolBar.py
similarity index 100%
rename from wxPython/demo/wxToolBar.py
rename to wxPython/demo/ToolBar.py
diff --git a/wxPython/demo/wxTreeCtrl.py b/wxPython/demo/TreeCtrl.py
similarity index 100%
rename from wxPython/demo/wxTreeCtrl.py
rename to wxPython/demo/TreeCtrl.py
diff --git a/wxPython/demo/wxTreeListCtrl.py b/wxPython/demo/TreeListCtrl.py
similarity index 100%
rename from wxPython/demo/wxTreeListCtrl.py
rename to wxPython/demo/TreeListCtrl.py
diff --git a/wxPython/demo/wxVListBox.py b/wxPython/demo/VListBox.py
similarity index 100%
rename from wxPython/demo/wxVListBox.py
rename to wxPython/demo/VListBox.py
diff --git a/wxPython/demo/wxValidator.py b/wxPython/demo/Validator.py
similarity index 100%
rename from wxPython/demo/wxValidator.py
rename to wxPython/demo/Validator.py
diff --git a/wxPython/demo/wxWave.py b/wxPython/demo/Wave.py
similarity index 100%
rename from wxPython/demo/wxWave.py
rename to wxPython/demo/Wave.py
diff --git a/wxPython/demo/wxWizard.py b/wxPython/demo/Wizard.py
similarity index 100%
rename from wxPython/demo/wxWizard.py
rename to wxPython/demo/Wizard.py
diff --git a/wxPython/demo/wxXmlResource.py b/wxPython/demo/XmlResource.py
similarity index 100%
rename from wxPython/demo/wxXmlResource.py
rename to wxPython/demo/XmlResource.py
diff --git a/wxPython/demo/wxXmlResourceHandler.py b/wxPython/demo/XmlResourceHandler.py
similarity index 100%
rename from wxPython/demo/wxXmlResourceHandler.py
rename to wxPython/demo/XmlResourceHandler.py
diff --git a/wxPython/demo/wxXmlResourceSubclass.py b/wxPython/demo/XmlResourceSubclass.py
similarity index 96%
rename from wxPython/demo/wxXmlResourceSubclass.py
rename to wxPython/demo/XmlResourceSubclass.py
index f587ba9275..4fc5a275c4 100644
--- a/wxPython/demo/wxXmlResourceSubclass.py
+++ b/wxPython/demo/XmlResourceSubclass.py
@@ -15,7 +15,7 @@ resourceText = r'''<?xml version="1.0"?>
      subclass is specified as "moduleName.ClassName"  Try changing
      the classname to one that does not exist and see what happens -->
 
-<object class="wxPanel" subclass="wxXmlResourceSubclass.MyBluePanel" name="MyPanel">
+<object class="wxPanel" subclass="XmlResourceSubclass.MyBluePanel" name="MyPanel">
     <size>200,100</size>
     <object class="wxStaticText" name="label1">
         <label>This blue panel is a class derived from wxPanel
@@ -31,8 +31,8 @@ and is loaded by a using a subclass attribute of the object tag.</label>
 class MyBluePanel(wx.Panel):
     def __init__(self):
         p = wx.PrePanel()
+        # the Create step is done by XRC.
         self.PostCreate(p)
-
         self.Bind(wx.EVT_WINDOW_CREATE, self.OnCreate)
         
     def OnCreate(self, evt):
diff --git a/wxPython/demo/pyfiles.tgz b/wxPython/demo/pyfiles.tgz
new file mode 100644
index 0000000000..3ce3fd61ff
Binary files /dev/null and b/wxPython/demo/pyfiles.tgz differ