diff --git a/src/aphront/AphrontRequest.php b/src/aphront/AphrontRequest.php
--- a/src/aphront/AphrontRequest.php
+++ b/src/aphront/AphrontRequest.php
@@ -58,7 +58,7 @@
    *
    * @param string $key URI data key to pull line range information from.
    * @param int|null $limit Maximum length of the range.
-   * @return null|pair<int, int> Null, or beginning and end of the range.
+   * @return null|array<int, int> Null, or beginning and end of the range.
    */
   public function getURILineRange($key, $limit) {
     $range = $this->getURIData($key);
diff --git a/src/aphront/configuration/AphrontApplicationConfiguration.php b/src/aphront/configuration/AphrontApplicationConfiguration.php
--- a/src/aphront/configuration/AphrontApplicationConfiguration.php
+++ b/src/aphront/configuration/AphrontApplicationConfiguration.php
@@ -387,8 +387,8 @@
   /**
    * Build a controller to respond to the request.
    *
-   * @return pair<AphrontController,array> Controller and dictionary of request
-   *                                       parameters.
+   * @return array<AphrontController,array> Controller and dictionary of
+   *                                        request parameters.
    * @task routing
    */
   private function buildController() {
diff --git a/src/aphront/sink/AphrontHTTPSink.php b/src/aphront/sink/AphrontHTTPSink.php
--- a/src/aphront/sink/AphrontHTTPSink.php
+++ b/src/aphront/sink/AphrontHTTPSink.php
@@ -45,7 +45,7 @@
   /**
    * Write HTTP headers to the output.
    *
-   * @param list<pair> $headers List of <name, value> pairs.
+   * @param list<array> $headers List of <name, value> pairs.
    * @return void
    */
   final public function writeHeaders(array $headers) {
diff --git a/src/applications/celerity/CelerityResourceMapGenerator.php b/src/applications/celerity/CelerityResourceMapGenerator.php
--- a/src/applications/celerity/CelerityResourceMapGenerator.php
+++ b/src/applications/celerity/CelerityResourceMapGenerator.php
@@ -216,7 +216,7 @@
    *
    * @param string $name Resource name.
    * @param string $data Resource data.
-   * @return pair<string|null, list<string>|null> The `@provides` symbol and
+   * @return array<string|null, list<string>|null> The `@provides` symbol and
    *    the list of `@requires` symbols. If the resource is not part of the
    *    dependency graph, both are null.
    */
diff --git a/src/applications/conduit/controller/PhabricatorConduitAPIController.php b/src/applications/conduit/controller/PhabricatorConduitAPIController.php
--- a/src/applications/conduit/controller/PhabricatorConduitAPIController.php
+++ b/src/applications/conduit/controller/PhabricatorConduitAPIController.php
@@ -162,7 +162,7 @@
    * @param   ConduitAPIRequest $api_request Request being executed.
    * @param   array             $metadata Dictionary of request metadata.
    * @param   wild              $method
-   * @return  null|pair         Null to indicate successful authentication, or
+   * @return  null|array        Null to indicate successful authentication, or
    *                            an error code and error message pair.
    */
   private function authenticateUser(
diff --git a/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php b/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
--- a/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
@@ -606,7 +606,7 @@
   /**
    * Build the prefixes for line IDs used to track inline comments.
    *
-   * @return pair<wild, wild> Left and right prefixes.
+   * @return array<wild, wild> Left and right prefixes.
    */
   protected function getLineIDPrefixes() {
     // These look like "C123NL45", which means the line is line 45 on the
diff --git a/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php b/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
--- a/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
+++ b/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
@@ -276,7 +276,7 @@
    *
    * @param list<string> $to List of To PHIDs.
    * @param list<string> $cc List of CC PHIDs.
-   * @return pair<list<string>, list<string>> Expanded PHID lists.
+   * @return array<list<string>, list<string>> Expanded PHID lists.
    */
   private function expandRecipientPHIDs(array $to, array $cc) {
     $to_result = array();
@@ -334,7 +334,7 @@
    *
    * @param list<string> $to List of To PHIDs.
    * @param list<string> $cc List of CC PHIDs.
-   * @return pair<wild, wild> Maps from PHIDs to users.
+   * @return array<wild, wild> Maps from PHIDs to users.
    */
   private function loadRecipientUsers(array $to, array $cc) {
     $to_result = array();
@@ -372,7 +372,7 @@
    *
    * @param map<string, PhabricatorUser> $to Map of "To" users.
    * @param map<string, PhabricatorUser> $cc Map of "CC" users.
-   * @return pair<wild, wild> Filtered user maps.
+   * @return array<wild, wild> Filtered user maps.
    */
   private function filterRecipientUsers(array $to, array $cc) {
     $to_result = array();
diff --git a/src/applications/phrequent/storage/PhrequentTimeBlock.php b/src/applications/phrequent/storage/PhrequentTimeBlock.php
--- a/src/applications/phrequent/storage/PhrequentTimeBlock.php
+++ b/src/applications/phrequent/storage/PhrequentTimeBlock.php
@@ -254,9 +254,9 @@
    * This is used to avoid double-counting time on objects which had timers
    * started multiple times.
    *
-   * @param list<pair<int, int>> $ranges List of possibly overlapping time
-   *   ranges.
-   * @return list<pair<int, int>> Nonoverlapping time ranges.
+   * @param list<array<int, int>> $ranges List of possibly overlapping time
+   *   range pairs.
+   * @return list<array<int, int>> Nonoverlapping time range pairs.
    */
   public static function mergeTimeRanges(array $ranges) {
     $ranges = isort($ranges, '0');
diff --git a/src/applications/policy/interface/PhabricatorExtendedPolicyInterface.php b/src/applications/policy/interface/PhabricatorExtendedPolicyInterface.php
--- a/src/applications/policy/interface/PhabricatorExtendedPolicyInterface.php
+++ b/src/applications/policy/interface/PhabricatorExtendedPolicyInterface.php
@@ -64,7 +64,7 @@
    *
    * @param string $capability Constant of the capability being tested.
    * @param PhabricatorUser $viewer Viewer whose capabilities are being tested.
-   * @return list<pair<wild, wild>> List of extended policies.
+   * @return list<array<wild, wild>> List of extended policies.
    */
   public function getExtendedPolicy($capability, PhabricatorUser $viewer);
 
diff --git a/src/infrastructure/env/PhabricatorEnv.php b/src/infrastructure/env/PhabricatorEnv.php
--- a/src/infrastructure/env/PhabricatorEnv.php
+++ b/src/infrastructure/env/PhabricatorEnv.php
@@ -783,7 +783,7 @@
    *
    * @param string $raw_uri URI to test.
    * @param list<string> $protocols Allowed protocols.
-   * @return pair<string, string> Pre-resolved URI and domain.
+   * @return array<string, string> Pre-resolved URI and domain.
    * @task uri
    */
   public static function requireValidRemoteURIForFetch(
diff --git a/src/view/control/AphrontTableView.php b/src/view/control/AphrontTableView.php
--- a/src/view/control/AphrontTableView.php
+++ b/src/view/control/AphrontTableView.php
@@ -106,7 +106,7 @@
    *   list($sort, $reverse) = AphrontTableView::parseSortParam($sort_param);
    *
    * @param string  $sort Sort request parameter.
-   * @return pair   Sort value, sort direction.
+   * @return array  Sort value, sort direction.
    */
   public static function parseSort($sort) {
     return array(ltrim($sort, '-'), preg_match('/^-/', $sort));