diff --git a/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java b/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java
index 9a55cc051..2bd22df6d 100644
--- a/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java
+++ b/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java
@@ -240,7 +240,7 @@ abstract class CreateOrUpdateRegistrarCommand extends MutatingCommand {
 
   @Nullable
   @Parameter(
-      names = "--drive_id",
+      names = "--drive_folder_id",
       description = "Id of this registrar's folder in Drive",
       converter = OptionalStringParameter.class,
       validateWith = OptionalStringParameter.class)
diff --git a/javatests/google/registry/tools/CreateRegistrarCommandTest.java b/javatests/google/registry/tools/CreateRegistrarCommandTest.java
index d0aaf19a0..5cef82ebb 100644
--- a/javatests/google/registry/tools/CreateRegistrarCommandTest.java
+++ b/javatests/google/registry/tools/CreateRegistrarCommandTest.java
@@ -620,7 +620,7 @@ public class CreateRegistrarCommandTest extends CommandTestCase<CreateRegistrarC
         "--fax=null",
         "--email=null",
         "--url=null",
-        "--drive_id=null",
+        "--drive_folder_id=null",
         "--street=\"123 Fake St\"",
         "--city Fakington",
         "--state MA",
@@ -653,7 +653,7 @@ public class CreateRegistrarCommandTest extends CommandTestCase<CreateRegistrarC
         "--fax=",
         "--email=",
         "--url=",
-        "--drive_id=",
+        "--drive_folder_id=",
         "--icann_referral_email=foo@bar.test",
         "--street=\"123 Fake St\"",
         "--city Fakington",
diff --git a/javatests/google/registry/tools/UpdateRegistrarCommandTest.java b/javatests/google/registry/tools/UpdateRegistrarCommandTest.java
index c03725ec1..469fa9ed0 100644
--- a/javatests/google/registry/tools/UpdateRegistrarCommandTest.java
+++ b/javatests/google/registry/tools/UpdateRegistrarCommandTest.java
@@ -367,7 +367,7 @@ public class UpdateRegistrarCommandTest extends CommandTestCase<UpdateRegistrarC
         "--fax=null",
         "--email=null",
         "--url=null",
-        "--drive_id=null",
+        "--drive_folder_id=null",
         "--force",
         "NewRegistrar");
 
@@ -411,7 +411,7 @@ public class UpdateRegistrarCommandTest extends CommandTestCase<UpdateRegistrarC
         "--fax=",
         "--email=",
         "--url=",
-        "--drive_id=",
+        "--drive_folder_id=",
         "--force",
         "NewRegistrar");