diff --git a/src/main/java/com/google/devtools/build/docgen/templates/attributes/common/tags.html b/src/main/java/com/google/devtools/build/docgen/templates/attributes/common/tags.html
index 212d921..e9f10d7 100644
--- a/src/main/java/com/google/devtools/build/docgen/templates/attributes/common/tags.html
+++ b/src/main/java/com/google/devtools/build/docgen/templates/attributes/common/tags.html
@@ -9,7 +9,7 @@
   <i>Tags</i> on non-test rules are used to control sandboxed execution of
   <code>genrule</code>s and
 
-<a href="/versions/{{ site.version }}/skylark/index.html">Skylark</a>
+<a href="/versions/{{ site.version }}/skylark/index.html">Starlark</a>
   actions, and for parsing by humans and/or external tools.
 </p>
 
@@ -17,7 +17,7 @@
   Bazel modifies the behavior of its sandboxing code if it finds the following
   keywords in the <code>tags</code> attribute of any test rule or
   <code>genrule</code>, or the keys of <code>execution_requirements</code> for
-  any Skylark action.
+  any Starlark action.
 </p>
 
 <ul>
diff --git a/src/main/java/com/google/devtools/build/docgen/templates/skylark-overview.vm b/src/main/java/com/google/devtools/build/docgen/templates/skylark-overview.vm
index e1c7914..32453440 100644
--- a/src/main/java/com/google/devtools/build/docgen/templates/skylark-overview.vm
+++ b/src/main/java/com/google/devtools/build/docgen/templates/skylark-overview.vm
@@ -4,7 +4,7 @@
 ---
 <h1>One-Page Overview</h1>
 
-A list of all modules and globals that are available in Skylark:
+A list of all modules and globals that are available:
 
 <h2>
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
index 9d99dcf..1a171ab 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
@@ -567,8 +567,8 @@
   public static OptionsDiff diff(OptionsDiff diff, BuildOptions first, BuildOptions second) {
     if (diff.hasStarlarkOptions) {
       throw new IllegalStateException(
-          "OptionsDiff cannot handle multiple 'second' BuildOptions with skylark options "
-              + "and is trying to diff against a second BuildOptions with skylark options.");
+          "OptionsDiff cannot handle multiple 'second' BuildOptions with Starlark options "
+              + "and is trying to diff against a second BuildOptions with Starlark options.");
     }
     if (first == null || second == null) {
       throw new IllegalArgumentException("Cannot diff null BuildOptions");
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java
index 6659cd9..29b7e5b 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java
@@ -578,8 +578,7 @@
   }
 
   private String getMnemonic(Object mnemonicUnchecked) {
-    String mnemonic =
-        mnemonicUnchecked == Runtime.NONE ? "SkylarkAction" : (String) mnemonicUnchecked;
+    String mnemonic = mnemonicUnchecked == Runtime.NONE ? "Action" : (String) mnemonicUnchecked;
     if (ruleContext.getConfiguration().getReservedActionMnemonics().contains(mnemonic)) {
       mnemonic = mangleMnemonic(mnemonic);
     }
@@ -587,7 +586,7 @@
   }
 
   private static String mangleMnemonic(String mnemonic) {
-    return mnemonic + "FromSkylark";
+    return mnemonic + "FromStarlark";
   }
 
   @Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiProvider.java
index 4506b0d..a6f467f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiProvider.java
@@ -157,7 +157,7 @@
           location,
           "The .java provider is deprecated and cannot be used "
               + "when --incompatible_disallow_legacy_java_provider is set. "
-              + "Please migrate to the JavaInfo Skylark provider.");
+              + "Please migrate to the JavaInfo Starlark provider.");
     }
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDataProcessingApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDataProcessingApi.java
index 5bd0a00..3d67e3d 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDataProcessingApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDataProcessingApi.java
@@ -682,7 +682,7 @@
             generic1 = String.class,
             named = true,
             doc =
