diff --git a/core/src/main/java/google/registry/tools/RegistryTool.java b/core/src/main/java/google/registry/tools/RegistryTool.java
index 99c0a8a84..f0d7d1227 100644
--- a/core/src/main/java/google/registry/tools/RegistryTool.java
+++ b/core/src/main/java/google/registry/tools/RegistryTool.java
@@ -123,7 +123,7 @@ public final class RegistryTool {
           .put("update_allocation_tokens", UpdateAllocationTokensCommand.class)
           .put("update_cursors", UpdateCursorsCommand.class)
           .put("update_domain", UpdateDomainCommand.class)
-          .put("update_kms_keyring", UpdateKmsKeyringCommand.class)
+          .put("update_keyring_secret", UpdateKeyringSecretCommand.class)
           .put("update_premium_list", UpdatePremiumListCommand.class)
           .put("update_registrar", UpdateRegistrarCommand.class)
           .put("update_reserved_list", UpdateReservedListCommand.class)
diff --git a/core/src/main/java/google/registry/tools/RegistryToolComponent.java b/core/src/main/java/google/registry/tools/RegistryToolComponent.java
index dbfd9c989..6600fcf76 100644
--- a/core/src/main/java/google/registry/tools/RegistryToolComponent.java
+++ b/core/src/main/java/google/registry/tools/RegistryToolComponent.java
@@ -160,7 +160,7 @@ interface RegistryToolComponent {
 
   void inject(UpdateDomainCommand command);
 
-  void inject(UpdateKmsKeyringCommand command);
+  void inject(UpdateKeyringSecretCommand command);
 
   void inject(UpdateRegistrarCommand command);
 
diff --git a/core/src/main/java/google/registry/tools/UpdateKmsKeyringCommand.java b/core/src/main/java/google/registry/tools/UpdateKeyringSecretCommand.java
similarity index 93%
rename from core/src/main/java/google/registry/tools/UpdateKmsKeyringCommand.java
rename to core/src/main/java/google/registry/tools/UpdateKeyringSecretCommand.java
index 865643e20..3034e5b02 100644
--- a/core/src/main/java/google/registry/tools/UpdateKmsKeyringCommand.java
+++ b/core/src/main/java/google/registry/tools/UpdateKeyringSecretCommand.java
@@ -27,17 +27,16 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import javax.inject.Inject;
 
-/** Command to set and update {@code KmsKeyring} values. */
-@Parameters(
-  separators = " =",
-  commandDescription = "Update values of secrets in KmsKeyring."
-)
-final class UpdateKmsKeyringCommand implements CommandWithRemoteApi {
+/**
+ * Command to set and update ASCII-armored secret from the active {@code Keyring} implementation.
+ */
+@Parameters(separators = " =", commandDescription = "Update values of secret in the keyring.")
+final class UpdateKeyringSecretCommand implements CommandWithRemoteApi {
 
   @Inject KmsUpdater kmsUpdater;
 
   @Inject
-  UpdateKmsKeyringCommand() {}
+  UpdateKeyringSecretCommand() {}
 
   @Parameter(names  = "--keyname", description = "The secret to update", required = true)
   private KeyringKeyName keyringKeyName;