diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py
index 8024b78de6..e951a1ba02 100644
--- a/zerver/lib/actions.py
+++ b/zerver/lib/actions.py
@@ -249,7 +249,7 @@ def notify_new_user(user_profile, internal=False):
     # type: (UserProfile, bool) -> None
     if settings.NEW_USER_BOT is not None:
         send_signup_message(settings.NEW_USER_BOT, "signups", user_profile, internal)
-    statsd.gauge("users.signups.%s" % (user_profile.realm.domain.replace('.', '_')), 1, delta=True)
+    statsd.gauge("users.signups.%s" % (user_profile.realm.string_id), 1, delta=True)
 
 def add_new_user_history(user_profile, streams):
     # type: (UserProfile, Iterable[Stream]) -> None
diff --git a/zerver/tests/test_report.py b/zerver/tests/test_report.py
index 7283c2d52a..44a08ae2c0 100644
--- a/zerver/tests/test_report.py
+++ b/zerver/tests/test_report.py
@@ -56,9 +56,9 @@ class TestReport(ZulipTestCase):
         self.assert_json_success(result)
 
         expected_calls = [
-            ('timing', ('endtoend.send_time.zulip_com', 5)),
-            ('timing', ('endtoend.receive_time.zulip_com', 6)),
-            ('timing', ('endtoend.displayed_time.zulip_com', 7)),
+            ('timing', ('endtoend.send_time.zulip', 5)),
+            ('timing', ('endtoend.receive_time.zulip', 6)),
+            ('timing', ('endtoend.displayed_time.zulip', 7)),
             ('incr', ('locally_echoed',)),
             ('incr', ('render_disparity',)),
         ]
@@ -81,9 +81,9 @@ class TestReport(ZulipTestCase):
         self.assert_json_success(result)
 
         expected_calls = [
-            ('timing', ('narrow.initial_core.zulip_com', 5)),
-            ('timing', ('narrow.initial_free.zulip_com', 6)),
-            ('timing', ('narrow.network.zulip_com', 7)),
+            ('timing', ('narrow.initial_core.zulip', 5)),
+            ('timing', ('narrow.initial_free.zulip', 6)),
+            ('timing', ('narrow.network.zulip', 7)),
         ]
         self.assertEqual(stats_mock.func_calls, expected_calls)
 
@@ -103,8 +103,8 @@ class TestReport(ZulipTestCase):
         self.assert_json_success(result)
 
         expected_calls = [
-            ('timing', ('unnarrow.initial_core.zulip_com', 5)),
-            ('timing', ('unnarrow.initial_free.zulip_com', 6)),
+            ('timing', ('unnarrow.initial_core.zulip', 5)),
+            ('timing', ('unnarrow.initial_free.zulip', 6)),
         ]
         self.assertEqual(stats_mock.func_calls, expected_calls)
 
diff --git a/zerver/views/report.py b/zerver/views/report.py
index ea3c4d5fec..8e0a9eb430 100644
--- a/zerver/views/report.py
+++ b/zerver/views/report.py
@@ -40,7 +40,7 @@ def json_report_send_time(request, user_profile,
     # type: (HttpRequest, UserProfile, int, int, int, bool, bool) -> HttpResponse
     request._log_data["extra"] = "[%sms/%sms/%sms/echo:%s/diff:%s]" \
         % (time, received, displayed, locally_echoed, rendered_content_disparity)
-    base_key = statsd_key(user_profile.realm.domain, clean_periods=True)
+    base_key = statsd_key(user_profile.realm.string_id, clean_periods=True)
     statsd.timing("endtoend.send_time.%s" % (base_key,), time)
     if received != "(unknown)":
         statsd.timing("endtoend.receive_time.%s" % (base_key,), received)
@@ -60,7 +60,7 @@ def json_report_narrow_time(request, user_profile,
                             network=REQ(converter=to_non_negative_int)):
     # type: (HttpRequest, UserProfile, int, int, int) -> HttpResponse
     request._log_data["extra"] = "[%sms/%sms/%sms]" % (initial_core, initial_free, network)
-    base_key = statsd_key(user_profile.realm.domain, clean_periods=True)
+    base_key = statsd_key(user_profile.realm.string_id, clean_periods=True)
     statsd.timing("narrow.initial_core.%s" % (base_key,), initial_core)
     statsd.timing("narrow.initial_free.%s" % (base_key,), initial_free)
     statsd.timing("narrow.network.%s" % (base_key,), network)
@@ -73,7 +73,7 @@ def json_report_unnarrow_time(request, user_profile,
                               initial_free=REQ(converter=to_non_negative_int)):
     # type: (HttpRequest, UserProfile, int, int) -> HttpResponse
     request._log_data["extra"] = "[%sms/%sms]" % (initial_core, initial_free)
-    base_key = statsd_key(user_profile.realm.domain, clean_periods=True)
+    base_key = statsd_key(user_profile.realm.string_id, clean_periods=True)
     statsd.timing("unnarrow.initial_core.%s" % (base_key,), initial_core)
     statsd.timing("unnarrow.initial_free.%s" % (base_key,), initial_free)
     return json_success()