diff --git a/common/tool/tool_manager.cpp b/common/tool/tool_manager.cpp
index 43cb53a8e3..6d3966c9e7 100644
--- a/common/tool/tool_manager.cpp
+++ b/common/tool/tool_manager.cpp
@@ -977,6 +977,6 @@ void TOOL_MANAGER::UpdateUI()
     if( frame )
     {
         frame->UpdateStatusBar();
-        frame->SyncMenusAndToolbars();
+        frame->SyncToolbars();
     }
 }
diff --git a/cvpcb/display_footprints_frame.cpp b/cvpcb/display_footprints_frame.cpp
index 42583e1163..aeb3611ebf 100644
--- a/cvpcb/display_footprints_frame.cpp
+++ b/cvpcb/display_footprints_frame.cpp
@@ -445,7 +445,7 @@ void DISPLAY_FOOTPRINTS_FRAME::UpdateMsgPanel()
 }
 
 
-void DISPLAY_FOOTPRINTS_FRAME::SyncMenusAndToolbars()
+void DISPLAY_FOOTPRINTS_FRAME::SyncToolbars()
 {
     m_mainToolBar->Toggle( ACTIONS::zoomTool, GetToolId() == ID_ZOOM_SELECTION );
     m_mainToolBar->Refresh();
diff --git a/cvpcb/display_footprints_frame.h b/cvpcb/display_footprints_frame.h
index e87c90b2fc..cc8e8c3e85 100644
--- a/cvpcb/display_footprints_frame.h
+++ b/cvpcb/display_footprints_frame.h
@@ -127,7 +127,7 @@ public:
         // currently: do nothing in CvPcb.
     }
 
-    void SyncMenusAndToolbars() override;
+    void SyncToolbars() override;
 
     DECLARE_EVENT_TABLE()
 };
diff --git a/eeschema/libedit/lib_edit_frame.h b/eeschema/libedit/lib_edit_frame.h
index 1880ae0345..7b6fff4fb5 100644
--- a/eeschema/libedit/lib_edit_frame.h
+++ b/eeschema/libedit/lib_edit_frame.h
@@ -452,7 +452,7 @@ public:
 
     void ShowChangedLanguage() override;
 
-    void SyncMenusAndToolbars() override;
+    void SyncToolbars() override;
 
     void SetScreen( BASE_SCREEN* aScreen ) override;
 
diff --git a/eeschema/libedit/libedit.cpp b/eeschema/libedit/libedit.cpp
index cb59815dac..c087b6e2d4 100644
--- a/eeschema/libedit/libedit.cpp
+++ b/eeschema/libedit/libedit.cpp
@@ -251,7 +251,7 @@ bool LIB_EDIT_FRAME::LoadOneLibraryPartAux( LIB_ALIAS* aEntry, const wxString& a
     updateTitle();
     RebuildSymbolUnitsList();
     SetShowDeMorgan( GetCurPart()->HasConversion() );
-    SyncMenusAndToolbars();
+    SyncToolbars();
 
     // Display the document information based on the entry selected just in
     // case the entry is an alias.
diff --git a/eeschema/libedit/toolbars_libedit.cpp b/eeschema/libedit/toolbars_libedit.cpp
index 64aa0274b7..78ccd532e7 100644
--- a/eeschema/libedit/toolbars_libedit.cpp
+++ b/eeschema/libedit/toolbars_libedit.cpp
@@ -156,7 +156,7 @@ void LIB_EDIT_FRAME::ReCreateOptToolbar()
 }
 
 
-void LIB_EDIT_FRAME::SyncMenusAndToolbars()
+void LIB_EDIT_FRAME::SyncToolbars()
 {
     KIGFX::GAL_DISPLAY_OPTIONS& galOpts = GetGalDisplayOptions();
 
diff --git a/eeschema/sch_edit_frame.h b/eeschema/sch_edit_frame.h
index eb685cfd3c..045d5c528b 100644
--- a/eeschema/sch_edit_frame.h
+++ b/eeschema/sch_edit_frame.h
@@ -1097,7 +1097,7 @@ public:
 
     void ShowChangedLanguage() override;
 
-    void SyncMenusAndToolbars() override;
+    void SyncToolbars() override;
 
     void SetScreen( BASE_SCREEN* aScreen ) override;
 
diff --git a/eeschema/toolbars_sch_editor.cpp b/eeschema/toolbars_sch_editor.cpp
index d8e771bb2a..e9ca6be507 100644
--- a/eeschema/toolbars_sch_editor.cpp
+++ b/eeschema/toolbars_sch_editor.cpp
@@ -167,7 +167,7 @@ void SCH_EDIT_FRAME::ReCreateOptToolbar()
 }
 
 
