diff --git a/src/app/core/platform/app_delegate.mm b/src/app/core/platform/app_delegate.mm
index fe999898..3b76351c 100644
--- a/src/app/core/platform/app_delegate.mm
+++ b/src/app/core/platform/app_delegate.mm
@@ -195,7 +195,7 @@
 }
 
 - (void)openFileAction:(id)sender {
-  yaze::app::SharedROM::shared_rom_->LoadFromFile(FileDialogWrapper::ShowOpenFileDialog());
+  yaze::app::SharedRom::shared_rom_->LoadFromFile(FileDialogWrapper::ShowOpenFileDialog());
 }
 
 - (void)cutAction:(id)sender {
diff --git a/src/app/editor/dungeon_editor.h b/src/app/editor/dungeon_editor.h
index 2ec181c7..a2c748d0 100644
--- a/src/app/editor/dungeon_editor.h
+++ b/src/app/editor/dungeon_editor.h
@@ -43,7 +43,7 @@ constexpr ImGuiTableFlags kDungeonTableFlags =
  * entrances, calculating usage statistics, and rendering set usage.
  */
 class DungeonEditor : public Editor,
-                      public SharedROM,
+                      public SharedRom,
                       public core::ExperimentFlags {
  public:
   absl::Status Update() override;
diff --git a/src/app/editor/graphics_editor.h b/src/app/editor/graphics_editor.h
index 07f4c9cf..48502ad7 100644
--- a/src/app/editor/graphics_editor.h
+++ b/src/app/editor/graphics_editor.h
@@ -73,7 +73,7 @@ constexpr ImGuiTableFlags kGfxEditFlags = ImGuiTableFlags_Reorderable |
  * drawing toolsets, palette controls, clipboard imports, experimental features,
  * and memory editor.
  */
-class GraphicsEditor : public SharedROM {
+class GraphicsEditor : public SharedRom {
  public:
   absl::Status Update();
 
diff --git a/src/app/editor/master_editor.h b/src/app/editor/master_editor.h
index 4dc516aa..dd4692e6 100644
--- a/src/app/editor/master_editor.h
+++ b/src/app/editor/master_editor.h
@@ -39,7 +39,7 @@ namespace editor {
  * @brief The MasterEditor class represents the main editor for a ROM in the
  * Yaze application.
  *
- * This class inherits from SharedROM, GfxContext, and ExperimentFlags, and
+ * This class inherits from SharedRom, GfxContext, and ExperimentFlags, and
  * provides functionality for setting up the screen, updating the editor, and
  * shutting down the editor. It also includes methods for drawing various menus
  * and popups, saving the ROM, and managing editor-specific flags.
@@ -52,7 +52,7 @@ namespace editor {
  * @note This class assumes the presence of an SDL_Renderer object for rendering
  * graphics.
  */
-class MasterEditor : public SharedROM,
+class MasterEditor : public SharedRom,
                      public context::GfxContext,
                      public core::ExperimentFlags {
  public:
diff --git a/src/app/editor/modules/gfx_group_editor.h b/src/app/editor/modules/gfx_group_editor.h
index 7a44447c..53734284 100644
--- a/src/app/editor/modules/gfx_group_editor.h
+++ b/src/app/editor/modules/gfx_group_editor.h
@@ -27,7 +27,7 @@ namespace editor {
  * @class GfxGroupEditor
  * @brief Manage graphics group configurations in a ROM.
  */
-class GfxGroupEditor : public SharedROM {
+class GfxGroupEditor : public SharedRom {
  public:
   absl::Status Update();
 
diff --git a/src/app/editor/modules/music_editor.h b/src/app/editor/modules/music_editor.h
index a9e17d5c..dbf04b9d 100644
--- a/src/app/editor/modules/music_editor.h
+++ b/src/app/editor/modules/music_editor.h
@@ -59,7 +59,7 @@ static constexpr absl::string_view kSongNotes[] = {
  * @class MusicEditor
  * @brief A class for editing music data in a ROM.
  */
-class MusicEditor : public SharedROM {
+class MusicEditor : public SharedRom {
  public:
   void Update();
 
diff --git a/src/app/editor/modules/palette_editor.h b/src/app/editor/modules/palette_editor.h
index c823476c..cbc5aec3 100644
--- a/src/app/editor/modules/palette_editor.h
+++ b/src/app/editor/modules/palette_editor.h
@@ -81,7 +81,7 @@ class PaletteEditorHistory {
  * @class PaletteEditor
  * @brief Allows the user to view and edit in game palettes.
  */
-class PaletteEditor : public SharedROM {
+class PaletteEditor : public SharedRom {
  public:
   absl::Status Update();
   absl::Status DrawPaletteGroups();
diff --git a/src/app/editor/modules/tile16_editor.h b/src/app/editor/modules/tile16_editor.h
index d7e6c68f..f554b8e1 100644
--- a/src/app/editor/modules/tile16_editor.h
+++ b/src/app/editor/modules/tile16_editor.h
@@ -27,7 +27,7 @@ namespace editor {
 /**
  * @brief Popup window to edit Tile16 data
  */
-class Tile16Editor : public context::GfxContext, public SharedROM {
+class Tile16Editor : public context::GfxContext, public SharedRom {
  public:
   absl::Status Update();
   absl::Status DrawMenu();
diff --git a/src/app/editor/overworld_editor.h b/src/app/editor/overworld_editor.h
index 8b427b4e..d17d327e 100644
--- a/src/app/editor/overworld_editor.h
+++ b/src/app/editor/overworld_editor.h
@@ -79,7 +79,7 @@ constexpr absl::string_view kOWMapTable = "#MapSettingsTable";
  *
  */
 class OverworldEditor : public Editor,
-                        public SharedROM,
+                        public SharedRom,
                         public context::GfxContext,
                         public context::EntranceContext,
                         public core::ExperimentFlags {
diff --git a/src/app/editor/screen_editor.h b/src/app/editor/screen_editor.h
index 8cecd330..286c9230 100644
--- a/src/app/editor/screen_editor.h
+++ b/src/app/editor/screen_editor.h
@@ -34,9 +34,9 @@ namespace editor {
  * The screens that can be edited include the title screen, naming screen,
  * overworld map, inventory menu, and more.
  *
- * The class inherits from the SharedROM class.
+ * The class inherits from the SharedRom class.
  */
-class ScreenEditor : public SharedROM {
+class ScreenEditor : public SharedRom {
  public:
   ScreenEditor();
   void Update();
diff --git a/src/app/editor/sprite_editor.h b/src/app/editor/sprite_editor.h
index e760e2e4..3e6d24f1 100644
--- a/src/app/editor/sprite_editor.h
+++ b/src/app/editor/sprite_editor.h
@@ -16,7 +16,7 @@ namespace editor {
  * This class provides functionality for updating the sprite editor, drawing the
  * editor table, drawing the sprite canvas, and drawing the current sheets.
  */
-class SpriteEditor : public SharedROM {
+class SpriteEditor : public SharedRom {
  public:
   /**
    * @brief Updates the sprite editor.
diff --git a/src/app/emu/emulator.h b/src/app/emu/emulator.h
index 66ac631a..686f99be 100644
--- a/src/app/emu/emulator.h
+++ b/src/app/emu/emulator.h
@@ -22,7 +22,7 @@ namespace emu {
  * @class Emulator
  * @brief A class for emulating and debugging SNES ROMs.
  */
-class Emulator : public SharedROM {
+class Emulator : public SharedRom {
  public:
   void Run();
 
diff --git a/src/app/emu/video/ppu.h b/src/app/emu/video/ppu.h
index 55956a18..68f9bbb3 100644
--- a/src/app/emu/video/ppu.h
+++ b/src/app/emu/video/ppu.h
@@ -265,7 +265,7 @@ struct BackgroundLayer {
 
 const int kPpuClockSpeed = 5369318;  // 5.369318 MHz
 
-class Ppu : public Observer, public SharedROM {
+class Ppu : public Observer, public SharedRom {
  public:
   // Initializes the PPU with the necessary resources and dependencies
   Ppu(memory::Memory& memory, Clock& clock) : memory_(memory), clock_(clock) {}
diff --git a/src/app/gfx/bitmap.h b/src/app/gfx/bitmap.h
index 5e3ed075..7ec705f5 100644
--- a/src/app/gfx/bitmap.h
+++ b/src/app/gfx/bitmap.h
@@ -22,6 +22,8 @@ namespace app {
  */
 namespace gfx {
 
+
+
 /**
  * @brief Convert SDL_Surface to PNG image data.
  */
diff --git a/src/app/rom.cc b/src/app/rom.cc
index cdcad79a..620caa1d 100644
--- a/src/app/rom.cc
+++ b/src/app/rom.cc
@@ -516,7 +516,7 @@ absl::Status Rom::SaveAllPalettes() {
   return absl::OkStatus();
 }
 
-std::shared_ptr<Rom> SharedROM::shared_rom_ = nullptr;
+std::shared_ptr<Rom> SharedRom::shared_rom_ = nullptr;
 
 }  // namespace app
 }  // namespace yaze
\ No newline at end of file
diff --git a/src/app/rom.h b/src/app/rom.h
index d9968770..ebb24145 100644
--- a/src/app/rom.h
+++ b/src/app/rom.h
@@ -678,10 +678,10 @@ class Rom : public core::ExperimentFlags {
 /**
  * @brief A class to hold a shared pointer to a ROM object.
  */
-class SharedROM {
+class SharedRom {
  public:
-  SharedROM() = default;
-  virtual ~SharedROM() = default;
+  SharedRom() = default;
+  virtual ~SharedRom() = default;
 
   std::shared_ptr<Rom> shared_rom() {
     if (!shared_rom_) {
diff --git a/src/app/zelda3/dungeon/object_renderer.h b/src/app/zelda3/dungeon/object_renderer.h
index e469658b..7d1aac3e 100644
--- a/src/app/zelda3/dungeon/object_renderer.h
+++ b/src/app/zelda3/dungeon/object_renderer.h
@@ -28,7 +28,7 @@ struct SubtypeInfo {
   uint32_t routine_ptr;
 };
 
-class DungeonObjectRenderer : public SharedROM {
+class DungeonObjectRenderer : public SharedRom {
  public:
   DungeonObjectRenderer() = default;
 
diff --git a/src/app/zelda3/dungeon/room.h b/src/app/zelda3/dungeon/room.h
index 35a35c62..db970b3f 100644
--- a/src/app/zelda3/dungeon/room.h
+++ b/src/app/zelda3/dungeon/room.h
@@ -116,7 +116,7 @@ struct ChestData {
 
 struct StaircaseRooms {};
 
-class Room : public SharedROM, public core::ExperimentFlags {
+class Room : public SharedRom, public core::ExperimentFlags {
  public:
   Room() = default;
   Room(int room_id) : room_id_(room_id) {}
diff --git a/src/app/zelda3/dungeon/room_object.h b/src/app/zelda3/dungeon/room_object.h
index 12ca9c25..25a07782 100644
--- a/src/app/zelda3/dungeon/room_object.h
+++ b/src/app/zelda3/dungeon/room_object.h
@@ -58,7 +58,7 @@ enum ObjectOption {
   Stairs = 32
 };
 
-class RoomObject : public SharedROM {
+class RoomObject : public SharedRom {
  public:
   enum LayerType { BG1 = 0, BG2 = 1, BG3 = 2 };
 
diff --git a/src/app/zelda3/overworld/overworld.h b/src/app/zelda3/overworld/overworld.h
index 5e3656fc..6f78acfd 100644
--- a/src/app/zelda3/overworld/overworld.h
+++ b/src/app/zelda3/overworld/overworld.h
@@ -480,7 +480,7 @@ struct MapData {
  * This class is responsible for loading and saving the overworld data,
  * as well as creating the tilesets and tilemaps for the overworld.
  */
-class Overworld : public SharedROM, public core::ExperimentFlags {
+class Overworld : public SharedRom, public core::ExperimentFlags {
  public:
   OWBlockset &GetMapTiles(int world_type);
   absl::Status Load(Rom &rom);
diff --git a/src/app/zelda3/screen/inventory.h b/src/app/zelda3/screen/inventory.h
index c0b39435..6c1496c2 100644
--- a/src/app/zelda3/screen/inventory.h
+++ b/src/app/zelda3/screen/inventory.h
@@ -15,7 +15,7 @@ namespace screen {
 constexpr int kInventoryStart = 0x6564A;
 constexpr int kBowItemPos = 0x6F631;
 
-class Inventory : public SharedROM {
+class Inventory : public SharedRom {
  public:
   auto Bitmap() const { return bitmap_; }
   auto Tilesheet() const { return tilesheets_bmp_; }