diff --git a/Kernel/Arch/x86_64/ISABus/I8042Controller.h b/Kernel/Arch/x86_64/ISABus/I8042Controller.h
index bbb349a778..0837defb3b 100644
--- a/Kernel/Arch/x86_64/ISABus/I8042Controller.h
+++ b/Kernel/Arch/x86_64/ISABus/I8042Controller.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <AK/Types.h>
+#include <Kernel/Bus/SerialIO/Controller.h>
 #include <Kernel/Devices/HID/Controller.h>
 #include <Kernel/Devices/HID/KeyboardDevice.h>
 #include <Kernel/Devices/HID/MouseDevice.h>
@@ -96,7 +97,7 @@ protected:
 class PS2KeyboardDevice;
 class PS2MouseDevice;
 class HIDManagement;
-class I8042Controller final : public HIDController {
+class I8042Controller final : public SerialIOController {
     friend class PS2KeyboardDevice;
     friend class PS2MouseDevice;
 
diff --git a/Kernel/Bus/SerialIO/Controller.h b/Kernel/Bus/SerialIO/Controller.h
new file mode 100644
index 0000000000..8c357e4337
--- /dev/null
+++ b/Kernel/Bus/SerialIO/Controller.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2023, Liav A. <liavalb@hotmail.co.il>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#include <AK/AtomicRefCounted.h>
+#include <AK/Error.h>
+#include <AK/IntrusiveList.h>
+#include <AK/NonnullRefPtr.h>
+#include <AK/RefPtr.h>
+#include <AK/Types.h>
+
+namespace Kernel {
+
+class HIDManagement;
+class SerialIOController : public AtomicRefCounted<SerialIOController> {
+    friend class HIDManagement;
+
+public:
+    virtual ~SerialIOController() = default;
+
+protected:
+    SerialIOController() = default;
+
+private:
+    IntrusiveListNode<SerialIOController, NonnullRefPtr<SerialIOController>> m_list_node;
+};
+
+}
diff --git a/Kernel/Devices/HID/Controller.h b/Kernel/Devices/HID/Controller.h
deleted file mode 100644
index be11bc056d..0000000000
--- a/Kernel/Devices/HID/Controller.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2022, Liav A. <liavalb@hotmail.co.il>
- *
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-#pragma once
-
-#include <AK/AtomicRefCounted.h>
-#include <AK/IntrusiveList.h>
-#include <AK/NonnullRefPtr.h>
-#include <AK/RefPtr.h>
-
-namespace Kernel {
-
-class HIDManagement;
-class HIDController : public AtomicRefCounted<HIDController> {
-    friend class HIDManagement;
-
-public:
-    virtual ~HIDController() = default;
-
-protected:
-    HIDController() = default;
-
-private:
-    IntrusiveListNode<HIDController, NonnullRefPtr<HIDController>> m_list_node;
-};
-
-}
diff --git a/Kernel/Devices/HID/Management.cpp b/Kernel/Devices/HID/Management.cpp
index 970a4cee47..d1fcf6a6b7 100644
--- a/Kernel/Devices/HID/Management.cpp
+++ b/Kernel/Devices/HID/Management.cpp
@@ -155,7 +155,7 @@ UNMAP_AFTER_INIT ErrorOr<void> HIDManagement::enumerate()
         return {};
     if (auto result_or_error = i8042_controller->detect_devices(); result_or_error.is_error())
         return {};
-    m_hid_controllers.with([&](auto& list) {
+    m_hid_serial_io_controllers.with([&](auto& list) {
         list.append(i8042_controller);
     });
 #endif
diff --git a/Kernel/Devices/HID/Management.h b/Kernel/Devices/HID/Management.h
index 0dae995cd1..1a64ffcda6 100644
--- a/Kernel/Devices/HID/Management.h
+++ b/Kernel/Devices/HID/Management.h
@@ -14,7 +14,7 @@
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
 #include <Kernel/API/KeyCode.h>
-#include <Kernel/Devices/HID/Controller.h>
+#include <Kernel/Bus/SerialIO/Controller.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Locking/SpinlockProtected.h>
 #include <Kernel/UnixTypes.h>
@@ -60,7 +60,7 @@ private:
     size_t m_keyboard_minor_number { 0 };
     KeyboardClient* m_client { nullptr };
 
-    SpinlockProtected<IntrusiveList<&HIDController::m_list_node>, LockRank::None> m_hid_controllers;
+    SpinlockProtected<IntrusiveList<&SerialIOController::m_list_node>, LockRank::None> m_hid_serial_io_controllers;
     Spinlock<LockRank::None> m_client_lock;
 };