diff --git a/cypress/integration/all/setup/setup.spec.ts b/cypress/integration/all/setup/setup.spec.ts
index b781b81d97bb..210a2eb391dc 100644
--- a/cypress/integration/all/setup/setup.spec.ts
+++ b/cypress/integration/all/setup/setup.spec.ts
@@ -30,10 +30,10 @@ describe("Setup", () => {
     cy.contains("button:enabled", /next/i).click();
 
     // Page 3
-    cy.contains("button:enabled", /submit/i).click();
+    cy.contains("button:enabled", /next/i).click();
 
     // Page 4
-    cy.contains("button:enabled", /finish/i).click();
+    cy.contains("button:enabled", /confirm/i).click();
 
     cy.url().should("match", /\/hosts\/manage$/i);
     cy.contains(/all hosts/i);
diff --git a/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.tests.jsx b/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.tests.jsx
index 63758cf035bc..68f8cb165654 100644
--- a/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.tests.jsx
+++ b/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.tests.jsx
@@ -9,7 +9,7 @@ describe("ConfirmationPage - form", () => {
     name: "Rachel Perkins",
     email: "rachel@fleet.com",
     org_name: "Fleet",
-    fleet_web_address: "http://localhost:8080",
+    server_url: "http://localhost:8080",
   };
 
   it("renders the user information", () => {
@@ -20,7 +20,7 @@ describe("ConfirmationPage - form", () => {
     expect(form.text()).toContain(formData.name);
     expect(form.text()).toContain(formData.email);
     expect(form.text()).toContain(formData.org_name);
-    expect(form.text()).toContain(formData.fleet_web_address);
+    expect(form.text()).toContain(formData.server_url);
   });
 
   it("submits the form", () => {
diff --git a/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.tsx b/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.tsx
index 7167e4e52dfc..5c242afb6cc9 100644
--- a/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.tsx
+++ b/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.tsx
@@ -19,7 +19,7 @@ const ConfirmationPage = ({
   currentPage,
   formData,
   handleSubmit,
-}: IConfirmationPageProps) => {
+}: IConfirmationPageProps): JSX.Element => {
   useEffect(() => {
     if (currentPage) {
       // Component has a transition duration of 300ms set in
@@ -57,12 +57,7 @@ const ConfirmationPage = ({
     );
   };
 
-  const {
-    email,
-    fleet_web_address: fleetWebAddress,
-    org_name: orgName,
-    name,
-  } = formData;
+  const { email, server_url: serverUrl, org_name: orgName, name } = formData;
   const tabIndex = currentPage ? 1 : -1;
 
   const confirmRegClasses = classnames(className, baseClass);
@@ -88,11 +83,8 @@ const ConfirmationPage = ({
             <tr>
               <th>Fleet URL:</th>
               <td>
-                <span
-                  className={`${baseClass}__table-url`}
-                  title={fleetWebAddress}
-                >
-                  {fleetWebAddress}
+                <span className={`${baseClass}__table-url`} title={serverUrl}>
+                  {serverUrl}
                 </span>
               </td>
             </tr>
@@ -112,7 +104,7 @@ const ConfirmationPage = ({
         disabled={!currentPage}
         className="button button--brand"
       >
-        Finish
+        Confirm
       </Button>
     </form>
   );
diff --git a/frontend/components/forms/RegistrationForm/FleetDetails/FleetDetails.jsx b/frontend/components/forms/RegistrationForm/FleetDetails/FleetDetails.jsx
index bca22c171dfc..11c1df743d6b 100644
--- a/frontend/components/forms/RegistrationForm/FleetDetails/FleetDetails.jsx
+++ b/frontend/components/forms/RegistrationForm/FleetDetails/FleetDetails.jsx
@@ -61,7 +61,7 @@ class FleetDetails extends Component {
           disabled={!currentPage}
           className="button button--brand"
         >
-          Submit
+          Next
         </Button>
       </form>
     );
diff --git a/frontend/components/forms/RegistrationForm/RegistrationForm.jsx b/frontend/components/forms/RegistrationForm/RegistrationForm.jsx
index addf94c9c327..f1a1244513b0 100644
--- a/frontend/components/forms/RegistrationForm/RegistrationForm.jsx
+++ b/frontend/components/forms/RegistrationForm/RegistrationForm.jsx
@@ -152,7 +152,7 @@ class RegistrationForm extends Component {
             <ConfirmationPage
               formData={formData}
               handleSubmit={onSubmitConfirmation}
-              classNmae={confirmationClass}
+              className={confirmationClass}
               currentPage={isCurrentPage(4)}
             />
           </div>
diff --git a/frontend/interfaces/registration_form_data.ts b/frontend/interfaces/registration_form_data.ts
index 29e7eb3e4346..2c08740ce44b 100644
--- a/frontend/interfaces/registration_form_data.ts
+++ b/frontend/interfaces/registration_form_data.ts
@@ -20,4 +20,5 @@ export interface IRegistrationFormData {
   org_web_url: string;
   org_logo_url: string;
   fleet_web_address: string;
+  server_url: string;
 }