diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 976ccaed3c..00f67fbe29 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -495,9 +495,9 @@ phutil_register_library_map(array(
     'DifferentialResponsibleViewerFunctionDatasource' => 'applications/differential/typeahead/DifferentialResponsibleViewerFunctionDatasource.php',
     'DifferentialRevertPlanField' => 'applications/differential/customfield/DifferentialRevertPlanField.php',
     'DifferentialReviewedByField' => 'applications/differential/customfield/DifferentialReviewedByField.php',
-    'DifferentialReviewer' => 'applications/differential/storage/DifferentialReviewer.php',
     'DifferentialReviewerDatasource' => 'applications/differential/typeahead/DifferentialReviewerDatasource.php',
     'DifferentialReviewerForRevisionEdgeType' => 'applications/differential/edge/DifferentialReviewerForRevisionEdgeType.php',
+    'DifferentialReviewerProxy' => 'applications/differential/storage/DifferentialReviewerProxy.php',
     'DifferentialReviewerStatus' => 'applications/differential/constants/DifferentialReviewerStatus.php',
     'DifferentialReviewersAddBlockingReviewersHeraldAction' => 'applications/differential/herald/DifferentialReviewersAddBlockingReviewersHeraldAction.php',
     'DifferentialReviewersAddBlockingSelfHeraldAction' => 'applications/differential/herald/DifferentialReviewersAddBlockingSelfHeraldAction.php',
@@ -5125,9 +5125,9 @@ phutil_register_library_map(array(
     'DifferentialResponsibleViewerFunctionDatasource' => 'PhabricatorTypeaheadDatasource',
     'DifferentialRevertPlanField' => 'DifferentialStoredCustomField',
     'DifferentialReviewedByField' => 'DifferentialCoreCustomField',
-    'DifferentialReviewer' => 'Phobject',
     'DifferentialReviewerDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'DifferentialReviewerForRevisionEdgeType' => 'PhabricatorEdgeType',
+    'DifferentialReviewerProxy' => 'Phobject',
     'DifferentialReviewerStatus' => 'Phobject',
     'DifferentialReviewersAddBlockingReviewersHeraldAction' => 'DifferentialReviewersHeraldAction',
     'DifferentialReviewersAddBlockingSelfHeraldAction' => 'DifferentialReviewersHeraldAction',
diff --git a/src/applications/differential/controller/DifferentialCommentSaveController.php b/src/applications/differential/controller/DifferentialCommentSaveController.php
index 831d7c90c8..87376bf6d5 100644
--- a/src/applications/differential/controller/DifferentialCommentSaveController.php
+++ b/src/applications/differential/controller/DifferentialCommentSaveController.php
@@ -64,7 +64,7 @@ final class DifferentialCommentSaveController
       if (isset($current_reviewers[$reviewer_phid])) {
         continue;
       }
-      $reviewer = new DifferentialReviewer(
+      $reviewer = new DifferentialReviewerProxy(
         $reviewer_phid,
         array(
           'status' => DifferentialReviewerStatus::STATUS_ADDED,
diff --git a/src/applications/differential/customfield/DifferentialReviewersField.php b/src/applications/differential/customfield/DifferentialReviewersField.php
index 41a4cf8f26..5138733c41 100644
--- a/src/applications/differential/customfield/DifferentialReviewersField.php
+++ b/src/applications/differential/customfield/DifferentialReviewersField.php
@@ -84,7 +84,7 @@ final class DifferentialReviewersField
     }
 
     foreach ($new_reviewers as $phid => $status) {
-      $new_reviewers[$phid] = new DifferentialReviewer(
+      $new_reviewers[$phid] = new DifferentialReviewerProxy(
         $phid,
         array(
           'status' => $status,
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index b4828494c0..f1bed835d9 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -474,7 +474,7 @@ final class DifferentialTransactionEditor
 
             $owner_phid = $object->getAuthorPHID();
             if ($owner_phid) {
-              $reviewer = new DifferentialReviewer(
+              $reviewer = new DifferentialReviewerProxy(
                 $owner_phid,
                 array(
                   'status' => DifferentialReviewerStatus::STATUS_ADDED,
diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php
index f36a686eb5..6dd690d179 100644
--- a/src/applications/differential/query/DifferentialRevisionQuery.php
+++ b/src/applications/differential/query/DifferentialRevisionQuery.php
@@ -1008,7 +1008,9 @@ final class DifferentialRevisionQuery
       $revision_edges = $edges[$revision->getPHID()][$edge_type];
       $reviewers = array();
       foreach ($revision_edges as $reviewer_phid => $edge) {
-        $reviewer = new DifferentialReviewer($reviewer_phid, $edge['data']);
+        $reviewer = new DifferentialReviewerProxy(
+          $reviewer_phid,
+          $edge['data']);
 
         if ($this->needReviewerAuthority) {
           if (!$viewer_phid) {
diff --git a/src/applications/differential/storage/DifferentialReviewer.php b/src/applications/differential/storage/DifferentialReviewerProxy.php
similarity index 96%
rename from src/applications/differential/storage/DifferentialReviewer.php
rename to src/applications/differential/storage/DifferentialReviewerProxy.php
index 1ad7fbc8b0..bf38ee27e3 100644
--- a/src/applications/differential/storage/DifferentialReviewer.php
+++ b/src/applications/differential/storage/DifferentialReviewerProxy.php
@@ -1,6 +1,6 @@
 <?php
 
-final class DifferentialReviewer extends Phobject {
+final class DifferentialReviewerProxy extends Phobject {
 
   private $reviewerPHID;
   private $status;
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 47443932e3..29ac61505d 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -403,7 +403,7 @@ final class DifferentialRevision extends DifferentialDAO
   }
 
   public function attachReviewerStatus(array $reviewers) {
-    assert_instances_of($reviewers, 'DifferentialReviewer');
+    assert_instances_of($reviewers, 'DifferentialReviewerProxy');
 
     $this->reviewerStatus = $reviewers;
     return $this;
diff --git a/src/applications/differential/view/DifferentialReviewersView.php b/src/applications/differential/view/DifferentialReviewersView.php
index b94e246d73..fd558d85f1 100644
--- a/src/applications/differential/view/DifferentialReviewersView.php
+++ b/src/applications/differential/view/DifferentialReviewersView.php
@@ -7,7 +7,7 @@ final class DifferentialReviewersView extends AphrontView {
   private $diff;
 
   public function setReviewers(array $reviewers) {
-    assert_instances_of($reviewers, 'DifferentialReviewer');
+    assert_instances_of($reviewers, 'DifferentialReviewerProxy');
     $this->reviewers = $reviewers;
     return $this;
   }