3 files changed, 13 insertions, 13 deletions
diff --git a/kapi/kapi/filesystem.hpp b/kapi/kapi/filesystem.hpp
index 6796532f..161a1019 100644
--- a/kapi/kapi/filesystem.hpp
+++ b/kapi/kapi/filesystem.hpp
@@ -1,11 +1,11 @@
 #ifndef TEACHOS_KAPI_FILESYSTEM_HPP
 #define TEACHOS_KAPI_FILESYSTEM_HPP
 
-#include <kapi/filesystem/block_device.hpp>      // IWYU pragma: export
-#include <kapi/filesystem/character_device.hpp>  // IWYU pragma: export
-#include <kapi/filesystem/device_number.hpp>     // IWYU pragma: export
-#include <kapi/filesystem/file_status.hpp>       // IWYU pragma: export
-#include <kapi/filesystem/file_type.hpp>         // IWYU pragma: export
+#include <kapi/filesystem/block_special_file.hpp>      // IWYU pragma: export
+#include <kapi/filesystem/character_special_file.hpp>  // IWYU pragma: export
+#include <kapi/filesystem/device_number.hpp>           // IWYU pragma: export
+#include <kapi/filesystem/file_status.hpp>             // IWYU pragma: export
+#include <kapi/filesystem/file_type.hpp>               // IWYU pragma: export
 
 #include <kstd/result.hpp>
 #include <kstd/system_error.hpp>
diff --git a/kapi/kapi/filesystem/block_device.hpp b/kapi/kapi/filesystem/block_special_file.hpp
index 6d062b07..6e125117 100644
--- a/kapi/kapi/filesystem/block_device.hpp
+++ b/kapi/kapi/filesystem/block_special_file.hpp
@@ -1,5 +1,5 @@
-#ifndef TEACHOS_KAPI_FILESYSTEM_BLOCK_DEVICE_HPP
-#define TEACHOS_KAPI_FILESYSTEM_BLOCK_DEVICE_HPP
+#ifndef TEACHOS_KAPI_FILESYSTEM_BLOCK_SPECIAL_FILE_HPP
+#define TEACHOS_KAPI_FILESYSTEM_BLOCK_SPECIAL_FILE_HPP
 
 // IWYU pragma: private, include <kapi/filesystem.hpp>
 
@@ -13,12 +13,12 @@
 namespace kapi::filesystem
 {
 
-  struct block_device
+  struct block_special_file
   {
     constexpr auto static id = kapi::devices::interface_id{"block"};
 
     //! Virtual destructor to enable clean deletes through base pointers.
-    virtual ~block_device() = default;
+    virtual ~block_special_file() = default;
 
     //! Read data from a block into a given buffer.
     //!
diff --git a/kapi/kapi/filesystem/character_device.hpp b/kapi/kapi/filesystem/character_special_file.hpp
index b839410d..d7bc8c64 100644
--- a/kapi/kapi/filesystem/character_device.hpp
+++ b/kapi/kapi/filesystem/character_special_file.hpp
@@ -1,5 +1,5 @@
-#ifndef TEACHOS_KAPI_FILESYSTEM_CHARACTER_DEVICE_HPP
-#define TEACHOS_KAPI_FILESYSTEM_CHARACTER_DEVICE_HPP
+#ifndef TEACHOS_KAPI_FILESYSTEM_CHARACTER_SPECIAL_FILE_HPP
+#define TEACHOS_KAPI_FILESYSTEM_CHARACTER_SPECIAL_FILE_HPP
 
 // IWYU pragma: private, include <kapi/filesystem.hpp>
 
@@ -14,12 +14,12 @@
 namespace kapi::filesystem
 {
 
-  struct character_device
+  struct character_special_file
   {
     constexpr auto static id = kapi::devices::interface_id{"char"};
 
     //! Virtual destructor to enable clean deletes through base pointers.
-    virtual ~character_device() = default;
+    virtual ~character_special_file() = default;
 
     //! Read data from the stream into a given buffer.
     //!