diff --git a/headers/private/kernel/arch/dbg_console.h b/headers/private/kernel/arch/debug_console.h
similarity index 100%
rename from headers/private/kernel/arch/dbg_console.h
rename to headers/private/kernel/arch/debug_console.h
diff --git a/src/system/kernel/arch/x86/Jamfile b/src/system/kernel/arch/x86/Jamfile
index 3b9d557a21..a0b9816738 100644
--- a/src/system/kernel/arch/x86/Jamfile
+++ b/src/system/kernel/arch/x86/Jamfile
@@ -5,8 +5,8 @@ SubDirHdrs [ FObjectsDir src system kernel ] ;
 
 KernelStaticLibrary libx86 :
 	arch_cpu.c
-	arch_dbg_console.c
 	arch_debug.c
+	arch_debug_console.c
 	arch_elf.c
 	arch_faults.c
 	arch_int.c
diff --git a/src/system/kernel/arch/x86/arch_dbg_console.c b/src/system/kernel/arch/x86/arch_debug_console.c
similarity index 99%
rename from src/system/kernel/arch/x86/arch_dbg_console.c
rename to src/system/kernel/arch/x86/arch_debug_console.c
index e8dcf49701..4abc899ff2 100644
--- a/src/system/kernel/arch/x86/arch_dbg_console.c
+++ b/src/system/kernel/arch/x86/arch_debug_console.c
@@ -13,7 +13,7 @@
 #include <driver_settings.h>
 #include <int.h>
 #include <arch/cpu.h>
-#include <arch/dbg_console.h>
+#include <arch/debug_console.h>
 
 #include <boot/stage2.h>
 
diff --git a/src/system/kernel/debug/debug.c b/src/system/kernel/debug/debug.c
index f5e9d4850a..a71ce58719 100644
--- a/src/system/kernel/debug/debug.c
+++ b/src/system/kernel/debug/debug.c
@@ -17,7 +17,7 @@
 #include <vm.h>
 #include <driver_settings.h>
 
-#include <arch/dbg_console.h>
+#include <arch/debug_console.h>
 #include <arch/debug.h>
 #include <arch/cpu.h>