diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/UploadPackMetricsHook.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/UploadPackMetricsHook.java
index cbaca6b381..8810c44bea 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/UploadPackMetricsHook.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/UploadPackMetricsHook.java
@@ -36,7 +36,7 @@ public class UploadPackMetricsHook implements PostUploadHook {
   @Inject
   UploadPackMetricsHook(MetricMaker metricMaker) {
     upload = metricMaker.newCounter(
-        "git/upload-pack",
+        "git/upload-pack/request_count",
         new Description("Total number of git-upload-pack requests")
           .setRate()
           .setUnit("requests"),
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
index 18e950a09e..33347e7b3c 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
@@ -275,7 +275,7 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
           .setUnit("sessions"));
 
     final Counter0 authFailures = metricMaker.newCounter(
-        "sshd/sessions/authentication-failed",
+        "sshd/sessions/authentication_failures",
         new Description("Rate of SSH authentication failures")
           .setRate()
           .setUnit("failures"));