diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java
index 86984e5be..ba6836896 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java
@@ -61,9 +61,9 @@ package com.opensymphony.xwork2.validator.validators;
  *     <field name="myEmail">
  *        <field-validator type="email">
  *           <param name="parse">true</param>*
- *           <param name="expression">${emailPattern}</param> <!-- will be evaluated as: String getEmailPattern() -->
- *           <param name="caseSensitive">${emailCaseSensitive}</param> <!-- will be evaluated as: boolean getEmailCaseSensitive() -->
- *           <param name="trim">${trimEmail}</param> <!-- will be evaluated as: boolean getTrimEmail() -->
+ *           <param name="regexExpression">${emailPattern}</param> <!-- will be evaluated as: String getEmailPattern() -->
+ *           <param name="caseSensitiveExpression">${emailCaseSensitive}</param> <!-- will be evaluated as: boolean getEmailCaseSensitive() -->
+ *           <param name="trimExpression">${trimEmail}</param> <!-- will be evaluated as: boolean getTrimEmail() -->
  *           <message>Must provide a valid email</message>
  *        </field-validator>
  *     </field>
@@ -81,8 +81,8 @@ public class EmailValidator extends RegexFieldValidator {
     	"\\b^['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2}|aero|arpa|asia|biz|com|coop|edu|gov|info|int|jobs|mil|mobi|museum|name|nato|net|org|pro|tel|travel|xxx)$\\b";
 
     public EmailValidator() {
-        setExpression(emailAddressPattern);
-        setCaseSensitive("false");
+        setRegex(emailAddressPattern);
+        setCaseSensitive(false);
     }
 
 }
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
index 82aaf7558..ffc6ec785 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
@@ -95,7 +95,7 @@ public class EmailValidatorTest extends XWorkTestCase {
         validator.setFieldName("myEmail");
         validator.setDefaultMessage("invalid email");
         validator.setParse(true);
-        validator.setExpression("${emailExpression}");
+        validator.setRegexExpression("${emailExpression}");
 
         validator.validate(action);
         valueStack.pop();
@@ -124,7 +124,7 @@ public class EmailValidatorTest extends XWorkTestCase {
         validator.setValueStack(valueStack);
 
         validator.setParse(true);
-        validator.setCaseSensitive("${emailCaseSensitive}");
+        validator.setCaseSensitiveExpression("${emailCaseSensitive}");
 
         valueStack.pop();
 
@@ -152,7 +152,7 @@ public class EmailValidatorTest extends XWorkTestCase {
         validator.setValueStack(valueStack);
 
         validator.setParse(true);
-        validator.setTrim("${trimEmail}");
+        validator.setTrimExpression("${trimEmail}");
 
         valueStack.pop();