5 files changed, 11 insertions, 9 deletions
diff --git a/dev/kernel/HALKit/AMD64/HalDebugOutput.cc b/dev/kernel/HALKit/AMD64/HalDebugOutput.cc
index 789c1067..aa3f284f 100644
--- a/dev/kernel/HALKit/AMD64/HalDebugOutput.cc
+++ b/dev/kernel/HALKit/AMD64/HalDebugOutput.cc
@@ -90,7 +90,7 @@ EXTERN_C void ke_utf_io_write(DeviceInterface<const Utf8Char*>* obj, const Utf8C
     tmp_str[0] = (bytes[index] > 127) ? '?' : bytes[index];
     tmp_str[1] = 0;
 
-    fb_render_string(tmp_str, kY, kX, RGB(0xff, 0xff, 0xff));
+    cg_render_string(tmp_str, kY, kX, RGB(0xff, 0xff, 0xff));
 
     if (bytes[index] == '\r') {
       kY += kFontSizeY;
@@ -106,7 +106,7 @@ EXTERN_C void ke_utf_io_write(DeviceInterface<const Utf8Char*>* obj, const Utf8C
     if (kY > kHandoverHeader->f_GOP.f_Height) {
       kY = kFontSizeY;
 
-      FBDrawInRegion(fb_get_clear_clr(), FB::FBAccessibilty::Height(), FB::FBAccessibilty::Width(),
+      FBDrawInRegion(cg_get_clear_clr(), FB::CGAccessibilty::Height(), FB::CGAccessibilty::Width(),
                      0, 0);
     }
 
@@ -146,7 +146,7 @@ EXTERN_C void ke_io_write(DeviceInterface<const Char*>* obj, const Char* bytes)
     tmp_str[0] = bytes[index];
     tmp_str[1] = 0;
 
-    fb_render_string(tmp_str, kY, kX, RGB(0xff, 0xff, 0xff));
+    cg_render_string(tmp_str, kY, kX, RGB(0xff, 0xff, 0xff));
 
     if (bytes[index] == '\r') {
       kY += kFontSizeY;
@@ -162,7 +162,7 @@ EXTERN_C void ke_io_write(DeviceInterface<const Char*>* obj, const Char* bytes)
     if (kY > kHandoverHeader->f_GOP.f_Height) {
       kY = kFontSizeY;
 
-      FBDrawInRegion(fb_get_clear_clr(), FB::FBAccessibilty::Height(), FB::FBAccessibilty::Width(),
+      FBDrawInRegion(cg_get_clear_clr(), FB::CGAccessibilty::Height(), FB::CGAccessibilty::Width(),
                      0, 0);
     }
 
diff --git a/dev/kernel/HALKit/AMD64/HalKernelMain.cc b/dev/kernel/HALKit/AMD64/HalKernelMain.cc
index e67501cc..2339f56d 100644
--- a/dev/kernel/HALKit/AMD64/HalKernelMain.cc
+++ b/dev/kernel/HALKit/AMD64/HalKernelMain.cc
@@ -118,7 +118,7 @@ EXTERN_C Int32 hal_init_platform(Kernel::HEL::BootInfoHeader* handover_hdr) {
   kGDTArray[4].fFlags      = 0;
   kGDTArray[4].fBaseHigh   = 0;
 
-  FB::fb_clear_video();
+  FB::cg_clear_video();
 
   // Load memory descriptors.
   HAL::Register64 gdt_reg;
diff --git a/dev/kernel/HALKit/ARM64/HalKernelMain.cc b/dev/kernel/HALKit/ARM64/HalKernelMain.cc
index b711b833..ad516539 100644
--- a/dev/kernel/HALKit/ARM64/HalKernelMain.cc
+++ b/dev/kernel/HALKit/ARM64/HalKernelMain.cc
@@ -42,7 +42,7 @@ EXTERN_C void hal_init_platform(Kernel::HEL::BootInfoHeader* handover_hdr) {
                          handover_hdr->f_HardwareTables.f_ImageHandle);
 #endif
 
-  FB::fb_clear_video();
+  FB::cg_clear_video();
 
   /************************************** */
   /*     INITIALIZE BIT MAP.              */
diff --git a/dev/kernel/KernelKit/KernelTaskScheduler.h b/dev/kernel/KernelKit/KernelTaskScheduler.h
index 2029ae7b..659362fe 100644
--- a/dev/kernel/KernelKit/KernelTaskScheduler.h
+++ b/dev/kernel/KernelKit/KernelTaskScheduler.h
@@ -29,7 +29,7 @@ class KERNEL_TASK final {
   UInt8*             StackReserve{nullptr};
   SizeT              StackSize{kSchedMaxStackSz};
   ProcessImage       Image{};
-  /// @brief a KID is a Kernel Identification Descriptor, it is used to find a task running within
+  /// @brief a KID is a Kernel ID, it is used to find a task running within
   /// the kernel.
   KID Kid{0};
 };
diff --git a/dev/kernel/src/UserProcessScheduler.cc b/dev/kernel/src/UserProcessScheduler.cc
index ac25c3d8..02d5c1d6 100644
--- a/dev/kernel/src/UserProcessScheduler.cc
+++ b/dev/kernel/src/UserProcessScheduler.cc
@@ -678,11 +678,13 @@ UserProcessScheduler::operator bool() {
 /// @brief this checks if no process is on the team.
 ////////////////////////////////////////////////////////////
 Bool UserProcessScheduler::operator!() {
+  SInt64 cnt = 0UL;
+
   for (auto process_index = 0UL; process_index < mTeam.AsArray().Count(); ++process_index) {
     auto& process = mTeam.AsArray()[process_index];
-    if (UserProcessHelper::CanBeScheduled(process)) return false;
+    if (UserProcessHelper::CanBeScheduled(process)) ++cnt;
   }
 
-  return true;
+  return cnt == 0L;
 }
 }  // namespace Kernel