diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 5d743f38..aec7a54d 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -26,6 +26,18 @@
     <bean id="String" abstract="true" class="java.lang.String"/>
     <bean id="QName" abstract="true" class="javax.xml.namespace.QName"/>
     
+    <!--
+        File system and class path Resource parent shorthand beans.
+        
+        These are currently defined as Shibboleth resources, but will become
+        Spring resources in Shibboleth MDA 0.9. The parent beans are named
+        after the Spring Resource classes to ease migration later.
+    -->
+    <bean id="ClassPathResource" abstract="true" parent="component_parent"
+        class="net.shibboleth.utilities.java.support.resource.ClasspathResource"/>
+    <bean id="FileSystemResource" abstract="true" parent="component_parent"
+        class="net.shibboleth.utilities.java.support.resource.FilesystemResource"/>
+    
     <!--
         Shibboleth-defined Resource class parent bean.
         
@@ -43,22 +55,6 @@
     -->
     <bean id="component_parent" abstract="true" init-method="initialize"/>
     
-    <!--
-        ClasspathResource
-        
-        Parent for all classpath resource beans.
-    -->
-    <bean id="ClasspathResource" abstract="true" parent="component_parent"
-        class="net.shibboleth.utilities.java.support.resource.ClasspathResource"/>
-    
-    <!--
-        FilesystemResource
-        
-        Parent for all file system resource beans.
-    -->
-    <bean id="FilesystemResource" abstract="true" parent="component_parent"
-        class="net.shibboleth.utilities.java.support.resource.FilesystemResource"/>
-
     <!--
         SimplePipeline
         
@@ -393,7 +389,7 @@
     <bean id="normaliseNamespaces" parent="XSLTransformationStage"
         p:id="normaliseNamespaces">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="ns_norm.xsl"/>
             </bean>
         </property>
@@ -673,7 +669,7 @@
     -->
     <bean id="default_regauth_parent" abstract="true" parent="XSLTransformationStage">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="default_regauth.xsl"/>
             </bean>
         </property>
@@ -702,7 +698,7 @@
     <bean id="stripAAMDUI" parent="XSLTransformationStage"
         p:id="stripAAMDUI">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="strip-aa-mdui.xsl"/>
             </bean>
         </property>
@@ -785,74 +781,74 @@
         A list of all schema documents that we make common use of in SAML metadata.
     -->
     <util:list id="schemaResources">
-        <bean parent="FilesystemResource" c:resourcePath="#{ systemProperties['basedir'] }/xml/incommon-metadata.xsd"/>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource" c:resourcePath="#{ systemProperties['basedir'] }/xml/incommon-metadata.xsd"/>
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/MetadataExchange.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/saml-metadata-rpi-v1.0.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/saml-schema-assertion-2.0.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/saml-schema-metadata-2.0.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/shibboleth-metadata-1.0.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-metadata-attr.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-request-initiation.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-saml-holder-of-key-browser-sso.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-saml-idp-discovery.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-saml-metadata-algsupport-v1.0.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-saml-metadata-ui-v1.0.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/uk-fed-label.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/ws-addr.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/ws-authorization.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/ws-federation.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/ws-securitypolicy-1.2.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/xenc-schema.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/xenc-schema-11.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/xml.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/xmldsig-core-schema.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/xmldsig11-schema.xsd"/>
         </bean>
     </util:list>
@@ -877,7 +873,7 @@
     <bean id="stripComments" parent="XSLTransformationStage"
         p:id="stripComments">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="strip-comments.xsl"/>
             </bean>
         </property>
@@ -921,7 +917,7 @@
     <bean id="cleanImport" parent="XSLTransformationStage"
         p:id="cleanImport">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="clean-import.xsl"/>
             </bean>
         </property>
diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
index b953e52d..6c2d1497 100644
--- a/mdx/int_edugain/verbs.xml
+++ b/mdx/int_edugain/verbs.xml
@@ -116,7 +116,7 @@
                 <bean id="check_recovered" parent="XSLValidationStage"
                     p:id="check_recovered">
                     <property name="XSLResource">
