diff --git a/src/main/java/com/google/devtools/build/lib/starlarkdebug/module/StarlarkDebuggerOptions.java b/src/main/java/com/google/devtools/build/lib/starlarkdebug/module/StarlarkDebuggerOptions.java
index 06878f7..6f4c464 100644
--- a/src/main/java/com/google/devtools/build/lib/starlarkdebug/module/StarlarkDebuggerOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/module/StarlarkDebuggerOptions.java
@@ -21,9 +21,11 @@
 import com.google.devtools.common.options.OptionsBase;
 
 /** Configuration options for Starlark debugging. */
+// TODO(laurentlb): Rename the flags (remove 'experimental' and replace 'skylark' with 'starlark')
+// when the interpreter code is more stable.
 public final class StarlarkDebuggerOptions extends OptionsBase {
   @Option(
-      name = "experimental_starlark_debug",
+      name = "experimental_skylark_debug",
       defaultValue = "false",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.EXECUTION},
@@ -34,7 +36,7 @@
   public boolean debugStarlark;
 
   @Option(
-      name = "experimental_starlark_debug_server_port",
+      name = "experimental_skylark_debug_server_port",
       defaultValue = "7300",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.EXECUTION},
@@ -43,7 +45,7 @@
   public int debugServerPort;
 
   @Option(
-      name = "experimental_starlark_debug_verbose_logging",
+      name = "experimental_skylark_debug_verbose_logging",
       defaultValue = "false",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.TERMINAL_OUTPUT},