diff --git a/src/link.ld b/src/link.ld
index fcb0863..43d93c1 100644
--- a/src/link.ld
+++ b/src/link.ld
@@ -1,4 +1,4 @@
-ENTRY(kernel_entry)
+ENTRY(shell_entry)
 
 SECTIONS
 {
diff --git a/src/shell/command.c b/src/shell/command.c
index 9265642..1536aec 100644
--- a/src/shell/command.c
+++ b/src/shell/command.c
@@ -10,7 +10,7 @@
 #include "../libc/io.h"
 #include "../libc/sound.h"
 #include "../libc/string.h"
-#include "kernel_main.h"
+#include "shell_main.h"
 #include "paging.h"
 
 struct command commands[] = {
diff --git a/src/shell/paging.c b/src/shell/paging.c
index 5ee0950..8fd15b4 100644
--- a/src/shell/paging.c
+++ b/src/shell/paging.c
@@ -6,7 +6,7 @@
 
 #include "paging.h"
 
-#include "kernel_main.h"
+#include "shell_main.h"
 #include "../libc/io.h"
 #include "../libc/memory.h"
 #include "../libc/string.h"
diff --git a/src/shell/kernel_entry.asm b/src/shell/shell_entry.asm
similarity index 64%
rename from src/shell/kernel_entry.asm
rename to src/shell/shell_entry.asm
index 2fb3f6a..5279401 100644
--- a/src/shell/kernel_entry.asm
+++ b/src/shell/shell_entry.asm
@@ -3,20 +3,20 @@
 ; COPYRIGHT: Copyright (c) 2024 Erdem Ersoy (eersoy93).
 ; LICENSE: Licensed with MIT License. See LICENSE file for details.
 
-global kernel_entry
+global shell_entry
 
 MAGIC_NUMBER equ 0x1BADB002
 FLAGS        equ 0x0
 CHECKSUM     equ -MAGIC_NUMBER
-KERNEL_STACK_SIZE equ 4096
+SHELL_STACK_SIZE equ 4096
 
-extern kernel_main
+extern shell_main
 
 section .bss
 align 4
 
-kernel_stack:
-    resb KERNEL_STACK_SIZE
+shell_stack:
+    resb SHELL_STACK_SIZE
 
 section .text
 align 4
@@ -24,9 +24,9 @@ align 4
     dd FLAGS
     dd CHECKSUM
 
-kernel_entry:
-    mov esp, kernel_stack + KERNEL_STACK_SIZE
-    call kernel_main
+shell_entry:
+    mov esp, shell_stack + SHELL_STACK_SIZE
+    call shell_main
 
 .loop:
     jmp .loop
diff --git a/src/shell/kernel_main.c b/src/shell/shell_main.c
similarity index 85%
rename from src/shell/kernel_main.c
rename to src/shell/shell_main.c
index 094fdcc..9c8cec9 100644
--- a/src/shell/kernel_main.c
+++ b/src/shell/shell_main.c
@@ -4,7 +4,7 @@
  * LICENSE: Licensed with MIT License. See LICENSE file for details.
  */
 
-#include "kernel_main.h"
+#include "shell_main.h"
 
 #include "command.h"
 #include "../libc/boolean.h"
@@ -15,11 +15,11 @@
 #include "../libc/string.h"
 #include "../libc/video.h"
 
-void kernel_main(void)
+void shell_main(void)
 {
     cls();
 
-    println("Executing the kernel...", OUTPUT_COLOR);
+    println("Executing the shell...", OUTPUT_COLOR);
 
     if (get_video_type() == VIDEO_TYPE_COLOR)
     {
diff --git a/src/shell/kernel_main.h b/src/shell/shell_main.h
similarity index 81%
rename from src/shell/kernel_main.h
rename to src/shell/shell_main.h
index 63d2015..f347296 100644
--- a/src/shell/kernel_main.h
+++ b/src/shell/shell_main.h
@@ -4,8 +4,8 @@
  * LICENSE: Licensed with MIT License. See LICENSE file for details.
  */
 
-#ifndef KERNEL_MAIN_H
-#define KERNEL_MAIN_H
+#ifndef SHELL_MAIN_H
+#define SHELL_MAIN_H
 
 void show_prompt(void);