diff --git a/src/applications/differential/phid/DifferentialPHIDTypeRevision.php b/src/applications/differential/phid/DifferentialPHIDTypeRevision.php
--- a/src/applications/differential/phid/DifferentialPHIDTypeRevision.php
+++ b/src/applications/differential/phid/DifferentialPHIDTypeRevision.php
@@ -9,7 +9,7 @@
   }
 
   public function getTypeName() {
-    return pht('Differential Revision');
+    return pht('Revision');
   }
 
   public function newObject() {
diff --git a/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php b/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php
--- a/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php
+++ b/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php
@@ -9,7 +9,7 @@
   }
 
   public function getTypeName() {
-    return pht('Phabricator User');
+    return pht('User');
   }
 
   public function getTypeIcon() {
diff --git a/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php b/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php
--- a/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php
+++ b/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php
@@ -216,6 +216,13 @@
 
     asort($results);
 
+    // Put tasks first, see T4606.
+    $results = array_select_keys(
+      $results,
+      array(
+        ManiphestPHIDTypeTask::TYPECONST,
+      )) + $results;
+
     return $results;
   }