diff --git a/platform/platform-resources/src/idea/Keymap_Eclipse.xml b/platform/platform-resources/src/idea/Keymap_Eclipse.xml
index e3570998c8a6..7a4459867a97 100644
--- a/platform/platform-resources/src/idea/Keymap_Eclipse.xml
+++ b/platform/platform-resources/src/idea/Keymap_Eclipse.xml
@@ -47,7 +47,7 @@
       <keyboard-shortcut first-keystroke="shift alt D" />
       <keyboard-shortcut first-keystroke="shift F9" />
     </action>
-    <action id="Debugger.Inspect">
+    <action id="XDebugger.Inspect">
       <keyboard-shortcut first-keystroke="shift control I" />
     </action>
     <action id="DelegateMethods">
diff --git a/platform/platform-resources/src/idea/Keymap_EclipseMac.xml b/platform/platform-resources/src/idea/Keymap_EclipseMac.xml
index 8ac008b05436..7cf1977d5db3 100644
--- a/platform/platform-resources/src/idea/Keymap_EclipseMac.xml
+++ b/platform/platform-resources/src/idea/Keymap_EclipseMac.xml
@@ -43,7 +43,7 @@
     <action id="Debug">
       <keyboard-shortcut first-keystroke="meta F11" />
     </action>
-    <action id="Debugger.Inspect">
+    <action id="XDebugger.Inspect">
       <keyboard-shortcut first-keystroke="shift meta I" />
     </action>
     <action id="DelegateMethods"/>
diff --git a/platform/platform-resources/src/idea/Keymap_Netbeans.xml b/platform/platform-resources/src/idea/Keymap_Netbeans.xml
index fc4c8addf0ae..eb406143e64e 100644
--- a/platform/platform-resources/src/idea/Keymap_Netbeans.xml
+++ b/platform/platform-resources/src/idea/Keymap_Netbeans.xml
@@ -83,7 +83,7 @@
       <keyboard-shortcut first-keystroke="shift control F5" />
       <keyboard-shortcut first-keystroke="shift alt F5" />
     </action>
-    <action id="Debugger.NewWatch">
+    <action id="XDebugger.NewWatch">
       <keyboard-shortcut first-keystroke="shift control F7" />
     </action>
     <action id="Debugger.ResumeThread">
diff --git a/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java b/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
index 8546c74392fc..7a2b52530d58 100644
--- a/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
+++ b/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -262,7 +262,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
     { "shift control F6",         "PreviousTab", "ChangeTypeSignature"},
     { "shift control F11",        "ToggleBookmark", "FocusTracer"},
     { "shift control G",          "FindUsagesInFile", "ClassTemplateNavigation", "GoToClass"},
-    { "shift control I",          "QuickImplementations", "Debugger.Inspect"},
+    { "shift control I",          "QuickImplementations", "XDebugger.Inspect"},
     { "shift control LEFT",       "EditorPreviousWordWithSelection", "ResizeToolWindowLeft", },
     { "shift control RIGHT",      "EditorNextWordWithSelection", "ResizeToolWindowRight", },
     { "shift control UP",         "ResizeToolWindowUp", "MethodUp"},
@@ -297,7 +297,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
     { "shift alt F9",             "ChooseDebugConfiguration", "ValidateXml", "ValidateJsp"},
     { "shift control DOWN",       "EditorDuplicate", "ResizeToolWindowDown", },
     { "shift control ENTER",      "EditorChooseLookupItemCompleteStatement", "EditorCompleteStatement", "Console.Jpa.GenerateSql"},
-    { "shift control F7",         "HighlightUsagesInFile", "Debugger.NewWatch"},
+    { "shift control F7",         "HighlightUsagesInFile", "XDebugger.NewWatch"},
     { "shift control UP",         "EditorDuplicate", "ResizeToolWindowUp", },
     { "shift control alt P",      "Print", "Graph.Print"},
     { "shift control K",          "HippieCompletion", "Vcs.Push"},