diff --git a/edivorce/apps/core/templates/dashboard/final_filing.html b/edivorce/apps/core/templates/dashboard/final_filing.html
index 8df6ad51..df5e8b78 100644
--- a/edivorce/apps/core/templates/dashboard/final_filing.html
+++ b/edivorce/apps/core/templates/dashboard/final_filing.html
@@ -90,7 +90,7 @@
                     <p class="error-text" hidden id="court-file-error">
                         A Court File Number contains only digits and must be between 4 and 10 digits in length.
                     </p>
-                    <label>{% include "partials/tooltips/court_file_number.html" with text="Court File #" %}</label>
+                    <label>{% include "partials/tooltips/court_file_number.html" %}</label>
                     {% input_field type="number" name="court_file_number" id="court-file-number" class="input-inline" %}
                 </div>
             </div>
diff --git a/edivorce/apps/core/templates/partials/dashnav.html b/edivorce/apps/core/templates/partials/dashnav.html
index 798f74d7..53e8d837 100644
--- a/edivorce/apps/core/templates/partials/dashnav.html
+++ b/edivorce/apps/core/templates/partials/dashnav.html
@@ -21,7 +21,7 @@
     </a>
     <a href="{% url 'dashboard_nav' 'wait_for_number' %}" class="progress-question {% if active_page == 'wait_for_number' %} active {% endif %}">
         <span class="progress-icon"><i class="fa fa-clock-o" aria-hidden="true"></i></span>
-        <span class="progress-content">Wait for Court File #</span>
+        <span class="progress-content">Wait for Court File Number</span>
     </a>
 {% endif %}
     <a href="{% url 'dashboard_nav' 'swear_forms' %}" class="progress-question {% if active_page == 'swear_forms' %} active {% endif %}">
diff --git a/edivorce/apps/core/templates/partials/tooltips/court_file_number.html b/edivorce/apps/core/templates/partials/tooltips/court_file_number.html
index 5153b9d1..cd111cb0 100644
--- a/edivorce/apps/core/templates/partials/tooltips/court_file_number.html
+++ b/edivorce/apps/core/templates/partials/tooltips/court_file_number.html
@@ -1,9 +1,8 @@
-<span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-      data-html="true"
-      title="
-                <b>Court File Number</b>
-                <br /><br />
-                This is the filing # given by the Court Registry to your spouse when they filed their portion
-                of the documents. If unknown, please check with your spouse before entering your Court File #.">
-          {% if text %}{{ text }}{% else %}Court File Number{% endif %}
-    <i class="fa fa-question-circle" aria-hidden="true"></i></span>
\ No newline at end of file
+<span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true" title="
+    <b>Court File Number</b>
+    <br /><br />
+    This is the filing # given by the Court Registry to your spouse when they filed their portion
+    of the documents. If unknown, please check with your spouse before entering your Court File Number.">
+    Court File Number
+    <i class="fa fa-question-circle" aria-hidden="true"></i>
+</span>
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/online_package_number.html b/edivorce/apps/core/templates/partials/tooltips/online_package_number.html
index fbd290b1..d8bd46fd 100644
--- a/edivorce/apps/core/templates/partials/tooltips/online_package_number.html
+++ b/edivorce/apps/core/templates/partials/tooltips/online_package_number.html
@@ -4,5 +4,5 @@
                 <b>CSO Online Package #</b>
                 <br /><br />
                 This is the filing # given by the Court Registry to your spouse when they filed their portion
-                of the documents. If unknown, please check with your spouse before entering your Court File #.">
+                of the documents. If unknown, please check with your spouse before entering your Court File Number.">
           {% if with_cso %}CSO {% endif %}Online Package #<i class="fa fa-question-circle" aria-hidden="true"></i></span>
\ No newline at end of file