diff --git a/arch/arc/core/context.c b/arch/arc/core/context.c
index 61bb3445a80..6d87cc3c11f 100644
--- a/arch/arc/core/context.c
+++ b/arch/arc/core/context.c
@@ -85,7 +85,7 @@ static ALWAYS_INLINE void context_monitor_init(struct s_CCS *pCcs /* context */
 	 */
 
 	key = irq_lock_inline();
-	pCcs->activeLink = _NanoKernel.contexts;
+	pCcs->next_context = _NanoKernel.contexts;
 	_NanoKernel.contexts = pCcs;
 	irq_unlock_inline(key);
 }
diff --git a/arch/arc/include/nanok.h b/arch/arc/include/nanok.h
index c8961651136..84607809642 100644
--- a/arch/arc/include/nanok.h
+++ b/arch/arc/include/nanok.h
@@ -185,7 +185,7 @@ struct s_CCS {
 	struct coop coopReg;
 	struct preempt preempReg;
 #ifdef CONFIG_CONTEXT_MONITOR
-	struct s_CCS *activeLink;  /* link to next context in the active list */
+	struct s_CCS *next_context;  /* next item in list of ALL fiber+tasks */
 #endif
 };
 
diff --git a/arch/arm/core/nanocontext.c b/arch/arm/core/nanocontext.c
index 5faab6e38f1..3620b8ad976 100644
--- a/arch/arm/core/nanocontext.c
+++ b/arch/arm/core/nanocontext.c
@@ -75,7 +75,7 @@ static ALWAYS_INLINE void _context_monitor_init(struct s_CCS *pCcs /* context */
 	 */
 
 	key = irq_lock();
-	pCcs->activeLink = _NanoKernel.contexts;
+	pCcs->next_context = _NanoKernel.contexts;
 	_NanoKernel.contexts = pCcs;
 	irq_unlock(key);
 }
diff --git a/arch/arm/include/nanok.h b/arch/arm/include/nanok.h
index ab85746445a..75e89da8092 100644
--- a/arch/arm/include/nanok.h
+++ b/arch/arm/include/nanok.h
@@ -135,7 +135,7 @@ struct s_CCS {
 	struct coop coopReg;
 	struct preempt preempReg;
 #if defined(CONFIG_CONTEXT_MONITOR)
-	struct s_CCS *activeLink; /* link to next context in the active list */
+	struct s_CCS *next_context; /* next item in list of ALL fiber+tasks */
 #endif
 };
 
diff --git a/arch/x86/core/nanocontext.c b/arch/x86/core/nanocontext.c
index e7ce839e291..968b83af672 100644
--- a/arch/x86/core/nanocontext.c
+++ b/arch/x86/core/nanocontext.c
@@ -199,7 +199,7 @@ static void _NewContextInternal(
 		 */
 
 		imask = irq_lock();
-		ccs->activeLink = _NanoKernel.contexts;
+		ccs->next_context = _NanoKernel.contexts;
 		_NanoKernel.contexts = ccs;
 		irq_unlock(imask);
 	}
diff --git a/arch/x86/include/nanok.h b/arch/x86/include/nanok.h
index 061fbf373da..75248d0595d 100644
--- a/arch/x86/include/nanok.h
+++ b/arch/x86/include/nanok.h
@@ -684,7 +684,7 @@ struct s_CCS {
 	tPreempReg preempReg; /* volatile integer register storage */
 
 #if defined(CONFIG_CONTEXT_MONITOR)
-	struct s_CCS *activeLink; /* link to next context in the active list */
+	struct s_CCS *next_context; /* next item in list of ALL fiber+tasks */
 #endif
 #ifdef CONFIG_GDB_INFO
 	void *esfPtr; /* pointer to exception stack frame saved by */
diff --git a/kernel/nanokernel/core/nanocontextentry.c b/kernel/nanokernel/core/nanocontextentry.c
index 73c17f81526..a34174cc7df 100644
--- a/kernel/nanokernel/core/nanocontextentry.c
+++ b/kernel/nanokernel/core/nanocontextentry.c
@@ -74,15 +74,15 @@ void _context_exit(tCCS *pContext)
 	 */
 
 	if (pContext == _NanoKernel.contexts) {
-		_NanoKernel.contexts = _NanoKernel.contexts->activeLink;
+		_NanoKernel.contexts = _NanoKernel.contexts->next_context;
 	} else {
 		tCCS *pPrevContext;
 
 		pPrevContext = _NanoKernel.contexts;
-		while (pContext != pPrevContext->activeLink) {
-			pPrevContext = pPrevContext->activeLink;
+		while (pContext != pPrevContext->next_context) {
+			pPrevContext = pPrevContext->next_context;
 		}
-		pPrevContext->activeLink = pContext->activeLink;
+		pPrevContext->next_context = pContext->next_context;
 	}
 }
 #endif /* CONFIG_CONTEXT_MONITOR */
diff --git a/kernel/nanokernel/include/offsets/common.h b/kernel/nanokernel/include/offsets/common.h
index 0f638ca0f71..797fd968c20 100644
--- a/kernel/nanokernel/include/offsets/common.h
+++ b/kernel/nanokernel/include/offsets/common.h
@@ -58,7 +58,7 @@ GEN_ABSOLUTE_SYM(__tNANO_SIZEOF, sizeof(tNANO));
 /* arch-agnostic tCCS structure member offsets */
 
 GEN_OFFSET_SYM(tCCS, link);
-GEN_OFFSET_SYM_HOST(tCCS, activeLink);
+GEN_OFFSET_SYM_HOST(tCCS, next_context);
 GEN_OFFSET_SYM(tCCS, prio);
 GEN_OFFSET_SYM(tCCS, flags);
 GEN_OFFSET_SYM(tCCS, coopReg);   /* start of coop register set */