From 486808a0e327f607322e9040de54894316c9ec27 Mon Sep 17 00:00:00 2001
From: K-ballo <k@fusionfenix.com>
Date: Thu, 18 Dec 2014 12:13:13 -0300
Subject: [PATCH] Rename plain and component actions to just actions

---
 .../remote_object/server/remote_object.hpp    |    4 +-
 hpx/runtime/actions/action_support.hpp        |   34 +-
 hpx/runtime/actions/component_action.hpp      |   17 -
 .../actions/component_const_action.hpp        |   56 +-
 ...component_const_action_implementations.hpp |   60 +-
 .../actions/component_non_const_action.hpp    |   56 +-
 ...onent_non_const_action_implementations.hpp |   52 +-
 hpx/runtime/actions/plain_action.hpp          |   51 +-
 .../actions/plain_action_implementations.hpp  |   36 +-
 ...ponent_const_action_implementations_10.hpp |  500 ++-------
 ...ponent_const_action_implementations_15.hpp |  750 +++----------
 ...ponent_const_action_implementations_20.hpp | 1000 ++++-------------
 ...mponent_const_action_implementations_5.hpp |  250 +----
 ...nt_non_const_action_implementations_10.hpp |  500 ++-------
 ...nt_non_const_action_implementations_15.hpp |  750 +++----------
 ...nt_non_const_action_implementations_20.hpp | 1000 ++++-------------
 ...ent_non_const_action_implementations_5.hpp |  250 +----
 .../plain_action_implementations_10.hpp       |  340 +-----
 .../plain_action_implementations_15.hpp       |  510 ++-------
 .../plain_action_implementations_20.hpp       |  680 ++---------
 .../plain_action_implementations_5.hpp        |  170 +--
 .../components/server/console_error_sink.hpp  |    2 +-
 .../components/server/console_logging.hpp     |    4 +-
 .../components/server/copy_component.hpp      |    4 +-
 .../components/server/migrate_component.hpp   |    2 +-
 .../runtime_support_implementations_10.hpp    |   84 +-
 .../runtime_support_implementations_15.hpp    |  124 +-
 .../runtime_support_implementations_20.hpp    |  164 +--
 .../runtime_support_implementations_5.hpp     |   44 +-
 .../components/server/runtime_support.hpp     |    4 +-
 .../runtime_support_implementations.hpp       |    8 +-
 src/hpx_init.cpp                              |    4 +-
 src/runtime/agas/big_boot_barrier.cpp         |    8 +-
 .../plain_action_dataflow_move_semantics.cpp  |   28 +-
 .../actions/plain_action_move_semantics.cpp   |   36 +-
 tests/unit/lcos/dataflow.cpp                  |   14 +-
 tests/unit/lcos/future_wait.cpp               |    6 +-
 tests/unit/lcos/packaged_action.cpp           |    4 +-
 tests/unit/lcos/unwrapped.cpp                 |    6 +-
 39 files changed, 1888 insertions(+), 5724 deletions(-)

