diff --git a/wxPython/src/windows3.i b/wxPython/src/windows3.i
index 5e1ce81add..29d371c13c 100644
--- a/wxPython/src/windows3.i
+++ b/wxPython/src/windows3.i
@@ -828,3 +828,11 @@ public:
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
+%init %{
+    // Map renamed classes back to their common name for OOR
+    wxPyPtrTypeMap_Add("wxHtmlListBox", "wxPyHtmlListBox");
+    wxPyPtrTypeMap_Add("wxVListBox", "wxPyVListBox");
+    wxPyPtrTypeMap_Add("wxVScrolledWindow", "wxPyVScrolledWindow");
+%}
+
+//----------------------------------------------------------------------