diff --git a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/cluster/ClusterStateResolver.java b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/cluster/ClusterStateResolver.java
index 54a5a1650e3..54cff93720f 100644
--- a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/cluster/ClusterStateResolver.java
+++ b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/cluster/ClusterStateResolver.java
@@ -57,7 +57,7 @@ public class ClusterStateResolver extends MonitoringIndexNameResolver.Timestampe
     }
 
     static final class Fields {
-        static final String CLUSTER_STATE = new String(TYPE);
+        static final String CLUSTER_STATE = TYPE;
         static final String STATUS = "status";
     }
 }
diff --git a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/cluster/ClusterStatsResolver.java b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/cluster/ClusterStatsResolver.java
index d995f7901b7..de81f68b22b 100644
--- a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/cluster/ClusterStatsResolver.java
+++ b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/cluster/ClusterStatsResolver.java
@@ -63,6 +63,6 @@ public class ClusterStatsResolver extends MonitoringIndexNameResolver.Timestampe
     }
 
     static final class Fields {
-        static final String CLUSTER_STATS = new String(TYPE);
+        static final String CLUSTER_STATS = TYPE;
     }
 }
diff --git a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/cluster/DiscoveryNodeResolver.java b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/cluster/DiscoveryNodeResolver.java
index 2ba482ae41f..4a5df234572 100644
--- a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/cluster/DiscoveryNodeResolver.java
+++ b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/cluster/DiscoveryNodeResolver.java
@@ -54,7 +54,7 @@ public class DiscoveryNodeResolver extends MonitoringIndexNameResolver.Data<Disc
     }
 
     static final class Fields {
-        static final String NODE = new String(TYPE);
+        static final String NODE = TYPE;
         static final String NAME = "name";
         static final String TRANSPORT_ADDRESS = "transport_address";
         static final String ATTRIBUTES = "attributes";
diff --git a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/indices/IndexRecoveryResolver.java b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/indices/IndexRecoveryResolver.java
index 3c711c22ea8..d22b039c911 100644
--- a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/indices/IndexRecoveryResolver.java
+++ b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/indices/IndexRecoveryResolver.java
@@ -61,7 +61,7 @@ public class IndexRecoveryResolver extends MonitoringIndexNameResolver.Timestamp
     }
 
     static final class Fields {
-        static final String INDEX_RECOVERY = new String(TYPE);
+        static final String INDEX_RECOVERY = TYPE;
         static final String SHARDS = "shards";
         static final String INDEX_NAME = "index_name";
     }
diff --git a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/indices/IndexStatsResolver.java b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/indices/IndexStatsResolver.java
index 2d0edf9a586..c7386c6662e 100644
--- a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/indices/IndexStatsResolver.java
+++ b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/indices/IndexStatsResolver.java
@@ -105,7 +105,7 @@ public class IndexStatsResolver extends MonitoringIndexNameResolver.Timestamped<
     }
 
     static final class Fields {
-        static final String INDEX_STATS = new String(TYPE);
+        static final String INDEX_STATS = TYPE;
         static final String INDEX = "index";
         static final String TOTAL = "total";
         static final String PRIMARIES = "primaries";
diff --git a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/indices/IndicesStatsResolver.java b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/indices/IndicesStatsResolver.java
index 1dcecbbb634..3080fd9e34c 100644
--- a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/indices/IndicesStatsResolver.java
+++ b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/indices/IndicesStatsResolver.java
@@ -66,6 +66,6 @@ public class IndicesStatsResolver extends MonitoringIndexNameResolver.Timestampe
     }
 
     static final class Fields {
-        static final String INDICES_STATS = new String(TYPE);
+        static final String INDICES_STATS = TYPE;
     }
 }
diff --git a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolver.java b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolver.java
index 086cc939220..dddda12e55f 100644
--- a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolver.java
+++ b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolver.java
@@ -120,7 +120,7 @@ public class NodeStatsResolver extends MonitoringIndexNameResolver.Timestamped<N
     }
 
     static final class Fields {
-        static final String NODE_STATS = new String(TYPE);
+        static final String NODE_STATS = TYPE;
         static final String NODE_ID = "node_id";
         static final String NODE_MASTER = "node_master";
         static final String MLOCKALL = "mlockall";