diff --git a/src/main/java/org/broadinstitute/consent/http/enumeration/EmailType.java b/src/main/java/org/broadinstitute/consent/http/enumeration/EmailType.java
index b7efe3fe3..9d581ae79 100644
--- a/src/main/java/org/broadinstitute/consent/http/enumeration/EmailType.java
+++ b/src/main/java/org/broadinstitute/consent/http/enumeration/EmailType.java
@@ -7,7 +7,7 @@ public enum EmailType {
   NEW_DAR(4, "new-request.html"),
   DISABLED_DATASET(5),
   CLOSED_DATASET_ELECTION(6),
-  DATA_CUSTODIAN_APPROVAL(7, "data-custodian-approval.html"),
+  DATA_CUSTODIAN_APPROVAL(7, "data-custodian-approval.ftl"),
   RESEARCHER_DAR_APPROVED(8, "researcher-dar-approved.ftl"),
   ADMIN_FLAGGED_DAR_APPROVED(9),
   DAR_CANCEL(10),
@@ -32,7 +32,7 @@ public enum EmailType {
   SO_DAR_APPROVED(29, "so-dar-approved.html"),
   SO_PROGRESS_REPORT_SUBMITTED(30, "so-progress-report-submitted.html"),
   SO_PROGRESS_REPORT_APPROVED(31, "so-progress-report-approved.html"),
-  DAC_RADAR_APPROVED(32, "dac-radar-approved.html"),
+  DAC_RADAR_APPROVED(32, "dac-radar-approved.ftl"),
   NEW_DAR_SO_NEEDS_TO_APPROVE(33, "new-dar-so-needs-to-approve.html"),
   DAC_VOTE_REMINDER_DIGEST(34, "vote-digest.ftl"),
   NEW_STUDY_REGISTRATION_CONFIRMATION(35, "new-study-registration-confirmation.ftl");
diff --git a/src/main/resources/freemarker/dac-radar-approved.html b/src/main/resources/freemarker/dac-radar-approved.ftl
similarity index 97%
rename from src/main/resources/freemarker/dac-radar-approved.html
rename to src/main/resources/freemarker/dac-radar-approved.ftl
index 070e9c0ff..0a0167c08 100644
--- a/src/main/resources/freemarker/dac-radar-approved.html
+++ b/src/main/resources/freemarker/dac-radar-approved.ftl
@@ -47,10 +47,10 @@
               <#items as dataset>
                 <tr>
                   <td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
-                    ${dataset.identifier}
+                    ${dataset.identifier()}
                   </td>
                   <td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
-                    ${dataset.name}
+                    ${dataset.name()}
                   </td>
                 </tr>
               </#items>
diff --git a/src/main/resources/freemarker/data-custodian-approval.html b/src/main/resources/freemarker/data-custodian-approval.ftl
similarity index 97%
rename from src/main/resources/freemarker/data-custodian-approval.html
rename to src/main/resources/freemarker/data-custodian-approval.ftl
index 72e712452..de3d2e09c 100644
--- a/src/main/resources/freemarker/data-custodian-approval.html
+++ b/src/main/resources/freemarker/data-custodian-approval.ftl
@@ -37,10 +37,10 @@
                         <#items as dataset>
                             <tr>
                                 <td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
-                                    ${dataset.identifier}
+                                    ${dataset.identifier()}
                                 </td>
                                 <td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
-                                    ${dataset.name}
+                                    ${dataset.name()}
                                 </td>
                             </tr>
                         </#items>
diff --git a/src/main/resources/freemarker/researcher-dar-approved.ftl b/src/main/resources/freemarker/researcher-dar-approved.ftl
index 080c26c2d..5148d4a7a 100644
--- a/src/main/resources/freemarker/researcher-dar-approved.ftl
+++ b/src/main/resources/freemarker/researcher-dar-approved.ftl
@@ -40,14 +40,14 @@
                         <#items as dataset>
                             <tr>
                                 <td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
-                                    ${dataset.identifier}
+                                    ${dataset.identifier()}
                                 </td>
                                 <td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
-                                    ${dataset.name}
+                                    ${dataset.name()}
                                 </td>
                                 <td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
-                                    <#if (dataset.dataLocationUrl)??>
-                                        <a href="${dataset.dataLocationUrl}" style="text-decoration: none; font-family: 'Montserrat', sans-serif; color: #00609F;">${dataset.dataLocationUrl}</a>
+                                    <#if (dataset.dataLocationUrl())??>
+                                        <a href="${dataset.dataLocationUrl()}" style="text-decoration: none; font-family: 'Montserrat', sans-serif; color: #00609F;">${dataset.dataLocationUrl()}</a>
                                     </#if>
                                 </td>
                             </tr>
diff --git a/src/main/resources/freemarker/researcher-progress-report-approved.ftl b/src/main/resources/freemarker/researcher-progress-report-approved.ftl
index 901187416..c18397613 100644
--- a/src/main/resources/freemarker/researcher-progress-report-approved.ftl
+++ b/src/main/resources/freemarker/researcher-progress-report-approved.ftl
@@ -40,14 +40,14 @@
                         <#items as dataset>
                             <tr>
                                 <td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
-                                    ${dataset.identifier}
+                                    ${dataset.identifier()}
                                 </td>
                                 <td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
-                                    ${dataset.name}
+                                    ${dataset.name()}
                                 </td>
                                 <td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
-                                    <#if (dataset.dataLocationUrl)??>
-                                        <a href="${dataset.dataLocationUrl}" style="text-decoration: none; font-family: 'Montserrat', sans-serif; color: #00609F;">${dataset.dataLocationUrl}</a>
+                                    <#if (dataset.dataLocationUrl())??>
+                                        <a href="${dataset.dataLocationUrl()}" style="text-decoration: none; font-family: 'Montserrat', sans-serif; color: #00609F;">${dataset.dataLocationUrl()}</a>
                                     </#if>
                                 </td>
                             </tr>