diff --git a/templates/requests/_new.html b/templates/requests/_new.html
index 23c4491b..fd815e68 100644
--- a/templates/requests/_new.html
+++ b/templates/requests/_new.html
@@ -17,8 +17,8 @@
     <div class="panel">
 
       <div class="panel__heading">
-        <h1>New Request</h1>
-        <div class="subtitle">{% block subtitle %}{% endblock %}</div>
+        <h1>{% block heading %}{% endblock %}</h1>
+        <div class="subtitle"><h2>New Request</h2></div>
       </div>
 
       <div class="panel__content">
diff --git a/templates/requests/financial_verification.html b/templates/requests/financial_verification.html
index 958fe242..d2a24409 100644
--- a/templates/requests/financial_verification.html
+++ b/templates/requests/financial_verification.html
@@ -49,8 +49,8 @@
   <div class="panel">
 
     <div class="panel__heading">
-      <h1>Order #{{ request_id }}</h1>
-      <div class="subtitle" id="financial-verification"><h2>Financial Verification</h2></div>
+      <h1>Financial Verification</h1>
+      <div class="subtitle" id="financial-verification"><h2>Order #{{ request_id }}</h2></div>
     </div>
 
     <div class="panel__content">
diff --git a/templates/requests/screen-1.html b/templates/requests/screen-1.html
index 22e9b100..68280440 100644
--- a/templates/requests/screen-1.html
+++ b/templates/requests/screen-1.html
@@ -5,8 +5,8 @@
 {% from "components/options_input.html" import OptionsInput %}
 {% from "components/date_input.html" import DateInput %}
 
-{% block subtitle %}
-<h2>Details of Use</h2>
+{% block heading %}
+  Details of Use
 {% endblock %}
 
 {% block form %}
diff --git a/templates/requests/screen-2.html b/templates/requests/screen-2.html
index 52395767..2994ecd3 100644
--- a/templates/requests/screen-2.html
+++ b/templates/requests/screen-2.html
@@ -5,8 +5,8 @@
 {% from "components/options_input.html" import OptionsInput %}
 {% from "components/date_input.html" import DateInput %}
 
-{% block subtitle %}
-<h2>Information About You</h2>
+{% block heading %}
+  Information About You
 {% endblock %}
 
 {% block form %}
diff --git a/templates/requests/screen-3.html b/templates/requests/screen-3.html
index 61b370d3..cabead7c 100644
--- a/templates/requests/screen-3.html
+++ b/templates/requests/screen-3.html
@@ -4,8 +4,8 @@
 {% from "components/text_input.html" import TextInput %}
 {% from "components/checkbox_input.html" import CheckboxInput %}
 
-{% block subtitle %}
-<h2>Designate a Workspace Owner</h2>
+{% block heading %}
+  Designate a Workspace Owner
 {% endblock %}
 
 {% block form %}
diff --git a/templates/requests/screen-4.html b/templates/requests/screen-4.html
index 36fe1276..34e01aa3 100644
--- a/templates/requests/screen-4.html
+++ b/templates/requests/screen-4.html
@@ -8,8 +8,8 @@
 {% from "components/text_input.html" import TextInput %}
 {% from "components/icon.html" import Icon %}
 
-{% block subtitle %}
-<h2>Review &amp; Submit</h2>
+{% block heading %}
+  Review &amp; Submit
 {% endblock %}