diff --git a/src/test/java/com/google/devtools/build/docgen/BUILD b/src/test/java/com/google/devtools/build/docgen/BUILD
index a1f54d5..993e67f 100644
--- a/src/test/java/com/google/devtools/build/docgen/BUILD
+++ b/src/test/java/com/google/devtools/build/docgen/BUILD
@@ -51,7 +51,7 @@
         "//src/main/java/com/google/devtools/build/docgen:docgen_javalib",
         "//src/main/java/com/google/devtools/build/lib:syntax",
         "//src/main/java/net/starlark/java/annot",
-        "//src/test/java/com/google/devtools/build/lib/skylark/util",
+        "//src/test/java/com/google/devtools/build/lib/starlark/util",
         "//src/test/java/com/google/devtools/build/lib/syntax/util",
         "//third_party:guava",
         "//third_party:junit4",
@@ -81,7 +81,7 @@
         "//src/main/java/com/google/devtools/build/lib/rules/cpp",
         "//src/main/java/com/google/devtools/build/lib/util:classpath",
         "//src/main/java/net/starlark/java/annot",
-        "//src/test/java/com/google/devtools/build/lib/skylark/util",
+        "//src/test/java/com/google/devtools/build/lib/starlark/util",
         "//src/test/java/com/google/devtools/build/lib/syntax/util",
         "//src/test/java/com/google/devtools/build/lib/testutil",
         "//third_party:guava",
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index 9f3edbe..8163ec0 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -37,7 +37,7 @@
         "//src/test/java/com/google/devtools/build/lib/skyframe/packages:srcs",
         "//src/test/java/com/google/devtools/build/lib/skyframe/serialization:srcs",
         "//src/test/java/com/google/devtools/build/lib/skyframe:srcs",
-        "//src/test/java/com/google/devtools/build/lib/skylark:srcs",
+        "//src/test/java/com/google/devtools/build/lib/starlark:srcs",
         "//src/test/java/net/starlark/java/annot/processor:srcs",
         "//src/test/java/com/google/devtools/build/lib/starlarkdebug/server:srcs",
         "//src/test/java/com/google/devtools/build/lib/supplier:srcs",
@@ -421,7 +421,7 @@
         "//src/main/protobuf:test_status_java_proto",
         "//src/test/java/com/google/devtools/build/lib/actions/util",
         "//src/test/java/com/google/devtools/build/lib/events:testutil",
-        "//src/test/java/com/google/devtools/build/lib/skylark/util",
+        "//src/test/java/com/google/devtools/build/lib/starlark/util",
         "//src/test/java/com/google/devtools/build/lib/testutil",
         "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
         "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
@@ -673,7 +673,7 @@
         "//src/test/java/com/google/devtools/build/lib/rules:all_windows_tests",
         "//src/test/java/com/google/devtools/build/lib/shell:all_windows_tests",
         "//src/test/java/com/google/devtools/build/lib/skyframe:all_windows_tests",
-        "//src/test/java/com/google/devtools/build/lib/skylark:all_windows_tests",
+        "//src/test/java/com/google/devtools/build/lib/starlark:all_windows_tests",
         "//src/test/java/com/google/devtools/build/lib/unsafe:all_windows_tests",
         "//src/test/java/com/google/devtools/build/lib/util:all_windows_tests",
         "//src/test/java/com/google/devtools/build/lib/vfs:all_windows_tests",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/BUILD b/src/test/java/com/google/devtools/build/lib/rules/config/BUILD
index ea6a22c..ec9f8b5 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/config/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/config/BUILD
@@ -43,7 +43,7 @@
         "//src/main/java/com/google/devtools/common/options",
         "//src/test/java/com/google/devtools/build/lib/actions/util",
         "//src/test/java/com/google/devtools/build/lib/analysis/util",
-        "//src/test/java/com/google/devtools/build/lib/skylark/util",
+        "//src/test/java/com/google/devtools/build/lib/starlark/util",
         "//src/test/java/com/google/devtools/build/lib/syntax/util",
         "//src/test/java/com/google/devtools/build/lib/testutil",
         "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTest.java b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTest.java
