diff --git a/server/src/main/java/org/elasticsearch/script/AbstractFieldScript.java b/server/src/main/java/org/elasticsearch/script/AbstractFieldScript.java
index c06fcaa937542..8c5d1eafdb691 100644
--- a/server/src/main/java/org/elasticsearch/script/AbstractFieldScript.java
+++ b/server/src/main/java/org/elasticsearch/script/AbstractFieldScript.java
@@ -35,7 +35,7 @@ public abstract class AbstractFieldScript {
 
     static <F> ScriptContext<F> newContext(String name, Class<F> factoryClass) {
         return new ScriptContext<>(
-            name + "_script_field",
+            name,
             factoryClass,
             /*
              * We rely on the script cache in two ways:
diff --git a/server/src/main/java/org/elasticsearch/script/BooleanFieldScript.java b/server/src/main/java/org/elasticsearch/script/BooleanFieldScript.java
index 3a1c849d5deb0..98b9d5d959804 100644
--- a/server/src/main/java/org/elasticsearch/script/BooleanFieldScript.java
+++ b/server/src/main/java/org/elasticsearch/script/BooleanFieldScript.java
@@ -16,7 +16,7 @@
 
 public abstract class BooleanFieldScript extends AbstractFieldScript {
 
-    public static final ScriptContext<Factory> CONTEXT = newContext("boolean_script_field", Factory.class);
+    public static final ScriptContext<Factory> CONTEXT = newContext("boolean_field", Factory.class);
 
     @SuppressWarnings("unused")
     public static final String[] PARAMETERS = {};
diff --git a/server/src/main/java/org/elasticsearch/script/DateFieldScript.java b/server/src/main/java/org/elasticsearch/script/DateFieldScript.java
index 2dd6c4dfc9466..8e337f8d51fcb 100644
--- a/server/src/main/java/org/elasticsearch/script/DateFieldScript.java
+++ b/server/src/main/java/org/elasticsearch/script/DateFieldScript.java
@@ -15,7 +15,7 @@
 import java.util.Map;
 
 public abstract class DateFieldScript extends AbstractLongFieldScript {
-    public static final ScriptContext<Factory> CONTEXT = newContext("date", Factory.class);
+    public static final ScriptContext<Factory> CONTEXT = newContext("date_field", Factory.class);
 
     @SuppressWarnings("unused")
     public static final String[] PARAMETERS = {};
diff --git a/server/src/main/java/org/elasticsearch/script/DoubleFieldScript.java b/server/src/main/java/org/elasticsearch/script/DoubleFieldScript.java
index da52860e94197..e48b636a495e2 100644
--- a/server/src/main/java/org/elasticsearch/script/DoubleFieldScript.java
+++ b/server/src/main/java/org/elasticsearch/script/DoubleFieldScript.java
@@ -16,7 +16,7 @@
 import java.util.function.DoubleConsumer;
 
 public abstract class DoubleFieldScript extends AbstractFieldScript {
-    public static final ScriptContext<Factory> CONTEXT = newContext("double_script_field", Factory.class);
+    public static final ScriptContext<Factory> CONTEXT = newContext("double_field", Factory.class);
 
     @SuppressWarnings("unused")
     public static final String[] PARAMETERS = {};
diff --git a/server/src/main/java/org/elasticsearch/script/GeoPointFieldScript.java b/server/src/main/java/org/elasticsearch/script/GeoPointFieldScript.java
index f6c0b52f436f5..e69b70c142cf5 100644
--- a/server/src/main/java/org/elasticsearch/script/GeoPointFieldScript.java
+++ b/server/src/main/java/org/elasticsearch/script/GeoPointFieldScript.java
@@ -22,7 +22,7 @@
  * it encodes the points as a long value.
  */
 public abstract class GeoPointFieldScript extends AbstractLongFieldScript {
-    public static final ScriptContext<Factory> CONTEXT = newContext("geo_point_script_field", Factory.class);
+    public static final ScriptContext<Factory> CONTEXT = newContext("geo_point_field", Factory.class);
 
     @SuppressWarnings("unused")
     public static final String[] PARAMETERS = {};
diff --git a/server/src/main/java/org/elasticsearch/script/IpFieldScript.java b/server/src/main/java/org/elasticsearch/script/IpFieldScript.java
index 7ac038390903d..23b4a5775857f 100644
--- a/server/src/main/java/org/elasticsearch/script/IpFieldScript.java
+++ b/server/src/main/java/org/elasticsearch/script/IpFieldScript.java
@@ -36,7 +36,7 @@
  * </ul>
  */
 public abstract class IpFieldScript extends AbstractFieldScript {
-    public static final ScriptContext<Factory> CONTEXT = newContext("ip_script_field", Factory.class);
+    public static final ScriptContext<Factory> CONTEXT = newContext("ip_field", Factory.class);
 
     @SuppressWarnings("unused")
     public static final String[] PARAMETERS = {};
diff --git a/server/src/main/java/org/elasticsearch/script/LongFieldScript.java b/server/src/main/java/org/elasticsearch/script/LongFieldScript.java
index fcb78c029db93..fafdf96e05fe1 100644
--- a/server/src/main/java/org/elasticsearch/script/LongFieldScript.java
+++ b/server/src/main/java/org/elasticsearch/script/LongFieldScript.java
@@ -14,7 +14,7 @@
 import java.util.Map;
 
 public abstract class LongFieldScript extends AbstractLongFieldScript {
-    public static final ScriptContext<Factory> CONTEXT = newContext("long_script_field", Factory.class);
+    public static final ScriptContext<Factory> CONTEXT = newContext("long_field", Factory.class);
 
     @SuppressWarnings("unused")
     public static final String[] PARAMETERS = {};
diff --git a/server/src/main/java/org/elasticsearch/script/StringFieldScript.java b/server/src/main/java/org/elasticsearch/script/StringFieldScript.java
index 81f1f281e506a..62cca73939c85 100644
--- a/server/src/main/java/org/elasticsearch/script/StringFieldScript.java
+++ b/server/src/main/java/org/elasticsearch/script/StringFieldScript.java
@@ -23,7 +23,7 @@ public abstract class StringFieldScript extends AbstractFieldScript {
      */
     public static final long MAX_CHARS = 1024 * 1024;
 
-    public static final ScriptContext<Factory> CONTEXT = newContext("string_script_field", Factory.class);
+    public static final ScriptContext<Factory> CONTEXT = newContext("string_field", Factory.class);
 
     @SuppressWarnings("unused")
     public static final String[] PARAMETERS = {};