diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewer.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewer.java
index 3a70e09975..3704f5dc90 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewer.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewer.java
@@ -105,7 +105,7 @@ public class DeleteReviewer implements RestModifyView<ReviewerResource, Input> {
       }
       ChangeUtil.bumpRowVersionNotLastUpdatedOn(rsrc.getId(), db);
       db.patchSetApprovals().delete(del);
-      update.removeReviewer(rsrc.getUser().getAccountId());
+      update.removeReviewer(rsrc.getReviewerUser().getAccountId());
 
       if (msg.length() > 0) {
         ChangeMessage changeMessage =
@@ -136,7 +136,7 @@ public class DeleteReviewer implements RestModifyView<ReviewerResource, Input> {
 
   private Iterable<PatchSetApproval> approvals(ReviewDb db,
       ReviewerResource rsrc) throws OrmException {
-    final Account.Id user = rsrc.getUser().getAccountId();
+    final Account.Id user = rsrc.getReviewerUser().getAccountId();
     return Iterables.filter(
         approvalsUtil.byChange(db, rsrc.getNotes()).values(),
         new Predicate<PatchSetApproval>() {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteVote.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteVote.java
index b3e59b9672..9abef6da16 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteVote.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteVote.java
@@ -76,7 +76,7 @@ public class DeleteVote implements RestModifyView<VoteResource, Input> {
           change.getProject(), ctl.getUser().asIdentifiedUser(),
           TimeUtil.nowTs())) {
       bu.addOp(change.getId(),
-          new Op(r.getUser().getAccountId(), rsrc.getLabel()));
+          new Op(r.getReviewerUser().getAccountId(), rsrc.getLabel()));
       bu.execute();
     }
 
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
index 1766ed2378..3f7720c346 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
@@ -149,7 +149,7 @@ public class PostReviewers implements RestModifyView<ChangeResource, AddReviewer
 
   private PostResult putAccount(ReviewerResource rsrc) throws OrmException,
       IOException {
-    Account member = rsrc.getUser().getAccount();
+    Account member = rsrc.getReviewerUser().getAccount();
     ChangeControl control = rsrc.getControl();
     PostResult result = new PostResult();
     if (isValidReviewer(member, control)) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java
index 7c10b115b1..1adc734a6c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java
@@ -67,7 +67,7 @@ public class ReviewerJson {
     AccountLoader loader = accountLoaderFactory.create(true);
     for (ReviewerResource rsrc : rsrcs) {
       ReviewerInfo info = format(new ReviewerInfo(
-          rsrc.getUser().getAccountId()),
+          rsrc.getReviewerUser().getAccountId()),
           rsrc.getUserControl());
       loader.put(info);
       infos.add(info);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerResource.java
index f7b5228786..88949d1c31 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerResource.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerResource.java
@@ -47,7 +47,7 @@ public class ReviewerResource extends ChangeResource {
     this(rsrc, userFactory.create(id));
   }
 
-  public IdentifiedUser getUser() {
+  public IdentifiedUser getReviewerUser() {
     return user;
   }
 
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Votes.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Votes.java
index a86ce7f87f..3bba37e8c0 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Votes.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Votes.java
@@ -79,7 +79,7 @@ public class Votes implements ChildCollection<ReviewerResource, VoteResource> {
           db.get(),
           rsrc.getControl(),
           rsrc.getChange().currentPatchSetId(),
-          rsrc.getUser().getAccountId());
+          rsrc.getReviewerUser().getAccountId());
       for (PatchSetApproval psa : byPatchSetUser) {
         votes.put(psa.getLabel(), psa.getValue());
       }