-                        <bean parent="FilesystemResource">
+                        <bean parent="FileSystemResource">
                             <constructor-arg value="#{ systemProperties['basedir'] }/mdx/int_edugain/check_recovered.xsl"/>
                         </bean>
                     </property>
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index c2ea638b..da5ab62d 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -152,7 +152,7 @@
     <bean id="uk_processScopes" parent="XSLTransformationStage"
         p:id="uk_processScopes">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="uk/scopes.xsl"/>
             </bean>
         </property>
@@ -169,7 +169,7 @@
         
         A Resource referencing the members.xml document.
     -->
-    <bean id="uk_membersResource" parent="FilesystemResource">
+    <bean id="uk_membersResource" parent="FileSystemResource">
         <constructor-arg value="#{ systemProperties['basedir'] }/xml/members.xml"/>
     </bean>
     
@@ -207,7 +207,7 @@
     <bean id="uk_fix_mailto" parent="XSLTransformationStage"
         p:id="uk_fix_mailto">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="uk/fix_mailto.xsl"/>
             </bean>
         </property>
@@ -225,7 +225,7 @@
     <bean id="uk_hide_idps" parent="XSLTransformationStage"
         p:id="uk_hide_idps">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="uk/hide_idps.xsl"/>
             </bean>
         </property>
@@ -240,7 +240,7 @@
     <bean id="check_ukreg" parent="XSLValidationStage"
         p:id="check_ukreg">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_ukreg.xsl"/>
             </bean>
         </property>
@@ -258,7 +258,7 @@
     <bean id="check_uk_expkeyname" parent="XSLValidationStage"
         p:id="check_uk_expkeyname">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_uk_expkeyname.xsl"/>
             </bean>
         </property>
@@ -271,7 +271,7 @@
     <bean id="check_uk_keydesc_key" parent="XSLValidationStage"
         p:id="check_uk_keydesc_key">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_uk_keydesc_key.xsl"/>
             </bean>
         </property>
@@ -284,7 +284,7 @@
     <bean id="check_uk_mdrps" parent="XSLValidationStage"
         p:id="check_uk_mdrps">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_uk_mdrps.xsl"/>
             </bean>
         </property>
@@ -297,7 +297,7 @@
     <bean id="check_uk_urlenc" parent="XSLValidationStage"
         p:id="check_uk_urlenc">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_uk_urlenc.xsl"/>
             </bean>
         </property>
@@ -312,7 +312,7 @@
     <bean id="uk_trustRootsDocument" class="net.shibboleth.ext.spring.factory.DomDocumentFactoryBean">
         <property name="parserPool" ref="parserPool"/>
         <property name="documentResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/trust-roots.xml"/>
             </bean>
         </property>
@@ -327,7 +327,7 @@
     <bean id="uk_addTrustRoots" parent="XSLTransformationStage"
         p:id="uk_addTrustRoots">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="uk/trust-roots.xsl"/>
             </bean>
         </property>
@@ -347,7 +347,7 @@
     <bean id="uk_processFragment" parent="XSLTransformationStage"
         p:id="uk_processFragment">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="uk/fragment.xsl"/>
             </bean>
         </property>
@@ -479,7 +479,7 @@
     <bean id="uk_stripExtensions" parent="XSLTransformationStage"
         p:id="uk_stripExtensions">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="uk/strip_extensions.xsl"/>
             </bean>
         </property>
@@ -504,7 +504,7 @@
     <bean id="uk_normaliseNamespaces" parent="XSLTransformationStage"
         p:id="uk_normaliseNamespaces">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_uk.xsl"/>
             </bean>
         </property>
@@ -579,7 +579,7 @@
     <bean id="uk_generateStatistics" parent="XSLTransformationStage"
         p:id="uk_generateStatistics">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="uk/statistics.xsl"/>
             </bean>
         </property>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 3b60b3b5..ba660e82 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -47,7 +47,7 @@
     <bean id="stripEntityScopes" parent="XSLTransformationStage"
         p:id="stripEntityScopes">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="uk/entity_scopes.xsl"/>
             </bean>
         </property>