diff --git a/hpx/components/remote_object/server/remote_object.hpp b/hpx/components/remote_object/server/remote_object.hpp
index d8b227ea14fa..49fc348a6d9f 100644
--- a/hpx/components/remote_object/server/remote_object.hpp
+++ b/hpx/components/remote_object/server/remote_object.hpp
@@ -63,7 +63,7 @@ namespace hpx { namespace components { namespace server
     ///////////////////////////////////////////////////////////////////////////
     template <typename F>
     struct remote_object_apply_action1
-      : hpx::actions::component_action<
+      : hpx::actions::action<
             typename F::result_type (remote_object::*)(F const &)
           , &remote_object::apply1<F>
           , remote_object_apply_action1<F>
@@ -72,7 +72,7 @@ namespace hpx { namespace components { namespace server
 
     template <typename F, typename A>
     struct remote_object_apply_action2
-      : hpx::actions::component_action<
+      : hpx::actions::action<
             typename F::result_type (remote_object::*)(F const &, A const &)
           , &remote_object::apply2<F, A>
           , remote_object_apply_action2<F, A>
diff --git a/hpx/runtime/actions/action_support.hpp b/hpx/runtime/actions/action_support.hpp
index 1c99a6a28042..a9da47f7f05a 100644
--- a/hpx/runtime/actions/action_support.hpp
+++ b/hpx/runtime/actions/action_support.hpp
@@ -853,7 +853,7 @@ namespace hpx { namespace actions
     {
         typedef Component component_type;
         typedef Derived derived_type;
-        
+
         typedef R result_type;
         typedef typename traits::promise_local_result<R>::type local_result_type;
         typedef typename detail::remote_action_result<R>::type remote_result_type;
@@ -938,17 +938,43 @@ namespace hpx { namespace actions
         {};
     }
 
+    ///////////////////////////////////////////////////////////////////////////
+    template <typename TF, TF F, typename Derived>
+    class basic_action_impl;
+
+    ///////////////////////////////////////////////////////////////////////////
+    template <typename TF, TF F, typename Derived = detail::this_type>
+    struct action;
+
+    ///////////////////////////////////////////////////////////////////////////
+    template <typename TF, TF F, typename Derived = detail::this_type>
+    struct direct_action;
+
     ///////////////////////////////////////////////////////////////////////////
     // Base template allowing to generate a concrete action type from a function
     // pointer. It is instantiated only if the supplied pointer is not a
     // supported function pointer.
-    template <typename F, F funcptr, typename Derived = detail::this_type,
+    template <typename TF, TF F, typename Derived = detail::this_type,
         typename Direct = boost::mpl::false_>
     struct make_action;
 
-    template <typename F, F funcptr, typename Derived = detail::this_type>
+    template <typename TF, TF F, typename Derived>
+    struct make_action<TF, F, Derived, boost::mpl::false_>
+      : action<TF, F, Derived>
+    {
+        typedef action<TF, F, Derived> type;
+    };
+
+    template <typename TF, TF F, typename Derived>
+    struct make_action<TF, F, Derived, boost::mpl::true_>
+      : direct_action<TF, F, Derived>
+    {
+        typedef direct_action<TF, F, Derived> type;
+    };
+
+    template <typename TF, TF F, typename Derived = detail::this_type>
     struct make_direct_action
-      : make_action<F, funcptr, Derived, boost::mpl::true_>
+      : make_action<TF, F, Derived, boost::mpl::true_>
     {};
 
 // older compilers require BOOST_TYPEOF, newer compilers have decltype()
diff --git a/hpx/runtime/actions/component_action.hpp b/hpx/runtime/actions/component_action.hpp
index 0df6de1b2c16..74cc8b79d2af 100644
--- a/hpx/runtime/actions/component_action.hpp
+++ b/hpx/runtime/actions/component_action.hpp
@@ -26,23 +26,6 @@
 #include <cstdlib>
 #include <stdexcept>
 
-namespace hpx { namespace actions
-{
-    // declarations for main templates
-
-    ///////////////////////////////////////////////////////////////////////////
-    template <typename TF, TF F, typename Derived>
-    class component_base_action;
-
-    ///////////////////////////////////////////////////////////////////////////
-    template <typename TF, TF F, typename Derived = detail::this_type>
-    struct component_action;
-
-    ///////////////////////////////////////////////////////////////////////////
-    template <typename TF, TF F, typename Derived = detail::this_type>
-    struct component_direct_action;
-}}
-
 ///////////////////////////////////////////////////////////////////////////////
 // bring in nullary actions and all other arities
 #include <hpx/runtime/actions/component_const_action.hpp>
diff --git a/hpx/runtime/actions/component_const_action.hpp b/hpx/runtime/actions/component_const_action.hpp
index 04ae2e5ae969..6204f371ac7e 100644
--- a/hpx/runtime/actions/component_const_action.hpp
+++ b/hpx/runtime/actions/component_const_action.hpp
@@ -25,7 +25,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R,
         R (Component::*F)() const, typename Derived>
-    class component_base_action<R (Component::*)() const, F, Derived>
+    class basic_action_impl<R (Component::*)() const, F, Derived>
       : public basic_action<Component const, R(), Derived>
     {
     public:
@@ -87,7 +87,7 @@ namespace hpx { namespace actions
     public:
         /// \brief This static \a construct_thread_function allows to construct
         /// a proper thread function for a \a thread without having to
-        /// instantiate the \a component_base_action type. This is used by the \a
+        /// instantiate the \a basic_action_impl type. This is used by the \a
         /// applier in case no continuation has been supplied.
         template <typename Arguments>
         static threads::thread_function_type
@@ -103,7 +103,7 @@ namespace hpx { namespace actions
 
         /// \brief This static \a construct_thread_function allows to construct
         /// a proper thread function for a \a thread without having to
-        /// instantiate the \a component_base_action type. This is used by the \a
+        /// instantiate the \a basic_action_impl type. This is used by the \a
         /// applier in case a continuation has been supplied
         template <typename Arguments>
         static threads::thread_function_type
@@ -123,7 +123,7 @@ namespace hpx { namespace actions
             Arguments &&)
         {
             LTM_(debug)
-                << "component_base_action::execute_function: name("
+                << "basic_action_impl::execute_function: name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
                     get_lva<Component const>::call(lva)) << ")";
@@ -135,46 +135,34 @@ namespace hpx { namespace actions
     ///////////////////////////////////////////////////////////////////////////
     template <typename Component, typename R,
         R (Component::*F)() const, typename Derived>
-    struct component_action<R (Component::*)() const, F, Derived>
-      : component_base_action<
+    struct action<R (Component::*)() const, F, Derived>
+      : basic_action_impl<
             R (Component::*)() const, F,
             typename detail::action_type<
-                component_action<R (Component::*)() const, F, Derived>,
+                action<R (Component::*)() const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
 
         typedef boost::mpl::false_ direct_execution;
     };
 
-    ///////////////////////////////////////////////////////////////////////////
-    template <
-        typename Component, typename R,
-        R (Component::*F)() const, typename Derived>
-    struct make_action<R (Component::*)() const, F, Derived, boost::mpl::false_>
-      : component_action<R (Component::*)() const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)() const, F, Derived
-        > type;
-    };
-
     ///////////////////////////////////////////////////////////////////////////
     template <typename Component, typename R,
         R (Component::*F)() const, typename Derived>
-    struct component_direct_action<R (Component::*)() const, F, Derived>
-      : public component_base_action<
+    struct direct_action<R (Component::*)() const, F, Derived>
+      : public basic_action_impl<
             R (Component::*)() const, F,
             typename detail::action_type<
-                component_direct_action<R (Component::*)() const, F, Derived>,
+                direct_action<R (Component::*)() const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
 
         typedef boost::mpl::true_ direct_execution;
@@ -187,22 +175,10 @@ namespace hpx { namespace actions
         }
     };
 
-    ///////////////////////////////////////////////////////////////////////////
-    template <
-        typename Component, typename R,
-        R (Component::*F)() const, typename Derived>
-    struct make_action<R (Component::*)() const, F, Derived, boost::mpl::true_>
-      : component_direct_action<R (Component::*)() const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)() const, F, Derived
-        > type;
-    };
-
     ///////////////////////////////////////////////////////////////////////////
     //  zero parameter version, no result value
     template <typename Component, void (Component::*F)() const, typename Derived>
-    class component_base_action<void (Component::*)() const, F, Derived>
+    class basic_action_impl<void (Component::*)() const, F, Derived>
       : public basic_action<Component const, util::unused_type(), Derived>
     {
     public:
@@ -264,7 +240,7 @@ namespace hpx { namespace actions
     public:
         /// \brief This static \a construct_thread_function allows to construct
         /// a proper thread function for a \a thread without having to
-        /// instantiate the component_base_action type. This is used by the \a applier in
+        /// instantiate the basic_action_impl type. This is used by the \a applier in
         /// case no continuation has been supplied.
         template <typename Arguments>
         static threads::thread_function_type
@@ -280,7 +256,7 @@ namespace hpx { namespace actions
 
         /// \brief This static \a construct_thread_function allows to construct
         /// a proper thread function for a \a thread without having to
-        /// instantiate the component_base_action type. This is used by the \a applier in
+        /// instantiate the basic_action_impl type. This is used by the \a applier in
         /// case a continuation has been supplied
         template <typename Arguments>
         static threads::thread_function_type
@@ -300,7 +276,7 @@ namespace hpx { namespace actions
             Arguments &&)
         {
             LTM_(debug)
-                << "component_base_action::execute_function: name("
+                << "basic_action_impl::execute_function: name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
                     get_lva<Component const>::call(lva)) << ")";
diff --git a/hpx/runtime/actions/component_const_action_implementations.hpp b/hpx/runtime/actions/component_const_action_implementations.hpp
index 1f9d3dd9433e..33f09b7ff854 100644
--- a/hpx/runtime/actions/component_const_action_implementations.hpp
+++ b/hpx/runtime/actions/component_const_action_implementations.hpp
@@ -57,7 +57,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         BOOST_PP_ENUM_PARAMS(N, typename T),
         R (Component::*F)(BOOST_PP_ENUM_PARAMS(N, T)) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)) const, F, Derived>
       : public basic_action<
             Component const, R(BOOST_PP_REPEAT(N, HPX_REMOVE_QUALIFIERS, _)),
@@ -133,7 +133,7 @@ namespace hpx { namespace actions
 
         // This static construct_thread_function allows to construct
         // a proper thread function for a thread without having to
-        // instantiate the component_base_action type. This is used by the
+        // instantiate the basic_action_impl type. This is used by the
         // applier in case no continuation has been supplied.
         template <typename Arguments>
         static threads::thread_function_type
@@ -147,7 +147,7 @@ namespace hpx { namespace actions
 
         // This static construct_thread_function allows to construct
         // a proper thread function for a thread without having to
-        // instantiate the component_base_action type. This is used by the
+        // instantiate the basic_action_impl type. This is used by the
         // applier in case a continuation has been supplied
         template <typename Arguments>
         static threads::thread_function_type
@@ -167,7 +167,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << N
+                << "basic_action_impl" << N
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -185,37 +185,23 @@ namespace hpx { namespace actions
         BOOST_PP_ENUM_PARAMS(N, typename T),
         R (Component::*F)(BOOST_PP_ENUM_PARAMS(N, T)) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
 
         typedef boost::mpl::false_ direct_execution;
     };
 
-    ///////////////////////////////////////////////////////////////////////////
-    template <
-        typename Component, typename R, BOOST_PP_ENUM_PARAMS(N, typename T),
-        R (Component::*F)(BOOST_PP_ENUM_PARAMS(N, T)) const, typename Derived>
-    struct make_action<R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)) const, F, Derived
-        > type;
-    };
-
     ///////////////////////////////////////////////////////////////////////////
     //  N parameter version, direct execution with result
     template <
@@ -223,18 +209,18 @@ namespace hpx { namespace actions
         BOOST_PP_ENUM_PARAMS(N, typename T),
         R (Component::*F)(BOOST_PP_ENUM_PARAMS(N, T)) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
 
         typedef boost::mpl::true_ direct_execution;
@@ -247,26 +233,12 @@ namespace hpx { namespace actions
         }
     };
 
-    ///////////////////////////////////////////////////////////////////////////
-    template <
-        typename Component, typename R, BOOST_PP_ENUM_PARAMS(N, typename T),
-        R (Component::*F)(BOOST_PP_ENUM_PARAMS(N, T)) const, typename Derived>
-    struct make_action<R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)) const, F, Derived
-        > type;
-    };
-
     ///////////////////////////////////////////////////////////////////////////
     //  N parameter version, no result type
     template <
         typename Component, BOOST_PP_ENUM_PARAMS(N, typename T),
         void (Component::*F)(BOOST_PP_ENUM_PARAMS(N, T)) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(BOOST_PP_REPEAT(N, HPX_REMOVE_QUALIFIERS, _)),
@@ -340,7 +312,7 @@ namespace hpx { namespace actions
     public:
         // This static construct_thread_function allows to construct
         // a proper thread function for a thread without having to
-        // instantiate the component_base_action type. This is used by the applier in
+        // instantiate the basic_action_impl type. This is used by the applier in
         // case no continuation has been supplied.
         template <typename Arguments>
         static threads::thread_function_type
@@ -356,7 +328,7 @@ namespace hpx { namespace actions
 
         // This static construct_thread_function allows to construct
         // a proper thread function for a thread without having to
-        // instantiate the component_base_action type. This is used by the applier in
+        // instantiate the basic_action_impl type. This is used by the applier in
         // case a continuation has been supplied
         template <typename Arguments>
         static threads::thread_function_type
@@ -376,7 +348,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << N
+                << "basic_action_impl" << N
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
diff --git a/hpx/runtime/actions/component_non_const_action.hpp b/hpx/runtime/actions/component_non_const_action.hpp
index 6654490b2c2e..acf0558f4363 100644
--- a/hpx/runtime/actions/component_non_const_action.hpp
+++ b/hpx/runtime/actions/component_non_const_action.hpp
@@ -25,7 +25,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R,
         R (Component::*F)(), typename Derived>
-    class component_base_action<R (Component::*)(), F, Derived>
+    class basic_action_impl<R (Component::*)(), F, Derived>
       : public basic_action<Component, R(), Derived>
     {
     public:
@@ -87,7 +87,7 @@ namespace hpx { namespace actions
     public:
         /// \brief This static \a construct_thread_function allows to construct
         /// a proper thread function for a \a thread without having to
-        /// instantiate the \a component_base_action type. This is used by the \a
+        /// instantiate the \a basic_action_impl type. This is used by the \a
         /// applier in case no continuation has been supplied.
         template <typename Arguments>
         static threads::thread_function_type
@@ -103,7 +103,7 @@ namespace hpx { namespace actions
 
         /// \brief This static \a construct_thread_function allows to construct
         /// a proper thread function for a \a thread without having to
-        /// instantiate the \a component_base_action type. This is used by the \a
+        /// instantiate the \a basic_action_impl type. This is used by the \a
         /// applier in case a continuation has been supplied
         template <typename Arguments>
         static threads::thread_function_type
@@ -123,7 +123,7 @@ namespace hpx { namespace actions
             Arguments &&)
         {
             LTM_(debug)
-                << "component_base_action::execute_function: name("
+                << "basic_action_impl::execute_function: name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
                     get_lva<Component>::call(lva)) << ")";
@@ -136,15 +136,15 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R,
         R (Component::*F)(), typename Derived>
-    struct component_action<R (Component::*)(), F, Derived>
-      : component_base_action<
+    struct action<R (Component::*)(), F, Derived>
+      : basic_action_impl<
             R (Component::*)(), F,
             typename detail::action_type<
-                component_action<R (Component::*)(), F, Derived>, Derived
+                action<R (Component::*)(), F, Derived>, Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
 
         typedef boost::mpl::false_ direct_execution;
@@ -154,27 +154,15 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R,
         R (Component::*F)(), typename Derived>
-    struct make_action<R (Component::*)(), F, Derived, boost::mpl::false_>
-      : component_action<R (Component::*)(), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(), F, Derived
-        > type;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-    template <
-        typename Component, typename R,
-        R (Component::*F)(), typename Derived>
-    struct component_direct_action<R (Component::*)(), F, Derived>
-      : public component_base_action<
+    struct direct_action<R (Component::*)(), F, Derived>
+      : public basic_action_impl<
             R (Component::*)(), F,
             typename detail::action_type<
-                component_direct_action<R (Component::*)(), F, Derived>, Derived
+                direct_action<R (Component::*)(), F, Derived>, Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
 
         typedef boost::mpl::true_ direct_execution;
@@ -187,22 +175,10 @@ namespace hpx { namespace actions
         }
     };
 
-    ///////////////////////////////////////////////////////////////////////////
-    template <
-        typename Component, typename R,
-        R (Component::*F)(), typename Derived>
-    struct make_action<R (Component::*)(), F, Derived, boost::mpl::true_>
-      : component_direct_action<R (Component::*)(), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(), F, Derived
-        > type;
-    };
-
     ///////////////////////////////////////////////////////////////////////////
     //  zero parameter version, no result value
     template <typename Component, void (Component::*F)(), typename Derived>
-    class component_base_action<void (Component::*)(), F, Derived>
+    class basic_action_impl<void (Component::*)(), F, Derived>
       : public basic_action<Component, util::unused_type(), Derived>
     {
     public:
@@ -264,7 +240,7 @@ namespace hpx { namespace actions
     public:
         /// \brief This static \a construct_thread_function allows to construct
         /// a proper thread function for a \a thread without having to
-        /// instantiate the component_base_action type. This is used by the \a applier in
+        /// instantiate the basic_action_impl type. This is used by the \a applier in
         /// case no continuation has been supplied.
         template <typename Arguments>
         static threads::thread_function_type
@@ -280,7 +256,7 @@ namespace hpx { namespace actions
 
         /// \brief This static \a construct_thread_function allows to construct
         /// a proper thread function for a \a thread without having to
-        /// instantiate the component_base_action type. This is used by the \a applier in
+        /// instantiate the basic_action_impl type. This is used by the \a applier in
         /// case a continuation has been supplied
         template <typename Arguments>
         static threads::thread_function_type
@@ -300,7 +276,7 @@ namespace hpx { namespace actions
             Arguments &&)
         {
             LTM_(debug)
-                << "component_base_action::execute_function: name("
+                << "basic_action_impl::execute_function: name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
                     get_lva<Component>::call(lva)) << ")";
diff --git a/hpx/runtime/actions/component_non_const_action_implementations.hpp b/hpx/runtime/actions/component_non_const_action_implementations.hpp
index 8d0d89f89154..eca69a64fdcc 100644
--- a/hpx/runtime/actions/component_non_const_action_implementations.hpp
+++ b/hpx/runtime/actions/component_non_const_action_implementations.hpp
@@ -55,7 +55,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, BOOST_PP_ENUM_PARAMS(N, typename T),
         R (Component::*F)(BOOST_PP_ENUM_PARAMS(N, T)), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived>
       : public basic_action<
             Component, R(BOOST_PP_REPEAT(N, HPX_REMOVE_QUALIFIERS, _)),
@@ -165,7 +165,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << N
+                << "basic_action_impl" << N
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -181,37 +181,23 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, BOOST_PP_ENUM_PARAMS(N, typename T),
         R (Component::*F)(BOOST_PP_ENUM_PARAMS(N, T)), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
 
         typedef boost::mpl::false_ direct_execution;
     };
 
-    ///////////////////////////////////////////////////////////////////////////
-    template <
-        typename Component, typename R, BOOST_PP_ENUM_PARAMS(N, typename T),
-        R (Component::*F)(BOOST_PP_ENUM_PARAMS(N, T)), typename Derived>
-    struct make_action<R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived
-        > type;
-    };
-
     ///////////////////////////////////////////////////////////////////////////
     //  N parameter version, direct execution with result
     template <
@@ -219,18 +205,18 @@ namespace hpx { namespace actions
         BOOST_PP_ENUM_PARAMS(N, typename T),
         R (Component::*F)(BOOST_PP_ENUM_PARAMS(N, T)),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
 
         typedef boost::mpl::true_ direct_execution;
@@ -243,26 +229,12 @@ namespace hpx { namespace actions
         }
     };
 
-    ///////////////////////////////////////////////////////////////////////////
-    template <
-        typename Component, typename R, BOOST_PP_ENUM_PARAMS(N, typename T),
-        R (Component::*F)(BOOST_PP_ENUM_PARAMS(N, T)), typename Derived>
-    struct make_action<R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived
-        > type;
-    };
-
     ///////////////////////////////////////////////////////////////////////////
     //  N parameter version, no result type
     template <
         typename Component, BOOST_PP_ENUM_PARAMS(N, typename T),
         void (Component::*F)(BOOST_PP_ENUM_PARAMS(N, T)), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived>
       : public basic_action<
             Component, util::unused_type(BOOST_PP_REPEAT(N, HPX_REMOVE_QUALIFIERS, _)),
@@ -372,7 +344,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << N
+                << "basic_action_impl" << N
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
diff --git a/hpx/runtime/actions/plain_action.hpp b/hpx/runtime/actions/plain_action.hpp
index 24c5e7a1354c..157a3f397d3b 100644
--- a/hpx/runtime/actions/plain_action.hpp
+++ b/hpx/runtime/actions/plain_action.hpp
@@ -40,12 +40,9 @@ namespace hpx { namespace actions
     //  different number of arguments
     ///////////////////////////////////////////////////////////////////////////
 
-    template <typename TF, TF F, typename Derived>
-    class plain_base_action;
-
     // zero argument version
     template <typename R, R (*F)(), typename Derived>
-    class plain_base_action<R (*)(), F, Derived>
+    class basic_action_impl<R (*)(), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(), Derived>
@@ -109,7 +106,7 @@ namespace hpx { namespace actions
 
         /// \brief This static \a construct_thread_function allows to construct
         /// a proper thread function for a \a thread without having to
-        /// instantiate the \a plain_base_action type. This is used by
+        /// instantiate the \a basic_action_impl type. This is used by
         /// the \a applier in case no continuation has been supplied.
         template <typename Arguments>
         static threads::thread_function_type
@@ -145,7 +142,7 @@ namespace hpx { namespace actions
             Arguments && /*args*/)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function: name("
+                << "basic_action_impl::execute_function: name("
                 << detail::get_action_name<Derived>()
                 << ")";
             return F();
@@ -153,35 +150,28 @@ namespace hpx { namespace actions
     };
 
     ///////////////////////////////////////////////////////////////////////////
-    template <typename TF, TF F, typename Derived = detail::this_type>
-    struct plain_action
-      : plain_base_action<TF, F,
-            typename detail::action_type<plain_action<TF, F>, Derived>::type
+    template <typename TF, TF F, typename Derived>
+    struct action
+      : basic_action_impl<TF, F,
+            typename detail::action_type<action<TF, F>, Derived>::type
         >
     {
         typedef typename detail::action_type<
-            plain_action, Derived
+            action, Derived
         >::type derived_type;
 
         typedef boost::mpl::false_ direct_execution;
     };
 
-    template <typename R, R (*F)(), typename Derived>
-    struct make_action<R (*)(), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(), F, Derived>
-    {
-        typedef plain_action<R (*)(), F, Derived> type;
-    };
-
     ///////////////////////////////////////////////////////////////////////////
-    template <typename TF, TF F, typename Derived = detail::this_type>
-    struct plain_direct_action
-      : plain_base_action<TF, F,
-            typename detail::action_type<plain_direct_action<TF, F>, Derived>::type
+    template <typename TF, TF F, typename Derived>
+    struct direct_action
+      : basic_action_impl<TF, F,
+            typename detail::action_type<direct_action<TF, F>, Derived>::type
         >
     {
         typedef typename detail::action_type<
-            plain_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
 
         typedef boost::mpl::true_ direct_execution;
@@ -194,17 +184,10 @@ namespace hpx { namespace actions
         }
     };
 
-    template <typename R, R (*F)(), typename Derived>
-    struct make_action<R (*)(), F, Derived, boost::mpl::true_>
-      : plain_direct_action<R (*)(), F, Derived>
-    {
-        typedef plain_direct_action<R (*)(), F, Derived> type;
-    };
-
     ///////////////////////////////////////////////////////////////////////////
     //  zero parameter version, no result value
     template <void (*F)(), typename Derived>
-    class plain_base_action<void (*)(), F, Derived>
+    class basic_action_impl<void (*)(), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(), Derived>
@@ -303,7 +286,7 @@ namespace hpx { namespace actions
             Arguments && /*args*/)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function: name("
+                << "basic_action_impl::execute_function: name("
                 << detail::get_action_name<Derived>()
                 << ")";
             F();
@@ -322,14 +305,14 @@ namespace hpx { namespace traits
     template <typename R, R(*F)(), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<R (*)(), F, Derived> > , Enable>
+                hpx::actions::action<R (*)(), F, Derived> > , Enable>
       : boost::mpl::false_
     {};
 
     template <typename R, R(*F)(), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<R (*)(), F, Derived> >, Enable>
+                hpx::actions::direct_action<R (*)(), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
     /// \endcond
diff --git a/hpx/runtime/actions/plain_action_implementations.hpp b/hpx/runtime/actions/plain_action_implementations.hpp
index 568fe1ae50f9..eccc68734f57 100644
--- a/hpx/runtime/actions/plain_action_implementations.hpp
+++ b/hpx/runtime/actions/plain_action_implementations.hpp
@@ -62,7 +62,7 @@ namespace hpx { namespace actions
     template <
         typename R, BOOST_PP_ENUM_PARAMS(N, typename T),
         R (*F)(BOOST_PP_ENUM_PARAMS(N, T)), typename Derived>
-    class plain_base_action<R (*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived>
+    class basic_action_impl<R (*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(BOOST_PP_REPEAT(N, HPX_REMOVE_QUALIFIERS, _)),
@@ -165,43 +165,19 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
 
             return F(BOOST_PP_REPEAT(N, HPX_ACTION_DIRECT_ARGUMENT, args));
         }
     };
 
-    ///////////////////////////////////////////////////////////////////////////
-    //  N parameter version, direct execution with R
-    template <typename R, BOOST_PP_ENUM_PARAMS(N, typename T),
-        R (*F)(BOOST_PP_ENUM_PARAMS(N, T)), typename Derived>
-    struct make_action<R (*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived
-        > type;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-    //  N parameter version, direct execution with result
-    template <typename Result, BOOST_PP_ENUM_PARAMS(N, typename T),
-        Result (*F)(BOOST_PP_ENUM_PARAMS(N, T)), typename Derived>
-    struct make_action<Result (*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived
-        > type;
-    };
-
     ///////////////////////////////////////////////////////////////////////////
     //  N parameter version, no result type
     template <
         BOOST_PP_ENUM_PARAMS(N, typename T),
         void (*F)(BOOST_PP_ENUM_PARAMS(N, T)), typename Derived>
-    class plain_base_action<void (*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived>
+    class basic_action_impl<void (*)(BOOST_PP_ENUM_PARAMS(N, T)), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(BOOST_PP_REPEAT(N, HPX_REMOVE_QUALIFIERS, _)),
@@ -304,7 +280,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
 
             F(BOOST_PP_REPEAT(N, HPX_ACTION_DIRECT_ARGUMENT, args));
@@ -321,7 +297,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(BOOST_PP_ENUM_PARAMS(N, Arg)), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -330,7 +306,7 @@ namespace hpx { namespace traits
         R (*F)(BOOST_PP_ENUM_PARAMS(N, Arg)), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(BOOST_PP_ENUM_PARAMS(N, Arg)), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
diff --git a/hpx/runtime/actions/preprocessed/component_const_action_implementations_10.hpp b/hpx/runtime/actions/preprocessed/component_const_action_implementations_10.hpp
index 3ec69fd21cc9..7749daca2a18 100644
--- a/hpx/runtime/actions/preprocessed/component_const_action_implementations_10.hpp
+++ b/hpx/runtime/actions/preprocessed/component_const_action_implementations_10.hpp
@@ -16,7 +16,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0,
         R (Component::*F)(T0) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type),
@@ -115,7 +115,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 1
+                << "basic_action_impl" << 1
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -131,53 +131,40 @@ namespace hpx { namespace actions
         typename T0,
         R (Component::*F)(T0) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0,
-        R (Component::*F)(T0) const, typename Derived>
-    struct make_action<R (Component::*)(T0) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0,
         R (Component::*F)(T0) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -188,24 +175,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0,
-        R (Component::*F)(T0) const, typename Derived>
-    struct make_action<R (Component::*)(T0) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0,
         void (Component::*F)(T0) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type),
@@ -305,7 +279,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 1
+                << "basic_action_impl" << 1
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -324,7 +298,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1,
         R (Component::*F)(T0 , T1) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -423,7 +397,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 2
+                << "basic_action_impl" << 2
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -439,53 +413,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1,
         R (Component::*F)(T0 , T1) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1,
-        R (Component::*F)(T0 , T1) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1,
         R (Component::*F)(T0 , T1) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -496,24 +457,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1,
-        R (Component::*F)(T0 , T1) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1,
         void (Component::*F)(T0 , T1) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -613,7 +561,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 2
+                << "basic_action_impl" << 2
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -632,7 +580,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -731,7 +679,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 3
+                << "basic_action_impl" << 3
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -747,53 +695,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2,
-        R (Component::*F)(T0 , T1 , T2) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -804,24 +739,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2,
-        R (Component::*F)(T0 , T1 , T2) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2,
         void (Component::*F)(T0 , T1 , T2) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -921,7 +843,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 3
+                << "basic_action_impl" << 3
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -940,7 +862,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -1039,7 +961,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 4
+                << "basic_action_impl" << 4
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1055,53 +977,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (Component::*F)(T0 , T1 , T2 , T3) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1112,24 +1021,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (Component::*F)(T0 , T1 , T2 , T3) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3,
         void (Component::*F)(T0 , T1 , T2 , T3) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -1229,7 +1125,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 4
+                << "basic_action_impl" << 4
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1248,7 +1144,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1347,7 +1243,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 5
+                << "basic_action_impl" << 5
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1363,53 +1259,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1420,24 +1303,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1537,7 +1407,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 5
+                << "basic_action_impl" << 5
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1556,7 +1426,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1655,7 +1525,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 6
+                << "basic_action_impl" << 6
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1671,53 +1541,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1728,24 +1585,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1845,7 +1689,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 6
+                << "basic_action_impl" << 6
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1864,7 +1708,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -1963,7 +1807,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 7
+                << "basic_action_impl" << 7
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1979,53 +1823,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2036,24 +1867,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -2153,7 +1971,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 7
+                << "basic_action_impl" << 7
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2172,7 +1990,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -2271,7 +2089,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 8
+                << "basic_action_impl" << 8
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2287,53 +2105,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2344,24 +2149,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -2461,7 +2253,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 8
+                << "basic_action_impl" << 8
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2480,7 +2272,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2579,7 +2371,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 9
+                << "basic_action_impl" << 9
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2595,53 +2387,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2652,24 +2431,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2769,7 +2535,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 9
+                << "basic_action_impl" << 9
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2788,7 +2554,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -2887,7 +2653,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 10
+                << "basic_action_impl" << 10
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2903,53 +2669,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2960,24 +2713,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -3077,7 +2817,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 10
+                << "basic_action_impl" << 10
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
diff --git a/hpx/runtime/actions/preprocessed/component_const_action_implementations_15.hpp b/hpx/runtime/actions/preprocessed/component_const_action_implementations_15.hpp
index f6bfac6fe50b..f0aada616527 100644
--- a/hpx/runtime/actions/preprocessed/component_const_action_implementations_15.hpp
+++ b/hpx/runtime/actions/preprocessed/component_const_action_implementations_15.hpp
@@ -16,7 +16,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0,
         R (Component::*F)(T0) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type),
@@ -115,7 +115,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 1
+                << "basic_action_impl" << 1
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -131,53 +131,40 @@ namespace hpx { namespace actions
         typename T0,
         R (Component::*F)(T0) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0,
-        R (Component::*F)(T0) const, typename Derived>
-    struct make_action<R (Component::*)(T0) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0,
         R (Component::*F)(T0) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -188,24 +175,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0,
-        R (Component::*F)(T0) const, typename Derived>
-    struct make_action<R (Component::*)(T0) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0,
         void (Component::*F)(T0) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type),
@@ -305,7 +279,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 1
+                << "basic_action_impl" << 1
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -324,7 +298,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1,
         R (Component::*F)(T0 , T1) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -423,7 +397,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 2
+                << "basic_action_impl" << 2
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -439,53 +413,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1,
         R (Component::*F)(T0 , T1) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1,
-        R (Component::*F)(T0 , T1) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1,
         R (Component::*F)(T0 , T1) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -496,24 +457,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1,
-        R (Component::*F)(T0 , T1) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1,
         void (Component::*F)(T0 , T1) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -613,7 +561,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 2
+                << "basic_action_impl" << 2
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -632,7 +580,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -731,7 +679,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 3
+                << "basic_action_impl" << 3
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -747,53 +695,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2,
-        R (Component::*F)(T0 , T1 , T2) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -804,24 +739,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2,
-        R (Component::*F)(T0 , T1 , T2) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2,
         void (Component::*F)(T0 , T1 , T2) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -921,7 +843,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 3
+                << "basic_action_impl" << 3
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -940,7 +862,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -1039,7 +961,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 4
+                << "basic_action_impl" << 4
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1055,53 +977,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (Component::*F)(T0 , T1 , T2 , T3) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1112,24 +1021,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (Component::*F)(T0 , T1 , T2 , T3) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3,
         void (Component::*F)(T0 , T1 , T2 , T3) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -1229,7 +1125,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 4
+                << "basic_action_impl" << 4
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1248,7 +1144,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1347,7 +1243,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 5
+                << "basic_action_impl" << 5
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1363,53 +1259,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1420,24 +1303,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1537,7 +1407,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 5
+                << "basic_action_impl" << 5
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1556,7 +1426,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1655,7 +1525,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 6
+                << "basic_action_impl" << 6
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1671,53 +1541,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1728,24 +1585,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1845,7 +1689,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 6
+                << "basic_action_impl" << 6
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1864,7 +1708,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -1963,7 +1807,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 7
+                << "basic_action_impl" << 7
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1979,53 +1823,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2036,24 +1867,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -2153,7 +1971,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 7
+                << "basic_action_impl" << 7
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2172,7 +1990,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -2271,7 +2089,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 8
+                << "basic_action_impl" << 8
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2287,53 +2105,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2344,24 +2149,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -2461,7 +2253,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 8
+                << "basic_action_impl" << 8
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2480,7 +2272,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2579,7 +2371,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 9
+                << "basic_action_impl" << 9
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2595,53 +2387,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2652,24 +2431,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2769,7 +2535,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 9
+                << "basic_action_impl" << 9
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2788,7 +2554,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -2887,7 +2653,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 10
+                << "basic_action_impl" << 10
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2903,53 +2669,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2960,24 +2713,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -3077,7 +2817,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 10
+                << "basic_action_impl" << 10
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3096,7 +2836,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type),
@@ -3195,7 +2935,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 11
+                << "basic_action_impl" << 11
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3211,53 +2951,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -3268,24 +2995,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type),
@@ -3385,7 +3099,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 11
+                << "basic_action_impl" << 11
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3404,7 +3118,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type),
@@ -3503,7 +3217,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 12
+                << "basic_action_impl" << 12
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3519,53 +3233,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -3576,24 +3277,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type),
@@ -3693,7 +3381,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 12
+                << "basic_action_impl" << 12
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3712,7 +3400,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type),
@@ -3811,7 +3499,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 13
+                << "basic_action_impl" << 13
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3827,53 +3515,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -3884,24 +3559,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type),
@@ -4001,7 +3663,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 13
+                << "basic_action_impl" << 13
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4020,7 +3682,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type),
@@ -4119,7 +3781,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 14
+                << "basic_action_impl" << 14
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4135,53 +3797,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -4192,24 +3841,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type),
@@ -4309,7 +3945,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 14
+                << "basic_action_impl" << 14
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4328,7 +3964,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type),
@@ -4427,7 +4063,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 15
+                << "basic_action_impl" << 15
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4443,53 +4079,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -4500,24 +4123,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type),
@@ -4617,7 +4227,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 15
+                << "basic_action_impl" << 15
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
diff --git a/hpx/runtime/actions/preprocessed/component_const_action_implementations_20.hpp b/hpx/runtime/actions/preprocessed/component_const_action_implementations_20.hpp
index 8fb12d5a5d5f..edeca26c3f2e 100644
--- a/hpx/runtime/actions/preprocessed/component_const_action_implementations_20.hpp
+++ b/hpx/runtime/actions/preprocessed/component_const_action_implementations_20.hpp
@@ -16,7 +16,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0,
         R (Component::*F)(T0) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type),
