diff --git a/src/helma/framework/RequestBean.java b/src/helma/framework/RequestBean.java
index c2688a98..93a7cf44 100644
--- a/src/helma/framework/RequestBean.java
+++ b/src/helma/framework/RequestBean.java
@@ -203,22 +203,22 @@ public class RequestBean implements Serializable {
     }
 
     /**
-     * The action processor allows the onRequest() method to set the function object
+     * The action handler allows the onRequest() method to set the function object
      * to be invoked for processing the request, overriding the action resolved
      * from the request path.
-     * @return the action processor
+     * @return the action handler
      */
-    public Object getActionProcessor() {
-        return req.getActionProcessor();
+    public Object getActionHandler() {
+        return req.getActionHandler();
     }
 
     /**
-     * The action processor allows the onRequest() method to set the function object
+     * The action handler allows the onRequest() method to set the function object
      * to be invoked for processing the request, overriding the action resolved
      * from the request path.
-     * @param processor the action processor
+     * @param handler the action handler
      */
-    public void setActionProcessor(Object processor) {
-        req.setActionProcessor(processor);
+    public void setActionHandler(Object handler) {
+        req.setActionHandler(handler);
     }
 }
diff --git a/src/helma/framework/RequestTrans.java b/src/helma/framework/RequestTrans.java
index 34653e43..4b78ca2e 100644
--- a/src/helma/framework/RequestTrans.java
+++ b/src/helma/framework/RequestTrans.java
@@ -82,7 +82,7 @@ public class RequestTrans implements Serializable {
 
     // the name of the action being invoked
     private String action;
-    private Object actionProcessor = null;
+    private Object actionHandler = null;
     private String httpUsername;
     private String httpPassword;
 
@@ -458,23 +458,23 @@ public class RequestTrans implements Serializable {
     }
 
     /**
-     * Get the request's action processor. The action processor allows the
+     * Get the request's action handler. The action handler allows the
      * onRequest() method to set the function object to be invoked for processing
      * the request, overriding the action resolved from the request path.
-     * @return the action processor
+     * @return the action handler function
      */
-    public Object getActionProcessor() {
-        return actionProcessor;
+    public Object getActionHandler() {
+        return actionHandler;
     }
 
     /**
-     * Set the request's action processor. The action processor allows the
+     * Set the request's action handler. The action handler allows the
      * onRequest() method to set the function object to be invoked for processing
      * the request, overriding the action resolved from the request path.
-     * @param processor the action processor
+     * @param handler the action handler
      */
-    public void setActionProcessor(Object processor) {
-        this.actionProcessor = processor;
+    public void setActionHandler(Object handler) {
+        this.actionHandler = handler;
     }
 
     /**
diff --git a/src/helma/framework/core/RequestEvaluator.java b/src/helma/framework/core/RequestEvaluator.java
index 65871c7e..d7d66b42 100644
--- a/src/helma/framework/core/RequestEvaluator.java
+++ b/src/helma/framework/core/RequestEvaluator.java
@@ -376,8 +376,8 @@ public final class RequestEvaluator implements Runnable {
                                     // reset skin recursion detection counter
                                     skinDepth = 0;
 
-                                    Object actionProcessor = req.getActionProcessor() != null ?
-                                        req.getActionProcessor() : action;
+                                    Object actionProcessor = req.getActionHandler() != null ?
+                                        req.getActionHandler() : action;
 
                                     // do the actual action invocation
                                     if (req.isXmlRpc()) {