diff --git a/include/boost/fiber/context.hpp b/include/boost/fiber/context.hpp
index 40b2e788..90fd6a6a 100644
--- a/include/boost/fiber/context.hpp
+++ b/include/boost/fiber/context.hpp
@@ -366,7 +366,7 @@ public:
         void * data,
         bool cleanup_existing);
 
-    bool managed_is_linked();
+    bool worker_is_linked();
 
     bool ready_is_linked();
 
@@ -376,7 +376,7 @@ public:
 
     bool wait_is_linked();
 
-    void managed_unlink();
+    void worker_unlink();
 
     void sleep_unlink();
 
diff --git a/src/context.cpp b/src/context.cpp
index 096981b5..99180702 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -277,7 +277,7 @@ context::set_fss_data( void const * vp,
 }
 
 bool
-context::managed_is_linked() {
+context::worker_is_linked() {
     return worker_hook_.is_linked();
 }
 
@@ -302,7 +302,7 @@ context::wait_is_linked() {
 }
 
 void
-context::managed_unlink() {
+context::worker_unlink() {
     worker_hook_.unlink();
 }
 
diff --git a/src/scheduler.cpp b/src/scheduler.cpp
index 66c8f735..bd11b2b6 100644
--- a/src/scheduler.cpp
+++ b/src/scheduler.cpp
@@ -27,10 +27,10 @@ scheduler::resume_( context * active_ctx, context * ctx) {
     BOOST_ASSERT( nullptr != ctx);
     BOOST_ASSERT( main_ctx_ == active_ctx ||
                   dispatcher_ctx_.get() == active_ctx ||
-                  active_ctx->managed_is_linked() );
+                  active_ctx->worker_is_linked() );
     BOOST_ASSERT( main_ctx_ == ctx ||
                   dispatcher_ctx_.get() == ctx ||
-                  ctx->managed_is_linked() );
+                  ctx->worker_is_linked() );
     BOOST_ASSERT( active_ctx->get_scheduler() == ctx->get_scheduler() );
     // fiber next-to-run is same as current active-fiber
     // this might happen in context of this_fiber::yield() 
@@ -44,7 +44,7 @@ scheduler::resume_( context * active_ctx, context * ctx) {
     BOOST_ASSERT( context::active() == active_ctx);
     BOOST_ASSERT( main_ctx_ == active_ctx ||
                   dispatcher_ctx_.get() == active_ctx ||
-                  active_ctx->managed_is_linked() );
+                  active_ctx->worker_is_linked() );
     if ( ctx->unwinding_requested() ) {
         throw forced_unwind();
     }
@@ -68,7 +68,7 @@ scheduler::release_terminated_() {
         context * ctx = & ( * i);
         BOOST_ASSERT( ! ctx->is_main_context() );
         BOOST_ASSERT( ! ctx->is_dispatcher_context() );
-        BOOST_ASSERT( ctx->managed_is_linked() );
+        BOOST_ASSERT( ctx->worker_is_linked() );
         BOOST_ASSERT( ctx->is_terminated() );
         BOOST_ASSERT( ! ctx->ready_is_linked() );
         BOOST_ASSERT( ! ctx->sleep_is_linked() );
@@ -108,7 +108,7 @@ scheduler::sleep2ready_() noexcept {
         context * ctx = & ( * i);
         BOOST_ASSERT( ! ctx->is_dispatcher_context() );
         BOOST_ASSERT( main_ctx_ == ctx ||
-                      ctx->managed_is_linked() );
+                      ctx->worker_is_linked() );
         BOOST_ASSERT( ! ctx->is_terminated() );
         BOOST_ASSERT( ! ctx->ready_is_linked() );
         BOOST_ASSERT( ctx->sleep_is_linked() );
@@ -254,7 +254,7 @@ scheduler::set_ready( context * ctx) noexcept {
     //BOOST_ASSERT( active_ctx->wait_is_linked() );
     // handle newly created context
     if ( ! ctx->is_main_context() ) {
-        if ( ! ctx->managed_is_linked() ) {
+        if ( ! ctx->worker_is_linked() ) {
             // attach context to `this`-scheduler
             ctx->set_scheduler( this);
             // push to the worker-queue
@@ -304,7 +304,7 @@ scheduler::set_terminated( context * ctx) noexcept {
     BOOST_ASSERT( nullptr != ctx);
     BOOST_ASSERT( ! ctx->is_main_context() );
     BOOST_ASSERT( ! ctx->is_dispatcher_context() );
-    BOOST_ASSERT( ctx->managed_is_linked() );
+    BOOST_ASSERT( ctx->worker_is_linked() );
     BOOST_ASSERT( ctx->is_terminated() );
     BOOST_ASSERT( ! ctx->ready_is_linked() );
     BOOST_ASSERT( ! ctx->sleep_is_linked() );
@@ -320,7 +320,7 @@ scheduler::yield( context * active_ctx) noexcept {
     BOOST_ASSERT( nullptr != active_ctx);
     BOOST_ASSERT( main_ctx_ == active_ctx ||
                   dispatcher_ctx_.get() == active_ctx ||
-                  active_ctx->managed_is_linked() );
+                  active_ctx->worker_is_linked() );
     BOOST_ASSERT( ! active_ctx->is_terminated() );
     BOOST_ASSERT( ! active_ctx->ready_is_linked() );
     BOOST_ASSERT( ! active_ctx->sleep_is_linked() );
@@ -339,7 +339,7 @@ scheduler::wait_until( context * active_ctx,
     BOOST_ASSERT( nullptr != active_ctx);
     BOOST_ASSERT( main_ctx_ == active_ctx ||
                   dispatcher_ctx_.get() == active_ctx ||
-                  active_ctx->managed_is_linked() );
+                  active_ctx->worker_is_linked() );
     BOOST_ASSERT( ! active_ctx->is_terminated() );
     // if the active-fiber running in this thread calls
     // condition:wait() and code in another thread calls
@@ -369,7 +369,7 @@ scheduler::re_schedule( context * active_ctx) noexcept {
     BOOST_ASSERT( nullptr != active_ctx);
     BOOST_ASSERT( main_ctx_ == active_ctx ||
                   dispatcher_ctx_.get() == active_ctx ||
-                  active_ctx->managed_is_linked() );
+                  active_ctx->worker_is_linked() );
     // resume another context
     resume_( active_ctx, get_next_() );
 }