index 9dcaeb2..3d80efb 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTest.java
@@ -26,7 +26,7 @@
 import com.google.devtools.build.lib.packages.ConfiguredAttributeMapper;
 import com.google.devtools.build.lib.packages.Type;
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData;
-import com.google.devtools.build.lib.skylark.util.BazelEvaluationTestCase;
+import com.google.devtools.build.lib.starlark.util.BazelEvaluationTestCase;
 import com.google.devtools.build.lib.syntax.util.EvaluationTestCase;
 import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
 import org.junit.Before;
diff --git a/src/test/java/com/google/devtools/build/lib/rules/python/BUILD b/src/test/java/com/google/devtools/build/lib/rules/python/BUILD
index a65a79f..0493376 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/python/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/python/BUILD
@@ -227,7 +227,7 @@
         "//src/main/java/com/google/devtools/build/lib/rules/python",
         "//src/main/java/com/google/devtools/build/lib/syntax:frontend",
         "//src/test/java/com/google/devtools/build/lib/analysis/util",
-        "//src/test/java/com/google/devtools/build/lib/skylark/util",
+        "//src/test/java/com/google/devtools/build/lib/starlark/util",
         "//src/test/java/com/google/devtools/build/lib/syntax/util",
         "//third_party:junit4",
         "//third_party:truth",
@@ -244,7 +244,7 @@
         "//src/main/java/com/google/devtools/build/lib/syntax:frontend",
         "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
         "//src/test/java/com/google/devtools/build/lib/analysis/util",
-        "//src/test/java/com/google/devtools/build/lib/skylark/util",
+        "//src/test/java/com/google/devtools/build/lib/starlark/util",
         "//src/test/java/com/google/devtools/build/lib/syntax/util",
         "//third_party:junit4",
         "//third_party:truth",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/python/PyInfoTest.java b/src/test/java/com/google/devtools/build/lib/rules/python/PyInfoTest.java
index b7e43d3..c635d7e 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/python/PyInfoTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/python/PyInfoTest.java
@@ -21,7 +21,7 @@
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
-import com.google.devtools.build.lib.skylark.util.BazelEvaluationTestCase;
+import com.google.devtools.build.lib.starlark.util.BazelEvaluationTestCase;
 import com.google.devtools.build.lib.syntax.Location;
 import com.google.devtools.build.lib.syntax.util.EvaluationTestCase;
 import org.junit.Before;
diff --git a/src/test/java/com/google/devtools/build/lib/rules/python/PyRuntimeInfoTest.java b/src/test/java/com/google/devtools/build/lib/rules/python/PyRuntimeInfoTest.java
index 497ac7d..9e47561 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/python/PyRuntimeInfoTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/python/PyRuntimeInfoTest.java
@@ -21,7 +21,7 @@
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
-import com.google.devtools.build.lib.skylark.util.BazelEvaluationTestCase;
+import com.google.devtools.build.lib.starlark.util.BazelEvaluationTestCase;
 import com.google.devtools.build.lib.syntax.Location;
 import com.google.devtools.build.lib.syntax.util.EvaluationTestCase;
 import com.google.devtools.build.lib.vfs.PathFragment;
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/StarlarkOptionCommandLineEventTest.java b/src/test/java/com/google/devtools/build/lib/runtime/StarlarkOptionCommandLineEventTest.java
index f510be5..b1970b5 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/StarlarkOptionCommandLineEventTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/StarlarkOptionCommandLineEventTest.java
@@ -19,7 +19,7 @@
 import com.google.devtools.build.lib.runtime.CommandLineEvent.CanonicalCommandLineEvent;
 import com.google.devtools.build.lib.runtime.CommandLineEvent.OriginalCommandLineEvent;
 import com.google.devtools.build.lib.runtime.proto.CommandLineOuterClass.CommandLine;
