diff --git a/Makefile b/Makefile
index 33fe09e..dd24e73 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ LDFLAGS =
 
 DISK_IMG_FILES = build/kernel/kernel.bin hello.txt alpha.txt
 KERNEL_OBJS = build/kernel/entry.o build/kernel/screenstuff.o build/kernel/io.o build/kernel/idt.o build/kernel/keyboard.o \
-							build/kernel/strings.o build/kernel/atapio.o build/kernel/kernel.o build/kernel/paging.o build/kernel/allocate.o \
+							build/kernel/strings.o build/kernel/atapio.o build/kernel/kmain.o build/kernel/paging.o build/kernel/allocate.o \
 							build/kernel/gdt.o build/kernel/memory.o build/kernel/process.o build/kernel/datatypes/hash.o \
 							build/kernel/terminal.o build/kernel/global.o
 STAGE2_OBS = build/c_code_entry.o build/boot_stage2/io.o build/boot_stage2/atapio.o build/boot_stage2/strings.o build/boot_stage2/screenstuff.o build/boot_stage2/stage2.o build/boot_stage2/paging.o
diff --git a/src/kernel/kernel.ld b/src/kernel/kernel.ld
index 7d03cbe..01eb987 100644
--- a/src/kernel/kernel.ld
+++ b/src/kernel/kernel.ld
@@ -8,7 +8,7 @@ SECTIONS {
 
   .text : { 
     build/kernel/entry.o(.text)
-    build/kernel/kernel.o(.text)
+    build/kernel/kmain.o(.text)
     build/kernel/*(.text)
     build/kernel/datatypes/*(.text)
   }
diff --git a/src/kernel/kernel.cpp b/src/kernel/kmain.cpp
similarity index 100%
rename from src/kernel/kernel.cpp
rename to src/kernel/kmain.cpp