diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index 3fa04220a0..ec0ded9c73 100644
--- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -217,8 +217,8 @@ protected void setParameters(final Object action, ValueStack stack, HttpParamete
             //block or allow access to properties
             //see WW-2761 for more details
             MemberAccessValueStack accessValueStack = (MemberAccessValueStack) newStack;
-            accessValueStack.setAcceptProperties(acceptedPatterns.getAcceptedPatterns());
-            accessValueStack.setExcludeProperties(excludedPatterns.getExcludedPatterns());
+            accessValueStack.useAcceptProperties(acceptedPatterns.getAcceptedPatterns());
+            accessValueStack.useExcludeProperties(excludedPatterns.getExcludedPatterns());
         }
 
         for (Map.Entry<String, Parameter> entry : acceptableParameters.entrySet()) {
diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index 827cda11a0..8c17902290 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -872,22 +872,22 @@ protected Map<String, Object> createDefaultContext(Object root, ClassResolver cl
         }
 
         SecurityMemberAccess memberAccess = new SecurityMemberAccess(allowStaticFieldAccess);
-        memberAccess.setDisallowProxyMemberAccess(disallowProxyMemberAccess);
+        memberAccess.disallowProxyMemberAccess(disallowProxyMemberAccess);
 
         if (devMode) {
             if (!warnReported.get()) {
                 warnReported.set(true);
                 LOG.warn("Working in devMode, using devMode excluded classes and packages!");
             }
-            memberAccess.setExcludedClasses(devModeExcludedClasses);
-            memberAccess.setExcludedPackageNamePatterns(devModeExcludedPackageNamePatterns);
-            memberAccess.setExcludedPackageNames(devModeExcludedPackageNames);
-            memberAccess.setExcludedPackageExemptClasses(devModeExcludedPackageExemptClasses);
+            memberAccess.useExcludedClasses(devModeExcludedClasses);
+            memberAccess.useExcludedPackageNamePatterns(devModeExcludedPackageNamePatterns);
+            memberAccess.useExcludedPackageNames(devModeExcludedPackageNames);
+            memberAccess.useExcludedPackageExemptClasses(devModeExcludedPackageExemptClasses);
         } else {
-            memberAccess.setExcludedClasses(excludedClasses);
-            memberAccess.setExcludedPackageNamePatterns(excludedPackageNamePatterns);
-            memberAccess.setExcludedPackageNames(excludedPackageNames);
-            memberAccess.setExcludedPackageExemptClasses(excludedPackageExemptClasses);
+            memberAccess.useExcludedClasses(excludedClasses);
+            memberAccess.useExcludedPackageNamePatterns(excludedPackageNamePatterns);
+            memberAccess.useExcludedPackageNames(excludedPackageNames);
+            memberAccess.useExcludedPackageExemptClasses(excludedPackageExemptClasses);
         }
 
         return Ognl.createDefaultContext(root, memberAccess, resolver, defaultConverter);
diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
index 938ed477ae..336312c897 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
@@ -89,11 +89,11 @@ protected OgnlValueStack(ValueStack vs, XWorkConverter xworkConverter, CompoundR
     @Inject
     protected void setOgnlUtil(OgnlUtil ognlUtil) {
         this.ognlUtil = ognlUtil;
-        securityMemberAccess.setExcludedClasses(ognlUtil.getExcludedClasses());
-        securityMemberAccess.setExcludedPackageNamePatterns(ognlUtil.getExcludedPackageNamePatterns());
-        securityMemberAccess.setExcludedPackageNames(ognlUtil.getExcludedPackageNames());
-        securityMemberAccess.setExcludedPackageExemptClasses(ognlUtil.getExcludedPackageExemptClasses());
-        securityMemberAccess.setDisallowProxyMemberAccess(ognlUtil.isDisallowProxyMemberAccess());
+        securityMemberAccess.useExcludedClasses(ognlUtil.getExcludedClasses());
+        securityMemberAccess.useExcludedPackageNamePatterns(ognlUtil.getExcludedPackageNamePatterns());
+        securityMemberAccess.useExcludedPackageNames(ognlUtil.getExcludedPackageNames());
+        securityMemberAccess.useExcludedPackageExemptClasses(ognlUtil.getExcludedPackageExemptClasses());
+        securityMemberAccess.disallowProxyMemberAccess(ognlUtil.isDisallowProxyMemberAccess());
     }
 
     protected void setRoot(XWorkConverter xworkConverter, CompoundRootAccessor accessor, CompoundRoot compoundRoot, boolean allowStaticFieldAccess) {
@@ -482,12 +482,22 @@ public void clearContextValues() {
         ((OgnlContext) context).getValues().clear();
     }
 
+    @Deprecated
     public void setAcceptProperties(Set<Pattern> acceptedProperties) {
-        securityMemberAccess.setAcceptProperties(acceptedProperties);
+        securityMemberAccess.useAcceptProperties(acceptedProperties);
     }
 
+    public void useAcceptProperties(Set<Pattern> acceptedProperties) {
+        securityMemberAccess.useAcceptProperties(acceptedProperties);
+    }
+
+    @Deprecated
     public void setExcludeProperties(Set<Pattern> excludeProperties) {
-        securityMemberAccess.setExcludeProperties(excludeProperties);
+        securityMemberAccess.useExcludeProperties(excludeProperties);
+    }
+
+    public void useExcludeProperties(Set<Pattern> excludeProperties) {
+        securityMemberAccess.useExcludeProperties(excludeProperties);
     }
 
     @Inject
diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java b/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
index c21b5b089e..18acc675c0 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
@@ -299,31 +299,87 @@ protected boolean isExcluded(String paramName) {
         return false;
     }
 
+    /**
+     * @deprecated please use {@link #useExcludeProperties(Set)}
+     */
+    @Deprecated
     public void setExcludeProperties(Set<Pattern> excludeProperties) {
         this.excludeProperties = excludeProperties;
     }
 
+    public void useExcludeProperties(Set<Pattern> excludeProperties) {
+        this.excludeProperties = excludeProperties;
+    }
+
+    /**
+     * @deprecated please use {@link #useAcceptProperties(Set)}
+     */
+    @Deprecated
     public void setAcceptProperties(Set<Pattern> acceptedProperties) {
         this.acceptProperties = acceptedProperties;
     }
 
+    public void useAcceptProperties(Set<Pattern> acceptedProperties) {
+        this.acceptProperties = acceptedProperties;
+    }
+
+    /**
+     * @deprecated please use {@link #useExcludedClasses(Set)}
+     */
+    @Deprecated
     public void setExcludedClasses(Set<Class<?>> excludedClasses) {
         this.excludedClasses = excludedClasses;
     }
 
+    public void useExcludedClasses(Set<Class<?>> excludedClasses) {
+        this.excludedClasses = excludedClasses;
+    }
+
+    /**
+     * @deprecated please use {@link #useExcludedPackageNamePatterns(Set)}
+     */
+    @Deprecated
     public void setExcludedPackageNamePatterns(Set<Pattern> excludedPackageNamePatterns) {
         this.excludedPackageNamePatterns = excludedPackageNamePatterns;
     }
 
+    public void useExcludedPackageNamePatterns(Set<Pattern> excludedPackageNamePatterns) {
+        this.excludedPackageNamePatterns = excludedPackageNamePatterns;
+    }
+
+    /**
+     * @deprecated please use {@link #useExcludedPackageNames(Set)}
+     */
+    @Deprecated
     public void setExcludedPackageNames(Set<String> excludedPackageNames) {
         this.excludedPackageNames = excludedPackageNames;
     }
 
+    public void useExcludedPackageNames(Set<String> excludedPackageNames) {
+        this.excludedPackageNames = excludedPackageNames;
+    }
+
+    /**
+     * @deprecated please use {@link #useExcludedPackageExemptClasses(Set)}
+     */
+    @Deprecated
     public void setExcludedPackageExemptClasses(Set<Class<?>> excludedPackageExemptClasses) {
         this.excludedPackageExemptClasses = excludedPackageExemptClasses;
     }
 
+    public void useExcludedPackageExemptClasses(Set<Class<?>> excludedPackageExemptClasses) {
+        this.excludedPackageExemptClasses = excludedPackageExemptClasses;
+    }
+
+    /**
+     * @deprecated please use {@link #disallowProxyMemberAccess(boolean)}
+     */
+    @Deprecated
     public void setDisallowProxyMemberAccess(boolean disallowProxyMemberAccess) {
         this.disallowProxyMemberAccess = disallowProxyMemberAccess;
     }
+
+    public void disallowProxyMemberAccess(boolean disallowProxyMemberAccess) {
+        this.disallowProxyMemberAccess = disallowProxyMemberAccess;
+    }
 }
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/MemberAccessValueStack.java b/core/src/main/java/com/opensymphony/xwork2/util/MemberAccessValueStack.java
index 801c24573b..86b39f480b 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/MemberAccessValueStack.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/MemberAccessValueStack.java
@@ -27,8 +27,20 @@
  */
 public interface MemberAccessValueStack {
 
+    /**
+     * @deprecated please use {@link #useExcludeProperties(Set)}
+     */
+    @Deprecated
     void setExcludeProperties(Set<Pattern> excludeProperties);
 
+    void useExcludeProperties(Set<Pattern> excludeProperties);
+
+    /**
+     * @deprecated please use {@link #useAcceptProperties(Set)}
+     */
+    @Deprecated
     void setAcceptProperties(Set<Pattern> acceptedProperties);
 
+    void useAcceptProperties(Set<Pattern> acceptedProperties);
+
 }
diff --git a/core/src/main/resources/struts-excluded-classes.xml b/core/src/main/resources/struts-excluded-classes.xml
index 524194af9a..294e2399b9 100644
--- a/core/src/main/resources/struts-excluded-classes.xml
+++ b/core/src/main/resources/struts-excluded-classes.xml
@@ -2,19 +2,19 @@
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
  *
  *  http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  */
@@ -37,7 +37,9 @@
                 java.lang.ProcessBuilder,
                 java.lang.Thread,
                 sun.misc.Unsafe,
-                com.opensymphony.xwork2.ActionContext"/>
+                com.opensymphony.xwork2.ActionContext,
+                com.opensymphony.xwork2.ognl.SecurityMemberAccess,
+                com.opensymphony.xwork2.ognl.OgnlValueStack"/>
 
     <constant name="struts.devMode.excludedClasses"
               value="
diff --git a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
index b5795a326d..3017043161 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
@@ -35,7 +35,6 @@
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.location.LocatableProperties;
 import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
-import java.beans.BeanInfo;
 import ognl.InappropriateExpressionException;
 import ognl.MethodFailedException;
 import ognl.NoSuchPropertyException;
@@ -48,6 +47,7 @@
 import org.apache.struts2.StrutsConstants;
 import org.apache.struts2.StrutsException;
 
+import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
 import java.lang.reflect.Method;
 import java.text.DateFormat;
@@ -877,6 +877,33 @@ public void testStringToLong() {
         assertEquals(123, foo.getALong());
     }
 
+    public void testBeanMapExpressions() throws OgnlException {
+        Foo foo = new Foo();
+        ognlUtil.setExcludedClasses(
+                "com.opensymphony.xwork2.ognl.SecurityMemberAccess"
+        );
+
+        Map<String, Object> context = ognlUtil.createDefaultContext(foo);
+
+        String expression = "%{\n" +
+            "(#request.a=#@org.apache.commons.collections.BeanMap@{}) +\n" +
+            "(#request.a.setBean(#request.get('struts.valueStack')) == true) +\n" +
+            "(#request.b=#@org.apache.commons.collections.BeanMap@{}) +\n" +
+            "(#request.b.setBean(#request.get('a').get('context'))) +\n" +
+            "(#request.c=#@org.apache.commons.collections.BeanMap@{}) +\n" +
+            "(#request.c.setBean(#request.get('b').get('memberAccess'))) +\n" +
+            "(#request.get('c').put('excluded'+'PackageNames',#@org.apache.commons.collections.BeanMap@{}.keySet())) +\n" +
+            "(#request.get('c').put('excludedClasses',#@org.apache.commons.collections.BeanMap@{}.keySet()))\n" +
+            "}";
+
+        ognlUtil.setValue("title", context, foo, expression);
+
+        assertEquals(foo.getTitle(), expression);
+
+        SecurityMemberAccess sma = (SecurityMemberAccess) ((OgnlContext) context).getMemberAccess();
+        assertTrue(sma.isClassExcluded(SecurityMemberAccess.class));
+    }
+
     public void testNullProperties() {
         Foo foo = new Foo();
         foo.setALong(88);
@@ -1834,19 +1861,19 @@ public void testOgnlDefaultCacheFactoryCoverage() {
         defaultOgnlCacheFactory.setUseLRUCache("false");
         ognlCache = defaultOgnlCacheFactory.buildOgnlCache();
         assertNotNull("No param build method result null ?", ognlCache);
-        assertEquals("Eviction limit for cache mismatches limit for factory ?", 12, ognlCache.getEvictionLimit() );
+        assertEquals("Eviction limit for cache mismatches limit for factory ?", 12, ognlCache.getEvictionLimit());
         ognlCache = defaultOgnlCacheFactory.buildOgnlCache(6, 6, 0.75f, false);
         assertNotNull("No param build method result null ?", ognlCache);
-        assertEquals("Eviction limit for cache mismatches limit for factory ?", 6, ognlCache.getEvictionLimit() );
+        assertEquals("Eviction limit for cache mismatches limit for factory ?", 6, ognlCache.getEvictionLimit());
         // LRU cache
         defaultOgnlCacheFactory.setCacheMaxSize("30");
         defaultOgnlCacheFactory.setUseLRUCache("true");
         ognlCache = defaultOgnlCacheFactory.buildOgnlCache();
         assertNotNull("No param build method result null ?", ognlCache);
-        assertEquals("Eviction limit for cache mismatches limit for factory ?", 30, ognlCache.getEvictionLimit() );
+        assertEquals("Eviction limit for cache mismatches limit for factory ?", 30, ognlCache.getEvictionLimit());
         ognlCache = defaultOgnlCacheFactory.buildOgnlCache(15, 15, 0.75f, false);
         assertNotNull("No param build method result null ?", ognlCache);
-        assertEquals("Eviction limit for cache mismatches limit for factory ?", 15, ognlCache.getEvictionLimit() );
+        assertEquals("Eviction limit for cache mismatches limit for factory ?", 15, ognlCache.getEvictionLimit());
     }
 
     /**
diff --git a/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java b/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
index acf4bbc805..5a5bc6ae05 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
@@ -75,7 +75,7 @@ public void testClassExclusion() throws Exception {
 
         Set<Class<?>> excluded = new HashSet<>();
         excluded.add(FooBar.class);
-        sma.setExcludedClasses(excluded);
+        sma.useExcludedClasses(excluded);
 
         // when
         boolean accessible = sma.isAccessible(context, target, member, propertyName);
@@ -118,7 +118,7 @@ public void testInterfaceInheritanceExclusion() throws Exception {
 
         Set<Class<?>> excluded = new HashSet<>();
         excluded.add(BarInterface.class);
-        sma.setExcludedClasses(excluded);
+        sma.useExcludedClasses(excluded);
 
         // when
         boolean accessible = sma.isAccessible(context, target, member, propertyName);
@@ -135,7 +135,7 @@ public void testMiddleOfInheritanceExclusion1() throws Exception {
 
         Set<Class<?>> excluded = new HashSet<>();
         excluded.add(BarInterface.class);
-        sma.setExcludedClasses(excluded);
+        sma.useExcludedClasses(excluded);
 
         // when
         boolean accessible = sma.isAccessible(context, target, member, propertyName);
@@ -152,7 +152,7 @@ public void testMiddleOfInheritanceExclusion2() throws Exception {
 
         Set<Class<?>> excluded = new HashSet<>();
         excluded.add(BarInterface.class);
-        sma.setExcludedClasses(excluded);
+        sma.useExcludedClasses(excluded);
 
         // when
         boolean accessible = sma.isAccessible(context, target, member, propertyName);
@@ -169,7 +169,7 @@ public void testMiddleOfInheritanceExclusion3() throws Exception {
 
         Set<Class<?>> excluded = new HashSet<>();
         excluded.add(FooInterface.class);
-        sma.setExcludedClasses(excluded);
+        sma.useExcludedClasses(excluded);
 
         // when
         boolean accessible = sma.isAccessible(context, target, member, propertyName);
@@ -186,7 +186,7 @@ public void testMiddleOfInheritanceExclusion4() throws Exception {
 
         Set<Class<?>> excluded = new HashSet<>();
         excluded.add(FooBarInterface.class);
-        sma.setExcludedClasses(excluded);
+        sma.useExcludedClasses(excluded);
 
         // when
         boolean accessible = sma.isAccessible(context, target, member, propertyName);
@@ -200,7 +200,7 @@ public void testPackageExclusion() throws Exception {
         // given
         Set<Pattern> excluded = new HashSet<>();
         excluded.add(Pattern.compile("^" + FooBar.class.getPackage().getName().replaceAll("\\.", "\\\\.") + ".*"));
-        sma.setExcludedPackageNamePatterns(excluded);
+        sma.useExcludedPackageNamePatterns(excluded);
 
         String propertyName = "stringField";
         Member member = FooBar.class.getMethod(formGetterName(propertyName));
@@ -217,11 +217,11 @@ public void testPackageExclusionExemption() throws Exception {
         // given
         Set<Pattern> excluded = new HashSet<>();
         excluded.add(Pattern.compile("^" + FooBar.class.getPackage().getName().replaceAll("\\.", "\\\\.") + ".*"));
-        sma.setExcludedPackageNamePatterns(excluded);
+        sma.useExcludedPackageNamePatterns(excluded);
 
         Set<Class<?>> allowed = new HashSet<>();
         allowed.add(FooBar.class);
-        sma.setExcludedPackageExemptClasses(allowed);
+        sma.useExcludedPackageExemptClasses(allowed);
 
         String propertyName = "stringField";
         Member member = FooBar.class.getMethod(formGetterName(propertyName));
@@ -238,7 +238,7 @@ public void testPackageNameExclusion() throws Exception {
         // given
         Set<String> excluded = new HashSet<>();
         excluded.add(FooBar.class.getPackage().getName());
-        sma.setExcludedPackageNames(excluded);
+        sma.useExcludedPackageNames(excluded);
 
         String propertyName = "stringField";
         Member member = FooBar.class.getMethod(formGetterName(propertyName));
@@ -255,11 +255,11 @@ public void testPackageNameExclusionExemption() throws Exception {
         // given
         Set<String> excluded = new HashSet<>();
         excluded.add(FooBar.class.getPackage().getName());
-        sma.setExcludedPackageNames(excluded);
+        sma.useExcludedPackageNames(excluded);
 
         Set<Class<?>> allowed = new HashSet<>();
         allowed.add(FooBar.class);
-        sma.setExcludedPackageExemptClasses(allowed);
+        sma.useExcludedPackageExemptClasses(allowed);
 
         String propertyName = "stringField";
         Member member = FooBar.class.getMethod(formGetterName(propertyName));
@@ -276,12 +276,12 @@ public void testPackageNameExclusionExemption2() throws Exception {
         // given
         Set<String> excluded = new HashSet<>();
         excluded.add(FooBar.class.getPackage().getName());
-        sma.setExcludedPackageNames(excluded);
+        sma.useExcludedPackageNames(excluded);
 
         // Exemption must exist for both classes (target and member) if they both match a banned package
         Set<Class<?>> allowed = new HashSet<>();
         allowed.add(BarInterface.class);
-        sma.setExcludedPackageExemptClasses(allowed);
+        sma.useExcludedPackageExemptClasses(allowed);
 
         String propertyName = "barLogic";
         Member member = BarInterface.class.getMethod(propertyName);
@@ -298,13 +298,13 @@ public void testPackageNameExclusionExemption3() throws Exception {
         // given
         Set<String> excluded = new HashSet<>();
         excluded.add(FooBar.class.getPackage().getName());
-        sma.setExcludedPackageNames(excluded);
+        sma.useExcludedPackageNames(excluded);
 
         // Exemption must exist for both classes (target and member) if they both match a banned package
         Set<Class<?>> allowed = new HashSet<>();
         allowed.add(BarInterface.class);
         allowed.add(FooBar.class);
-        sma.setExcludedPackageExemptClasses(allowed);
+        sma.useExcludedPackageExemptClasses(allowed);
 
         String propertyName = "barLogic";
         Member member = BarInterface.class.getMethod(propertyName);
@@ -321,7 +321,7 @@ public void testDefaultPackageExclusion() throws Exception {
         // given
         Set<Pattern> excluded = new HashSet<>();
         excluded.add(Pattern.compile("^" + FooBar.class.getPackage().getName().replaceAll("\\.", "\\\\.") + ".*"));
-        sma.setExcludedPackageNamePatterns(excluded);
+        sma.useExcludedPackageNamePatterns(excluded);
 
         Class<?> clazz = Class.forName("PackagelessAction");
 
@@ -337,7 +337,7 @@ public void testDefaultPackageExclusion2() throws Exception {
         // given
         Set<Pattern> excluded = new HashSet<>();
         excluded.add(Pattern.compile("^$"));
-        sma.setExcludedPackageNamePatterns(excluded);
+        sma.useExcludedPackageNamePatterns(excluded);
 
         Class<?> clazz = Class.forName("PackagelessAction");
 
@@ -361,7 +361,7 @@ public void testAccessEnum() throws Exception {
     @Test
     public void testAccessStaticMethod() throws Exception {
         // given
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         Member method = StaticTester.class.getMethod("sayHello");
@@ -374,7 +374,7 @@ public void testAccessStaticMethod() throws Exception {
     @Test
     public void testAccessStaticField() throws Exception {
         // given
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         Member method = StaticTester.class.getField("MAX_VALUE");
@@ -388,7 +388,7 @@ public void testAccessStaticField() throws Exception {
     public void testBlockedStaticFieldWhenFlagIsTrue() throws Exception {
         // given
         assignNewSma(true);
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         Member method = StaticTester.class.getField("MAX_VALUE");
@@ -400,7 +400,7 @@ public void testBlockedStaticFieldWhenFlagIsTrue() throws Exception {
         // public static final test
         // given
         assignNewSma(true);
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         method = StaticTester.class.getField("MIN_VALUE");
@@ -412,7 +412,7 @@ public void testBlockedStaticFieldWhenFlagIsTrue() throws Exception {
         // package static test
         // given
         assignNewSma(true);
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         method = StaticTester.getFieldByName("PACKAGE_STRING");
@@ -424,7 +424,7 @@ public void testBlockedStaticFieldWhenFlagIsTrue() throws Exception {
         // package final static test
         // given
         assignNewSma(true);
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         method = StaticTester.getFieldByName("FINAL_PACKAGE_STRING");
@@ -436,7 +436,7 @@ public void testBlockedStaticFieldWhenFlagIsTrue() throws Exception {
         // protected static test
         // given
         assignNewSma(true);
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         method = StaticTester.getFieldByName("PROTECTED_STRING");
@@ -448,7 +448,7 @@ public void testBlockedStaticFieldWhenFlagIsTrue() throws Exception {
         // protected final static test
         // given
         assignNewSma(true);
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         method = StaticTester.getFieldByName("FINAL_PROTECTED_STRING");
@@ -460,7 +460,7 @@ public void testBlockedStaticFieldWhenFlagIsTrue() throws Exception {
         // private static test
         // given
         assignNewSma(true);
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         method = StaticTester.getFieldByName("PRIVATE_STRING");
@@ -472,7 +472,7 @@ public void testBlockedStaticFieldWhenFlagIsTrue() throws Exception {
         // private final static test
         // given
         assignNewSma(true);
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         method = StaticTester.getFieldByName("FINAL_PRIVATE_STRING");
@@ -486,7 +486,7 @@ public void testBlockedStaticFieldWhenFlagIsTrue() throws Exception {
     public void testBlockedStaticFieldWhenFlagIsFalse() throws Exception {
         // given
         assignNewSma(false);
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         Member method = StaticTester.class.getField("MAX_VALUE");
@@ -498,7 +498,7 @@ public void testBlockedStaticFieldWhenFlagIsFalse() throws Exception {
         // public static final test
         // given
         assignNewSma(false);
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         method = StaticTester.class.getField("MIN_VALUE");
@@ -510,7 +510,7 @@ public void testBlockedStaticFieldWhenFlagIsFalse() throws Exception {
         // package static test
         // given
         assignNewSma(false);
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         method = StaticTester.getFieldByName("PACKAGE_STRING");
@@ -522,7 +522,7 @@ public void testBlockedStaticFieldWhenFlagIsFalse() throws Exception {
         // package final static test
         // given
         assignNewSma(false);
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         method = StaticTester.getFieldByName("FINAL_PACKAGE_STRING");
@@ -534,7 +534,7 @@ public void testBlockedStaticFieldWhenFlagIsFalse() throws Exception {
         // protected static test
         // given
         assignNewSma(false);
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         method = StaticTester.getFieldByName("PROTECTED_STRING");
@@ -546,7 +546,7 @@ public void testBlockedStaticFieldWhenFlagIsFalse() throws Exception {
         // protected final static test
         // given
         assignNewSma(false);
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         method = StaticTester.getFieldByName("FINAL_PROTECTED_STRING");
@@ -558,7 +558,7 @@ public void testBlockedStaticFieldWhenFlagIsFalse() throws Exception {
         // private static test
         // given
         assignNewSma(false);
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         method = StaticTester.getFieldByName("PRIVATE_STRING");
@@ -570,7 +570,7 @@ public void testBlockedStaticFieldWhenFlagIsFalse() throws Exception {
         // private final static test
         // given
         assignNewSma(false);
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         method = StaticTester.getFieldByName("FINAL_PRIVATE_STRING");
@@ -583,7 +583,7 @@ public void testBlockedStaticFieldWhenFlagIsFalse() throws Exception {
     @Test
     public void testBlockedStaticFieldWhenClassIsExcluded() throws Exception {
         // given
-        sma.setExcludedClasses(new HashSet<>(Arrays.asList(Class.class, StaticTester.class)));
+        sma.useExcludedClasses(new HashSet<>(Arrays.asList(Class.class, StaticTester.class)));
 
         // when
         Member method = StaticTester.class.getField("MAX_VALUE");
@@ -596,7 +596,7 @@ public void testBlockedStaticFieldWhenClassIsExcluded() throws Exception {
     @Test
     public void testBlockStaticMethodAccess() throws Exception {
         // given
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         Member method = StaticTester.class.getMethod("sayHello");
@@ -609,7 +609,7 @@ public void testBlockStaticMethodAccess() throws Exception {
     @Test
     public void testBlockAccessIfClassIsExcluded() throws Exception {
         // given
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         Member method = Class.class.getMethod("getClassLoader");
@@ -622,7 +622,7 @@ public void testBlockAccessIfClassIsExcluded() throws Exception {
    @Test
     public void testBlockAccessIfClassIsExcluded_2() throws Exception {
         // given
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(ClassLoader.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(ClassLoader.class)));
 
         // when
         Member method = ClassLoader.class.getMethod("loadClass", String.class);
@@ -636,7 +636,7 @@ public void testBlockAccessIfClassIsExcluded_2() throws Exception {
     @Test
     public void testAllowAccessIfClassIsNotExcluded() throws Exception {
         // given
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(ClassLoader.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(ClassLoader.class)));
 
         // when
         Member method = Class.class.getMethod("getClassLoader");
@@ -649,7 +649,7 @@ public void testAllowAccessIfClassIsNotExcluded() throws Exception {
    @Test
     public void testIllegalArgumentExceptionExpectedForTargetMemberMismatch() throws Exception {
         // given
-        sma.setExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
+        sma.useExcludedClasses(new HashSet<>(Collections.singletonList(Class.class)));
 
         // when
         Member method = ClassLoader.class.getMethod("loadClass", String.class);
@@ -668,7 +668,7 @@ public void testIllegalArgumentExceptionExpectedForTargetMemberMismatch() throws
     @Test
     public void testAccessPrimitiveInt() throws Exception {
         // given
-        sma.setExcludedPackageNames(TextParseUtil.commaDelimitedStringToSet("java.lang.,ognl,javax"));
+        sma.useExcludedPackageNames(TextParseUtil.commaDelimitedStringToSet("java.lang.,ognl,javax"));
 
         String propertyName = "intField";
         Member member = FooBar.class.getMethod(formGetterName(propertyName));
@@ -683,7 +683,7 @@ public void testAccessPrimitiveInt() throws Exception {
     @Test
     public void testAccessPrimitiveDoubleWithNames() throws Exception {
         // given
-        sma.setExcludedPackageNames(TextParseUtil.commaDelimitedStringToSet("ognl.,javax."));
+        sma.useExcludedPackageNames(TextParseUtil.commaDelimitedStringToSet("ognl.,javax."));
 
 
         Set<Class<?>> excluded = new HashSet<>();
@@ -692,7 +692,7 @@ public void testAccessPrimitiveDoubleWithNames() throws Exception {
         excluded.add(System.class);
         excluded.add(Class.class);
         excluded.add(ClassLoader.class);
-        sma.setExcludedClasses(excluded);
+        sma.useExcludedClasses(excluded);
 
         String propertyName = "doubleValue";
         double myDouble = 1;
@@ -738,7 +738,7 @@ public void testAccessPrimitiveDoubleWithPackageRegExs() throws Exception {
         // given
         Set<Pattern> patterns = new HashSet<>();
         patterns.add(Pattern.compile("^java\\.lang\\..*"));
-        sma.setExcludedPackageNamePatterns(patterns);
+        sma.useExcludedPackageNamePatterns(patterns);
 
         String propertyName = "doubleValue";
         double myDouble = 1;
@@ -756,7 +756,7 @@ public void testAccessMemberAccessIsAccessible() throws Exception {
         // given
         Set<Class<?>> excluded = new HashSet<>();
         excluded.add(ognl.MemberAccess.class);
-        sma.setExcludedClasses(excluded);
+        sma.useExcludedClasses(excluded);
 
         String propertyName = "excludedClasses";
         String setter = "setExcludedClasses";
@@ -774,7 +774,7 @@ public void testAccessMemberAccessIsBlocked() throws Exception {
         // given
         Set<Class<?>> excluded = new HashSet<>();
         excluded.add(SecurityMemberAccess.class);
-        sma.setExcludedClasses(excluded);
+        sma.useExcludedClasses(excluded);
 
         String propertyName = "excludedClasses";
         String setter = "setExcludedClasses";
@@ -790,7 +790,7 @@ public void testAccessMemberAccessIsBlocked() throws Exception {
     @Test
     public void testPackageNameExclusionAsCommaDelimited() {
         // given
-        sma.setExcludedPackageNames(TextParseUtil.commaDelimitedStringToSet("java.lang."));
+        sma.useExcludedPackageNames(TextParseUtil.commaDelimitedStringToSet("java.lang."));
 
         // when
         boolean actual = sma.isPackageExcluded(String.class, String.class);
diff --git a/core/src/test/java/org/apache/struts2/util/SecurityMemberAccessInServletsTest.java b/core/src/test/java/org/apache/struts2/util/SecurityMemberAccessInServletsTest.java
index 0e89e2a3c9..6fcfd9f1ec 100644
--- a/core/src/test/java/org/apache/struts2/util/SecurityMemberAccessInServletsTest.java
+++ b/core/src/test/java/org/apache/struts2/util/SecurityMemberAccessInServletsTest.java
@@ -45,7 +45,7 @@ public void testJavaxServletPackageAccess() throws Exception {
 
         Set<Pattern> excluded = new HashSet<Pattern>();
         excluded.add(Pattern.compile("^(?!javax\\.servlet\\..+)(javax\\..+)"));
-        sma.setExcludedPackageNamePatterns(excluded);
+        sma.useExcludedPackageNamePatterns(excluded);
 
         String propertyName = "value";
         Member member = TagSupport.class.getMethod("doStartTag");
@@ -63,7 +63,7 @@ public void testJavaxServletPackageExclusion() throws Exception {
 
         Set<Pattern> excluded = new HashSet<>();
         excluded.add(Pattern.compile("^javax\\..+"));
-        sma.setExcludedPackageNamePatterns(excluded);
+        sma.useExcludedPackageNamePatterns(excluded);
 
         String propertyName = "value";
         Member member = TagSupport.class.getMethod("doStartTag");
diff --git a/plugins/spring/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessProxyTest.java b/plugins/spring/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessProxyTest.java
index d51cc771c0..61282f3d1c 100644
--- a/plugins/spring/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessProxyTest.java
+++ b/plugins/spring/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessProxyTest.java
@@ -46,7 +46,7 @@ public void testProxyAccessIsBlocked() throws Exception {
             "chaintoAOPedTestSubBeanAction", null, context);
 
         SecurityMemberAccess sma = new SecurityMemberAccess(true);
-        sma.setDisallowProxyMemberAccess(true);
+        sma.disallowProxyMemberAccess(true);
 
         Member member = proxy.getAction().getClass().getMethod("isExposeProxy");
 
diff --git a/plugins/spring/src/test/java/com/test/SecurityMemberAccessProxyTest.java b/plugins/spring/src/test/java/com/test/SecurityMemberAccessProxyTest.java
index 1d898fc260..ef53fee704 100644
--- a/plugins/spring/src/test/java/com/test/SecurityMemberAccessProxyTest.java
+++ b/plugins/spring/src/test/java/com/test/SecurityMemberAccessProxyTest.java
@@ -47,7 +47,7 @@ public void testProxyAccessIsBlocked() throws Exception {
             "chaintoAOPedTestSubBeanAction", null, context);
 
         SecurityMemberAccess sma = new SecurityMemberAccess(true);
-        sma.setDisallowProxyMemberAccess(true);
+        sma.disallowProxyMemberAccess(true);
 
         Member member = proxy.getAction().getClass().getMethod("isExposeProxy");