@@ -115,7 +115,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 1
+                << "basic_action_impl" << 1
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -131,53 +131,40 @@ namespace hpx { namespace actions
         typename T0,
         R (Component::*F)(T0) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0,
-        R (Component::*F)(T0) const, typename Derived>
-    struct make_action<R (Component::*)(T0) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0,
         R (Component::*F)(T0) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -188,24 +175,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0,
-        R (Component::*F)(T0) const, typename Derived>
-    struct make_action<R (Component::*)(T0) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0,
         void (Component::*F)(T0) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type),
@@ -305,7 +279,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 1
+                << "basic_action_impl" << 1
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -324,7 +298,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1,
         R (Component::*F)(T0 , T1) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -423,7 +397,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 2
+                << "basic_action_impl" << 2
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -439,53 +413,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1,
         R (Component::*F)(T0 , T1) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1,
-        R (Component::*F)(T0 , T1) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1,
         R (Component::*F)(T0 , T1) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -496,24 +457,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1,
-        R (Component::*F)(T0 , T1) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1,
         void (Component::*F)(T0 , T1) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -613,7 +561,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 2
+                << "basic_action_impl" << 2
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -632,7 +580,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -731,7 +679,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 3
+                << "basic_action_impl" << 3
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -747,53 +695,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2,
-        R (Component::*F)(T0 , T1 , T2) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -804,24 +739,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2,
-        R (Component::*F)(T0 , T1 , T2) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2,
         void (Component::*F)(T0 , T1 , T2) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -921,7 +843,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 3
+                << "basic_action_impl" << 3
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -940,7 +862,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -1039,7 +961,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 4
+                << "basic_action_impl" << 4
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1055,53 +977,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (Component::*F)(T0 , T1 , T2 , T3) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1112,24 +1021,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (Component::*F)(T0 , T1 , T2 , T3) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3,
         void (Component::*F)(T0 , T1 , T2 , T3) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -1229,7 +1125,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 4
+                << "basic_action_impl" << 4
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1248,7 +1144,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1347,7 +1243,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 5
+                << "basic_action_impl" << 5
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1363,53 +1259,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1420,24 +1303,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1537,7 +1407,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 5
+                << "basic_action_impl" << 5
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1556,7 +1426,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1655,7 +1525,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 6
+                << "basic_action_impl" << 6
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1671,53 +1541,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1728,24 +1585,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1845,7 +1689,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 6
+                << "basic_action_impl" << 6
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1864,7 +1708,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -1963,7 +1807,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 7
+                << "basic_action_impl" << 7
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1979,53 +1823,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2036,24 +1867,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -2153,7 +1971,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 7
+                << "basic_action_impl" << 7
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2172,7 +1990,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -2271,7 +2089,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 8
+                << "basic_action_impl" << 8
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2287,53 +2105,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2344,24 +2149,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -2461,7 +2253,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 8
+                << "basic_action_impl" << 8
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2480,7 +2272,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2579,7 +2371,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 9
+                << "basic_action_impl" << 9
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2595,53 +2387,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2652,24 +2431,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2769,7 +2535,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 9
+                << "basic_action_impl" << 9
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2788,7 +2554,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -2887,7 +2653,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 10
+                << "basic_action_impl" << 10
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2903,53 +2669,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2960,24 +2713,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -3077,7 +2817,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 10
+                << "basic_action_impl" << 10
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3096,7 +2836,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type),
@@ -3195,7 +2935,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 11
+                << "basic_action_impl" << 11
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3211,53 +2951,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -3268,24 +2995,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type),
@@ -3385,7 +3099,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 11
+                << "basic_action_impl" << 11
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3404,7 +3118,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type),
@@ -3503,7 +3217,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 12
+                << "basic_action_impl" << 12
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3519,53 +3233,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -3576,24 +3277,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type),
@@ -3693,7 +3381,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 12
+                << "basic_action_impl" << 12
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3712,7 +3400,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type),
@@ -3811,7 +3499,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 13
+                << "basic_action_impl" << 13
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3827,53 +3515,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -3884,24 +3559,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type),
@@ -4001,7 +3663,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 13
+                << "basic_action_impl" << 13
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4020,7 +3682,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type),
@@ -4119,7 +3781,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 14
+                << "basic_action_impl" << 14
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4135,53 +3797,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -4192,24 +3841,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type),
@@ -4309,7 +3945,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 14
+                << "basic_action_impl" << 14
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4328,7 +3964,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type),
@@ -4427,7 +4063,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 15
+                << "basic_action_impl" << 15
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4443,53 +4079,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -4500,24 +4123,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type),
@@ -4617,7 +4227,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 15
+                << "basic_action_impl" << 15
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4636,7 +4246,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type),
@@ -4735,7 +4345,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 16
+                << "basic_action_impl" << 16
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4751,53 +4361,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -4808,24 +4405,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type),
@@ -4925,7 +4509,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 16
+                << "basic_action_impl" << 16
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4944,7 +4528,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type),
@@ -5043,7 +4627,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 17
+                << "basic_action_impl" << 17
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -5059,53 +4643,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -5116,24 +4687,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type),
@@ -5233,7 +4791,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 17
+                << "basic_action_impl" << 17
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -5252,7 +4810,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type),
@@ -5351,7 +4909,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 18
+                << "basic_action_impl" << 18
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -5367,53 +4925,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -5424,24 +4969,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type),
@@ -5541,7 +5073,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 18
+                << "basic_action_impl" << 18
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -5560,7 +5092,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type , typename util::decay<T18>::type),
@@ -5659,7 +5191,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 19
+                << "basic_action_impl" << 19
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -5675,53 +5207,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -5732,24 +5251,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type , typename util::decay<T18>::type),
@@ -5849,7 +5355,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 19
+                << "basic_action_impl" << 19
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -5868,7 +5374,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type , typename util::decay<T18>::type , typename util::decay<T19>::type),
@@ -5967,7 +5473,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 20
+                << "basic_action_impl" << 20
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -5983,53 +5489,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -6040,24 +5533,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type , typename util::decay<T18>::type , typename util::decay<T19>::type),
@@ -6157,7 +5637,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 20
+                << "basic_action_impl" << 20
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
diff --git a/hpx/runtime/actions/preprocessed/component_const_action_implementations_5.hpp b/hpx/runtime/actions/preprocessed/component_const_action_implementations_5.hpp
index 25057f3493ac..a8336030a0ad 100644
--- a/hpx/runtime/actions/preprocessed/component_const_action_implementations_5.hpp
+++ b/hpx/runtime/actions/preprocessed/component_const_action_implementations_5.hpp
@@ -16,7 +16,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0,
         R (Component::*F)(T0) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type),
@@ -115,7 +115,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 1
+                << "basic_action_impl" << 1
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -131,53 +131,40 @@ namespace hpx { namespace actions
         typename T0,
         R (Component::*F)(T0) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0,
-        R (Component::*F)(T0) const, typename Derived>
-    struct make_action<R (Component::*)(T0) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0,
         R (Component::*F)(T0) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -188,24 +175,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0,
-        R (Component::*F)(T0) const, typename Derived>
-    struct make_action<R (Component::*)(T0) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0,
         void (Component::*F)(T0) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type),
@@ -305,7 +279,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 1
+                << "basic_action_impl" << 1
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -324,7 +298,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1,
         R (Component::*F)(T0 , T1) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -423,7 +397,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 2
+                << "basic_action_impl" << 2
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -439,53 +413,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1,
         R (Component::*F)(T0 , T1) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1,
-        R (Component::*F)(T0 , T1) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1,
         R (Component::*F)(T0 , T1) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -496,24 +457,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1,
-        R (Component::*F)(T0 , T1) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1,
         void (Component::*F)(T0 , T1) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -613,7 +561,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 2
+                << "basic_action_impl" << 2
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -632,7 +580,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -731,7 +679,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 3
+                << "basic_action_impl" << 3
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -747,53 +695,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2,
-        R (Component::*F)(T0 , T1 , T2) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -804,24 +739,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2,
-        R (Component::*F)(T0 , T1 , T2) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2,
         void (Component::*F)(T0 , T1 , T2) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -921,7 +843,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 3
+                << "basic_action_impl" << 3
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -940,7 +862,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -1039,7 +961,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 4
+                << "basic_action_impl" << 4
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1055,53 +977,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (Component::*F)(T0 , T1 , T2 , T3) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1112,24 +1021,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (Component::*F)(T0 , T1 , T2 , T3) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3,
         void (Component::*F)(T0 , T1 , T2 , T3) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -1229,7 +1125,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 4
+                << "basic_action_impl" << 4
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1248,7 +1144,7 @@ namespace hpx { namespace actions
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
       : public basic_action<
             Component const, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1347,7 +1243,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 5
+                << "basic_action_impl" << 5
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1363,53 +1259,40 @@ namespace hpx { namespace actions
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4) const,
         typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4) const,
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4) const,
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1420,24 +1303,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4) const, typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4) const,
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4) const, typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4) const, F, Derived>
       : public basic_action<
             Component const, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1537,7 +1407,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 5
+                << "basic_action_impl" << 5
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
diff --git a/hpx/runtime/actions/preprocessed/component_non_const_action_implementations_10.hpp b/hpx/runtime/actions/preprocessed/component_non_const_action_implementations_10.hpp
index a1601baf0e29..432a6fbeb512 100644
--- a/hpx/runtime/actions/preprocessed/component_non_const_action_implementations_10.hpp
+++ b/hpx/runtime/actions/preprocessed/component_non_const_action_implementations_10.hpp
@@ -15,7 +15,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0,
         R (Component::*F)(T0), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type),
@@ -114,7 +114,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 1
+                << "basic_action_impl" << 1
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -128,53 +128,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0,
         R (Component::*F)(T0), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0,
-        R (Component::*F)(T0), typename Derived>
-    struct make_action<R (Component::*)(T0),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0,
         R (Component::*F)(T0),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -185,24 +172,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0,
-        R (Component::*F)(T0), typename Derived>
-    struct make_action<R (Component::*)(T0),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0,
         void (Component::*F)(T0), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type),
@@ -302,7 +276,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 1
+                << "basic_action_impl" << 1
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -320,7 +294,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1,
         R (Component::*F)(T0 , T1), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -419,7 +393,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 2
+                << "basic_action_impl" << 2
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -433,53 +407,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1,
         R (Component::*F)(T0 , T1), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1,
-        R (Component::*F)(T0 , T1), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1,
         R (Component::*F)(T0 , T1),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -490,24 +451,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1,
-        R (Component::*F)(T0 , T1), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1,
         void (Component::*F)(T0 , T1), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -607,7 +555,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 2
+                << "basic_action_impl" << 2
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -625,7 +573,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -724,7 +672,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 3
+                << "basic_action_impl" << 3
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -738,53 +686,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2,
-        R (Component::*F)(T0 , T1 , T2), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -795,24 +730,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2,
-        R (Component::*F)(T0 , T1 , T2), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2,
         void (Component::*F)(T0 , T1 , T2), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -912,7 +834,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 3
+                << "basic_action_impl" << 3
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -930,7 +852,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -1029,7 +951,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 4
+                << "basic_action_impl" << 4
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1043,53 +965,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1100,24 +1009,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3,
         void (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -1217,7 +1113,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 4
+                << "basic_action_impl" << 4
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1235,7 +1131,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1334,7 +1230,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 5
+                << "basic_action_impl" << 5
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1348,53 +1244,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1405,24 +1288,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1522,7 +1392,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 5
+                << "basic_action_impl" << 5
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1540,7 +1410,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1639,7 +1509,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 6
+                << "basic_action_impl" << 6
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1653,53 +1523,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1710,24 +1567,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1827,7 +1671,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 6
+                << "basic_action_impl" << 6
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1845,7 +1689,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -1944,7 +1788,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 7
+                << "basic_action_impl" << 7
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1958,53 +1802,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2015,24 +1846,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -2132,7 +1950,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 7
+                << "basic_action_impl" << 7
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2150,7 +1968,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -2249,7 +2067,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 8
+                << "basic_action_impl" << 8
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2263,53 +2081,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2320,24 +2125,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -2437,7 +2229,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 8
+                << "basic_action_impl" << 8
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2455,7 +2247,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2554,7 +2346,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 9
+                << "basic_action_impl" << 9
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2568,53 +2360,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2625,24 +2404,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2742,7 +2508,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 9
+                << "basic_action_impl" << 9
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2760,7 +2526,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -2859,7 +2625,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 10
+                << "basic_action_impl" << 10
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2873,53 +2639,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2930,24 +2683,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -3047,7 +2787,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 10
+                << "basic_action_impl" << 10
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
diff --git a/hpx/runtime/actions/preprocessed/component_non_const_action_implementations_15.hpp b/hpx/runtime/actions/preprocessed/component_non_const_action_implementations_15.hpp
index ddc8dffac1c7..070c3f97b216 100644
--- a/hpx/runtime/actions/preprocessed/component_non_const_action_implementations_15.hpp
+++ b/hpx/runtime/actions/preprocessed/component_non_const_action_implementations_15.hpp
@@ -15,7 +15,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0,
         R (Component::*F)(T0), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type),
@@ -114,7 +114,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 1
+                << "basic_action_impl" << 1
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -128,53 +128,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0,
         R (Component::*F)(T0), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0,
-        R (Component::*F)(T0), typename Derived>
-    struct make_action<R (Component::*)(T0),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0,
         R (Component::*F)(T0),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -185,24 +172,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0,
-        R (Component::*F)(T0), typename Derived>
-    struct make_action<R (Component::*)(T0),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0,
         void (Component::*F)(T0), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type),
@@ -302,7 +276,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 1
+                << "basic_action_impl" << 1
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -320,7 +294,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1,
         R (Component::*F)(T0 , T1), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -419,7 +393,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 2
+                << "basic_action_impl" << 2
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -433,53 +407,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1,
         R (Component::*F)(T0 , T1), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1,
-        R (Component::*F)(T0 , T1), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1,
         R (Component::*F)(T0 , T1),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -490,24 +451,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1,
-        R (Component::*F)(T0 , T1), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1,
         void (Component::*F)(T0 , T1), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -607,7 +555,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 2
+                << "basic_action_impl" << 2
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -625,7 +573,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -724,7 +672,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 3
+                << "basic_action_impl" << 3
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -738,53 +686,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2,
-        R (Component::*F)(T0 , T1 , T2), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -795,24 +730,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2,
-        R (Component::*F)(T0 , T1 , T2), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2,
         void (Component::*F)(T0 , T1 , T2), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -912,7 +834,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 3
