diff --git a/edivorce/apps/core/templates/dashboard/final_filing.html b/edivorce/apps/core/templates/dashboard/final_filing.html
index 88ca7a3d..017d6a26 100644
--- a/edivorce/apps/core/templates/dashboard/final_filing.html
+++ b/edivorce/apps/core/templates/dashboard/final_filing.html
@@ -106,10 +106,10 @@
                     </ul>
                 {% endif %}
                 <div id="vue-app">
-                    <initial-filing-uploader
+                    <filing-uploader
                             :form-types="{{ form_types }}"
                             proxy-root-path="{{ proxy_root_path }}">
-                    </initial-filing-uploader>
+                    </filing-uploader>
                 </div>
             </div>
         {% elif how_to_file == 'In-person' %}
@@ -306,15 +306,15 @@
 
 {% block extra_css %}
     <link rel="stylesheet" type="text/css" href="{% static 'dist/vue/css/chunk-common.css' %}"/>
-    <link rel="stylesheet" type="text/css" href="{% static 'dist/vue/css/initialFiling.css' %}"/>
+    <link rel="stylesheet" type="text/css" href="{% static 'dist/vue/css/filingUploader.css' %}"/>
     <link rel="preload" as="script" href="{% static 'dist/vue/js/chunk-vendors.js' %}"/>
     <link rel="preload" as="script" href="{% static 'dist/vue/js/chunk-common.js' %}"/>
-    <link rel="preload" as="script" href="{% static 'dist/vue/js/initialFiling.js' %}"/>
+    <link rel="preload" as="script" href="{% static 'dist/vue/js/filingUploader.js' %}"/>
 {% endblock %}
 
 {% block extra_js %}
     <script type="text/javascript" src="{% static 'dist/vue/js/chunk-vendors.js' %}"></script>
     <script type="text/javascript" src="{% static 'dist/vue/js/chunk-common.js' %}"></script>
-    <script type="text/javascript" src="{% static 'dist/vue/js/initialFiling.js' %}"></script>
+    <script type="text/javascript" src="{% static 'dist/vue/js/filingUploader.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/filing.js' %}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/dashboard/initial_filing.html b/edivorce/apps/core/templates/dashboard/initial_filing.html
index 1c67de6a..495aeb3e 100644
--- a/edivorce/apps/core/templates/dashboard/initial_filing.html
+++ b/edivorce/apps/core/templates/dashboard/initial_filing.html
@@ -85,10 +85,10 @@
                 </ul>
             {% endif %}
             <div id="vue-app">
-                <initial-filing-uploader
+                <filing-uploader
                         :form-types="{{ form_types }}"
                         proxy-root-path="{{ proxy_root_path }}">
-                </initial-filing-uploader>
+                </filing-uploader>
             </div>
         </div>
 
@@ -158,15 +158,15 @@
 
 {% block extra_css %}
     <link rel="stylesheet" type="text/css" href="{% static 'dist/vue/css/chunk-common.css' %}"/>
-    <link rel="stylesheet" type="text/css" href="{% static 'dist/vue/css/initialFiling.css' %}"/>
+    <link rel="stylesheet" type="text/css" href="{% static 'dist/vue/css/filingUploader.css' %}"/>
     <link rel="preload" as="script" href="{% static 'dist/vue/js/chunk-vendors.js' %}"/>
     <link rel="preload" as="script" href="{% static 'dist/vue/js/chunk-common.js' %}"/>
-    <link rel="preload" as="script" href="{% static 'dist/vue/js/initialFiling.js' %}"/>
+    <link rel="preload" as="script" href="{% static 'dist/vue/js/filingUploader.js' %}"/>
 {% endblock %}
 
 {% block extra_js %}
     <script type="text/javascript" src="{% static 'dist/vue/js/chunk-vendors.js' %}"></script>
     <script type="text/javascript" src="{% static 'dist/vue/js/chunk-common.js' %}"></script>