@@ -61,7 +61,7 @@
     -->
     <bean id="finalise_parent" abstract="true" parent="XSLTransformationStage">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="uk/final_tweak.xsl"/>
             </bean>
         </property>
@@ -120,7 +120,7 @@
     <bean id="fixup_keyuse" parent="XSLTransformationStage"
         p:id="fixup_keyuse">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="uk/fixup_keyuse.xsl"/>
             </bean>
         </property>
@@ -149,7 +149,7 @@
     <bean id="check_fixup_encmethod" parent="XSLValidationStage"
         p:id="check_fixup_encmethod">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_fixup_encmethod.xsl"/>
             </bean>
         </property>
@@ -161,7 +161,7 @@
     <bean id="check_fixup_keyuse" parent="XSLValidationStage"
         p:id="check_fixup_keyuse">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_fixup_keyuse.xsl"/>
             </bean>
         </property>
@@ -432,7 +432,7 @@
     <bean id="CDSNormaliseNamespaces" parent="XSLTransformationStage"
         p:id="CDSNormaliseNamespaces">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_cds.xsl"/>
             </bean>
         </property>
@@ -514,7 +514,7 @@
     <bean id="uk_normaliseFallback" parent="XSLTransformationStage"
         p:id="uk_normaliseFallback">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_back.xsl"/>
             </bean>
         </property>
@@ -578,7 +578,7 @@
     <bean id="uk_normaliseTest" parent="XSLTransformationStage"
         p:id="uk_normaliseTest">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_test.xsl"/>
             </bean>
         </property>
@@ -639,7 +639,7 @@
     <bean id="uk_normaliseExport" parent="XSLTransformationStage"
         p:id="uk_normaliseExport">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_export.xsl"/>
             </bean>
         </property>
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index c0c83dba..294733ee 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -62,7 +62,7 @@
                 <bean id="process" parent="XSLTransformationStage"
                     p:id="process">
                     <property name="xslResource">
-                        <bean parent="ClasspathResource">
+                        <bean parent="ClassPathResource">
                             <constructor-arg value="uk/sp_mdui_test.xsl"/>
                         </bean>
                     </property>
@@ -253,7 +253,7 @@
                 <bean id="importTransform" parent="XSLTransformationStage"
                     p:id="importTransform">
                     <property name="XSLResource">
-                        <bean parent="ClasspathResource">
+                        <bean parent="ClassPathResource">
                             <constructor-arg value="uk/import.xsl"/>
                         </bean>
                     </property>
@@ -263,7 +263,7 @@
                 <bean id="normalizeFragment" parent="XSLTransformationStage"
                     p:id="normalizeFragment">
                     <property name="XSLResource">
-                        <bean parent="FilesystemResource">
+                        <bean parent="FileSystemResource">
                             <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_fragment.xsl"/>
                         </bean>
                     </property>
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index 779d3e77..eb17a9ab 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -38,7 +38,7 @@
     <bean id="check_future_0" parent="XSLValidationStage"
         p:id="check_future_0">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_0.xsl"/>
             </bean>
         </property>
@@ -50,7 +50,7 @@
     <bean id="check_future_1" parent="XSLValidationStage"
         p:id="check_future_1">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_1.xsl"/>
             </bean>
         </property>
@@ -62,7 +62,7 @@
     <bean id="check_future_2" parent="XSLValidationStage"
         p:id="check_future_2">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_2.xsl"/>
             </bean>
         </property>
@@ -74,7 +74,7 @@
     <bean id="check_future_3" parent="XSLValidationStage"
         p:id="check_future_3">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_3.xsl"/>
             </bean>
         </property>
@@ -86,7 +86,7 @@
     <bean id="check_future_4" parent="XSLValidationStage"
         p:id="check_future_4">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_4.xsl"/>
             </bean>
         </property>
@@ -98,7 +98,7 @@
     <bean id="check_future_5" parent="XSLValidationStage"
         p:id="check_future_5">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_5.xsl"/>
             </bean>
         </property>
