diff --git a/common/gbr_metadata.cpp b/common/gbr_metadata.cpp
index 97c7f2e298..d80d7a09d8 100644
--- a/common/gbr_metadata.cpp
+++ b/common/gbr_metadata.cpp
@@ -519,7 +519,7 @@ std::string FormatStringToGerber( const wxString& aString )
 }
 
 // Netname and Pan num fields cannot be empty in Gerber files
-// m_Normalized names must be used, if any
+// Normalized names must be used, if any
 #define NO_NET_NAME wxT( "N/C" )    // net name of not connected pads (one pad net) (normalized)
 #define NO_PAD_NAME wxT( "" )       // pad name of pads without pad name/number (not normalized)
 
diff --git a/eeschema/symbol_tree_synchronizing_adapter.cpp b/eeschema/symbol_tree_synchronizing_adapter.cpp
index 22b531ef03..d81c5edce6 100644
--- a/eeschema/symbol_tree_synchronizing_adapter.cpp
+++ b/eeschema/symbol_tree_synchronizing_adapter.cpp
@@ -262,7 +262,7 @@ bool SYMBOL_TREE_SYNCHRONIZING_ADAPTER::GetAttr( wxDataViewItem const& aItem, un
 #ifdef __WXGTK__
         // The native wxGTK+ impl ignores background colour, so set the text colour instead.
         // This works reasonably well in dark themes, and quite poorly in light ones....
-        if( node->Name == m_libMgr->GetCurrentLib() )
+        if( node->m_Name == m_libMgr->GetCurrentLib() )
             aAttr.SetColour( wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT ) );
 #else
         // mark the current library with background color
@@ -284,7 +284,7 @@ bool SYMBOL_TREE_SYNCHRONIZING_ADAPTER::GetAttr( wxDataViewItem const& aItem, un
 #ifdef __WXGTK__
         // The native wxGTK+ impl ignores background colour, so set the text colour instead.
         // This works reasonably well in dark themes, and quite poorly in light ones....
-        if( node->LibId == m_libMgr->GetCurrentLibId() )
+        if( node->m_LibId == m_libMgr->GetCurrentLibId() )
             aAttr.SetColour( wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT ) );
 #else
         // mark the current part with background color
diff --git a/include/env_paths.h b/include/env_paths.h
index 0e0e0e0912..a27fbcc7ca 100644
--- a/include/env_paths.h
+++ b/include/env_paths.h
@@ -33,7 +33,7 @@
  * @param aFilePath is the full file path (path and file name) to be normalized.
  * @param aEnvVars is an optional map of environmental variables to try substition with.
  * @param aProject is an optional project, to normalize the file path to the project path.
- * @return m_Normalized full file path (path and file name) if succeeded or empty string if the
+ * @return Normalized full file path (path and file name) if succeeded or empty string if the
  *          path could not be normalized.
  */
 wxString NormalizePath( const wxFileName& aFilePath, const ENV_VAR_MAP* aEnvVars,
@@ -45,7 +45,7 @@ wxString NormalizePath( const wxFileName& aFilePath, const ENV_VAR_MAP* aEnvVars
  * @param aFilePath is the full file path (path and file name) to be normalized.
  * @param aEnvVars is an optional map of environmental variables to try substition with.
  * @param aProjectPath is an optional string to normalize the file path to the project path.
- * @return m_Normalized full file path (path and file name) if succeeded or empty string if the
+ * @return Normalized full file path (path and file name) if succeeded or empty string if the
  *          path could not be normalized.
  */
 wxString NormalizePath(
diff --git a/pcbnew/autorouter/ar_autoplacer.cpp b/pcbnew/autorouter/ar_autoplacer.cpp
index 638e0d1544..9680a313af 100644
--- a/pcbnew/autorouter/ar_autoplacer.cpp
+++ b/pcbnew/autorouter/ar_autoplacer.cpp
@@ -649,7 +649,7 @@ int AR_AUTOPLACER::getOptimalModulePlacement(MODULE* aModule)
     fpBBox.SetOrigin( fpBBoxOrg + m_curPosition );
 
     min_cost = -1.0;
-//    m_frame->SetStatusText( wxT( "m_Score ??, pos ??" ) );
+//    m_frame->SetStatusText( wxT( "Score ??, pos ??" ) );
 
 
     for( ; m_curPosition.x < xylimit.x; m_curPosition.x += m_matrix.m_GridRouting )
@@ -675,7 +675,7 @@ int AR_AUTOPLACER::getOptimalModulePlacement(MODULE* aModule)
                     LastPosOK   = m_curPosition;
                     min_cost    = Score;
                     wxString msg;
-/*                    msg.Printf( wxT( "m_Score %g, pos %s, %s" ),
+/*                    msg.Printf( wxT( "Score %g, pos %s, %s" ),
                                 min_cost,
                                 GetChars( ::CoordinateToString( LastPosOK.x ) ),
                                 GetChars( ::CoordinateToString( LastPosOK.y ) ) );