-    <script type="text/javascript" src="{% static 'dist/vue/js/initialFiling.js' %}"></script>
+    <script type="text/javascript" src="{% static 'dist/vue/js/filingUploader.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/filing.js' %}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/vue/src/pages/initial-filing/InitialFiling.vue b/vue/src/pages/filing-uploader/FilingUploader.vue
similarity index 69%
rename from vue/src/pages/initial-filing/InitialFiling.vue
rename to vue/src/pages/filing-uploader/FilingUploader.vue
index 34342e39..a738287c 100644
--- a/vue/src/pages/initial-filing/InitialFiling.vue
+++ b/vue/src/pages/filing-uploader/FilingUploader.vue
@@ -22,13 +22,3 @@
     },
   };
 </script>
-
-<style scoped lang="scss">
-  .upload-area {
-    padding: 32px 20px 32px 20px;
-    margin-bottom: 50px;
-    background-color: #f2f2f2;
-    border: 1px solid #ddd;
-    border-radius: 8px;
-  }
-</style>
diff --git a/vue/src/pages/final-filing/main.js b/vue/src/pages/filing-uploader/main.js
similarity index 52%
rename from vue/src/pages/final-filing/main.js
rename to vue/src/pages/filing-uploader/main.js
index 965d79b6..71603c9e 100644
--- a/vue/src/pages/final-filing/main.js
+++ b/vue/src/pages/filing-uploader/main.js
@@ -1,8 +1,8 @@
 import Vue from "vue";
-import App from "./FinalFiling.vue";
+import App from "./FilingUploader.vue";
 
 Vue.config.productionTip = false;