-                "A SkylarkList of resource configuration filters, such 'en' that will limit the"
+                "A list of resource configuration filters, such 'en' that will limit the"
                     + " resources in the apk to only the ones in the 'en' configuration."),
         @Param(
             name = "densities",
@@ -703,7 +703,7 @@
             generic1 = String.class,
             named = true,
             doc =
-                "A SkylarkList of file extension to leave uncompressed in apk. Templates must be"
+                "A list of file extension to leave uncompressed in apk. Templates must be"
                     + " expanded before passing this value in."),
         @Param(
             name = "aapt_version",
diff --git a/src/test/shell/bazel/bazel_execlog_test.sh b/src/test/shell/bazel/bazel_execlog_test.sh
index b296253..8f07504 100755
--- a/src/test/shell/bazel/bazel_execlog_test.sh
+++ b/src/test/shell/bazel/bazel_execlog_test.sh
@@ -86,8 +86,8 @@
   # If dependencies were not properly accounted for, the order would have been:
   # rule1, rule2, dir1, dir2
 
-  dir1Num=`grep "SkylarkAction dir_name1" -n output.json | grep -Eo '^[^:]+'`
-  dir2Num=`grep "SkylarkAction dir_name2" -n output.json | grep -Eo '^[^:]+'`
+  dir1Num=`grep "Action dir_name1" -n output.json | grep -Eo '^[^:]+'`
+  dir2Num=`grep "Action dir_name2" -n output.json | grep -Eo '^[^:]+'`
   rule1Num=`grep "Executing genrule //:rule1" -n output.json | grep -Eo '^[^:]+'`
   rule2Num=`grep "Executing genrule //:rule2" -n output.json | grep -Eo '^[^:]+'`
 
diff --git a/src/test/shell/integration/aquery_test.sh b/src/test/shell/integration/aquery_test.sh
index 24afc26..aac6b59 100755
--- a/src/test/shell/integration/aquery_test.sh
+++ b/src/test/shell/integration/aquery_test.sh
@@ -223,7 +223,7 @@
   bazel aquery --output=text "//$pkg:goo" > output 2> "$TEST_log" \
     || fail "Expected success"
   cat output >> "$TEST_log"
-  assert_contains "Mnemonic: SkylarkAction" output
+  assert_contains "Mnemonic: Action" output
   assert_contains "Target: //$pkg:goo" output
   assert_contains "Environment: \[.*foo=bar" output
 }
@@ -729,7 +729,7 @@
     outputs = [ctx.outputs.outfile],
     executable = 'dummy',
     arguments = ['--non-param-file-flag', args],
-    mnemonic = 'SkylarkAction'
+    mnemonic = 'Action'
   )
 
 test_rule = rule(
diff --git a/src/test/shell/integration/modify_execution_info_test.sh b/src/test/shell/integration/modify_execution_info_test.sh
index 52d0778..ed29252 100755
--- a/src/test/shell/integration/modify_execution_info_test.sh
+++ b/src/test/shell/integration/modify_execution_info_test.sh
@@ -224,7 +224,7 @@
 JavaSourceJar=+requires-java-source-jar,\
 Javac=+requires-javac,\
 PyTinypar=+requires-py-tinypar,\
-SkylarkAction=+requires-skylark-action \
+Action=+requires-action \
    > output 2> "$TEST_log" || fail "Expected success"
 
   # There are sometimes other elements in ExecutionInfo, e.g. requires-darwin
@@ -232,7 +232,7 @@
   # would be brittle, irrelevant to the operation of the flag, and in some
   # cases platform-dependent, we just search for the key itself, not the whole
   # ExecutionInfo: {...} line.
-  assert_contains "requires-skylark-action: ''" output
+  assert_contains "requires-action: ''" output
   assert_contains "requires-cpp-compile: ''" output
   assert_contains "requires-cpp-link: ''" output
   assert_contains "requires-extra-action: ''" output