diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxService.java
index 39d0644fbfb..59326ef38b6 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxService.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxService.java
@@ -78,7 +78,7 @@ public class JmxService {
         this.logger = logger;
         this.settings = settings;
 
-        this.jmxDomain = settings.get("jmx.domain", "{elasticsearch}");
+        this.jmxDomain = settings.get("jmx.domain", "org.elasticsearch");
 
         this.mBeanServer = ManagementFactory.getPlatformMBeanServer();
     }
@@ -237,13 +237,6 @@ public class JmxService {
     }
 
     private String getObjectName(String jmxDomain, String resourceName) {
-        String type;
-        if (settings.get("name") != null) {
-            type = settings.get("name") + " [" + nodeDescription + "]";
-        } else {
-            type = nodeDescription;
-        }
-        type = type.replace(':', '_').replace('/', '_').replace('.', '_').replace(',', ' ').replace('\"', ' ');
-        return jmxDomain + ":" + "type=" + type + "," + resourceName;
+        return jmxDomain + ":" + resourceName;
     }
 }