-import com.google.devtools.build.lib.skylark.util.StarlarkOptionsTestCase;
+import com.google.devtools.build.lib.starlark.util.StarlarkOptionsTestCase;
 import com.google.devtools.common.options.OptionsParser;
 import java.util.Optional;
 import org.junit.Test;
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/BUILD b/src/test/java/com/google/devtools/build/lib/starlark/BUILD
similarity index 96%
rename from src/test/java/com/google/devtools/build/lib/skylark/BUILD
rename to src/test/java/com/google/devtools/build/lib/starlark/BUILD
index b5ceb25..bc25685 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/starlark/BUILD
@@ -9,7 +9,7 @@
     name = "srcs",
     testonly = 0,
     srcs = glob(["**"]) + [
-        "//src/test/java/com/google/devtools/build/lib/skylark/util:srcs",
+        "//src/test/java/com/google/devtools/build/lib/starlark/util:srcs",
     ],
     visibility = ["//src:__subpackages__"],
 )
@@ -71,7 +71,7 @@
         "//src/test/java/com/google/devtools/build/lib/actions/util",
         "//src/test/java/com/google/devtools/build/lib/analysis/util",
         "//src/test/java/com/google/devtools/build/lib/packages:testutil",
-        "//src/test/java/com/google/devtools/build/lib/skylark/util",
+        "//src/test/java/com/google/devtools/build/lib/starlark/util",
         "//src/test/java/com/google/devtools/build/lib/syntax/util",
         "//src/test/java/com/google/devtools/build/lib/testutil",
         "//src/test/java/com/google/devtools/build/lib/testutil:JunitUtils",
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkActionProviderTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkActionProviderTest.java
similarity index 99%
rename from src/test/java/com/google/devtools/build/lib/skylark/StarlarkActionProviderTest.java
rename to src/test/java/com/google/devtools/build/lib/starlark/StarlarkActionProviderTest.java
index a5a4c21..15f6f76 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkActionProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkActionProviderTest.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.google.devtools.build.lib.skylark;
+package com.google.devtools.build.lib.starlark;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkAnnotationContractTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkAnnotationContractTest.java
similarity index 98%
rename from src/test/java/com/google/devtools/build/lib/skylark/StarlarkAnnotationContractTest.java
rename to src/test/java/com/google/devtools/build/lib/starlark/StarlarkAnnotationContractTest.java
index 7fbd1f2..6bd9012 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkAnnotationContractTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkAnnotationContractTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.lib.skylark;
+package com.google.devtools.build.lib.starlark;
 
 import com.google.devtools.build.lib.util.Classpath;
 import java.lang.reflect.Method;
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkDefinedAspectsTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkDefinedAspectsTest.java
similarity index 99%
rename from src/test/java/com/google/devtools/build/lib/skylark/StarlarkDefinedAspectsTest.java
rename to src/test/java/com/google/devtools/build/lib/starlark/StarlarkDefinedAspectsTest.java
index 899dec0..cd963d6 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkDefinedAspectsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkDefinedAspectsTest.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.google.devtools.build.lib.skylark;
+package com.google.devtools.build.lib.starlark;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
similarity index 99%
rename from src/test/java/com/google/devtools/build/lib/skylark/StarlarkIntegrationTest.java
rename to src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
index eeda430..983bd02 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.google.devtools.build.lib.skylark;
+package com.google.devtools.build.lib.starlark;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkOptionsParsingTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkOptionsParsingTest.java
similarity index 98%
rename from src/test/java/com/google/devtools/build/lib/skylark/StarlarkOptionsParsingTest.java
rename to src/test/java/com/google/devtools/build/lib/starlark/StarlarkOptionsParsingTest.java
index e44bb2a..ea16805 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkOptionsParsingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkOptionsParsingTest.java
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.lib.skylark;
+package com.google.devtools.build.lib.starlark;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.runtime.StarlarkOptionsParser;
-import com.google.devtools.build.lib.skylark.util.StarlarkOptionsTestCase;
+import com.google.devtools.build.lib.starlark.util.StarlarkOptionsTestCase;
 import com.google.devtools.build.lib.util.Pair;
 import com.google.devtools.common.options.OptionsParsingException;
 import com.google.devtools.common.options.OptionsParsingResult;
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java
similarity index 99%
rename from src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java
rename to src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java
index dadd537..af4d729 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.lib.skylark;
+package com.google.devtools.build.lib.starlark;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
@@ -50,7 +50,7 @@
 import com.google.devtools.build.lib.packages.StructProvider;
 import com.google.devtools.build.lib.packages.Type;
 import com.google.devtools.build.lib.skyframe.BzlLoadFunction;
