diff --git a/stratosphere/fs_mitm/source/fsmitm_layeredrom.cpp b/stratosphere/fs_mitm/source/fsmitm_layeredrom.cpp
index c8033a831..f1e926b7d 100644
--- a/stratosphere/fs_mitm/source/fsmitm_layeredrom.cpp
+++ b/stratosphere/fs_mitm/source/fsmitm_layeredrom.cpp
@@ -19,10 +19,10 @@ LayeredRomFS::LayeredRomFS(std::shared_ptr<RomInterfaceStorage> s_r, std::shared
         build_ctx.MergeSdFiles();
     }
     if (this->file_romfs) {
-        build_ctx.MergeRomStorage(this->file_romfs.get(), RomFSDataSource_FileRomFS);
+        build_ctx.MergeRomStorage(this->file_romfs.get(), RomFSDataSource::FileRomFS);
     }
     if (this->storage_romfs) {
-        build_ctx.MergeRomStorage(this->storage_romfs.get(), RomFSDataSource_BaseRomFS);
+        build_ctx.MergeRomStorage(this->storage_romfs.get(), RomFSDataSource::BaseRomFS);
     }
     build_ctx.Build(this->p_source_infos.get());
 }
diff --git a/stratosphere/fs_mitm/source/fsmitm_romfsbuild.cpp b/stratosphere/fs_mitm/source/fsmitm_romfsbuild.cpp
index 13a255035..4ceb63851 100644
--- a/stratosphere/fs_mitm/source/fsmitm_romfsbuild.cpp
+++ b/stratosphere/fs_mitm/source/fsmitm_romfsbuild.cpp
@@ -77,7 +77,7 @@ void RomFSBuildContext::MergeSdFiles() {
     if (R_FAILED(fsMountSdcard(&sd_filesystem))) {
         return;
     }
-    this->cur_source_type = RomFSDataSource_LooseFile;
+    this->cur_source_type = RomFSDataSource::LooseFile;
     this->VisitDirectory(&sd_filesystem, this->root);
     fsFsClose(&sd_filesystem);
 }
@@ -310,7 +310,7 @@ void RomFSBuildContext::Build(std::vector<RomFSSourceInfo> *out_infos) {
     }
     
     out_infos->clear();
-    out_infos->push_back(RomFSSourceInfo(0, sizeof(*header), header, RomFSDataSource_Memory));
+    out_infos->push_back(RomFSSourceInfo(0, sizeof(*header), header, RomFSDataSource::Memory));
         
     /* Determine file offsets. */
     cur_file = this->files;
@@ -356,8 +356,8 @@ void RomFSBuildContext::Build(std::vector<RomFSSourceInfo> *out_infos) {
         
         
         switch (cur_file->source) {
-            case RomFSDataSource_BaseRomFS:
-            case RomFSDataSource_FileRomFS:
+            case RomFSDataSource::BaseRomFS:
+            case RomFSDataSource::FileRomFS:
                 /* Try to compact, if possible. */
                 if (out_infos->back().GetType() == cur_file->source) {
                     out_infos->back().size = cur_file->offset + ROMFS_FILEPARTITION_OFS + cur_file->size - out_infos->back().virtual_offset;
@@ -365,7 +365,7 @@ void RomFSBuildContext::Build(std::vector<RomFSSourceInfo> *out_infos) {
                     out_infos->push_back(RomFSSourceInfo(cur_file->offset + ROMFS_FILEPARTITION_OFS, cur_file->size, cur_file->orig_offset + ROMFS_FILEPARTITION_OFS, cur_file->source));
                 }
                 break;
-            case RomFSDataSource_LooseFile:
+            case RomFSDataSource::LooseFile:
                 {
                     char *path = new char[cur_file->path_len + 1];
                     strcpy(path, cur_file->path);
@@ -416,5 +416,5 @@ void RomFSBuildContext::Build(std::vector<RomFSSourceInfo> *out_infos) {
     header->file_hash_table_ofs = header->dir_table_ofs + header->dir_table_size;
     header->file_table_ofs = header->file_hash_table_ofs + header->file_hash_table_size;
     
-    out_infos->push_back(RomFSSourceInfo(header->dir_hash_table_ofs, this->dir_hash_table_size + this->dir_table_size + this->file_hash_table_size + this->file_table_size, metadata, RomFSDataSource_Memory));
+    out_infos->push_back(RomFSSourceInfo(header->dir_hash_table_ofs, this->dir_hash_table_size + this->dir_table_size + this->file_hash_table_size + this->file_table_size, metadata, RomFSDataSource::Memory));
 }
diff --git a/stratosphere/fs_mitm/source/fsmitm_romfsbuild.hpp b/stratosphere/fs_mitm/source/fsmitm_romfsbuild.hpp
index 5192578b4..d8de39007 100644
--- a/stratosphere/fs_mitm/source/fsmitm_romfsbuild.hpp
+++ b/stratosphere/fs_mitm/source/fsmitm_romfsbuild.hpp
@@ -8,11 +8,11 @@
 #define ROMFS_FILEPARTITION_OFS 0x200
 
 /* Types for RomFS Meta construction. */
-enum RomFSDataSource {
-    RomFSDataSource_BaseRomFS,
-    RomFSDataSource_FileRomFS,
-    RomFSDataSource_LooseFile,
-    RomFSDataSource_Memory,
+enum class RomFSDataSource {
+    BaseRomFS,
+    FileRomFS,
+    LooseFile,
+    Memory,
 };
 
 struct RomFSBaseSourceInfo {
@@ -36,10 +36,10 @@ class RomFSSourceInfo {
 
     static InfoVariant MakeInfoVariantFromOffset(u64 offset, RomFSDataSource t) {
         switch(t) {
-            case RomFSDataSource_BaseRomFS:
+            case RomFSDataSource::BaseRomFS:
                 return RomFSBaseSourceInfo { offset };
 
-            case RomFSDataSource_FileRomFS:
+            case RomFSDataSource::FileRomFS:
                 return RomFSFileSourceInfo { offset };
 
             default:
@@ -49,10 +49,10 @@ class RomFSSourceInfo {
 
     static InfoVariant MakeInfoVariantFromPointer(const void *arg, RomFSDataSource t) {
         switch(t) {
-            case RomFSDataSource_LooseFile:
+            case RomFSDataSource::LooseFile:
                 return RomFSLooseSourceInfo { (decltype(RomFSLooseSourceInfo::path))arg };
 
-            case RomFSDataSource_Memory:
+            case RomFSDataSource::Memory:
                 return RomFSMemorySourceInfo { (decltype(RomFSMemorySourceInfo::data))arg };
 
             default:
@@ -78,19 +78,19 @@ class RomFSSourceInfo {
 
     struct GetTypeHelper {
         RomFSDataSource operator()(const RomFSBaseSourceInfo& info) const {
-            return RomFSDataSource_BaseRomFS;
+            return RomFSDataSource::BaseRomFS;
         }
 
         RomFSDataSource operator()(const RomFSFileSourceInfo& info) const {
-            return RomFSDataSource_FileRomFS;
+            return RomFSDataSource::FileRomFS;
         }
 
         RomFSDataSource operator()(const RomFSLooseSourceInfo& info) const {
-            return RomFSDataSource_LooseFile;
+            return RomFSDataSource::LooseFile;
         }
 
         RomFSDataSource operator()(const RomFSMemorySourceInfo& info) const {
-            return RomFSDataSource_Memory;
+            return RomFSDataSource::Memory;
         }
     };