diff --git a/cfg/cpu/kernel/context-switch.cfg b/cfg/cpu/kernel/context-switch.cfg
index 8974082..8433f04 100644
--- a/cfg/cpu/kernel/context-switch.cfg
+++ b/cfg/cpu/kernel/context-switch.cfg
@@ -4,9 +4,9 @@ ConfigFile.NumWindows: 1
 
 
 ################################################################################
-< NEW DISPLAYING WINDOW CPU: Context switches of the ACTIVE thread >
+< NEW DISPLAYING WINDOW CPU: Context switches of the RUNNING thread >
 ################################################################################
-window_name CPU: Context switches of the ACTIVE thread
+window_name CPU: Context switches of the RUNNING thread
 window_type single
 window_id 1
 window_position_x 0
@@ -38,5 +38,5 @@ window_labels_to_draw 1
 window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
 window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
 window_filter_module evt_type 1 45
-window_filter_module evt_type_label 1 "CPU: Context switches of the ACTIVE thread"
+window_filter_module evt_type_label 1 "CPU: Context switches of the RUNNING thread"
 
diff --git a/cfg/thread/kernel/context-switch.cfg b/cfg/thread/kernel/context-switch.cfg
index 21ec964..e18bf25 100644
--- a/cfg/thread/kernel/context-switch.cfg
+++ b/cfg/thread/kernel/context-switch.cfg
@@ -38,5 +38,5 @@ window_labels_to_draw 1
 window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
 window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
 window_filter_module evt_type 1 45
-window_filter_module evt_type_label 1 "Thread: Context switches of the CURRENT thread"
+window_filter_module evt_type_label 1 "Thread: Context switches"
 
diff --git a/src/emu/kernel/setup.c b/src/emu/kernel/setup.c
index 4274f0f..042faca 100644
--- a/src/emu/kernel/setup.c
+++ b/src/emu/kernel/setup.c
@@ -54,7 +54,7 @@ static const int th_track[CH_MAX] = {
 };
 
 static const int cpu_track[CH_MAX] = {
-	[CH_CS] = TRACK_TH_RUN, /* FIXME: Why active */
+	[CH_CS] = TRACK_TH_RUN,
 };
 
 /* ----------------- chan_spec ------------------ */