diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/GenericValidatorContext.java b/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java
similarity index 96%
rename from core/src/test/java/com/opensymphony/xwork2/validator/GenericValidatorContext.java
rename to core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java
index 948cd97f4..9d3400f03 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/GenericValidatorContext.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java
@@ -26,14 +26,14 @@ import java.util.*;
  * @author Mark Woon
  * @author Matthew Payne
  */
-public class GenericValidatorContext extends DelegatingValidatorContext {
+public class DummyValidatorContext extends DelegatingValidatorContext {
 
     private Collection<String> actionErrors;
     private Collection<String> actionMessages;
     private Map<String, List<String>> fieldErrors;
 
 
-    public GenericValidatorContext(Object object, TextProviderFactory tpf) {
+    public DummyValidatorContext(Object object, TextProviderFactory tpf) {
         super(object, tpf);
     }
 
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java
index fd4a480a6..6129fc0ae 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java
@@ -5,7 +5,7 @@ import com.opensymphony.xwork2.TextProviderFactory;
 import com.opensymphony.xwork2.XWorkTestCase;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.ValueStackFactory;
-import com.opensymphony.xwork2.validator.GenericValidatorContext;
+import com.opensymphony.xwork2.validator.DummyValidatorContext;
 import com.opensymphony.xwork2.validator.ValidatorContext;
 
 import java.util.Calendar;
@@ -19,7 +19,7 @@ public class DateRangeFieldValidatorTest extends XWorkTestCase {
     public void testPassValidation() throws Exception {
         // given
         ValidationAction action = prepareAction(createDate(2013, 6, 6));
-        ValidatorContext context = new GenericValidatorContext(action, tpf);
+        ValidatorContext context = new DummyValidatorContext(action, tpf);
         DateRangeFieldValidator validator = prepareValidator(action, context);
 
         // when
@@ -32,7 +32,7 @@ public class DateRangeFieldValidatorTest extends XWorkTestCase {
     public void testMinValidation() throws Exception {
         // given
         ValidationAction action = prepareAction(createDate(2012, Calendar.MARCH, 3));
-        ValidatorContext context = new GenericValidatorContext(action, tpf);
+        ValidatorContext context = new DummyValidatorContext(action, tpf);
         DateRangeFieldValidator validator = prepareValidator(action, context);
 
         // when
@@ -46,7 +46,7 @@ public class DateRangeFieldValidatorTest extends XWorkTestCase {
     public void testMaxValidation() throws Exception {
         // given
         ValidationAction action = prepareAction(createDate(2014, Calendar.APRIL, 4));
-        ValidatorContext context = new GenericValidatorContext(action, tpf);
+        ValidatorContext context = new DummyValidatorContext(action, tpf);
         DateRangeFieldValidator validator = prepareValidator(action, context);
 
         // when
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java
index a729ec8b4..77037328b 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java
@@ -4,7 +4,7 @@ import com.opensymphony.xwork2.TextProviderFactory;
 import com.opensymphony.xwork2.XWorkTestCase;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.ValueStackFactory;
-import com.opensymphony.xwork2.validator.GenericValidatorContext;
+import com.opensymphony.xwork2.validator.DummyValidatorContext;
 import com.opensymphony.xwork2.validator.ValidatorContext;
 
 public class IntRangeFieldValidatorTest extends XWorkTestCase {
@@ -19,7 +19,7 @@ public class IntRangeFieldValidatorTest extends XWorkTestCase {
     public void testPassValidation() throws Exception {
         // given
         ValidationAction action = prepareAction(100);
-        ValidatorContext context = new GenericValidatorContext(action, tpf);
+        ValidatorContext context = new DummyValidatorContext(action, tpf);
         IntRangeFieldValidator validator = prepareValidator(action, context);
 
         // when
@@ -32,7 +32,7 @@ public class IntRangeFieldValidatorTest extends XWorkTestCase {
     public void testMinValidation() throws Exception {
         // given
         ValidationAction action = prepareAction(98);
-        ValidatorContext context = new GenericValidatorContext(action, tpf);
+        ValidatorContext context = new DummyValidatorContext(action, tpf);
         IntRangeFieldValidator validator = prepareValidator(action, context);
 
         // when
@@ -46,7 +46,7 @@ public class IntRangeFieldValidatorTest extends XWorkTestCase {
     public void testMaxValidation() throws Exception {
         // given
         ValidationAction action = prepareAction(102);
-        ValidatorContext context = new GenericValidatorContext(action, tpf);
+        ValidatorContext context = new DummyValidatorContext(action, tpf);
         IntRangeFieldValidator validator = prepareValidator(action, context);
 
         // when
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java
index b2e5ad305..bc14b57aa 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java
@@ -4,7 +4,7 @@ import com.opensymphony.xwork2.TextProviderFactory;
 import com.opensymphony.xwork2.XWorkTestCase;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.ValueStackFactory;
-import com.opensymphony.xwork2.validator.GenericValidatorContext;
+import com.opensymphony.xwork2.validator.DummyValidatorContext;
 import com.opensymphony.xwork2.validator.ValidatorContext;
 
 public class LongRangeFieldValidatorTest extends XWorkTestCase {
@@ -19,7 +19,7 @@ public class LongRangeFieldValidatorTest extends XWorkTestCase {
     public void testPassValidation() throws Exception {
         // given
         ValidationAction action = prepareAction(100);
-        ValidatorContext context = new GenericValidatorContext(action, tpf);
+        ValidatorContext context = new DummyValidatorContext(action, tpf);
         LongRangeFieldValidator validator = prepareValidator(action, context);
 
         // when
@@ -32,7 +32,7 @@ public class LongRangeFieldValidatorTest extends XWorkTestCase {
     public void testMinValidation() throws Exception {
         // given
         ValidationAction action = prepareAction(98);
-        ValidatorContext context = new GenericValidatorContext(action, tpf);
+        ValidatorContext context = new DummyValidatorContext(action, tpf);
         LongRangeFieldValidator validator = prepareValidator(action, context);
 
         // when
@@ -46,7 +46,7 @@ public class LongRangeFieldValidatorTest extends XWorkTestCase {
     public void testMaxValidation() throws Exception {
         // given
         ValidationAction action = prepareAction(102);
-        ValidatorContext context = new GenericValidatorContext(action, tpf);
+        ValidatorContext context = new DummyValidatorContext(action, tpf);
         LongRangeFieldValidator validator = prepareValidator(action, context);
 
         // when
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java
index 906fcd309..1495733f9 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java
@@ -5,7 +5,7 @@ import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.TextProviderFactory;
 import com.opensymphony.xwork2.XWorkTestCase;
 import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.validator.GenericValidatorContext;
+import com.opensymphony.xwork2.validator.DummyValidatorContext;
 import com.opensymphony.xwork2.validator.ValidatorContext;
 
 public class RequiredStringValidatorTest extends XWorkTestCase {
@@ -25,7 +25,7 @@ public class RequiredStringValidatorTest extends XWorkTestCase {
         action.setStringValue("a string");
         valueStack.push(action);
 
-        ValidatorContext context = new GenericValidatorContext(action, tpf);
+        ValidatorContext context = new DummyValidatorContext(action, tpf);
         RequiredStringValidator validator = new RequiredStringValidator();
         validator.setValidatorContext(context);
         validator.setFieldName("stringValue");
@@ -45,7 +45,7 @@ public class RequiredStringValidatorTest extends XWorkTestCase {
         ValidationAction action = new ValidationAction();
         valueStack.push(action);
 
-        ValidatorContext context = new GenericValidatorContext(action, tpf);
+        ValidatorContext context = new DummyValidatorContext(action, tpf);
         RequiredStringValidator validator = new RequiredStringValidator();
         validator.setValidatorContext(context);
         validator.setFieldName("stringValue");
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java
index 18c450cfc..bb2766405 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java
@@ -4,7 +4,7 @@ import com.opensymphony.xwork2.TextProviderFactory;
 import com.opensymphony.xwork2.XWorkTestCase;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.ValueStackFactory;
-import com.opensymphony.xwork2.validator.GenericValidatorContext;
+import com.opensymphony.xwork2.validator.DummyValidatorContext;
 import com.opensymphony.xwork2.validator.ValidatorContext;
 
 public class ShortRangeFieldValidatorTest extends XWorkTestCase {
@@ -19,7 +19,7 @@ public class ShortRangeFieldValidatorTest extends XWorkTestCase {
     public void testPassValidation() throws Exception {
         // given
         ValidationAction action = prepareAction((short) 5);
-        ValidatorContext context = new GenericValidatorContext(action, tpf);
+        ValidatorContext context = new DummyValidatorContext(action, tpf);
         ShortRangeFieldValidator validator = prepareValidator(action, context);
 
         // when
@@ -32,7 +32,7 @@ public class ShortRangeFieldValidatorTest extends XWorkTestCase {
     public void testMinValidation() throws Exception {
         // given
         ValidationAction action = prepareAction((short) 1);
-        ValidatorContext context = new GenericValidatorContext(action, tpf);
+        ValidatorContext context = new DummyValidatorContext(action, tpf);
         ShortRangeFieldValidator validator = prepareValidator(action, context);
 
         // when
@@ -46,7 +46,7 @@ public class ShortRangeFieldValidatorTest extends XWorkTestCase {
     public void testMaxValidation() throws Exception {
         // given
         ValidationAction action = prepareAction((short) 11);
-        ValidatorContext context = new GenericValidatorContext(action, tpf);
+        ValidatorContext context = new DummyValidatorContext(action, tpf);
         ShortRangeFieldValidator validator = prepareValidator(action, context);
 
         // when