diff --git a/ehr/api-src/org/labkey/api/ehr/security/EHRSecurityEscalatorAuditProvider.java b/ehr/api-src/org/labkey/api/ehr/security/EHRSecurityEscalatorAuditProvider.java
index 1cf2de19b..aa013232f 100644
--- a/ehr/api-src/org/labkey/api/ehr/security/EHRSecurityEscalatorAuditProvider.java
+++ b/ehr/api-src/org/labkey/api/ehr/security/EHRSecurityEscalatorAuditProvider.java
@@ -15,7 +15,6 @@
  */
 package org.labkey.api.ehr.security;
 
-import org.labkey.api.audit.query.AbstractAuditDomainKind;
 import org.labkey.api.data.Container;
 import org.labkey.api.study.security.SecurityEscalationAuditProvider;
 
@@ -27,8 +26,14 @@ public class EHRSecurityEscalatorAuditProvider extends SecurityEscalationAuditPr
     public static String EVENT_TYPE = EHRSecurityEscalationEvent.class.getSimpleName();
     public static String AUDIT_LOG_TITLE = "EHR Security Escalations";
 
+    public EHRSecurityEscalatorAuditProvider()
+    {
+        super(new EHRSecurityEscalationDomainKind());
+    }
+
     @Override
-    public String getDescription() {
+    public String getDescription()
+    {
         return "This audits all uses of the EHR Security Escalation";
     }
 
@@ -47,11 +52,6 @@ public String getAuditLogTitle() {
         return AUDIT_LOG_TITLE;
     }
 
-    @Override
-    protected AbstractAuditDomainKind getDomainKind() {
-        return new EHRSecurityEscalationDomain();
-    }
-
     public static class EHRSecurityEscalationEvent extends SecurityEscalationEvent
     {
         /** Important for reflection-based instantiation */
@@ -69,10 +69,17 @@ public String getEventType() {
         }
     }
 
-    public static class EHRSecurityEscalationDomain extends SecurityEscalationAuditDomainKind
+    public static class EHRSecurityEscalationDomainKind extends SecurityEscalationAuditDomainKind
     {
-        public EHRSecurityEscalationDomain() {
+        public EHRSecurityEscalationDomainKind()
+        {
             super(EVENT_TYPE, EHRSecurityEscalationEvent.class.getName());
         }
+
+        @Override
+        protected String getNamespacePrefix()
+        {
+            return NAMESPACE_PREFIX + "EHRSecurityEscalationDomain";
+        }
     }
 }
diff --git a/snd/src/org/labkey/snd/NarrativeAuditProvider.java b/snd/src/org/labkey/snd/NarrativeAuditProvider.java
index 17643cd4b..64075e8c1 100644
--- a/snd/src/org/labkey/snd/NarrativeAuditProvider.java
+++ b/snd/src/org/labkey/snd/NarrativeAuditProvider.java
@@ -42,10 +42,10 @@ public class NarrativeAuditProvider extends AbstractAuditTypeProvider implements
     public static final String COLUMN_NAME_EVENTDATE = "EventDate";
     public static final String COLUMN_NAME_QCSTATE = "QcState";
 
-    static final List<FieldKey> defaultVisibleColumns = new ArrayList<>();
-
-    static {
+    private static final List<FieldKey> defaultVisibleColumns = new ArrayList<>();
 
+    static
+    {
         defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_CREATED));
         defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_CREATED_BY));
         defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_IMPERSONATED_BY));
@@ -57,10 +57,9 @@ public class NarrativeAuditProvider extends AbstractAuditTypeProvider implements
         defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_QCSTATE));
     }
 
-    @Override
-    protected AbstractAuditDomainKind getDomainKind()
+    public NarrativeAuditProvider()
     {
-        return new org.labkey.snd.NarrativeAuditProvider.NarrativeAuditDomainKind();
+        super(new NarrativeAuditDomainKind());
     }
 
     @Override