diff --git a/Source/NimbleCommander/NimbleCommander/Bootstrap/AppDelegate.mm b/Source/NimbleCommander/NimbleCommander/Bootstrap/AppDelegate.mm
index bf3802650..301ee70cb 100644
--- a/Source/NimbleCommander/NimbleCommander/Bootstrap/AppDelegate.mm
+++ b/Source/NimbleCommander/NimbleCommander/Bootstrap/AppDelegate.mm
@@ -628,7 +628,7 @@ - (IBAction)OnMenuToggleAdminMode:(id) [[maybe_unused]] _sender
 - (BOOL)validateMenuItem:(NSMenuItem *)item
 {
     static const int admin_mode_tag =
-        nc::core::ActionsShortcutsManager::Instance().TagFromAction("menu.nimble_commander.toggle_admin_mode").value();
+        nc::core::ActionsShortcutsManager::TagFromAction("menu.nimble_commander.toggle_admin_mode").value();
     const long tag = item.tag;
 
     if( tag == admin_mode_tag ) {
diff --git a/Source/NimbleCommander/NimbleCommander/States/InternalViewer/MainWindowInternalViewerState.mm b/Source/NimbleCommander/NimbleCommander/States/InternalViewer/MainWindowInternalViewerState.mm
index 71866674c..4bd006514 100644
--- a/Source/NimbleCommander/NimbleCommander/States/InternalViewer/MainWindowInternalViewerState.mm
+++ b/Source/NimbleCommander/NimbleCommander/States/InternalViewer/MainWindowInternalViewerState.mm
@@ -121,7 +121,7 @@ - (IBAction)OnFileInternalBigViewCommand:(id)sender
 - (BOOL)validateMenuItem:(NSMenuItem *)item
 {
     const long tag = item.tag;
-    static const int close_tag = nc::core::ActionsShortcutsManager::Instance().TagFromAction("menu.file.close").value();
+    static const int close_tag = nc::core::ActionsShortcutsManager::TagFromAction("menu.file.close").value();
     if( tag == close_tag ) {
         item.title = NSLocalizedString(@"Close Viewer", "Menu item title for closing internal viewer state");
         return true;
diff --git a/Source/NimbleCommander/NimbleCommander/States/MainWindow.mm b/Source/NimbleCommander/NimbleCommander/States/MainWindow.mm
index bbb77c6f4..a9174f7f5 100644
--- a/Source/NimbleCommander/NimbleCommander/States/MainWindow.mm
+++ b/Source/NimbleCommander/NimbleCommander/States/MainWindow.mm
@@ -95,14 +95,14 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item
 {
     const long tag = item.tag;
 
-    static const int close_tag = nc::core::ActionsShortcutsManager::Instance().TagFromAction("menu.file.close").value();
+    static const int close_tag = nc::core::ActionsShortcutsManager::TagFromAction("menu.file.close").value();
     if( tag == close_tag ) {
         item.title = g_CloseWindowTitle;
         return true;
     }
 
     static const int close_window_tag =
-        nc::core::ActionsShortcutsManager::Instance().TagFromAction("menu.file.close_window").value();
+        nc::core::ActionsShortcutsManager::TagFromAction("menu.file.close_window").value();
     if( tag == close_window_tag ) {
         item.hidden = true;
         return true;
diff --git a/Source/NimbleCommander/NimbleCommander/States/MainWindowController.mm b/Source/NimbleCommander/NimbleCommander/States/MainWindowController.mm
index 3f7028631..4fc6560c6 100644
--- a/Source/NimbleCommander/NimbleCommander/States/MainWindowController.mm
+++ b/Source/NimbleCommander/NimbleCommander/States/MainWindowController.mm
@@ -432,7 +432,7 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item
     const long tag = item.tag;
 
     static const int show_toolbal_tag =
-        nc::core::ActionsShortcutsManager::Instance().TagFromAction("menu.view.show_toolbar").value();
+        nc::core::ActionsShortcutsManager::TagFromAction("menu.view.show_toolbar").value();
     if( tag == show_toolbal_tag ) {
         item.title = self.toolbarVisible ? g_HideToolbarTitle : g_ShowToolbarTitle;
         return self.window.toolbar != nil;
diff --git a/Source/NimbleCommander/NimbleCommander/States/Terminal/ShellState.mm b/Source/NimbleCommander/NimbleCommander/States/Terminal/ShellState.mm
index 91c7a40eb..dec985054 100644
--- a/Source/NimbleCommander/NimbleCommander/States/Terminal/ShellState.mm
+++ b/Source/NimbleCommander/NimbleCommander/States/Terminal/ShellState.mm
@@ -370,7 +370,7 @@ - (IBAction)OnShowTerminal:(id) [[maybe_unused]] _sender
 - (BOOL)validateMenuItem:(NSMenuItem *)item
 {
     static const int show_terminal_tag =
-        nc::core::ActionsShortcutsManager::Instance().TagFromAction("menu.view.show_terminal").value();
+        nc::core::ActionsShortcutsManager::TagFromAction("menu.view.show_terminal").value();
     const long tag = item.tag;
     if( tag == show_terminal_tag ) {
         item.title = NSLocalizedString(@"Hide Terminal", "Menu item title for hiding terminal");