6 files changed, 28 insertions, 22 deletions
diff --git a/dev/kernel/NetworkKit/IP.h b/dev/kernel/NetworkKit/IP.h
index bf3b24ff..0b872352 100644
--- a/dev/kernel/NetworkKit/IP.h
+++ b/dev/kernel/NetworkKit/IP.h
@@ -7,9 +7,9 @@
 #pragma once
 
 #include <KernelKit/DebugOutput.h>
-#include <NewKit/Defines.h>
-#include <NewKit/KString.h>
-#include <NewKit/Ref.h>
+#include <NeKit/Defines.h>
+#include <NeKit/KString.h>
+#include <NeKit/Ref.h>
 
 namespace Kernel {
 class RawIPAddress6;
diff --git a/dev/kernel/NetworkKit/IPC.h b/dev/kernel/NetworkKit/IPC.h
index 43b58d35..0dd8a1f1 100644
--- a/dev/kernel/NetworkKit/IPC.h
+++ b/dev/kernel/NetworkKit/IPC.h
@@ -10,8 +10,8 @@
 #ifndef INC_IPC_H
 #define INC_IPC_H
 
-#include <NewKit/Defines.h>
-#include <NewKit/KString.h>
+#include <NeKit/Defines.h>
+#include <NeKit/KString.h>
 #include <hint/CompilerHint.h>
 
 /// @file IPC.h
diff --git a/dev/kernel/NetworkKit/LTE.h b/dev/kernel/NetworkKit/LTE.h
index 71254cbf..030f9955 100644
--- a/dev/kernel/NetworkKit/LTE.h
+++ b/dev/kernel/NetworkKit/LTE.h
@@ -10,7 +10,7 @@
 #ifndef _INC_NETWORK_LTE_H_
 #define _INC_NETWORK_LTE_H_
 
-#include <NewKit/Defines.h>
-#include <NewKit/KString.h>
+#include <NeKit/Defines.h>
+#include <NeKit/KString.h>
 
 #endif  // ifndef _INC_NETWORK_LTE_H_
diff --git a/dev/kernel/NetworkKit/MAC.h b/dev/kernel/NetworkKit/MAC.h
index 8520037e..805f7259 100644
--- a/dev/kernel/NetworkKit/MAC.h
+++ b/dev/kernel/NetworkKit/MAC.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <NewKit/Array.h>
-#include <NewKit/Defines.h>
-#include <NewKit/KString.h>
+#include <NeKit/Array.h>
+#include <NeKit/Defines.h>
+#include <NeKit/KString.h>
 
 #define kMACAddrLen (32)
 
diff --git a/dev/kernel/NetworkKit/NetworkDevice.h b/dev/kernel/NetworkKit/NetworkDevice.h
index 7ed67bab..c37d8504 100644
--- a/dev/kernel/NetworkKit/NetworkDevice.h
+++ b/dev/kernel/NetworkKit/NetworkDevice.h
@@ -19,11 +19,11 @@ class NetworkDevice;
 /**
  * \brief Network device interface, establishes a connection to the NIC.
  */
-class NetworkDevice final : public IDeviceObject<NetworkDeviceCommand> {
+class NetworkDevice final NE_DEVICE<NetworkDeviceCommand> {
  public:
   NetworkDevice(void (*out)(IDeviceObject<NetworkDeviceCommand>*, NetworkDeviceCommand),
                 void (*in)(IDeviceObject<NetworkDeviceCommand>*, NetworkDeviceCommand),
-                void (*onCleanup)(void) = nullptr);
+                void (*cleanup)(void) = nullptr);
 
   ~NetworkDevice() override;
 
@@ -36,10 +36,7 @@ class NetworkDevice final : public IDeviceObject<NetworkDeviceCommand> {
   Boolean     Name(const Char* newStr);
 
  private:
-  static constexpr auto cNetworkNameLen = 512;
-
   Void (*fCleanup)(void);
-  Char fNetworkName[cNetworkNameLen];
 };
 
 struct NetworkDeviceCommand final {
@@ -71,6 +68,12 @@ using GSMNetworkDevice = NetworkDevice;
 /// @brief Bluetooth device.
 using BTNetworkDevice = NetworkDevice;
 
+/// @brief Printer device.
+using PrinterNetworkDevice = NetworkDevice;
+
+/// @brief Debug device.
+using DBGNetworkDevice = NetworkDevice;
+
 /// @brief LTE device.
 using LTENetworkDevice = NetworkDevice;
 }  // namespace Kernel
diff --git a/dev/kernel/NetworkKit/NetworkDevice.inl b/dev/kernel/NetworkKit/NetworkDevice.inl
index 797b8adc..84ec9edc 100644
--- a/dev/kernel/NetworkKit/NetworkDevice.inl
+++ b/dev/kernel/NetworkKit/NetworkDevice.inl
@@ -8,20 +8,23 @@
   Dtor and ctors.
 */
 
+#ifndef __INC_NETWORK_DEVICE_H__
+#include <NetworkKit/NetworkDevice.h>
+#endif  // __INC_NETWORK_DEVICE_H__
+
 namespace Kernel {
-NetworkDevice::NetworkDevice(void (*out)(IDeviceObject<NetworkDeviceCommand>*,
-                                         NetworkDeviceCommand),
-                             void (*in)(IDeviceObject<NetworkDeviceCommand>*, NetworkDeviceCommand),
-                             void (*on_cleanup)(void))
+inline NetworkDevice::NetworkDevice(void (*out)(IDeviceObject<NetworkDeviceCommand>*,
+                                                NetworkDeviceCommand),
+                                    void (*in)(IDeviceObject<NetworkDeviceCommand>*,
+                                               NetworkDeviceCommand),
+                                    void (*on_cleanup)(void))
     : IDeviceObject<NetworkDeviceCommand>(out, in), fCleanup(on_cleanup) {
   kout << "NetworkDevice initialized.\r";
 
   MUST_PASS(out && in && on_cleanup);
 }
 
-NetworkDevice::~NetworkDevice() {
-  MUST_PASS(fCleanup);
-
+inline NetworkDevice::~NetworkDevice() {
   kout << "NetworkDevice cleanup.\r";
 
   if (fCleanup) fCleanup();