diff --git a/plugins/android/resources/messages/AndroidBundle.properties b/plugins/android/resources/messages/AndroidBundle.properties
index 659e9c71177f..e2931ed87d65 100644
--- a/plugins/android/resources/messages/AndroidBundle.properties
+++ b/plugins/android/resources/messages/AndroidBundle.properties
@@ -236,7 +236,7 @@ no.jdk.error=You need to create at least one JSDK of versions 1.5, 1.6 or 1.7
 cannot.parse.sdk.error=Cannot parse Android SDK
 android.add.sdk.tooltip=Add SDK
 android.console.tool.window.title=Android Console
-ddms.corrupted.error=Warning: debug info can be unavailable. Please close other application using ADB: DDMS, Eclipse
+ddms.corrupted.error=Warning: debug info can be unavailable. Please close other application using ADB: Monitor, DDMS, Eclipse
 android.import.dependencies.error.message.header=Importing finished with errors:
 android.import.dependencies.add.module.dependency.task.title=Add dependency {0} --> {1}
 android.import.dependencies.new.module.task.title=Create library module {0} in {1}
@@ -405,8 +405,8 @@ android.lint.inspections.unknown.id.in.layout=Reference to an id that is not in
 android.lint.inspections.unknown.id=Reference to an unknown id
 android.lint.inspections.suspicious.import='import android.R' statement
 android.debug.sessions.will.be.closed=Following debug sessions will be closed\:\n{0}
-android.launch.ddms.title=DDMS
-android.launch.ddms.already.launched.error=DDMS is already launched
+android.launch.ddms.title=Monitor
+android.launch.ddms.already.launched.error=Monitor is already launched
 android.disable.adb.service.title=Disable ADB service
 android.launch.hierarchy.viewer.action=Hierarchy Viewer
 android.launch.draw.9.patch.action=Draw 9 Patch
diff --git a/plugins/android/src/META-INF/plugin.xml b/plugins/android/src/META-INF/plugin.xml
index 2f12617d6888..c4d18c17def1 100644
--- a/plugins/android/src/META-INF/plugin.xml
+++ b/plugins/android/src/META-INF/plugin.xml
@@ -47,9 +47,9 @@
     <action id="Android.RunDdms" class="org.jetbrains.android.actions.AndroidRunDdmsAction">
       <add-to-group group-id="AndroidToolsGroup" anchor="last"/>
     </action>
-    <action id="Android.RunHierarchyViewer" class="org.jetbrains.android.actions.AndroidRunHierarchyViewerAction">
+    <!--<action id="Android.RunHierarchyViewer" class="org.jetbrains.android.actions.AndroidRunHierarchyViewerAction">
       <add-to-group group-id="AndroidToolsGroup" anchor="last"/>
-    </action>
+    </action>-->
     <action id="Android.RunDraw9Patch" class="org.jetbrains.android.actions.AndroidRunDraw9PatchAction">
       <add-to-group group-id="AndroidToolsGroup" anchor="last"/>
     </action>
diff --git a/plugins/android/src/org/jetbrains/android/actions/AndroidRunDdmsAction.java b/plugins/android/src/org/jetbrains/android/actions/AndroidRunDdmsAction.java
index c5dd68313c55..6ab1ba2dc234 100644
--- a/plugins/android/src/org/jetbrains/android/actions/AndroidRunDdmsAction.java
+++ b/plugins/android/src/org/jetbrains/android/actions/AndroidRunDdmsAction.java
@@ -81,6 +81,10 @@ public class AndroidRunDdmsAction extends AndroidRunSdkToolAction {
 
   @NotNull
   private static String getDdmsCmdName() {
-    return SystemInfo.isWindows ? "ddms.bat" : "ddms";
+    final String monitorCmdName = SystemInfo.isWindows ? "monitor.exe" : "monitor";
+    final String archName = SystemInfo.OS_ARCH.equalsIgnoreCase("x86_64") ||
+                            SystemInfo.OS_ARCH.equalsIgnoreCase("amd64")
+                            ? "x86_64" : "x86";
+    return "/lib/monitor-" + archName + "/" + monitorCmdName;
   }
 }
diff --git a/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkUtils.java b/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkUtils.java
index 0c912a8d2688..7ee3bf91bc71 100644
--- a/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkUtils.java
+++ b/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkUtils.java
@@ -494,7 +494,7 @@ public class AndroidSdkUtils {
       final OSProcessHandler ddmsProcessHandler = AndroidRunDdmsAction.getDdmsProcessHandler();
       if (ddmsProcessHandler != null) {
         final int r = Messages
-          .showYesNoDialog(project, "DDMS will be closed to activate ADB service. Continue?", "ADB activation", Messages.getQuestionIcon());
+          .showYesNoDialog(project, "Monitor will be closed to activate ADB service. Continue?", "ADB activation", Messages.getQuestionIcon());
 
         if (r != Messages.YES) {
           return false;
@@ -509,7 +509,7 @@ public class AndroidSdkUtils {
             }
           }
         };
-        if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(destroyingRunnable, "Closing DDMS", true, project)) {
+        if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(destroyingRunnable, "Closing Monitor", true, project)) {
           return false;
         }