diff --git a/sched/sched/sched_critmonitor.c b/sched/sched/sched_critmonitor.c
index c9992e8a7488e..7e12f367a29a0 100644
--- a/sched/sched/sched_critmonitor.c
+++ b/sched/sched/sched_critmonitor.c
@@ -154,6 +154,7 @@ static void nxsched_critmon_cpuload(FAR struct tcb_s *tcb, clock_t current,
                                     clock_t tick)
 {
   int i;
+
   UNUSED(i);
 
   /* Update the cpuload of the thread ready to be suspended */
@@ -374,13 +375,13 @@ void nxsched_switch_critmon(FAR struct tcb_s *from, FAR struct tcb_s *to)
 
 #ifdef CONFIG_SCHED_CPULOAD_CRITMONITOR
   clock_t tick = elapsed * CLOCKS_PER_SEC / perf_getfreq();
+
   nxsched_critmon_cpuload(from, current, tick);
-  to->run_start = current;
 #endif
 
 #if CONFIG_SCHED_CRITMONITOR_MAXTIME_THREAD >= 0
   from->run_time += elapsed;
-  to->run_time = current;
+  to->run_start = current;
   if (elapsed > from->run_max)
     {
       from->run_max = elapsed;
@@ -418,7 +419,7 @@ void nxsched_switch_critmon(FAR struct tcb_s *from, FAR struct tcb_s *to)
 
   if (to->lockcount > 0)
     {
-      to->premp_start = current;
+      to->preemp_start = current;
     }
 #endif /* CONFIG_SCHED_CRITMONITOR_MAXTIME_PREEMPTION */
 
@@ -465,6 +466,7 @@ void nxsched_update_critmon(FAR struct tcb_s *tcb)
     {
 #ifdef CONFIG_SCHED_CPULOAD_CRITMONITOR
       clock_t tick = elapsed * CLOCKS_PER_SEC / perf_getfreq();
+
       nxsched_process_taskload_ticks(tcb, tick);
 #endif
 
diff --git a/tools/pynuttx/nxgdb/protocols/thread.py b/tools/pynuttx/nxgdb/protocols/thread.py
index db89313840b34..16306f3427758 100644
--- a/tools/pynuttx/nxgdb/protocols/thread.py
+++ b/tools/pynuttx/nxgdb/protocols/thread.py
@@ -101,10 +101,10 @@ class Tcb(Value):
     run_start: Value
     run_max: Value
     run_time: Value
-    premp_start: Value
-    premp_max: Value
-    premp_caller: Value
-    premp_max_caller: Value
+    preemp_start: Value
+    preemp_max: Value
+    preemp_caller: Value
+    preemp_max_caller: Value
     crit_start: Value
     crit_max: Value
     crit_caller: Value