diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 45f8255b31..35946ef9e0 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -1690,7 +1690,7 @@ class wxPythonDemo(wx.Frame):
 
     def OnOpenWidgetInspector(self, evt):
         # Activate the widget inspection tool
-        from wx.lib.inspect import InspectionTool
+        from wx.lib.inspection import InspectionTool
         if not InspectionTool().initialized:
             InspectionTool().Init()
 
diff --git a/wxPython/demo/run.py b/wxPython/demo/run.py
index 5b1fffb091..b7b1a38ec0 100755
--- a/wxPython/demo/run.py
+++ b/wxPython/demo/run.py
@@ -18,7 +18,7 @@ on the command line.
 """
 
 import wx
-import wx.lib.mixins.inspect
+import wx.lib.mixins.inspection
 import sys, os
 
 # stuff for debugging
@@ -40,7 +40,7 @@ class Log:
     write = WriteText
 
 
-class RunDemoApp(wx.App, wx.lib.mixins.inspect.InspectionMixin):
+class RunDemoApp(wx.App, wx.lib.mixins.inspection.InspectionMixin):
     def __init__(self, name, module, useShell):
         self.name = name
         self.demoModule = module
diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index da9a5e03c4..56baa6b25f 100644
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -57,6 +57,11 @@ wx.lib.customtreectrl patches from Andrea:
   4. UnselectAll bug fixed.
 
 
+Renamed the wx.lib.inspect and wx.lib.mixins.inspect modules to
+inspection, in order to avoid conflicts with the inspect module in the
+standard Python library.
+
+
 
 
 
diff --git a/wxPython/tests/test_borders.py b/wxPython/tests/test_borders.py
index d20d63094e..2fdc754dff 100644
--- a/wxPython/tests/test_borders.py
+++ b/wxPython/tests/test_borders.py
@@ -34,8 +34,8 @@ class TestPanel(wx.Panel):
         self.Fit()
         
 
-import wx.lib.mixins.inspect
-class TestApp(wx.App, wx.lib.mixins.inspect.InspectionMixin):
+import wx.lib.mixins.inspection
+class TestApp(wx.App, wx.lib.mixins.inspection.InspectionMixin):
     pass
 
 app = TestApp(False)
diff --git a/wxPython/tests/test_griddrag.py b/wxPython/tests/test_griddrag.py
index cb77a60312..6a01296812 100644
--- a/wxPython/tests/test_griddrag.py
+++ b/wxPython/tests/test_griddrag.py
@@ -39,7 +39,7 @@ class TestFrame(wx.Frame):
         print "result = %d" % result
             
 
-from wx.lib.mixins.inspect import InspectableApp
+from wx.lib.mixins.inspection import InspectableApp
 
 app = InspectableApp(False)
 app.Init()
diff --git a/wxPython/wx/lib/inspect.py b/wxPython/wx/lib/inspection.py
similarity index 99%
rename from wxPython/wx/lib/inspect.py
rename to wxPython/wx/lib/inspection.py
index 2ce4d35edc..622d1168f5 100644
--- a/wxPython/wx/lib/inspect.py
+++ b/wxPython/wx/lib/inspection.py
@@ -1,5 +1,5 @@
 #----------------------------------------------------------------------------
-# Name:        wx.lib.inspect
+# Name:        wx.lib.inspection
 # Purpose:     A widget inspection tool that allows easy introspection of
 #              all the live widgets and sizers in an application.
 #
diff --git a/wxPython/wx/lib/mixins/inspect.py b/wxPython/wx/lib/mixins/inspection.py
similarity index 97%
rename from wxPython/wx/lib/mixins/inspect.py
rename to wxPython/wx/lib/mixins/inspection.py
index b6a5f82c61..1a364fa2e3 100644
--- a/wxPython/wx/lib/mixins/inspect.py
+++ b/wxPython/wx/lib/mixins/inspection.py
@@ -1,5 +1,5 @@
 #----------------------------------------------------------------------------
-# Name:        wx.lib.mixins.inspect
+# Name:        wx.lib.mixins.inspection
 # Purpose:     A mix-in class that can add PyCrust-based inspection of the
 #              app's widgets and sizers.
 #
@@ -15,7 +15,7 @@
 # wxPython-users mail list by Dan Eloff.
 
 import wx
-from wx.lib.inspect import InspectionTool
+from wx.lib.inspection import InspectionTool
 
 
 #----------------------------------------------------------------------------