diff --git a/.gitignore b/.gitignore
index 84d134e45..97f65b914 100644
--- a/.gitignore
+++ b/.gitignore
@@ -201,3 +201,44 @@ local.properties
 /org.hl7.fhir.r5/src/main/resources/snapshot-generation/t7-output.xml
 /org.hl7.fhir.r5/src/main/resources/snapshot-generation/t8-output.xml
 /org.hl7.fhir.r5/src/main/resources/snapshot-generation/t9-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t1-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t10-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t11-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t12-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t12a-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t13-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t14-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t15-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t16-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t17-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t18-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t19-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t2-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t21-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t22-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t23-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t24b-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t26-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t27-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t28-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t29-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t3-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t30b-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t31-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t32-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t33-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t34-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t35-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t36-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t38-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t4-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t40-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t41-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t42-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t43-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t44-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t5-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t6-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t7-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t8-output.xml
+/org.hl7.fhir.r5/src/test/resources/snapshot-generation/t9-output.xml
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r4/validation/XmlValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r4/validation/XmlValidator.java
index 8e3471355..7e4c7b462 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r4/validation/XmlValidator.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r4/validation/XmlValidator.java
@@ -199,8 +199,8 @@ public class XmlValidator {
     Document doc;
     byte[] out = null;
     try {
-      out = XmlUtilities.saxonTransform(transforms, schemas.get(sch), transforms.get("iso_svrl_for_xslt2.xsl"));
-      out = XmlUtilities.saxonTransform(transforms, TextFile.fileToBytes(filename), out);
+      out = XsltUtilities.saxonTransform(transforms, schemas.get(sch), transforms.get("iso_svrl_for_xslt2.xsl"));
+      out = XsltUtilities.saxonTransform(transforms, TextFile.fileToBytes(filename), out);
     } catch (Throwable e) {
       errors.add(new ValidationMessage(Source.InstanceValidator, IssueType.STRUCTURE, -1, -1, filename+":"+sch, e.getMessage(), IssueSeverity.ERROR));
       if (wantThrow)
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/XmlValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/XmlValidator.java
index 5b245767a..5f87599b1 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/XmlValidator.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/XmlValidator.java
@@ -137,8 +137,8 @@ public class XmlValidator {
     Document doc;
     byte[] out = null;
     try {
-      out = XmlUtilities.saxonTransform(transforms, schemas.get(sch), transforms.get("iso_svrl_for_xslt2.xsl"));
-      out = XmlUtilities.saxonTransform(transforms, TextFile.fileToBytes(filename), out);
+      out = XsltUtilities.saxonTransform(transforms, schemas.get(sch), transforms.get("iso_svrl_for_xslt2.xsl"));
+      out = XsltUtilities.saxonTransform(transforms, TextFile.fileToBytes(filename), out);
     } catch (Throwable e) {
       errors.add(new ValidationMessage(Source.InstanceValidator, IssueType.STRUCTURE, -1, -1, filename + ":" + sch, e.getMessage(), IssueSeverity.ERROR));
       if (wantThrow)