diff --git a/src/main/java/org/apache/commons/validator/Arg.java b/src/main/java/org/apache/commons/validator/Arg.java
index 2cd585e81..09cc956ff 100644
--- a/src/main/java/org/apache/commons/validator/Arg.java
+++ b/src/main/java/org/apache/commons/validator/Arg.java
@@ -150,7 +150,7 @@ public void setName(final String name) {
     }
 
     /**
-     * Set this argument's replacement position.
+     * Sets this argument's replacement position.
      * @param position set this argument's replacement position.
      */
     public void setPosition(final int position) {
diff --git a/src/main/java/org/apache/commons/validator/Validator.java b/src/main/java/org/apache/commons/validator/Validator.java
index e6005ba30..de9464310 100644
--- a/src/main/java/org/apache/commons/validator/Validator.java
+++ b/src/main/java/org/apache/commons/validator/Validator.java
@@ -129,7 +129,7 @@ public class Validator implements Serializable {
     protected boolean useContextClassLoader;
 
     /**
-     * Set this to true to not return Fields that pass validation.  Only return failures.
+     * Sets this to true to not return Fields that pass validation.  Only return failures.
      */
     protected boolean onlyReturnErrors;
 
@@ -185,7 +185,7 @@ public Validator(final ValidatorResources resources, final String formName, fina
     }
 
     /**
-     * Set a parameter of a pluggable validation method.
+     * Sets a parameter of a pluggable validation method.
      *
      * @param parameterClassName The full class name of the parameter of the
      * validation method that corresponds to the value/instance passed in with it.
@@ -328,7 +328,7 @@ public ClassLoader getClassLoader() {
     }
 
     /**
-     * Set the class loader to be used for instantiating application objects
+     * Sets the class loader to be used for instantiating application objects
      * when required.
      *
      * @param classLoader The new class loader to use, or <code>null</code>
diff --git a/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java b/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java
index c02895218..6c1902646 100644
--- a/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java
+++ b/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java
@@ -34,7 +34,7 @@ public CustomValidatorResourcesTest(final String name) {
     }
 
     /**
-     * Set up.
+     * Sets up.
      */
     @Override
     protected void setUp() {
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigitTest.java
index e224bc76a..107f345b8 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/CUSIPCheckDigitTest.java
@@ -33,7 +33,7 @@ public CUSIPCheckDigitTest(final String name) {
     }
 
     /**
-     * Set up routine & valid codes.
+     * Sets up routine & valid codes.
      */
     @Override
     protected void setUp() {
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/EAN13CheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/EAN13CheckDigitTest.java
index 1c9809148..dc273ac3b 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/EAN13CheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/EAN13CheckDigitTest.java
@@ -33,7 +33,7 @@ public EAN13CheckDigitTest(final String name) {
     }
 
     /**
-     * Set up routine & valid codes.
+     * Sets up routine & valid codes.
      */
     @Override
     protected void setUp() {
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java
index 861a73fb4..db2db16af 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java
@@ -41,7 +41,7 @@ public IBANCheckDigitTest(final String name) {
     }
 
     /**
-     * Set up routine & valid codes.
+     * Sets up routine & valid codes.
      */
     @Override
     protected void setUp() {
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISBN10CheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISBN10CheckDigitTest.java
index d1ee7e5b0..ef30ab889 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISBN10CheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISBN10CheckDigitTest.java
@@ -33,7 +33,7 @@ public ISBN10CheckDigitTest(final String name) {
     }
 
     /**
-     * Set up routine & valid codes.
+     * Sets up routine & valid codes.
      */
     @Override
     protected void setUp() {
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISBNCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISBNCheckDigitTest.java
index 7b364c88d..b53303d85 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISBNCheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISBNCheckDigitTest.java
@@ -33,7 +33,7 @@ public ISBNCheckDigitTest(final String name) {
     }
 
     /**
-     * Set up routine & valid codes.
+     * Sets up routine & valid codes.
      */
     @Override
     protected void setUp() {
@@ -51,7 +51,7 @@ protected void setUp() {
     }
 
     /**
-     * Set up routine & valid codes.
+     * Sets up routine & valid codes.
      */
     public void testInvalidLength() {
         assertFalse("isValid() Lth 9 ", routine.isValid("123456789"));
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigitTest.java
index c9fc8a5c6..41f23ff37 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISINCheckDigitTest.java
@@ -33,7 +33,7 @@ public ISINCheckDigitTest(final String name) {
     }
 
     /**
-     * Set up routine & valid codes.
+     * Sets up routine & valid codes.
      */
     @Override
     protected void setUp() {
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISSNCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISSNCheckDigitTest.java
index ae98544ae..570471691 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ISSNCheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ISSNCheckDigitTest.java
@@ -33,7 +33,7 @@ public ISSNCheckDigitTest(final String name) {
     }
 
     /**
-     * Set up routine & valid codes.
+     * Sets up routine & valid codes.
      */
     @Override
     protected void setUp() {
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/LuhnCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/LuhnCheckDigitTest.java
index 0e2427db0..09e2ae9d6 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/LuhnCheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/LuhnCheckDigitTest.java
@@ -40,7 +40,7 @@ public LuhnCheckDigitTest(final String name) {
     }
 
     /**
-     * Set up routine & valid codes.
+     * Sets up routine & valid codes.
      */
     @Override
     protected void setUp() {
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenABACheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenABACheckDigitTest.java
index aa0b085a4..5940f6be3 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenABACheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenABACheckDigitTest.java
@@ -31,7 +31,7 @@ public ModulusTenABACheckDigitTest(final String name) {
     }
 
     /**
-     * Set up routine & valid codes.
+     * Sets up routine & valid codes.
      */
     @Override
     protected void setUp() {
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenCUSIPCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenCUSIPCheckDigitTest.java
index 8ec6d9ee0..2941d7254 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenCUSIPCheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenCUSIPCheckDigitTest.java
@@ -31,7 +31,7 @@ public ModulusTenCUSIPCheckDigitTest(final String name) {
     }
 
     /**
-     * Set up routine & valid codes.
+     * Sets up routine & valid codes.
      */
     @Override
     protected void setUp() {
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenEAN13CheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenEAN13CheckDigitTest.java
index be1745f85..cc4e0a428 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenEAN13CheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenEAN13CheckDigitTest.java
@@ -31,7 +31,7 @@ public ModulusTenEAN13CheckDigitTest(final String name) {
     }
 
     /**
-     * Set up routine & valid codes.
+     * Sets up routine & valid codes.
      */
     @Override
     protected void setUp() {
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenLuhnCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenLuhnCheckDigitTest.java
index b012f8771..de397634b 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenLuhnCheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenLuhnCheckDigitTest.java
@@ -38,7 +38,7 @@ public ModulusTenLuhnCheckDigitTest(final String name) {
     }
 
     /**
-     * Set up routine & valid codes.
+     * Sets up routine & valid codes.
      */
     @Override
     protected void setUp() {
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenSedolCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenSedolCheckDigitTest.java
index a0a1f6f48..e9c72b8e9 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenSedolCheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/ModulusTenSedolCheckDigitTest.java
@@ -31,7 +31,7 @@ public ModulusTenSedolCheckDigitTest(final String name) {
     }
 
     /**
-     * Set up routine & valid codes.
+     * Sets up routine & valid codes.
      */
     @Override
     protected void setUp() {
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigitTest.java
index dafdb69e1..10603b04d 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/SedolCheckDigitTest.java
@@ -33,7 +33,7 @@ public SedolCheckDigitTest(final String name) {
     }
 
     /**
-     * Set up routine & valid codes.
+     * Sets up routine & valid codes.
      */
     @Override
     protected void setUp() {
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/VerhoeffCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/VerhoeffCheckDigitTest.java
index e38e19833..f7911ea01 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/VerhoeffCheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/VerhoeffCheckDigitTest.java
@@ -32,7 +32,7 @@ public VerhoeffCheckDigitTest(final String name) {
     }
 
     /**
-     * Set up routine & valid codes.
+     * Sets up routine & valid codes.
      */
     @Override
     protected void setUp() {