diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 411bb59..691cbc0 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -24,7 +24,7 @@ file(GLOB_RECURSE KERNEL_SOURCES CMAKE_CONFIGURE_DEPENDS
     "src/lib/*.c"
     "src/IO/*.c"
     "src/VM/*.c"
-    "src/shell/*.c"
+    "src/KSH/*.c"
     "src/FS/*.c"
     
     "Data/*.c"
diff --git a/kernel/inc/shell/builtins.h b/kernel/inc/KSH/KSHBuiltins.h
similarity index 100%
rename from kernel/inc/shell/builtins.h
rename to kernel/inc/KSH/KSHBuiltins.h
diff --git a/kernel/inc/shell/dbgcmd.h b/kernel/inc/KSH/KSHDebug.h
similarity index 100%
rename from kernel/inc/shell/dbgcmd.h
rename to kernel/inc/KSH/KSHDebug.h
diff --git a/kernel/inc/shell/ksh.h b/kernel/inc/KSH/KSHEntry.h
similarity index 84%
rename from kernel/inc/shell/ksh.h
rename to kernel/inc/KSH/KSHEntry.h
index 095805c..7cc1141 100644
--- a/kernel/inc/shell/ksh.h
+++ b/kernel/inc/KSH/KSHEntry.h
@@ -3,4 +3,4 @@
 
 #pragma once
 
-void ksh();
+void KSHEntry();
diff --git a/kernel/src/shell/builtins.c b/kernel/src/KSH/KSHBuiltins.c
similarity index 99%
rename from kernel/src/shell/builtins.c
rename to kernel/src/KSH/KSHBuiltins.c
index 74cd1e7..20c0639 100644
--- a/kernel/src/shell/builtins.c
+++ b/kernel/src/KSH/KSHBuiltins.c
@@ -15,7 +15,7 @@
 #include <VM/VMM.h>
 #include <VM/Heap.h>
 
-#include <shell/dbgcmd.h>
+#include <KSH/KSHDebug.h>
 
 #include <Data/cats.h>
 
diff --git a/kernel/src/shell/dbgcmd.c b/kernel/src/KSH/KSHDebug.c
similarity index 84%
rename from kernel/src/shell/dbgcmd.c
rename to kernel/src/KSH/KSHDebug.c
index 952155f..29813d4 100644
--- a/kernel/src/shell/dbgcmd.c
+++ b/kernel/src/KSH/KSHDebug.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 // Copyright (c) 2026 0xKarinyash
 
-#include <shell/dbgcmd.h>
+#include <KSH/KSHDebug.h>
 #include <IO/IOConsole.h>
 
 UInt64 KSHDebug() {
diff --git a/kernel/src/shell/ksh.c b/kernel/src/KSH/KSHEntry.c
similarity index 93%
rename from kernel/src/shell/ksh.c
rename to kernel/src/KSH/KSHEntry.c
index d8792fb..59d1366 100644
--- a/kernel/src/shell/ksh.c
+++ b/kernel/src/KSH/KSHEntry.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 // Copyright (c) 2026 0xKarinyash
 
-#include <shell/ksh.h>
-#include <shell/builtins.h>
+#include <KSH/KSHEntry.h>
+#include <KSH/KSHBuiltins.h>
 
 #include <IO/IOConsole.h>
 #include <IO/IOGraphics.h>
@@ -72,19 +72,19 @@ static const KSHCommandMap CommandMap[] = {
     {nullptr, TOKEN_NULL}
 };
 
-KSHToken char2token(char* token) {
+KSHToken KSHCharacter2Token(char* token) {
     for (Int32 i = 0; CommandMap[i].str != nullptr; i++) {
         if (StringCompare(token, CommandMap[i].str) == 0) return CommandMap[i].token;
     }
     return TOKEN_ILLEGAL;
 }
 
-void ksh() {
+void KSHEntry() {
     while (true) {
         IOConsoleLog("ksh_> ");
         char cmdbuff[256];
         IOConsoleReadLine(cmdbuff, 256);
-        switch(char2token(cmdbuff)) {
+        switch(KSHCharacter2Token(cmdbuff)) {
             case TOKEN_EMPTY: continue;
 
             case TOKEN_CLEAR: IOConsoleClear((UInt32) IOConsoleGetColors() & 0xFFFFFFFF); break;
diff --git a/kernel/src/kmain.c b/kernel/src/kmain.c
index 6ab7e2d..8a2d069 100644
--- a/kernel/src/kmain.c
+++ b/kernel/src/kmain.c
@@ -3,7 +3,7 @@
 
 #include "bootinfo.h"
 
-#include <shell/ksh.h>
+#include <KSH/KSHEntry.h>
 
 #include <types.h>
 
@@ -107,7 +107,7 @@ void kmain(Bootinfo* info) {
         if (c == 'q') rescueMode = true;
     }
     
-    if (rescueMode) OSSchedulerSpawn(ksh, nullptr, false, 0);
+    if (rescueMode) OSSchedulerSpawn(KSHEntry, nullptr, false, 0);
     else OSSchedulerSpawn(init_task_entry, nullptr, false, 0);
     
     __asm__ volatile("sti");