+                << "basic_action_impl" << 3
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -930,7 +852,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -1029,7 +951,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 4
+                << "basic_action_impl" << 4
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1043,53 +965,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1100,24 +1009,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3,
         void (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -1217,7 +1113,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 4
+                << "basic_action_impl" << 4
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1235,7 +1131,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1334,7 +1230,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 5
+                << "basic_action_impl" << 5
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1348,53 +1244,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1405,24 +1288,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1522,7 +1392,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 5
+                << "basic_action_impl" << 5
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1540,7 +1410,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1639,7 +1509,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 6
+                << "basic_action_impl" << 6
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1653,53 +1523,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1710,24 +1567,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1827,7 +1671,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 6
+                << "basic_action_impl" << 6
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1845,7 +1689,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -1944,7 +1788,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 7
+                << "basic_action_impl" << 7
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1958,53 +1802,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2015,24 +1846,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -2132,7 +1950,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 7
+                << "basic_action_impl" << 7
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2150,7 +1968,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -2249,7 +2067,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 8
+                << "basic_action_impl" << 8
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2263,53 +2081,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2320,24 +2125,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -2437,7 +2229,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 8
+                << "basic_action_impl" << 8
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2455,7 +2247,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2554,7 +2346,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 9
+                << "basic_action_impl" << 9
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2568,53 +2360,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2625,24 +2404,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2742,7 +2508,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 9
+                << "basic_action_impl" << 9
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2760,7 +2526,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -2859,7 +2625,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 10
+                << "basic_action_impl" << 10
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2873,53 +2639,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2930,24 +2683,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -3047,7 +2787,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 10
+                << "basic_action_impl" << 10
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3065,7 +2805,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type),
@@ -3164,7 +2904,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 11
+                << "basic_action_impl" << 11
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3178,53 +2918,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -3235,24 +2962,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type),
@@ -3352,7 +3066,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 11
+                << "basic_action_impl" << 11
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3370,7 +3084,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type),
@@ -3469,7 +3183,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 12
+                << "basic_action_impl" << 12
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3483,53 +3197,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -3540,24 +3241,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type),
@@ -3657,7 +3345,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 12
+                << "basic_action_impl" << 12
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3675,7 +3363,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type),
@@ -3774,7 +3462,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 13
+                << "basic_action_impl" << 13
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3788,53 +3476,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -3845,24 +3520,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type),
@@ -3962,7 +3624,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 13
+                << "basic_action_impl" << 13
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3980,7 +3642,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type),
@@ -4079,7 +3741,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 14
+                << "basic_action_impl" << 14
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4093,53 +3755,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -4150,24 +3799,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type),
@@ -4267,7 +3903,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 14
+                << "basic_action_impl" << 14
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4285,7 +3921,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type),
@@ -4384,7 +4020,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 15
+                << "basic_action_impl" << 15
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4398,53 +4034,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -4455,24 +4078,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type),
@@ -4572,7 +4182,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 15
+                << "basic_action_impl" << 15
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
diff --git a/hpx/runtime/actions/preprocessed/component_non_const_action_implementations_20.hpp b/hpx/runtime/actions/preprocessed/component_non_const_action_implementations_20.hpp
index f2c16e18f32a..19022da2aa46 100644
--- a/hpx/runtime/actions/preprocessed/component_non_const_action_implementations_20.hpp
+++ b/hpx/runtime/actions/preprocessed/component_non_const_action_implementations_20.hpp
@@ -15,7 +15,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0,
         R (Component::*F)(T0), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type),
@@ -114,7 +114,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 1
+                << "basic_action_impl" << 1
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -128,53 +128,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0,
         R (Component::*F)(T0), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0,
-        R (Component::*F)(T0), typename Derived>
-    struct make_action<R (Component::*)(T0),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0,
         R (Component::*F)(T0),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -185,24 +172,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0,
-        R (Component::*F)(T0), typename Derived>
-    struct make_action<R (Component::*)(T0),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0,
         void (Component::*F)(T0), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type),
@@ -302,7 +276,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 1
+                << "basic_action_impl" << 1
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -320,7 +294,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1,
         R (Component::*F)(T0 , T1), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -419,7 +393,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 2
+                << "basic_action_impl" << 2
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -433,53 +407,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1,
         R (Component::*F)(T0 , T1), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1,
-        R (Component::*F)(T0 , T1), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1,
         R (Component::*F)(T0 , T1),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -490,24 +451,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1,
-        R (Component::*F)(T0 , T1), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1,
         void (Component::*F)(T0 , T1), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -607,7 +555,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 2
+                << "basic_action_impl" << 2
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -625,7 +573,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -724,7 +672,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 3
+                << "basic_action_impl" << 3
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -738,53 +686,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2,
-        R (Component::*F)(T0 , T1 , T2), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -795,24 +730,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2,
-        R (Component::*F)(T0 , T1 , T2), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2,
         void (Component::*F)(T0 , T1 , T2), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -912,7 +834,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 3
+                << "basic_action_impl" << 3
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -930,7 +852,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -1029,7 +951,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 4
+                << "basic_action_impl" << 4
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1043,53 +965,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1100,24 +1009,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3,
         void (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -1217,7 +1113,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 4
+                << "basic_action_impl" << 4
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1235,7 +1131,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1334,7 +1230,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 5
+                << "basic_action_impl" << 5
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1348,53 +1244,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1405,24 +1288,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1522,7 +1392,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 5
+                << "basic_action_impl" << 5
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1540,7 +1410,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1639,7 +1509,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 6
+                << "basic_action_impl" << 6
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1653,53 +1523,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1710,24 +1567,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1827,7 +1671,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 6
+                << "basic_action_impl" << 6
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1845,7 +1689,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -1944,7 +1788,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 7
+                << "basic_action_impl" << 7
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1958,53 +1802,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2015,24 +1846,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -2132,7 +1950,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 7
+                << "basic_action_impl" << 7
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2150,7 +1968,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -2249,7 +2067,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 8
+                << "basic_action_impl" << 8
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2263,53 +2081,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2320,24 +2125,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -2437,7 +2229,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 8
+                << "basic_action_impl" << 8
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2455,7 +2247,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2554,7 +2346,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 9
+                << "basic_action_impl" << 9
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2568,53 +2360,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2625,24 +2404,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2742,7 +2508,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 9
+                << "basic_action_impl" << 9
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2760,7 +2526,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -2859,7 +2625,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 10
+                << "basic_action_impl" << 10
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -2873,53 +2639,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -2930,24 +2683,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -3047,7 +2787,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 10
+                << "basic_action_impl" << 10
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3065,7 +2805,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type),
@@ -3164,7 +2904,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 11
+                << "basic_action_impl" << 11
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3178,53 +2918,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -3235,24 +2962,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type),
@@ -3352,7 +3066,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 11
+                << "basic_action_impl" << 11
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3370,7 +3084,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type),
@@ -3469,7 +3183,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 12
+                << "basic_action_impl" << 12
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3483,53 +3197,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -3540,24 +3241,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type),
@@ -3657,7 +3345,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 12
+                << "basic_action_impl" << 12
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3675,7 +3363,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type),
@@ -3774,7 +3462,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 13
+                << "basic_action_impl" << 13
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3788,53 +3476,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -3845,24 +3520,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type),
@@ -3962,7 +3624,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 13
+                << "basic_action_impl" << 13
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -3980,7 +3642,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type),
@@ -4079,7 +3741,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 14
+                << "basic_action_impl" << 14
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4093,53 +3755,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -4150,24 +3799,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type),
@@ -4267,7 +3903,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 14
+                << "basic_action_impl" << 14
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4285,7 +3921,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type),
@@ -4384,7 +4020,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 15
+                << "basic_action_impl" << 15
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4398,53 +4034,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -4455,24 +4078,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type),
@@ -4572,7 +4182,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 15
+                << "basic_action_impl" << 15
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4590,7 +4200,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type),
@@ -4689,7 +4299,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 16
+                << "basic_action_impl" << 16
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4703,53 +4313,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -4760,24 +4357,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type),
@@ -4877,7 +4461,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 16
+                << "basic_action_impl" << 16
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -4895,7 +4479,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type),
@@ -4994,7 +4578,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 17
+                << "basic_action_impl" << 17
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -5008,53 +4592,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -5065,24 +4636,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type),
@@ -5182,7 +4740,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 17
+                << "basic_action_impl" << 17
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -5200,7 +4758,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type),
@@ -5299,7 +4857,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 18
+                << "basic_action_impl" << 18
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -5313,53 +4871,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -5370,24 +4915,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type),
@@ -5487,7 +5019,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 18
+                << "basic_action_impl" << 18
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -5505,7 +5037,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type , typename util::decay<T18>::type),
@@ -5604,7 +5136,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 19
+                << "basic_action_impl" << 19
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -5618,53 +5150,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -5675,24 +5194,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type , typename util::decay<T18>::type),
@@ -5792,7 +5298,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 19
+                << "basic_action_impl" << 19
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -5810,7 +5316,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type , typename util::decay<T18>::type , typename util::decay<T19>::type),
@@ -5909,7 +5415,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 20
+                << "basic_action_impl" << 20
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -5923,53 +5429,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -5980,24 +5473,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type , typename util::decay<T18>::type , typename util::decay<T19>::type),
@@ -6097,7 +5577,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 20
+                << "basic_action_impl" << 20
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
diff --git a/hpx/runtime/actions/preprocessed/component_non_const_action_implementations_5.hpp b/hpx/runtime/actions/preprocessed/component_non_const_action_implementations_5.hpp
index d7c142023cae..b9a875c1d7af 100644
--- a/hpx/runtime/actions/preprocessed/component_non_const_action_implementations_5.hpp
+++ b/hpx/runtime/actions/preprocessed/component_non_const_action_implementations_5.hpp
@@ -15,7 +15,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0,
         R (Component::*F)(T0), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type),
@@ -114,7 +114,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 1
+                << "basic_action_impl" << 1
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -128,53 +128,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0,
         R (Component::*F)(T0), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0,
-        R (Component::*F)(T0), typename Derived>
-    struct make_action<R (Component::*)(T0),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0,
         R (Component::*F)(T0),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -185,24 +172,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0,
-        R (Component::*F)(T0), typename Derived>
-    struct make_action<R (Component::*)(T0),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0,
         void (Component::*F)(T0), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type),
@@ -302,7 +276,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 1
+                << "basic_action_impl" << 1
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -320,7 +294,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1,
         R (Component::*F)(T0 , T1), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -419,7 +393,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 2
+                << "basic_action_impl" << 2
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -433,53 +407,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1,
         R (Component::*F)(T0 , T1), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1,
-        R (Component::*F)(T0 , T1), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1,
         R (Component::*F)(T0 , T1),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -490,24 +451,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1,
-        R (Component::*F)(T0 , T1), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1,
         void (Component::*F)(T0 , T1), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -607,7 +555,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 2
+                << "basic_action_impl" << 2
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -625,7 +573,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -724,7 +672,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 3
+                << "basic_action_impl" << 3
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -738,53 +686,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2,
-        R (Component::*F)(T0 , T1 , T2), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2,
         R (Component::*F)(T0 , T1 , T2),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -795,24 +730,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2,
-        R (Component::*F)(T0 , T1 , T2), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2,
         void (Component::*F)(T0 , T1 , T2), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -912,7 +834,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 3
+                << "basic_action_impl" << 3
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -930,7 +852,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -1029,7 +951,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 4
+                << "basic_action_impl" << 4
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1043,53 +965,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3,
         R (Component::*F)(T0 , T1 , T2 , T3),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1100,24 +1009,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3,
         void (Component::*F)(T0 , T1 , T2 , T3), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -1217,7 +1113,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 4
+                << "basic_action_impl" << 4
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1235,7 +1131,7 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
       : public basic_action<
             Component, R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1334,7 +1230,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 5
+                << "basic_action_impl" << 5
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
@@ -1348,53 +1244,40 @@ namespace hpx { namespace actions
     template <
         typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct component_action<
+    struct action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F,
             typename detail::action_type<
-                component_action<
+                action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>,
                 Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_action, Derived
+            action, Derived
         >::type derived_type;
         typedef boost::mpl::false_ direct_execution;
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4),
-            F, Derived, boost::mpl::false_>
-      : component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-    {
-        typedef component_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename R,
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (Component::*F)(T0 , T1 , T2 , T3 , T4),
         typename Derived>
-    struct component_direct_action<
+    struct direct_action<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-      : component_base_action<
+      : basic_action_impl<
             R (Component::*)(T0 , T1 , T2 , T3 , T4), F,
             typename detail::action_type<
-                component_direct_action<
+                direct_action<
                     R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>,
                     Derived
             >::type>
     {
         typedef typename detail::action_type<
-            component_direct_action, Derived
+            direct_action, Derived
         >::type derived_type;
         typedef boost::mpl::true_ direct_execution;
         
@@ -1405,24 +1288,11 @@ namespace hpx { namespace actions
         }
     };
     
-    template <
-        typename Component, typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct make_action<R (Component::*)(T0 , T1 , T2 , T3 , T4),
-            F, Derived, boost::mpl::true_>
-      : component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-    {
-        typedef component_direct_action<
-            R (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived
-        > type;
-    };
-    
     
     template <
         typename Component, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         void (Component::*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    class component_base_action<
+    class basic_action_impl<
             void (Component::*)(T0 , T1 , T2 , T3 , T4), F, Derived>
       : public basic_action<
             Component, util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1522,7 +1392,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "component_base_action" << 5
+                << "basic_action_impl" << 5
                 << "::execute_function name("
                 << detail::get_action_name<Derived>()
                 << ") lva(" << reinterpret_cast<void const*>(
diff --git a/hpx/runtime/actions/preprocessed/plain_action_implementations_10.hpp b/hpx/runtime/actions/preprocessed/plain_action_implementations_10.hpp
index 886727975351..c1594c672cf7 100644
--- a/hpx/runtime/actions/preprocessed/plain_action_implementations_10.hpp
+++ b/hpx/runtime/actions/preprocessed/plain_action_implementations_10.hpp
@@ -15,7 +15,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0,
         R (*F)(T0), typename Derived>
-    class plain_base_action<R (*)(T0), F, Derived>
+    class basic_action_impl<R (*)(T0), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type),
@@ -108,39 +108,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0,
-        R (*F)(T0), typename Derived>
-    struct make_action<R (*)(T0), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0,
-        Result (*F)(T0), typename Derived>
-    struct make_action<Result (*)(T0), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0,
         void (*F)(T0), typename Derived>
-    class plain_base_action<void (*)(T0), F, Derived>
+    class basic_action_impl<void (*)(T0), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type),
@@ -233,7 +211,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)));
             return util::unused;
@@ -247,7 +225,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -255,7 +233,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -267,7 +245,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1,
         R (*F)(T0 , T1), typename Derived>
-    class plain_base_action<R (*)(T0 , T1), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -360,39 +338,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1,
-        R (*F)(T0 , T1), typename Derived>
-    struct make_action<R (*)(T0 , T1), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1,
-        Result (*F)(T0 , T1), typename Derived>
-    struct make_action<Result (*)(T0 , T1), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1,
         void (*F)(T0 , T1), typename Derived>
-    class plain_base_action<void (*)(T0 , T1), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -485,7 +441,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)));
             return util::unused;
@@ -499,7 +455,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -507,7 +463,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -519,7 +475,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2,
         R (*F)(T0 , T1 , T2), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -612,39 +568,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2,
-        R (*F)(T0 , T1 , T2), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2,
-        Result (*F)(T0 , T1 , T2), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2,
         void (*F)(T0 , T1 , T2), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -737,7 +671,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)));
             return util::unused;
@@ -751,7 +685,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -759,7 +693,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -771,7 +705,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3,
         R (*F)(T0 , T1 , T2 , T3), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -864,39 +798,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3,
-        Result (*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3,
         void (*F)(T0 , T1 , T2 , T3), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -989,7 +901,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)));
             return util::unused;
@@ -1003,7 +915,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1011,7 +923,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1023,7 +935,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1116,39 +1028,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        Result (*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         void (*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1241,7 +1131,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)));
             return util::unused;
@@ -1255,7 +1145,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1263,7 +1153,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1275,7 +1165,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1368,39 +1258,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1493,7 +1361,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)));
             return util::unused;
@@ -1507,7 +1375,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1515,7 +1383,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1527,7 +1395,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -1620,39 +1488,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -1745,7 +1591,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)));
             return util::unused;
@@ -1759,7 +1605,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1767,7 +1613,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1779,7 +1625,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -1872,39 +1718,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -1997,7 +1821,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)));
             return util::unused;
@@ -2011,7 +1835,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2019,7 +1843,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2031,7 +1855,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2124,39 +1948,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2249,7 +2051,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)));
             return util::unused;
@@ -2263,7 +2065,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2271,7 +2073,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2283,7 +2085,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -2376,39 +2178,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -2501,7 +2281,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)));
             return util::unused;
@@ -2515,7 +2295,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2523,7 +2303,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
diff --git a/hpx/runtime/actions/preprocessed/plain_action_implementations_15.hpp b/hpx/runtime/actions/preprocessed/plain_action_implementations_15.hpp
index d4d9d9057e32..21aefed2c718 100644
--- a/hpx/runtime/actions/preprocessed/plain_action_implementations_15.hpp
+++ b/hpx/runtime/actions/preprocessed/plain_action_implementations_15.hpp
@@ -15,7 +15,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0,
         R (*F)(T0), typename Derived>
-    class plain_base_action<R (*)(T0), F, Derived>
+    class basic_action_impl<R (*)(T0), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type),
@@ -108,39 +108,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0,
-        R (*F)(T0), typename Derived>
-    struct make_action<R (*)(T0), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0,
-        Result (*F)(T0), typename Derived>
-    struct make_action<Result (*)(T0), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0,
         void (*F)(T0), typename Derived>
-    class plain_base_action<void (*)(T0), F, Derived>
+    class basic_action_impl<void (*)(T0), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type),
@@ -233,7 +211,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)));
             return util::unused;
@@ -247,7 +225,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -255,7 +233,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -267,7 +245,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1,
         R (*F)(T0 , T1), typename Derived>
