diff --git a/java/google/registry/whois/WhoisMetrics.java b/java/google/registry/whois/WhoisMetrics.java
index 93c3ae47a..32e87e511 100644
--- a/java/google/registry/whois/WhoisMetrics.java
+++ b/java/google/registry/whois/WhoisMetrics.java
@@ -112,7 +112,9 @@ public class WhoisMetrics {
       private Clock clock = null;
 
       public Builder setCommand(WhoisCommand command) {
-        return setCommandName(command.getClass().getSimpleName());
+        // All WHOIS command class names share the "Command" suffix, so strip it out in order to
+        // have shorter labels.
+        return setCommandName(command.getClass().getSimpleName().replaceFirst("Command$", ""));
       }
 
       public abstract Builder setCommandName(String commandName);
diff --git a/javatests/google/registry/whois/WhoisHttpServerTest.java b/javatests/google/registry/whois/WhoisHttpServerTest.java
index cbae3b24b..ac17aa35f 100644
--- a/javatests/google/registry/whois/WhoisHttpServerTest.java
+++ b/javatests/google/registry/whois/WhoisHttpServerTest.java
@@ -352,7 +352,7 @@ public class WhoisHttpServerTest {
     server.run();
     WhoisMetric expected =
         WhoisMetric.builderForRequest(clock)
-            .setCommandName("NameserverLookupByHostCommand")
+            .setCommandName("NameserverLookupByHost")
             .setNumResults(1)
             .setStatus(SC_OK)
             .build();
diff --git a/javatests/google/registry/whois/WhoisServerTest.java b/javatests/google/registry/whois/WhoisServerTest.java
index 7c66d40fa..7330635b2 100644
--- a/javatests/google/registry/whois/WhoisServerTest.java
+++ b/javatests/google/registry/whois/WhoisServerTest.java
@@ -456,7 +456,7 @@ public class WhoisServerTest {
     server.run();
     WhoisMetric expected =
         WhoisMetric.builderForRequest(clock)
-            .setCommandName("NameserverLookupByIpCommand")
+            .setCommandName("NameserverLookupByIp")
             .setNumResults(2)
             .setStatus(SC_OK)
             .build();
@@ -470,7 +470,7 @@ public class WhoisServerTest {
     server.run();
     WhoisMetric expected =
         WhoisMetric.builderForRequest(clock)
-            .setCommandName("DomainLookupCommand")
+            .setCommandName("DomainLookup")
             .setNumResults(0)
             .setStatus(SC_NOT_FOUND)
             .build();