diff --git a/app/src/main/java/com/google/reviewit/UnifiedDiffFragment.java b/app/src/main/java/com/google/reviewit/UnifiedDiffFragment.java
index 8607b7e..c116ec8 100644
--- a/app/src/main/java/com/google/reviewit/UnifiedDiffFragment.java
+++ b/app/src/main/java/com/google/reviewit/UnifiedDiffFragment.java
@@ -33,7 +33,7 @@
 import com.google.reviewit.util.FormatUtil;
 import com.google.reviewit.util.LayoutUtil;
 import com.google.reviewit.util.WidgetUtil;
-import com.google.reviewit.widget.PostReviewView;
+import com.google.reviewit.widget.SelectCodeReviewView;
 import com.google.reviewit.widget.ScrollWithHeadingsView;
 import com.google.reviewit.widget.UnifiedDiffView;
 
@@ -156,10 +156,10 @@
   }
 
   private void initPostReview(Change change, @IdRes int id) {
-    PostReviewView postReview = ((PostReviewView) v(id));
+    SelectCodeReviewView postReview = ((SelectCodeReviewView) v(id));
     postReview.setChange(change);
     postReview.select(change.getVote("Code-Review", getApp().getSelf()));
-    postReview.setOnVoteListener(new PostReviewView.OnVoteListener() {
+    postReview.setOnVoteListener(new SelectCodeReviewView.OnVoteListener() {
       @Override
       public void vote(int vote) {
         display(PostReviewFragment.create(vote));
diff --git a/app/src/main/java/com/google/reviewit/widget/PostReviewView.java b/app/src/main/java/com/google/reviewit/widget/SelectCodeReviewView.java
similarity index 98%
rename from app/src/main/java/com/google/reviewit/widget/PostReviewView.java
rename to app/src/main/java/com/google/reviewit/widget/SelectCodeReviewView.java
index 3dd59bb..1c9bd1e 100644
--- a/app/src/main/java/com/google/reviewit/widget/PostReviewView.java
+++ b/app/src/main/java/com/google/reviewit/widget/SelectCodeReviewView.java
@@ -48,9 +48,9 @@
 import static com.google.reviewit.util.LayoutUtil.matchLayout;
 
 /**
- * View to post a review on a change (summary comment + Code-Review vote).
+ * View to select a Code-Review vote.
  */
-public class PostReviewView extends LinearLayout {
+public class SelectCodeReviewView extends LinearLayout {
   private final WidgetUtil widgetUtil;
   private final List<VotingButton> votingButtons = new ArrayList<>();
   private final ImageView emoticon;
@@ -58,11 +58,11 @@
   private Change change;
   private OnVoteListener onVoteListener = null;
 
-  public PostReviewView(Context context) {
+  public SelectCodeReviewView(Context context) {
     this(context, null);
   }
 
-  public PostReviewView(Context context, AttributeSet attrs) {
+  public SelectCodeReviewView(Context context, AttributeSet attrs) {
     super(context, attrs);
 
     this.widgetUtil = new WidgetUtil(context);
diff --git a/app/src/main/res/layout/content_unified_diff.xml b/app/src/main/res/layout/content_unified_diff.xml
index 70b2ca7..1f52b02 100644
--- a/app/src/main/res/layout/content_unified_diff.xml
+++ b/app/src/main/res/layout/content_unified_diff.xml
@@ -38,7 +38,7 @@
     android:orientation="vertical"
     android:visibility="gone">
 
-    <com.google.reviewit.widget.PostReviewView
+    <com.google.reviewit.widget.SelectCodeReviewView
       xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto"
       android:id="@+id/postReview"
@@ -49,7 +49,7 @@
       android:layout_marginLeft="5dp"
       android:layout_marginRight="5dp"
       android:visibility="gone">
-    </com.google.reviewit.widget.PostReviewView>
+    </com.google.reviewit.widget.SelectCodeReviewView>
 
     <ImageView
       android:id="@+id/expandPostReviewPanel"
@@ -76,7 +76,7 @@
     android:orientation="vertical"
     android:background="@drawable/navigation_button_bar">
 
-    <com.google.reviewit.widget.PostReviewView
+    <com.google.reviewit.widget.SelectCodeReviewView
       xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto"
       android:id="@+id/postReviewNav"
@@ -87,7 +87,7 @@
       android:layout_marginLeft="5dp"
       android:layout_marginRight="5dp"
       android:visibility="gone">
-    </com.google.reviewit.widget.PostReviewView>
+    </com.google.reviewit.widget.SelectCodeReviewView>
 
     <RelativeLayout
       android:id="@+id/navigationButtons"