-    class plain_base_action<R (*)(T0 , T1), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -360,39 +338,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1,
-        R (*F)(T0 , T1), typename Derived>
-    struct make_action<R (*)(T0 , T1), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1,
-        Result (*F)(T0 , T1), typename Derived>
-    struct make_action<Result (*)(T0 , T1), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1,
         void (*F)(T0 , T1), typename Derived>
-    class plain_base_action<void (*)(T0 , T1), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -485,7 +441,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)));
             return util::unused;
@@ -499,7 +455,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -507,7 +463,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -519,7 +475,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2,
         R (*F)(T0 , T1 , T2), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -612,39 +568,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2,
-        R (*F)(T0 , T1 , T2), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2,
-        Result (*F)(T0 , T1 , T2), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2,
         void (*F)(T0 , T1 , T2), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -737,7 +671,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)));
             return util::unused;
@@ -751,7 +685,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -759,7 +693,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -771,7 +705,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3,
         R (*F)(T0 , T1 , T2 , T3), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -864,39 +798,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3,
-        Result (*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3,
         void (*F)(T0 , T1 , T2 , T3), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -989,7 +901,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)));
             return util::unused;
@@ -1003,7 +915,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1011,7 +923,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1023,7 +935,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1116,39 +1028,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        Result (*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         void (*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1241,7 +1131,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)));
             return util::unused;
@@ -1255,7 +1145,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1263,7 +1153,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1275,7 +1165,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1368,39 +1258,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1493,7 +1361,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)));
             return util::unused;
@@ -1507,7 +1375,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1515,7 +1383,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1527,7 +1395,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -1620,39 +1488,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -1745,7 +1591,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)));
             return util::unused;
@@ -1759,7 +1605,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1767,7 +1613,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1779,7 +1625,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -1872,39 +1718,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -1997,7 +1821,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)));
             return util::unused;
@@ -2011,7 +1835,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2019,7 +1843,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2031,7 +1855,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2124,39 +1948,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2249,7 +2051,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)));
             return util::unused;
@@ -2263,7 +2065,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2271,7 +2073,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2283,7 +2085,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -2376,39 +2178,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -2501,7 +2281,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)));
             return util::unused;
@@ -2515,7 +2295,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2523,7 +2303,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2535,7 +2315,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type),
@@ -2628,39 +2408,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type),
@@ -2753,7 +2511,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)));
             return util::unused;
@@ -2767,7 +2525,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2775,7 +2533,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2787,7 +2545,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type),
@@ -2880,39 +2638,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type),
@@ -3005,7 +2741,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)));
             return util::unused;
@@ -3019,7 +2755,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -3027,7 +2763,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -3039,7 +2775,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type),
@@ -3132,39 +2868,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type),
@@ -3257,7 +2971,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)));
             return util::unused;
@@ -3271,7 +2985,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -3279,7 +2993,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -3291,7 +3005,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type),
@@ -3384,39 +3098,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type),
@@ -3509,7 +3201,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)));
             return util::unused;
@@ -3523,7 +3215,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -3531,7 +3223,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -3543,7 +3235,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type),
@@ -3636,39 +3328,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)) , util::get< 14>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type),
@@ -3761,7 +3431,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)) , util::get< 14>(std::forward<Arguments>( args)));
             return util::unused;
@@ -3775,7 +3445,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -3783,7 +3453,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
diff --git a/hpx/runtime/actions/preprocessed/plain_action_implementations_20.hpp b/hpx/runtime/actions/preprocessed/plain_action_implementations_20.hpp
index eafaa1de2ad8..a9be57c7cd83 100644
--- a/hpx/runtime/actions/preprocessed/plain_action_implementations_20.hpp
+++ b/hpx/runtime/actions/preprocessed/plain_action_implementations_20.hpp
@@ -15,7 +15,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0,
         R (*F)(T0), typename Derived>
-    class plain_base_action<R (*)(T0), F, Derived>
+    class basic_action_impl<R (*)(T0), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type),
@@ -108,39 +108,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0,
-        R (*F)(T0), typename Derived>
-    struct make_action<R (*)(T0), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0,
-        Result (*F)(T0), typename Derived>
-    struct make_action<Result (*)(T0), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0,
         void (*F)(T0), typename Derived>
-    class plain_base_action<void (*)(T0), F, Derived>
+    class basic_action_impl<void (*)(T0), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type),
@@ -233,7 +211,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)));
             return util::unused;
@@ -247,7 +225,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -255,7 +233,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -267,7 +245,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1,
         R (*F)(T0 , T1), typename Derived>
-    class plain_base_action<R (*)(T0 , T1), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -360,39 +338,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1,
-        R (*F)(T0 , T1), typename Derived>
-    struct make_action<R (*)(T0 , T1), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1,
-        Result (*F)(T0 , T1), typename Derived>
-    struct make_action<Result (*)(T0 , T1), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1,
         void (*F)(T0 , T1), typename Derived>
-    class plain_base_action<void (*)(T0 , T1), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -485,7 +441,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)));
             return util::unused;
@@ -499,7 +455,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -507,7 +463,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -519,7 +475,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2,
         R (*F)(T0 , T1 , T2), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -612,39 +568,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2,
-        R (*F)(T0 , T1 , T2), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2,
-        Result (*F)(T0 , T1 , T2), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2,
         void (*F)(T0 , T1 , T2), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -737,7 +671,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)));
             return util::unused;
@@ -751,7 +685,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -759,7 +693,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -771,7 +705,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3,
         R (*F)(T0 , T1 , T2 , T3), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -864,39 +798,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3,
-        Result (*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3,
         void (*F)(T0 , T1 , T2 , T3), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -989,7 +901,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)));
             return util::unused;
@@ -1003,7 +915,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1011,7 +923,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1023,7 +935,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1116,39 +1028,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        Result (*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         void (*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1241,7 +1131,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)));
             return util::unused;
@@ -1255,7 +1145,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1263,7 +1153,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1275,7 +1165,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1368,39 +1258,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type),
@@ -1493,7 +1361,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)));
             return util::unused;
@@ -1507,7 +1375,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1515,7 +1383,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1527,7 +1395,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -1620,39 +1488,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type),
@@ -1745,7 +1591,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)));
             return util::unused;
@@ -1759,7 +1605,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1767,7 +1613,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1779,7 +1625,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -1872,39 +1718,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type),
@@ -1997,7 +1821,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)));
             return util::unused;
@@ -2011,7 +1835,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2019,7 +1843,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2031,7 +1855,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2124,39 +1948,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type),
@@ -2249,7 +2051,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)));
             return util::unused;
@@ -2263,7 +2065,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2271,7 +2073,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2283,7 +2085,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -2376,39 +2178,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type),
@@ -2501,7 +2281,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)));
             return util::unused;
@@ -2515,7 +2295,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2523,7 +2303,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2535,7 +2315,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type),
@@ -2628,39 +2408,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type),
@@ -2753,7 +2511,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)));
             return util::unused;
@@ -2767,7 +2525,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2775,7 +2533,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -2787,7 +2545,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type),
@@ -2880,39 +2638,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type),
@@ -3005,7 +2741,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)));
             return util::unused;
@@ -3019,7 +2755,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -3027,7 +2763,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -3039,7 +2775,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type),
@@ -3132,39 +2868,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type),
@@ -3257,7 +2971,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)));
             return util::unused;
@@ -3271,7 +2985,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -3279,7 +2993,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -3291,7 +3005,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type),
@@ -3384,39 +3098,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type),
@@ -3509,7 +3201,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)));
             return util::unused;
@@ -3523,7 +3215,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -3531,7 +3223,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -3543,7 +3235,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type),
@@ -3636,39 +3328,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)) , util::get< 14>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type),
@@ -3761,7 +3431,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)) , util::get< 14>(std::forward<Arguments>( args)));
             return util::unused;
@@ -3775,7 +3445,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -3783,7 +3453,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -3795,7 +3465,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type),
@@ -3888,39 +3558,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)) , util::get< 14>(std::forward<Arguments>( args)) , util::get< 15>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type),
@@ -4013,7 +3661,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)) , util::get< 14>(std::forward<Arguments>( args)) , util::get< 15>(std::forward<Arguments>( args)));
             return util::unused;
@@ -4027,7 +3675,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14 , Arg15), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -4035,7 +3683,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14 , Arg15), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14 , Arg15), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -4047,7 +3695,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type),
@@ -4140,39 +3788,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)) , util::get< 14>(std::forward<Arguments>( args)) , util::get< 15>(std::forward<Arguments>( args)) , util::get< 16>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type),
@@ -4265,7 +3891,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)) , util::get< 14>(std::forward<Arguments>( args)) , util::get< 15>(std::forward<Arguments>( args)) , util::get< 16>(std::forward<Arguments>( args)));
             return util::unused;
@@ -4279,7 +3905,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14 , Arg15 , Arg16), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -4287,7 +3913,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14 , Arg15 , Arg16), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14 , Arg15 , Arg16), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -4299,7 +3925,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type),
@@ -4392,39 +4018,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)) , util::get< 14>(std::forward<Arguments>( args)) , util::get< 15>(std::forward<Arguments>( args)) , util::get< 16>(std::forward<Arguments>( args)) , util::get< 17>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type),
@@ -4517,7 +4121,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)) , util::get< 14>(std::forward<Arguments>( args)) , util::get< 15>(std::forward<Arguments>( args)) , util::get< 16>(std::forward<Arguments>( args)) , util::get< 17>(std::forward<Arguments>( args)));
             return util::unused;
@@ -4531,7 +4135,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14 , Arg15 , Arg16 , Arg17), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -4539,7 +4143,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14 , Arg15 , Arg16 , Arg17), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14 , Arg15 , Arg16 , Arg17), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -4551,7 +4155,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type , typename util::decay<T18>::type),
@@ -4644,39 +4248,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)) , util::get< 14>(std::forward<Arguments>( args)) , util::get< 15>(std::forward<Arguments>( args)) , util::get< 16>(std::forward<Arguments>( args)) , util::get< 17>(std::forward<Arguments>( args)) , util::get< 18>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type , typename util::decay<T18>::type),
@@ -4769,7 +4351,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)) , util::get< 14>(std::forward<Arguments>( args)) , util::get< 15>(std::forward<Arguments>( args)) , util::get< 16>(std::forward<Arguments>( args)) , util::get< 17>(std::forward<Arguments>( args)) , util::get< 18>(std::forward<Arguments>( args)));
             return util::unused;
@@ -4783,7 +4365,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14 , Arg15 , Arg16 , Arg17 , Arg18), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -4791,7 +4373,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14 , Arg15 , Arg16 , Arg17 , Arg18), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14 , Arg15 , Arg16 , Arg17 , Arg18), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -4803,7 +4385,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19,
         R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type , typename util::decay<T18>::type , typename util::decay<T19>::type),
@@ -4896,39 +4478,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)) , util::get< 14>(std::forward<Arguments>( args)) , util::get< 15>(std::forward<Arguments>( args)) , util::get< 16>(std::forward<Arguments>( args)) , util::get< 17>(std::forward<Arguments>( args)) , util::get< 18>(std::forward<Arguments>( args)) , util::get< 19>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19,
-        R (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19,
-        Result (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19,
         void (*F)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type , typename util::decay<T5>::type , typename util::decay<T6>::type , typename util::decay<T7>::type , typename util::decay<T8>::type , typename util::decay<T9>::type , typename util::decay<T10>::type , typename util::decay<T11>::type , typename util::decay<T12>::type , typename util::decay<T13>::type , typename util::decay<T14>::type , typename util::decay<T15>::type , typename util::decay<T16>::type , typename util::decay<T17>::type , typename util::decay<T18>::type , typename util::decay<T19>::type),
@@ -5021,7 +4581,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)) , util::get< 5>(std::forward<Arguments>( args)) , util::get< 6>(std::forward<Arguments>( args)) , util::get< 7>(std::forward<Arguments>( args)) , util::get< 8>(std::forward<Arguments>( args)) , util::get< 9>(std::forward<Arguments>( args)) , util::get< 10>(std::forward<Arguments>( args)) , util::get< 11>(std::forward<Arguments>( args)) , util::get< 12>(std::forward<Arguments>( args)) , util::get< 13>(std::forward<Arguments>( args)) , util::get< 14>(std::forward<Arguments>( args)) , util::get< 15>(std::forward<Arguments>( args)) , util::get< 16>(std::forward<Arguments>( args)) , util::get< 17>(std::forward<Arguments>( args)) , util::get< 18>(std::forward<Arguments>( args)) , util::get< 19>(std::forward<Arguments>( args)));
             return util::unused;
@@ -5035,7 +4595,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14 , Arg15 , Arg16 , Arg17 , Arg18 , Arg19), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -5043,7 +4603,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14 , Arg15 , Arg16 , Arg17 , Arg18 , Arg19), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9 , Arg10 , Arg11 , Arg12 , Arg13 , Arg14 , Arg15 , Arg16 , Arg17 , Arg18 , Arg19), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
diff --git a/hpx/runtime/actions/preprocessed/plain_action_implementations_5.hpp b/hpx/runtime/actions/preprocessed/plain_action_implementations_5.hpp
index 65f1ff6e68d0..4fe47c479992 100644
--- a/hpx/runtime/actions/preprocessed/plain_action_implementations_5.hpp
+++ b/hpx/runtime/actions/preprocessed/plain_action_implementations_5.hpp
@@ -15,7 +15,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0,
         R (*F)(T0), typename Derived>
-    class plain_base_action<R (*)(T0), F, Derived>
+    class basic_action_impl<R (*)(T0), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type),
@@ -108,39 +108,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0,
-        R (*F)(T0), typename Derived>
-    struct make_action<R (*)(T0), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0,
-        Result (*F)(T0), typename Derived>
-    struct make_action<Result (*)(T0), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0,
         void (*F)(T0), typename Derived>
-    class plain_base_action<void (*)(T0), F, Derived>
+    class basic_action_impl<void (*)(T0), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type),
@@ -233,7 +211,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)));
             return util::unused;
@@ -247,7 +225,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -255,7 +233,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -267,7 +245,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1,
         R (*F)(T0 , T1), typename Derived>
-    class plain_base_action<R (*)(T0 , T1), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -360,39 +338,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1,
-        R (*F)(T0 , T1), typename Derived>
-    struct make_action<R (*)(T0 , T1), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1,
-        Result (*F)(T0 , T1), typename Derived>
-    struct make_action<Result (*)(T0 , T1), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1,
         void (*F)(T0 , T1), typename Derived>
-    class plain_base_action<void (*)(T0 , T1), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type),
@@ -485,7 +441,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)));
             return util::unused;
@@ -499,7 +455,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -507,7 +463,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -519,7 +475,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2,
         R (*F)(T0 , T1 , T2), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -612,39 +568,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2,
-        R (*F)(T0 , T1 , T2), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2,
-        Result (*F)(T0 , T1 , T2), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2,
         void (*F)(T0 , T1 , T2), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type),
@@ -737,7 +671,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)));
             return util::unused;
@@ -751,7 +685,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -759,7 +693,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -771,7 +705,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3,
         R (*F)(T0 , T1 , T2 , T3), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -864,39 +798,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3,
-        R (*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3,
-        Result (*F)(T0 , T1 , T2 , T3), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3,
         void (*F)(T0 , T1 , T2 , T3), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type),
@@ -989,7 +901,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)));
             return util::unused;
@@ -1003,7 +915,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1011,7 +923,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1023,7 +935,7 @@ namespace hpx { namespace actions
     template <
         typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         R (*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    class plain_base_action<R (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
+    class basic_action_impl<R (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             R(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1116,39 +1028,17 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             return F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)));
         }
     };
     
     
