diff --git a/plugins/struts2-oval-plugin/pom.xml b/plugins/oval/pom.xml
similarity index 100%
rename from plugins/struts2-oval-plugin/pom.xml
rename to plugins/oval/pom.xml
diff --git a/plugins/struts2-oval-plugin/src/main/java/org/apache/struts2/oval/annotation/Profiles.java b/plugins/oval/src/main/java/org/apache/struts2/oval/annotation/Profiles.java
similarity index 100%
rename from plugins/struts2-oval-plugin/src/main/java/org/apache/struts2/oval/annotation/Profiles.java
rename to plugins/oval/src/main/java/org/apache/struts2/oval/annotation/Profiles.java
diff --git a/plugins/struts2-oval-plugin/src/main/java/org/apache/struts2/oval/interceptor/DefaultOValValidationManager.java b/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/DefaultOValValidationManager.java
similarity index 100%
rename from plugins/struts2-oval-plugin/src/main/java/org/apache/struts2/oval/interceptor/DefaultOValValidationManager.java
rename to plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/DefaultOValValidationManager.java
diff --git a/plugins/struts2-oval-plugin/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java b/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
similarity index 100%
rename from plugins/struts2-oval-plugin/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
rename to plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
diff --git a/plugins/struts2-oval-plugin/src/main/java/org/apache/struts2/oval/interceptor/OValValidationManager.java b/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationManager.java
similarity index 100%
rename from plugins/struts2-oval-plugin/src/main/java/org/apache/struts2/oval/interceptor/OValValidationManager.java
rename to plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationManager.java
diff --git a/plugins/struts2-oval-plugin/src/main/resources/LICENSE.txt b/plugins/oval/src/main/resources/LICENSE.txt
similarity index 100%
rename from plugins/struts2-oval-plugin/src/main/resources/LICENSE.txt
rename to plugins/oval/src/main/resources/LICENSE.txt
diff --git a/plugins/struts2-oval-plugin/src/main/resources/NOTICE.txt b/plugins/oval/src/main/resources/NOTICE.txt
similarity index 100%
rename from plugins/struts2-oval-plugin/src/main/resources/NOTICE.txt
rename to plugins/oval/src/main/resources/NOTICE.txt
diff --git a/plugins/struts2-oval-plugin/src/main/resources/OVAL-LICENSE.txt b/plugins/oval/src/main/resources/OVAL-LICENSE.txt
similarity index 100%
rename from plugins/struts2-oval-plugin/src/main/resources/OVAL-LICENSE.txt
rename to plugins/oval/src/main/resources/OVAL-LICENSE.txt
diff --git a/plugins/struts2-oval-plugin/src/main/resources/XSTREAM-LICENSE.txt b/plugins/oval/src/main/resources/XSTREAM-LICENSE.txt
similarity index 100%
rename from plugins/struts2-oval-plugin/src/main/resources/XSTREAM-LICENSE.txt
rename to plugins/oval/src/main/resources/XSTREAM-LICENSE.txt
diff --git a/plugins/struts2-oval-plugin/src/main/resources/struts-plugin.xml b/plugins/oval/src/main/resources/struts-plugin.xml
similarity index 100%
rename from plugins/struts2-oval-plugin/src/main/resources/struts-plugin.xml
rename to plugins/oval/src/main/resources/struts-plugin.xml
diff --git a/plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/FieldsWithProfiles.java b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/FieldsWithProfiles.java
similarity index 100%
rename from plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/FieldsWithProfiles.java
rename to plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/FieldsWithProfiles.java
diff --git a/plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/OValValidationInterceptorTest.java b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/OValValidationInterceptorTest.java
similarity index 100%
rename from plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/OValValidationInterceptorTest.java
rename to plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/OValValidationInterceptorTest.java
diff --git a/plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/SimpleField.java b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleField.java
similarity index 100%
rename from plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/SimpleField.java
rename to plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleField.java
diff --git a/plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18n.java b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18n.java
similarity index 100%
rename from plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18n.java
rename to plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18n.java
diff --git a/plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18nDefaultKey.java b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18nDefaultKey.java
similarity index 100%
rename from plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18nDefaultKey.java
rename to plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18nDefaultKey.java
diff --git a/plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldJPAAnnotations.java b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldJPAAnnotations.java
similarity index 100%
rename from plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldJPAAnnotations.java
rename to plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldJPAAnnotations.java
diff --git a/plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldOGNLExpression.java b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldOGNLExpression.java
similarity index 100%
rename from plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldOGNLExpression.java
rename to plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldOGNLExpression.java
diff --git a/plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldsXML.java b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldsXML.java
similarity index 100%
rename from plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldsXML.java
rename to plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldsXML.java
diff --git a/plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldsXMLChild.java b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldsXMLChild.java
similarity index 100%
rename from plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldsXMLChild.java
rename to plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldsXMLChild.java
diff --git a/plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/SimpleMethod.java b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleMethod.java
similarity index 100%
rename from plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/SimpleMethod.java
rename to plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleMethod.java
diff --git a/plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/ValidationInMethods.java b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/ValidationInMethods.java
similarity index 100%
rename from plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/ValidationInMethods.java
rename to plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/ValidationInMethods.java
diff --git a/plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/VoidResult.java b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/VoidResult.java
similarity index 100%
rename from plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/VoidResult.java
rename to plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/VoidResult.java
diff --git a/plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/aa.java b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/aa.java
similarity index 100%
rename from plugins/struts2-oval-plugin/src/test/java/org/apache/struts2/oval/interceptor/aa.java
rename to plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/aa.java
diff --git a/plugins/struts2-oval-plugin/src/test/resources/org/apache/struts2/oval/interceptor/SimpleFieldI18n.properties b/plugins/oval/src/test/resources/org/apache/struts2/oval/interceptor/SimpleFieldI18n.properties
similarity index 100%
rename from plugins/struts2-oval-plugin/src/test/resources/org/apache/struts2/oval/interceptor/SimpleFieldI18n.properties
rename to plugins/oval/src/test/resources/org/apache/struts2/oval/interceptor/SimpleFieldI18n.properties
diff --git a/plugins/struts2-oval-plugin/src/test/resources/org/apache/struts2/oval/interceptor/SimpleFieldsXML-validation.xml b/plugins/oval/src/test/resources/org/apache/struts2/oval/interceptor/SimpleFieldsXML-validation.xml
similarity index 100%
rename from plugins/struts2-oval-plugin/src/test/resources/org/apache/struts2/oval/interceptor/SimpleFieldsXML-validation.xml
rename to plugins/oval/src/test/resources/org/apache/struts2/oval/interceptor/SimpleFieldsXML-validation.xml
diff --git a/plugins/struts2-oval-plugin/src/test/resources/org/apache/struts2/oval/interceptor/SimpleFieldsXMLChild-validation.xml b/plugins/oval/src/test/resources/org/apache/struts2/oval/interceptor/SimpleFieldsXMLChild-validation.xml
similarity index 100%
rename from plugins/struts2-oval-plugin/src/test/resources/org/apache/struts2/oval/interceptor/SimpleFieldsXMLChild-validation.xml
rename to plugins/oval/src/test/resources/org/apache/struts2/oval/interceptor/SimpleFieldsXMLChild-validation.xml
diff --git a/plugins/struts2-oval-plugin/src/test/resources/oval-test.xml b/plugins/oval/src/test/resources/oval-test.xml
similarity index 100%
rename from plugins/struts2-oval-plugin/src/test/resources/oval-test.xml
rename to plugins/oval/src/test/resources/oval-test.xml