diff --git a/wxPython/include/wx/wxPython/wxPython_int.h b/wxPython/include/wx/wxPython/wxPython_int.h
index f942120404..59788453de 100644
--- a/wxPython/include/wx/wxPython/wxPython_int.h
+++ b/wxPython/include/wx/wxPython/wxPython_int.h
@@ -1828,7 +1828,7 @@ extern wxPyApp *wxPythonApp;
             ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OO)",        \
                                          obj, s));                              \
             if (ro) {                                                           \
-                wxPyConvertSwigPtr(ro, (void **)&rval, wxT("wxFSFILE"));        \
+                wxPyConvertSwigPtr(ro, (void **)&rval, wxT("wxFSFile"));        \
                 Py_DECREF(ro);                                                  \
             }                                                                   \
             Py_DECREF(obj);                                                     \
diff --git a/wxPython/wxPython/lib/popupctl.py b/wxPython/wxPython/lib/popupctl.py
index 64b618bc55..4e4cf71259 100644
--- a/wxPython/wxPython/lib/popupctl.py
+++ b/wxPython/wxPython/lib/popupctl.py
@@ -7,7 +7,6 @@ import wx.lib.popupctl
 __doc__ =  wx.lib.popupctl.__doc__
 
 PopButton = wx.lib.popupctl.PopButton
-wxPopupControl = wx.lib.popupctl.wxPopupControl
-wxPopupCtrl = wx.lib.popupctl.PopupCtrl
-wxPopupControl = wx.lib.popupctl.PopupControl
 wxPopupDialog = wx.lib.popupctl.PopupDialog
+wxPopupControl = wx.lib.popupctl.PopupControl
+wxPopupCtrl = wx.lib.popupctl.PopupCtrl