-import com.google.devtools.build.lib.skylark.util.BazelEvaluationTestCase;
+import com.google.devtools.build.lib.starlark.util.BazelEvaluationTestCase;
 import com.google.devtools.build.lib.syntax.ClassObject;
 import com.google.devtools.build.lib.syntax.Dict;
 import com.google.devtools.build.lib.syntax.EvalException;
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java
similarity index 99%
rename from src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleContextTest.java
rename to src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java
index 9a4edfd..2567bac 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleContextTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.lib.skylark;
+package com.google.devtools.build.lib.starlark;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
@@ -51,7 +51,7 @@
 import com.google.devtools.build.lib.rules.java.JavaInfo;
 import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider;
 import com.google.devtools.build.lib.rules.python.PyProviderUtils;
-import com.google.devtools.build.lib.skylark.util.BazelEvaluationTestCase;
+import com.google.devtools.build.lib.starlark.util.BazelEvaluationTestCase;
 import com.google.devtools.build.lib.syntax.Dict;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.Mutability;
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java
similarity index 98%
rename from src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleImplementationFunctionsTest.java
rename to src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java
index ee96a1c..00bbdad 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleImplementationFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.lib.skylark;
+package com.google.devtools.build.lib.starlark;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
@@ -57,7 +57,7 @@
 import com.google.devtools.build.lib.packages.Provider;
 import com.google.devtools.build.lib.packages.StarlarkProvider;
 import com.google.devtools.build.lib.packages.StructImpl;
-import com.google.devtools.build.lib.skylark.util.BazelEvaluationTestCase;
+import com.google.devtools.build.lib.starlark.util.BazelEvaluationTestCase;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.Printer;
 import com.google.devtools.build.lib.syntax.Sequence;
@@ -2896,7 +2896,7 @@
   }
 
   @Test
