diff --git a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp
index 72939ad4de..32da8ed987 100644
--- a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp
+++ b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp
@@ -134,7 +134,7 @@ DLG_SELECT_3DMODEL::DLG_SELECT_3DMODEL( wxWindow* aParent, S3D_CACHE* aCacheMana
     m_modelViewer->Refresh();
     m_modelViewer->SetFocus();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
@@ -216,14 +216,14 @@ void DLG_SELECT_3DMODEL::updateDirChoiceList( void )
     // extract the current project dir
     if( sL != md->end() )
     {
-        prjDir = sL->m_pathexp;
+        prjDir = sL->m_Pathexp;
         ++sL;
     }
 
     while( sL != md->end() )
     {
-        if( !sL->m_pathexp.empty() && sL->m_pathexp.compare( prjDir ) )
-            cl.insert( sL->m_pathexp );
+        if( !sL->m_Pathexp.empty() && sL->m_Pathexp.compare( prjDir ) )
+            cl.insert( sL->m_Pathexp );
 
         ++sL;
     }
diff --git a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option.cpp b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option.cpp
index 40914d3aea..f6d76a0e1f 100644
--- a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option.cpp
+++ b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option.cpp
@@ -79,7 +79,7 @@ DIALOG_3D_VIEW_OPTIONS::DIALOG_3D_VIEW_OPTIONS( EDA_3D_VIEWER* aParent ) :
     m_sdbSizerOK->SetDefault();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/3d-viewer/3d_viewer/eda_3d_viewer.cpp b/3d-viewer/3d_viewer/eda_3d_viewer.cpp
index 1fcc9e4068..d1c188aa79 100644
--- a/3d-viewer/3d_viewer/eda_3d_viewer.cpp
+++ b/3d-viewer/3d_viewer/eda_3d_viewer.cpp
@@ -93,7 +93,7 @@ EDA_3D_VIEWER::EDA_3D_VIEWER( KIWAY *aKiway, PCB_BASE_FRAME *aParent, const wxSt
     wxLogTrace( m_logTrace, "EDA_3D_VIEWER::EDA_3D_VIEWER %s", aTitle );
 
     m_disable_ray_tracing = false;
-    m_AboutTitle = "3D Viewer";
+    m_aboutTitle = "3D Viewer";
 
     // Give it an icon
     wxIcon icon;
diff --git a/bitmap2component/bitmap2cmp_gui.cpp b/bitmap2component/bitmap2cmp_gui.cpp
index bd38646d8c..1afd61d069 100644
--- a/bitmap2component/bitmap2cmp_gui.cpp
+++ b/bitmap2component/bitmap2cmp_gui.cpp
@@ -179,9 +179,9 @@ BM2CMP_FRAME::BM2CMP_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
     m_buttonExportFile->Enable( false );
     m_buttonExportClipboard->Enable( false );
 
-    SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
+    SetSize( m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y );
 
-    if ( m_FramePos == wxDefaultPosition )
+    if ( m_framePos == wxDefaultPosition )
         Centre();
 }
 
diff --git a/common/advanced_config.cpp b/common/advanced_config.cpp
index cf2908e25b..175a3ed740 100644
--- a/common/advanced_config.cpp
+++ b/common/advanced_config.cpp
@@ -220,11 +220,11 @@ ADVANCED_CFG::ADVANCED_CFG()
 
     // Init defaults - this is done in case the config doesn't exist,
     // then the values will remain as set here.
-    m_realTimeConnectivity      = true;
-    m_coroutineStackSize        = AC_STACK::default_stack;
+    m_RealTimeConnectivity      = true;
+    m_CoroutineStackSize        = AC_STACK::default_stack;
     m_ShowRouterDebugGraphics   = false;
-    m_drawArcAccuracy           = 10.0;
-    m_drawArcCenterMaxAngle     = 50.0;
+    m_DrawArcAccuracy           = 10.0;
+    m_DrawArcCenterMaxAngle     = 50.0;
     m_DrawTriangulationOutlines = false;
     m_PluginAltiumSch           = false;
 
@@ -281,7 +281,7 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
     std::vector<PARAM_CFG*> configParams;
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::RealtimeConnectivity,
-                                                &m_realTimeConnectivity, true ) );
+                                                &m_RealTimeConnectivity, true ) );
 
     configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::ExtraFillMargin,
                                                   &m_ExtraClearance, 0.0005, 0.0, 1.0 ) );
@@ -293,7 +293,7 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
                                                   &m_HoleWallThickness, 0.020, 0.0, 1.0 ) );
 
     configParams.push_back( new PARAM_CFG_INT( true, AC_KEYS::CoroutineStackSize,
-                                               &m_coroutineStackSize, AC_STACK::default_stack,
+                                               &m_CoroutineStackSize, AC_STACK::default_stack,
                                                AC_STACK::min_stack, AC_STACK::max_stack ) );
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::ShowRouterDebugGraphics,
@@ -303,10 +303,10 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
                                                 &m_CompactSave, false ) );
 
     configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::DrawArcAccuracy,
-                                                  &m_drawArcAccuracy, 10.0, 0.0, 100000.0 ) );
+                                                  &m_DrawArcAccuracy, 10.0, 0.0, 100000.0 ) );
 
     configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::DrawArcCenterStartEndMaxAngle,
-                                                  &m_drawArcCenterMaxAngle, 50.0, 0.0, 100000.0 ) );
+                                                  &m_DrawArcCenterMaxAngle, 50.0, 0.0, 100000.0 ) );
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::StrokeTriangulation,
                                                 &m_DrawTriangulationOutlines, false ) );
diff --git a/common/base_screen.cpp b/common/base_screen.cpp
index 5a40558b77..d42f471663 100644
--- a/common/base_screen.cpp
+++ b/common/base_screen.cpp
@@ -40,8 +40,8 @@ BASE_SCREEN::BASE_SCREEN( EDA_ITEM* aParent, KICAD_T aType ) :
     m_pageCount         = 1;         // Hierarchy: Root: ScreenNumber = 1
     m_Center            = true;
 
-    m_FlagModified      = false;     // Set when any change is made on board.
-    m_FlagSave          = false;     // Used in auto save set when an auto save is required.
+    m_flagModified      = false;     // Set when any change is made on board.
+    m_flagSave          = false;     // Used in auto save set when an auto save is required.
 }
 
 
diff --git a/common/board_printout.cpp b/common/board_printout.cpp
index eba8df7ff9..7ed5da8106 100644
--- a/common/board_printout.cpp
+++ b/common/board_printout.cpp
@@ -36,8 +36,8 @@
 BOARD_PRINTOUT_SETTINGS::BOARD_PRINTOUT_SETTINGS( const PAGE_INFO& aPageInfo )
     : PRINTOUT_SETTINGS( aPageInfo )
 {
-    m_layerSet.set();
-    m_mirror = false;
+    m_LayerSet.set();
+    m_Mirror = false;
 }
 
 
@@ -45,10 +45,10 @@ void BOARD_PRINTOUT_SETTINGS::Load( APP_SETTINGS_BASE* aConfig )
 {
     PRINTOUT_SETTINGS::Load( aConfig );
 
-    m_layerSet.reset();
+    m_LayerSet.reset();
 
     for( int layer : aConfig->m_Printing.layers )
-        m_layerSet.set( layer, true );
+        m_LayerSet.set( layer, true );
 }
 
 
@@ -58,8 +58,8 @@ void BOARD_PRINTOUT_SETTINGS::Save( APP_SETTINGS_BASE* aConfig )
 
     aConfig->m_Printing.layers.clear();
 
-    for( unsigned layer = 0; layer < m_layerSet.size(); ++layer )
-        if( m_layerSet.test( layer ) )
+    for( unsigned layer = 0; layer < m_LayerSet.size(); ++layer )
+        if( m_LayerSet.test( layer ) )
             aConfig->m_Printing.layers.push_back( layer );
 }
 
@@ -126,7 +126,7 @@ void BOARD_PRINTOUT::DrawPage( const wxString& aLayerName, int aPageNum, int aPa
         }
     }
 
-    setupViewLayers( *view, m_settings.m_layerSet );
+    setupViewLayers( *view, m_settings.m_LayerSet );
     setupPainter( *painter );
 
     auto sheetSizeMils = m_settings.m_pageInfo.GetSizeMils();
@@ -203,5 +203,5 @@ void BOARD_PRINTOUT::setupPainter( KIGFX::PAINTER& aPainter )
 
 void BOARD_PRINTOUT::setupGal( KIGFX::GAL* aGal )
 {
-    aGal->SetFlip( m_settings.m_mirror, false );
+    aGal->SetFlip( m_settings.m_Mirror, false );
 }
diff --git a/common/dialog_shim.cpp b/common/dialog_shim.cpp
index 42be75cee6..5b7b14e39d 100644
--- a/common/dialog_shim.cpp
+++ b/common/dialog_shim.cpp
@@ -144,7 +144,7 @@ DIALOG_SHIM::~DIALOG_SHIM()
 }
 
 
-void DIALOG_SHIM::FinishDialogSettings()
+void DIALOG_SHIM::finishDialogSettings()
 {
     // must be called from the constructor of derived classes,
     // when all widgets are initialized, and therefore their size fixed
@@ -155,21 +155,21 @@ void DIALOG_SHIM::FinishDialogSettings()
 }
 
 
-void DIALOG_SHIM::SetSizeInDU( int x, int y )
+void DIALOG_SHIM::setSizeInDU( int x, int y )
 {
     wxSize sz( x, y );
     SetSize( ConvertDialogToPixels( sz ) );
 }
 
 
-int DIALOG_SHIM::HorizPixelsFromDU( int x )
+int DIALOG_SHIM::horizPixelsFromDU( int x )
 {
     wxSize sz( x, 0 );
     return ConvertDialogToPixels( sz ).x;
 }
 
 
-int DIALOG_SHIM::VertPixelsFromDU( int y )
+int DIALOG_SHIM::vertPixelsFromDU( int y )
 {
     wxSize sz( 0, y );
     return ConvertDialogToPixels( sz ).y;
@@ -241,7 +241,7 @@ bool DIALOG_SHIM::Show( bool show )
 }
 
 
-void DIALOG_SHIM::ResetSize()
+void DIALOG_SHIM::resetSize()
 {
     const char* hash_key;
 
diff --git a/common/dialogs/dialog_color_picker.cpp b/common/dialogs/dialog_color_picker.cpp
index fea0bc6134..0c6d6b9e1f 100644
--- a/common/dialogs/dialog_color_picker.cpp
+++ b/common/dialogs/dialog_color_picker.cpp
@@ -142,7 +142,7 @@ bool DIALOG_COLOR_PICKER::TransferDataToWindow()
     m_notebook->GetPage( 0 )->Layout();
     m_notebook->GetPage( 1 )->Layout();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 
     return true;
 }
diff --git a/common/dialogs/dialog_configure_paths.cpp b/common/dialogs/dialog_configure_paths.cpp
index e9b9fb29f9..0f0b52defb 100644
--- a/common/dialogs/dialog_configure_paths.cpp
+++ b/common/dialogs/dialog_configure_paths.cpp
@@ -143,12 +143,12 @@ bool DIALOG_CONFIGURE_PATHS::TransferDataToWindow()
 
        for( auto it = paths->begin(); it != paths->end(); ++it )
        {
-           if ( !( *it ).m_alias.StartsWith( "${" ) && !( *it ).m_alias.StartsWith( "$(" ) )
+           if ( !( *it ).m_Alias.StartsWith( "${" ) && !( *it ).m_Alias.StartsWith( "$(" ) )
            {
-               AppendSearchPath( it->m_alias, it->m_pathvar, it->m_description );
+               AppendSearchPath( it->m_Alias, it->m_Pathvar, it->m_Description );
 
                if( m_curdir.IsEmpty() )
-                   m_curdir = it->m_pathexp;
+                   m_curdir = it->m_Pathexp;
            }
        }
    }