-    template <typename R, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        R (*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct make_action<R (*)(T0 , T1 , T2 , T3 , T4), F, Derived, boost::mpl::false_>
-      : plain_action<R (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-    {
-        typedef plain_action<
-            R (*)(T0 , T1 , T2 , T3 , T4), F, Derived
-        > type;
-    };
-    
-    
-    template <typename Result, typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
-        Result (*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    struct make_action<Result (*)(T0 , T1 , T2 , T3 , T4), F, Derived, boost::mpl::true_>
-      : plain_direct_action<Result (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
-    {
-        typedef plain_direct_action<
-            Result (*)(T0 , T1 , T2 , T3 , T4), F, Derived
-        > type;
-    };
-    
-    
     template <
         typename T0 , typename T1 , typename T2 , typename T3 , typename T4,
         void (*F)(T0 , T1 , T2 , T3 , T4), typename Derived>
-    class plain_base_action<void (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
+    class basic_action_impl<void (*)(T0 , T1 , T2 , T3 , T4), F, Derived>
       : public basic_action<
             components::server::plain_function<Derived>,
             util::unused_type(typename util::decay<T0>::type , typename util::decay<T1>::type , typename util::decay<T2>::type , typename util::decay<T3>::type , typename util::decay<T4>::type),
@@ -1241,7 +1131,7 @@ namespace hpx { namespace actions
             Arguments && args)
         {
             LTM_(debug)
-                << "plain_base_action::execute_function name("
+                << "basic_action_impl::execute_function name("
                 << detail::get_action_name<Derived>() << ")";
             F(util::get< 0>(std::forward<Arguments>( args)) , util::get< 1>(std::forward<Arguments>( args)) , util::get< 2>(std::forward<Arguments>( args)) , util::get< 3>(std::forward<Arguments>( args)) , util::get< 4>(std::forward<Arguments>( args)));
             return util::unused;
@@ -1255,7 +1145,7 @@ namespace hpx { namespace traits
         typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_action<
+                hpx::actions::action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
@@ -1263,7 +1153,7 @@ namespace hpx { namespace traits
         R (*F)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4), typename Derived, typename Enable>
     struct needs_guid_initialization<
             hpx::actions::transfer_action<
-                hpx::actions::plain_direct_action<
+                hpx::actions::direct_action<
                     R (*)(Arg0 , Arg1 , Arg2 , Arg3 , Arg4), F, Derived> >, Enable>
       : boost::mpl::false_
     {};
diff --git a/hpx/runtime/components/server/console_error_sink.hpp b/hpx/runtime/components/server/console_error_sink.hpp
index cea9028fc661..7c0887db1246 100644
--- a/hpx/runtime/components/server/console_error_sink.hpp
+++ b/hpx/runtime/components/server/console_error_sink.hpp
@@ -21,7 +21,7 @@ namespace hpx { namespace components { namespace server
     // console logging happens here
     void console_error_sink(boost::exception_ptr const&);
 
-    typedef actions::plain_action<
+    typedef actions::action<
         void (*)(boost::exception_ptr const&), console_error_sink
     > console_error_sink_action;
 }}}
diff --git a/hpx/runtime/components/server/console_logging.hpp b/hpx/runtime/components/server/console_logging.hpp
index 889c90cd56ac..3410391e18c4 100644
--- a/hpx/runtime/components/server/console_logging.hpp
+++ b/hpx/runtime/components/server/console_logging.hpp
@@ -40,11 +40,11 @@ namespace hpx { namespace components { namespace server
     // serialization support instances
     template <typename Dummy = void>
     class console_logging_action
-      : public actions::plain_direct_action<void (*)(messages_type const&),
+      : public actions::direct_action<void (*)(messages_type const&),
         console_logging, console_logging_action<Dummy> >
     {
     private:
-        typedef actions::plain_direct_action<
+        typedef actions::direct_action<
             void (*)(messages_type const&),
             console_logging, console_logging_action>
         base_type;
diff --git a/hpx/runtime/components/server/copy_component.hpp b/hpx/runtime/components/server/copy_component.hpp
index 41a73765ebdd..3fc92d2777ba 100644
--- a/hpx/runtime/components/server/copy_component.hpp
+++ b/hpx/runtime/components/server/copy_component.hpp
@@ -82,7 +82,7 @@ namespace hpx { namespace components { namespace server
 
     template <typename Component>
     struct copy_component_action_here
-      : ::hpx::actions::plain_action<
+      : ::hpx::actions::action<
             future<naming::id_type> (*)(naming::id_type const&)
           , &copy_component_here<Component>
           , copy_component_action_here<Component> >
@@ -90,7 +90,7 @@ namespace hpx { namespace components { namespace server
 
     template <typename Component>
     struct copy_component_action
-      : ::hpx::actions::plain_action<
+      : ::hpx::actions::action<
             future<naming::id_type> (*)(naming::id_type const&, naming::id_type const&)
           , &copy_component<Component>
           , copy_component_action<Component> >
diff --git a/hpx/runtime/components/server/migrate_component.hpp b/hpx/runtime/components/server/migrate_component.hpp
index 2f5baf8d5aca..7587bd175538 100644
--- a/hpx/runtime/components/server/migrate_component.hpp
+++ b/hpx/runtime/components/server/migrate_component.hpp
@@ -95,7 +95,7 @@ namespace hpx { namespace components { namespace server
 
     template <typename Component>
     struct migrate_component_action
-      : ::hpx::actions::plain_action<
+      : ::hpx::actions::action<
             future<naming::id_type> (*)(naming::id_type const&, naming::id_type const&)
           , &migrate_component<Component>
           , migrate_component_action<Component> >
diff --git a/hpx/runtime/components/server/preprocessed/runtime_support_implementations_10.hpp b/hpx/runtime/components/server/preprocessed/runtime_support_implementations_10.hpp
index 99146cbbb036..fd936cb66c8a 100644
--- a/hpx/runtime/components/server/preprocessed/runtime_support_implementations_10.hpp
+++ b/hpx/runtime/components/server/preprocessed/runtime_support_implementations_10.hpp
@@ -15,7 +15,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
        >
     struct create_component_action0
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)()
           , &runtime_support::create_component0<
                 Component >
@@ -25,7 +25,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
        >
     struct create_component_direct_action0
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)()
           , &runtime_support::create_component0<
                 Component >
@@ -85,7 +85,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0>
     struct create_component_action1
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0)
           , &runtime_support::create_component1<
                 Component , A0>
@@ -95,7 +95,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0>
     struct create_component_direct_action1
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0)
           , &runtime_support::create_component1<
                 Component , A0>
@@ -106,7 +106,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
        >
     struct bulk_create_component_action1
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t )
           , &runtime_support::bulk_create_component1<
@@ -117,7 +117,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
        >
     struct bulk_create_component_direct_action1
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t )
           , &runtime_support::bulk_create_component1<
@@ -178,7 +178,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1>
     struct create_component_action2
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1)
           , &runtime_support::create_component2<
                 Component , A0 , A1>
@@ -188,7 +188,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1>
     struct create_component_direct_action2
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1)
           , &runtime_support::create_component2<
                 Component , A0 , A1>
@@ -251,7 +251,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0>
     struct bulk_create_component_action2
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0)
           , &runtime_support::bulk_create_component2<
@@ -262,7 +262,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0>
     struct bulk_create_component_direct_action2
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0)
           , &runtime_support::bulk_create_component2<
@@ -323,7 +323,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2>
     struct create_component_action3
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2)
           , &runtime_support::create_component3<
                 Component , A0 , A1 , A2>
@@ -333,7 +333,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2>
     struct create_component_direct_action3
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2)
           , &runtime_support::create_component3<
                 Component , A0 , A1 , A2>
@@ -396,7 +396,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1>
     struct bulk_create_component_action3
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1)
           , &runtime_support::bulk_create_component3<
@@ -407,7 +407,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1>
     struct bulk_create_component_direct_action3
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1)
           , &runtime_support::bulk_create_component3<
@@ -468,7 +468,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3>
     struct create_component_action4
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3)
           , &runtime_support::create_component4<
                 Component , A0 , A1 , A2 , A3>
@@ -478,7 +478,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3>
     struct create_component_direct_action4
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3)
           , &runtime_support::create_component4<
                 Component , A0 , A1 , A2 , A3>
@@ -541,7 +541,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2>
     struct bulk_create_component_action4
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2)
           , &runtime_support::bulk_create_component4<
@@ -552,7 +552,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2>
     struct bulk_create_component_direct_action4
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2)
           , &runtime_support::bulk_create_component4<
@@ -613,7 +613,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4>
     struct create_component_action5
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4)
           , &runtime_support::create_component5<
                 Component , A0 , A1 , A2 , A3 , A4>
@@ -623,7 +623,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4>
     struct create_component_direct_action5
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4)
           , &runtime_support::create_component5<
                 Component , A0 , A1 , A2 , A3 , A4>
@@ -686,7 +686,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3>
     struct bulk_create_component_action5
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3)
           , &runtime_support::bulk_create_component5<
@@ -697,7 +697,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3>
     struct bulk_create_component_direct_action5
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3)
           , &runtime_support::bulk_create_component5<
@@ -758,7 +758,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5>
     struct create_component_action6
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5)
           , &runtime_support::create_component6<
                 Component , A0 , A1 , A2 , A3 , A4 , A5>
@@ -768,7 +768,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5>
     struct create_component_direct_action6
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5)
           , &runtime_support::create_component6<
                 Component , A0 , A1 , A2 , A3 , A4 , A5>
@@ -831,7 +831,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4>
     struct bulk_create_component_action6
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4)
           , &runtime_support::bulk_create_component6<
@@ -842,7 +842,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4>
     struct bulk_create_component_direct_action6
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4)
           , &runtime_support::bulk_create_component6<
@@ -903,7 +903,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6>
     struct create_component_action7
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6)
           , &runtime_support::create_component7<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6>
@@ -913,7 +913,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6>
     struct create_component_direct_action7
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6)
           , &runtime_support::create_component7<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6>
@@ -976,7 +976,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5>
     struct bulk_create_component_action7
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5)
           , &runtime_support::bulk_create_component7<
@@ -987,7 +987,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5>
     struct bulk_create_component_direct_action7
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5)
           , &runtime_support::bulk_create_component7<
@@ -1048,7 +1048,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7>
     struct create_component_action8
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7)
           , &runtime_support::create_component8<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7>
@@ -1058,7 +1058,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7>
     struct create_component_direct_action8
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7)
           , &runtime_support::create_component8<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7>
@@ -1121,7 +1121,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6>
     struct bulk_create_component_action8
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6)
           , &runtime_support::bulk_create_component8<
@@ -1132,7 +1132,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6>
     struct bulk_create_component_direct_action8
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6)
           , &runtime_support::bulk_create_component8<
@@ -1193,7 +1193,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8>
     struct create_component_action9
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8)
           , &runtime_support::create_component9<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8>
@@ -1203,7 +1203,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8>
     struct create_component_direct_action9
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8)
           , &runtime_support::create_component9<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8>
@@ -1266,7 +1266,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7>
     struct bulk_create_component_action9
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7)
           , &runtime_support::bulk_create_component9<
@@ -1277,7 +1277,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7>
     struct bulk_create_component_direct_action9
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7)
           , &runtime_support::bulk_create_component9<
@@ -1338,7 +1338,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9>
     struct create_component_action10
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9)
           , &runtime_support::create_component10<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9>
@@ -1348,7 +1348,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9>
     struct create_component_direct_action10
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9)
           , &runtime_support::create_component10<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9>
@@ -1411,7 +1411,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8>
     struct bulk_create_component_action10
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8)
           , &runtime_support::bulk_create_component10<
@@ -1422,7 +1422,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8>
     struct bulk_create_component_direct_action10
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8)
           , &runtime_support::bulk_create_component10<
diff --git a/hpx/runtime/components/server/preprocessed/runtime_support_implementations_15.hpp b/hpx/runtime/components/server/preprocessed/runtime_support_implementations_15.hpp
index 17fdd9b5a644..62d99d714037 100644
--- a/hpx/runtime/components/server/preprocessed/runtime_support_implementations_15.hpp
+++ b/hpx/runtime/components/server/preprocessed/runtime_support_implementations_15.hpp
@@ -15,7 +15,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
        >
     struct create_component_action0
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)()
           , &runtime_support::create_component0<
                 Component >
@@ -25,7 +25,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
        >
     struct create_component_direct_action0
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)()
           , &runtime_support::create_component0<
                 Component >
@@ -85,7 +85,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0>
     struct create_component_action1
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0)
           , &runtime_support::create_component1<
                 Component , A0>
@@ -95,7 +95,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0>
     struct create_component_direct_action1
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0)
           , &runtime_support::create_component1<
                 Component , A0>
@@ -106,7 +106,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
        >
     struct bulk_create_component_action1
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t )
           , &runtime_support::bulk_create_component1<
@@ -117,7 +117,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
        >
     struct bulk_create_component_direct_action1
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t )
           , &runtime_support::bulk_create_component1<
@@ -178,7 +178,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1>
     struct create_component_action2
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1)
           , &runtime_support::create_component2<
                 Component , A0 , A1>
@@ -188,7 +188,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1>
     struct create_component_direct_action2
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1)
           , &runtime_support::create_component2<
                 Component , A0 , A1>
@@ -251,7 +251,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0>
     struct bulk_create_component_action2
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0)
           , &runtime_support::bulk_create_component2<
@@ -262,7 +262,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0>
     struct bulk_create_component_direct_action2
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0)
           , &runtime_support::bulk_create_component2<
@@ -323,7 +323,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2>
     struct create_component_action3
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2)
           , &runtime_support::create_component3<
                 Component , A0 , A1 , A2>
@@ -333,7 +333,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2>
     struct create_component_direct_action3
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2)
           , &runtime_support::create_component3<
                 Component , A0 , A1 , A2>
@@ -396,7 +396,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1>
     struct bulk_create_component_action3
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1)
           , &runtime_support::bulk_create_component3<
@@ -407,7 +407,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1>
     struct bulk_create_component_direct_action3
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1)
           , &runtime_support::bulk_create_component3<
@@ -468,7 +468,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3>
     struct create_component_action4
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3)
           , &runtime_support::create_component4<
                 Component , A0 , A1 , A2 , A3>
@@ -478,7 +478,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3>
     struct create_component_direct_action4
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3)
           , &runtime_support::create_component4<
                 Component , A0 , A1 , A2 , A3>
@@ -541,7 +541,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2>
     struct bulk_create_component_action4
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2)
           , &runtime_support::bulk_create_component4<
@@ -552,7 +552,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2>
     struct bulk_create_component_direct_action4
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2)
           , &runtime_support::bulk_create_component4<
@@ -613,7 +613,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4>
     struct create_component_action5
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4)
           , &runtime_support::create_component5<
                 Component , A0 , A1 , A2 , A3 , A4>
@@ -623,7 +623,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4>
     struct create_component_direct_action5
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4)
           , &runtime_support::create_component5<
                 Component , A0 , A1 , A2 , A3 , A4>
@@ -686,7 +686,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3>
     struct bulk_create_component_action5
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3)
           , &runtime_support::bulk_create_component5<
@@ -697,7 +697,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3>
     struct bulk_create_component_direct_action5
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3)
           , &runtime_support::bulk_create_component5<
@@ -758,7 +758,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5>
     struct create_component_action6
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5)
           , &runtime_support::create_component6<
                 Component , A0 , A1 , A2 , A3 , A4 , A5>
@@ -768,7 +768,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5>
     struct create_component_direct_action6
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5)
           , &runtime_support::create_component6<
                 Component , A0 , A1 , A2 , A3 , A4 , A5>
@@ -831,7 +831,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4>
     struct bulk_create_component_action6
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4)
           , &runtime_support::bulk_create_component6<
@@ -842,7 +842,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4>
     struct bulk_create_component_direct_action6
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4)
           , &runtime_support::bulk_create_component6<
@@ -903,7 +903,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6>
     struct create_component_action7
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6)
           , &runtime_support::create_component7<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6>
@@ -913,7 +913,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6>
     struct create_component_direct_action7
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6)
           , &runtime_support::create_component7<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6>
@@ -976,7 +976,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5>
     struct bulk_create_component_action7
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5)
           , &runtime_support::bulk_create_component7<
@@ -987,7 +987,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5>
     struct bulk_create_component_direct_action7
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5)
           , &runtime_support::bulk_create_component7<
@@ -1048,7 +1048,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7>
     struct create_component_action8
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7)
           , &runtime_support::create_component8<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7>
@@ -1058,7 +1058,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7>
     struct create_component_direct_action8
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7)
           , &runtime_support::create_component8<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7>
@@ -1121,7 +1121,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6>
     struct bulk_create_component_action8
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6)
           , &runtime_support::bulk_create_component8<
@@ -1132,7 +1132,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6>
     struct bulk_create_component_direct_action8
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6)
           , &runtime_support::bulk_create_component8<
@@ -1193,7 +1193,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8>
     struct create_component_action9
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8)
           , &runtime_support::create_component9<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8>
@@ -1203,7 +1203,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8>
     struct create_component_direct_action9
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8)
           , &runtime_support::create_component9<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8>
@@ -1266,7 +1266,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7>
     struct bulk_create_component_action9
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7)
           , &runtime_support::bulk_create_component9<
@@ -1277,7 +1277,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7>
     struct bulk_create_component_direct_action9
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7)
           , &runtime_support::bulk_create_component9<
@@ -1338,7 +1338,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9>
     struct create_component_action10
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9)
           , &runtime_support::create_component10<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9>
@@ -1348,7 +1348,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9>
     struct create_component_direct_action10
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9)
           , &runtime_support::create_component10<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9>
@@ -1411,7 +1411,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8>
     struct bulk_create_component_action10
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8)
           , &runtime_support::bulk_create_component10<
@@ -1422,7 +1422,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8>
     struct bulk_create_component_direct_action10
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8)
           , &runtime_support::bulk_create_component10<
@@ -1483,7 +1483,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10>
     struct create_component_action11
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10)
           , &runtime_support::create_component11<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10>
@@ -1493,7 +1493,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10>
     struct create_component_direct_action11
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10)
           , &runtime_support::create_component11<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10>
@@ -1556,7 +1556,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9>
     struct bulk_create_component_action11
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9)
           , &runtime_support::bulk_create_component11<
@@ -1567,7 +1567,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9>
     struct bulk_create_component_direct_action11
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9)
           , &runtime_support::bulk_create_component11<
@@ -1628,7 +1628,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11>
     struct create_component_action12
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11)
           , &runtime_support::create_component12<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11>
@@ -1638,7 +1638,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11>
     struct create_component_direct_action12
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11)
           , &runtime_support::create_component12<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11>
@@ -1701,7 +1701,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10>
     struct bulk_create_component_action12
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10)
           , &runtime_support::bulk_create_component12<
@@ -1712,7 +1712,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10>
     struct bulk_create_component_direct_action12
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10)
           , &runtime_support::bulk_create_component12<
@@ -1773,7 +1773,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12>
     struct create_component_action13
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12)
           , &runtime_support::create_component13<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12>
@@ -1783,7 +1783,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12>
     struct create_component_direct_action13
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12)
           , &runtime_support::create_component13<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12>
@@ -1846,7 +1846,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11>
     struct bulk_create_component_action13
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11)
           , &runtime_support::bulk_create_component13<
@@ -1857,7 +1857,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11>
     struct bulk_create_component_direct_action13
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11)
           , &runtime_support::bulk_create_component13<
@@ -1918,7 +1918,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13>
     struct create_component_action14
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13)
           , &runtime_support::create_component14<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13>
@@ -1928,7 +1928,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13>
     struct create_component_direct_action14
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13)
           , &runtime_support::create_component14<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13>
@@ -1991,7 +1991,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12>
     struct bulk_create_component_action14
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12)
           , &runtime_support::bulk_create_component14<
@@ -2002,7 +2002,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12>
     struct bulk_create_component_direct_action14
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12)
           , &runtime_support::bulk_create_component14<
@@ -2063,7 +2063,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14>
     struct create_component_action15
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14)
           , &runtime_support::create_component15<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14>
@@ -2073,7 +2073,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14>
     struct create_component_direct_action15
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14)
           , &runtime_support::create_component15<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14>
@@ -2136,7 +2136,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13>
     struct bulk_create_component_action15
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13)
           , &runtime_support::bulk_create_component15<
@@ -2147,7 +2147,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13>
     struct bulk_create_component_direct_action15
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13)
           , &runtime_support::bulk_create_component15<
diff --git a/hpx/runtime/components/server/preprocessed/runtime_support_implementations_20.hpp b/hpx/runtime/components/server/preprocessed/runtime_support_implementations_20.hpp
index f89eccc2cdbf..59ed1349b700 100644
--- a/hpx/runtime/components/server/preprocessed/runtime_support_implementations_20.hpp
+++ b/hpx/runtime/components/server/preprocessed/runtime_support_implementations_20.hpp
@@ -15,7 +15,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
        >
     struct create_component_action0
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)()
           , &runtime_support::create_component0<
                 Component >
