diff --git a/Kernel/FileSystem/BlockBasedFileSystem.cpp b/Kernel/FileSystem/BlockBasedFileSystem.cpp
index f0619cbc9dc..7a4af3db076 100644
--- a/Kernel/FileSystem/BlockBasedFileSystem.cpp
+++ b/Kernel/FileSystem/BlockBasedFileSystem.cpp
@@ -64,8 +64,8 @@ public:
 
         if (m_clean_list.is_empty()) {
             // Not a single clean entry! Flush writes and try again.
-            // NOTE: We want to make sure we only call FileBackedFS flush here,
-            //       not some FileBackedFS subclass flush!
+            // NOTE: We want to make sure we only call FileBackedFileSystem flush here,
+            //       not some FileBackedFileSystem subclass flush!
             m_fs.flush_writes_impl();
             return get(block_index);
         }
@@ -105,7 +105,7 @@ private:
 };
 
 BlockBasedFS::BlockBasedFS(FileDescription& file_description)
-    : FileBackedFS(file_description)
+    : FileBackedFileSystem(file_description)
 {
     VERIFY(file_description.file().is_seekable());
 }
diff --git a/Kernel/FileSystem/BlockBasedFileSystem.h b/Kernel/FileSystem/BlockBasedFileSystem.h
index 36b70d799fd..96f44d50a9a 100644
--- a/Kernel/FileSystem/BlockBasedFileSystem.h
+++ b/Kernel/FileSystem/BlockBasedFileSystem.h
@@ -10,7 +10,7 @@
 
 namespace Kernel {
 
-class BlockBasedFS : public FileBackedFS {
+class BlockBasedFS : public FileBackedFileSystem {
 public:
     TYPEDEF_DISTINCT_ORDERED_ID(u64, BlockIndex);
 
diff --git a/Kernel/FileSystem/FileBackedFileSystem.cpp b/Kernel/FileSystem/FileBackedFileSystem.cpp
index 094bf0a4e95..97f08716b45 100644
--- a/Kernel/FileSystem/FileBackedFileSystem.cpp
+++ b/Kernel/FileSystem/FileBackedFileSystem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
+ * Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
@@ -8,12 +8,12 @@
 
 namespace Kernel {
 
-FileBackedFS::FileBackedFS(FileDescription& file_description)
+FileBackedFileSystem::FileBackedFileSystem(FileDescription& file_description)
     : m_file_description(file_description)
 {
 }
 
-FileBackedFS::~FileBackedFS()
+FileBackedFileSystem::~FileBackedFileSystem()
 {
 }
 
diff --git a/Kernel/FileSystem/FileBackedFileSystem.h b/Kernel/FileSystem/FileBackedFileSystem.h
index 1172cd4a497..623c5454852 100644
--- a/Kernel/FileSystem/FileBackedFileSystem.h
+++ b/Kernel/FileSystem/FileBackedFileSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
+ * Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
@@ -11,9 +11,9 @@
 
 namespace Kernel {
 
-class FileBackedFS : public FileSystem {
+class FileBackedFileSystem : public FileSystem {
 public:
-    virtual ~FileBackedFS() override;
+    virtual ~FileBackedFileSystem() override;
 
     File& file() { return m_file_description->file(); }
     FileDescription& file_description() { return *m_file_description; }
@@ -21,7 +21,7 @@ public:
     FileDescription& file_description() const { return *m_file_description; }
 
 protected:
-    explicit FileBackedFS(FileDescription&);
+    explicit FileBackedFileSystem(FileDescription&);
 
 private:
     virtual bool is_file_backed() const override { return true; }
diff --git a/Kernel/FileSystem/Plan9FileSystem.cpp b/Kernel/FileSystem/Plan9FileSystem.cpp
index 851a5c20777..6b3bc31d327 100644
--- a/Kernel/FileSystem/Plan9FileSystem.cpp
+++ b/Kernel/FileSystem/Plan9FileSystem.cpp
@@ -15,7 +15,7 @@ NonnullRefPtr<Plan9FS> Plan9FS::create(FileDescription& file_description)
 }
 
 Plan9FS::Plan9FS(FileDescription& file_description)
-    : FileBackedFS(file_description)
+    : FileBackedFileSystem(file_description)
     , m_completion_blocker(*this)
 {
 }
diff --git a/Kernel/FileSystem/Plan9FileSystem.h b/Kernel/FileSystem/Plan9FileSystem.h
index 13514acfd97..ddb8debb122 100644
--- a/Kernel/FileSystem/Plan9FileSystem.h
+++ b/Kernel/FileSystem/Plan9FileSystem.h
@@ -15,7 +15,7 @@ namespace Kernel {
 
 class Plan9FSInode;
 
-class Plan9FS final : public FileBackedFS {
+class Plan9FS final : public FileBackedFileSystem {
     friend class Plan9FSInode;
 
 public:
diff --git a/Kernel/FileSystem/VirtualFileSystem.cpp b/Kernel/FileSystem/VirtualFileSystem.cpp
index 0441ef21e4d..ab30db3000d 100644
--- a/Kernel/FileSystem/VirtualFileSystem.cpp
+++ b/Kernel/FileSystem/VirtualFileSystem.cpp
@@ -128,7 +128,7 @@ bool VirtualFileSystem::mount_root(FileSystem& fs)
     }
 
     m_root_inode = move(root_inode);
-    dmesgln("VirtualFileSystem: mounted root from {} ({})", fs.class_name(), static_cast<FileBackedFS&>(fs).file_description().absolute_path());
+    dmesgln("VirtualFileSystem: mounted root from {} ({})", fs.class_name(), static_cast<FileBackedFileSystem&>(fs).file_description().absolute_path());
 
     m_mounts.append(move(mount));
 
diff --git a/Kernel/GlobalProcessExposed.cpp b/Kernel/GlobalProcessExposed.cpp
index 56049e27093..a1219ead031 100644
--- a/Kernel/GlobalProcessExposed.cpp
+++ b/Kernel/GlobalProcessExposed.cpp
@@ -353,7 +353,7 @@ private:
             fs_object.add("mount_flags", mount.flags());
 
             if (fs.is_file_backed())
-                fs_object.add("source", static_cast<const FileBackedFS&>(fs).file_description().absolute_path());
+                fs_object.add("source", static_cast<const FileBackedFileSystem&>(fs).file_description().absolute_path());
             else
                 fs_object.add("source", "none");
         });