-Vue.component("final-filing-uploader", App);
+Vue.component("filing-uploader", App);
 
 new Vue({
   el: "#vue-app",
diff --git a/vue/src/pages/final-filing/FinalFiling.vue b/vue/src/pages/final-filing/FinalFiling.vue
deleted file mode 100644
index d07ab356..00000000
--- a/vue/src/pages/final-filing/FinalFiling.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<template>
-  <div id="app">
-    <div class="question-well-border-less" v-if="signingLocation === 'Virtual'">
-      <div>
-        <!-- CSA - Child Support Affidavit (F37) -->
-        <Uploader doc-type="CSA" />
-      </div>
-      <div>
-        <!-- AFDO - Affidavit - Desk Order Divorce (F38) -->
-        <Uploader doc-type="AFDO" />
-      </div>
-    </div>
-    <div
-      class="question-well-border-less"
-      v-else-if="
-        signingLocationYou === 'Virtual' && signingLocationSpouse === 'Virtual'
-      "
-    >
-      <div>
-        <!-- CSA - Child Support Affidavit (F37) -->
-        <Uploader doc-type="CSA" :party="1" />
-      </div>
-      <div>
-        <!-- AFDO - Affidavit - Desk Order Divorce (F38) -->
-        <Uploader doc-type="AFDO" :party="1" />
-      </div>
-      <div>
-        <!-- CSA - Child Support Affidavit (F37) -->
-        <Uploader doc-type="CSA" :party="2" />
-      </div>
-      <div>
-        <!-- AFDO - Affidavit - Desk Order Divorce (F38) -->
-        <Uploader doc-type="AFDO" :party="2" />
-      </div>
-    </div>
-    <template v-else-if="howToFile === 'Online'">
-      <div
-        class="question-well-border-less"
-        v-if="
-          signingLocation.length ||
-            (signingLocationYou.length && signingLocationSpouse.length)
-        "
-      >
-        <p>
-          Missing a form required on this page? Check the
-          <a :href="printFormUrl">Review Forms</a> step.
-        </p>
-        <p>The following forms will be automatically filed for you:</p>
-        <ul>
-          <li>Requisition Form (F35)</li>
-          <li>Certificate of Pleadings Form (F36)</li>
-        </ul>
-        <div>
-          <!-- CSA - Child Support Affidavit (F37) -->
-          <Uploader doc-type="CSA" />
-        </div>
-        <div>
-          <!-- AFDO - Affidavit - Desk Order Divorce (F38) -->
-          <Uploader doc-type="AFDO" />
-        </div>
-        <div>
-          <!-- OFI - Final Order (F52) -->
-          <Uploader doc-type="OFI" />
-        </div>
-        <div>
-          <!-- EFSS - Electronic Filing Statement - Supreme (F96) -->
-          <Uploader doc-type="EFSS" :party="1" post-text=" - For You" />
-        </div>
-        <div>
-          <!-- EFSS - Electronic Filing Statement - Supreme (F96) -->
-          <Uploader doc-type="EFSS" :party="2" />
-        </div>
-        <div>
-          <!-- AAI - Agreement as to Annual Income (F9) -->
-          <Uploader doc-type="AAI" />
-        </div>
-        <div>
-          <!-- NCV – Name Change Form – Vital Statistics -->
-          <Uploader doc-type="NCV" :party="1" />
-        </div>
-        <div>
-          <!-- NCV – Name Change Form – Vital Statistics -->
-          <Uploader doc-type="NCV" :party="2" />
-        </div>
-      </div>
-      <div class="question-well-border-less" v-else>
-        <h2>
-          You need to select a signing method in the
-          <a :href="signFileOptionsUrl">Signing & Filing Options</a> step.
-        </h2>
-      </div>
-    </template>
-    <template v-else-if="howToSign === 'Together'">
-      <div>
-        <p>
-          Staple each form together and then fasten all forms with a paper clip,
-          in the following order:
-        </p>
-        <ul>
-          <li>Notice of Joint Family Claim Form (F1)</li>
-          <li>Requisition Form (F35)</li>
-          <li>Draft Final Order Form (F52)</li>
-          <li>Certificate of Pleadings Form (F36)</li>
-          <li>Child Support Affidavit (F37) signed by claimants</li>
-          <li>Affidavit Desk Order Divorce (F38) signed by both claimants</li>
-          <li>Agreement as to Annual Income (F9)</li>
-        </ul>
-        <p>Also ensure you bring the following additional documentation:</p>
-        <ul>
-          <li>Proof of marriage</li>
-          <li>Registration of Joint Divorce Proceedings (JUS280)</li>
-          <li>Identification of Applicant (VSA 512) for Claimant 1 ([Name])</li>
-          <li>Identification of Applicant (VSA 512) for Claimant 2 ([Name])</li>
-          <li>Agreement as to Annual Income (F9)</li>
-        </ul>
-        <p>
-          If you have other court orders or a written separation agreement, they
-          should also be attached to your Affidavit — Desk Order Divorce Form
-        </p>
-        <p>
-          (F38). Note that these agreements or orders must not contradict what's
-          in your divorce application.
-        </p>
-        <p>
-          You have indicated that you will file at the following court registry:
-        </p>
-        <p>[City]</p>
-        <p>[Address]</p>
-        <p>[Postal Code]</p>
-        <p>
-          Once sign / sworn and filed, you will receive a Court Filing Number
-          <i class="fa fa-question-circle"></i>. This number will be used if you
-          need to file any additional documentation.
-        </p>
-      </div>
-    </template>
-    <template v-else-if="howToSign === 'Separately'">
-      <div class="question-well-border-less">
-        <p>
-          Staple each form together and then fasten all forms with a paper clip,
-          in the following order:
-        </p>
-        <ul>
-          <li>Notice of Joint Family Claim Form (F1)</li>
-          <li>Requisition Form (F35)</li>
-          <li>Draft Final Order Form (F52)</li>
-          <li>Certificate of Pleadings Form (F36)</li>
-          <li>Child Support Affidavit (F37) signed by you</li>
-          <li>Affidavit Desk Order Divorce (F38) signed by you</li>
-          <li>Agreement as to Annual Income (F9)</li>
-        </ul>
-        <br />
-        <p>Also ensure you bring the following additional documentation:</p>
-        <ul>
-          <li>Proof of marriage</li>
-          <li>Registration of Joint Divorce Proceedings (JUS280)</li>
-          <li>Identification of Applicant (VSA 512) for Claimant 1 ([Name])</li>
-          <li>Agreement as to Annual Income (F9)</li>
-        </ul>
-        <p>
-          If you have other court orders or a written separation agreement, they
-          should also be attached to your Affidavit — Desk Order Divorce Form
-        </p>
-        <p>
-          (F38). Note that these agreements or orders must not contradict what's
-          in your divorce application.
-        </p>
-        <p>
-          You have indicated that you will file at the following court registry:
-        </p>
-        <p>[City]</p>
-        <p>[Address]</p>
-        <p>[Postal Code]</p>
-        <p>
-          Once sign / sworn and filed, you will receive a Court Filing Number
-          <i class="fa fa-question-circle"></i>. This number will be used if you
-          need to file any additional documentation.
-        </p>
-        <h2>Spousal Documentation Requirements</h2>
-        <p>
-          The following sworn / affirmed affidavits still remains to be filed:
-        </p>
-        <ul>
-          <li>Child Support Affidavit (F37) - signed by your spouse</li>
-          <li>
-            Affidavit - Desk Order Divorce Form (F38) - signed by your spouse
-          </li>
-          <li>Identification of Applicant (VSA 512) - for your Spouse</li>
-        </ul>
-        <p>
-          Either you or your spouse must file this documentation using the Court
-          Filing Number <i class="fa fa-question-circle"></i> that you received
-          via e-mail. If you have not received a Court Filing Number then please
-          check to the Wait for Court Filing Number step.
-        </p>
-        <p>
-          You have indicated that you will file at the following court registry:
-        </p>
-        <p>[City]</p>
-        <p>[Address]</p>
-        <p>[Postal Code]</p>
-      </div>
-    </template>
-  </div>
-</template>
-
-<script>
-  import Uploader from "../../components/Uploader/Uploader.vue";
-
-  export default {
-    name: "App",
-    components: {
-      Uploader,
-    },
-    props: {
-      signingLocation: String,
-      signingLocationYou: String,
-      signingLocationSpouse: String,
-      howToSign: String,
-      howToFile: String,
-      signFileOptionsUrl: String,
-      printFormUrl: String,
-      proxyRootPath: String,
-    },
-  };
-</script>
-
-<style scoped lang="scss">
-  .question-well-border-less {
-    padding: 10px 20px 30px 20px;
-    background-color: #f2f2f2;
-    border: 1px solid #ddd;
-    border-radius: 6px;
-  }
-</style>
diff --git a/vue/src/pages/initial-filing/main.js b/vue/src/pages/initial-filing/main.js
deleted file mode 100644
index f6157b68..00000000
--- a/vue/src/pages/initial-filing/main.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import Vue from "vue";
-import App from "./InitialFiling.vue";
-
-Vue.config.productionTip = false;
-Vue.component("initial-filing-uploader", App);
-
-new Vue({
-  el: "#vue-app",
-});
diff --git a/vue/vue.config.js b/vue/vue.config.js
index 5419a9a1..faf03199 100644
--- a/vue/vue.config.js
+++ b/vue/vue.config.js
@@ -3,17 +3,11 @@ module.exports = {
   filenameHashing: false,
   runtimeCompiler: true,
   pages: {
-    initialFiling: {
-      entry: 'src/pages/initial-filing/main.js',
-      template: 'public/initial-filing.html',
+    filingUploader: {
+      entry: 'src/pages/filing-uploader/main.js',
+      template: 'public/filing-uploader.html',
       filename: 'index.html',
-      chunks: ['chunk-vendors', 'chunk-common', 'initialFiling']
-    },
-    finalFiling: {
-      entry: 'src/pages/final-filing/main.js',
-      template: 'public/final-filing.html',
-      filename: 'final-filing.html',
-      chunks: ['chunk-vendors', 'chunk-common', 'finalFiling']
+      chunks: ['chunk-vendors', 'chunk-common', 'filingUploader']
     }
   },
   configureWebpack: {