diff --git a/usaon_vta_survey/templates/macros/forms/relationships/dataproduct_application.j2 b/usaon_vta_survey/templates/macros/forms/relationships/dataproduct_application.j2
new file mode 100644
index 00000000..7a1e5373
--- /dev/null
+++ b/usaon_vta_survey/templates/macros/forms/relationships/dataproduct_application.j2
@@ -0,0 +1,40 @@
+{% macro data_product_application_fields(form) -%}
+  {{form.criticality_rating.label}} {{form.criticality_rating(size=5)}}
+  {% if form.criticality_rating.errors %}
+    <ul class="errors">
+    {% for error in form.criticality_rating.errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  <br />
+
+  {{form.performance_rating.label}} {{form.performance_rating(size=50)}}
+  {% if form.performance_rating.errors %}
+    <ul class="errors">
+    {% for error in form.performance_rating.errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  <br />
+
+  {{form.rationale.label}} {{form.rationale(size=50)}}
+  {% if form.rationale.errors %}
+    <ul class="errors">
+    {% for error in form.rationale.errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  <br />
+
+  {{form.needed_improvements.label}} {{form.needed_improvements(size=50)}}
+  {% if form.needed_improvements.errors %}
+    <ul class="errors">
+    {% for error in form.needed_improvements.errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+{%- endmacro -%}
diff --git a/usaon_vta_survey/templates/macros/forms/relationships/app_sba.j2 b/usaon_vta_survey/templates/macros/forms/relationships/observingsystem_dataproduct.j2
similarity index 50%
rename from usaon_vta_survey/templates/macros/forms/relationships/app_sba.j2
rename to usaon_vta_survey/templates/macros/forms/relationships/observingsystem_dataproduct.j2
index 75692694..18a2cab1 100644
--- a/usaon_vta_survey/templates/macros/forms/relationships/app_sba.j2
+++ b/usaon_vta_survey/templates/macros/forms/relationships/observingsystem_dataproduct.j2
@@ -1,44 +1,3 @@
-{% macro data_product_application_fields(form) -%}
-  {{form.criticality_rating.label}} {{form.criticality_rating(size=5)}}
-  {% if form.criticality_rating.errors %}
-    <ul class="errors">
-    {% for error in form.criticality_rating.errors %}
-      <li>{{ error }}</li>
-    {% endfor %}
-    </ul>
-  {% endif %}
-  <br />
-
-  {{form.performance_rating.label}} {{form.performance_rating(size=50)}}
-  {% if form.performance_rating.errors %}
-    <ul class="errors">
-    {% for error in form.performance_rating.errors %}
-      <li>{{ error }}</li>
-    {% endfor %}
-    </ul>
-  {% endif %}
-  <br />
-
-  {{form.rationale.label}} {{form.rationale(size=50)}}
-  {% if form.rationale.errors %}
-    <ul class="errors">
-    {% for error in form.rationale.errors %}
-      <li>{{ error }}</li>
-    {% endfor %}
-    </ul>
-  {% endif %}
-  <br />
-
-  {{form.needed_improvements.label}} {{form.needed_improvements(size=50)}}
-  {% if form.needed_improvements.errors %}
-    <ul class="errors">
-    {% for error in form.needed_improvements.errors %}
-      <li>{{ error }}</li>
-    {% endfor %}
-    </ul>
-  {% endif %}
-{%- endmacro -%}
-
 {% macro observing_system_data_product_fields(form) -%}
   {{form.criticality_rating.label}} {{form.criticality_rating(size=5)}}
   {% if form.criticality_rating.errors %}
diff --git a/usaon_vta_survey/templates/response/relationships/data_product_application.html b/usaon_vta_survey/templates/response/relationships/data_product_application.html
index 28ba0b12..79ba0c06 100644
--- a/usaon_vta_survey/templates/response/relationships/data_product_application.html
+++ b/usaon_vta_survey/templates/response/relationships/data_product_application.html
@@ -4,7 +4,7 @@
   data_product_fields,
   data_product_application_fields
 %}
-{% from 'macros/forms/relationships/app_sba.j2' import
+{% from 'macros/forms/relationships/dataproduct_application.j2' import
   data_product_application_fields
 %}
 
diff --git a/usaon_vta_survey/templates/response/relationships/observing_system_data_product.html b/usaon_vta_survey/templates/response/relationships/observing_system_data_product.html
index 485a8027..8de339c8 100644
--- a/usaon_vta_survey/templates/response/relationships/observing_system_data_product.html
+++ b/usaon_vta_survey/templates/response/relationships/observing_system_data_product.html
@@ -4,7 +4,7 @@
   data_product_fields,
   observing_system_data_product_fields
 %}
-{% from 'macros/forms/relationships/app_sba.j2' import
+{% from 'macros/forms/relationships/observingsystem_dataproduct.j2' import
   observing_system_data_product_fields
 %}