diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/AlwaysAcceptValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/AcceptAllValidator.java
similarity index 92%
rename from src/main/java/uk/org/iay/incommon/mda/validate/AlwaysAcceptValidator.java
rename to src/main/java/uk/org/iay/incommon/mda/validate/AcceptAllValidator.java
index a4f71a2..2c7e4b4 100644
--- a/src/main/java/uk/org/iay/incommon/mda/validate/AlwaysAcceptValidator.java
+++ b/src/main/java/uk/org/iay/incommon/mda/validate/AcceptAllValidator.java
@@ -25,7 +25,7 @@
  * {@link net.shibboleth.metadata.validate.Validator.Action#DONE}
  * to terminate any validator sequence.
  */
-public class AlwaysAcceptValidator extends BaseValidator implements Validator<Object> {
+public class AcceptAllValidator extends BaseValidator implements Validator<Object> {
 
     @Override
     public Action validate(@Nonnull final Object e, @Nonnull final Item<?> item, @Nonnull final String stageId) {
diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/AlwaysRejectValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/RejectAllValidator.java
similarity index 96%
rename from src/main/java/uk/org/iay/incommon/mda/validate/AlwaysRejectValidator.java
rename to src/main/java/uk/org/iay/incommon/mda/validate/RejectAllValidator.java
index d644c5e..378c382 100644
--- a/src/main/java/uk/org/iay/incommon/mda/validate/AlwaysRejectValidator.java
+++ b/src/main/java/uk/org/iay/incommon/mda/validate/RejectAllValidator.java
@@ -30,7 +30,7 @@
  * An error status is added using the value of the given property as a format string.
  * The message defaults to a simple rejection message including the object's string value.
  */
-public class AlwaysRejectValidator extends BaseValidator implements Validator<Object> {
+public class RejectAllValidator extends BaseValidator implements Validator<Object> {
 
     /**
      * Message format string.
diff --git a/src/main/resources/uk/org/iay/incommon/mda/beans.xml b/src/main/resources/uk/org/iay/incommon/mda/beans.xml
index 2318eb1..16f2c0c 100644
--- a/src/main/resources/uk/org/iay/incommon/mda/beans.xml
+++ b/src/main/resources/uk/org/iay/incommon/mda/beans.xml
@@ -35,10 +35,10 @@
         Validator beans.
     -->
 
-    <bean id="inc.AlwaysAcceptValidator" abstract="true"
-        class="uk.org.iay.incommon.mda.validate.AlwaysAcceptValidator"/>
+    <bean id="inc.AcceptAllValidator" abstract="true"
+        class="uk.org.iay.incommon.mda.validate.AcceptAllValidator"/>
 
-    <bean id="inc.AlwaysRejectValidator" abstract="true"
-        class="uk.org.iay.incommon.mda.validate.AlwaysRejectValidator"/>
+    <bean id="inc.RejectAllValidator" abstract="true"
+        class="uk.org.iay.incommon.mda.validate.RejectAllValidator"/>
 
 </beans>
diff --git a/src/test/java/uk/org/iay/incommon/mda/validate/AlwaysAcceptValidatorTest.java b/src/test/java/uk/org/iay/incommon/mda/validate/AcceptAllValidatorTest.java
similarity index 87%
rename from src/test/java/uk/org/iay/incommon/mda/validate/AlwaysAcceptValidatorTest.java
rename to src/test/java/uk/org/iay/incommon/mda/validate/AcceptAllValidatorTest.java
index f487094..83f3b5c 100644
--- a/src/test/java/uk/org/iay/incommon/mda/validate/AlwaysAcceptValidatorTest.java
+++ b/src/test/java/uk/org/iay/incommon/mda/validate/AcceptAllValidatorTest.java
@@ -12,11 +12,11 @@
 import net.shibboleth.metadata.validate.Validator.Action;
 import uk.org.ukfederation.mda.MockItem;
 
-public class AlwaysAcceptValidatorTest {
+public class AcceptAllValidatorTest {
 
     @Test
     public void validate() throws Exception {
-        final AlwaysAcceptValidator v = new AlwaysAcceptValidator();
+        final AcceptAllValidator v = new AcceptAllValidator();
         v.setId("comp");
         v.initialize();
 
diff --git a/src/test/java/uk/org/iay/incommon/mda/validate/AlwaysRejectValidatorTest.java b/src/test/java/uk/org/iay/incommon/mda/validate/RejectAllValidatorTest.java
similarity index 90%
rename from src/test/java/uk/org/iay/incommon/mda/validate/AlwaysRejectValidatorTest.java
rename to src/test/java/uk/org/iay/incommon/mda/validate/RejectAllValidatorTest.java
index 79ea619..7a23bc5 100644
--- a/src/test/java/uk/org/iay/incommon/mda/validate/AlwaysRejectValidatorTest.java
+++ b/src/test/java/uk/org/iay/incommon/mda/validate/RejectAllValidatorTest.java
@@ -12,11 +12,11 @@
 import net.shibboleth.metadata.validate.Validator.Action;
 import uk.org.ukfederation.mda.MockItem;
 
-public class AlwaysRejectValidatorTest {
+public class RejectAllValidatorTest {
 
     @Test
     public void validate() throws Exception {
-        final AlwaysRejectValidator v = new AlwaysRejectValidator();
+        final RejectAllValidator v = new RejectAllValidator();
         v.setId("comp");
         v.initialize();
 
@@ -34,7 +34,7 @@ public void validate() throws Exception {
 
     @Test
     public void validateWithMessage() throws Exception {
-        final AlwaysRejectValidator v = new AlwaysRejectValidator();
+        final RejectAllValidator v = new RejectAllValidator();
         v.setId("comp");
         v.setMessage("decimal %.2f");
         v.initialize();