diff --git a/include/wx/module.h b/include/wx/module.h
index 993f765e0f..f139ddde12 100644
--- a/include/wx/module.h
+++ b/include/wx/module.h
@@ -54,14 +54,14 @@ public:
     static void RegisterModule(wxModule *module);
     static void RegisterModules();
     static bool InitializeModules();
-    static void CleanUpModules() { DoCleanUpModules(m_modules); }
+    static void CleanUpModules() { DoCleanUpModules(ms_modules); }
 
     // used by wxObjectLoader when unloading shared libs's
 
     static void UnregisterModule(wxModule *module);
 
 protected:
-    static wxModuleList m_modules;
+    static wxModuleList ms_modules;
 
     // the function to call from constructor of a deriving class add module
     // dependency which will be initialized before the module and unloaded
@@ -89,7 +89,7 @@ private:
 
     // cleanup the modules in the specified list (which may not contain all
     // modules if we're called during initialization because not all modules
-    // could be initialized) and also empty m_modules itself
+    // could be initialized) and also empty ms_modules itself
     static void DoCleanUpModules(const wxModuleList& modules);
 
     // resolve all named dependencies and add them to the normal m_dependencies
diff --git a/src/common/module.cpp b/src/common/module.cpp
index 994f3d8093..45a05d35ff 100644
--- a/src/common/module.cpp
+++ b/src/common/module.cpp
@@ -28,17 +28,17 @@ WX_DEFINE_LIST(wxModuleList)
 
 wxIMPLEMENT_ABSTRACT_CLASS(wxModule, wxObject)
 
-wxModuleList wxModule::m_modules;
+wxModuleList wxModule::ms_modules;
 
 void wxModule::RegisterModule(wxModule* module)
 {
     module->m_state = State_Registered;
-    m_modules.Append(module);
+    ms_modules.Append(module);
 }
 
 void wxModule::UnregisterModule(wxModule* module)
 {
-    m_modules.DeleteObject(module);
+    ms_modules.DeleteObject(module);
     delete module;
 }
 
@@ -101,7 +101,7 @@ bool wxModule::DoInitializeModule(wxModule *module,
         }
 
         // find the module in the registered modules list
-        for ( node = m_modules.GetFirst(); node; node = node->GetNext() )
+        for ( node = ms_modules.GetFirst(); node; node = node->GetNext() )
         {
             wxModule *moduleDep = node->GetData();
             if ( moduleDep->GetClassInfo() == cinfo )
@@ -146,7 +146,7 @@ bool wxModule::InitializeModules()
 {
     wxModuleList initializedModules;
 
-    for ( wxModuleList::compatibility_iterator node = m_modules.GetFirst();
+    for ( wxModuleList::compatibility_iterator node = ms_modules.GetFirst();
           node;
           node = node->GetNext() )
     {
@@ -168,7 +168,7 @@ bool wxModule::InitializeModules()
     }
 
     // remember the real initialisation order
-    m_modules = initializedModules;
+    ms_modules = initializedModules;
 
     return true;
 }
@@ -195,7 +195,7 @@ void wxModule::DoCleanUpModules(const wxModuleList& modules)
     }
 
     // clear all modules, even the non-initialized ones
-    WX_CLEAR_LIST(wxModuleList, m_modules);
+    WX_CLEAR_LIST(wxModuleList, ms_modules);
 }
 
 bool wxModule::ResolveNamedDependencies()