5 files changed, 16 insertions, 20 deletions
diff --git a/dev/kernel/src/Gfx/FBDeviceInterface.cc b/dev/kernel/src/Gfx/FBDeviceInterface.cc
index d588e8c8..f1867b45 100644
--- a/dev/kernel/src/Gfx/FBDeviceInterface.cc
+++ b/dev/kernel/src/Gfx/FBDeviceInterface.cc
@@ -12,9 +12,9 @@ using namespace Kernel;
 /// @param Out Drive output
 /// @param In  Drive input
 /// @param Cleanup Drive cleanup.
-FBDeviceInterface::FBDeviceInterface(void (*out)(IDeviceObject* self, FBDevicePacket* outpacket),
-                                     void (*in)(IDeviceObject* self, FBDevicePacket* inpacket))
-    : IDeviceObject(out, in) {}
+FBDeviceInterface::FBDeviceInterface(void (*out)(DeviceInterface* self, FBDevicePacket* outpacket),
+                                     void (*in)(DeviceInterface* self, FBDevicePacket* inpacket))
+    : DeviceInterface(out, in) {}
 
 /// @brief Class desctructor
 FBDeviceInterface::~FBDeviceInterface() = default;
diff --git a/dev/kernel/src/Storage/AHCIDeviceInterface.cc b/dev/kernel/src/Storage/AHCIDeviceInterface.cc
index 2d97eee7..382ce37b 100644
--- a/dev/kernel/src/Storage/AHCIDeviceInterface.cc
+++ b/dev/kernel/src/Storage/AHCIDeviceInterface.cc
@@ -12,11 +12,11 @@ using namespace Kernel;
 /// @param Out Drive output
 /// @param In  Drive input
 /// @param Cleanup Drive cleanup.
-AHCIDeviceInterface::AHCIDeviceInterface(void (*out)(IDeviceObject*       self,
+AHCIDeviceInterface::AHCIDeviceInterface(void (*out)(DeviceInterface*       self,
                                                      MountpointInterface* outpacket),
-                                         void (*in)(IDeviceObject*       self,
+                                         void (*in)(DeviceInterface*       self,
                                                     MountpointInterface* inpacket))
-    : IDeviceObject(out, in) {}
+    : DeviceInterface(out, in) {}
 
 /// @brief Class desctructor
 AHCIDeviceInterface::~AHCIDeviceInterface() = default;
@@ -45,7 +45,7 @@ AHCIDeviceInterface& AHCIDeviceInterface::operator<<(MountpointInterface* mnt) {
     }
   }
 
-  return (AHCIDeviceInterface&) IDeviceObject<MountpointInterface*>::operator<<(mnt);
+  return (AHCIDeviceInterface&) DeviceInterface<MountpointInterface*>::operator<<(mnt);
 }
 
 /// @brief Input operator.
@@ -67,7 +67,7 @@ AHCIDeviceInterface& AHCIDeviceInterface::operator>>(MountpointInterface* mnt) {
     }
   }
 
-  return (AHCIDeviceInterface&) IDeviceObject<MountpointInterface*>::operator>>(mnt);
+  return (AHCIDeviceInterface&) DeviceInterface<MountpointInterface*>::operator>>(mnt);
 }
 
 const UInt16& AHCIDeviceInterface::GetPortsImplemented() {
diff --git a/dev/kernel/src/Storage/ATADeviceInterface.cc b/dev/kernel/src/Storage/ATADeviceInterface.cc
index a66d812b..697571a3 100644
--- a/dev/kernel/src/Storage/ATADeviceInterface.cc
+++ b/dev/kernel/src/Storage/ATADeviceInterface.cc
@@ -12,9 +12,9 @@ using namespace Kernel;
 /// @param Out Drive output
 /// @param In  Drive input
 /// @param Cleanup Drive cleanup.
-ATADeviceInterface::ATADeviceInterface(void (*Out)(IDeviceObject*, MountpointInterface* outpacket),
-                                       void (*In)(IDeviceObject*, MountpointInterface* inpacket))
-    : IDeviceObject(Out, In) {}
+ATADeviceInterface::ATADeviceInterface(void (*Out)(DeviceInterface*, MountpointInterface* outpacket),
+                                       void (*In)(DeviceInterface*, MountpointInterface* inpacket))
+    : DeviceInterface(Out, In) {}
 
 /// @brief Class desctructor
 ATADeviceInterface::~ATADeviceInterface() = default;
@@ -43,7 +43,7 @@ ATADeviceInterface& ATADeviceInterface::operator<<(MountpointInterface* Data) {
     }
   }
 
-  return (ATADeviceInterface&) IDeviceObject<MountpointInterface*>::operator<<(Data);
+  return (ATADeviceInterface&) DeviceInterface<MountpointInterface*>::operator<<(Data);
 }
 
 /// @brief Input operator.
@@ -65,7 +65,7 @@ ATADeviceInterface& ATADeviceInterface::operator>>(MountpointInterface* Data) {
     }
   }
 
-  return (ATADeviceInterface&) IDeviceObject<MountpointInterface*>::operator>>(Data);
+  return (ATADeviceInterface&) DeviceInterface<MountpointInterface*>::operator>>(Data);
 }
 
 const UInt32& ATADeviceInterface::GetIndex() {
diff --git a/dev/kernel/src/Storage/NVMEDeviceInterface.cc b/dev/kernel/src/Storage/NVMEDeviceInterface.cc
index cff776c9..bc138710 100644
--- a/dev/kernel/src/Storage/NVMEDeviceInterface.cc
+++ b/dev/kernel/src/Storage/NVMEDeviceInterface.cc
@@ -7,11 +7,11 @@
 #include <StorageKit/NVME.h>
 
 namespace Kernel {
-NVMEDeviceInterface::NVMEDeviceInterface(void (*out)(IDeviceObject*,
+NVMEDeviceInterface::NVMEDeviceInterface(void (*out)(DeviceInterface*,
                                                      MountpointInterface* outpacket),
-                                         void (*in)(IDeviceObject*, MountpointInterface* inpacket),
+                                         void (*in)(DeviceInterface*, MountpointInterface* inpacket),
                                          void (*cleanup)(void))
-    : IDeviceObject(out, in), fCleanup(cleanup) {}
+    : DeviceInterface(out, in), fCleanup(cleanup) {}
 
 NVMEDeviceInterface::~NVMEDeviceInterface() {
   if (fCleanup) fCleanup();
diff --git a/dev/kernel/src/UserProcessScheduler.cc b/dev/kernel/src/UserProcessScheduler.cc
index 876cae03..1454585c 100644
--- a/dev/kernel/src/UserProcessScheduler.cc
+++ b/dev/kernel/src/UserProcessScheduler.cc
@@ -31,10 +31,6 @@ namespace Kernel {
 
 STATIC UInt32 kLastExitCode = 0U;
 
-/***********************************************************************************/
-/// @brief Scheduler itself.
-/***********************************************************************************/
-
 USER_PROCESS::USER_PROCESS()  = default;
 USER_PROCESS::~USER_PROCESS() = default;