@@ -110,7 +110,7 @@
     <bean id="check_future_6" parent="XSLValidationStage"
         p:id="check_future_6">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_6.xsl"/>
             </bean>
         </property>
@@ -122,7 +122,7 @@
     <bean id="check_future_7" parent="XSLValidationStage"
         p:id="check_future_7">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_7.xsl"/>
             </bean>
         </property>
@@ -134,7 +134,7 @@
     <bean id="check_future_8" parent="XSLValidationStage"
         p:id="check_future_8">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_8.xsl"/>
             </bean>
         </property>
@@ -146,7 +146,7 @@
     <bean id="check_future_9" parent="XSLValidationStage"
         p:id="check_future_9">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_9.xsl"/>
             </bean>
         </property>
@@ -191,7 +191,7 @@
     <bean id="check_algsupport" parent="XSLValidationStage"
         p:id="check_algsupport">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_algsupport.xsl"/>
             </bean>
         </property>
@@ -213,7 +213,7 @@
     <bean id="check_adfs" parent="XSLValidationStage"
         p:id="check_adfs">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_adfs.xsl"/>
             </bean>
         </property>
@@ -225,7 +225,7 @@
     <bean id="check_bindings" parent="XSLValidationStage"
         p:id="check_bindings">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_bindings.xsl"/>
             </bean>
         </property>
@@ -237,7 +237,7 @@
     <bean id="check_filtered" parent="XSLValidationStage"
         p:id="check_filtered">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_filtered.xsl"/>
             </bean>
         </property>
@@ -249,7 +249,7 @@
     <bean id="check_hoksso" parent="XSLValidationStage"
         p:id="check_hoksso">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_hoksso.xsl"/>
             </bean>
         </property>
@@ -261,7 +261,7 @@
     <bean id="check_idpdisc" parent="XSLValidationStage"
         p:id="check_idpdisc">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_idpdisc.xsl"/>
             </bean>
         </property>
@@ -273,7 +273,7 @@
     <bean id="check_imported" parent="XSLValidationStage"
         p:id="check_imported">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_imported.xsl"/>
             </bean>
         </property>
@@ -285,7 +285,7 @@
     <bean id="check_init" parent="XSLValidationStage"
         p:id="check_init">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_init.xsl"/>
             </bean>
         </property>
@@ -297,7 +297,7 @@
     <bean id="check_mdiop" parent="XSLValidationStage"
         p:id="check_mdiop">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_mdiop.xsl"/>
             </bean>
         </property>
@@ -319,7 +319,7 @@
     <bean id="check_mdrpi_xslt" parent="XSLValidationStage"
         p:id="check_mdrpi_xslt">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_mdrpi.xsl"/>
             </bean>
         </property>
@@ -349,7 +349,7 @@
     -->
     <bean id="check_regauth_parent" abstract="true" parent="XSLValidationStage">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_regauth.xsl"/>
             </bean>
         </property>
@@ -363,7 +363,7 @@
     <bean id="check_hasreginfo" parent="XSLValidationStage"
         p:id="check_hasreginfo">
         <property name="XSLResource">
-            <bean parent="FilesystemResource" c:resourcePath="#{ systemProperties['rulesdir'] }/check_hasreginfo.xsl"/>
+            <bean parent="FileSystemResource" c:resourcePath="#{ systemProperties['rulesdir'] }/check_hasreginfo.xsl"/>
         </property>
     </bean>
     
@@ -393,7 +393,7 @@
     <bean id="check_mdui_xslt" parent="XSLValidationStage"
         p:id="check_mdui_xslt">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_mdui.xsl"/>
             </bean>
         </property>
@@ -410,7 +410,7 @@
     <bean id="mdui_dn_en_match" parent="XSLValidationStage"
         p:id="mdui_dn_en_match">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/mdui_dn_en_match.xsl"/>
             </bean>
         </property>
@@ -425,7 +425,7 @@
     <bean id="mdui_dn_en_present" parent="XSLValidationStage"
         p:id="mdui_dn_en_present">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/mdui_dn_en_present.xsl"/>
             </bean>
         </property>
