diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 5156c10..10e96da 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -8,5 +8,5 @@ spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false
 validator.common = common-beans.xml
 
 # Space-separated list of the validator configurations to load.
-validator.configurations = default-validator.xml second-validator.xml \
-    test-validator.xml
+validator.configurations = default-validator.xml \
+    empty-validator.xml test-validator.xml
diff --git a/src/main/resources/second-validator.xml b/src/main/resources/empty-validator.xml
similarity index 88%
rename from src/main/resources/second-validator.xml
rename to src/main/resources/empty-validator.xml
index 3552d08..2bd75e2 100644
--- a/src/main/resources/second-validator.xml
+++ b/src/main/resources/empty-validator.xml
@@ -12,8 +12,8 @@
     <!-- *** Default Shibboleth component bean id property from Spring bean id *** -->
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" lazy-init="false"/>
 
-    <bean id="id" parent="String" c:_="second"/>
-    <bean id="description" parent="String" c:_="Second validator."/>
+    <bean id="id" parent="String" c:_="empty"/>
+    <bean id="description" parent="String" c:_="Empty validator pipeline."/>
 
     <bean id="pipeline" parent="mda.SimplePipeline">
         <property name="stages">