diff --git a/primed/cdsa/audit/signed_agreement_audit.py b/primed/cdsa/audit/signed_agreement_audit.py
index 59ef6fd2..8247f250 100644
--- a/primed/cdsa/audit/signed_agreement_audit.py
+++ b/primed/cdsa/audit/signed_agreement_audit.py
@@ -95,7 +95,7 @@ class SignedAgreementAccessAuditTable(tables.Table):
     agreement_type = tables.Column(accessor="signed_agreement__combined_type")
     agreement_version = tables.Column(accessor="signed_agreement__version")
     note = tables.Column()
-    action = tables.TemplateColumn(template_name="cdsa/snippets/cdsa_signedagreement_audit_action_button.html")
+    action = tables.TemplateColumn(template_name="cdsa/snippets/signedagreement_audit_action_button.html")
 
     class Meta:
         attrs = {"class": "table align-middle"}
diff --git a/primed/cdsa/audit/workspace_audit.py b/primed/cdsa/audit/workspace_audit.py
index 9c0bff96..b413463b 100644
--- a/primed/cdsa/audit/workspace_audit.py
+++ b/primed/cdsa/audit/workspace_audit.py
@@ -96,7 +96,7 @@ class WorkspaceAccessAuditTable(tables.Table):
     data_affiliate_agreement = tables.Column(linkify=True)
     agreement_version = tables.Column(accessor="data_affiliate_agreement__signed_agreement__version")
     note = tables.Column()
-    action = tables.TemplateColumn(template_name="cdsa/snippets/cdsa_workspace_audit_action_button.html")
+    action = tables.TemplateColumn(template_name="cdsa/snippets/cdsaworkspace_audit_action_button.html")
 
     class Meta:
         attrs = {"class": "table align-middle"}
diff --git a/primed/templates/cdsa/cdsaworkspace_audit.html b/primed/templates/cdsa/cdsaworkspace_audit.html
index 787e0cf1..218e3668 100644
--- a/primed/templates/cdsa/cdsaworkspace_audit.html
+++ b/primed/templates/cdsa/cdsaworkspace_audit.html
@@ -10,7 +10,7 @@ <h1>CDSA workspace audit</h1>
 
 <h2>Audit results</h2>
 
-{% include "cdsa/snippets/cdsa_workspace_audit_explanation.html" %}
+{% include "cdsa/snippets/cdsaworkspace_audit_explanation.html" %}
 
 {% include "__audit_tables.html" with verified_table=verified_table needs_action_table=needs_action_table errors_table=errors_table %}
 
diff --git a/primed/templates/cdsa/cdsaworkspace_audit_resolve.html b/primed/templates/cdsa/cdsaworkspace_audit_resolve.html
index 41a663b8..c505e85e 100644
--- a/primed/templates/cdsa/cdsaworkspace_audit_resolve.html
+++ b/primed/templates/cdsa/cdsaworkspace_audit_resolve.html
@@ -11,7 +11,7 @@ <h1>CDSA workspace audit</h1>
 
 <h2>Audit results</h2>
 
-{% include "cdsa/snippets/cdsa_workspace_audit_explanation.html" %}
+{% include "cdsa/snippets/cdsaworkspace_audit_explanation.html" %}
 
 <div class="card container-fluid mt-3 mb-3">
   <div class="card-body">
diff --git a/primed/templates/cdsa/signedagreement_audit_resolve.html b/primed/templates/cdsa/signedagreement_audit_resolve.html
index 52ed1564..0d5f9c35 100644
--- a/primed/templates/cdsa/signedagreement_audit_resolve.html
+++ b/primed/templates/cdsa/signedagreement_audit_resolve.html
@@ -11,7 +11,7 @@ <h1>Signed Agreement audit</h1>
 
 <h2>Audit results for SignedAgreement {{ object }}</h2>
 
-{% include 'snippets/cdsa_signedagreement_audit_explanation.html' %}
+{% include 'cdsa/snippets/signedagreement_audit_explanation.html' %}
 
 <div class="card container-fluid mt-3 mb-3">
   <div class="card-body">
diff --git a/primed/templates/cdsa/snippets/cdsa_workspace_audit_action_button.html b/primed/templates/cdsa/snippets/cdsaworkspace_audit_action_button.html
similarity index 100%
rename from primed/templates/cdsa/snippets/cdsa_workspace_audit_action_button.html
rename to primed/templates/cdsa/snippets/cdsaworkspace_audit_action_button.html
diff --git a/primed/templates/cdsa/snippets/cdsa_workspace_audit_explanation.html b/primed/templates/cdsa/snippets/cdsaworkspace_audit_explanation.html
similarity index 100%
rename from primed/templates/cdsa/snippets/cdsa_workspace_audit_explanation.html
rename to primed/templates/cdsa/snippets/cdsaworkspace_audit_explanation.html
diff --git a/primed/templates/cdsa/snippets/cdsa_signedagreement_audit_action_button.html b/primed/templates/cdsa/snippets/signedagreement_audit_action_button.html
similarity index 100%
rename from primed/templates/cdsa/snippets/cdsa_signedagreement_audit_action_button.html
rename to primed/templates/cdsa/snippets/signedagreement_audit_action_button.html
diff --git a/primed/templates/snippets/cdsa_signedagreement_audit_explanation.html b/primed/templates/cdsa/snippets/signedagreement_audit_explanation.html
similarity index 100%
rename from primed/templates/snippets/cdsa_signedagreement_audit_explanation.html
rename to primed/templates/cdsa/snippets/signedagreement_audit_explanation.html