@@ -25,7 +25,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
        >
     struct create_component_direct_action0
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)()
           , &runtime_support::create_component0<
                 Component >
@@ -85,7 +85,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0>
     struct create_component_action1
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0)
           , &runtime_support::create_component1<
                 Component , A0>
@@ -95,7 +95,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0>
     struct create_component_direct_action1
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0)
           , &runtime_support::create_component1<
                 Component , A0>
@@ -106,7 +106,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
        >
     struct bulk_create_component_action1
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t )
           , &runtime_support::bulk_create_component1<
@@ -117,7 +117,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
        >
     struct bulk_create_component_direct_action1
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t )
           , &runtime_support::bulk_create_component1<
@@ -178,7 +178,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1>
     struct create_component_action2
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1)
           , &runtime_support::create_component2<
                 Component , A0 , A1>
@@ -188,7 +188,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1>
     struct create_component_direct_action2
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1)
           , &runtime_support::create_component2<
                 Component , A0 , A1>
@@ -251,7 +251,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0>
     struct bulk_create_component_action2
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0)
           , &runtime_support::bulk_create_component2<
@@ -262,7 +262,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0>
     struct bulk_create_component_direct_action2
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0)
           , &runtime_support::bulk_create_component2<
@@ -323,7 +323,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2>
     struct create_component_action3
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2)
           , &runtime_support::create_component3<
                 Component , A0 , A1 , A2>
@@ -333,7 +333,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2>
     struct create_component_direct_action3
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2)
           , &runtime_support::create_component3<
                 Component , A0 , A1 , A2>
@@ -396,7 +396,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1>
     struct bulk_create_component_action3
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1)
           , &runtime_support::bulk_create_component3<
@@ -407,7 +407,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1>
     struct bulk_create_component_direct_action3
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1)
           , &runtime_support::bulk_create_component3<
@@ -468,7 +468,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3>
     struct create_component_action4
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3)
           , &runtime_support::create_component4<
                 Component , A0 , A1 , A2 , A3>
@@ -478,7 +478,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3>
     struct create_component_direct_action4
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3)
           , &runtime_support::create_component4<
                 Component , A0 , A1 , A2 , A3>
@@ -541,7 +541,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2>
     struct bulk_create_component_action4
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2)
           , &runtime_support::bulk_create_component4<
@@ -552,7 +552,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2>
     struct bulk_create_component_direct_action4
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2)
           , &runtime_support::bulk_create_component4<
@@ -613,7 +613,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4>
     struct create_component_action5
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4)
           , &runtime_support::create_component5<
                 Component , A0 , A1 , A2 , A3 , A4>
@@ -623,7 +623,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4>
     struct create_component_direct_action5
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4)
           , &runtime_support::create_component5<
                 Component , A0 , A1 , A2 , A3 , A4>
@@ -686,7 +686,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3>
     struct bulk_create_component_action5
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3)
           , &runtime_support::bulk_create_component5<
@@ -697,7 +697,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3>
     struct bulk_create_component_direct_action5
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3)
           , &runtime_support::bulk_create_component5<
@@ -758,7 +758,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5>
     struct create_component_action6
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5)
           , &runtime_support::create_component6<
                 Component , A0 , A1 , A2 , A3 , A4 , A5>
@@ -768,7 +768,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5>
     struct create_component_direct_action6
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5)
           , &runtime_support::create_component6<
                 Component , A0 , A1 , A2 , A3 , A4 , A5>
@@ -831,7 +831,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4>
     struct bulk_create_component_action6
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4)
           , &runtime_support::bulk_create_component6<
@@ -842,7 +842,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4>
     struct bulk_create_component_direct_action6
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4)
           , &runtime_support::bulk_create_component6<
@@ -903,7 +903,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6>
     struct create_component_action7
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6)
           , &runtime_support::create_component7<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6>
@@ -913,7 +913,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6>
     struct create_component_direct_action7
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6)
           , &runtime_support::create_component7<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6>
@@ -976,7 +976,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5>
     struct bulk_create_component_action7
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5)
           , &runtime_support::bulk_create_component7<
@@ -987,7 +987,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5>
     struct bulk_create_component_direct_action7
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5)
           , &runtime_support::bulk_create_component7<
@@ -1048,7 +1048,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7>
     struct create_component_action8
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7)
           , &runtime_support::create_component8<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7>
@@ -1058,7 +1058,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7>
     struct create_component_direct_action8
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7)
           , &runtime_support::create_component8<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7>
@@ -1121,7 +1121,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6>
     struct bulk_create_component_action8
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6)
           , &runtime_support::bulk_create_component8<
@@ -1132,7 +1132,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6>
     struct bulk_create_component_direct_action8
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6)
           , &runtime_support::bulk_create_component8<
@@ -1193,7 +1193,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8>
     struct create_component_action9
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8)
           , &runtime_support::create_component9<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8>
@@ -1203,7 +1203,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8>
     struct create_component_direct_action9
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8)
           , &runtime_support::create_component9<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8>
@@ -1266,7 +1266,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7>
     struct bulk_create_component_action9
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7)
           , &runtime_support::bulk_create_component9<
@@ -1277,7 +1277,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7>
     struct bulk_create_component_direct_action9
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7)
           , &runtime_support::bulk_create_component9<
@@ -1338,7 +1338,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9>
     struct create_component_action10
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9)
           , &runtime_support::create_component10<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9>
@@ -1348,7 +1348,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9>
     struct create_component_direct_action10
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9)
           , &runtime_support::create_component10<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9>
@@ -1411,7 +1411,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8>
     struct bulk_create_component_action10
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8)
           , &runtime_support::bulk_create_component10<
@@ -1422,7 +1422,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8>
     struct bulk_create_component_direct_action10
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8)
           , &runtime_support::bulk_create_component10<
@@ -1483,7 +1483,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10>
     struct create_component_action11
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10)
           , &runtime_support::create_component11<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10>
@@ -1493,7 +1493,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10>
     struct create_component_direct_action11
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10)
           , &runtime_support::create_component11<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10>
@@ -1556,7 +1556,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9>
     struct bulk_create_component_action11
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9)
           , &runtime_support::bulk_create_component11<
@@ -1567,7 +1567,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9>
     struct bulk_create_component_direct_action11
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9)
           , &runtime_support::bulk_create_component11<
@@ -1628,7 +1628,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11>
     struct create_component_action12
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11)
           , &runtime_support::create_component12<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11>
@@ -1638,7 +1638,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11>
     struct create_component_direct_action12
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11)
           , &runtime_support::create_component12<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11>
@@ -1701,7 +1701,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10>
     struct bulk_create_component_action12
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10)
           , &runtime_support::bulk_create_component12<
@@ -1712,7 +1712,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10>
     struct bulk_create_component_direct_action12
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10)
           , &runtime_support::bulk_create_component12<
@@ -1773,7 +1773,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12>
     struct create_component_action13
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12)
           , &runtime_support::create_component13<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12>
@@ -1783,7 +1783,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12>
     struct create_component_direct_action13
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12)
           , &runtime_support::create_component13<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12>
@@ -1846,7 +1846,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11>
     struct bulk_create_component_action13
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11)
           , &runtime_support::bulk_create_component13<
@@ -1857,7 +1857,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11>
     struct bulk_create_component_direct_action13
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11)
           , &runtime_support::bulk_create_component13<
@@ -1918,7 +1918,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13>
     struct create_component_action14
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13)
           , &runtime_support::create_component14<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13>
@@ -1928,7 +1928,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13>
     struct create_component_direct_action14
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13)
           , &runtime_support::create_component14<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13>
@@ -1991,7 +1991,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12>
     struct bulk_create_component_action14
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12)
           , &runtime_support::bulk_create_component14<
@@ -2002,7 +2002,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12>
     struct bulk_create_component_direct_action14
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12)
           , &runtime_support::bulk_create_component14<
@@ -2063,7 +2063,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14>
     struct create_component_action15
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14)
           , &runtime_support::create_component15<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14>
@@ -2073,7 +2073,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14>
     struct create_component_direct_action15
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14)
           , &runtime_support::create_component15<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14>
@@ -2136,7 +2136,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13>
     struct bulk_create_component_action15
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13)
           , &runtime_support::bulk_create_component15<
@@ -2147,7 +2147,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13>
     struct bulk_create_component_direct_action15
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13)
           , &runtime_support::bulk_create_component15<
@@ -2208,7 +2208,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15>
     struct create_component_action16
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15)
           , &runtime_support::create_component16<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15>
@@ -2218,7 +2218,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15>
     struct create_component_direct_action16
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15)
           , &runtime_support::create_component16<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15>
@@ -2281,7 +2281,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14>
     struct bulk_create_component_action16
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14)
           , &runtime_support::bulk_create_component16<
@@ -2292,7 +2292,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14>
     struct bulk_create_component_direct_action16
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14)
           , &runtime_support::bulk_create_component16<
@@ -2353,7 +2353,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15 , typename A16>
     struct create_component_action17
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16)
           , &runtime_support::create_component17<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16>
@@ -2363,7 +2363,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15 , typename A16>
     struct create_component_direct_action17
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16)
           , &runtime_support::create_component17<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16>
@@ -2426,7 +2426,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15>
     struct bulk_create_component_action17
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15)
           , &runtime_support::bulk_create_component17<
@@ -2437,7 +2437,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15>
     struct bulk_create_component_direct_action17
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15)
           , &runtime_support::bulk_create_component17<
@@ -2498,7 +2498,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15 , typename A16 , typename A17>
     struct create_component_action18
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16 , A17)
           , &runtime_support::create_component18<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16 , A17>
@@ -2508,7 +2508,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15 , typename A16 , typename A17>
     struct create_component_direct_action18
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16 , A17)
           , &runtime_support::create_component18<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16 , A17>
@@ -2571,7 +2571,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15 , typename A16>
     struct bulk_create_component_action18
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16)
           , &runtime_support::bulk_create_component18<
@@ -2582,7 +2582,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15 , typename A16>
     struct bulk_create_component_direct_action18
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16)
           , &runtime_support::bulk_create_component18<
@@ -2643,7 +2643,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15 , typename A16 , typename A17 , typename A18>
     struct create_component_action19
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16 , A17 , A18)
           , &runtime_support::create_component19<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16 , A17 , A18>
@@ -2653,7 +2653,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15 , typename A16 , typename A17 , typename A18>
     struct create_component_direct_action19
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16 , A17 , A18)
           , &runtime_support::create_component19<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16 , A17 , A18>
@@ -2716,7 +2716,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15 , typename A16 , typename A17>
     struct bulk_create_component_action19
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16 , A17)
           , &runtime_support::bulk_create_component19<
@@ -2727,7 +2727,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15 , typename A16 , typename A17>
     struct bulk_create_component_direct_action19
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16 , A17)
           , &runtime_support::bulk_create_component19<
@@ -2788,7 +2788,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15 , typename A16 , typename A17 , typename A18 , typename A19>
     struct create_component_action20
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16 , A17 , A18 , A19)
           , &runtime_support::create_component20<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16 , A17 , A18 , A19>
@@ -2798,7 +2798,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15 , typename A16 , typename A17 , typename A18 , typename A19>
     struct create_component_direct_action20
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16 , A17 , A18 , A19)
           , &runtime_support::create_component20<
                 Component , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16 , A17 , A18 , A19>
@@ -2861,7 +2861,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15 , typename A16 , typename A17 , typename A18>
     struct bulk_create_component_action20
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16 , A17 , A18)
           , &runtime_support::bulk_create_component20<
@@ -2872,7 +2872,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9 , typename A10 , typename A11 , typename A12 , typename A13 , typename A14 , typename A15 , typename A16 , typename A17 , typename A18>
     struct bulk_create_component_direct_action20
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 , A9 , A10 , A11 , A12 , A13 , A14 , A15 , A16 , A17 , A18)
           , &runtime_support::bulk_create_component20<
diff --git a/hpx/runtime/components/server/preprocessed/runtime_support_implementations_5.hpp b/hpx/runtime/components/server/preprocessed/runtime_support_implementations_5.hpp
index e9d477fc478b..501468204233 100644
--- a/hpx/runtime/components/server/preprocessed/runtime_support_implementations_5.hpp
+++ b/hpx/runtime/components/server/preprocessed/runtime_support_implementations_5.hpp
@@ -15,7 +15,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
        >
     struct create_component_action0
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)()
           , &runtime_support::create_component0<
                 Component >
@@ -25,7 +25,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
        >
     struct create_component_direct_action0
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)()
           , &runtime_support::create_component0<
                 Component >
@@ -85,7 +85,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0>
     struct create_component_action1
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0)
           , &runtime_support::create_component1<
                 Component , A0>
@@ -95,7 +95,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0>
     struct create_component_direct_action1
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0)
           , &runtime_support::create_component1<
                 Component , A0>
@@ -106,7 +106,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
        >
     struct bulk_create_component_action1
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t )
           , &runtime_support::bulk_create_component1<
@@ -117,7 +117,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
        >
     struct bulk_create_component_direct_action1
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t )
           , &runtime_support::bulk_create_component1<
@@ -178,7 +178,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1>
     struct create_component_action2
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1)
           , &runtime_support::create_component2<
                 Component , A0 , A1>
@@ -188,7 +188,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1>
     struct create_component_direct_action2
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1)
           , &runtime_support::create_component2<
                 Component , A0 , A1>
@@ -251,7 +251,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0>
     struct bulk_create_component_action2
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0)
           , &runtime_support::bulk_create_component2<
@@ -262,7 +262,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0>
     struct bulk_create_component_direct_action2
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0)
           , &runtime_support::bulk_create_component2<
@@ -323,7 +323,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2>
     struct create_component_action3
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2)
           , &runtime_support::create_component3<
                 Component , A0 , A1 , A2>
@@ -333,7 +333,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2>
     struct create_component_direct_action3
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2)
           , &runtime_support::create_component3<
                 Component , A0 , A1 , A2>
@@ -396,7 +396,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1>
     struct bulk_create_component_action3
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1)
           , &runtime_support::bulk_create_component3<
@@ -407,7 +407,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1>
     struct bulk_create_component_direct_action3
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1)
           , &runtime_support::bulk_create_component3<
@@ -468,7 +468,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3>
     struct create_component_action4
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3)
           , &runtime_support::create_component4<
                 Component , A0 , A1 , A2 , A3>
@@ -478,7 +478,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3>
     struct create_component_direct_action4
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3)
           , &runtime_support::create_component4<
                 Component , A0 , A1 , A2 , A3>
@@ -541,7 +541,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2>
     struct bulk_create_component_action4
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2)
           , &runtime_support::bulk_create_component4<
@@ -552,7 +552,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2>
     struct bulk_create_component_direct_action4
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2)
           , &runtime_support::bulk_create_component4<
@@ -613,7 +613,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4>
     struct create_component_action5
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4)
           , &runtime_support::create_component5<
                 Component , A0 , A1 , A2 , A3 , A4>
@@ -623,7 +623,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3 , typename A4>
     struct create_component_direct_action5
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(A0 , A1 , A2 , A3 , A4)
           , &runtime_support::create_component5<
                 Component , A0 , A1 , A2 , A3 , A4>
@@ -686,7 +686,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3>
     struct bulk_create_component_action5
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3)
           , &runtime_support::bulk_create_component5<
@@ -697,7 +697,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       , typename A0 , typename A1 , typename A2 , typename A3>
     struct bulk_create_component_direct_action5
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t , A0 , A1 , A2 , A3)
           , &runtime_support::bulk_create_component5<