-void SCH_EDIT_FRAME::SyncMenusAndToolbars()
+void SCH_EDIT_FRAME::SyncToolbars()
 {
     KIGFX::GAL_DISPLAY_OPTIONS& galOpts = GetGalDisplayOptions();
     SCH_SHEET_LIST              sheetList( g_RootSheet );
diff --git a/eeschema/toolbars_viewlib.cpp b/eeschema/toolbars_viewlib.cpp
index 9a72decfd7..1754199b6a 100644
--- a/eeschema/toolbars_viewlib.cpp
+++ b/eeschema/toolbars_viewlib.cpp
@@ -146,7 +146,7 @@ void LIB_VIEW_FRAME::ReCreateMenuBar()
 }
 
 
-void LIB_VIEW_FRAME::SyncMenusAndToolbars()
+void LIB_VIEW_FRAME::SyncToolbars()
 {
     LIB_PART*  symbol = GetSelectedSymbol();
     LIB_ALIAS* alias = GetSelectedAlias();
diff --git a/eeschema/viewlib_frame.h b/eeschema/viewlib_frame.h
index 6ec95bb995..1462acac5f 100644
--- a/eeschema/viewlib_frame.h
+++ b/eeschema/viewlib_frame.h
@@ -138,7 +138,7 @@ public:
 
     const BOX2I GetDocumentExtents() const override;
 
-    void SyncMenusAndToolbars() override;
+    void SyncToolbars() override;
 
 private:
     // Sets up the tool framework
diff --git a/gerbview/gerbview_frame.h b/gerbview/gerbview_frame.h
index cd2217cffb..8953e597e6 100644
--- a/gerbview/gerbview_frame.h
+++ b/gerbview/gerbview_frame.h
@@ -592,7 +592,7 @@ public:
      */
     void CommonSettingsChanged() override;
 
-    void SyncMenusAndToolbars() override;
+    void SyncToolbars() override;
 
     DECLARE_EVENT_TABLE()
 };
diff --git a/gerbview/toolbars_gerber.cpp b/gerbview/toolbars_gerber.cpp
index dc28857381..636f7f6201 100644
--- a/gerbview/toolbars_gerber.cpp
+++ b/gerbview/toolbars_gerber.cpp
@@ -463,7 +463,7 @@ void GERBVIEW_FRAME::OnUpdateLayerSelectBox( wxUpdateUIEvent& aEvent )
 }
 
 
-void GERBVIEW_FRAME::SyncMenusAndToolbars()
+void GERBVIEW_FRAME::SyncToolbars()
 {
     KIGFX::GAL_DISPLAY_OPTIONS& galOpts = GetGalDisplayOptions();
 
diff --git a/include/eda_base_frame.h b/include/eda_base_frame.h
index 1f9af1a0f9..ba5a56d16f 100644
--- a/include/eda_base_frame.h
+++ b/include/eda_base_frame.h
@@ -414,7 +414,7 @@ public:
      * Update the toolbars (mostly settings/check buttons/checkboxes) with the current 
      * controller state.
      */
-    virtual void SyncMenusAndToolbars() { };
+    virtual void SyncToolbars() { };
 
     /**
      * Redraw the menus and what not in current language.
diff --git a/kicad/kicad_manager_frame.h b/kicad/kicad_manager_frame.h
index 3c5bbaafdd..005d2f1a53 100644
--- a/kicad/kicad_manager_frame.h
+++ b/kicad/kicad_manager_frame.h
@@ -147,7 +147,7 @@ public:
      */
     void OnChangeWatchedPaths( wxCommandEvent& aEvent );
 
-    void SyncMenusAndToolbars() override;
+    void SyncToolbars() override;
 
     void SetProjectFileName( const wxString& aFullProjectProFileName );
     const wxString GetProjectFileName();
diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp
index bb2b756e9b..f7f6d20908 100644
--- a/kicad/menubar.cpp
+++ b/kicad/menubar.cpp
@@ -223,7 +223,7 @@ void KICAD_MANAGER_FRAME::RecreateLauncher()
 }
 
 
