diff --git a/content/base/src/nsScriptLoader.cpp b/content/base/src/nsScriptLoader.cpp
index e0a1cd6899b0..7802f5e9dcbd 100644
--- a/content/base/src/nsScriptLoader.cpp
+++ b/content/base/src/nsScriptLoader.cpp
@@ -862,8 +862,8 @@ nsScriptLoader::EvaluateScript(nsScriptLoadRequest* aRequest,
   if (aRequest->mOriginPrincipal)
     options.setOriginPrincipals(nsJSPrincipals::get(aRequest->mOriginPrincipal));
   JS::Value ignored;
-  rv = context->EvaluateStringWithValue(aScript, *globalObject->GetGlobalJSObject(),
-                                        options, /* aCoerceToString = */ false, ignored);
+  rv = context->EvaluateString(aScript, *globalObject->GetGlobalJSObject(),
+                               options, /* aCoerceToString = */ false, ignored);
 
   // Put the old script back in case it wants to do anything else.
   mCurrentScript = oldCurrent;
diff --git a/content/xbl/src/nsXBLProtoImplField.cpp b/content/xbl/src/nsXBLProtoImplField.cpp
index 666263136d5a..4158889d083c 100644
--- a/content/xbl/src/nsXBLProtoImplField.cpp
+++ b/content/xbl/src/nsXBLProtoImplField.cpp
@@ -90,7 +90,7 @@ nsXBLProtoImplField::InstallField(nsIScriptContext* aContext,
 
   nsAutoMicroTask mt;
 
-  // EvaluateStringWithValue and JS_DefineUCProperty can both trigger GC, so
+  // EvaluateString and JS_DefineUCProperty can both trigger GC, so
   // protect |result| here.
   nsresult rv;
 
@@ -111,11 +111,11 @@ nsXBLProtoImplField::InstallField(nsIScriptContext* aContext,
   options.setFileAndLine(uriSpec.get(), mLineNumber)
          .setVersion(JSVERSION_LATEST)
          .setUserBit(true); // Flag us as XBL
-  rv = context->EvaluateStringWithValue(nsDependentString(mFieldText,
-                                                          mFieldTextLength),
-                                        *aBoundNode, options,
-                                        /* aCoerceToString = */ false,
-                                        result);
+  rv = context->EvaluateString(nsDependentString(mFieldText,
+                                                 mFieldTextLength),
+                               *aBoundNode, options,
+                               /* aCoerceToString = */ false,
+                               result);
   if (NS_FAILED(rv)) {
     return rv;
   }
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index d63b46f35920..80bd3db69921 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -9752,8 +9752,8 @@ nsGlobalWindow::RunTimeoutHandler(nsTimeout* aTimeout,
     options.setFileAndLine(filename, lineNo)
            .setVersion(JSVERSION_DEFAULT);
     JS::Value ignored;
-    aScx->EvaluateStringWithValue(nsDependentString(script), *FastGetGlobalJSObject(),
-                                  options, /*aCoerceToString = */ false, ignored);
+    aScx->EvaluateString(nsDependentString(script), *FastGetGlobalJSObject(),
+                         options, /*aCoerceToString = */ false, ignored);
   } else {
     nsCOMPtr<nsIVariant> dummy;
     nsCOMPtr<nsISupports> me(static_cast<nsIDOMWindow *>(this));
diff --git a/dom/base/nsIScriptContext.h b/dom/base/nsIScriptContext.h
index 56e90c996b8a..513dc4746350 100644
--- a/dom/base/nsIScriptContext.h
+++ b/dom/base/nsIScriptContext.h
@@ -73,11 +73,11 @@ public:
    *                        to a string before returning.
    * @param aRetValue the result of executing the script.
    **/
-  virtual nsresult EvaluateStringWithValue(const nsAString& aScript,
-                                           JSObject& aScopeObject,
-                                           JS::CompileOptions& aOptions,
-                                           bool aCoerceToString,
-                                           JS::Value& aRetValue) = 0;
+  virtual nsresult EvaluateString(const nsAString& aScript,
+                                  JSObject& aScopeObject,
+                                  JS::CompileOptions& aOptions,
+                                  bool aCoerceToString,
+                                  JS::Value& aRetValue) = 0;
 
   /**
    * Compile a script.
diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index 1a900f68695f..5ea052cecb01 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -1229,13 +1229,13 @@ nsJSContext::GetCCRefcnt()
 }
 
 nsresult
-nsJSContext::EvaluateStringWithValue(const nsAString& aScript,
-                                     JSObject& aScopeObject,
-                                     JS::CompileOptions& aOptions,
-                                     bool aCoerceToString,
-                                     JS::Value& aRetValue)
+nsJSContext::EvaluateString(const nsAString& aScript,
+                            JSObject& aScopeObject,
+                            JS::CompileOptions& aOptions,
+                            bool aCoerceToString,
+                            JS::Value& aRetValue)
 {
-  SAMPLE_LABEL("JS", "EvaluateStringWithValue");
+  SAMPLE_LABEL("JS", "EvaluateString");
 
   NS_ENSURE_TRUE(mIsInitialized, NS_ERROR_NOT_INITIALIZED);
   aRetValue = JSVAL_VOID;
diff --git a/dom/base/nsJSEnvironment.h b/dom/base/nsJSEnvironment.h
index b097f12f2f2b..75f961432b22 100644
--- a/dom/base/nsJSEnvironment.h
+++ b/dom/base/nsJSEnvironment.h
@@ -44,11 +44,11 @@ public:
 
   virtual nsIScriptObjectPrincipal* GetObjectPrincipal();
 
-  virtual nsresult EvaluateStringWithValue(const nsAString& aScript,
-                                           JSObject& aScopeObject,
-                                           JS::CompileOptions &aOptions,
-                                           bool aCoerceToString,
-                                           JS::Value& aRetValue);
+  virtual nsresult EvaluateString(const nsAString& aScript,
+                                  JSObject& aScopeObject,
+                                  JS::CompileOptions &aOptions,
+                                  bool aCoerceToString,
+                                  JS::Value& aRetValue);
 
   virtual nsresult CompileScript(const PRUnichar* aText,
                                  int32_t aTextLength,
diff --git a/dom/plugins/base/nsNPAPIPlugin.cpp b/dom/plugins/base/nsNPAPIPlugin.cpp
index 08ea5436563e..8ad7777a8a89 100644
--- a/dom/plugins/base/nsNPAPIPlugin.cpp
+++ b/dom/plugins/base/nsNPAPIPlugin.cpp
@@ -1595,9 +1595,9 @@ _evaluate(NPP npp, NPObject* npobj, NPString *script, NPVariant *result)
   JS::CompileOptions options(cx);
   options.setFileAndLine(spec, 0)
          .setVersion(JSVERSION_DEFAULT);
-  nsresult rv = scx->EvaluateStringWithValue(utf16script, *obj, options,
-                                             /* aCoerceToString = */ false,
-                                             *rval);
+  nsresult rv = scx->EvaluateString(utf16script, *obj, options,
+                                    /* aCoerceToString = */ false,
+                                    *rval);
 
   return NS_SUCCEEDED(rv) &&
          (!result || JSValToNPVariant(npp, cx, *rval, result));
diff --git a/dom/src/jsurl/nsJSProtocolHandler.cpp b/dom/src/jsurl/nsJSProtocolHandler.cpp
index 2bb81444267e..7f86e3b63b9c 100644
--- a/dom/src/jsurl/nsJSProtocolHandler.cpp
+++ b/dom/src/jsurl/nsJSProtocolHandler.cpp
@@ -326,11 +326,9 @@ nsresult nsJSThunk::EvaluateScript(nsIChannel *aChannel,
         JS::CompileOptions options(cx);
         options.setFileAndLine(mURL.get(), 1)
                .setVersion(JSVERSION_DEFAULT);
-        rv = scriptContext->EvaluateStringWithValue(NS_ConvertUTF8toUTF16(script),
-                                                    *globalJSObject,
-                                                    options,
-                                                    /* aCoerceToString = */ true,
-                                                    v);
+        rv = scriptContext->EvaluateString(NS_ConvertUTF8toUTF16(script),
+                                           *globalJSObject, options,
+                                           /* aCoerceToString = */ true, v);
 
         // If there's an error on cx as a result of that call, report
         // it now -- either we're just running under the event loop,