@@ -272,11 +272,11 @@ bool DIALOG_CONFIGURE_PATHS::TransferDataFromWindow()
 
         for( int row = 0; row < m_SearchPaths->GetNumberRows(); ++row )
         {
-            alias.m_alias = m_SearchPaths->GetCellValue( row, SP_ALIAS_COL );
-            alias.m_pathvar = m_SearchPaths->GetCellValue( row, SP_PATH_COL );
-            alias.m_description = m_SearchPaths->GetCellValue( row, SP_DESC_COL );
+            alias.m_Alias = m_SearchPaths->GetCellValue( row, SP_ALIAS_COL );
+            alias.m_Pathvar = m_SearchPaths->GetCellValue( row, SP_PATH_COL );
+            alias.m_Description = m_SearchPaths->GetCellValue( row, SP_DESC_COL );
 
-            if( alias.m_alias.IsEmpty() )
+            if( alias.m_Alias.IsEmpty() )
             {
                 m_errorGrid = m_SearchPaths;
                 m_errorRow = row;
@@ -284,7 +284,7 @@ bool DIALOG_CONFIGURE_PATHS::TransferDataFromWindow()
                 m_errorMsg = _( "3D search path alias cannot be empty." );
                 return false;
             }
-            else if( alias.m_pathvar.IsEmpty() )
+            else if( alias.m_Pathvar.IsEmpty() )
             {
                 m_errorGrid = m_SearchPaths;
                 m_errorRow = row;
diff --git a/common/dialogs/dialog_edit_library_tables.cpp b/common/dialogs/dialog_edit_library_tables.cpp
index 479159b43c..e27d65bfea 100644
--- a/common/dialogs/dialog_edit_library_tables.cpp
+++ b/common/dialogs/dialog_edit_library_tables.cpp
@@ -57,7 +57,7 @@ void DIALOG_EDIT_LIBRARY_TABLES::InstallPanel( wxPanel* aPanel )
 
     sdbSizerOK->SetDefault();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 
     // On some windows manager (Unity, XFCE), this dialog is not always raised, depending
     // on how the dialog is run.
diff --git a/common/dialogs/dialog_global_lib_table_config.cpp b/common/dialogs/dialog_global_lib_table_config.cpp
index 67c8a0efeb..00aed32224 100644
--- a/common/dialogs/dialog_global_lib_table_config.cpp
+++ b/common/dialogs/dialog_global_lib_table_config.cpp
@@ -74,7 +74,7 @@ DIALOG_GLOBAL_LIB_TABLE_CONFIG::DIALOG_GLOBAL_LIB_TABLE_CONFIG( wxWindow* aParen
     if( okButton )
         okButton->SetDefault();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/common/dialogs/dialog_grid_settings.cpp b/common/dialogs/dialog_grid_settings.cpp
index efe47bafbf..cf85d30a51 100644
--- a/common/dialogs/dialog_grid_settings.cpp
+++ b/common/dialogs/dialog_grid_settings.cpp
@@ -68,7 +68,7 @@ DIALOG_GRID_SETTINGS::DIALOG_GRID_SETTINGS( EDA_DRAW_FRAME* aParent ):
     Layout();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/common/dialogs/dialog_hotkey_list.cpp b/common/dialogs/dialog_hotkey_list.cpp
index 934f3baefe..b709568d93 100644
--- a/common/dialogs/dialog_hotkey_list.cpp
+++ b/common/dialogs/dialog_hotkey_list.cpp
@@ -50,7 +50,7 @@ DIALOG_LIST_HOTKEYS::DIALOG_LIST_HOTKEYS( EDA_BASE_FRAME* aParent, TOOL_MANAGER*
 
     SetSizer( main_sizer );
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/common/dialogs/dialog_image_editor.cpp b/common/dialogs/dialog_image_editor.cpp
index e30e6edf46..2cc3844685 100644
--- a/common/dialogs/dialog_image_editor.cpp
+++ b/common/dialogs/dialog_image_editor.cpp
@@ -39,7 +39,7 @@ DIALOG_IMAGE_EDITOR::DIALOG_IMAGE_EDITOR( wxWindow* aParent, BITMAP_BASE* aItem
     msg.Printf( wxT( "%f" ), m_workingImage->GetScale() );
     m_textCtrlScale->SetValue( msg );
 
-    FinishDialogSettings();
+    finishDialogSettings();
     m_sdbSizerOK->SetDefault();
 }
 
diff --git a/common/dialogs/dialog_print_generic.cpp b/common/dialogs/dialog_print_generic.cpp
index 96f23d9612..fe8925b587 100644
--- a/common/dialogs/dialog_print_generic.cpp
+++ b/common/dialogs/dialog_print_generic.cpp
@@ -52,7 +52,7 @@ DIALOG_PRINT_GENERIC::DIALOG_PRINT_GENERIC( EDA_DRAW_FRAME* aParent, PRINTOUT_SE
     m_sdbSizer1Apply->Hide();
 #endif
 
-    FinishDialogSettings();
+    finishDialogSettings();
     Layout();
     initPrintData();
 }
diff --git a/common/dialogs/html_messagebox.cpp b/common/dialogs/html_messagebox.cpp
index 3be60906b5..5756d5eeec 100644
--- a/common/dialogs/html_messagebox.cpp
+++ b/common/dialogs/html_messagebox.cpp
@@ -35,7 +35,7 @@ HTML_MESSAGE_BOX::HTML_MESSAGE_BOX( wxWindow* aParent, const wxString& aTitle,
 
     // Gives a default logical size (the actual size depends on the display definition)
     if( aSize != wxDefaultSize )
-        SetSizeInDU( aSize.x, aSize.y );
+        setSizeInDU( aSize.x, aSize.y );
 
     Center();
 
diff --git a/common/eda_base_frame.cpp b/common/eda_base_frame.cpp
index 4297315914..83bd18eb9e 100644
--- a/common/eda_base_frame.cpp
+++ b/common/eda_base_frame.cpp
@@ -84,7 +84,7 @@ EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* aParent, FRAME_T aFrameType,
         wxFrame( aParent, wxID_ANY, aTitle, aPos, aSize, aStyle, aFrameName ),
         TOOLS_HOLDER(),
         KIWAY_HOLDER( aKiway, KIWAY_HOLDER::FRAME ),
-        m_Ident( aFrameType ),
+        m_ident( aFrameType ),
         m_maximizeByDefault( false ),
         m_infoBar( nullptr ),
         m_settingsManager( nullptr ),
@@ -92,14 +92,14 @@ EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* aParent, FRAME_T aFrameType,
         m_hasAutoSave( false ),
         m_autoSaveState( false ),
         m_autoSaveInterval(-1 ),
-        m_UndoRedoCountMax( DEFAULT_MAX_UNDO_ITEMS ),
+        m_undoRedoCountMax( DEFAULT_MAX_UNDO_ITEMS ),
         m_userUnits( EDA_UNITS::MILLIMETRES ),
         m_isClosing( false ),
         m_isNonUserClose( false )
 {
     m_autoSaveTimer = new wxTimer( this, ID_AUTO_SAVE_TIMER );
     m_mruPath       = wxStandardPaths::Get().GetDocumentsDir();
-    m_FrameSize     = wxSize( s_defaultSize_x, s_defaultSize_y );
+    m_frameSize     = wxSize( s_defaultSize_x, s_defaultSize_y );
 
     m_auimgr.SetArtProvider( new WX_AUI_DOCK_ART() );
 
@@ -109,7 +109,7 @@ EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* aParent, FRAME_T aFrameType,
     SetSizeHints( s_minsize_x, s_minsize_y, -1, -1, -1, -1 );
 
     // Store dimensions of the user area of the main window.
-    GetClientSize( &m_FrameSize.x, &m_FrameSize.y );
+    GetClientSize( &m_frameSize.x, &m_frameSize.y );
 
     Connect( ID_AUTO_SAVE_TIMER, wxEVT_TIMER,
              wxTimerEventHandler( EDA_BASE_FRAME::onAutoSaveTimer ) );
@@ -131,7 +131,7 @@ wxWindow* EDA_BASE_FRAME::findQuasiModalDialog()
 
     // FIXME: CvPcb is currently implemented on top of KIWAY_PLAYER rather than DIALOG_SHIM,
     // so we have to look for it separately.
-    if( m_Ident == FRAME_SCH )
+    if( m_ident == FRAME_SCH )
     {
         wxWindow* cvpcb = wxWindow::FindWindowByName( "CvpcbFrame" );
         if( cvpcb )
@@ -450,22 +450,22 @@ void EDA_BASE_FRAME::LoadWindowState( const WINDOW_STATE& aState )
 {
     bool wasDefault = false;
 
-    m_FramePos.x  = aState.pos_x;
-    m_FramePos.y  = aState.pos_y;
-    m_FrameSize.x = aState.size_x;
-    m_FrameSize.y = aState.size_y;
+    m_framePos.x  = aState.pos_x;
+    m_framePos.y  = aState.pos_y;
+    m_frameSize.x = aState.size_x;
+    m_frameSize.y = aState.size_y;
 
     wxLogTrace( traceDisplayLocation, "Config position (%d, %d) with size (%d, %d)",
-        m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
+                m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y );
 
     // Ensure minimum size is set if the stored config was zero-initialized
-    if( m_FrameSize.x < s_minsize_x || m_FrameSize.y < s_minsize_y )
+    if( m_frameSize.x < s_minsize_x || m_frameSize.y < s_minsize_y )
     {
-        m_FrameSize.x = s_defaultSize_x;
-        m_FrameSize.y = s_defaultSize_y;
+        m_frameSize.x = s_defaultSize_x;
+        m_frameSize.y = s_defaultSize_y;
         wasDefault    = true;
 
-        wxLogTrace( traceDisplayLocation, "Using minimum size (%d, %d)", m_FrameSize.x, m_FrameSize.y );
+        wxLogTrace( traceDisplayLocation, "Using minimum size (%d, %d)", m_frameSize.x, m_frameSize.y );
     }
 
     wxLogTrace( traceDisplayLocation, "Number of displays: %d", wxDisplay::GetCount() );
@@ -480,19 +480,19 @@ void EDA_BASE_FRAME::LoadWindowState( const WINDOW_STATE& aState )
         wxDisplay display( index );
         wxRect    clientSize = display.GetGeometry();
 
-        m_FramePos = wxDefaultPosition;
+        m_framePos = wxDefaultPosition;
 
         // Ensure the window fits on the display, since the other one could have been larger
-        if( m_FrameSize.x > clientSize.width )
-            m_FrameSize.x = clientSize.width;
+        if( m_frameSize.x > clientSize.width )
+            m_frameSize.x = clientSize.width;
 
-        if( m_FrameSize.y > clientSize.height )
-            m_FrameSize.y = clientSize.height;
+        if( m_frameSize.y > clientSize.height )
+            m_frameSize.y = clientSize.height;
     }
     else
     {
-        wxPoint upperRight( m_FramePos.x + m_FrameSize.x, m_FramePos.y );
-        wxPoint upperLeft( m_FramePos.x, m_FramePos.y );
+        wxPoint upperRight( m_framePos.x + m_frameSize.x, m_framePos.y );
+        wxPoint upperLeft( m_framePos.x, m_framePos.y );
 
         wxDisplay display( aState.display );
         wxRect clientSize = display.GetClientArea();
@@ -509,7 +509,7 @@ void EDA_BASE_FRAME::LoadWindowState( const WINDOW_STATE& aState )
             upperRight.x < xLimLeft  ||  // Upper right corner too close to left edge of screen
             upperRight.y > yLim )        // Upper corner too close to the bottom of the screen
         {
-            m_FramePos = wxDefaultPosition;
+            m_framePos = wxDefaultPosition;
             wxLogTrace( traceDisplayLocation, "Resetting to default position" );
         }
     }
@@ -521,25 +521,25 @@ void EDA_BASE_FRAME::LoadWindowState( const WINDOW_STATE& aState )
 #else
     int Ypos_min = 0;
 #endif
-    if( m_FramePos.y < Ypos_min )
-        m_FramePos.y = Ypos_min;
+    if( m_framePos.y < Ypos_min )
+        m_framePos.y = Ypos_min;
 
     wxLogTrace( traceDisplayLocation, "Final window position (%d, %d) with size (%d, %d)",
-        m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
+                m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y );
 
-    SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
+    SetSize( m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y );
 
     // Center the window if we reset to default
-    if( m_FramePos.x == -1 )
+    if( m_framePos.x == -1 )
     {
         wxLogTrace( traceDisplayLocation, "Centering window" );
         Center();
-        m_FramePos = GetPosition();
+        m_framePos = GetPosition();
     }
 
     // Record the frame sizes in an un-maximized state
-    m_NormalFrameSize = m_FrameSize;
-    m_NormalFramePos  = m_FramePos;
+    m_normalFrameSize = m_frameSize;
+    m_normalFramePos  = m_framePos;
 
     // Maximize if we were maximized before
     if( aState.maximized || ( wasDefault && m_maximizeByDefault ) )
@@ -576,25 +576,25 @@ void EDA_BASE_FRAME::SaveWindowSettings( WINDOW_SETTINGS* aCfg )
     // If the window is maximized, we use the saved window size from before it was maximized
     if( IsMaximized() )
     {
-        m_FramePos  = m_NormalFramePos;
-        m_FrameSize = m_NormalFrameSize;
+        m_framePos  = m_normalFramePos;
+        m_frameSize = m_normalFrameSize;
     }
     else
     {
-        m_FrameSize = GetWindowSize();
-        m_FramePos  = GetPosition();
+        m_frameSize = GetWindowSize();
+        m_framePos  = GetPosition();
     }
 
-    aCfg->state.pos_x     = m_FramePos.x;
-    aCfg->state.pos_y     = m_FramePos.y;
-    aCfg->state.size_x    = m_FrameSize.x;
-    aCfg->state.size_y    = m_FrameSize.y;
+    aCfg->state.pos_x     = m_framePos.x;
+    aCfg->state.pos_y     = m_framePos.y;
+    aCfg->state.size_x    = m_frameSize.x;
+    aCfg->state.size_y    = m_frameSize.y;
     aCfg->state.maximized = IsMaximized();
     aCfg->state.display   = wxDisplay::GetFromWindow( this );
 
     wxLogTrace( traceDisplayLocation, "Saving window maximized: %s", IsMaximized() ? "true" : "false" );
     wxLogTrace( traceDisplayLocation, "Saving config position (%d, %d) with size (%d, %d)",
-            m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
+                m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y );
 
     // TODO(JE) should auto-save in common settings be overwritten by every app?
     if( m_hasAutoSave )
@@ -928,9 +928,9 @@ void EDA_BASE_FRAME::PushCommandToUndoList( PICKED_ITEMS_LIST* aNewitem )
     m_undoList.PushCommand( aNewitem );
 
     // Delete the extra items, if count max reached
-    if( m_UndoRedoCountMax > 0 )
+    if( m_undoRedoCountMax > 0 )
     {
-        int extraitems = GetUndoCommandCount() - m_UndoRedoCountMax;
+        int extraitems = GetUndoCommandCount() - m_undoRedoCountMax;
 
         if( extraitems > 0 )
             ClearUndoORRedoList( UNDO_LIST, extraitems );
@@ -943,9 +943,9 @@ void EDA_BASE_FRAME::PushCommandToRedoList( PICKED_ITEMS_LIST* aNewitem )
     m_redoList.PushCommand( aNewitem );
 
     // Delete the extra items, if count max reached
-    if( m_UndoRedoCountMax > 0 )
+    if( m_undoRedoCountMax > 0 )
     {
-        int extraitems = GetRedoCommandCount() - m_UndoRedoCountMax;
+        int extraitems = GetRedoCommandCount() - m_undoRedoCountMax;
 
         if( extraitems > 0 )
             ClearUndoORRedoList( REDO_LIST, extraitems );
@@ -986,10 +986,10 @@ void EDA_BASE_FRAME::OnMaximize( wxMaximizeEvent& aEvent )
     if( !IsMaximized() )
 #endif
     {
-        m_NormalFrameSize = GetWindowSize();
-        m_NormalFramePos  = GetPosition();
+        m_normalFrameSize = GetWindowSize();
+        m_normalFramePos  = GetPosition();
         wxLogTrace( traceDisplayLocation, "Maximizing window - Saving position (%d, %d) with size (%d, %d)",
-                m_NormalFramePos.x, m_NormalFramePos.y, m_NormalFrameSize.x, m_NormalFrameSize.y );
+                    m_normalFramePos.x, m_normalFramePos.y, m_normalFrameSize.x, m_normalFrameSize.y );
     }
 
     // Skip event to actually maximize the window
diff --git a/common/eda_draw_frame.cpp b/common/eda_draw_frame.cpp
index ef10db2e77..f644d7a139 100644
--- a/common/eda_draw_frame.cpp
+++ b/common/eda_draw_frame.cpp
@@ -135,12 +135,12 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame
     SetStatusWidths( arrayDim( dims ), dims );
 
     // Create child subwindows.
-    GetClientSize( &m_FrameSize.x, &m_FrameSize.y );
-    m_FramePos.x   = m_FramePos.y = 0;
-    m_FrameSize.y -= m_msgFrameHeight;
+    GetClientSize( &m_frameSize.x, &m_frameSize.y );
+    m_framePos.x   = m_framePos.y = 0;
+    m_frameSize.y -= m_msgFrameHeight;
 
-    m_messagePanel  = new EDA_MSG_PANEL( this, -1, wxPoint( 0, m_FrameSize.y ),
-                                         wxSize( m_FrameSize.x, m_msgFrameHeight ) );
+    m_messagePanel  = new EDA_MSG_PANEL( this, -1, wxPoint( 0, m_frameSize.y ),
+                                         wxSize( m_frameSize.x, m_msgFrameHeight ) );
 
     m_messagePanel->SetBackgroundColour( COLOR4D( LIGHTGRAY ).ToColour() );
 }
@@ -460,7 +460,7 @@ void EDA_DRAW_FRAME::AddStandardSubMenus( TOOL_MENU& aToolMenu )
 }
 
 
-void EDA_DRAW_FRAME::InitExitKey()
+void EDA_DRAW_FRAME::initExitKey()
 {
     wxAcceleratorEntry entries[1];
     entries[0].Set( wxACCEL_CTRL, int( 'Q' ), wxID_EXIT );
@@ -504,7 +504,7 @@ void EDA_DRAW_FRAME::DisplayUnitsMsg()
 
 void EDA_DRAW_FRAME::OnSize( wxSizeEvent& SizeEv )
 {
-    m_FrameSize = GetClientSize( );
+    m_frameSize = GetClientSize( );
 
     SizeEv.Skip();
 }
@@ -659,7 +659,7 @@ void EDA_DRAW_FRAME::SwitchCanvas( EDA_DRAW_PANEL_GAL::GAL_TYPE aCanvasType )
 }
 
 
-EDA_DRAW_PANEL_GAL::GAL_TYPE EDA_DRAW_FRAME::LoadCanvasTypeSetting()
+EDA_DRAW_PANEL_GAL::GAL_TYPE EDA_DRAW_FRAME::loadCanvasTypeSetting()
 {
 #ifdef __WXMAC__
     // Cairo renderer doesn't handle Retina displays so there's really only one game
@@ -706,7 +706,7 @@ bool EDA_DRAW_FRAME::saveCanvasTypeSetting( EDA_DRAW_PANEL_GAL::GAL_TYPE aCanvas
 
     for( unsigned ii = 0; ii < arrayDim( allowed_frames ); ii++ )
     {
-        if( m_Ident == allowed_frames[ii] )
+        if( m_ident == allowed_frames[ii] )
         {
             allow_save = true;
             break;
@@ -992,9 +992,9 @@ void EDA_DRAW_FRAME::GetUnitPair( EDA_UNITS& aPrimaryUnit, EDA_UNITS& aSecondary
 }
 
 
-void EDA_DRAW_FRAME::ResolveCanvasType()
+void EDA_DRAW_FRAME::resolveCanvasType()
 {
-    m_canvasType = LoadCanvasTypeSetting();
+    m_canvasType = loadCanvasTypeSetting();
 
     // Nudge user to switch to OpenGL if they are on legacy or Cairo
     if( m_firstRunDialogSetting < 1 )
diff --git a/common/filename_resolver.cpp b/common/filename_resolver.cpp
index ab20b1b039..b2f454f797 100644
--- a/common/filename_resolver.cpp
+++ b/common/filename_resolver.cpp
@@ -70,7 +70,7 @@ bool FILENAME_RESOLVER::Set3DConfigDir( const wxString& aConfigDir )
     if( !cfgdir.DirExists() )
         return false;
 
-    m_ConfigDir = cfgdir.GetPath();
+    m_configDir = cfgdir.GetPath();
     createPathList();
 
     return true;
@@ -96,22 +96,22 @@ bool FILENAME_RESOLVER::SetProject( PROJECT* aProject, bool* flgChanged )
     if( flgChanged )
         *flgChanged = false;
 
-    if( m_Paths.empty() )
+    if( m_paths.empty() )
     {
         SEARCH_PATH al;
-        al.m_alias = "${KIPRJMOD}";
-        al.m_pathvar = "${KIPRJMOD}";
-        al.m_pathexp = m_curProjDir;
-        m_Paths.push_back( al );
+        al.m_Alias = "${KIPRJMOD}";
+        al.m_Pathvar = "${KIPRJMOD}";
+        al.m_Pathexp = m_curProjDir;
+        m_paths.push_back( al );
 
         if( flgChanged )
             *flgChanged = true;
     }
     else
     {
-        if( m_Paths.front().m_pathexp.Cmp( m_curProjDir ) )
+        if( m_paths.front().m_Pathexp.Cmp( m_curProjDir ) )
         {
-            m_Paths.front().m_pathexp = m_curProjDir;
+            m_paths.front().m_Pathexp = m_curProjDir;
 
             if( flgChanged )
                 *flgChanged = true;
@@ -127,7 +127,7 @@ bool FILENAME_RESOLVER::SetProject( PROJECT* aProject, bool* flgChanged )
         std::ostringstream ostr;
         ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
         ostr << " * [INFO] changed project dir to ";
-        ostr << m_Paths.front().m_pathexp.ToUTF8();
+        ostr << m_paths.front().m_Pathexp.ToUTF8();
         wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() );
     }
 #endif
@@ -146,18 +146,18 @@ void FILENAME_RESOLVER::SetProgramBase( PGM_BASE* aBase )
 {
     m_pgm = aBase;
 
-    if( !m_pgm || m_Paths.empty() )
+    if( !m_pgm || m_paths.empty() )
         return;
 
     // recreate the path list
-    m_Paths.clear();
+    m_paths.clear();
     createPathList();
 }
 
 
 bool FILENAME_RESOLVER::createPathList()
 {
-    if( !m_Paths.empty() )
+    if( !m_paths.empty() )
         return true;
 
     wxString kmod;
@@ -167,10 +167,10 @@ bool FILENAME_RESOLVER::createPathList()
     // the user may change this later with a call to SetProjectDir()
 
     SEARCH_PATH lpath;
-    lpath.m_alias = "${KIPRJMOD}";
-    lpath.m_pathvar = "${KIPRJMOD}";
-    lpath.m_pathexp = m_curProjDir;
-    m_Paths.push_back( lpath );
+    lpath.m_Alias = "${KIPRJMOD}";
+    lpath.m_Pathvar = "${KIPRJMOD}";
+    lpath.m_Pathexp = m_curProjDir;
+    m_paths.push_back( lpath );
     wxFileName fndummy;
     wxUniChar psep = fndummy.GetPathSeparator();
     std::list< wxString > epaths;
@@ -183,39 +183,39 @@ bool FILENAME_RESOLVER::createPathList()
 
             if( pathVal.empty() )
             {
-                lpath.m_pathexp.clear();
+                lpath.m_Pathexp.clear();
             }
             else
             {
                 fndummy.Assign( pathVal, "" );
                 fndummy.Normalize();
-                lpath.m_pathexp = fndummy.GetFullPath();
+                lpath.m_Pathexp = fndummy.GetFullPath();
             }
 
-            lpath.m_alias =  curr_path;
-            lpath.m_pathvar = curr_path;
+            lpath.m_Alias =  curr_path;
+            lpath.m_Pathvar = curr_path;
 
-            if( !lpath.m_pathexp.empty() && psep == *lpath.m_pathexp.rbegin() )
-                lpath.m_pathexp.erase( --lpath.m_pathexp.end() );
+            if( !lpath.m_Pathexp.empty() && psep == *lpath.m_Pathexp.rbegin() )
+                lpath.m_Pathexp.erase( --lpath.m_Pathexp.end() );
 
-            m_Paths.push_back( lpath );
+            m_paths.push_back( lpath );
         }
     }
 
-    if( !m_ConfigDir.empty() )
+    if( !m_configDir.empty() )
         readPathList();
 
-    if( m_Paths.empty() )
+    if( m_paths.empty() )
         return false;
 
 #ifdef DEBUG
     wxLogTrace( MASK_3D_RESOLVER, " * [3D model] search paths:\n" );
-    std::list< SEARCH_PATH >::const_iterator sPL = m_Paths.begin();
+    std::list< SEARCH_PATH >::const_iterator sPL = m_paths.begin();
 
-    while( sPL != m_Paths.end() )
+    while( sPL != m_paths.end() )
     {
-        wxLogTrace( MASK_3D_RESOLVER, "   + %s : '%s'\n", (*sPL).m_alias.GetData(),
-            (*sPL).m_pathexp.GetData() );
+        wxLogTrace( MASK_3D_RESOLVER, "   + %s : '%s'\n", (*sPL).m_Alias.GetData(),
+            (*sPL).m_Pathexp.GetData() );
         ++sPL;
     }
 #endif
@@ -228,8 +228,8 @@ bool FILENAME_RESOLVER::UpdatePathList( std::vector< SEARCH_PATH >& aPathList )
 {
     wxUniChar envMarker( '$' );
 
-    while( !m_Paths.empty() && envMarker != *m_Paths.back().m_alias.rbegin() )
-        m_Paths.pop_back();
+    while( !m_paths.empty() && envMarker != *m_paths.back().m_Alias.rbegin() )
+        m_paths.pop_back();
 
     size_t nI = aPathList.size();
 
@@ -247,7 +247,7 @@ wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
     if( aFileName.empty() )
         return wxEmptyString;
 
-    if( m_Paths.empty() )
+    if( m_paths.empty() )
         createPathList();
 
     // first attempt to use the name as specified:
@@ -316,8 +316,8 @@ wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
     // a. an aliased shortened name or
     // b. cannot be determined
 
-    std::list< SEARCH_PATH >::const_iterator sPL = m_Paths.begin();
-    std::list< SEARCH_PATH >::const_iterator ePL = m_Paths.end();
+    std::list< SEARCH_PATH >::const_iterator sPL = m_paths.begin();
+    std::list< SEARCH_PATH >::const_iterator ePL = m_paths.end();
 
     // check the path relative to the current project directory;
     // note: this is not necessarily the same as the current working
@@ -326,9 +326,9 @@ wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
     // This check is performed before checking the path relative to
     // ${KISYS3DMOD} so that users can potentially override a model
     // within ${KISYS3DMOD}
-    if( !sPL->m_pathexp.empty() && !tname.StartsWith( ":" ) )
+    if( !sPL->m_Pathexp.empty() && !tname.StartsWith( ":" ) )
     {
-        tmpFN.Assign( sPL->m_pathexp, "" );
+        tmpFN.Assign( sPL->m_Pathexp, "" );
         wxString fullPath = tmpFN.GetPathWithSep() + tname;
 
         fullPath = ExpandEnvVarSubstitutions( fullPath, m_project );
@@ -362,7 +362,7 @@ wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
     }
 
     // ${ENV_VAR} paths have already been checked; skip them
-    while( sPL != ePL && ( sPL->m_alias.StartsWith( "${" ) || sPL->m_alias.StartsWith( "$(" ) ) )
+    while( sPL != ePL && ( sPL->m_Alias.StartsWith( "${" ) || sPL->m_Alias.StartsWith( "$(" ) ) )
         ++sPL;
 
     // at this point the filename must contain an alias or else it is invalid
@@ -388,9 +388,9 @@ wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
 
     while( sPL != ePL )
     {
-        if( !sPL->m_alias.Cmp( alias ) && !sPL->m_pathexp.empty() )
+        if( !sPL->m_Alias.Cmp( alias ) && !sPL->m_Pathexp.empty() )
         {
-            wxFileName fpath( wxFileName::DirName( sPL->m_pathexp ) );
+            wxFileName fpath( wxFileName::DirName( sPL->m_Pathexp ) );
             wxString fullPath = fpath.GetPathWithSep() + relpath;
 
             fullPath = ExpandEnvVarSubstitutions( fullPath, m_project );
@@ -425,7 +425,7 @@ wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
 
 bool FILENAME_RESOLVER::addPath( const SEARCH_PATH& aPath )
 {
-    if( aPath.m_alias.empty() || aPath.m_pathvar.empty() )
+    if( aPath.m_Alias.empty() || aPath.m_Pathvar.empty() )
         return false;
 
     std::lock_guard<std::mutex> lock( mutex_resolver );
@@ -433,14 +433,14 @@ bool FILENAME_RESOLVER::addPath( const SEARCH_PATH& aPath )
     SEARCH_PATH tpath = aPath;
 
     #ifdef _WIN32
-    while( tpath.m_pathvar.EndsWith( wxT( "\\" ) ) )
-        tpath.m_pathvar.erase( tpath.m_pathvar.length() - 1 );
+    while( tpath.m_Pathvar.EndsWith( wxT( "\\" ) ) )
+        tpath.m_pathvar.erase( tpath.m_Pathvar.length() - 1 );
     #else
-    while( tpath.m_pathvar.EndsWith( wxT( "/" ) ) &&  tpath.m_pathvar.length() > 1 )
-        tpath.m_pathvar.erase( tpath.m_pathvar.length() - 1 );
+    while( tpath.m_Pathvar.EndsWith( wxT( "/" ) ) && tpath.m_Pathvar.length() > 1 )
+        tpath.m_Pathvar.erase( tpath.m_Pathvar.length() - 1 );
     #endif
 
-    wxFileName path( ExpandEnvVarSubstitutions( tpath.m_pathvar, m_project ), "" );
+    wxFileName path( ExpandEnvVarSubstitutions( tpath.m_Pathvar, m_project ), "" );
 
     path.Normalize();
 
@@ -448,45 +448,45 @@ bool FILENAME_RESOLVER::addPath( const SEARCH_PATH& aPath )
     {
         // suppress the message if the missing pathvar is the
         // legacy KISYS3DMOD variable
-        if( aPath.m_pathvar.compare( wxT( "${KISYS3DMOD}" ) ) )
+        if( aPath.m_Pathvar.compare( wxT( "${KISYS3DMOD}" ) ) )
         {
             wxString msg = _( "The given path does not exist" );
             msg.append( wxT( "\n" ) );
-            msg.append( tpath.m_pathvar );
+            msg.append( tpath.m_Pathvar );
             wxMessageBox( msg, _( "3D model search path" ) );
         }
 
-        tpath.m_pathexp.clear();
+        tpath.m_Pathexp.clear();
     }
     else
     {
-        tpath.m_pathexp = path.GetFullPath();
+        tpath.m_Pathexp = path.GetFullPath();
 
-        #ifdef _WIN32
-        while( tpath.m_pathexp.EndsWith( wxT( "\\" ) ) )
-        tpath.m_pathexp.erase( tpath.m_pathexp.length() - 1 );
-        #else
-        while( tpath.m_pathexp.EndsWith( wxT( "/" ) ) &&  tpath.m_pathexp.length() > 1 )
-            tpath.m_pathexp.erase( tpath.m_pathexp.length() - 1 );
-        #endif
+#ifdef _WIN32
+        while( tpath.m_Pathexp.EndsWith( wxT( "\\" ) ) )
+        tpath.m_Pathexp.erase( tpath.m_Pathexp.length() - 1 );
+#else
+        while( tpath.m_Pathexp.EndsWith( wxT( "/" ) ) && tpath.m_Pathexp.length() > 1 )
+            tpath.m_Pathexp.erase( tpath.m_Pathexp.length() - 1 );
+#endif
     }
 
     wxString pname = path.GetPath();
-    std::list< SEARCH_PATH >::iterator sPL = m_Paths.begin();
-    std::list< SEARCH_PATH >::iterator ePL = m_Paths.end();
+    std::list< SEARCH_PATH >::iterator sPL = m_paths.begin();
+    std::list< SEARCH_PATH >::iterator ePL = m_paths.end();
 
     while( sPL != ePL )
     {
-        if( !tpath.m_alias.Cmp( sPL->m_alias ) )
+        if( !tpath.m_Alias.Cmp( sPL->m_Alias ) )
         {
             wxString msg = _( "Alias: " );
-            msg.append( tpath.m_alias );
+            msg.append( tpath.m_Alias );
             msg.append( wxT( "\n" ) );
             msg.append( _( "This path:" ) + wxS( " " ) );
-            msg.append( tpath.m_pathvar );
+            msg.append( tpath.m_Pathvar );
             msg.append( wxT( "\n" ) );
             msg.append( _( "Existing path:" ) + wxS( " " ) );
-            msg.append( sPL->m_pathvar );
+            msg.append( sPL->m_Pathvar );
             wxMessageBox( msg, _( "Bad alias (duplicate name)" ) );
 
             return false;
@@ -495,14 +495,14 @@ bool FILENAME_RESOLVER::addPath( const SEARCH_PATH& aPath )
         ++sPL;
     }
 
-    m_Paths.push_back( tpath );
+    m_paths.push_back( tpath );
     return true;
 }
 
 
 bool FILENAME_RESOLVER::readPathList()
 {
-    if( m_ConfigDir.empty() )
+    if( m_configDir.empty() )
     {
         std::ostringstream ostr;
         ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
@@ -512,11 +512,11 @@ bool FILENAME_RESOLVER::readPathList()
         return false;
     }
 
-    wxFileName cfgpath( m_ConfigDir, RESOLVER_CONFIG );
+    wxFileName cfgpath( m_configDir, RESOLVER_CONFIG );
     cfgpath.Normalize();
     wxString cfgname = cfgpath.GetFullPath();
 
-    size_t nitems = m_Paths.size();
+    size_t nitems = m_paths.size();
 
     std::ifstream cfgFile;
     std::string   cfgLine;
@@ -578,17 +578,17 @@ bool FILENAME_RESOLVER::readPathList()
 
         idx = 0;
 
-        if( !getHollerith( cfgLine, idx, al.m_alias ) )
+        if( !getHollerith( cfgLine, idx, al.m_Alias ) )
             continue;
 
         // never add on KISYS3DMOD from a config file
-        if( !al.m_alias.Cmp( wxT( "KISYS3DMOD" ) ) )
+        if( !al.m_Alias.Cmp( wxT( "KISYS3DMOD" ) ) )
             continue;
 
-        if( !getHollerith( cfgLine, idx, al.m_pathvar ) )
+        if( !getHollerith( cfgLine, idx, al.m_Pathvar ) )
             continue;
 
-        if( !getHollerith( cfgLine, idx, al.m_description ) )
+        if( !getHollerith( cfgLine, idx, al.m_Description ) )
             continue;
 
         addPath( al );
@@ -599,13 +599,13 @@ bool FILENAME_RESOLVER::readPathList()
     if( vnum < CFGFILE_VERSION )
         writePathList();
 
-    return( m_Paths.size() != nitems );
+    return( m_paths.size() != nitems );
 }
 
 
 bool FILENAME_RESOLVER::writePathList()
 {
-    if( m_ConfigDir.empty() )
+    if( m_configDir.empty() )
     {
         std::ostringstream ostr;
         ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
@@ -618,13 +618,13 @@ bool FILENAME_RESOLVER::writePathList()
     }
 
     // skip all ${ENV_VAR} alias names
-    std::list< SEARCH_PATH >::const_iterator sPL = m_Paths.begin();
+    std::list< SEARCH_PATH >::const_iterator sPL = m_paths.begin();
 
-    while( sPL != m_Paths.end() &&
-           ( sPL->m_alias.StartsWith( "${" ) || sPL->m_alias.StartsWith( "$(" ) ) )
+    while( sPL != m_paths.end() &&
+           ( sPL->m_Alias.StartsWith( "${" ) || sPL->m_Alias.StartsWith( "$(" ) ) )
         ++sPL;
 
-    wxFileName cfgpath( m_ConfigDir, RESOLVER_CONFIG );
+    wxFileName cfgpath( m_configDir, RESOLVER_CONFIG );
     wxString cfgname = cfgpath.GetFullPath();
     std::ofstream cfgFile;
 
@@ -645,13 +645,13 @@ bool FILENAME_RESOLVER::writePathList()
     cfgFile << "#V" << CFGFILE_VERSION << "\n";
     std::string tstr;
 
-    while( sPL != m_Paths.end() )
+    while( sPL != m_paths.end() )
     {
-        tstr = sPL->m_alias.ToUTF8();
+        tstr = sPL->m_Alias.ToUTF8();
         cfgFile << "\"" << tstr.size() << ":" << tstr << "\",";
-        tstr = sPL->m_pathvar.ToUTF8();
+        tstr = sPL->m_Pathvar.ToUTF8();
         cfgFile << "\"" << tstr.size() << ":" << tstr << "\",";
-        tstr = sPL->m_description.ToUTF8();
+        tstr = sPL->m_Description.ToUTF8();
         cfgFile << "\"" << tstr.size() << ":" << tstr << "\"\n";
         ++sPL;
     }
@@ -694,24 +694,24 @@ void FILENAME_RESOLVER::checkEnvVarPath( const wxString& aPath )
 
     // check if the alias exists; if not then add it to the end of the
     // env var section of the path list
-    auto sPL = m_Paths.begin();
-    auto ePL = m_Paths.end();
+    auto sPL = m_paths.begin();
+    auto ePL = m_paths.end();
 
     while( sPL != ePL )
     {
-        if( sPL->m_alias == envar )
+        if( sPL->m_Alias == envar )
             return;
 
-        if( !sPL->m_alias.StartsWith( "${" ) )
+        if( !sPL->m_Alias.StartsWith( "${" ) )
             break;
 
         ++sPL;
     }
 
     SEARCH_PATH lpath;
-    lpath.m_alias = envar;
-    lpath.m_pathvar = lpath.m_alias;
-    wxFileName tmpFN( ExpandEnvVarSubstitutions( lpath.m_alias, m_project ), "" );
+    lpath.m_Alias = envar;
+    lpath.m_Pathvar = lpath.m_Alias;
+    wxFileName tmpFN( ExpandEnvVarSubstitutions( lpath.m_Alias, m_project ), "" );
 
     wxUniChar psep = tmpFN.GetPathSeparator();
     tmpFN.Normalize();
@@ -719,15 +719,15 @@ void FILENAME_RESOLVER::checkEnvVarPath( const wxString& aPath )
     if( !tmpFN.DirExists() )
         return;
 
-    lpath.m_pathexp = tmpFN.GetFullPath();
+    lpath.m_Pathexp = tmpFN.GetFullPath();
 
-    if( !lpath.m_pathexp.empty() && psep == *lpath.m_pathexp.rbegin() )
-        lpath.m_pathexp.erase( --lpath.m_pathexp.end() );
+    if( !lpath.m_Pathexp.empty() && psep == *lpath.m_Pathexp.rbegin() )
+        lpath.m_Pathexp.erase( --lpath.m_Pathexp.end() );
 
-    if( lpath.m_pathexp.empty() )
+    if( lpath.m_Pathexp.empty() )
         return;
 
-    m_Paths.insert( sPL, lpath );
+    m_paths.insert( sPL, lpath );
 }
 
 
@@ -735,19 +735,19 @@ wxString FILENAME_RESOLVER::ShortenPath( const wxString& aFullPathName )
 {
     wxString fname = aFullPathName;
 
-    if( m_Paths.empty() )
+    if( m_paths.empty() )
         createPathList();
 
     std::lock_guard<std::mutex> lock( mutex_resolver );
 
-    std::list< SEARCH_PATH >::const_iterator sL = m_Paths.begin();
+    std::list< SEARCH_PATH >::const_iterator sL = m_paths.begin();
     size_t idx;
 
-    while( sL != m_Paths.end() )
+    while( sL != m_paths.end() )
     {
         // undefined paths do not participate in the
         // file name shortening procedure
-        if( sL->m_pathexp.empty() )
+        if( sL->m_Pathexp.empty() )
         {
             ++sL;
             continue;
@@ -756,9 +756,9 @@ wxString FILENAME_RESOLVER::ShortenPath( const wxString& aFullPathName )
         wxFileName fpath;
 
         // in the case of aliases, ensure that we use the most recent definition
-        if( sL->m_alias.StartsWith( "${" ) || sL->m_alias.StartsWith( "$(" ) )
+        if( sL->m_Alias.StartsWith( "${" ) || sL->m_Alias.StartsWith( "$(" ) )
         {
-            wxString tpath = ExpandEnvVarSubstitutions( sL->m_alias, m_project );
+            wxString tpath = ExpandEnvVarSubstitutions( sL->m_Alias, m_project );
 
             if( tpath.empty() )
             {
@@ -770,7 +770,7 @@ wxString FILENAME_RESOLVER::ShortenPath( const wxString& aFullPathName )
         }
         else
         {
-            fpath.Assign( sL->m_pathexp, wxT( "" ) );
+            fpath.Assign( sL->m_Pathexp, wxT( "" ) );
         }
 
         wxString fps = fpath.GetPathWithSep();
@@ -787,10 +787,10 @@ wxString FILENAME_RESOLVER::ShortenPath( const wxString& aFullPathName )
             fname.Replace( wxT( "\\" ), wxT( "/" ) );
             #endif
 
-            if( sL->m_alias.StartsWith( "${" ) || sL->m_alias.StartsWith( "$(" ) )
+            if( sL->m_Alias.StartsWith( "${" ) || sL->m_Alias.StartsWith( "$(" ) )
             {
                 // old style ENV_VAR
-                tname = sL->m_alias;
+                tname = sL->m_Alias;
                 tname.Append( "/" );
                 tname.append( fname );
             }
@@ -798,7 +798,7 @@ wxString FILENAME_RESOLVER::ShortenPath( const wxString& aFullPathName )
             {
                 // new style alias
                 tname = ":";
-                tname.append( sL->m_alias );
+                tname.append( sL->m_Alias );
                 tname.append( ":" );
                 tname.append( fname );
             }
@@ -824,7 +824,7 @@ wxString FILENAME_RESOLVER::ShortenPath( const wxString& aFullPathName )
 
 const std::list< SEARCH_PATH >* FILENAME_RESOLVER::GetPaths()
 {
-    return &m_Paths;
+    return &m_paths;
 }
 
 
diff --git a/common/footprint_info.cpp b/common/footprint_info.cpp
index bfb27d8f35..4be3b59ddf 100644
--- a/common/footprint_info.cpp
+++ b/common/footprint_info.cpp
@@ -182,7 +182,7 @@ void FOOTPRINT_ASYNC_LOADER::Start( FP_LIB_TABLE* aTable, wxString const* aNickn
     aTable->Format( &sof, 0 );
     m_last_table = sof.GetString();
 
-    m_list->StartWorkers( aTable, aNickname, this, aNThreads );
+    m_list->startWorkers( aTable, aNickname, this, aNThreads );
 }
 
 
@@ -190,7 +190,7 @@ bool FOOTPRINT_ASYNC_LOADER::Join()
 {
     if( m_list )
     {
-        bool rv = m_list->JoinWorkers();
+        bool rv = m_list->joinWorkers();
         m_list = nullptr;
         return rv;
     }
@@ -203,7 +203,7 @@ void FOOTPRINT_ASYNC_LOADER::Abort()
 {
     if( m_list )
     {
-        m_list->StopWorkers();
+        m_list->stopWorkers();
         m_list = nullptr;
     }
 }
diff --git a/common/widgets/paged_dialog.cpp b/common/widgets/paged_dialog.cpp
index 68b53652ac..bfdb84c205 100644
--- a/common/widgets/paged_dialog.cpp
+++ b/common/widgets/paged_dialog.cpp
@@ -130,7 +130,7 @@ void PAGED_DIALOG::finishInitialization()
     m_treebook->Fit();
     m_treebook->Layout();
 
-   	FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/cvpcb/cvpcb_mainframe.cpp b/cvpcb/cvpcb_mainframe.cpp
index a96d22021d..85a05263ab 100644
--- a/cvpcb/cvpcb_mainframe.cpp
+++ b/cvpcb/cvpcb_mainframe.cpp
@@ -70,7 +70,7 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) :
     m_tcFilterString      = NULL;
     m_FootprintsList      = FOOTPRINT_LIST::GetInstance( Kiway() );
     m_initialized         = false;
-    m_AboutTitle          = "CvPcb";
+    m_aboutTitle          = "CvPcb";
 
     // Give an icon
     wxIcon icon;
@@ -97,14 +97,14 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) :
 
     m_auimgr.AddPane( m_libListBox, EDA_PANE().Palette().Name( "Libraries" ).Left().Layer(1)
                       .Caption( _( "Footprint Libraries" ) )
-                      .BestSize( (int) ( m_FrameSize.x * 0.20 ), m_FrameSize.y ) );
+                      .BestSize((int) ( m_frameSize.x * 0.20 ), m_frameSize.y ) );
 
     m_auimgr.AddPane( m_compListBox, EDA_PANE().Palette().Name( "Components" ).Center().Layer(0)
                       .Caption( _( "Symbol : Footprint Assignments" ) ) );
 
     m_auimgr.AddPane( m_footprintListBox, EDA_PANE().Palette().Name( "Footprints" ).Right().Layer(1)
                       .Caption( _( "Filtered Footprints" ) )
-                      .BestSize( (int) ( m_FrameSize.x * 0.30 ), m_FrameSize.y ) );
+                      .BestSize((int) ( m_frameSize.x * 0.30 ), m_frameSize.y ) );
 
     // Build the bottom panel, to display 2 status texts and the buttons:
     auto bottomPanel = new wxPanel( this );
diff --git a/cvpcb/display_footprints_frame.cpp b/cvpcb/display_footprints_frame.cpp
index 9e3a508aae..13abf70bfc 100644
--- a/cvpcb/display_footprints_frame.cpp
+++ b/cvpcb/display_footprints_frame.cpp
@@ -82,7 +82,7 @@ DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( KIWAY* aKiway, wxWindow* aPa
     SetScreen( new PCB_SCREEN( GetPageSizeIU() ) );
 
     // Create GAL canvas before loading settings
-    auto* gal_drawPanel = new PCB_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_FrameSize,
+    auto* gal_drawPanel = new PCB_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_frameSize,
                                                   GetGalDisplayOptions(),
                                                   EDA_DRAW_PANEL_GAL::GAL_FALLBACK );
     SetCanvas( gal_drawPanel );
diff --git a/eeschema/cross-probing.cpp b/eeschema/cross-probing.cpp
index cfef06a19f..005653c8bd 100644
--- a/eeschema/cross-probing.cpp
+++ b/eeschema/cross-probing.cpp
@@ -578,7 +578,7 @@ void SCH_EDIT_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail )
         STRING_FORMATTER formatter;
 
         // TODO remove once real-time connectivity is a given
-        if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
+        if( !ADVANCED_CFG::GetCfg().m_RealTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
             // Ensure the netlist data is up to date:
             RecalculateConnections( NO_CLEANUP );
 
diff --git a/eeschema/dialogs/dialog_annotate.cpp b/eeschema/dialogs/dialog_annotate.cpp
index 647713f580..3c93ed7809 100644
--- a/eeschema/dialogs/dialog_annotate.cpp
+++ b/eeschema/dialogs/dialog_annotate.cpp
@@ -107,7 +107,7 @@ DIALOG_ANNOTATE::DIALOG_ANNOTATE( SCH_EDIT_FRAME* parent, const wxString& messag
     Layout();
 
     // When all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_bom.cpp b/eeschema/dialogs/dialog_bom.cpp
index 1592f8b237..998d5c6558 100644
--- a/eeschema/dialogs/dialog_bom.cpp
+++ b/eeschema/dialogs/dialog_bom.cpp
@@ -247,7 +247,7 @@ DIALOG_BOM::DIALOG_BOM( SCH_EDIT_FRAME* parent ) :
     m_sdbSizerOK->SetDefault();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 DIALOG_BOM::~DIALOG_BOM()
diff --git a/eeschema/dialogs/dialog_bus_manager.cpp b/eeschema/dialogs/dialog_bus_manager.cpp
index 6cf01b5dd3..3f1f14e28e 100644
--- a/eeschema/dialogs/dialog_bus_manager.cpp
+++ b/eeschema/dialogs/dialog_bus_manager.cpp
@@ -183,7 +183,7 @@ DIALOG_BUS_MANAGER::DIALOG_BUS_MANAGER( SCH_EDIT_FRAME* aParent )
     m_bus_edit->SetHint( _( "Bus Alias Name" ) );
     m_signal_edit->SetHint( _( "Net or Bus Name" ) );
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_change_symbols.cpp b/eeschema/dialogs/dialog_change_symbols.cpp
index ee36c71706..45bc036468 100644
--- a/eeschema/dialogs/dialog_change_symbols.cpp
+++ b/eeschema/dialogs/dialog_change_symbols.cpp
@@ -149,7 +149,7 @@ DIALOG_CHANGE_SYMBOLS::DIALOG_CHANGE_SYMBOLS( SCH_EDIT_FRAME* aParent, SCH_COMPO
     m_sdbSizerOK->SetDefault();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_choose_component.cpp b/eeschema/dialogs/dialog_choose_component.cpp
index 3312223242..4cbb904af8 100644
--- a/eeschema/dialogs/dialog_choose_component.cpp
+++ b/eeschema/dialogs/dialog_choose_component.cpp
@@ -155,14 +155,14 @@ DIALOG_CHOOSE_COMPONENT::DIALOG_CHOOSE_COMPONENT( SCH_BASE_FRAME* aParent, const
         // We specify the width of the right window (m_symbol_view_panel), because specify
         // the width of the left window does not work as expected when SetSashGravity() is called
         m_hsplitter->SetSashPosition( panelCfg.sash_pos_h > 0 ? panelCfg.sash_pos_h :
-                                                                HorizPixelsFromDU( 220 ) );
+                                      horizPixelsFromDU( 220 ) );
 
         if( m_vsplitter )
             m_vsplitter->SetSashPosition( panelCfg.sash_pos_v > 0 ? panelCfg.sash_pos_v :
-                                                                    VertPixelsFromDU( 230 ) );
+                                          vertPixelsFromDU( 230 ) );
 
-        wxSize dlgSize( panelCfg.width > 0 ? panelCfg.width : HorizPixelsFromDU( 390 ),
-                        panelCfg.height > 0 ? panelCfg.height : VertPixelsFromDU( 300 ) );
+        wxSize dlgSize( panelCfg.width > 0 ? panelCfg.width : horizPixelsFromDU( 390 ),
+                        panelCfg.height > 0 ? panelCfg.height : vertPixelsFromDU( 300 ) );
         SetSize( dlgSize );
     }
 
diff --git a/eeschema/dialogs/dialog_edit_components_libid.cpp b/eeschema/dialogs/dialog_edit_components_libid.cpp
index 377ea4a5a4..e03a2be72a 100644
--- a/eeschema/dialogs/dialog_edit_components_libid.cpp
+++ b/eeschema/dialogs/dialog_edit_components_libid.cpp
@@ -373,7 +373,7 @@ DIALOG_EDIT_COMPONENTS_LIBID::DIALOG_EDIT_COMPONENTS_LIBID( SCH_EDIT_FRAME* aPar
 
     initDlg();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_edit_label.cpp b/eeschema/dialogs/dialog_edit_label.cpp
index 6c873ef760..50673e9fe9 100644
--- a/eeschema/dialogs/dialog_edit_label.cpp
+++ b/eeschema/dialogs/dialog_edit_label.cpp
@@ -135,7 +135,7 @@ DIALOG_LABEL_EDITOR::DIALOG_LABEL_EDITOR( SCH_EDIT_FRAME* aParent, SCH_TEXT* aTe
 
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_edit_line_style.cpp b/eeschema/dialogs/dialog_edit_line_style.cpp
index c335945f70..288e760802 100644
--- a/eeschema/dialogs/dialog_edit_line_style.cpp
+++ b/eeschema/dialogs/dialog_edit_line_style.cpp
@@ -75,7 +75,7 @@ DIALOG_EDIT_LINE_STYLE::DIALOG_EDIT_LINE_STYLE( SCH_EDIT_FRAME* aParent,
     m_sdbSizerOK->SetDefault();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_edit_one_field.cpp b/eeschema/dialogs/dialog_edit_one_field.cpp
index e370a2e0c9..faf283daab 100644
--- a/eeschema/dialogs/dialog_edit_one_field.cpp
+++ b/eeschema/dialogs/dialog_edit_one_field.cpp
@@ -130,7 +130,7 @@ void DIALOG_EDIT_ONE_FIELD::init()
     }
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp
index d5d3ada12a..2f2ac762b1 100644
--- a/eeschema/dialogs/dialog_erc.cpp
+++ b/eeschema/dialogs/dialog_erc.cpp
@@ -106,7 +106,7 @@ DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) :
     }
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_fields_editor_global.cpp b/eeschema/dialogs/dialog_fields_editor_global.cpp
index 5a5459ec1f..9edd26ac4e 100644
--- a/eeschema/dialogs/dialog_fields_editor_global.cpp
+++ b/eeschema/dialogs/dialog_fields_editor_global.cpp
@@ -834,7 +834,7 @@ DIALOG_FIELDS_EDITOR_GLOBAL::DIALOG_FIELDS_EDITOR_GLOBAL( SCH_EDIT_FRAME* parent
 
     m_sdbSizerOK->SetDefault();
 
-    FinishDialogSettings();
+    finishDialogSettings();
     SetSize( defaultDlgSize );
     Center();
 
diff --git a/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp b/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
index 5f2df75743..178121e416 100644
--- a/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
+++ b/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
@@ -105,7 +105,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS( SCH_
     m_hasChange = false;
 
     // TODO(JE) remove once real-time connectivity is a given
-    if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
+    if( !ADVANCED_CFG::GetCfg().m_RealTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
         m_parent->RecalculateConnections( NO_CLEANUP );
 
     m_lineStyle->Append( DEFAULT_STYLE );
@@ -118,7 +118,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS( SCH_
 
     m_sdbSizerButtonsOK->SetDefault();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_junction_props.cpp b/eeschema/dialogs/dialog_junction_props.cpp
index b6f848e28b..459f1a8033 100644
--- a/eeschema/dialogs/dialog_junction_props.cpp
+++ b/eeschema/dialogs/dialog_junction_props.cpp
@@ -44,7 +44,7 @@ DIALOG_JUNCTION_PROPS::DIALOG_JUNCTION_PROPS( SCH_EDIT_FRAME* aParent,
     m_sdbSizerOK->SetDefault();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_lib_edit_draw_item.cpp b/eeschema/dialogs/dialog_lib_edit_draw_item.cpp
index fe533c7f70..a98d01dca7 100644
--- a/eeschema/dialogs/dialog_lib_edit_draw_item.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_draw_item.cpp
@@ -46,7 +46,7 @@ DIALOG_LIB_EDIT_DRAW_ITEM::DIALOG_LIB_EDIT_DRAW_ITEM( SYMBOL_EDIT_FRAME* aParent
     m_sdbSizerOK->SetDefault();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_lib_edit_text.cpp b/eeschema/dialogs/dialog_lib_edit_text.cpp
index e78a8f7b06..14e86afb10 100644
--- a/eeschema/dialogs/dialog_lib_edit_text.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_text.cpp
@@ -55,7 +55,7 @@ DIALOG_LIB_EDIT_TEXT::DIALOG_LIB_EDIT_TEXT( SYMBOL_EDIT_FRAME* aParent, LIB_TEXT
     m_sdbSizerButtonsOK->SetDefault();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_lib_new_component.cpp b/eeschema/dialogs/dialog_lib_new_component.cpp
index 75b88e58a6..b682361cae 100644
--- a/eeschema/dialogs/dialog_lib_new_component.cpp
+++ b/eeschema/dialogs/dialog_lib_new_component.cpp
@@ -49,7 +49,7 @@ DIALOG_LIB_NEW_COMPONENT::DIALOG_LIB_NEW_COMPONENT( EDA_DRAW_FRAME* aParent,
     m_sdbSizerOK->SetDefault();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_lib_symbol_properties.cpp b/eeschema/dialogs/dialog_lib_symbol_properties.cpp
index 9234667eda..c88a6878f8 100644
--- a/eeschema/dialogs/dialog_lib_symbol_properties.cpp
+++ b/eeschema/dialogs/dialog_lib_symbol_properties.cpp
@@ -102,7 +102,7 @@ DIALOG_LIB_SYMBOL_PROPERTIES::DIALOG_LIB_SYMBOL_PROPERTIES( SYMBOL_EDIT_FRAME* a
         if( ( m_lastLayout == DIALOG_LIB_SYMBOL_PROPERTIES::ALIAS && aLibEntry->IsRoot() )
           || ( m_lastLayout == DIALOG_LIB_SYMBOL_PROPERTIES::PARENT && aLibEntry->IsAlias() ) )
         {
-            ResetSize();
+            resetSize();
         }
     }
 
@@ -113,7 +113,7 @@ DIALOG_LIB_SYMBOL_PROPERTIES::DIALOG_LIB_SYMBOL_PROPERTIES( SYMBOL_EDIT_FRAME* a
     syncControlStates( m_libEntry->IsAlias() );
     Layout();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_netlist.cpp b/eeschema/dialogs/dialog_netlist.cpp
index 4ecf8c3443..95aa005c23 100644
--- a/eeschema/dialogs/dialog_netlist.cpp
+++ b/eeschema/dialogs/dialog_netlist.cpp
@@ -314,7 +314,7 @@ NETLIST_DIALOG::NETLIST_DIALOG( SCH_EDIT_FRAME* parent ) :
     m_sdbSizer2OK->SetDefault();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_paste_special.cpp b/eeschema/dialogs/dialog_paste_special.cpp
index 5f321c98a7..3001ef2c4f 100644
--- a/eeschema/dialogs/dialog_paste_special.cpp
+++ b/eeschema/dialogs/dialog_paste_special.cpp
@@ -32,7 +32,7 @@ DIALOG_PASTE_SPECIAL::DIALOG_PASTE_SPECIAL( wxWindow* parent, bool* aKeep ) :
     m_keep( aKeep )
 {
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_pin_properties.cpp b/eeschema/dialogs/dialog_pin_properties.cpp
index 477c9a793d..5e894875b7 100644
--- a/eeschema/dialogs/dialog_pin_properties.cpp
+++ b/eeschema/dialogs/dialog_pin_properties.cpp
@@ -201,7 +201,7 @@ DIALOG_PIN_PROPERTIES::DIALOG_PIN_PROPERTIES( SYMBOL_EDIT_FRAME* parent, LIB_PIN
     SetInitialFocus( m_textPinName );
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 
     // On some window managers (Unity, XFCE) the dialog is not always raised, depending on
     // how it is is run.
diff --git a/eeschema/dialogs/dialog_plot_schematic.cpp b/eeschema/dialogs/dialog_plot_schematic.cpp
index 3af9612eeb..0d05ec2f7b 100644
--- a/eeschema/dialogs/dialog_plot_schematic.cpp
+++ b/eeschema/dialogs/dialog_plot_schematic.cpp
@@ -65,7 +65,7 @@ DIALOG_PLOT_SCHEMATIC::DIALOG_PLOT_SCHEMATIC( SCH_EDIT_FRAME* parent )
     initDlg();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_print_using_printer.cpp b/eeschema/dialogs/dialog_print_using_printer.cpp
index bd9dd8846a..e10de4b1c4 100644
--- a/eeschema/dialogs/dialog_print_using_printer.cpp
+++ b/eeschema/dialogs/dialog_print_using_printer.cpp
@@ -154,7 +154,7 @@ DIALOG_PRINT_USING_PRINTER::DIALOG_PRINT_USING_PRINTER( SCH_EDIT_FRAME* aParent
                                     // what ENTER does.  Must also SetFocus().
     m_sdbSizer1OK->SetFocus();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_rescue_each.cpp b/eeschema/dialogs/dialog_rescue_each.cpp
index b19b7921e8..5785575c81 100644
--- a/eeschema/dialogs/dialog_rescue_each.cpp
+++ b/eeschema/dialogs/dialog_rescue_each.cpp
@@ -142,7 +142,7 @@ DIALOG_RESCUE_EACH::DIALOG_RESCUE_EACH( wxWindow* aParent,
     m_previewNewWidget->SetLayoutDirection( wxLayout_LeftToRight );
 
     Layout();
-    SetSizeInDU( 480, 360 );
+    setSizeInDU( 480, 360 );
 
     // Make sure the HTML window is large enough. Some fun size juggling and
     // fudge factors here but it does seem to work pretty reliably.
@@ -153,7 +153,7 @@ DIALOG_RESCUE_EACH::DIALOG_RESCUE_EACH( wxWindow* aParent,
     m_htmlPrompt->SetSizeHints( 2 * prompt_size.x / 3, approx_info_height );
     Layout();
     GetSizer()->SetSizeHints( this );
-    SetSizeInDU( 480, 360 );
+    setSizeInDU( 480, 360 );
     Center();
 }
 
diff --git a/eeschema/dialogs/dialog_schematic_setup.cpp b/eeschema/dialogs/dialog_schematic_setup.cpp
index c616d37f06..b55f208163 100644
--- a/eeschema/dialogs/dialog_schematic_setup.cpp
+++ b/eeschema/dialogs/dialog_schematic_setup.cpp
@@ -85,7 +85,7 @@ DIALOG_SCHEMATIC_SETUP::DIALOG_SCHEMATIC_SETUP( SCH_EDIT_FRAME* aFrame ) :
     if( Prj().IsReadOnly() )
         m_infoBar->ShowMessage( _( "Project is missing or read-only. Changes will not be saved." ) );
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/eeschema/dialogs/dialog_sheet_pin_properties.cpp b/eeschema/dialogs/dialog_sheet_pin_properties.cpp
index 17aa01d223..d73dea54a6 100644
--- a/eeschema/dialogs/dialog_sheet_pin_properties.cpp
+++ b/eeschema/dialogs/dialog_sheet_pin_properties.cpp
@@ -59,7 +59,7 @@ DIALOG_SHEET_PIN_PROPERTIES::DIALOG_SHEET_PIN_PROPERTIES( SCH_EDIT_FRAME* parent
     m_comboName->SetValidator( validator );
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 
     /* This ugly hack fixes a bug in wxWidgets 2.8.7 and likely earlier versions for
      * the flex grid sizer in wxGTK that prevents the last column from being sized
diff --git a/eeschema/dialogs/dialog_sheet_properties.cpp b/eeschema/dialogs/dialog_sheet_properties.cpp
index 54b551f754..a77e11af08 100644
--- a/eeschema/dialogs/dialog_sheet_properties.cpp
+++ b/eeschema/dialogs/dialog_sheet_properties.cpp
@@ -87,7 +87,7 @@ DIALOG_SHEET_PROPERTIES::DIALOG_SHEET_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_S
                      wxGridEventHandler( DIALOG_SHEET_PROPERTIES::OnGridCellChanging ),
                      NULL, this );
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
@@ -823,5 +823,5 @@ void DIALOG_SHEET_PROPERTIES::OnInitDlg( wxInitDialogEvent& event )
     TransferDataToWindow();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
diff --git a/eeschema/dialogs/dialog_signal_list.cpp b/eeschema/dialogs/dialog_signal_list.cpp
index 656438fcf9..1107b4b0be 100644
--- a/eeschema/dialogs/dialog_signal_list.cpp
+++ b/eeschema/dialogs/dialog_signal_list.cpp
@@ -81,7 +81,7 @@ bool DIALOG_SIGNAL_LIST::TransferDataToWindow()
     bool success = DIALOG_SIGNAL_LIST_BASE::TransferDataToWindow();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 
     return success;
 }
diff --git a/eeschema/dialogs/dialog_sim_settings.h b/eeschema/dialogs/dialog_sim_settings.h
index 233c9de96c..c1c39483c9 100644
--- a/eeschema/dialogs/dialog_sim_settings.h
+++ b/eeschema/dialogs/dialog_sim_settings.h
@@ -90,7 +90,7 @@ private:
         TransferDataToWindow();
 
         // Now all widgets have the size fixed, call FinishDialogSettings
-        FinishDialogSettings();
+        finishDialogSettings();
     }
 
     /**
diff --git a/eeschema/dialogs/dialog_spice_model.h b/eeschema/dialogs/dialog_spice_model.h
index 6de7512799..9a9968c662 100644
--- a/eeschema/dialogs/dialog_spice_model.h
+++ b/eeschema/dialogs/dialog_spice_model.h
@@ -99,7 +99,7 @@ private:
         TransferDataToWindow();
 
         // Now all widgets have the size fixed, call FinishDialogSettings
-        FinishDialogSettings();
+        finishDialogSettings();
     }
 
     /**
diff --git a/eeschema/dialogs/dialog_symbol_properties.cpp b/eeschema/dialogs/dialog_symbol_properties.cpp
index e3860baa57..4b1a608afe 100644
--- a/eeschema/dialogs/dialog_symbol_properties.cpp
+++ b/eeschema/dialogs/dialog_symbol_properties.cpp
@@ -361,7 +361,7 @@ DIALOG_SYMBOL_PROPERTIES::DIALOG_SYMBOL_PROPERTIES( SCH_EDIT_FRAME* aParent,
                         wxGridEventHandler( DIALOG_SYMBOL_PROPERTIES::OnPinTableColSort ),
                         nullptr, this );
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
@@ -1037,5 +1037,5 @@ void DIALOG_SYMBOL_PROPERTIES::OnInitDlg( wxInitDialogEvent& event )
     TransferDataToWindow();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
diff --git a/eeschema/dialogs/dialog_update_from_pcb.cpp b/eeschema/dialogs/dialog_update_from_pcb.cpp
index d693b3d9b4..9b3a6a84db 100644
--- a/eeschema/dialogs/dialog_update_from_pcb.cpp
+++ b/eeschema/dialogs/dialog_update_from_pcb.cpp
@@ -66,7 +66,7 @@ DIALOG_UPDATE_FROM_PCB::DIALOG_UPDATE_FROM_PCB( SCH_EDIT_FRAME* aParent )
     m_sdbSizer->Layout();
 
     m_sdbSizerOK->SetDefault();
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 void DIALOG_UPDATE_FROM_PCB::updateData()
diff --git a/eeschema/lib_view_frame.cpp b/eeschema/lib_view_frame.cpp
index 47fdd0db0e..b7ba87b865 100644
--- a/eeschema/lib_view_frame.cpp
+++ b/eeschema/lib_view_frame.cpp
@@ -111,7 +111,7 @@ LIB_VIEW_FRAME::LIB_VIEW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame
     if( aFrameType == FRAME_SCH_VIEWER_MODAL )
         SetModal( true );
 
-    m_AboutTitle = "Symbol Library Viewer";
+    m_aboutTitle = "Symbol Library Viewer";
 
     // Force the frame name used in config. the lib viewer frame has a name
     // depending on aFrameType (needed to identify the frame by wxWidgets),
@@ -687,11 +687,11 @@ void LIB_VIEW_FRAME::LoadSettings( APP_SETTINGS_BASE* aCfg )
     GetRenderSettings()->m_ShowPinsElectricalType = cfg->m_LibViewPanel.show_pin_electrical_type;
 
     // Set parameters to a reasonable value.
-    if( m_libListWidth > m_FrameSize.x/2 )
-        m_libListWidth = m_FrameSize.x/2;
+    if( m_libListWidth > m_frameSize.x / 2 )
+        m_libListWidth = m_frameSize.x / 2;
 
-    if( m_cmpListWidth > m_FrameSize.x/2 )
-        m_cmpListWidth = m_FrameSize.x/2;
+    if( m_cmpListWidth > m_frameSize.x / 2 )
+        m_cmpListWidth = m_frameSize.x / 2;
 }
 
 
diff --git a/eeschema/sch_base_frame.cpp b/eeschema/sch_base_frame.cpp
index 3b4b7ed124..1ff2e5bc9b 100644
--- a/eeschema/sch_base_frame.cpp
+++ b/eeschema/sch_base_frame.cpp
@@ -271,7 +271,7 @@ KIGFX::SCH_RENDER_SETTINGS* SCH_BASE_FRAME::GetRenderSettings()
 
 void SCH_BASE_FRAME::createCanvas()
 {
-    m_canvasType = LoadCanvasTypeSetting();
+    m_canvasType = loadCanvasTypeSetting();
 
     // Allows only a CAIRO or OPENGL canvas:
     if( m_canvasType != EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL
@@ -280,7 +280,7 @@ void SCH_BASE_FRAME::createCanvas()
         m_canvasType = EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL;
     }
 
-    SetCanvas( new SCH_DRAW_PANEL( this, wxID_ANY, wxPoint( 0, 0 ), m_FrameSize,
+    SetCanvas( new SCH_DRAW_PANEL( this, wxID_ANY, wxPoint( 0, 0 ), m_frameSize,
                                    GetGalDisplayOptions(), m_canvasType ));
     ActivateGalCanvas();
 }
diff --git a/eeschema/sch_connection.cpp b/eeschema/sch_connection.cpp
index ae750d7223..a7b3e93057 100644
--- a/eeschema/sch_connection.cpp
+++ b/eeschema/sch_connection.cpp
@@ -395,7 +395,7 @@ void SCH_CONNECTION::AppendInfoToMsgPanel( MSG_PANEL_ITEMS& aList ) const
 #if defined(DEBUG)
     // These messages are not flagged as translatable, because they are only debug messages
 
-    if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
+    if( !ADVANCED_CFG::GetCfg().m_RealTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
         return;
 
     if( IsBus() )
diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp
index b05de38a8f..8110d28802 100644
--- a/eeschema/sch_edit_frame.cpp
+++ b/eeschema/sch_edit_frame.cpp
@@ -217,7 +217,7 @@ SCH_EDIT_FRAME::SCH_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ):
 
     m_showBorderAndTitleBlock = true;   // true to show sheet references
     m_hasAutoSave = true;
-    m_AboutTitle = "Eeschema";
+    m_aboutTitle = "Eeschema";
 
     m_findReplaceDialog = nullptr;
 
@@ -274,7 +274,7 @@ SCH_EDIT_FRAME::SCH_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ):
     m_auimgr.GetPane( "InfoBar" ).Hide();
     m_auimgr.Update();
 
-    ResolveCanvasType();
+    resolveCanvasType();
     SwitchCanvas( m_canvasType );
 
     GetToolManager()->RunAction( ACTIONS::zoomFitScreen, true );
@@ -291,7 +291,7 @@ SCH_EDIT_FRAME::SCH_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ):
             p->SetSchematic( m_schematic );
     }
 
-    InitExitKey();
+    initExitKey();
     setupUnits( eeconfig() );
 
     // Net list generator
@@ -724,7 +724,7 @@ void SCH_EDIT_FRAME::OnModify()
     GetScreen()->SetModify();
     GetScreen()->SetSave();
 
-    if( ADVANCED_CFG::GetCfg().m_realTimeConnectivity && CONNECTION_GRAPH::m_allowRealTime )
+    if( ADVANCED_CFG::GetCfg().m_RealTimeConnectivity && CONNECTION_GRAPH::m_allowRealTime )
         RecalculateConnections( NO_CLEANUP );
 
     GetCanvas()->GetView()->UpdateAllItemsConditionally( KIGFX::REPAINT,
diff --git a/eeschema/symbol_editor/symbol_edit_frame.cpp b/eeschema/symbol_editor/symbol_edit_frame.cpp
index 89bebee727..8c6368fcc0 100644
--- a/eeschema/symbol_editor/symbol_edit_frame.cpp
+++ b/eeschema/symbol_editor/symbol_edit_frame.cpp
@@ -106,7 +106,7 @@ SYMBOL_EDIT_FRAME::SYMBOL_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
     m_libMgr = nullptr;
     m_unit = 1;
     m_convert = 1;
-    m_AboutTitle = _( "Symbol Editor" );
+    m_aboutTitle = _( "Symbol Editor" );
 
     wxIcon icon;
     icon.CopyFromBitmap( KiBitmap( icon_libedit_xpm ) );
@@ -138,7 +138,7 @@ SYMBOL_EDIT_FRAME::SYMBOL_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
     ReCreateHToolbar();
     ReCreateVToolbar();
     ReCreateOptToolbar();
-    InitExitKey();
+    initExitKey();
 
     updateTitle();
     DisplaySymbolDatasheet();
diff --git a/eeschema/tools/sch_editor_control.cpp b/eeschema/tools/sch_editor_control.cpp
index 66c44e8ff7..f8aa4069e6 100644
--- a/eeschema/tools/sch_editor_control.cpp
+++ b/eeschema/tools/sch_editor_control.cpp
@@ -911,7 +911,7 @@ int SCH_EDITOR_CONTROL::AssignNetclass( const TOOL_EVENT& aEvent )
     VECTOR2D              cursorPos = controls->GetCursorPosition( !aEvent.Modifier( MD_ALT ) );
 
     // TODO remove once real-time connectivity is a given
-    if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
+    if( !ADVANCED_CFG::GetCfg().m_RealTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
         // Ensure the netlist data is up to date:
         m_frame->RecalculateConnections( NO_CLEANUP );
 
@@ -1135,7 +1135,7 @@ int SCH_EDITOR_CONTROL::UpdateNetHighlighting( const TOOL_EVENT& aEvent )
 int SCH_EDITOR_CONTROL::HighlightNetCursor( const TOOL_EVENT& aEvent )
 {
     // TODO(JE) remove once real-time connectivity is a given
-    if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
+    if( !ADVANCED_CFG::GetCfg().m_RealTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
         m_frame->RecalculateConnections( NO_CLEANUP );
 
     std::string  tool = aEvent.GetCommandStr().get();
diff --git a/eeschema/tools/sch_line_wire_bus_tool.cpp b/eeschema/tools/sch_line_wire_bus_tool.cpp
index 2967f9297e..8e05158ce9 100644
--- a/eeschema/tools/sch_line_wire_bus_tool.cpp
+++ b/eeschema/tools/sch_line_wire_bus_tool.cpp
@@ -103,7 +103,7 @@ private:
         Clear();
 
         // TODO(JE) remove once real-time is enabled
-        if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
+        if( !ADVANCED_CFG::GetCfg().m_RealTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
         {
             frame->RecalculateConnections( NO_CLEANUP );
 
diff --git a/gerbview/dialogs/dialog_print_gerbview.cpp b/gerbview/dialogs/dialog_print_gerbview.cpp
index 24a5e3bbe9..335c2afaae 100644
--- a/gerbview/dialogs/dialog_print_gerbview.cpp
+++ b/gerbview/dialogs/dialog_print_gerbview.cpp
@@ -141,7 +141,7 @@ bool DIALOG_PRINT_GERBVIEW::TransferDataToWindow()
         wxCheckListBox* listBox = m_layerLists[listIdx];
         listBox->Append( filename.GetFullName() );
 
-        if( settings()->m_layerSet.test(ii) )
+        if( settings()->m_LayerSet.test( ii) )
             listBox->Check( ii, true );
 
         wxASSERT( m_layerToItemMap.count( ii ) == 0 );
@@ -150,7 +150,7 @@ bool DIALOG_PRINT_GERBVIEW::TransferDataToWindow()
         ++itemIdx;
     }
 
-    m_checkboxMirror->SetValue( settings()->m_mirror );
+    m_checkboxMirror->SetValue( settings()->m_Mirror );
 
     // Update the dialog layout when layers are added
     GetSizer()->Fit( this );
@@ -267,7 +267,7 @@ void DIALOG_PRINT_GERBVIEW::enableLayer( unsigned int aLayer, bool aValue )
 
 int DIALOG_PRINT_GERBVIEW::setLayerSetFromList()
 {
-    settings()->m_layerSet = LSET();
+    settings()->m_LayerSet = LSET();
     int& pageCount = settings()->m_pageCount;
     pageCount = 0;
 
@@ -279,7 +279,7 @@ int DIALOG_PRINT_GERBVIEW::setLayerSetFromList()
         {
             if( isLayerEnabled( layer ) )
             {
-                settings()->m_layerSet.set( layer );
+                settings()->m_LayerSet.set( layer );
                 ++pageCount;
             }
 
@@ -295,7 +295,7 @@ void DIALOG_PRINT_GERBVIEW::saveSettings()
 {
     setLayerSetFromList();
 
-    settings()->m_mirror = m_checkboxMirror->GetValue();
+    settings()->m_Mirror = m_checkboxMirror->GetValue();
 
     DIALOG_PRINT_GENERIC::saveSettings();
 }
diff --git a/gerbview/gerbview_frame.cpp b/gerbview/gerbview_frame.cpp
index c4c367ffbe..c7ed1e5c78 100644
--- a/gerbview/gerbview_frame.cpp
+++ b/gerbview/gerbview_frame.cpp
@@ -89,7 +89,7 @@ GERBVIEW_FRAME::GERBVIEW_FRAME( KIWAY* aKiway, wxWindow* aParent )
     m_apertText = nullptr;
     m_dcodeText = nullptr;
     m_displayMode = 0;
-    m_AboutTitle = "GerbView";
+    m_aboutTitle = "GerbView";
 
     SHAPE_POLY_SET dummy;   // A ugly trick to force the linker to include
                             // some methods in code and avoid link errors
@@ -99,7 +99,7 @@ GERBVIEW_FRAME::GERBVIEW_FRAME( KIWAY* aKiway, wxWindow* aParent )
     m_zipFileHistory.SetMaxFiles( fileHistorySize );
     m_jobFileHistory.SetMaxFiles( fileHistorySize );
 
-    auto* galCanvas = new GERBVIEW_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_FrameSize,
+    auto* galCanvas = new GERBVIEW_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_frameSize,
                                                    GetGalDisplayOptions(),
                                                    EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE );
 
@@ -160,7 +160,7 @@ GERBVIEW_FRAME::GERBVIEW_FRAME( KIWAY* aKiway, wxWindow* aParent )
     SetActiveLayer( 0, true );
     GetToolManager()->RunAction( ACTIONS::zoomFitScreen, false );
 
-    ResolveCanvasType();
+    resolveCanvasType();
 
     SwitchCanvas( m_canvasType );
 
diff --git a/gerbview/gerbview_printout.cpp b/gerbview/gerbview_printout.cpp
index 76d656df7c..205dc6ce8c 100644
--- a/gerbview/gerbview_printout.cpp
+++ b/gerbview/gerbview_printout.cpp
@@ -44,7 +44,7 @@ GERBVIEW_PRINTOUT::GERBVIEW_PRINTOUT( GBR_LAYOUT* aLayout, const BOARD_PRINTOUT_
 bool GERBVIEW_PRINTOUT::OnPrintPage( int aPage )
 {
     // Store the layerset, as it is going to be modified below and the original settings are needed
-    LSET lset = m_settings.m_layerSet;
+    LSET lset = m_settings.m_LayerSet;
 
     // The gerber filename of the page to print will be printed to the worksheet.
     // Find this filename:
@@ -57,7 +57,7 @@ bool GERBVIEW_PRINTOUT::OnPrintPage( int aPage )
     // because handling negative objects when using only one page is tricky
 
     // Enable only one layer to create a printout
-    m_settings.m_layerSet = LSET( layerId );
+    m_settings.m_LayerSet = LSET( layerId );
 
     GERBER_FILE_IMAGE_LIST& gbrImgList = GERBER_FILE_IMAGE_LIST::GetImagesList();
     GERBER_FILE_IMAGE* gbrImage = gbrImgList.GetGbrImage( layerId );
@@ -69,7 +69,7 @@ bool GERBVIEW_PRINTOUT::OnPrintPage( int aPage )
     DrawPage( gbr_filename, aPage, m_settings.m_pageCount );
 
     // Restore the original layer set, so the next page can be printed
-    m_settings.m_layerSet = lset;
+    m_settings.m_LayerSet = lset;
 
     return true;
 }
@@ -85,7 +85,7 @@ void GERBVIEW_PRINTOUT::setupViewLayers( KIGFX::VIEW& aView, const LSET& aLayerS
 {
     BOARD_PRINTOUT::setupViewLayers( aView, aLayerSet );
 
-    for( LSEQ layerSeq = m_settings.m_layerSet.Seq(); layerSeq; ++layerSeq )
+    for( LSEQ layerSeq = m_settings.m_LayerSet.Seq(); layerSeq; ++layerSeq )
         aView.SetLayerVisible( GERBVIEW_LAYER_ID_START + *layerSeq, true );
 }
 
diff --git a/include/advanced_config.h b/include/advanced_config.h
index a0bdbfbe64..3cd2ba3a1a 100644
--- a/include/advanced_config.h
+++ b/include/advanced_config.h
@@ -59,8 +59,7 @@ class ADVANCED_CFG
 {
 public:
     /**
-     * Get the singleton instance's config, which is shared by all
-     * consumers of advanced config.
+     * Get the singleton instance's config, which is shared by all consumers.
      *
      * This configuration is read-only - to set options, users should add the parameters to
      * their config files at ~/.config/kicad/advanced, or the platform equivalent.
@@ -68,18 +67,16 @@ public:
     static const ADVANCED_CFG& GetCfg();
 
     /**
-     * For drawsegments - arcs.
      * Distance from an arc end point and the estimated end point, when rotating from the
      * start point to the end point.
      */
-    double m_drawArcAccuracy;
+    double m_DrawArcAccuracy;
 
     /**
-     * For drawsegments - arcs.
-     * When drawing an arc, the angle ( center - start ) - ( start - end )
-     * can be limited to avoid extremely high radii.
+     * When drawing an arc, the angle ( center - start ) - ( start - end ) can be limited to
+     * avoid extremely high radii.
      */
-    double m_drawArcCenterMaxAngle;
+    double m_DrawArcCenterMaxAngle;
 
     /**
      * Extra fill clearance for zone fills.  Note that for zone tests this is essentially
@@ -102,12 +99,12 @@ public:
     /**
      * Do real-time connectivity
      */
-    bool m_realTimeConnectivity;
+    bool m_RealTimeConnectivity;
 
     /**
      * Set the stack size for coroutines
      */
-    int m_coroutineStackSize;
+    int m_CoroutineStackSize;
 
     /**
      * Show PNS router debug graphics
@@ -143,7 +140,7 @@ public:
     bool m_DebugZoneFiller;
 
     /**
-     * A mode that writes PDF's without compression.
+     * A mode that writes PDFs without compression.
      */
     bool m_DebugPDFWriter;
 
diff --git a/include/base_screen.h b/include/base_screen.h
index e88c935438..83bbf5bf54 100644
--- a/include/base_screen.h
+++ b/include/base_screen.h
@@ -41,8 +41,8 @@
 class BASE_SCREEN : public EDA_ITEM
 {
 private:
-    bool        m_FlagModified;     ///< Indicates current drawing has been modified.
-    bool        m_FlagSave;         ///< Indicates automatic file save.
+    bool        m_flagModified;     ///< Indicates current drawing has been modified.
+    bool        m_flagSave;         ///< Indicates automatic file save.
 
     /**
      * The cross hair position in logical (drawing) units.  The cross hair is not the cursor
@@ -81,7 +81,7 @@ protected:
     wxString    m_pageNumber;
 
 public:
-    static  wxString m_PageLayoutDescrFileName; ///< the name of the page layout descr file,
+    static wxString m_PageLayoutDescrFileName;  ///< the name of the page layout descr file,
                                                 ///< or emty to used the default pagelayout
 
     wxPoint     m_DrawOrg;          ///< offsets for drawing the circuit on the screen
@@ -89,15 +89,12 @@ public:
     VECTOR2D    m_LocalOrigin;      ///< Relative Screen cursor coordinate (on grid)
                                     ///< in user units. (coordinates from last reset position)
 
-    wxPoint     m_StartVisu;        /**< Coordinates in drawing units of the current
-                                     * view position (upper left corner of device)
-                                     */
+    wxPoint     m_StartVisu;        ///< Coordinates in drawing units of the current
+                                    ///< view position (upper left corner of device)
 
-    bool        m_Center;           /**< Center on screen.  If true (0.0) is centered
-                                     * on screen coordinates can be < 0 and
-                                     * > 0 except for schematics.
-                                     * false: when coordinates can only be >= 0
-                                     * Schematic */
+    bool        m_Center;           ///< Center on screen.  If true (0.0) is centered on screen
+                                    ///< coordinates can be < 0 and > 0 except for schematics.
+                                    ///< false: when coordinates can only be >= 0 (schematics).
 
     VECTOR2D    m_ScrollCenter;     ///< Current scroll center point in logical units.
 
@@ -120,12 +117,12 @@ public:
 
     void InitDataPoints( const wxSize& aPageSizeInternalUnits );
 
-    void SetModify()        { m_FlagModified = true; }
-    void ClrModify()        { m_FlagModified = false; }
-    void SetSave()          { m_FlagSave = true; }
-    void ClrSave()          { m_FlagSave = false; }
-    bool IsModify() const   { return m_FlagModified; }
-    bool IsSave() const     { return m_FlagSave; }
+    void SetModify()        { m_flagModified = true; }
+    void ClrModify()        { m_flagModified = false; }
+    void SetSave()          { m_flagSave = true; }
+    void ClrSave()          { m_flagSave = false; }
+    bool IsModify() const   { return m_flagModified; }
+    bool IsSave() const     { return m_flagSave; }
 
     /**
      * Return the class name.
diff --git a/include/board_item.h b/include/board_item.h
index 0a39fb46a0..c0f5ff076b 100644
--- a/include/board_item.h
+++ b/include/board_item.h
@@ -372,11 +372,10 @@ public:
 
 protected:
     /**
-     * Helper function
-     * Return a string (to be shown to the user) describing a layer mask.
-     * The BOARD is needed because layer names are (somewhat) customizable
+     * Return a string (to be shown to the user) describing a layer mask. The BOARD is needed
+     * because layer names are customizable.
      */
-    virtual wxString LayerMaskDescribe() const;
+    virtual wxString layerMaskDescribe() const;
 };
 
 #ifndef SWIG
@@ -407,10 +406,7 @@ public:
 
     // pure virtuals:
     void SetPosition( const wxPoint& ) override {}
-
-    wxPoint GetPosition() const override {
-        return wxPoint(0, 0);
-    }
+    wxPoint GetPosition() const override { return wxPoint(0, 0); }
 
     static DELETED_BOARD_ITEM* GetInstance()
     {
diff --git a/include/board_printout.h b/include/board_printout.h
index 1d5d0d8f9a..8a07efad07 100644
--- a/include/board_printout.h
+++ b/include/board_printout.h
@@ -55,8 +55,8 @@ struct BOARD_PRINTOUT_SETTINGS : public PRINTOUT_SETTINGS
     {
     }
 
-    LSET m_layerSet;                   ///< Layers to print
-    bool m_mirror;                      ///< Print mirrored
+    LSET m_LayerSet;                   ///< Layers to print
+    bool m_Mirror;                     ///< Print mirrored
 
     void Load( APP_SETTINGS_BASE* aConfig ) override;
     void Save( APP_SETTINGS_BASE* aConfig ) override;
diff --git a/include/dialog_shim.h b/include/dialog_shim.h
index ba1f8ec992..f713fbb5d0 100644
--- a/include/dialog_shim.h
+++ b/include/dialog_shim.h
@@ -100,11 +100,10 @@ protected:
 public:
 
     DIALOG_SHIM( wxWindow* aParent, wxWindowID id, const wxString& title,
-            const   wxPoint& pos = wxDefaultPosition,
-            const   wxSize&  size = wxDefaultSize,
-            long    style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER,
-            const   wxString& name = wxDialogNameStr
-            );
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxDEFAULT_FRAME_STYLE | wxRESIZE_BORDER,
+                 const wxString& name = wxDialogNameStr );
 
     ~DIALOG_SHIM();
 
@@ -146,45 +145,38 @@ public:
                 e.ShiftDown() && !e.MetaDown();
     }
 
-    static void FixOSXCancelButtonIssue( wxWindow *aWindow );
-
 protected:
 
     /**
-     * In all dialogs, we must call the same functions to fix minimal
-     * dlg size, the default position and perhaps some others to fix a few issues
-     * depending on Windows Managers
+     * In all dialogs, we must call the same functions to fix minimal dlg size, the default
+     * position and perhaps some others to fix a few issues depending on Windows Managers
      * this helper function does these calls.
      *
-     * FinishDialogSettings must be called from derived classes,
-     * when all widgets are initialized, and therefore their size fixed.
-     * If TransferDataToWindow() is used to initialize widgets, at end of TransferDataToWindow,
-     * or better at end of a wxInitDialogEvent handler
-     *
-     * In any case, the best way is to call it in a wxInitDialogEvent handler
-     * after calling TransfertDataToWindow(), which is the default
-     * wxInitDialogEvent handler wxDialog
+     * finishDialogSettings must be called from derived classes after all widgets have been
+     * initialized, and therefore their size fixed.  If TransferDataToWindow() is used to
+     * initialize widgets, at the end of TransferDataToWindow, or better yet, at end of a
+     * wxInitDialogEvent handler.
      */
-    void FinishDialogSettings();
+    void finishDialogSettings();
 
     /**
      * Set the dialog to the given dimensions in "dialog units". These are units equivalent
      * to 4* the average character width and 8* the average character height, allowing a dialog
      * to be sized in a way that scales it with the system font.
      */
-    void SetSizeInDU( int x, int y );
+    void setSizeInDU( int x, int y );
 
     /**
      * Convert an integer number of dialog units to pixels, horizontally. See SetSizeInDU or
      * wxDialog documentation for more information.
      */
-    int HorizPixelsFromDU( int x );
+    int horizPixelsFromDU( int x );
 
     /**
      * Convert an integer number of dialog units to pixels, vertically. See SetSizeInDU or
      * wxDialog documentation for more information.
      */
-    int VertPixelsFromDU( int y );
+    int vertPixelsFromDU( int y );
 
     /**
      * Clear the existing dialog size and position.
@@ -193,10 +185,10 @@ protected:
      * the sizers will layout the dialog accordingly.  This useful when there are dialog
      * windows that size changes due to layout dependency hidden controls.
      */
-    void ResetSize();
+    void resetSize();
 
-    EDA_UNITS   m_units;    // userUnits for display and parsing
-    std::string m_hash_key; // alternate for class_map when classname re-used
+    EDA_UNITS              m_units;    // userUnits for display and parsing
+    std::string            m_hash_key; // alternate for class_map when classname re-used
 
     // On MacOS (at least) SetFocus() calls made in the constructor will fail because a
     // window that isn't yet visible will return false to AcceptsFocus().  So we must delay
diff --git a/include/dialogs/html_messagebox.h b/include/dialogs/html_messagebox.h
index 563ee855a6..40f0e5ca41 100644
--- a/include/dialogs/html_messagebox.h
+++ b/include/dialogs/html_messagebox.h
@@ -55,7 +55,7 @@ public:
      */
     void SetDialogSizeInDU( int aWidth, int aHeight )
     {
-        SetSizeInDU( aWidth, aHeight );
+        setSizeInDU( aWidth, aHeight );
         Center();
     }
 
diff --git a/include/eda_base_frame.h b/include/eda_base_frame.h
index 58eccedf45..aebfcc5ec2 100644
--- a/include/eda_base_frame.h
+++ b/include/eda_base_frame.h
@@ -127,16 +127,16 @@ class EDA_BASE_FRAME : public wxFrame, public TOOLS_HOLDER, public KIWAY_HOLDER
     virtual bool IsModal() const { return false; }
 
 protected:
-    FRAME_T         m_Ident;                // Id Type (pcb, schematic, library..)
-    wxPoint         m_FramePos;
-    wxSize          m_FrameSize;
+    FRAME_T         m_ident;                // Id Type (pcb, schematic, library..)
+    wxPoint         m_framePos;
+    wxSize          m_frameSize;
     bool            m_maximizeByDefault;
 
     // These contain the frame size and position for when it is not maximized
-    wxPoint         m_NormalFramePos;
-    wxSize          m_NormalFrameSize;
+    wxPoint         m_normalFramePos;
+    wxSize          m_normalFrameSize;
 
-    wxString        m_AboutTitle;           // Name of program displayed in About.
+    wxString        m_aboutTitle;           // Name of program displayed in About.
 
     wxAuiManager    m_auimgr;
     wxString        m_perspective;          // wxAuiManager perspective.
@@ -155,7 +155,7 @@ protected:
     int             m_autoSaveInterval;     // The auto save interval time in seconds.
     wxTimer*        m_autoSaveTimer;
 
-    int             m_UndoRedoCountMax;     // undo/Redo command Max depth
+    int             m_undoRedoCountMax;     // undo/Redo command Max depth
 
     UNDO_REDO_CONTAINER m_undoList;         // Objects list for the undo command (old data)
     UNDO_REDO_CONTAINER m_redoList;         // Objects list for the redo command (old data)
@@ -314,7 +314,7 @@ public:
 
     int GetAutoSaveInterval() const { return m_autoSaveInterval; }
 
-    bool IsType( FRAME_T aType ) const { return m_Ident == aType; }
+    bool IsType( FRAME_T aType ) const { return m_ident == aType; }
 
     /**
      * Return a SEARCH_STACK pertaining to entire program.
@@ -551,7 +551,7 @@ public:
      */
     virtual void ProjectChanged() {}
 
-    const wxString& GetAboutTitle() const { return m_AboutTitle; }
+    const wxString& GetAboutTitle() const { return m_aboutTitle; }
 
     /**
      * Get if the contents of the frame have been modified since the last save.
@@ -630,7 +630,7 @@ public:
     virtual int GetUndoCommandCount() const { return m_undoList.m_CommandsList.size(); }
     virtual int GetRedoCommandCount() const { return m_redoList.m_CommandsList.size(); }
 
-    int GetMaxUndoItems() const { return m_UndoRedoCountMax; }
+    int GetMaxUndoItems() const { return m_undoRedoCountMax; }
 
     bool NonUserClose( bool aForce )
     {
diff --git a/include/eda_draw_frame.h b/include/eda_draw_frame.h
index b7e88f6217..c47ca494a2 100644
--- a/include/eda_draw_frame.h
+++ b/include/eda_draw_frame.h
@@ -118,37 +118,27 @@ protected:
 
     void setupUnits( APP_SETTINGS_BASE* aCfg );
 
-    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
-
     /**
      * Determines the Canvas type to load (with prompt if required) and initializes m_canvasType
      */
-    void ResolveCanvasType();
+    void resolveCanvasType();
+
+    /**
+     * Returns the canvas type stored in the application settings.
+     */
+    EDA_DRAW_PANEL_GAL::GAL_TYPE loadCanvasTypeSetting();
+
+    /**
+     * Stores the canvas type in the application settings.
+     */
+    bool saveCanvasTypeSetting( EDA_DRAW_PANEL_GAL::GAL_TYPE aCanvasType );
 
     /**
      * Sets the common key-pair for exiting the application (Ctrl-Q) and ties it
      * to the wxID_EXIT event id.  This is useful in sub-applications to pass the event
      * up to a non-owning window
      */
-    void InitExitKey();
-
-    /**
-     * @param doOpen if true runs an Open Library browser, otherwise New Library
-     * @param aFilename for New may contain a default name; in both cases return the chosen
-     *                  filename.
-     * @param wildcard a wildcard to filter the displayed files
-     * @param ext the library file extension
-     * @param isDirectory indicates the library files are directories
-     * @return true for OK; false for Cancel.
-     */
-    bool LibraryFileBrowser( bool doOpen, wxFileName& aFilename,
-                             const wxString& wildcard, const wxString& ext,
-                             bool isDirectory = false );
-
-    /**
-     * Stores the canvas type in the application settings.
-     */
-    bool saveCanvasTypeSetting( EDA_DRAW_PANEL_GAL::GAL_TYPE aCanvasType );
+    void initExitKey();
 
 public:
     EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent,
@@ -237,6 +227,21 @@ public:
     bool ShowPageLimits() const { return m_showPageLimits; }
     void SetShowPageLimits( bool aShow ) { m_showPageLimits = aShow; }
 
+    /**
+     * @param doOpen if true runs an Open Library browser, otherwise New Library
+     * @param aFilename for New may contain a default name; in both cases return the chosen
+     *                  filename.
+     * @param wildcard a wildcard to filter the displayed files
+     * @param ext the library file extension
+     * @param isDirectory indicates the library files are directories
+     * @return true for OK; false for Cancel.
+     */
+    bool LibraryFileBrowser( bool doOpen, wxFileName& aFilename,
+                             const wxString& wildcard, const wxString& ext,
+                             bool isDirectory = false );
+
+    void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
+
     virtual wxString GetScreenDesc() const;
 
     /**
@@ -246,13 +251,9 @@ public:
     virtual BASE_SCREEN* GetScreen() const  { return m_currentScreen; }
 
     /**
-     * Execute a remote command send via a socket to the application,
-     * port KICAD_PCB_PORT_SERVICE_NUMBER (currently 4242)
-     * It called by EDA_DRAW_FRAME::OnSockRequest().
-     * this is a virtual function becuse the actual commands depends on the
-     * application.
-     * the basic function do nothing
-     * @param cmdline = received command from socket
+     * Execute a remote command sent via socket (to port KICAD_PCB_PORT_SERVICE_NUMBER,
+     * currently 4242).
+     * Subclasses should override to implement actual command handlers.
      */
     virtual void ExecuteRemoteCommand( const char* cmdline ){}
 
@@ -277,12 +278,11 @@ public:
     /**
      * Command event handler for selecting grid sizes.
      *
-     * All commands that set the grid size should eventually end up here.
-     * This is where the application setting is saved.  If you override
-     * this method, make sure you call down to the base class.
+     * All commands that set the grid size should eventually end up here. This is where the
+     * application setting is saved.  If you override this method, make sure you call down
+     * to the base class.
      *
-     * @param event - Command event passed by selecting grid size from the
-     *                grid size combobox on the toolbar.
+     * @param event - Command event from the grid size combobox on the toolbar.
      */
     void OnSelectGrid( wxCommandEvent& event );
 
@@ -403,7 +403,6 @@ public:
     void OnSockRequestServer( wxSocketEvent& evt );
 
     void LoadSettings( APP_SETTINGS_BASE* aCfg ) override;
-
     void SaveSettings( APP_SETTINGS_BASE* aCfg ) override;
 
     /**
@@ -432,7 +431,6 @@ public:
      * @param aList is the list of #MSG_PANEL_ITEM objects to fill the message panel.
      */
     void SetMsgPanel( const std::vector< MSG_PANEL_ITEM >& aList );
-
     void SetMsgPanel( EDA_ITEM* aItem );
 
     /**
@@ -452,11 +450,6 @@ public:
      */
     virtual void PrintPage( RENDER_SETTINGS* aSettings );
 
-    /**
-     * Returns the canvas type stored in the application settings.
-     */
-    EDA_DRAW_PANEL_GAL::GAL_TYPE LoadCanvasTypeSetting();
-
     /**
      * Use to start up the GAL drawing canvas.
      */
diff --git a/include/filename_resolver.h b/include/filename_resolver.h
index a1bd705658..8c2f220853 100644
--- a/include/filename_resolver.h
+++ b/include/filename_resolver.h
@@ -42,17 +42,17 @@ class PGM_BASE;
 
 struct SEARCH_PATH
 {
-    wxString m_alias;           // alias to the base path
-    wxString m_pathvar;         // base path as stored in the config file
-    wxString m_pathexp;         // expanded base path
-    wxString m_description;     // description of the aliased path
+    wxString m_Alias;           // alias to the base path
+    wxString m_Pathvar;         // base path as stored in the config file
+    wxString m_Pathexp;         // expanded base path
+    wxString m_Description;     // description of the aliased path
 };
 
 class FILENAME_RESOLVER
 {
 private:
-    wxString               m_ConfigDir;     // 3D configuration directory
-    std::list<SEARCH_PATH> m_Paths;         // list of base paths to search from
+    wxString               m_configDir;     // 3D configuration directory
+    std::list<SEARCH_PATH> m_paths;         // list of base paths to search from
     int                    m_errflags;
     PGM_BASE*              m_pgm;
     PROJECT*               m_project;
diff --git a/include/footprint_info.h b/include/footprint_info.h
index 5f9ed71d8b..07b7162a71 100644
--- a/include/footprint_info.h
+++ b/include/footprint_info.h
@@ -69,20 +69,11 @@ public:
     // These two accessors do not have to call ensure_loaded(), because constructor
     // fills in these fields:
 
-    const wxString& GetFootprintName() const
-    {
-        return m_fpname;
-    }
+    const wxString& GetFootprintName() const { return m_fpname; }
 
-    wxString GetLibNickname() const override
-    {
-        return m_nickname;
-    }
+    wxString GetLibNickname() const override { return m_nickname; }
 
-    wxString GetName() const override
-    {
-        return m_fpname;
-    }
+    wxString GetName() const override { return m_fpname; }
 
     LIB_ID GetLibId() const override
     {
@@ -282,18 +273,18 @@ protected:
      * Launch worker threads to load footprints. Part of the
      * FOOTPRINT_ASYNC_LOADER implementation.
      */
-    virtual void StartWorkers( FP_LIB_TABLE* aTable, wxString const* aNickname,
-            FOOTPRINT_ASYNC_LOADER* aLoader, unsigned aNThreads ) = 0;
+    virtual void startWorkers( FP_LIB_TABLE* aTable, wxString const* aNickname,
+                               FOOTPRINT_ASYNC_LOADER* aLoader, unsigned aNThreads ) = 0;
 
     /**
      * Join worker threads. Part of the FOOTPRINT_ASYNC_LOADER implementation.
      */
-    virtual bool JoinWorkers() = 0;
+    virtual bool joinWorkers() = 0;
 
     /**
      * Stop worker threads. Part of the FOOTPRINT_ASYNC_LOADER implementation.
      */
-    virtual void StopWorkers() = 0;
+    virtual void stopWorkers() = 0;
 };
 
 
@@ -307,10 +298,10 @@ class APIEXPORT FOOTPRINT_ASYNC_LOADER
     friend class FOOTPRINT_LIST;
     friend class FOOTPRINT_LIST_IMPL;
 
-    FOOTPRINT_LIST*       m_list;
-    std::string           m_last_table;
+    FOOTPRINT_LIST*  m_list;
+    std::string      m_last_table;
 
-    int  m_total_libs;
+    int              m_total_libs;
 
 public:
     /**
diff --git a/include/tool/coroutine.h b/include/tool/coroutine.h
index 50f46535c4..24505acc39 100644
--- a/include/tool/coroutine.h
+++ b/include/tool/coroutine.h
@@ -160,7 +160,7 @@ public:
         ,valgrind_stack( 0 )
 #endif
     {
-        m_stacksize = ADVANCED_CFG::GetCfg().m_coroutineStackSize;
+        m_stacksize = ADVANCED_CFG::GetCfg().m_CoroutineStackSize;
     }
 
     ~COROUTINE()
diff --git a/kicad/kicad_manager_frame.cpp b/kicad/kicad_manager_frame.cpp
index 95bf5bcba9..c1f35ecd19 100644
--- a/kicad/kicad_manager_frame.cpp
+++ b/kicad/kicad_manager_frame.cpp
@@ -100,7 +100,7 @@ KICAD_MANAGER_FRAME::KICAD_MANAGER_FRAME( wxWindow* parent, const wxString& titl
 {
     m_active_project = false;
     m_leftWinWidth = 250;       // Default value
-    m_AboutTitle = "KiCad";
+    m_aboutTitle = "KiCad";
 
     // Create the status line (bottom of the frame)
     static const int dims[3] = { -1, -1, 100 };
diff --git a/pagelayout_editor/dialogs/design_inspector.cpp b/pagelayout_editor/dialogs/design_inspector.cpp
index c3be7a6afa..7498dd2827 100644
--- a/pagelayout_editor/dialogs/design_inspector.cpp
+++ b/pagelayout_editor/dialogs/design_inspector.cpp
@@ -189,7 +189,7 @@ DIALOG_INSPECTOR::DIALOG_INSPECTOR( PL_EDITOR_FRAME* aParent ) :
     ReCreateDesignList();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pagelayout_editor/pl_editor_frame.cpp b/pagelayout_editor/pl_editor_frame.cpp
index d90573d3bf..2c1a0aa2db 100644
--- a/pagelayout_editor/pl_editor_frame.cpp
+++ b/pagelayout_editor/pl_editor_frame.cpp
@@ -93,7 +93,7 @@ PL_EDITOR_FRAME::PL_EDITOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
     m_showBorderAndTitleBlock   = true; // true for reference drawings.
     WS_DATA_MODEL::GetTheInstance().m_EditMode = true;
     SetShowPageLimits( true );
-    m_AboutTitle = "PlEditor";
+    m_aboutTitle = "Page Layout Editor";
 
     // Give an icon
     wxIcon icon;
@@ -101,8 +101,8 @@ PL_EDITOR_FRAME::PL_EDITOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
     SetIcon( icon );
 
     // Create GAL canvas
-    auto* drawPanel = new PL_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_FrameSize,
-            GetGalDisplayOptions(), EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE );
+    auto* drawPanel = new PL_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_frameSize,
+                                             GetGalDisplayOptions(), EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE );
     SetCanvas( drawPanel );
 
     LoadSettings( config() );
@@ -180,11 +180,11 @@ PL_EDITOR_FRAME::PL_EDITOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
     m_auimgr.GetPane( "InfoBar" ).Hide();
     m_auimgr.Update();
 
-    ResolveCanvasType();
+    resolveCanvasType();
     SwitchCanvas( m_canvasType );
 
     // Add the exit key handler
-    InitExitKey();
+    initExitKey();
     setupUnits( config() );
 
     wxPoint originCoord = ReturnCoordOriginCorner();
diff --git a/pcb_calculator/dialogs/dialog_regulator_form.h b/pcb_calculator/dialogs/dialog_regulator_form.h
index 92ec821282..c55826f904 100644
--- a/pcb_calculator/dialogs/dialog_regulator_form.h
+++ b/pcb_calculator/dialogs/dialog_regulator_form.h
@@ -47,7 +47,7 @@ public:
         m_sdbSizerOK->SetDefault();
 
         // Now all widgets have the size fixed, call FinishDialogSettings
-        FinishDialogSettings();
+        finishDialogSettings();
     }
 
     ~DIALOG_REGULATOR_FORM(){};
diff --git a/pcb_calculator/pcb_calculator_frame.cpp b/pcb_calculator/pcb_calculator_frame.cpp
index b735fe98a8..e810db9ff8 100644
--- a/pcb_calculator/pcb_calculator_frame.cpp
+++ b/pcb_calculator/pcb_calculator_frame.cpp
@@ -93,9 +93,9 @@ PCB_CALCULATOR_FRAME::PCB_CALCULATOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
     GetSizer()->SetSizeHints( this );
 
     // Set previous size and position
-    SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
+    SetSize( m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y );
 
-    if( m_FramePos == wxDefaultPosition )
+    if( m_framePos == wxDefaultPosition )
         Centre();
 }
 
diff --git a/pcbnew/board_item.cpp b/pcbnew/board_item.cpp
index 384339f395..16860f3d32 100644
--- a/pcbnew/board_item.cpp
+++ b/pcbnew/board_item.cpp
@@ -69,7 +69,7 @@ wxString BOARD_ITEM::GetLayerName() const
 }
 
 
-wxString BOARD_ITEM::LayerMaskDescribe() const
+wxString BOARD_ITEM::layerMaskDescribe() const
 {
     BOARD* board = GetBoard();
     LSET   layers = GetLayerSet();
diff --git a/pcbnew/dialogs/dialog_board_reannotate.cpp b/pcbnew/dialogs/dialog_board_reannotate.cpp
index e41be6fc5a..36cbaef9bb 100644
--- a/pcbnew/dialogs/dialog_board_reannotate.cpp
+++ b/pcbnew/dialogs/dialog_board_reannotate.cpp
@@ -175,7 +175,7 @@ DIALOG_BOARD_REANNOTATE::DIALOG_BOARD_REANNOTATE( PCB_EDIT_FRAME* aParentFrame )
 
     m_MessageWindow->SetPrintInfo( false ); // Suppress the "Info: " prefix
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_board_setup.cpp b/pcbnew/dialogs/dialog_board_setup.cpp
index 7b852ebc4d..e17f4468cc 100644
--- a/pcbnew/dialogs/dialog_board_setup.cpp
+++ b/pcbnew/dialogs/dialog_board_setup.cpp
@@ -97,7 +97,7 @@ DIALOG_BOARD_SETUP::DIALOG_BOARD_SETUP( PCB_EDIT_FRAME* aFrame ) :
     if( Prj().IsReadOnly() )
         m_infoBar->ShowMessage( _( "Project is missing or read-only. Changes will not be saved." ) );
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_board_statistics.cpp b/pcbnew/dialogs/dialog_board_statistics.cpp
index f945fe39e1..49361a9e9a 100644
--- a/pcbnew/dialogs/dialog_board_statistics.cpp
+++ b/pcbnew/dialogs/dialog_board_statistics.cpp
@@ -172,7 +172,7 @@ bool DIALOG_BOARD_STATISTICS::TransferDataToWindow()
     updateWidets();
     Layout();
     drillsPanel->Layout();
-    FinishDialogSettings();
+    finishDialogSettings();
     return true;
 }
 
diff --git a/pcbnew/dialogs/dialog_choose_footprint.cpp b/pcbnew/dialogs/dialog_choose_footprint.cpp
index b3bfcbfbec..92ea356646 100644
--- a/pcbnew/dialogs/dialog_choose_footprint.cpp
+++ b/pcbnew/dialogs/dialog_choose_footprint.cpp
@@ -118,20 +118,20 @@ DIALOG_CHOOSE_FOOTPRINT::DIALOG_CHOOSE_FOOTPRINT( PCB_BASE_FRAME* aParent,
     // We specify the width of the right window (m_symbol_view_panel), because specify
     // the width of the left window does not work as expected when SetSashGravity() is called
     if( cfg->m_FootprintChooser.sash_h < 0 )
-        cfg->m_FootprintChooser.sash_h = HorizPixelsFromDU( 220 );
+        cfg->m_FootprintChooser.sash_h = horizPixelsFromDU( 220 );
 
     m_hsplitter->SetSashPosition( cfg->m_FootprintChooser.sash_h );
 
     if( cfg->m_FootprintChooser.sash_v < 0 )
-        cfg->m_FootprintChooser.sash_v = HorizPixelsFromDU( 230 );
+        cfg->m_FootprintChooser.sash_v = horizPixelsFromDU( 230 );
 
     if( m_vsplitter )
         m_vsplitter->SetSashPosition( cfg->m_FootprintChooser.sash_v );
 
     int w = cfg->m_FootprintChooser.width < 0 ?
-            HorizPixelsFromDU( 440 ) : cfg->m_FootprintChooser.width;
+            horizPixelsFromDU( 440 ) : cfg->m_FootprintChooser.width;
     int h = cfg->m_FootprintChooser.height < 0 ?
-            HorizPixelsFromDU( 340 ) : cfg->m_FootprintChooser.height;
+            horizPixelsFromDU( 340 ) : cfg->m_FootprintChooser.height;
     SetSize( wxSize( w, h ) );
 
     SetInitialFocus( m_tree );
diff --git a/pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp b/pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp
index 72e876dcbd..22917826c2 100644
--- a/pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp
+++ b/pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp
@@ -57,7 +57,7 @@ DIALOG_CLEANUP_TRACKS_AND_VIAS::DIALOG_CLEANUP_TRACKS_AND_VIAS( PCB_EDIT_FRAME*
     m_sdbSizerOK->SetDefault();
     m_sdbSizer->SetSizeHints( this );
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_constraints_reporter.cpp b/pcbnew/dialogs/dialog_constraints_reporter.cpp
index 17f72e4d80..ef642fbbea 100644
--- a/pcbnew/dialogs/dialog_constraints_reporter.cpp
+++ b/pcbnew/dialogs/dialog_constraints_reporter.cpp
@@ -35,7 +35,7 @@ DIALOG_CONSTRAINTS_REPORTER::DIALOG_CONSTRAINTS_REPORTER( PCB_EDIT_FRAME* aParen
 
 void DIALOG_CONSTRAINTS_REPORTER::FinishInitialization()
 {
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_copper_zones.cpp b/pcbnew/dialogs/dialog_copper_zones.cpp
index 5ce3c0c851..220347a147 100644
--- a/pcbnew/dialogs/dialog_copper_zones.cpp
+++ b/pcbnew/dialogs/dialog_copper_zones.cpp
@@ -144,7 +144,7 @@ DIALOG_COPPER_ZONE::DIALOG_COPPER_ZONE( PCB_BASE_FRAME* aParent, ZONE_SETTINGS*
                 m_islandThresholdUnits->Enable( val );
             } );
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_dimension_properties.cpp b/pcbnew/dialogs/dialog_dimension_properties.cpp
index 19988e59d8..5b40efe9eb 100644
--- a/pcbnew/dialogs/dialog_dimension_properties.cpp
+++ b/pcbnew/dialogs/dialog_dimension_properties.cpp
@@ -164,7 +164,7 @@ DIALOG_DIMENSION_PROPERTIES::DIALOG_DIMENSION_PROPERTIES( PCB_BASE_EDIT_FRAME* a
                 m_cbTextOrientation->Enable( !m_cbKeepAligned->GetValue() );
             } );
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_drc.cpp b/pcbnew/dialogs/dialog_drc.cpp
index 0155463780..47ee996392 100644
--- a/pcbnew/dialogs/dialog_drc.cpp
+++ b/pcbnew/dialogs/dialog_drc.cpp
@@ -88,7 +88,7 @@ DIALOG_DRC::DIALOG_DRC( PCB_EDIT_FRAME* aEditorFrame, wxWindow* aParent ) :
     initValues();
     syncCheckboxes();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp
index 8c40033984..a28b177395 100644
--- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp
+++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp
@@ -160,7 +160,7 @@ DIALOG_FOOTPRINT_FP_EDITOR::DIALOG_FOOTPRINT_FP_EDITOR( FOOTPRINT_EDIT_FRAME* aP
     // wxFormBuilder doesn't include this event...
     m_itemsGrid->Connect( wxEVT_GRID_CELL_CHANGING, wxGridEventHandler( DIALOG_FOOTPRINT_FP_EDITOR::OnGridCellChanging ), NULL, this );
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_enum_pads.cpp b/pcbnew/dialogs/dialog_enum_pads.cpp
index ac08f112ff..d7e86bb483 100644
--- a/pcbnew/dialogs/dialog_enum_pads.cpp
+++ b/pcbnew/dialogs/dialog_enum_pads.cpp
@@ -29,7 +29,7 @@ DIALOG_ENUM_PADS::DIALOG_ENUM_PADS( wxWindow* aParent ) :
 {
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_exchange_footprints.cpp b/pcbnew/dialogs/dialog_exchange_footprints.cpp
index e904bd622d..8ac5d0fe29 100644
--- a/pcbnew/dialogs/dialog_exchange_footprints.cpp
+++ b/pcbnew/dialogs/dialog_exchange_footprints.cpp
@@ -155,7 +155,7 @@ DIALOG_EXCHANGE_FOOTPRINTS::DIALOG_EXCHANGE_FOOTPRINTS( PCB_EDIT_FRAME* aParent,
     m_sdbSizerOK->SetDefault();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_export_idf.cpp b/pcbnew/dialogs/dialog_export_idf.cpp
index a440664440..f055129a65 100644
--- a/pcbnew/dialogs/dialog_export_idf.cpp
+++ b/pcbnew/dialogs/dialog_export_idf.cpp
@@ -84,7 +84,7 @@ public:
         m_sdbSizerOK->SetDefault();
 
         // Now all widgets have the size fixed, call FinishDialogSettings
-        FinishDialogSettings();
+        finishDialogSettings();
     }
 
     ~DIALOG_EXPORT_IDF3()
diff --git a/pcbnew/dialogs/dialog_export_step.cpp b/pcbnew/dialogs/dialog_export_step.cpp
index 1a74300520..83f76a304e 100644
--- a/pcbnew/dialogs/dialog_export_step.cpp
+++ b/pcbnew/dialogs/dialog_export_step.cpp
@@ -176,7 +176,7 @@ DIALOG_EXPORT_STEP::DIALOG_EXPORT_STEP( PCB_EDIT_FRAME* aParent, const wxString&
     m_STEP_Yorg->SetValue( tmpStr );
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_export_svg.cpp b/pcbnew/dialogs/dialog_export_svg.cpp
index 7e867a4c37..ea47276b9f 100644
--- a/pcbnew/dialogs/dialog_export_svg.cpp
+++ b/pcbnew/dialogs/dialog_export_svg.cpp
@@ -91,7 +91,7 @@ DIALOG_EXPORT_SVG::DIALOG_EXPORT_SVG( PCB_EDIT_FRAME* aParent, BOARD* aBoard ) :
     m_sdbSizer1Cancel->SetLabel( _( "Close" ) );
     m_sdbSizer1->Layout();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_export_vrml.cpp b/pcbnew/dialogs/dialog_export_vrml.cpp
index 8684e43d6b..72acc378bf 100644
--- a/pcbnew/dialogs/dialog_export_vrml.cpp
+++ b/pcbnew/dialogs/dialog_export_vrml.cpp
@@ -84,7 +84,7 @@ public:
         m_sdbSizer1OK->SetDefault();
 
         // Now all widgets have the size fixed, call FinishDialogSettings
-        FinishDialogSettings();
+        finishDialogSettings();
 
         Connect( ID_USE_ABS_PATH, wxEVT_UPDATE_UI,
                  wxUpdateUIEventHandler( DIALOG_EXPORT_3DFILE::OnUpdateUseRelativePath ) );
diff --git a/pcbnew/dialogs/dialog_footprint_properties.cpp b/pcbnew/dialogs/dialog_footprint_properties.cpp
index 415f30f8e7..9c771c6fd2 100644
--- a/pcbnew/dialogs/dialog_footprint_properties.cpp
+++ b/pcbnew/dialogs/dialog_footprint_properties.cpp
@@ -172,7 +172,7 @@ DIALOG_FOOTPRINT_PROPERTIES::DIALOG_FOOTPRINT_PROPERTIES( PCB_EDIT_FRAME* aParen
     m_buttonBrowse->SetBitmap( KiBitmap( folder_xpm ) );
     m_buttonRemove->SetBitmap( KiBitmap( trash_xpm ) );
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_footprint_wizard_list.cpp b/pcbnew/dialogs/dialog_footprint_wizard_list.cpp
index 6ce24ba256..0cb409aab8 100644
--- a/pcbnew/dialogs/dialog_footprint_wizard_list.cpp
+++ b/pcbnew/dialogs/dialog_footprint_wizard_list.cpp
@@ -67,7 +67,7 @@ DIALOG_FOOTPRINT_WIZARD_LIST::DIALOG_FOOTPRINT_WIZARD_LIST( wxWindow* aParent )
     SetSize( size );
 
     m_sdbSizerOK->SetDefault();
-    FinishDialogSettings();
+    finishDialogSettings();
 
     Center();
 }
diff --git a/pcbnew/dialogs/dialog_gencad_export_options.cpp b/pcbnew/dialogs/dialog_gencad_export_options.cpp
index d718f6276d..72db5d416c 100644
--- a/pcbnew/dialogs/dialog_gencad_export_options.cpp
+++ b/pcbnew/dialogs/dialog_gencad_export_options.cpp
@@ -61,7 +61,7 @@ DIALOG_GENCAD_EXPORT_OPTIONS::DIALOG_GENCAD_EXPORT_OPTIONS( PCB_EDIT_FRAME* aPar
     SetSizer( m_mainSizer );
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 
     // Set the path in m_filePicker, now the size is set
     // (otherwize the text is truncated)
diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp b/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp
index cec473d0b3..3ac09ede03 100644
--- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp
+++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp
@@ -137,7 +137,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS( PCB_
 
     m_sdbSizerButtonsOK->SetDefault();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
index 7b6fb233e5..c9ab15ddb1 100644
--- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
+++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
@@ -131,7 +131,7 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS( PCB_EDIT
 
     m_netFilter->Connect( NET_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::OnNetFilterSelect ), NULL, this );
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_graphic_item_properties.cpp b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
index 18170e9374..29605a007f 100644
--- a/pcbnew/dialogs/dialog_graphic_item_properties.cpp
+++ b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
@@ -71,7 +71,7 @@ private:
         TransferDataToWindow();
 
         // Now all widgets have the size fixed, call FinishDialogSettings
-        FinishDialogSettings();
+        finishDialogSettings();
     }
 
     bool Validate() override;
diff --git a/pcbnew/dialogs/dialog_imported_layers.cpp b/pcbnew/dialogs/dialog_imported_layers.cpp
index 4a2d9e7f99..cce4d252d4 100644
--- a/pcbnew/dialogs/dialog_imported_layers.cpp
+++ b/pcbnew/dialogs/dialog_imported_layers.cpp
@@ -296,7 +296,7 @@ DIALOG_IMPORTED_LAYERS::DIALOG_IMPORTED_LAYERS( wxWindow* aParent,
     m_sdbSizerOK->SetDefault();
 
     Fit();
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 std::vector<wxString> DIALOG_IMPORTED_LAYERS::GetUnmappedRequiredLayers() const
diff --git a/pcbnew/dialogs/dialog_move_exact.cpp b/pcbnew/dialogs/dialog_move_exact.cpp
index 99b32a82ba..dc13df3b59 100644
--- a/pcbnew/dialogs/dialog_move_exact.cpp
+++ b/pcbnew/dialogs/dialog_move_exact.cpp
@@ -84,7 +84,7 @@ DIALOG_MOVE_EXACT::DIALOG_MOVE_EXACT( PCB_BASE_FRAME *aParent, wxPoint& aTransla
 
     m_stdButtonsOK->SetDefault();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_net_inspector.cpp b/pcbnew/dialogs/dialog_net_inspector.cpp
index 7a18c83916..2a12064854 100644
--- a/pcbnew/dialogs/dialog_net_inspector.cpp
+++ b/pcbnew/dialogs/dialog_net_inspector.cpp
@@ -904,7 +904,7 @@ DIALOG_NET_INSPECTOR::DIALOG_NET_INSPECTOR( PCB_EDIT_FRAME* aParent,
             c->SetSortOrder( aSettings.sort_order_asc );
     }
 
-    FinishDialogSettings();
+    finishDialogSettings();
 
 #define connect_event( e, f ) \
     m_frame->Connect( e, wxCommandEventHandler( DIALOG_NET_INSPECTOR::f ), nullptr, this )
diff --git a/pcbnew/dialogs/dialog_netlist.cpp b/pcbnew/dialogs/dialog_netlist.cpp
index 98814b73bf..713cd528f0 100644
--- a/pcbnew/dialogs/dialog_netlist.cpp
+++ b/pcbnew/dialogs/dialog_netlist.cpp
@@ -89,7 +89,7 @@ DIALOG_NETLIST::DIALOG_NETLIST( PCB_EDIT_FRAME* aParent, wxString& aNetlistFullF
     m_buttonsSizer->Layout();
 
     m_sdbSizer1OK->SetDefault();
-    FinishDialogSettings();
+    finishDialogSettings();
 
     m_initialized = true;
     loadNetlist( true );
diff --git a/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp b/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp
index 80b3f32600..2b7c8cb5ef 100644
--- a/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp
+++ b/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp
@@ -90,7 +90,7 @@ DIALOG_NON_COPPER_ZONES_EDITOR::DIALOG_NON_COPPER_ZONES_EDITOR( PCB_BASE_FRAME*
 
     m_sdbSizerButtonsOK->SetDefault();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp b/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp
index c7b61460a8..67fcb20d45 100644
--- a/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp
+++ b/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp
@@ -62,7 +62,7 @@ DIALOG_PAD_PRIMITIVES_PROPERTIES::DIALOG_PAD_PRIMITIVES_PROPERTIES( wxWindow* aP
 
     m_sdbSizerOK->SetDefault();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 bool DIALOG_PAD_PRIMITIVES_PROPERTIES::TransferDataToWindow()
@@ -250,7 +250,7 @@ DIALOG_PAD_PRIMITIVE_POLY_PROPS::DIALOG_PAD_PRIMITIVE_POLY_PROPS( wxWindow* aPar
 	m_gridCornersList->Connect( wxEVT_GRID_CELL_CHANGING, wxGridEventHandler( DIALOG_PAD_PRIMITIVE_POLY_PROPS::onCellChanging ), NULL, this );
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_pad_properties.cpp b/pcbnew/dialogs/dialog_pad_properties.cpp
index bb36ef7aab..208f32b96b 100644
--- a/pcbnew/dialogs/dialog_pad_properties.cpp
+++ b/pcbnew/dialogs/dialog_pad_properties.cpp
@@ -199,7 +199,7 @@ DIALOG_PAD_PROPERTIES::DIALOG_PAD_PROPERTIES( PCB_BASE_FRAME* aParent, PAD* aPad
     m_PadNetSelector->Connect( NET_SELECTED, wxCommandEventHandler( DIALOG_PAD_PROPERTIES::OnValuesChanged ), NULL, this );
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 
     wxUpdateUIEvent dummy;
     OnUpdateUI( dummy );
diff --git a/pcbnew/dialogs/dialog_position_relative.cpp b/pcbnew/dialogs/dialog_position_relative.cpp
index 73b994bce3..d766f578d4 100644
--- a/pcbnew/dialogs/dialog_position_relative.cpp
+++ b/pcbnew/dialogs/dialog_position_relative.cpp
@@ -69,7 +69,7 @@ DIALOG_POSITION_RELATIVE::DIALOG_POSITION_RELATIVE( PCB_BASE_FRAME* aParent, wxP
 
     m_stdButtonsOK->SetDefault();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_print_pcbnew.cpp b/pcbnew/dialogs/dialog_print_pcbnew.cpp
index d085afc1c1..8f6b814d11 100644
--- a/pcbnew/dialogs/dialog_print_pcbnew.cpp
+++ b/pcbnew/dialogs/dialog_print_pcbnew.cpp
@@ -139,10 +139,10 @@ bool DIALOG_PRINT_PCBNEW::TransferDataToWindow()
             m_layers[layer] = std::make_pair( m_listTechLayers, checkIndex );
         }
 
-        m_layers[layer].first->Check( checkIndex, settings()->m_layerSet.test( layer ) );
+        m_layers[layer].first->Check( checkIndex, settings()->m_LayerSet.test( layer ) );
     }
 
-    m_checkboxMirror->SetValue( settings()->m_mirror );
+    m_checkboxMirror->SetValue( settings()->m_Mirror );
     m_checkboxNoEdge->SetValue( settings()->m_noEdgeLayer );
     m_titleBlock->SetValue( settings()->m_titleBlock );
 
@@ -373,7 +373,7 @@ void DIALOG_PRINT_PCBNEW::enableLayer( unsigned int aLayer, bool aValue )
 
 int DIALOG_PRINT_PCBNEW::setLayerSetFromList()
 {
-    settings()->m_layerSet = LSET();
+    settings()->m_LayerSet = LSET();
     int& pageCount = settings()->m_pageCount;
     pageCount = 0;
 
@@ -382,7 +382,7 @@ int DIALOG_PRINT_PCBNEW::setLayerSetFromList()
         if( isLayerEnabled( layer ) )
         {
             ++pageCount;
-            settings()->m_layerSet.set( layer );
+            settings()->m_LayerSet.set( layer );
         }
     }
 
@@ -409,7 +409,7 @@ void DIALOG_PRINT_PCBNEW::saveSettings()
     settings()->m_pagination = m_boxPagination->GetSelection() == 0
         ? PCBNEW_PRINTOUT_SETTINGS::LAYER_PER_PAGE : PCBNEW_PRINTOUT_SETTINGS::ALL_LAYERS;
 
-    settings()->m_mirror = m_checkboxMirror->GetValue();
+    settings()->m_Mirror = m_checkboxMirror->GetValue();
 
     PCBNEW_SETTINGS* cfg = m_parent->GetPcbNewSettings();
 
diff --git a/pcbnew/dialogs/dialog_push_pad_properties.cpp b/pcbnew/dialogs/dialog_push_pad_properties.cpp
index 254d3053e3..6613de56a9 100644
--- a/pcbnew/dialogs/dialog_push_pad_properties.cpp
+++ b/pcbnew/dialogs/dialog_push_pad_properties.cpp
@@ -59,7 +59,7 @@ DIALOG_PUSH_PAD_PROPERTIES::DIALOG_PUSH_PAD_PROPERTIES( PCB_BASE_FRAME* aParent
 
     m_sdbSizer1OK->SetDefault();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_rule_area_properties.cpp b/pcbnew/dialogs/dialog_rule_area_properties.cpp
index 663d0523ed..91151f1cc6 100644
--- a/pcbnew/dialogs/dialog_rule_area_properties.cpp
+++ b/pcbnew/dialogs/dialog_rule_area_properties.cpp
@@ -80,7 +80,7 @@ DIALOG_RULE_AREA_PROPERTIES::DIALOG_RULE_AREA_PROPERTIES( PCB_BASE_FRAME* aParen
 
     m_sdbSizerButtonsOK->SetDefault();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_swap_layers.cpp b/pcbnew/dialogs/dialog_swap_layers.cpp
index b917db62d4..3166bd86b8 100644
--- a/pcbnew/dialogs/dialog_swap_layers.cpp
+++ b/pcbnew/dialogs/dialog_swap_layers.cpp
@@ -79,7 +79,7 @@ DIALOG_SWAP_LAYERS::DIALOG_SWAP_LAYERS( PCB_BASE_EDIT_FRAME* aParent, PCB_LAYER_
 
     m_sdbSizerOK->SetDefault();
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_target_properties.cpp b/pcbnew/dialogs/dialog_target_properties.cpp
index e71660ca65..9b564b2d8f 100644
--- a/pcbnew/dialogs/dialog_target_properties.cpp
+++ b/pcbnew/dialogs/dialog_target_properties.cpp
@@ -72,7 +72,7 @@ DIALOG_TARGET_PROPERTIES::DIALOG_TARGET_PROPERTIES( PCB_EDIT_FRAME* aParent, PCB
     SetInitialFocus( m_sizeCtrl );
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_text_properties.cpp b/pcbnew/dialogs/dialog_text_properties.cpp
index 3cc4a74feb..047d0214a4 100644
--- a/pcbnew/dialogs/dialog_text_properties.cpp
+++ b/pcbnew/dialogs/dialog_text_properties.cpp
@@ -158,7 +158,7 @@ DIALOG_TEXT_PROPERTIES::DIALOG_TEXT_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent, BO
     // so we have to listen to wxEVT_CHAR_HOOK events instead.
     Connect( wxEVT_CHAR_HOOK, wxKeyEventHandler( DIALOG_TEXT_PROPERTIES::OnCharHook ), NULL, this );
 
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_track_via_properties.cpp b/pcbnew/dialogs/dialog_track_via_properties.cpp
index 110f1eca28..a39e6926a3 100644
--- a/pcbnew/dialogs/dialog_track_via_properties.cpp
+++ b/pcbnew/dialogs/dialog_track_via_properties.cpp
@@ -315,7 +315,7 @@ DIALOG_TRACK_VIA_PROPERTIES::DIALOG_TRACK_VIA_PROPERTIES( PCB_BASE_FRAME* aParen
     m_StdButtonsOK->SetDefault();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_track_via_size.cpp b/pcbnew/dialogs/dialog_track_via_size.cpp
index 5a525df516..f71991dc1d 100644
--- a/pcbnew/dialogs/dialog_track_via_size.cpp
+++ b/pcbnew/dialogs/dialog_track_via_size.cpp
@@ -44,7 +44,7 @@ DIALOG_TRACK_VIA_SIZE::DIALOG_TRACK_VIA_SIZE( EDA_DRAW_FRAME* aParent,
     m_stdButtonsOK->SetDefault();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_unused_pad_layers.cpp b/pcbnew/dialogs/dialog_unused_pad_layers.cpp
index f17fdf374f..c78880b851 100644
--- a/pcbnew/dialogs/dialog_unused_pad_layers.cpp
+++ b/pcbnew/dialogs/dialog_unused_pad_layers.cpp
@@ -57,7 +57,7 @@ DIALOG_UNUSED_PAD_LAYERS::DIALOG_UNUSED_PAD_LAYERS( PCB_BASE_FRAME* aParent,
     m_image->SetBitmap( KiBitmap( pads_remove_unused_xpm ) );
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_update_pcb.cpp b/pcbnew/dialogs/dialog_update_pcb.cpp
index 94729a265d..2086e613f3 100644
--- a/pcbnew/dialogs/dialog_update_pcb.cpp
+++ b/pcbnew/dialogs/dialog_update_pcb.cpp
@@ -75,7 +75,7 @@ DIALOG_UPDATE_PCB::DIALOG_UPDATE_PCB( PCB_EDIT_FRAME* aParent, NETLIST* aNetlist
     m_sdbSizer1->Layout();
 
     m_sdbSizer1OK->SetDefault();
-    FinishDialogSettings();
+    finishDialogSettings();
 
     m_initialized = true;
     PerformUpdate( true );
diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp
index 2b25363686..6e1c31393b 100644
--- a/pcbnew/footprint_edit_frame.cpp
+++ b/pcbnew/footprint_edit_frame.cpp
@@ -115,7 +115,7 @@ FOOTPRINT_EDIT_FRAME::FOOTPRINT_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent,
 {
     m_showBorderAndTitleBlock = false;   // true to show the frame references
     m_canvasType = aBackend;
-    m_AboutTitle = _( "Footprint Editor" );
+    m_aboutTitle = _( "Footprint Editor" );
     m_selLayerBox = nullptr;
     m_settings = nullptr;
 
@@ -126,11 +126,11 @@ FOOTPRINT_EDIT_FRAME::FOOTPRINT_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent,
 
     // Create GAL canvas
     if( aBackend == EDA_DRAW_PANEL_GAL::GAL_TYPE_UNKNOWN )
-        m_canvasType = LoadCanvasTypeSetting();
+        m_canvasType = loadCanvasTypeSetting();
     else
         m_canvasType = aBackend;
 
-    PCB_DRAW_PANEL_GAL* drawPanel = new PCB_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_FrameSize,
+    PCB_DRAW_PANEL_GAL* drawPanel = new PCB_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_frameSize,
                                                             GetGalDisplayOptions(), m_canvasType );
     SetCanvas( drawPanel );
     SetBoard( new BOARD() );
@@ -276,7 +276,7 @@ FOOTPRINT_EDIT_FRAME::FOOTPRINT_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent,
 
     GetToolManager()->RunAction( ACTIONS::zoomFitScreen, false );
     updateTitle();
-    InitExitKey();
+    initExitKey();
     setupUnits( GetSettings() );
 
     // Default shutdown reason until a file is loaded
diff --git a/pcbnew/footprint_info_impl.cpp b/pcbnew/footprint_info_impl.cpp
index b8f4bc3510..61d7233cc7 100644
--- a/pcbnew/footprint_info_impl.cpp
+++ b/pcbnew/footprint_info_impl.cpp
@@ -174,8 +174,8 @@ bool FOOTPRINT_LIST_IMPL::ReadFootprintFiles( FP_LIB_TABLE* aTable, const wxStri
 }
 
 
-void FOOTPRINT_LIST_IMPL::StartWorkers( FP_LIB_TABLE* aTable, wxString const* aNickname,
-        FOOTPRINT_ASYNC_LOADER* aLoader, unsigned aNThreads )
+void FOOTPRINT_LIST_IMPL::startWorkers( FP_LIB_TABLE* aTable, wxString const* aNickname,
+                                        FOOTPRINT_ASYNC_LOADER* aLoader, unsigned aNThreads )
 {
     m_loader = aLoader;
     m_lib_table = aTable;
@@ -204,7 +204,7 @@ void FOOTPRINT_LIST_IMPL::StartWorkers( FP_LIB_TABLE* aTable, wxString const* aN
     }
 }
 
-void FOOTPRINT_LIST_IMPL::StopWorkers()
+void FOOTPRINT_LIST_IMPL::stopWorkers()
 {
     std::lock_guard<std::mutex> lock1( m_join );
 
@@ -224,7 +224,7 @@ void FOOTPRINT_LIST_IMPL::StopWorkers()
         m_list_timestamp = 0;
 }
 
-bool FOOTPRINT_LIST_IMPL::JoinWorkers()
+bool FOOTPRINT_LIST_IMPL::joinWorkers()
 {
     {
         std::lock_guard<std::mutex> lock1( m_join );
@@ -335,7 +335,7 @@ FOOTPRINT_LIST_IMPL::FOOTPRINT_LIST_IMPL() :
 
 FOOTPRINT_LIST_IMPL::~FOOTPRINT_LIST_IMPL()
 {
-    StopWorkers();
+    stopWorkers();
 }
 
 
diff --git a/pcbnew/footprint_info_impl.h b/pcbnew/footprint_info_impl.h
index 8ba047b242..3df0f3f896 100644
--- a/pcbnew/footprint_info_impl.h
+++ b/pcbnew/footprint_info_impl.h
@@ -101,11 +101,11 @@ class FOOTPRINT_LIST_IMPL : public FOOTPRINT_LIST
     bool CatchErrors( const std::function<void()>& aFunc );
 
 protected:
-    void StartWorkers( FP_LIB_TABLE* aTable, wxString const* aNickname,
+    void startWorkers( FP_LIB_TABLE* aTable, wxString const* aNickname,
                        FOOTPRINT_ASYNC_LOADER* aLoader, unsigned aNThreads ) override;
-    bool JoinWorkers() override;
+    bool joinWorkers() override;
 
-    void StopWorkers() override;
+    void stopWorkers() override;
 
     /**
      * Function loader_job
diff --git a/pcbnew/footprint_viewer_frame.cpp b/pcbnew/footprint_viewer_frame.cpp
index 8ef59009d1..fa67211444 100644
--- a/pcbnew/footprint_viewer_frame.cpp
+++ b/pcbnew/footprint_viewer_frame.cpp
@@ -116,7 +116,7 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( KIWAY* aKiway, wxWindow* aParent
     if( aFrameType == FRAME_FOOTPRINT_VIEWER_MODAL )
         SetModal( true );
 
-    m_AboutTitle = "Footprint Library Viewer";
+    m_aboutTitle = "Footprint Library Viewer";
 
     // Force the items to always snap
     m_magneticItems.pads     = MAGNETIC_OPTIONS::CAPTURE_ALWAYS;
@@ -168,8 +168,8 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( KIWAY* aKiway, wxWindow* aParent
     fpPanel->Fit();
 
     // Create GAL canvas
-    m_canvasType = LoadCanvasTypeSetting();
-    PCB_DRAW_PANEL_GAL* drawPanel = new PCB_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_FrameSize,
+    m_canvasType = loadCanvasTypeSetting();
+    PCB_DRAW_PANEL_GAL* drawPanel = new PCB_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_frameSize,
                                                             GetGalDisplayOptions(), m_canvasType );
     SetCanvas( drawPanel );
 
@@ -266,7 +266,7 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( KIWAY* aKiway, wxWindow* aParent
     GetCanvas()->GetView()->SetScale( cfg->m_FootprintViewerZoom );
 
     updateView();
-    InitExitKey();
+    initExitKey();
     setupUnits( config() );
 
     if( !IsModal() )        // For modal mode, calling ShowModal() will show this frame
diff --git a/pcbnew/footprint_wizard_frame.cpp b/pcbnew/footprint_wizard_frame.cpp
index f6cc8c2176..bc992f93e5 100644
--- a/pcbnew/footprint_wizard_frame.cpp
+++ b/pcbnew/footprint_wizard_frame.cpp
@@ -99,7 +99,7 @@ FOOTPRINT_WIZARD_FRAME::FOOTPRINT_WIZARD_FRAME( KIWAY* aKiway, wxWindow* aParent
     // Create the GAL canvas.
     // Must be created before calling LoadSettings() that needs a valid GAL canvas
     PCB_DRAW_PANEL_GAL* gal_drawPanel = new PCB_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ),
-                                                                m_FrameSize,
+                                                                m_frameSize,
                                                                 GetGalDisplayOptions(),
                                                                 EDA_DRAW_PANEL_GAL::GAL_FALLBACK );
     SetCanvas( gal_drawPanel );
@@ -113,7 +113,7 @@ FOOTPRINT_WIZARD_FRAME::FOOTPRINT_WIZARD_FRAME( KIWAY* aKiway, wxWindow* aParent
 
     LoadSettings( config() );
 
-    SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
+    SetSize( m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y );
 
     // Set some display options here, because the FOOTPRINT_WIZARD_FRAME
     // does not have a config menu to do that:
diff --git a/pcbnew/pad.cpp b/pcbnew/pad.cpp
index 82722d5267..1e7d869c83 100644
--- a/pcbnew/pad.cpp
+++ b/pcbnew/pad.cpp
@@ -826,7 +826,7 @@ void PAD::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>&
 
     aList.emplace_back( _( "NetClass" ), msg, CYAN );
 
-    aList.emplace_back( _( "Layer" ), LayerMaskDescribe(), DARKGREEN );
+    aList.emplace_back( _( "Layer" ), layerMaskDescribe(), DARKGREEN );
 
     // Show the pad shape, attribute and property
     wxString props = ShowPadAttr();
@@ -1056,14 +1056,14 @@ wxString PAD::GetSelectMenuText( EDA_UNITS aUnits ) const
     {
         return wxString::Format( _( "Pad of %s on %s" ),
                                  GetParent()->GetReference(),
-                                 LayerMaskDescribe() );
+                                 layerMaskDescribe() );
     }
     else
     {
         return wxString::Format( _( "Pad %s of %s on %s" ),
                                  GetName(),
                                  GetParent()->GetReference(),
-                                 LayerMaskDescribe() );
+                                 layerMaskDescribe() );
     }
 }
 
diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index 686285b39e..1c47611985 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -186,10 +186,10 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
     m_ZoneFillsDirty = true;
 
     m_rotationAngle = 900;
-    m_AboutTitle = "Pcbnew";
+    m_aboutTitle = "Pcbnew";
 
     // Create GAL canvas
-    auto canvas = new PCB_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_FrameSize,
+    auto canvas = new PCB_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_frameSize,
                                           GetGalDisplayOptions(),
                                           EDA_DRAW_PANEL_GAL::GAL_FALLBACK );
 
@@ -310,9 +310,9 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
     // to calculate the wrong zoom size.  See PCB_EDIT_FRAME::onSize().
     Bind( wxEVT_SIZE, &PCB_EDIT_FRAME::onSize, this );
 
-    ResolveCanvasType();
+    resolveCanvasType();
 
-    InitExitKey();
+    initExitKey();
     setupUnits( config() );
 
     // Ensure the Python interpreter is up to date with its environment variables
diff --git a/pcbnew/pcbnew_printout.cpp b/pcbnew/pcbnew_printout.cpp
index f750092a5b..4292bd667d 100644
--- a/pcbnew/pcbnew_printout.cpp
+++ b/pcbnew/pcbnew_printout.cpp
@@ -51,7 +51,7 @@ void PCBNEW_PRINTOUT_SETTINGS::Load( APP_SETTINGS_BASE* aConfig )
     {
         m_drillMarks = static_cast<DRILL_MARK_SHAPE_T>( cfg->m_Plot.pads_drill_mode );
         m_pagination = static_cast<PAGINATION_T>( cfg->m_Plot.all_layers_on_one_page );
-        m_mirror     = cfg->m_Plot.mirror;
+        m_Mirror     = cfg->m_Plot.mirror;
     }
 }
 
@@ -64,7 +64,7 @@ void PCBNEW_PRINTOUT_SETTINGS::Save( APP_SETTINGS_BASE* aConfig )
     {
         cfg->m_Plot.pads_drill_mode        = m_drillMarks;
         cfg->m_Plot.all_layers_on_one_page = m_pagination;
-        cfg->m_Plot.mirror                 = m_mirror;
+        cfg->m_Plot.mirror                 = m_Mirror;
     }
 }
 
@@ -81,7 +81,7 @@ bool PCBNEW_PRINTOUT::OnPrintPage( int aPage )
 {
     // Store the layerset, as it is going to be modified below and the original settings are
     // needed.
-    LSET         lset = m_settings.m_layerSet;
+    LSET         lset = m_settings.m_LayerSet;
     int          pageCount = lset.count();
     wxString     layerName;
     PCB_LAYER_ID extractLayer;
@@ -95,13 +95,13 @@ bool PCBNEW_PRINTOUT::OnPrintPage( int aPage )
 
         // aPage starts at 1, not 0
         if( unsigned( aPage - 1 ) < seq.size() )
-            m_settings.m_layerSet = LSET( seq[aPage - 1] );
+            m_settings.m_LayerSet = LSET( seq[ aPage - 1] );
     }
 
-    if( !m_settings.m_layerSet.any() )
+    if( !m_settings.m_LayerSet.any() )
         return false;
 
-    extractLayer = m_settings.m_layerSet.ExtractLayer();
+    extractLayer = m_settings.m_LayerSet.ExtractLayer();
 
     if( extractLayer == UNDEFINED_LAYER )
         layerName = _( "Multiple Layers" );
@@ -110,12 +110,12 @@ bool PCBNEW_PRINTOUT::OnPrintPage( int aPage )
 
     // In Pcbnew we can want the layer EDGE always printed
     if( !m_pcbnewSettings.m_noEdgeLayer )
-        m_settings.m_layerSet.set( Edge_Cuts );
+        m_settings.m_LayerSet.set( Edge_Cuts );
 
     DrawPage( layerName, aPage, pageCount );
 
     // Restore the original layer set, so the next page can be printed
-    m_settings.m_layerSet = lset;
+    m_settings.m_LayerSet = lset;
 
     return true;
 }
@@ -131,7 +131,7 @@ void PCBNEW_PRINTOUT::setupViewLayers( KIGFX::VIEW& aView, const LSET& aLayerSet
 {
     BOARD_PRINTOUT::setupViewLayers( aView, aLayerSet );
 
-    for( LSEQ layerSeq = m_settings.m_layerSet.Seq(); layerSeq; ++layerSeq )
+    for( LSEQ layerSeq = m_settings.m_LayerSet.Seq(); layerSeq; ++layerSeq )
     {
         aView.SetLayerVisible( PCBNEW_LAYER_ID_START + *layerSeq, true );
 
diff --git a/pcbnew/tools/group_tool.cpp b/pcbnew/tools/group_tool.cpp
index 27dfb0ef1e..e980f9939e 100644
--- a/pcbnew/tools/group_tool.cpp
+++ b/pcbnew/tools/group_tool.cpp
@@ -75,7 +75,7 @@ DIALOG_GROUP_PROPERTIES::DIALOG_GROUP_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent,
     SetInitialFocus( m_nameCtrl );
 
     // Now all widgets have the size fixed, call FinishDialogSettings
-    FinishDialogSettings();
+    finishDialogSettings();
 }
 
 
diff --git a/pcbnew/tools/point_editor.cpp b/pcbnew/tools/point_editor.cpp
index aad2413c4c..e3b0a00a73 100644
--- a/pcbnew/tools/point_editor.cpp
+++ b/pcbnew/tools/point_editor.cpp
@@ -679,7 +679,7 @@ void POINT_EDITOR::editArcEndpointKeepTangent( PCB_SHAPE* aArc, VECTOR2I aCenter
         double delta = ( R * R - v2.x * v2.x - v2.y * v2.y ) / ( 2 * v2.x - 2 * R );
 
         // This is just to limit the radius, so nothing overflows later when drawing.
-        if( abs( v2.y / ( R - v2.x ) ) > ADVANCED_CFG::GetCfg().m_drawArcCenterMaxAngle )
+        if( abs( v2.y / ( R - v2.x ) ) > ADVANCED_CFG::GetCfg().m_DrawArcCenterMaxAngle )
         {
             arcValid = false;
         }
@@ -1002,7 +1002,7 @@ void POINT_EDITOR::editArcMidKeepEnpoints( PCB_SHAPE* aArc, VECTOR2I aCenter, VE
     RotatePoint( &( endTest.x ), &( endTest.y ), aCenter.x, aCenter.y, -newAngle );
     double distance = ( endTest - aEnd ).SquaredEuclideanNorm();
 
-    if( distance > ADVANCED_CFG::GetCfg().m_drawArcAccuracy )
+    if( distance > ADVANCED_CFG::GetCfg().m_DrawArcAccuracy )
     {
         // Cancel Everything
         // If the accuracy is low, we can't draw precisely the arc.
diff --git a/pcbnew/track.cpp b/pcbnew/track.cpp
index 614c5a113a..36ac1b22bb 100644
--- a/pcbnew/track.cpp
+++ b/pcbnew/track.cpp
@@ -89,7 +89,7 @@ wxString VIA::GetSelectMenuText( EDA_UNITS aUnits ) const
 
     return wxString::Format( formatStr,
                              GetNetnameMsg(),
-                             LayerMaskDescribe() );
+                             layerMaskDescribe() );
 }
 
 
@@ -607,7 +607,7 @@ void TRACK::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>
     GetMsgPanelInfoBase_Common( aFrame, aList );
 
     // Display layer
-    aList.emplace_back( _( "Layer" ), LayerMaskDescribe(), DARKGREEN );
+    aList.emplace_back( _( "Layer" ), layerMaskDescribe(), DARKGREEN );
 
     // Display width
     msg = MessageTextFromValue( aFrame->GetUserUnits(), m_Width );
@@ -672,7 +672,7 @@ void VIA::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>&
     GetMsgPanelInfoBase_Common( aFrame, aList );
 
     // Display layer pair
-    aList.emplace_back( _( "Layer" ), LayerMaskDescribe(), DARKGREEN );
+    aList.emplace_back( _( "Layer" ), layerMaskDescribe(), DARKGREEN );
 
     // Display width
     msg = MessageTextFromValue( aFrame->GetUserUnits(), m_Width );
@@ -761,7 +761,7 @@ void TRACK::GetMsgPanelInfoBase_Common( EDA_DRAW_FRAME* aFrame, std::vector<MSG_
 }
 
 
-wxString VIA::LayerMaskDescribe() const
+wxString VIA::layerMaskDescribe() const
 {
     BOARD*       board = GetBoard();
     PCB_LAYER_ID top_layer;
diff --git a/pcbnew/track.h b/pcbnew/track.h
index 733a4e5476..f4680777ea 100644
--- a/pcbnew/track.h
+++ b/pcbnew/track.h
@@ -517,7 +517,7 @@ public:
     std::shared_ptr<SHAPE> GetEffectiveShape( PCB_LAYER_ID aLayer = UNDEFINED_LAYER ) const override;
 
 protected:
-    wxString LayerMaskDescribe() const override;
+    wxString layerMaskDescribe() const override;
 
 private:
     /// The bottom layer of the via (the top layer is in m_layer)
diff --git a/utils/kicad2step/pcb/3d_resolver.cpp b/utils/kicad2step/pcb/3d_resolver.cpp
index 4f00bcb068..4f07685f79 100644
--- a/utils/kicad2step/pcb/3d_resolver.cpp
+++ b/utils/kicad2step/pcb/3d_resolver.cpp
@@ -138,9 +138,9 @@ bool S3D_RESOLVER::SetProjectDir( const wxString& aProjDir, bool* flgChanged )
     if( m_Paths.empty() )
     {
         SEARCH_PATH al;
-        al.m_alias = "${KIPRJMOD}";
-        al.m_pathvar = "${KIPRJMOD}";
-        al.m_pathexp = m_curProjDir;
+        al.m_Alias = "${KIPRJMOD}";
+        al.m_Pathvar = "${KIPRJMOD}";
+        al.m_Pathexp = m_curProjDir;
         m_Paths.push_back( al );
         m_NameMap.clear();
 
@@ -150,9 +150,9 @@ bool S3D_RESOLVER::SetProjectDir( const wxString& aProjDir, bool* flgChanged )
     }
     else
     {
-        if( m_Paths.front().m_pathexp.Cmp( m_curProjDir ) )
+        if( m_Paths.front().m_Pathexp.Cmp( m_curProjDir ) )
         {
-            m_Paths.front().m_pathexp = m_curProjDir;
+            m_Paths.front().m_Pathexp = m_curProjDir;
             m_NameMap.clear();
 
             if( flgChanged )
@@ -170,7 +170,7 @@ bool S3D_RESOLVER::SetProjectDir( const wxString& aProjDir, bool* flgChanged )
         std::ostringstream ostr;
         ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
         ostr << " * [INFO] changed project dir to ";
-        ostr << m_Paths.front().m_pathexp.ToUTF8();
+        ostr << m_Paths.front().m_Pathexp.ToUTF8();
         wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() );
     } while( 0 );
 #endif
@@ -197,9 +197,9 @@ bool S3D_RESOLVER::createPathList( void )
     // the user may change this later with a call to SetProjectDir()
 
     SEARCH_PATH lpath;
-    lpath.m_alias = "${KIPRJMOD}";
-    lpath.m_pathvar = "${KIPRJMOD}";
-    lpath.m_pathexp = m_curProjDir;
+    lpath.m_Alias = "${KIPRJMOD}";
+    lpath.m_Pathvar = "${KIPRJMOD}";
+    lpath.m_Pathexp = m_curProjDir;
     m_Paths.push_back( lpath );
     wxFileName fndummy;
     wxUniChar psep = fndummy.GetPathSeparator();
@@ -250,12 +250,12 @@ bool S3D_RESOLVER::createPathList( void )
         if( tmp == "${KISYS3DMOD}" )
             hasKISYS3DMOD = true;
 
-        lpath.m_alias =  tmp;
-        lpath.m_pathvar = tmp;
-        lpath.m_pathexp = fndummy.GetFullPath();
+        lpath.m_Alias =  tmp;
+        lpath.m_Pathvar = tmp;
+        lpath.m_Pathexp = fndummy.GetFullPath();
 
-        if( !lpath.m_pathexp.empty() && psep == *lpath.m_pathexp.rbegin() )
-            lpath.m_pathexp.erase( --lpath.m_pathexp.end() );
+        if( !lpath.m_Pathexp.empty() && psep == *lpath.m_Pathexp.rbegin() )
+            lpath.m_Pathexp.erase( --lpath.m_Pathexp.end() );
 
         m_Paths.push_back( lpath );
 
@@ -268,19 +268,19 @@ bool S3D_RESOLVER::createPathList( void )
 
     if( !hasKISYS3DMOD && wxGetEnv( "KISYS3DMOD", &envar ) )
     {
-        lpath.m_alias = "${KISYS3DMOD}";
-        lpath.m_pathvar = "${KISYS3DMOD}";
+        lpath.m_Alias = "${KISYS3DMOD}";
+        lpath.m_Pathvar = "${KISYS3DMOD}";
         fndummy.Assign( envar, "" );
         fndummy.Normalize();
 
         if( fndummy.DirExists() )
         {
-            lpath.m_pathexp = fndummy.GetFullPath();
+            lpath.m_Pathexp = fndummy.GetFullPath();
 
-            if( !lpath.m_pathexp.empty() && psep == *lpath.m_pathexp.rbegin() )
-                lpath.m_pathexp.erase( --lpath.m_pathexp.end() );
+            if( !lpath.m_Pathexp.empty() && psep == *lpath.m_Pathexp.rbegin() )
+                lpath.m_Pathexp.erase( --lpath.m_Pathexp.end() );
 
-            if( !lpath.m_pathexp.empty() )
+            if( !lpath.m_Pathexp.empty() )
                 m_Paths.push_back( lpath );
         }
 
@@ -299,7 +299,7 @@ bool S3D_RESOLVER::createPathList( void )
 
     while( sPL != ePL )
     {
-        wxLogTrace( MASK_3D_RESOLVER, "   + '%s'\n", (*sPL).m_pathexp.ToUTF8() );
+        wxLogTrace( MASK_3D_RESOLVER, "   + '%s'\n", (*sPL).m_Pathexp.ToUTF8() );
         ++sPL;
     }
 #endif
@@ -312,7 +312,7 @@ bool S3D_RESOLVER::UpdatePathList( std::vector< SEARCH_PATH >& aPathList )
 {
     wxUniChar envMarker( '$' );
 
-    while( !m_Paths.empty() && envMarker != *m_Paths.back().m_alias.rbegin() )
+    while( !m_Paths.empty() && envMarker != *m_Paths.back().m_Alias.rbegin() )
         m_Paths.pop_back();
 
     size_t nI = aPathList.size();
@@ -417,9 +417,9 @@ wxString S3D_RESOLVER::ResolvePath( const wxString& aFileName )
     // This check is performed before checking the path relative to
     // ${KISYS3DMOD} so that users can potentially override a model
     // within ${KISYS3DMOD}
-    if( !sPL->m_pathexp.empty() && !tname.StartsWith( ":" ) )
+    if( !sPL->m_Pathexp.empty() && !tname.StartsWith( ":" ) )
     {
-        tmpFN.Assign( sPL->m_pathexp, "" );
+        tmpFN.Assign( sPL->m_Pathexp, "" );
         wxString fullPath = tmpFN.GetPathWithSep() + tname;
 
         if( fullPath.StartsWith( "${" ) || fullPath.StartsWith( "$(" ) )
@@ -457,7 +457,7 @@ wxString S3D_RESOLVER::ResolvePath( const wxString& aFileName )
     }
 
     // ${ENV_VAR} paths have already been checked; skip them
-    while( sPL != ePL && ( sPL->m_alias.StartsWith( "${" ) || sPL->m_alias.StartsWith( "$(" ) ) )
+    while( sPL != ePL && ( sPL->m_Alias.StartsWith( "${" ) || sPL->m_Alias.StartsWith( "$(" ) ) )
         ++sPL;
 
     // at this point the filename must contain an alias or else it is invalid
@@ -482,9 +482,9 @@ wxString S3D_RESOLVER::ResolvePath( const wxString& aFileName )
 
     while( sPL != ePL )
     {
-        if( !sPL->m_alias.Cmp( alias ) && !sPL->m_pathexp.empty() )
+        if( !sPL->m_Alias.Cmp( alias ) && !sPL->m_Pathexp.empty() )
         {
-            wxFileName fpath( wxFileName::DirName( sPL->m_pathexp ) );
+            wxFileName fpath( wxFileName::DirName( sPL->m_Pathexp ) );
             wxString fullPath = fpath.GetPathWithSep() + relpath;
 
             if( fullPath.StartsWith( "${") || fullPath.StartsWith( "$(" ) )
@@ -520,7 +520,7 @@ wxString S3D_RESOLVER::ResolvePath( const wxString& aFileName )
 
 bool S3D_RESOLVER::addPath( const SEARCH_PATH& aPath )
 {
-    if( aPath.m_alias.empty() || aPath.m_pathvar.empty() )
+    if( aPath.m_Alias.empty() || aPath.m_Pathvar.empty() )
         return false;
 
     std::lock_guard<std::mutex> lock( mutex3D_resolver );
@@ -528,39 +528,39 @@ bool S3D_RESOLVER::addPath( const SEARCH_PATH& aPath )
     SEARCH_PATH tpath = aPath;
 
 #ifdef _WIN32
-    while( tpath.m_pathvar.EndsWith( "\\" ) )
-        tpath.m_pathvar.erase( tpath.m_pathvar.length() - 1 );
+    while( tpath.m_Pathvar.EndsWith( "\\" ) )
+        tpath.m_Pathvar.erase( tpath.m_Pathvar.length() - 1 );
 #else
-    while( tpath.m_pathvar.EndsWith( "/" ) &&  tpath.m_pathvar.length() > 1 )
-        tpath.m_pathvar.erase( tpath.m_pathvar.length() - 1 );
+    while( tpath.m_Pathvar.EndsWith( "/" ) && tpath.m_Pathvar.length() > 1 )
+        tpath.m_Pathvar.erase( tpath.m_Pathvar.length() - 1 );
 #endif
 
-    wxFileName path( tpath.m_pathvar, "" );
+    wxFileName path( tpath.m_Pathvar, "" );
     path.Normalize();
 
     if( !path.DirExists() )
     {
         // suppress the message if the missing pathvar is the legacy KISYS3DMOD variable
-        if( aPath.m_pathvar != "${KISYS3DMOD}" && aPath.m_pathvar != "$(KISYS3DMOD)" )
+        if( aPath.m_Pathvar != "${KISYS3DMOD}" && aPath.m_Pathvar != "$(KISYS3DMOD)" )
         {
             wxString msg = _( "The given path does not exist" );
             msg.append( "\n" );
-            msg.append( tpath.m_pathvar );
+            msg.append( tpath.m_Pathvar );
             wxLogMessage( "%s\n", msg.ToUTF8() );
         }
 
-        tpath.m_pathexp.clear();
+        tpath.m_Pathexp.clear();
     }
     else
     {
-        tpath.m_pathexp = path.GetFullPath();
+        tpath.m_Pathexp = path.GetFullPath();
 
 #ifdef _WIN32
-        while( tpath.m_pathexp.EndsWith( "\\" ) )
-        tpath.m_pathexp.erase( tpath.m_pathexp.length() - 1 );
+        while( tpath.m_Pathexp.EndsWith( "\\" ) )
+        tpath.m_Pathexp.erase( tpath.m_Pathexp.length() - 1 );
 #else
-        while( tpath.m_pathexp.EndsWith( "/" ) &&  tpath.m_pathexp.length() > 1 )
-            tpath.m_pathexp.erase( tpath.m_pathexp.length() - 1 );
+        while( tpath.m_Pathexp.EndsWith( "/" ) && tpath.m_Pathexp.length() > 1 )
+            tpath.m_Pathexp.erase( tpath.m_Pathexp.length() - 1 );
 #endif
     }
 
@@ -570,16 +570,16 @@ bool S3D_RESOLVER::addPath( const SEARCH_PATH& aPath )
 
     while( sPL != ePL )
     {
-        if( !tpath.m_alias.Cmp( sPL->m_alias ) )
+        if( !tpath.m_Alias.Cmp( sPL->m_Alias ) )
         {
             wxString msg = _( "Alias:" ) + wxS( " " );
-            msg.append( tpath.m_alias );
+            msg.append( tpath.m_Alias );
             msg.append( "\n" );
             msg.append( _( "This path:" ) + wxS( " " ) );
-            msg.append( tpath.m_pathvar );
+            msg.append( tpath.m_Pathvar );
             msg.append( "\n" );
             msg.append( _( "Existing path:" ) + wxS( " " ) );
-            msg.append( sPL->m_pathvar );
+            msg.append( sPL->m_Pathvar );
             wxMessageBox( msg, _( "Bad alias (duplicate name)" ) );
 
             return false;
@@ -671,17 +671,17 @@ bool S3D_RESOLVER::readPathList( void )
 
         idx = 0;
 
-        if( !getHollerith( cfgLine, idx, al.m_alias ) )
+        if( !getHollerith( cfgLine, idx, al.m_Alias ) )
             continue;
 
         // never add on KISYS3DMOD from a config file
-        if( !al.m_alias.Cmp( "KISYS3DMOD" ) )
+        if( !al.m_Alias.Cmp( "KISYS3DMOD" ) )
             continue;
 
-        if( !getHollerith( cfgLine, idx, al.m_pathvar ) )
+        if( !getHollerith( cfgLine, idx, al.m_Pathvar ) )
             continue;
 
-        if( !getHollerith( cfgLine, idx, al.m_description ) )
+        if( !getHollerith( cfgLine, idx, al.m_Description ) )
             continue;
 
         addPath( al );
@@ -717,8 +717,8 @@ bool S3D_RESOLVER::writePathList( void )
     std::list< SEARCH_PATH >::const_iterator sPL = m_Paths.begin();
     std::list< SEARCH_PATH >::const_iterator ePL = m_Paths.end();
 
-    while( sPL != ePL && ( sPL->m_alias.StartsWith( "${" )
-                           || sPL->m_alias.StartsWith( "$(" ) ) )
+    while( sPL != ePL && ( sPL->m_Alias.StartsWith( "${" )
+                           || sPL->m_Alias.StartsWith( "$(" ) ) )
         ++sPL;
 
     wxFileName cfgpath( m_ConfigDir, S3D_RESOLVER_CONFIG );
@@ -770,11 +770,11 @@ bool S3D_RESOLVER::writePathList( void )
 
     while( sPL != ePL )
     {
-        tstr = sPL->m_alias.ToUTF8();
+        tstr = sPL->m_Alias.ToUTF8();
         cfgFile << "\"" << tstr.size() << ":" << tstr << "\",";
-        tstr = sPL->m_pathvar.ToUTF8();
+        tstr = sPL->m_Pathvar.ToUTF8();
         cfgFile << "\"" << tstr.size() << ":" << tstr << "\",";
-        tstr = sPL->m_description.ToUTF8();
+        tstr = sPL->m_Description.ToUTF8();
         cfgFile << "\"" << tstr.size() << ":" << tstr << "\"\n";
         ++sPL;
     }
@@ -822,31 +822,31 @@ void S3D_RESOLVER::checkEnvVarPath( const wxString& aPath )
 
     while( sPL != ePL )
     {
-        if( sPL->m_alias == envar )
+        if( sPL->m_Alias == envar )
             return;
 
-        if( !sPL->m_alias.StartsWith( "${" ) )
+        if( !sPL->m_Alias.StartsWith( "${" ) )
             break;
 
         ++sPL;
     }
 
     SEARCH_PATH lpath;
-    lpath.m_alias = envar;
-    lpath.m_pathvar = lpath.m_alias;
-    wxFileName tmpFN( lpath.m_alias, "" );
+    lpath.m_Alias = envar;
+    lpath.m_Pathvar = lpath.m_Alias;
+    wxFileName tmpFN( lpath.m_Alias, "" );
     wxUniChar psep = tmpFN.GetPathSeparator();
     tmpFN.Normalize();
 
     if( !tmpFN.DirExists() )
         return;
 
-    lpath.m_pathexp = tmpFN.GetFullPath();
+    lpath.m_Pathexp = tmpFN.GetFullPath();
 
-    if( !lpath.m_pathexp.empty() && psep == *lpath.m_pathexp.rbegin() )
-        lpath.m_pathexp.erase( --lpath.m_pathexp.end() );
+    if( !lpath.m_Pathexp.empty() && psep == *lpath.m_Pathexp.rbegin() )
+        lpath.m_Pathexp.erase( --lpath.m_Pathexp.end() );
 
-    if( lpath.m_pathexp.empty() )
+    if( lpath.m_Pathexp.empty() )
         return;
 
     m_Paths.insert( sPL, lpath );
@@ -904,13 +904,13 @@ wxString S3D_RESOLVER::ShortenPath( const wxString& aFullPathName )
     {
         // undefined paths do not participate in the
         // file name shortening procedure
-        if( sL->m_pathexp.empty() )
+        if( sL->m_Pathexp.empty() )
         {
             ++sL;
             continue;
         }
 
-        wxFileName fpath( sL->m_pathexp, "" );
+        wxFileName fpath( sL->m_Pathexp, "" );
         wxString fps = fpath.GetPathWithSep();
         wxString tname;
 
@@ -925,10 +925,10 @@ wxString S3D_RESOLVER::ShortenPath( const wxString& aFullPathName )
             fname.Replace( "\\", "/" );
 #endif
 
-            if( sL->m_alias.StartsWith( "${" ) || sL->m_alias.StartsWith( "$(" ) )
+            if( sL->m_Alias.StartsWith( "${" ) || sL->m_Alias.StartsWith( "$(" ) )
             {
                 // old style ENV_VAR
-                tname = sL->m_alias;
+                tname = sL->m_Alias;
                 tname.Append( "/" );
                 tname.append( fname );
             }
@@ -936,7 +936,7 @@ wxString S3D_RESOLVER::ShortenPath( const wxString& aFullPathName )
             {
                 // new style alias
                 tname = ":";
-                tname.append( sL->m_alias );
+                tname.append( sL->m_Alias );
                 tname.append( ":" );
                 tname.append( fname );
             }
diff --git a/utils/kicad2step/pcb/3d_resolver.h b/utils/kicad2step/pcb/3d_resolver.h
index e9ec2d1825..d30ea46624 100644
--- a/utils/kicad2step/pcb/3d_resolver.h
+++ b/utils/kicad2step/pcb/3d_resolver.h
@@ -93,10 +93,10 @@ class KICADPCB;
 
 struct SEARCH_PATH
 {
-    wxString m_alias;           // alias to the base path
-    wxString m_pathvar;         // base path as stored in the config file
-    wxString m_pathexp;         // expanded base path
-    wxString m_description;     // description of the aliased path
+    wxString m_Alias;           // alias to the base path
+    wxString m_Pathvar;         // base path as stored in the config file
+    wxString m_Pathexp;         // expanded base path
+    wxString m_Description;     // description of the aliased path
 };
 
 class S3D_RESOLVER