diff --git a/basis/tools/continuations/continuations.factor b/basis/tools/continuations/continuations.factor
index 3faf4249e9..e6a5ea72ca 100644
--- a/basis/tools/continuations/continuations.factor
+++ b/basis/tools/continuations/continuations.factor
@@ -21,7 +21,7 @@ PRIVATE>
 SYMBOL: break-hook
 
 : break ( -- )
-    continuation callstack >>call
+    current-continuation callstack >>call
     break-hook get call( continuation -- continuation' )
     after-break ;
 
@@ -63,7 +63,7 @@ M: object add-breakpoint ;
 \ (step-into-execute) t "step-into?" set-word-prop
 
 : (step-into-continuation) ( -- )
-    continuation callstack >>call break ;
+    current-continuation callstack >>call break ;
 
 : (step-into-call-next-method) ( method -- )
     next-method-quot (step-into-quot) ;
diff --git a/core/continuations/continuations.factor b/core/continuations/continuations.factor
index ca2acbca46..0d0c41c72d 100644
--- a/core/continuations/continuations.factor
+++ b/core/continuations/continuations.factor
@@ -39,7 +39,7 @@ TUPLE: continuation data call retain name catch ;
 
 C: <continuation> continuation
 
-: continuation ( -- continuation )
+: current-continuation ( -- continuation )
     datastack callstack retainstack namestack catchstack
     <continuation> ;
 
@@ -51,7 +51,7 @@ C: <continuation> continuation
 PRIVATE>
 
 : ifcc ( capture restore -- )
-    [ dummy-1 continuation ] 2dip [ dummy-2 ] prepose ?if ; inline
+    [ dummy-1 current-continuation ] 2dip [ dummy-2 ] prepose ?if ; inline
 
 : callcc0 ( quot -- ) [ drop ] ifcc ; inline
 
@@ -196,7 +196,7 @@ M: condition compute-restarts
     [
         ! 65 = self
         OBJ-CURRENT-THREAD special-object error-thread set-global
-        continuation error-continuation set-global
+        current-continuation error-continuation set-global
         [ original-error set-global ] [ rethrow ] bi
     ] ERROR-HANDLER-QUOT set-special-object
     ! VM adds this to kernel errors, so that user-space
diff --git a/core/destructors/destructors.factor b/core/destructors/destructors.factor
index c8b8f81f6a..5f8e7b48f0 100755
--- a/core/destructors/destructors.factor
+++ b/core/destructors/destructors.factor
@@ -16,7 +16,7 @@ SYMBOL: debug-leaks?
 SLOT: continuation
 
 : register-disposable ( obj -- )
-    debug-leaks? get-global [ continuation >>continuation ] when
+    debug-leaks? get-global [ current-continuation >>continuation ] when
     disposables get conjoin ;
 
 : unregister-disposable ( obj -- )