diff --git a/hpx/runtime/components/server/runtime_support.hpp b/hpx/runtime/components/server/runtime_support.hpp
index 82fa20a2b74f..672ee353f0c9 100644
--- a/hpx/runtime/components/server/runtime_support.hpp
+++ b/hpx/runtime/components/server/runtime_support.hpp
@@ -744,7 +744,7 @@ namespace hpx { namespace components { namespace server
 {
     template <typename Component>
     struct copy_create_component_action
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(
                 boost::shared_ptr<Component> const&, bool)
           , &runtime_support::copy_create_component<Component>
@@ -752,7 +752,7 @@ namespace hpx { namespace components { namespace server
     {};
     template <typename Component>
     struct migrate_component_here_action
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(
                 boost::shared_ptr<Component> const&, naming::id_type)
           , &runtime_support::migrate_component_to_here<Component>
diff --git a/hpx/runtime/components/server/runtime_support_implementations.hpp b/hpx/runtime/components/server/runtime_support_implementations.hpp
index 707b3759d697..9709e8047938 100644
--- a/hpx/runtime/components/server/runtime_support_implementations.hpp
+++ b/hpx/runtime/components/server/runtime_support_implementations.hpp
@@ -97,7 +97,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       BOOST_PP_COMMA_IF(N) BOOST_PP_ENUM_PARAMS(N, typename A)>
     struct BOOST_PP_CAT(create_component_action, N)
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             naming::gid_type (runtime_support::*)(BOOST_PP_ENUM_PARAMS(N, A))
           , &runtime_support::BOOST_PP_CAT(create_component, N)<
                 Component BOOST_PP_COMMA_IF(N) BOOST_PP_ENUM_PARAMS(N, A)>
@@ -108,7 +108,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       BOOST_PP_COMMA_IF(N) BOOST_PP_ENUM_PARAMS(N, typename A)>
     struct BOOST_PP_CAT(create_component_direct_action, N)
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             naming::gid_type (runtime_support::*)(BOOST_PP_ENUM_PARAMS(N, A))
           , &runtime_support::BOOST_PP_CAT(create_component, N)<
                 Component BOOST_PP_COMMA_IF(N) BOOST_PP_ENUM_PARAMS(N, A)>
@@ -181,7 +181,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       BOOST_PP_COMMA_IF(M) BOOST_PP_ENUM_PARAMS(M, typename A)>
     struct BOOST_PP_CAT(bulk_create_component_action, N)
-      : ::hpx::actions::component_action<
+      : ::hpx::actions::action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t BOOST_PP_COMMA_IF(M) BOOST_PP_ENUM_PARAMS(M, A))
           , &runtime_support::BOOST_PP_CAT(bulk_create_component, N)<
@@ -193,7 +193,7 @@ namespace hpx { namespace components { namespace server
     template <typename Component
       BOOST_PP_COMMA_IF(M) BOOST_PP_ENUM_PARAMS(M, typename A)>
     struct BOOST_PP_CAT(bulk_create_component_direct_action, N)
-      : ::hpx::actions::component_direct_action<
+      : ::hpx::actions::direct_action<
             std::vector<naming::gid_type> (runtime_support::*)(
                 std::size_t BOOST_PP_COMMA_IF(M) BOOST_PP_ENUM_PARAMS(M, A))
           , &runtime_support::BOOST_PP_CAT(bulk_create_component, N)<
diff --git a/src/hpx_init.cpp b/src/hpx_init.cpp
index 56344e9ea8b5..50946af5bdad 100644
--- a/src/hpx_init.cpp
+++ b/src/hpx_init.cpp
@@ -69,7 +69,7 @@ HPX_PLAIN_ACTION(hpx::detail::list_component_type,
 
 typedef
     hpx::util::detail::bound_action<
-        hpx::actions::plain_action<
+        hpx::actions::action<
             void (*)(std::string const&, const hpx::naming::gid_type&)
           , hpx::detail::list_symbolic_name
           , hpx::actions::detail::this_type
@@ -94,7 +94,7 @@ HPX_UTIL_REGISTER_FUNCTION(
 
 typedef
     hpx::util::detail::bound_action<
-        hpx::actions::plain_action<
+        hpx::actions::action<
             void (*)(std::string const&, int)
           , hpx::detail::list_component_type
           , hpx::actions::detail::this_type
diff --git a/src/runtime/agas/big_boot_barrier.cpp b/src/runtime/agas/big_boot_barrier.cpp
index 8694594a6f28..08a23fe97de7 100644
--- a/src/runtime/agas/big_boot_barrier.cpp
+++ b/src/runtime/agas/big_boot_barrier.cpp
@@ -205,12 +205,12 @@ void notify_worker(notification_header const& header);
 // }}}
 
 // {{{ early action types
-typedef actions::plain_action<
+typedef actions::action<
     void (*)(registration_header const&)
   , register_worker
 > register_worker_action;
 
-typedef actions::plain_action<
+typedef actions::action<
     void (*)(notification_header const&)
   , notify_worker
 > notify_worker_action;
@@ -276,12 +276,12 @@ struct notification_header_security
 void register_worker_security(registration_header_security const& header);
 void notify_worker_security(notification_header_security const& header);
 
-typedef actions::plain_action<
+typedef actions::action<
     void (*)(registration_header_security const&)
   , register_worker_security
 > register_worker_security_action;
 
-typedef actions::plain_action<
+typedef actions::action<
     void (*)(notification_header_security const&)
   , notify_worker_security
 > notify_worker_security_action;
diff --git a/tests/regressions/actions/plain_action_dataflow_move_semantics.cpp b/tests/regressions/actions/plain_action_dataflow_move_semantics.cpp
index 50ac3cc16ed4..42a5d3a69f8f 100644
--- a/tests/regressions/actions/plain_action_dataflow_move_semantics.cpp
+++ b/tests/regressions/actions/plain_action_dataflow_move_semantics.cpp
@@ -24,8 +24,8 @@ using boost::program_options::value;
 
 using hpx::naming::id_type;
 
-using hpx::actions::plain_action;
-using hpx::actions::plain_direct_action;
+using hpx::actions::action;
+using hpx::actions::direct_action;
 
 using hpx::lcos::dataflow;
 
@@ -44,10 +44,10 @@ std::size_t pass_movable_object(movable_object const& obj)
 }
 
 // 'normal' actions (execution is scheduled on a new thread)
-typedef plain_action<
+typedef action<
     void (*)(movable_object const&), pass_movable_object_void
 > pass_movable_object_void_action;
-typedef plain_action<
+typedef action<
     std::size_t (*)(movable_object const&), pass_movable_object
 > pass_movable_object_action;
 
@@ -55,10 +55,10 @@ HPX_REGISTER_PLAIN_ACTION(pass_movable_object_void_action)
 HPX_REGISTER_PLAIN_ACTION(pass_movable_object_action)
 
 // direct actions (execution happens in the calling thread)
-typedef plain_direct_action<
+typedef direct_action<
     void (*)(movable_object const&), pass_movable_object_void
 > pass_movable_object_void_direct_action;
-typedef plain_direct_action<
+typedef direct_action<
     std::size_t (*)(movable_object const&), pass_movable_object
 > pass_movable_object_direct_action;
 
@@ -73,10 +73,10 @@ std::size_t pass_non_movable_object(non_movable_object const& obj)
 }
 
 // 'normal' actions (execution is scheduled on a new thread
-typedef plain_action<
+typedef action<
     void (*)(non_movable_object const&), pass_non_movable_object_void
 > pass_non_movable_object_void_action;
-typedef plain_action<
+typedef action<
     std::size_t (*)(non_movable_object const&), pass_non_movable_object
 > pass_non_movable_object_action;
 
@@ -84,10 +84,10 @@ HPX_REGISTER_PLAIN_ACTION(pass_non_movable_object_void_action)
 HPX_REGISTER_PLAIN_ACTION(pass_non_movable_object_action)
 
 // direct actions (execution happens in the calling thread)
-typedef plain_direct_action<
+typedef direct_action<
     void (*)(non_movable_object const&), pass_non_movable_object_void
 > pass_non_movable_object_void_direct_action;
-typedef plain_direct_action<
+typedef direct_action<
     std::size_t (*)(non_movable_object const&), pass_non_movable_object
 > pass_non_movable_object_direct_action;
 
@@ -105,11 +105,11 @@ movable_object return_movable_object()
 }
 
 // 'normal' actions (execution is scheduled on a new thread)
-typedef plain_action<
+typedef action<
     movable_object (*)(), return_movable_object
 > return_movable_object_action;
 
-typedef plain_action<
+typedef action<
     non_movable_object (*)(), return_non_movable_object
 > return_non_movable_object_action;
 
@@ -117,11 +117,11 @@ HPX_REGISTER_PLAIN_ACTION(return_movable_object_action)
 HPX_REGISTER_PLAIN_ACTION(return_non_movable_object_action)
 
 // direct actions (execution happens in the calling thread)
-typedef plain_direct_action<
+typedef direct_action<
     movable_object (*)(), return_movable_object
 > return_movable_object_direct_action;
 
-typedef plain_direct_action<
+typedef direct_action<
     non_movable_object (*)(), return_non_movable_object
 > return_non_movable_object_direct_action;
 
diff --git a/tests/regressions/actions/plain_action_move_semantics.cpp b/tests/regressions/actions/plain_action_move_semantics.cpp
index a073cf3eaf54..e01e878af660 100644
--- a/tests/regressions/actions/plain_action_move_semantics.cpp
+++ b/tests/regressions/actions/plain_action_move_semantics.cpp
@@ -26,8 +26,8 @@ using boost::program_options::value;
 
 using hpx::naming::id_type;
 
-using hpx::actions::plain_action;
-using hpx::actions::plain_direct_action;
+using hpx::actions::action;
+using hpx::actions::direct_action;
 
 using hpx::async;
 
@@ -50,10 +50,10 @@ HPX_PLAIN_ACTION(pass_movable_object, pass_movable_object_action)
 HPX_PLAIN_ACTION(pass_movable_object_void, pass_movable_object_void_action)
 
 // direct actions (execution happens in the calling thread)
-typedef plain_direct_action<
+typedef direct_action<
     void (*)(movable_object const&), pass_movable_object_void
 > pass_movable_object_void_direct_action;
-typedef plain_direct_action<
+typedef direct_action<
     std::size_t (*)(movable_object const&), pass_movable_object
 > pass_movable_object_direct_action;
 
@@ -72,10 +72,10 @@ HPX_PLAIN_ACTION(pass_movable_object_value, pass_movable_object_value_action)
 HPX_PLAIN_ACTION(pass_movable_object_value_void, pass_movable_object_value_void_action)
 
 // direct actions (execution happens in the calling thread)
-typedef plain_direct_action<
+typedef direct_action<
     void (*)(movable_object), pass_movable_object_value_void
 > pass_movable_object_value_void_direct_action;
-typedef plain_direct_action<
+typedef direct_action<
     std::size_t (*)(movable_object), pass_movable_object_value
 > pass_movable_object_value_direct_action;
 
@@ -90,10 +90,10 @@ std::size_t pass_non_movable_object(non_movable_object const& obj)
 }
 
 // 'normal' actions (execution is scheduled on a new thread)
-typedef plain_action<
+typedef action<
     void (*)(non_movable_object const&), pass_non_movable_object_void
 > pass_non_movable_object_void_action;
-typedef plain_action<
+typedef action<
     std::size_t (*)(non_movable_object const&), pass_non_movable_object
 > pass_non_movable_object_action;
 
@@ -101,10 +101,10 @@ HPX_REGISTER_PLAIN_ACTION(pass_non_movable_object_void_action)
 HPX_REGISTER_PLAIN_ACTION(pass_non_movable_object_action)
 
 // direct actions (execution happens in the calling thread)
-typedef plain_direct_action<
+typedef direct_action<
     void (*)(non_movable_object const&), pass_non_movable_object_void
 > pass_non_movable_object_void_direct_action;
-typedef plain_direct_action<
+typedef direct_action<
     std::size_t (*)(non_movable_object const&), pass_non_movable_object
 > pass_non_movable_object_direct_action;
 
@@ -119,10 +119,10 @@ std::size_t pass_non_movable_object_value(non_movable_object obj)
 }
 
 // 'normal' actions (execution is scheduled on a new thread)
-typedef plain_action<
+typedef action<
     void (*)(non_movable_object), pass_non_movable_object_value_void
 > pass_non_movable_object_value_void_action;
-typedef plain_action<
+typedef action<
     std::size_t (*)(non_movable_object), pass_non_movable_object_value
 > pass_non_movable_object_value_action;
 
@@ -130,10 +130,10 @@ HPX_REGISTER_PLAIN_ACTION(pass_non_movable_object_value_void_action)
 HPX_REGISTER_PLAIN_ACTION(pass_non_movable_object_value_action)
 
 // direct actions (execution happens in the calling thread)
-typedef plain_direct_action<
+typedef direct_action<
     void (*)(non_movable_object), pass_non_movable_object_value_void
 > pass_non_movable_object_value_void_direct_action;
-typedef plain_direct_action<
+typedef direct_action<
     std::size_t (*)(non_movable_object), pass_non_movable_object_value
 > pass_non_movable_object_value_direct_action;
 
@@ -152,11 +152,11 @@ movable_object return_movable_object()
 }
 
 // 'normal' actions (execution is scheduled on a new thread)
-typedef plain_action<
+typedef action<
     movable_object (*)(), return_movable_object
 > return_movable_object_action;
 
-typedef plain_action<
+typedef action<
     non_movable_object (*)(), return_non_movable_object
 > return_non_movable_object_action;
 
@@ -164,11 +164,11 @@ HPX_REGISTER_PLAIN_ACTION(return_movable_object_action)
 HPX_REGISTER_PLAIN_ACTION(return_non_movable_object_action)
 
 // direct actions (execution happens in the calling thread)
-typedef plain_direct_action<
+typedef direct_action<
     movable_object (*)(), return_movable_object
 > return_movable_object_direct_action;
 
-typedef plain_direct_action<
+typedef direct_action<
     non_movable_object (*)(), return_non_movable_object
 > return_non_movable_object_direct_action;
 
diff --git a/tests/unit/lcos/dataflow.cpp b/tests/unit/lcos/dataflow.cpp
index 3961cac3365b..3de950be9e30 100644
--- a/tests/unit/lcos/dataflow.cpp
+++ b/tests/unit/lcos/dataflow.cpp
@@ -30,14 +30,14 @@ int f(int i, int j)
 {
     return i + j;
 }
-typedef hpx::actions::plain_action<int (*)(int, int), &f> f_action;
+typedef hpx::actions::action<int (*)(int, int), &f> f_action;
 HPX_REGISTER_PLAIN_ACTION(f_action);
 
 int h(int i, int j)
 {
     return i + j;
 }
-typedef hpx::actions::plain_action<int (*)(int, int), &h> h_action;
+typedef hpx::actions::action<int (*)(int, int), &h> h_action;
 HPX_REGISTER_PLAIN_ACTION(h_action);
 
 int g()
@@ -45,7 +45,7 @@ int g()
     int i = 9000;
     return ++i;
 }
-typedef hpx::actions::plain_action<int (*)(), &g> g_action;
+typedef hpx::actions::action<int (*)(), &g> g_action;
 HPX_REGISTER_PLAIN_ACTION(g_action);
 
 bool called_trigger = false;
@@ -53,7 +53,7 @@ void trigger()
 {
     called_trigger = true;
 }
-typedef hpx::actions::plain_action<void (*)(), &trigger> trigger_action;
+typedef hpx::actions::action<void (*)(), &trigger> trigger_action;
 HPX_REGISTER_PLAIN_ACTION(trigger_action);
 
 boost::uint64_t id(boost::uint64_t i)
@@ -61,7 +61,7 @@ boost::uint64_t id(boost::uint64_t i)
     //std::cout << i << "\n";
     return i;
 }
-typedef hpx::actions::plain_action<boost::uint64_t (*)(boost::uint64_t), &id> id_action;
+typedef hpx::actions::action<boost::uint64_t (*)(boost::uint64_t), &id> id_action;
 HPX_REGISTER_PLAIN_ACTION(id_action);
 
 boost::uint64_t add(boost::uint64_t n1, boost::uint64_t n2)
@@ -69,7 +69,7 @@ boost::uint64_t add(boost::uint64_t n1, boost::uint64_t n2)
     //std::cout << n1 << " + " << n2 << "\n";
     return n1 + n2;
 }
-typedef hpx::actions::plain_action<
+typedef hpx::actions::action<
     boost::uint64_t (*)(boost::uint64_t, boost::uint64_t), &add> add_action;
 HPX_REGISTER_PLAIN_ACTION(add_action);
 
@@ -87,7 +87,7 @@ hpx::lcos::dataflow_base<boost::uint64_t> fib(boost::uint64_t n)
     {                                                                         \
         BOOST_PP_CAT(called_f, N) = true;                                     \
     }                                                                         \
-    typedef hpx::actions::plain_action<void (*)(), &BOOST_PP_CAT(f, N)>       \
+    typedef hpx::actions::action<void (*)(), &BOOST_PP_CAT(f, N)>       \
         BOOST_PP_CAT(BOOST_PP_CAT(f, N), action);                             \
     HPX_REGISTER_PLAIN_ACTION(BOOST_PP_CAT(BOOST_PP_CAT(f, N), action));      \
 /**/
diff --git a/tests/unit/lcos/future_wait.cpp b/tests/unit/lcos/future_wait.cpp
index 463165ac6266..6d7a68254123 100644
--- a/tests/unit/lcos/future_wait.cpp
+++ b/tests/unit/lcos/future_wait.cpp
@@ -24,7 +24,7 @@ using hpx::finalize;
 
 using hpx::util::report_errors;
 
-using hpx::actions::plain_action;
+using hpx::actions::action;
 
 using hpx::lcos::wait_each;
 using hpx::async;
@@ -72,7 +72,7 @@ void null_thread()
     ++void_counter;
 }
 
-typedef plain_action<void (*)(), null_thread> null_action;
+typedef action<void (*)(), null_thread> null_action;
 
 HPX_REGISTER_PLAIN_ACTION(null_action);
 
@@ -85,7 +85,7 @@ bool null_result_thread()
     return true;
 }
 
-typedef plain_action<bool (*)(), null_result_thread> null_result_action;
+typedef action<bool (*)(), null_result_thread> null_result_action;
 
 HPX_REGISTER_PLAIN_ACTION(null_result_action);
 
diff --git a/tests/unit/lcos/packaged_action.cpp b/tests/unit/lcos/packaged_action.cpp
index fd0e38fa550f..8377a3d8e406 100644
--- a/tests/unit/lcos/packaged_action.cpp
+++ b/tests/unit/lcos/packaged_action.cpp
@@ -27,7 +27,7 @@ bool null_thread()
 
 // Define the boilerplate code necessary for the function 'null_thread'
 // to be invoked as an HPX action (by a HPX future)
-typedef hpx::actions::plain_action<bool (*)(), null_thread> null_action;
+typedef hpx::actions::action<bool (*)(), null_thread> null_action;
 
 HPX_REGISTER_PLAIN_ACTION(null_action);
 
@@ -39,7 +39,7 @@ int int_thread()
 
 // Define the boilerplate code necessary for the function 'int_thread'
 // to be invoked as an HPX action (by a HPX future)
-typedef hpx::actions::plain_action<int (*)(), int_thread> int_action;
+typedef hpx::actions::action<int (*)(), int_thread> int_action;
 
 HPX_REGISTER_PLAIN_ACTION(int_action);
 
diff --git a/tests/unit/lcos/unwrapped.cpp b/tests/unit/lcos/unwrapped.cpp
index a8d1583f8cd2..d8cb606a7474 100644
--- a/tests/unit/lcos/unwrapped.cpp
+++ b/tests/unit/lcos/unwrapped.cpp
@@ -25,7 +25,7 @@ using hpx::finalize;
 
 using hpx::util::report_errors;
 
-using hpx::actions::plain_action;
+using hpx::actions::action;
 
 using hpx::util::unwrapped;
 using hpx::util::unwrapped2;
@@ -45,7 +45,7 @@ void null_thread()
     ++void_counter;
 }
 
-typedef plain_action<void (*)(), null_thread> null_action;
+typedef action<void (*)(), null_thread> null_action;
 
 HPX_REGISTER_PLAIN_ACTION(null_action);
 
@@ -58,7 +58,7 @@ bool null_result_thread()
     return true;
 }
 
-typedef plain_action<bool (*)(), null_result_thread> null_result_action;
+typedef action<bool (*)(), null_result_thread> null_result_action;
 
 HPX_REGISTER_PLAIN_ACTION(null_result_action);