5 files changed, 12 insertions, 13 deletions
diff --git a/src/DebuggerKit/src/MachContractCLI.cpp b/src/DebuggerKit/src/Mach+CLI.cpp
index 9bdb5b1..69000c9 100644
--- a/src/DebuggerKit/src/MachContractCLI.cpp
+++ b/src/DebuggerKit/src/Mach+CLI.cpp
@@ -6,7 +6,7 @@
 
 #ifdef DK_MACH_DEBUGGER
 
-#include <DebuggerKit/MachContract.h>
+#include <DebuggerKit/Mach.h>
 #include <ThirdParty/Dialogs/Dialogs.h>
 
 #ifdef DK_MACH_DEBUGGER
diff --git a/src/DebuggerKit/src/MachContract.cpp b/src/DebuggerKit/src/Mach.cpp
index 518f61a..31ae544 100644
--- a/src/DebuggerKit/src/MachContract.cpp
+++ b/src/DebuggerKit/src/Mach.cpp
@@ -6,7 +6,7 @@
 
 #ifdef DK_MACH_DEBUGGER
 
-#include <DebuggerKit/MachContract.h>
+#include <DebuggerKit/Mach.h>
 #include <ThirdParty/Dialogs/Dialogs.h>
 
 /// @brief a terrible way to import globals.
diff --git a/src/DebuggerKit/src/NeKernelContractCLI.cpp b/src/DebuggerKit/src/NeSystem+CLI.cpp
index 13144eb..39271b1 100644
--- a/src/DebuggerKit/src/NeKernelContractCLI.cpp
+++ b/src/DebuggerKit/src/NeSystem+CLI.cpp
@@ -6,9 +6,8 @@
 
 #ifdef DK_NEKERNEL_DEBUGGER
 
-#include <DebuggerKit/NeKernelContract.h>
+#include <DebuggerKit/NeSystem.h>
 #include <ThirdParty/Dialogs/Dialogs.h>
-#include <string>
 
 #include <DebuggerKit/Common.inl>
 
diff --git a/src/DebuggerKit/src/NeKernelContract.cpp b/src/DebuggerKit/src/NeSystem.cpp
index 5e7fb5e..ea3beb4 100644
--- a/src/DebuggerKit/src/NeKernelContract.cpp
+++ b/src/DebuggerKit/src/NeSystem.cpp
@@ -9,16 +9,16 @@
 /// @author Amlal El Mahrouss
 /// @brief Kernel Debugger Protocol
 
-#include <DebuggerKit/NeKernelContract.h>
+#include <DebuggerKit/NeSystem.h>
 #include <ThirdParty/Dialogs/Dialogs.h>
 
 using namespace DebuggerKit::Detail;
 using namespace DebuggerKit::NeKernel;
 
-NeKernelContract::NeKernelContract()  = default;
-NeKernelContract::~NeKernelContract() = default;
+NeSystemDebugger::NeSystemDebugger()  = default;
+NeSystemDebugger::~NeSystemDebugger() = default;
 
-bool NeKernelContract::Attach(CompilerKit::STLString path, CompilerKit::STLString argv,
+bool NeSystemDebugger::Attach(CompilerKit::STLString path, CompilerKit::STLString argv,
                               ProcessID& pid) noexcept {
   if (path.empty() || argv.empty()) return NO;
 
@@ -44,7 +44,7 @@ bool NeKernelContract::Attach(CompilerKit::STLString path, CompilerKit::STLStrin
   return ret;
 }
 
-bool NeKernelContract::BreakAt(CompilerKit::STLString symbol) noexcept {
+bool NeSystemDebugger::BreakAt(CompilerKit::STLString symbol) noexcept {
   CompilerKit::STLString pkt = Detail::kDebugMagic;
   pkt += ";SYM=\"";
   pkt += symbol;
@@ -56,7 +56,7 @@ bool NeKernelContract::BreakAt(CompilerKit::STLString symbol) noexcept {
   return ret;
 }
 
-bool NeKernelContract::Break() noexcept {
+bool NeSystemDebugger::Break() noexcept {
   CompilerKit::STLString pkt = Detail::kDebugMagic;
   pkt += ";BRK=1;\r";
 
@@ -64,7 +64,7 @@ bool NeKernelContract::Break() noexcept {
   return ret;
 }
 
-bool NeKernelContract::Continue() noexcept {
+bool NeSystemDebugger::Continue() noexcept {
   CompilerKit::STLString pkt = Detail::kDebugMagic;
   pkt += ";CONT=1;\r";
 
@@ -73,7 +73,7 @@ bool NeKernelContract::Continue() noexcept {
   return NO;
 }
 
-bool NeKernelContract::Detach() noexcept {
+bool NeSystemDebugger::Detach() noexcept {
   CompilerKit::STLString pkt = Detail::kDebugMagic;
   pkt += ";DTCH=1;\r";
 
diff --git a/src/DebuggerKit/src/POSIXContractCLI.cpp b/src/DebuggerKit/src/POSIX+CLI.cpp
index 58aa4a1..30dbe26 100644
--- a/src/DebuggerKit/src/POSIXContractCLI.cpp
+++ b/src/DebuggerKit/src/POSIX+CLI.cpp
@@ -6,7 +6,7 @@
 
 #ifdef DK_POSIX_DEBUGGER
 
-#include <DebuggerKit/POSIXContract.h>
+#include <DebuggerKit/POSIX.h>
 #include <ThirdParty/Dialogs/Dialogs.h>
 
 #include <DebuggerKit/Common.inl>