-  public void skylarkCustomCommandLineKeyComputation_differentMapEach() throws Exception {
+  public void starlarkCustomCommandLineKeyComputation_differentMapEach() throws Exception {
     setRuleContext(createRuleContext("//foo:foo"));
 
     CommandLine commandLine1 =
@@ -2916,7 +2916,7 @@
   }
 
   @Test
-  public void skylarkCustomCommandLineKeyComputation_differentArg() throws Exception {
+  public void starlarkCustomCommandLineKeyComputation_differentArg() throws Exception {
     setRuleContext(createRuleContext("//foo:foo"));
 
     CommandLine commandLine1 =
@@ -2934,7 +2934,7 @@
   }
 
   @Test
-  public void skylarkCustomCommandLineKeyComputationWithExpander_equivalentMapEach_sameKey()
+  public void starlarkCustomCommandLineKeyComputationWithExpander_equivalentMapEach_sameKey()
       throws Exception {
     setRuleContext(createRuleContext("//foo:foo"));
 
@@ -2955,7 +2955,7 @@
   }
 
   @Test
-  public void skylarkCustomCommandLineKeyComputationWithExpander_mapEachConstantForDir()
+  public void starlarkCustomCommandLineKeyComputationWithExpander_mapEachConstantForDir()
       throws Exception {
     setRuleContext(createRuleContext("//foo:foo"));
 
@@ -2977,7 +2977,7 @@
   }
 
   @Test
-  public void skylarkCustomCommandLineKeyComputationWithExpander_constantForDirWithNestedSet()
+  public void starlarkCustomCommandLineKeyComputationWithExpander_constantForDirWithNestedSet()
       throws Exception {
     setRuleContext(createRuleContext("//foo:foo"));
 
@@ -2999,7 +2999,7 @@
   }
 
   @Test
-  public void skylarkCustomCommandLineKeyComputationWithExpander_mapEachFailsForDir()
+  public void starlarkCustomCommandLineKeyComputationWithExpander_mapEachFailsForDir()
       throws Exception {
     setRuleContext(createRuleContext("//foo:foo"));
 
@@ -3027,7 +3027,7 @@
   }
 
   @Test
-  public void skylarkCustomCommandLineKeyComputationWithExpander_differentExpansion()
+  public void starlarkCustomCommandLineKeyComputationWithExpander_differentExpansion()
       throws Exception {
     setRuleContext(createRuleContext("//foo:foo"));
     CommandLine commandLine =
@@ -3044,7 +3044,7 @@
   }
 
   @Test
-  public void skylarkCustomCommandLineKeyComputationWithExpander_differentExpansionNoMapEach()
+  public void starlarkCustomCommandLineKeyComputationWithExpander_differentExpansionNoMapEach()
       throws Exception {
     setRuleContext(createRuleContext("//foo:foo"));
     CommandLine commandLine =
@@ -3059,7 +3059,7 @@
   }
 
   @Test
-  public void skylarkCustomCommandLineKeyComputationWithExpander_extraFileInExpansionNoMapEach()
+  public void starlarkCustomCommandLineKeyComputationWithExpander_extraFileInExpansionNoMapEach()
       throws Exception {
     setRuleContext(createRuleContext("//foo:foo"));
     CommandLine commandLine =
@@ -3074,7 +3074,7 @@
   }
 
   @Test
-  public void skylarkCustomCommandLineKeyComputationWithExpander_constantForDirAddJoined()
+  public void starlarkCustomCommandLineKeyComputationWithExpander_constantForDirAddJoined()
       throws Exception {
     setRuleContext(createRuleContext("//foo:foo"));
 
@@ -3098,7 +3098,7 @@
   }
 
   @Test
-  public void skylarkCustomCommandLineKeyComputation_inconsequentialChangeToStarlarkSemantics()
+  public void starlarkCustomCommandLineKeyComputation_inconsequentialChangeToStarlarkSemantics()
       throws Exception {
     setRuleContext(createRuleContext("//foo:foo"));
     CommandLine commandLine1 =
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkStringRepresentationsTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkStringRepresentationsTest.java
similarity index 99%
rename from src/test/java/com/google/devtools/build/lib/skylark/StarlarkStringRepresentationsTest.java
rename to src/test/java/com/google/devtools/build/lib/starlark/StarlarkStringRepresentationsTest.java
index ca839bc..b1f2764 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkStringRepresentationsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkStringRepresentationsTest.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.google.devtools.build.lib.skylark;
+package com.google.devtools.build.lib.starlark;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/util/BUILD b/src/test/java/com/google/devtools/build/lib/starlark/util/BUILD
similarity index 100%
rename from src/test/java/com/google/devtools/build/lib/skylark/util/BUILD
rename to src/test/java/com/google/devtools/build/lib/starlark/util/BUILD
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/util/BazelEvaluationTestCase.java b/src/test/java/com/google/devtools/build/lib/starlark/util/BazelEvaluationTestCase.java
similarity index 98%
rename from src/test/java/com/google/devtools/build/lib/skylark/util/BazelEvaluationTestCase.java
rename to src/test/java/com/google/devtools/build/lib/starlark/util/BazelEvaluationTestCase.java
index eab10bd..5c4ac84 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/util/BazelEvaluationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/util/BazelEvaluationTestCase.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.lib.skylark.util;
+package com.google.devtools.build.lib.starlark.util;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.analysis.starlark.StarlarkModules;
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/util/StarlarkOptionsTestCase.java b/src/test/java/com/google/devtools/build/lib/starlark/util/StarlarkOptionsTestCase.java
similarity index 98%
rename from src/test/java/com/google/devtools/build/lib/skylark/util/StarlarkOptionsTestCase.java
rename to src/test/java/com/google/devtools/build/lib/starlark/util/StarlarkOptionsTestCase.java
index 01ec179..ff4b909 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/util/StarlarkOptionsTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/util/StarlarkOptionsTestCase.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.lib.skylark.util;
+package com.google.devtools.build.lib.starlark.util;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;