@@ -466,7 +466,7 @@
     <bean id="check_misc" parent="XSLValidationStage"
         p:id="check_misc">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_misc.xsl"/>
             </bean>
         </property>
@@ -478,7 +478,7 @@
     <bean id="check_namespaces" parent="XSLValidationStage"
         p:id="check_namespaces">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_namespaces.xsl"/>
             </bean>
         </property>
@@ -492,7 +492,7 @@
     <bean id="check_regscope" parent="XSLValidationStage"
         p:id="check_regscope">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_regscope.xsl"/>
             </bean>
         </property>
@@ -504,7 +504,7 @@
     <bean id="check_reqattr" parent="XSLValidationStage"
         p:id="check_reqattr">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_reqattr.xsl"/>
             </bean>
         </property>
@@ -516,7 +516,7 @@
     <bean id="check_saml2int" parent="XSLValidationStage"
         p:id="check_saml2int">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml2int.xsl"/>
             </bean>
         </property>
@@ -528,7 +528,7 @@
     <bean id="check_saml1" parent="XSLValidationStage"
         p:id="check_saml1">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml1.xsl"/>
             </bean>
         </property>
@@ -540,7 +540,7 @@
     <bean id="check_saml2" parent="XSLValidationStage"
         p:id="check_saml2">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml2.xsl"/>
             </bean>
         </property>
@@ -552,7 +552,7 @@
     <bean id="check_saml2meta" parent="XSLValidationStage"
         p:id="check_saml2meta">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml2meta.xsl"/>
             </bean>
         </property>
@@ -564,7 +564,7 @@
     <bean id="check_shibboleth" parent="XSLValidationStage"
         p:id="check_shibboleth">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_shibboleth.xsl"/>
             </bean>
         </property>
@@ -596,7 +596,7 @@
     <bean id="check_vhosts" parent="XSLValidationStage"
         p:id="check_vhosts">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_vhosts.xsl"/>
             </bean>
         </property>
@@ -616,7 +616,7 @@
     <bean id="check_incmd" parent="XSLValidationStage"
         p:id="check_incmd">
         <property name="XSLResource">
-            <bean parent="FilesystemResource" c:resourcePath="#{ systemProperties['rulesdir'] }/check_incmd.xsl"/>
+            <bean parent="FileSystemResource" c:resourcePath="#{ systemProperties['rulesdir'] }/check_incmd.xsl"/>
         </property>
     </bean>
     
@@ -634,7 +634,7 @@
     <bean id="check_uk_trust" parent="XSLValidationStage"
         p:id="check_uk_trust">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_uk_trust.xsl"/>
             </bean>
         </property>
@@ -663,7 +663,7 @@
     <bean id="check_aggregate" parent="XSLValidationStage"
         p:id="check_aggregate">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_aggregate.xsl"/>
             </bean>
         </property>
@@ -697,7 +697,7 @@
     <bean id="debian.1024" parent="X509RSAOpenSSLBlacklistValidator"
         p:id="debian.1024" p:keySize="1024">
         <property name="blacklistResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="_openssl_blacklists/blacklist.RSA-1024"/>
             </bean>
         </property>
@@ -706,7 +706,7 @@
     <bean id="debian.2048" parent="X509RSAOpenSSLBlacklistValidator"
         p:id="debian.2048" p:keySize="2048">
         <property name="blacklistResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="_openssl_blacklists/blacklist.RSA-2048"/>
             </bean>
         </property>
@@ -715,7 +715,7 @@
     <bean id="debian.4096" parent="X509RSAOpenSSLBlacklistValidator"
         p:id="debian.4096" p:keySize="4096">
         <property name="blacklistResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="_openssl_blacklists/blacklist.RSA-4096"/>
             </bean>
         </property>
@@ -728,7 +728,7 @@
     <bean id="compromised.1024" parent="X509RSAOpenSSLBlacklistValidator"
         p:id="compromised.1024" p:keySize="1024">
         <property name="blacklistResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="_openssl_blacklists/compromised-1024.txt"/>
             </bean>
         </property>