diff --git a/packages/component-dashboard/src/components/Reviews.js b/packages/component-dashboard/src/components/Reviews.js
index 7ab111cfd159a362136776ca51ec2e3d8c38a233..dde994ec29cd3577fb9d28d23743adcaa9e8452d 100644
--- a/packages/component-dashboard/src/components/Reviews.js
+++ b/packages/component-dashboard/src/components/Reviews.js
@@ -6,7 +6,7 @@ import classes from './Reviews.local.scss'
 
 const Reviews = ({ reviews }) => (
   <div className={classes.root}>
-    {Object.keys(reviews).map(status => (
+    {['invited', 'accepted', 'rejected', 'completed'].map(status => (
       <span className={classes.badge} key={status}>
         <Badge count={reviews[status].length} label={status} />
       </span>
diff --git a/packages/component-dashboard/src/components/sections/ReviewerItem.js b/packages/component-dashboard/src/components/sections/ReviewerItem.js
index 8ec3b786910cfb0641f85e48464051725b047224..b9381c6164ce0c3d4396473474949331d1a99e29 100644
--- a/packages/component-dashboard/src/components/sections/ReviewerItem.js
+++ b/packages/component-dashboard/src/components/sections/ReviewerItem.js
@@ -7,7 +7,7 @@ import Divider from './Divider'
 import VersionTitle from './VersionTitle'
 
 // TODO: only return links if version id is in reviewer.accepted array
-// TODO: only return actions if not accepted or declined
+// TODO: only return actions if not accepted or rejected
 // TODO: review id in link
 
 const ReviewerItem = ({ project, version, currentUser, reviewerResponse }) => {
@@ -29,7 +29,7 @@ const ReviewerItem = ({ project, version, currentUser, reviewerResponse }) => {
                     project={project}
                     version={version}
                   >
-                    {reviewer.submitted ? 'Reviewed' : 'Do Review'}
+                    {reviewer.submitted ? 'Completed' : 'Do Review'}
                   </ProjectLink>
                 </div>
               </div>
@@ -52,7 +52,7 @@ const ReviewerItem = ({ project, version, currentUser, reviewerResponse }) => {
                 <div className={classes.action}>
                   <Button
                     onClick={() =>
-                      reviewerResponse(project, version, reviewer, 'declined')
+                      reviewerResponse(project, version, reviewer, 'rejected')
                     }
                   >
                     reject
@@ -61,7 +61,7 @@ const ReviewerItem = ({ project, version, currentUser, reviewerResponse }) => {
               </div>
             )}
 
-            {reviewer.status === 'declined' && <div>declined</div>}
+            {reviewer.status === 'rejected' && <div>rejected</div>}
           </div>
         )}
       </div>
diff --git a/packages/component-review/src/components/ReviewPage.js b/packages/component-review/src/components/ReviewPage.js
index 880a86d37054dea4416791e464a697e90422f61f..337231247252a7e011bc6d5f354b69e98b31b588 100644
--- a/packages/component-review/src/components/ReviewPage.js
+++ b/packages/component-review/src/components/ReviewPage.js
@@ -23,9 +23,9 @@ const onSubmit = (
   { history, project, version, reviewer },
 ) => {
   Object.assign(reviewer, {
-    status: 'reviewed',
-    submitted: new Date(),
     ...values,
+    status: 'completed',
+    submitted: new Date(),
   })
 
   return dispatch(