diff --git a/src/aphront/handler/PhabricatorDefaultRequestExceptionHandler.php b/src/aphront/handler/PhabricatorDefaultRequestExceptionHandler.php
index b13100b05d..2f563cabc0 100644
--- a/src/aphront/handler/PhabricatorDefaultRequestExceptionHandler.php
+++ b/src/aphront/handler/PhabricatorDefaultRequestExceptionHandler.php
@@ -53,7 +53,7 @@ final class PhabricatorDefaultRequestExceptionHandler
 
     if (PhabricatorEnv::getEnvConfig('phabricator.developer-mode')) {
       $trace = id(new AphrontStackTraceView())
-        ->setUser($viewer)
+        ->setViewer($viewer)
         ->setTrace($throwable->getTrace());
     } else {
       $trace = null;
@@ -71,7 +71,7 @@ final class PhabricatorDefaultRequestExceptionHandler
     $dialog
       ->setTitle(pht('Unhandled Exception ("%s")', $class))
       ->setClass('aphront-exception-dialog')
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->appendChild($content);
 
     if ($request->isAjax()) {
diff --git a/src/aphront/handler/PhabricatorPolicyRequestExceptionHandler.php b/src/aphront/handler/PhabricatorPolicyRequestExceptionHandler.php
index 442cb08f66..0900b4abbe 100644
--- a/src/aphront/handler/PhabricatorPolicyRequestExceptionHandler.php
+++ b/src/aphront/handler/PhabricatorPolicyRequestExceptionHandler.php
@@ -76,7 +76,7 @@ final class PhabricatorPolicyRequestExceptionHandler
     $dialog = id(new AphrontDialogView())
       ->setTitle($throwable->getTitle())
       ->setClass('aphront-access-dialog')
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->appendChild($content);
 
     if ($list) {
diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
index 5e94dc4d29..56a7bec5ed 100644
--- a/src/applications/base/controller/PhabricatorController.php
+++ b/src/applications/base/controller/PhabricatorController.php
@@ -416,7 +416,7 @@ abstract class PhabricatorController extends AphrontController {
     $submit_uri = $submit_uri->getPath();
 
     return id(new AphrontDialogView())
-      ->setUser($this->getRequest()->getUser())
+      ->setViewer($this->getRequest()->getUser())
       ->setSubmitURI($submit_uri);
   }
 
@@ -440,7 +440,7 @@ abstract class PhabricatorController extends AphrontController {
 
     $viewer = $this->getRequest()->getUser();
     if ($viewer) {
-      $page->setUser($viewer);
+      $page->setViewer($viewer);
     }
 
     return $page;
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
index 3ba3aa1e70..37a6a62456 100644
--- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
@@ -112,7 +112,7 @@ final class PhabricatorCalendarEventViewController
     }
 
     $header = id(new PHUIHeaderView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setHeader($event->getName())
       ->setStatus($icon, $color, $status)
       ->setPolicyObject($event)
@@ -151,7 +151,7 @@ final class PhabricatorCalendarEventViewController
         ->setText(pht('Availability: %s', $selected_option['name']));
 
       $dropdown = id(new PhabricatorActionListView())
-        ->setUser($viewer);
+        ->setViewer($viewer);
 
       foreach ($options as $key => $option) {
         $uri = "event/availability/{$id}/{$key}/";
@@ -277,7 +277,7 @@ final class PhabricatorCalendarEventViewController
     $viewer = $this->getViewer();
 
     $properties = id(new PHUIPropertyListView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
 
     $invitees = $event->getInvitees();
     foreach ($invitees as $key => $invitee) {
@@ -444,7 +444,7 @@ final class PhabricatorCalendarEventViewController
     }
 
     $properties = id(new PHUIPropertyListView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
 
     $is_parent = $event->isParentEvent();
     if ($is_parent) {
@@ -513,7 +513,7 @@ final class PhabricatorCalendarEventViewController
     $viewer = $this->getViewer();
 
     $properties = id(new PHUIPropertyListView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
 
     if (strlen($event->getDescription())) {
       $description = new PHUIRemarkupView($viewer, $event->getDescription());
diff --git a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
index 9fd87a138e..9236c7fbe6 100644
--- a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
+++ b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
@@ -368,7 +368,7 @@ final class PhabricatorCalendarEventSearchEngine
         $start_year);
     }
 
-    $month_view->setUser($viewer);
+    $month_view->setViewer($viewer);
 
     $viewer_phid = $viewer->getPHID();
     foreach ($events as $event) {
diff --git a/src/applications/conpherence/ConpherenceTransactionRenderer.php b/src/applications/conpherence/ConpherenceTransactionRenderer.php
index 5a6eaffaf2..722638a19f 100644
--- a/src/applications/conpherence/ConpherenceTransactionRenderer.php
+++ b/src/applications/conpherence/ConpherenceTransactionRenderer.php
@@ -64,14 +64,14 @@ final class ConpherenceTransactionRenderer extends Phobject {
         ConpherenceThreadDateMarkerTransaction::TRANSACTIONTYPE)
       ->makeEphemeral();
     $date_marker_transaction_view = id(new ConpherenceTransactionView())
-      ->setUser($user)
+      ->setViewer($user)
       ->setConpherenceTransaction($date_marker_transaction)
       ->setConpherenceThread($conpherence)
       ->setHandles($handles)
       ->setMarkupEngine($engine);
 
     $transaction_view_template = id(new ConpherenceTransactionView())
-      ->setUser($user)
+      ->setViewer($user)
       ->setConpherenceThread($conpherence)
       ->setHandles($handles)
       ->setMarkupEngine($engine);
diff --git a/src/applications/conpherence/controller/ConpherenceListController.php b/src/applications/conpherence/controller/ConpherenceListController.php
index d993a1bd5e..1cd58328a0 100644
--- a/src/applications/conpherence/controller/ConpherenceListController.php
+++ b/src/applications/conpherence/controller/ConpherenceListController.php
@@ -104,7 +104,7 @@ final class ConpherenceListController extends ConpherenceController {
     $threads = $this->loadConpherenceThreadData($all_participation);
 
     $thread_view = id(new ConpherenceThreadListView())
-      ->setUser($user)
+      ->setViewer($user)
       ->setBaseURI($this->getApplicationURI())
       ->setThreads($threads);
 
diff --git a/src/applications/conpherence/controller/ConpherenceParticipantController.php b/src/applications/conpherence/controller/ConpherenceParticipantController.php
index b141e0134c..c8014f90b0 100644
--- a/src/applications/conpherence/controller/ConpherenceParticipantController.php
+++ b/src/applications/conpherence/controller/ConpherenceParticipantController.php
@@ -26,7 +26,7 @@ final class ConpherenceParticipantController extends ConpherenceController {
 
     $uri = $this->getApplicationURI('edit/'.$conpherence->getID().'/');
     $content = id(new ConpherenceParticipantView())
-      ->setUser($this->getViewer())
+      ->setViewer($this->getViewer())
       ->setConpherence($conpherence)
       ->setUpdateURI($uri);
 
diff --git a/src/applications/conpherence/controller/ConpherenceViewController.php b/src/applications/conpherence/controller/ConpherenceViewController.php
index ac0240e418..bd1f22be87 100644
--- a/src/applications/conpherence/controller/ConpherenceViewController.php
+++ b/src/applications/conpherence/controller/ConpherenceViewController.php
@@ -115,7 +115,7 @@ final class ConpherenceViewController extends
     }
 
     $layout = id(new ConpherenceLayoutView())
-      ->setUser($user)
+      ->setViewer($user)
       ->setBaseURI($this->getApplicationURI())
       ->setThread($conpherence)
       ->setHeader($header)
@@ -160,14 +160,14 @@ final class ConpherenceViewController extends
       }
 
       $form = id(new AphrontFormView())
-        ->setUser($user)
+        ->setViewer($user)
         ->setAction($update_uri)
         ->addSigil('conpherence-pontificate')
         ->setWorkflow(true)
         ->addHiddenInput('action', $action)
         ->appendChild(
           id(new PhabricatorRemarkupControl())
-          ->setUser($user)
+          ->setViewer($user)
           ->setName('text')
           ->setSendOnEnter(true)
           ->setValue($draft->getDraft()));
diff --git a/src/applications/dashboard/controller/PhabricatorDashboardProfileController.php b/src/applications/dashboard/controller/PhabricatorDashboardProfileController.php
index ec441658c2..e6b0f722db 100644
--- a/src/applications/dashboard/controller/PhabricatorDashboardProfileController.php
+++ b/src/applications/dashboard/controller/PhabricatorDashboardProfileController.php
@@ -32,7 +32,7 @@ abstract class PhabricatorDashboardProfileController
       $dashboard->getStatus());
 
     return id(new PHUIHeaderView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setHeader($dashboard->getName())
       ->setPolicyObject($dashboard)
       ->setStatus($status_icon, $status_color, $status_name)
diff --git a/src/applications/dashboard/controller/panel/PhabricatorDashboardPanelViewController.php b/src/applications/dashboard/controller/panel/PhabricatorDashboardPanelViewController.php
index 56f9821fcd..515bc741d6 100644
--- a/src/applications/dashboard/controller/panel/PhabricatorDashboardPanelViewController.php
+++ b/src/applications/dashboard/controller/panel/PhabricatorDashboardPanelViewController.php
@@ -75,7 +75,7 @@ final class PhabricatorDashboardPanelViewController
     $id = $panel->getID();
 
     $header = id(new PHUIHeaderView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setHeader($panel->getName())
       ->setPolicyObject($panel)
       ->setHeaderIcon('fa-window-maximize');
diff --git a/src/applications/differential/controller/DifferentialDiffCreateController.php b/src/applications/differential/controller/DifferentialDiffCreateController.php
index c3bfc01743..55e0081527 100644
--- a/src/applications/differential/controller/DifferentialDiffCreateController.php
+++ b/src/applications/differential/controller/DifferentialDiffCreateController.php
@@ -141,7 +141,7 @@ final class DifferentialDiffCreateController extends DifferentialController {
 
     $form
       ->setEncType('multipart/form-data')
-      ->setUser($viewer);
+      ->setViewer($viewer);
 
     if ($revision) {
       $form->appendChild(
@@ -178,7 +178,7 @@ final class DifferentialDiffCreateController extends DifferentialController {
           ->setLimit(1))
       ->appendChild(
         id(new AphrontFormPolicyControl())
-          ->setUser($viewer)
+          ->setViewer($viewer)
           ->setName('viewPolicy')
           ->setPolicyObject($diff_object)
           ->setPolicies($policies)
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
index 35895f8b8b..afbb2da836 100644
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -382,7 +382,7 @@ final class DifferentialRevisionViewController
         ->setRawFileURIs(
           '/differential/changeset/?view=old',
           '/differential/changeset/?view=new')
-        ->setUser($viewer)
+        ->setViewer($viewer)
         ->setDiff($target)
         ->setRenderingReferences($rendering_references)
         ->setVsMap($vs_map)
@@ -408,7 +408,7 @@ final class DifferentialRevisionViewController
     $broken_diffs = $this->loadHistoryDiffStatus($diffs);
 
     $history = id(new DifferentialRevisionUpdateHistoryView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setDiffs($diffs)
       ->setDiffUnitStatuses($broken_diffs)
       ->setSelectedVersusDiffID($diff_vs)
@@ -416,7 +416,7 @@ final class DifferentialRevisionViewController
       ->setCommitsForLinks($commits_for_links);
 
     $local_table = id(new DifferentialLocalCommitsView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setLocalCommits(idx($props, 'local:commits'))
       ->setCommitsForLinks($commits_for_links);
 
@@ -667,7 +667,7 @@ final class DifferentialRevisionViewController
   private function buildHeader(DifferentialRevision $revision) {
     $view = id(new PHUIHeaderView())
       ->setHeader($revision->getTitle($revision))
-      ->setUser($this->getViewer())
+      ->setViewer($this->getViewer())
       ->setPolicyObject($revision)
       ->setHeaderIcon('fa-cog');
 
@@ -724,7 +724,7 @@ final class DifferentialRevisionViewController
     $custom_fields) {
     $viewer = $this->getViewer();
     $properties = id(new PHUIPropertyListView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
 
     if ($custom_fields) {
       $custom_fields->appendFieldsToPropertyList(
@@ -1200,7 +1200,7 @@ final class DifferentialRevisionViewController
     return id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Diff Detail'))
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->addTabGroup($tab_group);
   }
 
@@ -1211,7 +1211,7 @@ final class DifferentialRevisionViewController
     $viewer = $this->getViewer();
 
     $view = id(new PHUIPropertyListView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setObject($diff);
 
     foreach ($fields as $field) {
diff --git a/src/applications/differential/customfield/DifferentialReviewersField.php b/src/applications/differential/customfield/DifferentialReviewersField.php
index 91410cc5a3..b234ed1ded 100644
--- a/src/applications/differential/customfield/DifferentialReviewersField.php
+++ b/src/applications/differential/customfield/DifferentialReviewersField.php
@@ -39,7 +39,7 @@ final class DifferentialReviewersField
     }
 
     $view = id(new DifferentialReviewersView())
-      ->setUser($this->getViewer())
+      ->setViewer($this->getViewer())
       ->setReviewers($reviewers)
       ->setHandles($handles);
 
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
index 7a523d799a..5ec94b87a0 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
@@ -274,7 +274,7 @@ final class DiffusionRepositoryController extends DiffusionController {
 
     $header = id(new PHUIHeaderView())
       ->setHeader($repository->getName())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setPolicyObject($repository)
       ->setProfileHeader(true)
       ->setImage($repository->getProfileImageURI())
@@ -315,7 +315,7 @@ final class DiffusionRepositoryController extends DiffusionController {
 
     $edit_uri = $repository->getPathURI('manage/');
     $action_view = id(new PhabricatorActionListView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setObject($repository);
 
     $action_view->addAction(
@@ -359,7 +359,7 @@ final class DiffusionRepositoryController extends DiffusionController {
   private function buildDescriptionView(PhabricatorRepository $repository) {
     $viewer = $this->getViewer();
     $view = id(new PHUIPropertyListView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
 
     $description = $repository->getDetail('description');
     if (strlen($description)) {
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryURIViewController.php b/src/applications/diffusion/controller/DiffusionRepositoryURIViewController.php
index e923ebfc20..a5e51379b5 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryURIViewController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryURIViewController.php
@@ -179,7 +179,7 @@ final class DiffusionRepositoryURIViewController
     $viewer = $this->getViewer();
 
     $properties = id(new PHUIPropertyListView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
 
     $properties->addProperty(pht('URI'), $uri->getDisplayURI());
 
diff --git a/src/applications/feed/builder/PhabricatorFeedBuilder.php b/src/applications/feed/builder/PhabricatorFeedBuilder.php
index 335889df9d..85e85dc24f 100644
--- a/src/applications/feed/builder/PhabricatorFeedBuilder.php
+++ b/src/applications/feed/builder/PhabricatorFeedBuilder.php
@@ -60,7 +60,7 @@ final class PhabricatorFeedBuilder extends Phobject {
 
       try {
         $view = $story->renderView();
-        $view->setUser($user);
+        $view->setViewer($user);
         $view = $view->render();
       } catch (Exception $ex) {
         // If rendering failed for any reason, don't fail the entire feed,
diff --git a/src/applications/files/controller/PhabricatorFileUploadController.php b/src/applications/files/controller/PhabricatorFileUploadController.php
index dfc4696e08..5d9655efd5 100644
--- a/src/applications/files/controller/PhabricatorFileUploadController.php
+++ b/src/applications/files/controller/PhabricatorFileUploadController.php
@@ -54,7 +54,7 @@ final class PhabricatorFileUploadController extends PhabricatorFileController {
       ->execute();
 
     $form = id(new AphrontFormView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setEncType('multipart/form-data')
       ->appendChild(
         id(new AphrontFormFileControl())
@@ -68,7 +68,7 @@ final class PhabricatorFileUploadController extends PhabricatorFileController {
           ->setValue($request->getStr('name')))
       ->appendChild(
         id(new AphrontFormPolicyControl())
-          ->setUser($viewer)
+          ->setViewer($viewer)
           ->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
           ->setPolicyObject($file)
           ->setPolicies($policies)
@@ -86,7 +86,7 @@ final class PhabricatorFileUploadController extends PhabricatorFileController {
     $title = pht('Upload File');
 
     $global_upload = id(new PhabricatorGlobalUploadTargetView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setShowIfSupportedID($support_id);
 
     $form_box = id(new PHUIObjectBoxView())
diff --git a/src/applications/files/controller/PhabricatorFileViewController.php b/src/applications/files/controller/PhabricatorFileViewController.php
index 7cdf5f4cc2..57cb53d869 100644
--- a/src/applications/files/controller/PhabricatorFileViewController.php
+++ b/src/applications/files/controller/PhabricatorFileViewController.php
@@ -36,7 +36,7 @@ final class PhabricatorFileViewController extends PhabricatorFileController {
     $phid = $file->getPHID();
 
     $header = id(new PHUIHeaderView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setPolicyObject($file)
       ->setHeader($file->getName())
       ->setHeaderIcon('fa-file-o');
diff --git a/src/applications/home/engine/PhabricatorHomeProfileMenuEngine.php b/src/applications/home/engine/PhabricatorHomeProfileMenuEngine.php
index d3e338ef26..8015853bca 100644
--- a/src/applications/home/engine/PhabricatorHomeProfileMenuEngine.php
+++ b/src/applications/home/engine/PhabricatorHomeProfileMenuEngine.php
@@ -19,7 +19,7 @@ final class PhabricatorHomeProfileMenuEngine
     // the home page or any home dashboard to upload them.
 
     $upload = id(new PhabricatorGlobalUploadTargetView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
 
     $content = parent::buildItemViewContent($item);
 
diff --git a/src/applications/legalpad/controller/LegalpadDocumentManageController.php b/src/applications/legalpad/controller/LegalpadDocumentManageController.php
index b39bc89270..7702fc352f 100644
--- a/src/applications/legalpad/controller/LegalpadDocumentManageController.php
+++ b/src/applications/legalpad/controller/LegalpadDocumentManageController.php
@@ -43,7 +43,7 @@ final class LegalpadDocumentManageController extends LegalpadController {
 
     $header = id(new PHUIHeaderView())
       ->setHeader($title)
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setPolicyObject($document)
       ->setHeaderIcon('fa-gavel');
 
@@ -85,7 +85,7 @@ final class LegalpadDocumentManageController extends LegalpadController {
     $viewer = $this->getViewer();
 
     $view = id(new PHUIPropertyListView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
     $document_body = $document->getDocumentBody();
     $document_text = $engine->getOutput(
       $document_body, LegalpadDocumentBody::MARKUP_FIELD_TEXT);
@@ -148,7 +148,7 @@ final class LegalpadDocumentManageController extends LegalpadController {
     $viewer = $this->getViewer();
 
     $properties = id(new PHUIPropertyListView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
 
     $properties->addProperty(
       pht('Signature Type'),
diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
index fe79cd48b3..54fe5ead16 100644
--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
@@ -285,7 +285,7 @@ final class ManiphestTaskDetailController extends ManiphestController {
   private function buildHeaderView(ManiphestTask $task) {
     $view = id(new PHUIHeaderView())
       ->setHeader($task->getTitle())
-      ->setUser($this->getRequest()->getUser())
+      ->setViewer($this->getRequest()->getUser())
       ->setPolicyObject($task);
 
     $priority_name = ManiphestTaskPriority::getTaskPriorityName(
@@ -454,7 +454,7 @@ final class ManiphestTaskDetailController extends ManiphestController {
 
     $viewer = $this->getRequest()->getUser();
     $view = id(new PHUIPropertyListView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
 
     $source = $task->getOriginalEmailSource();
     if ($source) {
diff --git a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
index 541f7f3831..36b141b15f 100644
--- a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
+++ b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
@@ -379,7 +379,7 @@ final class ManiphestTaskSearchEngine
       PhabricatorCustomField::ROLE_LIST);
 
     $list = id(new ManiphestTaskResultListView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setTasks($tasks)
       ->setHandles($handles)
       ->setSavedQuery($saved)
diff --git a/src/applications/maniphest/view/ManiphestTaskListView.php b/src/applications/maniphest/view/ManiphestTaskListView.php
index d5d3d1e9c5..4ba4208d01 100644
--- a/src/applications/maniphest/view/ManiphestTaskListView.php
+++ b/src/applications/maniphest/view/ManiphestTaskListView.php
@@ -58,7 +58,7 @@ final class ManiphestTaskListView extends ManiphestView {
 
     foreach ($this->tasks as $task) {
       $item = id(new PHUIObjectItemView())
-        ->setUser($this->getUser())
+        ->setViewer($this->getUser())
         ->setObject($task)
         ->setObjectName('T'.$task->getID())
         ->setHeader($task->getTitle())
diff --git a/src/applications/maniphest/view/ManiphestTaskResultListView.php b/src/applications/maniphest/view/ManiphestTaskResultListView.php
index 6ee2025265..f21e9cb43e 100644
--- a/src/applications/maniphest/view/ManiphestTaskResultListView.php
+++ b/src/applications/maniphest/view/ManiphestTaskResultListView.php
@@ -65,7 +65,7 @@ final class ManiphestTaskResultListView extends ManiphestView {
     foreach ($groups as $group => $list) {
       $task_list = new ManiphestTaskListView();
       $task_list->setShowBatchControls($this->showBatchControls);
-      $task_list->setUser($viewer);
+      $task_list->setViewer($viewer);
       $task_list->setTasks($list);
       $task_list->setHandles($this->handles);
       $task_list->setCustomFieldLists($this->customFieldLists);
diff --git a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
index 1bf6734db3..88fa9e9904 100644
--- a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
+++ b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
@@ -28,7 +28,7 @@ final class PhabricatorApplicationDetailViewController
 
     $header = id(new PHUIHeaderView())
       ->setHeader($title)
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setPolicyObject($selected)
       ->setHeaderIcon($selected->getIcon());
 
diff --git a/src/applications/meta/controller/PhabricatorApplicationEditController.php b/src/applications/meta/controller/PhabricatorApplicationEditController.php
index f7c2eac81e..a55fde30d7 100644
--- a/src/applications/meta/controller/PhabricatorApplicationEditController.php
+++ b/src/applications/meta/controller/PhabricatorApplicationEditController.php
@@ -79,7 +79,7 @@ final class PhabricatorApplicationEditController
       $application);
 
     $form = id(new AphrontFormView())
-      ->setUser($user);
+      ->setViewer($user);
 
     $locked_policies = PhabricatorEnv::getEnvConfig('policy.locked');
     foreach ($application->getCapabilities() as $capability) {
@@ -96,7 +96,7 @@ final class PhabricatorApplicationEditController
             ->setCaption($caption));
       } else {
         $control = id(new AphrontFormPolicyControl())
-          ->setUser($user)
+          ->setViewer($user)
           ->setDisabled($locked)
           ->setCapability($capability)
           ->setPolicyObject($application)
diff --git a/src/applications/passphrase/controller/PassphraseCredentialEditController.php b/src/applications/passphrase/controller/PassphraseCredentialEditController.php
index 7247321648..f9c937e088 100644
--- a/src/applications/passphrase/controller/PassphraseCredentialEditController.php
+++ b/src/applications/passphrase/controller/PassphraseCredentialEditController.php
@@ -257,7 +257,7 @@ final class PassphraseCredentialEditController extends PassphraseController {
     $credential_is_locked = $credential->getIsLocked();
 
     $form = id(new AphrontFormView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->addHiddenInput('isInitialized', true)
       ->addHiddenInput('type', $type_const)
       ->appendChild(
@@ -268,7 +268,7 @@ final class PassphraseCredentialEditController extends PassphraseController {
           ->setError($e_name))
       ->appendChild(
         id(new PhabricatorRemarkupControl())
-          ->setUser($viewer)
+          ->setViewer($viewer)
           ->setName('description')
           ->setLabel(pht('Description'))
           ->setValue($v_desc))
diff --git a/src/applications/paste/controller/PhabricatorPasteViewController.php b/src/applications/paste/controller/PhabricatorPasteViewController.php
index b5736b784e..36d2836e2b 100644
--- a/src/applications/paste/controller/PhabricatorPasteViewController.php
+++ b/src/applications/paste/controller/PhabricatorPasteViewController.php
@@ -91,7 +91,7 @@ final class PhabricatorPasteViewController extends PhabricatorPasteController {
 
     $header = id(new PHUIHeaderView())
       ->setHeader($title)
-      ->setUser($this->getRequest()->getUser())
+      ->setViewer($this->getRequest()->getUser())
       ->setStatus($header_icon, $header_color, $header_name)
       ->setPolicyObject($paste)
       ->setHeaderIcon('fa-clipboard');
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileViewController.php b/src/applications/people/controller/PhabricatorPeopleProfileViewController.php
index b929d980d5..8d6c51a019 100644
--- a/src/applications/people/controller/PhabricatorPeopleProfileViewController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileViewController.php
@@ -90,7 +90,7 @@ final class PhabricatorPeopleProfileViewController
 
     $viewer = $this->getRequest()->getUser();
     $view = id(new PHUIPropertyListView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setObject($user);
 
     $field_list = PhabricatorCustomField::getObjectFields(
@@ -135,7 +135,7 @@ final class PhabricatorPeopleProfileViewController
       $limit = 5;
       $render_phids = array_slice($projects, 0, $limit);
       $list = id(new PhabricatorProjectListView())
-        ->setUser($viewer)
+        ->setViewer($viewer)
         ->setProjects($render_phids);
 
       if (count($projects) > $limit) {
diff --git a/src/applications/pholio/controller/PholioMockEditController.php b/src/applications/pholio/controller/PholioMockEditController.php
index 90db3fa62f..51cf2ad7b3 100644
--- a/src/applications/pholio/controller/PholioMockEditController.php
+++ b/src/applications/pholio/controller/PholioMockEditController.php
@@ -246,7 +246,7 @@ final class PholioMockEditController extends PholioController {
     }
     foreach ($display_mock_images as $mock_image) {
       $image_elements[] = id(new PholioUploadedImageView())
-        ->setUser($viewer)
+        ->setViewer($viewer)
         ->setImage($mock_image)
         ->setReplacesPHID($mock_image->getFilePHID());
     }
@@ -297,7 +297,7 @@ final class PholioMockEditController extends PholioController {
 
     require_celerity_resource('pholio-edit-css');
     $form = id(new AphrontFormView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->appendChild($order_control)
       ->appendChild(
         id(new AphrontFormTextControl())
@@ -310,7 +310,7 @@ final class PholioMockEditController extends PholioController {
         ->setName('description')
         ->setValue($v_desc)
         ->setLabel(pht('Description'))
-        ->setUser($viewer))
+        ->setViewer($viewer))
       ->appendControl(
         id(new AphrontFormTokenizerControl())
           ->setLabel(pht('Tags'))
@@ -322,11 +322,11 @@ final class PholioMockEditController extends PholioController {
           ->setLabel(pht('Subscribers'))
           ->setName('cc')
           ->setValue($v_cc)
-          ->setUser($viewer)
+          ->setViewer($viewer)
           ->setDatasource(new PhabricatorMetaMTAMailableDatasource()))
       ->appendChild(
         id(new AphrontFormPolicyControl())
-          ->setUser($viewer)
+          ->setViewer($viewer)
           ->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
           ->setPolicyObject($mock)
           ->setPolicies($policies)
@@ -334,7 +334,7 @@ final class PholioMockEditController extends PholioController {
           ->setName('can_view'))
       ->appendChild(
         id(new AphrontFormPolicyControl())
-          ->setUser($viewer)
+          ->setViewer($viewer)
           ->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
           ->setPolicyObject($mock)
           ->setPolicies($policies)
diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php
index 36a8ec8c81..f809be5ee7 100644
--- a/src/applications/pholio/controller/PholioMockViewController.php
+++ b/src/applications/pholio/controller/PholioMockViewController.php
@@ -51,7 +51,7 @@ final class PholioMockViewController extends PholioController {
 
     $header = id(new PHUIHeaderView())
       ->setHeader($title)
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setStatus($header_icon, $header_color, $header_name)
       ->setPolicyObject($mock)
       ->setHeaderIcon('fa-camera-retro');
@@ -73,7 +73,7 @@ final class PholioMockViewController extends PholioController {
     $mock_view = id(new PholioMockImagesView())
       ->setRequestURI($request->getRequestURI())
       ->setCommentFormID($comment_form_id)
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setMock($mock)
       ->setImageID($image_id);
 
@@ -89,7 +89,7 @@ final class PholioMockViewController extends PholioController {
     $crumbs->setBorder(true);
 
     $thumb_grid = id(new PholioMockThumbGridView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setMock($mock);
 
     $view = id(new PHUITwoColumnView())
@@ -176,7 +176,7 @@ final class PholioMockViewController extends PholioController {
     $viewer = $this->getViewer();
 
     $properties = id(new PHUIPropertyListView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
     $description = $mock->getDescription();
 
     if (strlen($description)) {
@@ -222,7 +222,7 @@ final class PholioMockViewController extends PholioController {
       : pht('History Beckons');
 
     $form = id(new PhabricatorApplicationTransactionCommentView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setObject($mock)
       ->setFormID($comment_form_id)
       ->setDraft($draft)
diff --git a/src/applications/pholio/query/PholioMockSearchEngine.php b/src/applications/pholio/query/PholioMockSearchEngine.php
index 104533eee2..e7c8a057c1 100644
--- a/src/applications/pholio/query/PholioMockSearchEngine.php
+++ b/src/applications/pholio/query/PholioMockSearchEngine.php
@@ -104,7 +104,7 @@ final class PholioMockSearchEngine extends PhabricatorApplicationSearchEngine {
 
       $header = 'M'.$mock->getID().' '.$mock->getName();
       $item = id(new PHUIPinboardItemView())
-        ->setUser($viewer)
+        ->setViewer($viewer)
         ->setHeader($header)
         ->setObject($mock)
         ->setURI('/M'.$mock->getID())
diff --git a/src/applications/pholio/view/PholioUploadedImageView.php b/src/applications/pholio/view/PholioUploadedImageView.php
index e583fa687b..9882ccad3c 100644
--- a/src/applications/pholio/view/PholioUploadedImageView.php
+++ b/src/applications/pholio/view/PholioUploadedImageView.php
@@ -32,7 +32,7 @@ final class PholioUploadedImageView extends AphrontView {
       ->setLabel(pht('Title'));
 
     $description = id(new PhabricatorRemarkupControl())
-      ->setUser($this->getUser())
+      ->setViewer($this->getUser())
       ->setName('description_'.$phid)
       ->setValue($image->getDescription())
       ->setSigil('image-description')
diff --git a/src/applications/phriction/query/PhrictionDocumentSearchEngine.php b/src/applications/phriction/query/PhrictionDocumentSearchEngine.php
index cf59159298..ed90360240 100644
--- a/src/applications/phriction/query/PhrictionDocumentSearchEngine.php
+++ b/src/applications/phriction/query/PhrictionDocumentSearchEngine.php
@@ -114,7 +114,7 @@ final class PhrictionDocumentSearchEngine
     $viewer = $this->requireViewer();
 
     $list = new PHUIObjectItemListView();
-    $list->setUser($viewer);
+    $list->setViewer($viewer);
     foreach ($documents as $document) {
       $content = $document->getContent();
       $slug = $document->getSlug();
diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
index aef3d63e93..d01f533e0b 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -97,7 +97,7 @@ final class PhabricatorProjectBoardViewController
     $board_id = celerity_generate_unique_node_id();
 
     $board = id(new PHUIWorkboardView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setID($board_id)
       ->addSigil('jx-workboard')
       ->setMetadata(
@@ -207,7 +207,7 @@ final class PhabricatorProjectBoardViewController
       $panel->setHeaderTag($count_tag);
 
       $cards = id(new PHUIObjectItemListView())
-        ->setUser($viewer)
+        ->setViewer($viewer)
         ->setFlush(true)
         ->setAllowEmptyList(true)
         ->addSigil('project-column')
@@ -438,7 +438,7 @@ final class PhabricatorProjectBoardViewController
       ->setDisabled(!$can_edit);
 
     $sort_menu = id(new PhabricatorActionListView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
     foreach ($items as $item) {
       $sort_menu->addAction($item);
     }
@@ -541,7 +541,7 @@ final class PhabricatorProjectBoardViewController
       ->setDisabled(!$can_edit);
 
     $filter_menu = id(new PhabricatorActionListView())
-        ->setUser($viewer);
+        ->setViewer($viewer);
     foreach ($items as $item) {
       $filter_menu->addAction($item);
     }
@@ -629,7 +629,7 @@ final class PhabricatorProjectBoardViewController
       ->setHref($manage_uri);
 
     $manage_menu = id(new PhabricatorActionListView())
-        ->setUser($viewer);
+        ->setViewer($viewer);
     foreach ($manage_items as $item) {
       $manage_menu->addAction($item);
     }
@@ -796,7 +796,7 @@ final class PhabricatorProjectBoardViewController
     }
 
     $column_menu = id(new PhabricatorActionListView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
     foreach ($column_items as $item) {
       $column_menu->addAction($item);
     }
@@ -858,7 +858,7 @@ final class PhabricatorProjectBoardViewController
       ->setDisabled(!$can_edit || !$trigger);
 
     $trigger_menu = id(new PhabricatorActionListView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
     foreach ($trigger_items as $item) {
       $trigger_menu->addAction($item);
     }
diff --git a/src/applications/project/controller/PhabricatorProjectEditPictureController.php b/src/applications/project/controller/PhabricatorProjectEditPictureController.php
index cc3981de92..b41439e8d3 100644
--- a/src/applications/project/controller/PhabricatorProjectEditPictureController.php
+++ b/src/applications/project/controller/PhabricatorProjectEditPictureController.php
@@ -107,7 +107,7 @@ final class PhabricatorProjectEditPictureController
     $title = pht('Edit Project Picture');
 
     $form = id(new PHUIFormLayoutView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
 
     $builtin = PhabricatorProjectIconSet::getIconImage(
       $project->getIcon());
@@ -261,7 +261,7 @@ final class PhabricatorProjectEditPictureController
         ->setValue($compose_form));
 
     $upload_form = id(new AphrontFormView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setEncType('multipart/form-data')
       ->appendChild(
         id(new AphrontFormFileControl())
diff --git a/src/applications/project/controller/PhabricatorProjectManageController.php b/src/applications/project/controller/PhabricatorProjectManageController.php
index eadda5bf86..cc58210550 100644
--- a/src/applications/project/controller/PhabricatorProjectManageController.php
+++ b/src/applications/project/controller/PhabricatorProjectManageController.php
@@ -20,7 +20,7 @@ final class PhabricatorProjectManageController
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Project History'))
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setPolicyObject($project);
 
     if ($project->getStatus() == PhabricatorProjectStatus::STATUS_ACTIVE) {
@@ -133,7 +133,7 @@ final class PhabricatorProjectManageController
     $viewer = $this->getViewer();
 
     $view = id(new PHUIPropertyListView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
 
     $view->addProperty(
       pht('Looks Like'),
diff --git a/src/applications/project/controller/PhabricatorProjectMembersViewController.php b/src/applications/project/controller/PhabricatorProjectMembersViewController.php
index ee0b71cefa..4b8bd074c5 100644
--- a/src/applications/project/controller/PhabricatorProjectMembersViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectMembersViewController.php
@@ -23,14 +23,14 @@ final class PhabricatorProjectMembersViewController
     $curtain = $this->buildCurtainView($project);
 
     $member_list = id(new PhabricatorProjectMemberListView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setProject($project)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setUserPHIDs($project->getMemberPHIDs())
       ->setShowNote(true);
 
     $watcher_list = id(new PhabricatorProjectWatcherListView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setProject($project)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setUserPHIDs($project->getWatcherPHIDs())
diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php
index 54e1d77d55..ea9bf11c4a 100644
--- a/src/applications/project/controller/PhabricatorProjectProfileController.php
+++ b/src/applications/project/controller/PhabricatorProjectProfileController.php
@@ -27,7 +27,7 @@ final class PhabricatorProjectProfileController
 
     $header = id(new PHUIHeaderView())
       ->setHeader(array($project->getDisplayName(), $tag))
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setPolicyObject($project)
       ->setProfileHeader(true);
 
@@ -61,14 +61,14 @@ final class PhabricatorProjectProfileController
     $subproject_list = $this->buildSubprojectList($project);
 
     $member_list = id(new PhabricatorProjectMemberListView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setProject($project)
       ->setLimit(10)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setUserPHIDs($project->getMemberPHIDs());
 
     $watcher_list = id(new PhabricatorProjectWatcherListView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setProject($project)
       ->setLimit(10)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
@@ -160,7 +160,7 @@ final class PhabricatorProjectProfileController
     $viewer = $request->getUser();
 
     $view = id(new PHUIPropertyListView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setObject($project);
 
     $field_list = PhabricatorCustomField::getObjectFields(
@@ -261,7 +261,7 @@ final class PhabricatorProjectProfileController
     }
 
     $milestone_list = id(new PhabricatorProjectListView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setProjects($milestones)
       ->renderList();
 
diff --git a/src/applications/project/controller/PhabricatorProjectSubprojectsController.php b/src/applications/project/controller/PhabricatorProjectSubprojectsController.php
index 5b8ac2486a..094b19874a 100644
--- a/src/applications/project/controller/PhabricatorProjectSubprojectsController.php
+++ b/src/applications/project/controller/PhabricatorProjectSubprojectsController.php
@@ -42,7 +42,7 @@ final class PhabricatorProjectSubprojectsController
         ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
         ->setObjectList(
           id(new PhabricatorProjectListView())
-            ->setUser($viewer)
+            ->setViewer($viewer)
             ->setProjects($subprojects)
             ->setNoDataString(pht('This project has no subprojects.'))
             ->renderList());
@@ -64,7 +64,7 @@ final class PhabricatorProjectSubprojectsController
         ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
         ->setObjectList(
           id(new PhabricatorProjectListView())
-            ->setUser($viewer)
+            ->setViewer($viewer)
             ->setProjects($milestones)
             ->setNoDataString(pht('This project has no milestones.'))
             ->renderList());
diff --git a/src/applications/project/query/PhabricatorProjectSearchEngine.php b/src/applications/project/query/PhabricatorProjectSearchEngine.php
index 936264a285..0c96d72994 100644
--- a/src/applications/project/query/PhabricatorProjectSearchEngine.php
+++ b/src/applications/project/query/PhabricatorProjectSearchEngine.php
@@ -325,7 +325,7 @@ final class PhabricatorProjectSearchEngine
     $viewer = $this->requireViewer();
 
     $list = id(new PhabricatorProjectListView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setProjects($projects)
       ->setShowWatching(true)
       ->setShowMember(true)
diff --git a/src/applications/project/view/PhabricatorProjectListView.php b/src/applications/project/view/PhabricatorProjectListView.php
index d8fb011c2e..aeef3b3aa9 100644
--- a/src/applications/project/view/PhabricatorProjectListView.php
+++ b/src/applications/project/view/PhabricatorProjectListView.php
@@ -44,7 +44,7 @@ final class PhabricatorProjectListView extends AphrontView {
     }
 
     $list = id(new PHUIObjectItemListView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setNoDataString($no_data);
 
     foreach ($projects as $key => $project) {
diff --git a/src/applications/project/view/ProjectBoardTaskCard.php b/src/applications/project/view/ProjectBoardTaskCard.php
index c35891f53d..2576a392fb 100644
--- a/src/applications/project/view/ProjectBoardTaskCard.php
+++ b/src/applications/project/view/ProjectBoardTaskCard.php
@@ -91,7 +91,7 @@ final class ProjectBoardTaskCard extends Phobject {
 
     $card = id(new PHUIObjectItemView())
       ->setObject($task)
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setObjectName($task->getMonogram())
       ->setHeader($task->getTitle())
       ->setHref($task->getURI())
diff --git a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
index 33ae85481d..eaf5f3bad1 100644
--- a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
+++ b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
@@ -175,7 +175,7 @@ final class PhabricatorRepositorySearchEngine
       $id = $repository->getID();
 
       $item = id(new PHUIObjectItemView())
-        ->setUser($viewer)
+        ->setViewer($viewer)
         ->setObject($repository)
         ->setHeader($repository->getName())
         ->setObjectName($repository->getMonogram())
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
index 5178a1a1d9..bef2adb669 100644
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -178,7 +178,7 @@ final class PhabricatorApplicationSearchController
       'query/advanced');
 
     $form = id(new AphrontFormView())
-      ->setUser($user)
+      ->setViewer($user)
       ->setAction($request->getPath());
 
     $engine->buildSearchForm($form, $saved_query);
@@ -771,7 +771,7 @@ final class PhabricatorApplicationSearchController
     $engine = $this->getSearchEngine();
 
     $nav = id(new AphrontSideNavFilterView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setBaseURI(new PhutilURI($this->getApplicationURI()));
 
     $engine->addNavigationItems($nav->getMenu());
diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
index 48639ffde6..d025f1855c 100644
--- a/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
+++ b/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
@@ -153,7 +153,7 @@ final class PhabricatorSlowvoteEditController
 
     $form = id(new AphrontFormView())
       ->setAction($request->getrequestURI())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Question'))
@@ -162,7 +162,7 @@ final class PhabricatorSlowvoteEditController
           ->setError($e_question))
       ->appendChild(
         id(new PhabricatorRemarkupControl())
-          ->setUser($viewer)
+          ->setViewer($viewer)
           ->setLabel(pht('Description'))
           ->setName('description')
           ->setValue($v_description))
@@ -265,7 +265,7 @@ final class PhabricatorSlowvoteEditController
             $v_shuffle))
       ->appendChild(
         id(new AphrontFormPolicyControl())
-          ->setUser($viewer)
+          ->setViewer($viewer)
           ->setName('viewPolicy')
           ->setPolicyObject($poll)
           ->setPolicies($policies)
diff --git a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
index 1844a5f03c..cccc020bf0 100644
--- a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
+++ b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
@@ -23,7 +23,7 @@ final class PhabricatorSlowvotePollController
     }
 
     $poll_view = id(new SlowvoteEmbedView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setPoll($poll);
 
     if ($request->isAjax()) {
@@ -43,7 +43,7 @@ final class PhabricatorSlowvotePollController
 
     $header = id(new PHUIHeaderView())
       ->setHeader($poll->getQuestion())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setStatus($header_icon, $header_color, $header_name)
       ->setPolicyObject($poll)
       ->setHeaderIcon('fa-bar-chart');
@@ -153,7 +153,7 @@ final class PhabricatorSlowvotePollController
     $draft = PhabricatorDraft::newFromUserAndKey($viewer, $poll->getPHID());
 
     return id(new PhabricatorApplicationTransactionCommentView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setObject($poll)
       ->setDraft($draft)
       ->setHeaderText($add_comment_header)
diff --git a/src/applications/spaces/controller/PhabricatorSpacesEditController.php b/src/applications/spaces/controller/PhabricatorSpacesEditController.php
index cf3b6578b6..14c0889138 100644
--- a/src/applications/spaces/controller/PhabricatorSpacesEditController.php
+++ b/src/applications/spaces/controller/PhabricatorSpacesEditController.php
@@ -121,7 +121,7 @@ final class PhabricatorSpacesEditController
       ->execute();
 
     $form = id(new AphrontFormView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
 
     if ($make_default) {
       $form->appendRemarkupInstructions(
@@ -145,7 +145,7 @@ final class PhabricatorSpacesEditController
           ->setValue($v_desc))
       ->appendChild(
         id(new AphrontFormPolicyControl())
-          ->setUser($viewer)
+          ->setViewer($viewer)
           ->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
           ->setPolicyObject($space)
           ->setPolicies($policies)
@@ -153,7 +153,7 @@ final class PhabricatorSpacesEditController
           ->setName('viewPolicy'))
       ->appendChild(
         id(new AphrontFormPolicyControl())
-          ->setUser($viewer)
+          ->setViewer($viewer)
           ->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
           ->setPolicyObject($space)
           ->setPolicies($policies)
diff --git a/src/applications/spaces/controller/PhabricatorSpacesViewController.php b/src/applications/spaces/controller/PhabricatorSpacesViewController.php
index ba55ba90a7..7f42191281 100644
--- a/src/applications/spaces/controller/PhabricatorSpacesViewController.php
+++ b/src/applications/spaces/controller/PhabricatorSpacesViewController.php
@@ -33,7 +33,7 @@ final class PhabricatorSpacesViewController
     $timeline->setShouldTerminate(true);
 
     $header = id(new PHUIHeaderView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setHeader($space->getNamespaceName())
       ->setPolicyObject($space)
       ->setHeaderIcon('fa-th-large');
@@ -72,7 +72,7 @@ final class PhabricatorSpacesViewController
     $viewer = $this->getRequest()->getUser();
 
     $list = id(new PHUIPropertyListView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
 
     $list->addProperty(
       pht('Default Space'),
diff --git a/src/applications/spaces/query/PhabricatorSpacesNamespaceSearchEngine.php b/src/applications/spaces/query/PhabricatorSpacesNamespaceSearchEngine.php
index 835a5d596f..993920fe0b 100644
--- a/src/applications/spaces/query/PhabricatorSpacesNamespaceSearchEngine.php
+++ b/src/applications/spaces/query/PhabricatorSpacesNamespaceSearchEngine.php
@@ -73,7 +73,7 @@ final class PhabricatorSpacesNamespaceSearchEngine
     $viewer = $this->requireViewer();
 
     $list = new PHUIObjectItemListView();
-    $list->setUser($viewer);
+    $list->setViewer($viewer);
     foreach ($spaces as $space) {
       $item = id(new PHUIObjectItemView())
         ->setObjectName($space->getMonogram())
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index 0b1118a7aa..6cdf4b39ca 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -1284,7 +1284,7 @@ abstract class PhabricatorEditEngine
     $tail = $this->newEditFormTailContent($page_state);
 
     $box = id(new PHUIObjectBoxView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setHeader($box_header)
       ->setValidationException($validation_exception)
       ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
@@ -1357,7 +1357,7 @@ abstract class PhabricatorEditEngine
     $request_path = $request->getPath();
 
     $form = id(new AphrontFormView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setAction($request_path)
       ->addHiddenInput('editEngine', 'true');
 
@@ -1430,7 +1430,7 @@ abstract class PhabricatorEditEngine
     $viewer = $this->getViewer();
 
     $action_view = id(new PhabricatorActionListView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
 
     foreach ($this->buildEditFormActions($object) as $action) {
       $action_view->addAction($action);
@@ -1673,7 +1673,7 @@ abstract class PhabricatorEditEngine
     }
 
     $view = id(new PhabricatorApplicationTransactionCommentView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setHeaderText($header_text)
       ->setAction($comment_uri)
       ->setRequestURI(new PhutilURI($this->getObjectViewURI($object)))
diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
index e0069d2103..b0f71069a9 100644
--- a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
@@ -364,7 +364,7 @@ final class PhabricatorApplicationTransactionCommentView
     $version_value = $this->getCurrentVersion();
 
     $form = id(new AphrontFormView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->addSigil('transaction-append')
       ->setWorkflow(true)
       ->setFullWidth($this->fullWidth)
diff --git a/src/applications/uiexample/examples/PHUIFeedStoryExample.php b/src/applications/uiexample/examples/PHUIFeedStoryExample.php
index 0df757cada..b88382c630 100644
--- a/src/applications/uiexample/examples/PHUIFeedStoryExample.php
+++ b/src/applications/uiexample/examples/PHUIFeedStoryExample.php
@@ -29,7 +29,7 @@ final class PHUIFeedStoryExample extends PhabricatorUIExample {
       ->setImageHref('http://en.wikipedia.org/wiki/Warren_G._Harding')
       ->setEpoch(1)
       ->setAppIcon('fa-star')
-      ->setUser($user);
+      ->setViewer($user);
 
     /* Text Story, useful in Blogs, Ponders, Status */
     $tokens = array(
@@ -54,7 +54,7 @@ final class PHUIFeedStoryExample extends PhabricatorUIExample {
       ->setImageHref('http://en.wikipedia.org/wiki/Abraham_Lincoln')
       ->setEpoch(strtotime('November 19, 1863'))
       ->setAppIcon('fa-star')
-      ->setUser($user)
+      ->setViewer($user)
       ->setTokenBar($tokenview)
       ->setPontification(
         'Four score and seven years ago our fathers brought '.
@@ -88,7 +88,7 @@ final class PHUIFeedStoryExample extends PhabricatorUIExample {
       ->setEpoch(1)
       ->addAction($action1)
       ->setAppIcon('fa-trophy')
-      ->setUser($user);
+      ->setViewer($user);
 
     /* Image Story, used in Pholio, Macro */
     $text = hsprintf(
@@ -110,7 +110,7 @@ final class PHUIFeedStoryExample extends PhabricatorUIExample {
         'Why does inline-block add space under my spans and anchors?')
       ->addAction($action1)
       ->addAction($action2)
-      ->setUser($user);
+      ->setViewer($user);
 
     /* Text Story, useful in Blogs, Ponders, Status */
     $text = hsprintf(
@@ -122,7 +122,7 @@ final class PHUIFeedStoryExample extends PhabricatorUIExample {
       ->setImageHref('http://en.wikipedia.org/wiki/Abraham_Lincoln')
       ->setEpoch(strtotime('November 19, 1863'))
       ->setAppIcon('fa-rocket')
-      ->setUser($user)
+      ->setViewer($user)
       ->setPontification(
         'If we ever create a lightweight status app '.
         'this story would be how that would be displayed.');
@@ -137,7 +137,7 @@ final class PHUIFeedStoryExample extends PhabricatorUIExample {
       ->setImageHref('http://en.wikipedia.org/wiki/Warren_G._Harding')
       ->setEpoch(1)
       ->setAppIcon('fa-wifi')
-      ->setUser($user);
+      ->setViewer($user);
 
 
     $head1 = id(new PHUIHeaderView())
diff --git a/src/applications/uiexample/examples/PHUITimelineExample.php b/src/applications/uiexample/examples/PHUITimelineExample.php
index 42c680ea7b..235af026cd 100644
--- a/src/applications/uiexample/examples/PHUITimelineExample.php
+++ b/src/applications/uiexample/examples/PHUITimelineExample.php
@@ -82,21 +82,21 @@ final class PHUITimelineExample extends PhabricatorUIExample {
 
     // Pinboard!!
     $pin1 = id(new PHUIPinboardItemView())
-      ->setUser($user)
+      ->setViewer($user)
       ->setHeader('user0.png')
       ->setImageURI(celerity_get_resource_uri('/rsrc/image/people/user0.png'))
       ->setURI(celerity_get_resource_uri('/rsrc/image/people/user0.png'))
       ->setImageSize(280, 210);
 
     $pin2 = id(new PHUIPinboardItemView())
-      ->setUser($user)
+      ->setViewer($user)
       ->setHeader('user1.png')
       ->setImageURI(celerity_get_resource_uri('/rsrc/image/people/user1.png'))
       ->setURI(celerity_get_resource_uri('/rsrc/image/people/user1.png'))
       ->setImageSize(280, 210);
 
     $pin3 = id(new PHUIPinboardItemView())
-      ->setUser($user)
+      ->setViewer($user)
       ->setHeader('user2.png')
       ->setImageURI(celerity_get_resource_uri('/rsrc/image/people/user2.png'))
       ->setURI(celerity_get_resource_uri('/rsrc/image/people/user1.png'))
@@ -204,14 +204,14 @@ final class PHUITimelineExample extends PhabricatorUIExample {
     $anchor = 0;
     foreach ($events as $group) {
       foreach ($group->getEventGroup() as $event) {
-        $event->setUser($user);
+        $event->setViewer($user);
         $event->setDateCreated(time() + ($anchor * 60 * 8));
         $event->setAnchor(++$anchor);
       }
     }
 
     $timeline = id(new PHUITimelineView());
-    $timeline->setUser($user);
+    $timeline->setViewer($user);
     foreach ($events as $event) {
       $timeline->addEvent($event);
     }
diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldDate.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldDate.php
index 389b440e46..670e79d3ff 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldDate.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldDate.php
@@ -46,7 +46,7 @@ final class PhabricatorStandardCustomFieldDate
 
   public function readValueFromRequest(AphrontRequest $request) {
     $control = $this->newDateControl();
-    $control->setUser($request->getUser());
+    $control->setViewer($request->getUser());
     $value = $control->readValueFromRequest($request);
 
     $this->setFieldValue($value);
@@ -65,7 +65,7 @@ final class PhabricatorStandardCustomFieldDate
     $control = id(new AphrontFormDateControl())
       ->setLabel($this->getFieldName())
       ->setName($this->getFieldKey())
-      ->setUser($this->getViewer())
+      ->setViewer($this->getViewer())
       ->setCaption($this->getCaption())
       ->setAllowNull(!$this->getRequired());
 
diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldRemarkup.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldRemarkup.php
index cda1595aeb..d9c1cc2d16 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldRemarkup.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldRemarkup.php
@@ -9,7 +9,7 @@ final class PhabricatorStandardCustomFieldRemarkup
 
   public function renderEditControl(array $handles) {
     return id(new PhabricatorRemarkupControl())
-      ->setUser($this->getViewer())
+      ->setViewer($this->getViewer())
       ->setLabel($this->getFieldName())
       ->setName($this->getFieldKey())
       ->setCaption($this->getCaption())
diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
index 3c5268d65b..dd4326801e 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
@@ -9,7 +9,7 @@ abstract class PhabricatorStandardCustomFieldTokenizer
     $value = $this->getFieldValue();
 
     $control = id(new AphrontFormTokenizerControl())
-      ->setUser($this->getViewer())
+      ->setViewer($this->getViewer())
       ->setLabel($this->getFieldName())
       ->setName($this->getFieldKey())
       ->setDatasource($this->getDatasource())
diff --git a/src/infrastructure/markup/view/PHUIRemarkupView.php b/src/infrastructure/markup/view/PHUIRemarkupView.php
index d60d28b5d3..1feec4f02d 100644
--- a/src/infrastructure/markup/view/PHUIRemarkupView.php
+++ b/src/infrastructure/markup/view/PHUIRemarkupView.php
@@ -24,7 +24,7 @@ final class PHUIRemarkupView extends AphrontView {
   const OPTION_GENERATE_TOC = 'header.generate-toc';
 
   public function __construct(PhabricatorUser $viewer, $corpus) {
-    $this->setUser($viewer);
+    $this->setViewer($viewer);
     $this->corpus = $corpus;
   }
 
diff --git a/src/view/layout/PHUIApplicationMenuView.php b/src/view/layout/PHUIApplicationMenuView.php
index 164f897550..bcd2ed3655 100644
--- a/src/view/layout/PHUIApplicationMenuView.php
+++ b/src/view/layout/PHUIApplicationMenuView.php
@@ -70,7 +70,7 @@ final class PHUIApplicationMenuView extends Phobject {
     $viewer = $this->getViewer();
 
     $view = id(new PHUIListView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
 
     $profile_menu = $this->getProfileMenu();
     if ($profile_menu) {
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
index 84581e991c..8f5e6b35bb 100644
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -351,7 +351,7 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView
     }
 
     $menu = id(new PhabricatorMainMenuView())
-      ->setUser($viewer);
+      ->setViewer($viewer);
 
     if ($this->getController()) {
       $menu->setController($this->getController());
@@ -501,7 +501,7 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView
       $is_minimize = $this->getDurableColumnMinimize();
       $durable_column = id(new ConpherenceDurableColumnView())
         ->setSelectedConpherence(null)
-        ->setUser($user)
+        ->setViewer($user)
         ->setQuicksandConfig($this->buildQuicksandConfig())
         ->setVisible($is_visible)
         ->setMinimize($is_minimize)
diff --git a/src/view/phui/PHUIHeaderView.php b/src/view/phui/PHUIHeaderView.php
index a2fdcaa81a..8d9d06669f 100644
--- a/src/view/phui/PHUIHeaderView.php
+++ b/src/view/phui/PHUIHeaderView.php
@@ -270,7 +270,7 @@ final class PHUIHeaderView extends AphrontTagView {
     $space_header = null;
     if ($viewer) {
       $space_header = id(new PHUISpacesNamespaceContextView())
-        ->setUser($viewer)
+        ->setViewer($viewer)
         ->setObject($this->policyObject);
     }
 
diff --git a/src/view/phui/PHUIObjectItemListView.php b/src/view/phui/PHUIObjectItemListView.php
index 629feb9139..4be130f62a 100644
--- a/src/view/phui/PHUIObjectItemListView.php
+++ b/src/view/phui/PHUIObjectItemListView.php
@@ -132,7 +132,7 @@ final class PHUIObjectItemListView extends AphrontTagView {
     if ($this->items) {
       if ($viewer) {
         foreach ($this->items as $item) {
-          $item->setUser($viewer);
+          $item->setViewer($viewer);
         }
       }
 
diff --git a/src/view/phui/PHUIObjectItemView.php b/src/view/phui/PHUIObjectItemView.php
index 527bd51b38..ae34314863 100644
--- a/src/view/phui/PHUIObjectItemView.php
+++ b/src/view/phui/PHUIObjectItemView.php
@@ -412,7 +412,7 @@ final class PHUIObjectItemView extends AphrontTagView {
 
     if ($viewer) {
       $header_name[] = id(new PHUISpacesNamespaceContextView())
-        ->setUser($viewer)
+        ->setViewer($viewer)
         ->setObject($this->object);
     }
 
diff --git a/src/view/phui/PHUIPinboardItemView.php b/src/view/phui/PHUIPinboardItemView.php
index 1fafefc3d6..7e02190884 100644
--- a/src/view/phui/PHUIPinboardItemView.php
+++ b/src/view/phui/PHUIPinboardItemView.php
@@ -62,7 +62,7 @@ final class PHUIPinboardItemView extends AphrontView {
         ),
         array(
           id(new PHUISpacesNamespaceContextView())
-            ->setUser($this->getUser())
+            ->setViewer($this->getUser())
             ->setObject($this->object),
           phutil_tag(
             'a',
diff --git a/src/view/phui/PHUITimelineEventView.php b/src/view/phui/PHUITimelineEventView.php
index 4bf8737758..d825e905a5 100644
--- a/src/view/phui/PHUITimelineEventView.php
+++ b/src/view/phui/PHUITimelineEventView.php
@@ -356,7 +356,7 @@ final class PHUITimelineEventView extends AphrontView {
       }
 
       $action_list = id(new PhabricatorActionListView())
-        ->setUser($this->getUser());
+        ->setViewer($this->getUser());
       foreach ($items as $item) {
         $action_list->addAction($item);
       }
@@ -575,7 +575,7 @@ final class PHUITimelineEventView extends AphrontView {
       if ($source) {
         $content_source = id(new PhabricatorContentSourceView())
           ->setContentSource($source)
-          ->setUser($this->getUser());
+          ->setViewer($this->getUser());
         $content_source = pht('Via %s', $content_source->getSourceName());
       }
 
diff --git a/src/view/phui/calendar/PHUICalendarWeekView.php b/src/view/phui/calendar/PHUICalendarWeekView.php
index 6237e5b569..d96a84d4d0 100644
--- a/src/view/phui/calendar/PHUICalendarWeekView.php
+++ b/src/view/phui/calendar/PHUICalendarWeekView.php
@@ -73,7 +73,7 @@ final class PHUICalendarWeekView extends AphrontView {
       ->addClass('calendar-day-view-sidebar');
 
     $list = id(new PHUICalendarListView())
-      ->setUser($this->getViewer())
+      ->setViewer($this->getViewer())
       ->setView($this->getView());
 
     if (count($events) == 0) {