diff --git a/src/applications/audit/editor/PhabricatorAuditCommentEditor.php b/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
index 03476f70a7..8a17999ee0 100644
--- a/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
@@ -46,7 +46,7 @@ final class PhabricatorAuditCommentEditor extends PhabricatorEditor {
       'diffusion-audit-'.$commit->getPHID(),
       pht(
         'Commit %s',
-        'r'.$repository->getCallsign().$commit->getCommitIdentifier()),
+        $commit->getMonogram()),
     );
   }
 
diff --git a/src/applications/audit/management/PhabricatorAuditManagementDeleteWorkflow.php b/src/applications/audit/management/PhabricatorAuditManagementDeleteWorkflow.php
index fa9dbff635..95fbdb430f 100644
--- a/src/applications/audit/management/PhabricatorAuditManagementDeleteWorkflow.php
+++ b/src/applications/audit/management/PhabricatorAuditManagementDeleteWorkflow.php
@@ -222,22 +222,23 @@ final class PhabricatorAuditManagementDeleteWorkflow
     return $list;
   }
 
-  private function loadRepos($callsigns) {
-    $callsigns = $this->parseList($callsigns);
-    if (!$callsigns) {
+  private function loadRepos($identifiers) {
+    $identifiers = $this->parseList($identifiers);
+    if (!$identifiers) {
       return null;
     }
 
-    $repos = id(new PhabricatorRepositoryQuery())
+    $query = id(new PhabricatorRepositoryQuery())
       ->setViewer($this->getViewer())
-      ->withCallsigns($callsigns)
-      ->execute();
-    $repos = mpull($repos, null, 'getCallsign');
+      ->withIdentifiers($identifiers);
 
-    foreach ($callsigns as $sign) {
-      if (empty($repos[$sign])) {
+    $repos = $query->execute();
+
+    $map = $query->getIdentifierMap();
+    foreach ($identifiers as $identifier) {
+      if (empty($map[$identifier])) {
         throw new PhutilArgumentUsageException(
-          pht('No such repository with callsign "%s"!', $sign));
+          pht('No repository "%s" exists!', $identifier));
       }
     }
 
diff --git a/src/applications/diffusion/herald/HeraldCommitAdapter.php b/src/applications/diffusion/herald/HeraldCommitAdapter.php
index 9baac6f2ad..67234edeab 100644
--- a/src/applications/diffusion/herald/HeraldCommitAdapter.php
+++ b/src/applications/diffusion/herald/HeraldCommitAdapter.php
@@ -130,10 +130,7 @@ final class HeraldCommitAdapter
   }
 
   public function getHeraldName() {
-    return
-      'r'.
-      $this->repository->getCallsign().
-      $this->commit->getCommitIdentifier();
+    return $this->commit->getMonogram();
   }
 
   public function loadAffectedPaths() {
diff --git a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
index 094968437b..195a68a695 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
@@ -112,7 +112,7 @@ final class HarbormasterBuildableSearchEngine
         } else if ($object instanceof DifferentialDiff) {
           $diff_names[] = $object->getID();
         } else if ($object instanceof PhabricatorRepository) {
-          $repository_names[] = 'r'.$object->getCallsign();
+          $repository_names[] = $object->getMonogram();
         } else if ($object instanceof PhabricatorRepositoryCommit) {
           $repository = $object->getRepository();
           $commit_names[] = $repository->formatCommitName(
diff --git a/src/applications/owners/controller/PhabricatorOwnersPathsController.php b/src/applications/owners/controller/PhabricatorOwnersPathsController.php
index ad278d5296..b02f5437be 100644
--- a/src/applications/owners/controller/PhabricatorOwnersPathsController.php
+++ b/src/applications/owners/controller/PhabricatorOwnersPathsController.php
@@ -83,7 +83,7 @@ final class PhabricatorOwnersPathsController
       }
     }
 
-    $repos = mpull($repos, 'getCallsign', 'getPHID');
+    $repos = mpull($repos, 'getMonogram', 'getPHID');
     asort($repos);
 
     $template = new AphrontTypeaheadTemplateView();
diff --git a/src/applications/releeph/controller/product/ReleephProductCreateController.php b/src/applications/releeph/controller/product/ReleephProductCreateController.php
index 9772b293fe..2aedf8cdf1 100644
--- a/src/applications/releeph/controller/product/ReleephProductCreateController.php
+++ b/src/applications/releeph/controller/product/ReleephProductCreateController.php
@@ -121,11 +121,11 @@ final class ReleephProductCreateController extends ReleephProductController {
 
     foreach ($repos as $repo_id => $repo) {
       $repo_name = $repo->getName();
-      $callsign = $repo->getCallsign();
-      $choices[$repo->getPHID()] = "r{$callsign} ({$repo_name})";
+      $display = $repo->getDisplayName();
+      $choices[$repo->getPHID()] = "{$display} ({$repo_name})";
     }
 
-    ksort($choices);
+    asort($choices);
     return $choices;
   }
 
diff --git a/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php b/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
index 2f06f50f13..26e708a00c 100644
--- a/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
+++ b/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
@@ -372,7 +372,7 @@ final class DifferentialReleephRequestFieldSpecification extends Phobject {
             'part of a Releeph branch, but also has %d path change(s) not '.
             'part of a Releeph branch!',
             $commit->getCommitIdentifier(),
-            $repo->getCallsign(),
+            $repo->getDisplayName(),
             count($in_branch),
             count($ex_branch));
           phlog($error);
diff --git a/src/applications/releeph/query/ReleephProductSearchEngine.php b/src/applications/releeph/query/ReleephProductSearchEngine.php
index ca92068b6f..f56125a687 100644
--- a/src/applications/releeph/query/ReleephProductSearchEngine.php
+++ b/src/applications/releeph/query/ReleephProductSearchEngine.php
@@ -114,9 +114,9 @@ final class ReleephProductSearchEngine
         phutil_tag(
           'a',
           array(
-            'href' => '/diffusion/'.$repo->getCallsign().'/',
+            'href' => $repo->getURI(),
           ),
-          'r'.$repo->getCallsign()));
+          $repo->getMonogram()));
 
       $list->addItem($item);
     }