-void KICAD_MANAGER_FRAME::SyncMenusAndToolbars()
+void KICAD_MANAGER_FRAME::SyncToolbars()
 {
     m_launcher->Toggle( KICAD_MANAGER_ACTIONS::editSchematic,  m_active_project );
     m_launcher->Toggle( KICAD_MANAGER_ACTIONS::editSymbols,    m_active_project );
diff --git a/pagelayout_editor/pl_editor_frame.h b/pagelayout_editor/pl_editor_frame.h
index ce85d6ccf0..db9ea26eea 100644
--- a/pagelayout_editor/pl_editor_frame.h
+++ b/pagelayout_editor/pl_editor_frame.h
@@ -162,7 +162,7 @@ public:
     void    ReCreateMenuBar() override;
     double  BestZoom() override;
 
-    void    SyncMenusAndToolbars() override;
+    void    SyncToolbars() override;
 
     const PL_EDITOR_LAYOUT& GetPageLayout() const { return m_pageLayout; }
     PL_EDITOR_LAYOUT& GetPageLayout() { return m_pageLayout; }
diff --git a/pagelayout_editor/toolbars_pl_editor.cpp b/pagelayout_editor/toolbars_pl_editor.cpp
index 89793270a9..e34a28a726 100644
--- a/pagelayout_editor/toolbars_pl_editor.cpp
+++ b/pagelayout_editor/toolbars_pl_editor.cpp
@@ -143,7 +143,7 @@ void PL_EDITOR_FRAME::ReCreateOptToolbar()
 }
 
 
-void PL_EDITOR_FRAME::SyncMenusAndToolbars()
+void PL_EDITOR_FRAME::SyncToolbars()
 {
     m_mainToolBar->Toggle( ACTIONS::save, GetScreen() && GetScreen()->IsModify() );
     m_mainToolBar->Toggle( ACTIONS::undo, GetScreen() && GetScreen()->GetUndoCommandCount() > 0 );
diff --git a/pcbnew/footprint_edit_frame.h b/pcbnew/footprint_edit_frame.h
index 9ca8f2ad98..0dee7cc28e 100644
--- a/pcbnew/footprint_edit_frame.h
+++ b/pcbnew/footprint_edit_frame.h
@@ -336,7 +336,7 @@ public:
 
     void KiwayMailIn( KIWAY_EXPRESS& mail ) override;
 
-    void SyncMenusAndToolbars() override;
+    void SyncToolbars() override;
 
     DECLARE_EVENT_TABLE()
 
diff --git a/pcbnew/pcb_edit_frame.h b/pcbnew/pcb_edit_frame.h
index aa81297bde..8cf60ba2dc 100644
--- a/pcbnew/pcb_edit_frame.h
+++ b/pcbnew/pcb_edit_frame.h
@@ -1020,7 +1020,7 @@ public:
      */
     void CommonSettingsChanged() override;
 
-    void SyncMenusAndToolbars() override;
+    void SyncToolbars() override;
 
     DECLARE_EVENT_TABLE()
 };
diff --git a/pcbnew/toolbars_footprint_editor.cpp b/pcbnew/toolbars_footprint_editor.cpp
index 2fd5d14c8c..171c9fc5dc 100644
--- a/pcbnew/toolbars_footprint_editor.cpp
+++ b/pcbnew/toolbars_footprint_editor.cpp
@@ -172,7 +172,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateOptToolbar()
 }
 
 
-void FOOTPRINT_EDIT_FRAME::SyncMenusAndToolbars()
+void FOOTPRINT_EDIT_FRAME::SyncToolbars()
 {
     PCB_DISPLAY_OPTIONS* opts = (PCB_DISPLAY_OPTIONS*) GetDisplayOptions();
 
diff --git a/pcbnew/toolbars_pcb_editor.cpp b/pcbnew/toolbars_pcb_editor.cpp
index 4b8942ee71..af4520a6d1 100644
--- a/pcbnew/toolbars_pcb_editor.cpp
+++ b/pcbnew/toolbars_pcb_editor.cpp
@@ -694,7 +694,7 @@ void PCB_EDIT_FRAME::OnUpdateMuWaveToolbar( wxUpdateUIEvent& aEvent )
 }
 
 
-void PCB_EDIT_FRAME::SyncMenusAndToolbars()
+void PCB_EDIT_FRAME::SyncToolbars()
 {
     PCB_DISPLAY_OPTIONS*        opts = (PCB_DISPLAY_OPTIONS*) GetDisplayOptions();
     KIGFX::GAL_DISPLAY_OPTIONS& galOpts = GetGalDisplayOptions();