diff --git a/src/Components/BidTracker/BidPhaseConfig/Complete.js b/src/Components/BidTracker/BidPhaseConfig/Complete.js
index fadd680503..8076830ddd 100644
--- a/src/Components/BidTracker/BidPhaseConfig/Complete.js
+++ b/src/Components/BidTracker/BidPhaseConfig/Complete.js
@@ -15,10 +15,9 @@ import {
   GET_DRAFT_TITLE,
   GET_SUBMIT_BID_ACTION_TITLE,
   GET_SUBMIT_BID_COMPLETE_TITLE,
-  GET_HAND_SHAKE_EVALUATE_TITLE,
   GET_HAND_SHAKE_EVALUATING_TITLE,
-  GET_HAND_SHAKE_OFFERED_TITLE,
   GET_HAND_SHAKE_ACCEPTED_TITLE,
+  GET_BID_REVIEW_COMPLETE_TITLE,
   GET_PANEL_TITLE,
   GET_APPROVAL_TITLE,
   DRAFT_NUMBER,
@@ -50,9 +49,8 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
   const DRAFT_TITLE = GET_DRAFT_TITLE();
   const SUBMIT_BID_ACTION_TITLE = GET_SUBMIT_BID_ACTION_TITLE();
   const SUBMIT_BID_COMPLETE_TITLE = GET_SUBMIT_BID_COMPLETE_TITLE();
-  const HAND_SHAKE_EVALUATE_TITLE = GET_HAND_SHAKE_EVALUATE_TITLE();
   const HAND_SHAKE_EVALUATING_TITLE = GET_HAND_SHAKE_EVALUATING_TITLE();
-  const HAND_SHAKE_OFFERED_TITLE = GET_HAND_SHAKE_OFFERED_TITLE();
+  const BID_REVIEW_COMPLETE_TITLE = GET_BID_REVIEW_COMPLETE_TITLE();
   const HAND_SHAKE_ACCEPTED_TITLE = GET_HAND_SHAKE_ACCEPTED_TITLE();
   const PANEL_TITLE = GET_PANEL_TITLE();
   const APPROVAL_TITLE = GET_APPROVAL_TITLE();
@@ -81,7 +79,7 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
       bidClassObject.stages[HAND_SHAKE_OFFERED_PROP] = {
         ...DEFAULT_INCOMPLETE_OBJECT,
         date: HAND_SHAKE_OFFERED_DATE,
-        title: HAND_SHAKE_EVALUATE_TITLE,
+        title: HAND_SHAKE_EVALUATING_TITLE,
         number: HAND_SHAKE_OFFERED_NUMBER };
       bidClassObject.stages[HAND_SHAKE_ACCEPTED_PROP] = {
         ...DEFAULT_INCOMPLETE_OBJECT,
@@ -106,6 +104,39 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
     // or when they've declined it.
     case SUBMITTED_PROP:
     case HAND_SHAKE_OFFERED_PROP:
+      bidClassObject.stages[DRAFT_PROP] = Object.assign(
+        {},
+        DEFAULT_COMPLETE_OBJECT,
+        { number: DRAFT_NUMBER, date: DRAFT_DATE, title: DRAFT_TITLE },
+      );
+      bidClassObject.stages[SUBMITTED_PROP] = {
+        ...DEFAULT_COMPLETE_OBJECT,
+        date: SUBMITTED_DATE,
+        title: SUBMIT_BID_COMPLETE_TITLE,
+        number: SUBMITTED_NUMBER };
+      bidClassObject.stages[HAND_SHAKE_OFFERED_PROP] = {
+        ...DEFAULT_INCOMPLETE_OBJECT,
+        date: HAND_SHAKE_OFFERED_DATE,
+        title: HAND_SHAKE_EVALUATING_TITLE,
+        needsAction: false,
+        isCurrent: true,
+        number: HAND_SHAKE_OFFERED_NUMBER };
+      bidClassObject.stages[HAND_SHAKE_ACCEPTED_PROP] = {
+        ...DEFAULT_INCOMPLETE_OBJECT,
+        date: HAND_SHAKE_ACCEPTED_DATE,
+        title: HAND_SHAKE_ACCEPTED_TITLE,
+        number: HAND_SHAKE_ACCEPTED_NUMBER };
+      bidClassObject.stages[IN_PANEL_PROP] = {
+        ...DEFAULT_INCOMPLETE_OBJECT,
+        date: IN_PANEL_DATE,
+        title: PANEL_TITLE,
+        number: IN_PANEL_NUMBER };
+      bidClassObject.stages[APPROVED_PROP] = {
+        ...DEFAULT_INCOMPLETE_OBJECT,
+        date: APPROVED_DATE,
+        title: APPROVAL_TITLE,
+        number: APPROVED_NUMBER };
+      return bidClassObject;
     case HAND_SHAKE_DECLINED_PROP:
     case CLOSED_PROP:
       bidClassObject.stages[DRAFT_PROP] = Object.assign(
@@ -121,7 +152,7 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
       bidClassObject.stages[HAND_SHAKE_OFFERED_PROP] = {
         ...DEFAULT_INCOMPLETE_OBJECT,
         date: HAND_SHAKE_OFFERED_DATE,
-        title: HAND_SHAKE_EVALUATING_TITLE,
+        title: BID_REVIEW_COMPLETE_TITLE,
         needsAction: false,
         isCurrent: true,
         number: HAND_SHAKE_OFFERED_NUMBER };
@@ -155,7 +186,7 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
       bidClassObject.stages[HAND_SHAKE_OFFERED_PROP] = {
         ...DEFAULT_COMPLETE_OBJECT,
         date: HAND_SHAKE_OFFERED_DATE,
-        title: HAND_SHAKE_OFFERED_TITLE,
+        title: BID_REVIEW_COMPLETE_TITLE,
         number: SUBMITTED_NUMBER };
       bidClassObject.stages[HAND_SHAKE_ACCEPTED_PROP] = {
         ...DEFAULT_COMPLETE_OBJECT,
@@ -194,7 +225,7 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
       bidClassObject.stages[HAND_SHAKE_OFFERED_PROP] = {
         ...DEFAULT_COMPLETE_OBJECT,
         date: HAND_SHAKE_OFFERED_DATE,
-        title: HAND_SHAKE_OFFERED_TITLE,
+        title: BID_REVIEW_COMPLETE_TITLE,
         number: SUBMITTED_NUMBER };
       bidClassObject.stages[HAND_SHAKE_ACCEPTED_PROP] = {
         ...DEFAULT_COMPLETE_OBJECT,
@@ -233,7 +264,7 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
       bidClassObject.stages[HAND_SHAKE_OFFERED_PROP] = {
         ...DEFAULT_COMPLETE_OBJECT,
         date: HAND_SHAKE_OFFERED_DATE,
-        title: HAND_SHAKE_OFFERED_TITLE,
+        title: BID_REVIEW_COMPLETE_TITLE,
         number: SUBMITTED_NUMBER };
       bidClassObject.stages[HAND_SHAKE_ACCEPTED_PROP] = {
         ...DEFAULT_COMPLETE_OBJECT,
@@ -273,7 +304,7 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
       bidClassObject.stages[HAND_SHAKE_OFFERED_PROP] = {
         ...DEFAULT_COMPLETE_OBJECT,
         date: HAND_SHAKE_OFFERED_DATE,
-        title: HAND_SHAKE_OFFERED_TITLE,
+        title: BID_REVIEW_COMPLETE_TITLE,
         number: SUBMITTED_NUMBER };
       bidClassObject.stages[HAND_SHAKE_ACCEPTED_PROP] = {
         ...DEFAULT_COMPLETE_OBJECT,
diff --git a/src/Components/BidTracker/BidPhaseConfig/Limited.js b/src/Components/BidTracker/BidPhaseConfig/Limited.js
index 4fe79a619a..46221e6f9a 100644
--- a/src/Components/BidTracker/BidPhaseConfig/Limited.js
+++ b/src/Components/BidTracker/BidPhaseConfig/Limited.js
@@ -1,7 +1,6 @@
 import { keys } from 'lodash';
 import {
   HAND_SHAKE_OFFERED_PROP,
-  GET_HAND_SHAKE_EVALUATING_TITLE,
 } from '../../../Constants/BidData';
 import getBidObject from './Complete';
 
@@ -16,9 +15,6 @@ export default function bidClassesFromCurrentStatus(bid = { status: 'draft' }) {
     return false;
   }
 
-  const HAND_SHAKE_EVALUATING_TITLE = GET_HAND_SHAKE_EVALUATING_TITLE();
-
-  bidClassObject$.stages[HAND_SHAKE_OFFERED_PROP].title = HAND_SHAKE_EVALUATING_TITLE;
   bidClassObject$.stages[HAND_SHAKE_OFFERED_PROP].date = null;
 
   return bidClassObject$;
diff --git a/src/Components/BidTracker/BidStep/__snapshots__/BidSteps.test.jsx.snap b/src/Components/BidTracker/BidStep/__snapshots__/BidSteps.test.jsx.snap
index 279d20162c..8a00a024c5 100644
--- a/src/Components/BidTracker/BidStep/__snapshots__/BidSteps.test.jsx.snap
+++ b/src/Components/BidTracker/BidStep/__snapshots__/BidSteps.test.jsx.snap
@@ -101,7 +101,7 @@ exports[`BidStepsComponent matches snapshot 1`] = `
         <div
           className="step-title-main-text"
         >
-          Pending Review
+          Bid Reviewed
         </div>
         <div
           className="step-title-sub-text"
@@ -165,7 +165,7 @@ exports[`BidStepsComponent matches snapshot 1`] = `
         <div
           className="step-title-main-text"
         >
-          Panel
+          Panel Scheduled
         </div>
         <div
           className="step-title-sub-text"
diff --git a/src/Constants/BidData.js b/src/Constants/BidData.js
index 115085e1af..b6de515187 100644
--- a/src/Constants/BidData.js
+++ b/src/Constants/BidData.js
@@ -59,8 +59,10 @@ export const GET_SUBMIT_BID_ACTION_TITLE = () => ['Submit Bid'];
 export const GET_SUBMIT_BID_COMPLETE_TITLE = () => ['Bid Submitted'];
 export const GET_HAND_SHAKE_EVALUATE_TITLE = () => ['Evaluate Bid'];
 export const GET_HAND_SHAKE_EVALUATING_TITLE = () => ['Pending Review'];
+export const GET_BID_REVIEW_COMPLETE_TITLE = () => ['Bid Reviewed'];
 export const GET_HAND_SHAKE_OFFERED_TITLE = () => ['Handshake Offered'];
 export const GET_HAND_SHAKE_ACCEPTED_TITLE = () => ['Handshake Accepted'];
 export const GET_HAND_SHAKE_NEEDS_REGISTER_TITLE = () => ['Register Handshake'];
-export const GET_PANEL_TITLE = () => ['Panel'];
-export const GET_APPROVAL_TITLE = () => ['Approval'];
+export const GET_HAND_SHAKE_COMPLETE_REGISTER_TITLE = () => ['Handshake Registered'];
+export const GET_PANEL_TITLE = () => ['Panel Scheduled'];
+export const GET_APPROVAL_TITLE = () => ['Assignment Approved'];