diff --git a/src/app/core/platform/clipboard.h b/src/app/core/platform/clipboard.h
index a98c703d..4c02f592 100644
--- a/src/app/core/platform/clipboard.h
+++ b/src/app/core/platform/clipboard.h
@@ -8,6 +8,7 @@ void GetImageFromClipboard(std::vector<uint8_t>& data, int& width, int& height);
 
 #elif defined(__APPLE__)
 
+#include <cstdint>
 #include <vector>
 
 void CopyImageToClipboard(const std::vector<uint8_t>& data);
@@ -15,6 +16,7 @@ void GetImageFromClipboard(std::vector<uint8_t>& data, int& width, int& height);
 
 #elif defined(__linux__)
 
+#include <cstdint>
 #include <vector>
 
 void CopyImageToClipboard(const std::vector<uint8_t>& data);
diff --git a/src/app/editor/overworld_editor.cc b/src/app/editor/overworld_editor.cc
index 585dc35c..e2bfecca 100644
--- a/src/app/editor/overworld_editor.cc
+++ b/src/app/editor/overworld_editor.cc
@@ -322,7 +322,7 @@ void OverworldEditor::RefreshChildMap(int map_index) {
   }
   status_ = overworld_.mutable_overworld_map(map_index)->BuildBitmap(blockset);
   maps_bmp_[map_index].set_data(
-      overworld_.mutable_overworld_map(map_index)->BitmapData());
+      overworld_.mutable_overworld_map(map_index)->bitmap_data());
   maps_bmp_[map_index].set_modified(true);
   PRINT_IF_ERROR(status_);
 }
@@ -1880,7 +1880,7 @@ void OverworldEditor::LoadAnimatedMaps() {
     }
     map.BuildBitmap(blockset);
 
-    gui::BuildAndRenderBitmapPipeline(0x200, 0x200, 0x200, map.BitmapData(),
+    gui::BuildAndRenderBitmapPipeline(0x200, 0x200, 0x200, map.bitmap_data(),
                                       *rom(), animated_maps_[world_index],
                                       *map.mutable_current_palette());
 
diff --git a/src/app/zelda3/overworld.cc b/src/app/zelda3/overworld.cc
index bd496938..bc74cae6 100644
--- a/src/app/zelda3/overworld.cc
+++ b/src/app/zelda3/overworld.cc
@@ -511,7 +511,7 @@ absl::Status Overworld::LoadSpritesFromMap(int sprite_start, int sprite_count,
       int realX = ((b2 & 0x3F) * 16) + mapX * 512;
       int realY = ((b1 & 0x3F) * 16) + mapY * 512;
       all_sprites_[sprite_index].emplace_back(
-          overworld_maps_[i].AreaGraphics(), (uint8_t)i, b3,
+          overworld_maps_[i].current_graphics(), (uint8_t)i, b3,
           (uint8_t)(b2 & 0x3F), (uint8_t)(b1 & 0x3F), realX, realY);
       // all_sprites_[sprite_index][i].Draw();
 
diff --git a/src/app/zelda3/overworld.h b/src/app/zelda3/overworld.h
index bd05540a..dcf5761a 100644
--- a/src/app/zelda3/overworld.h
+++ b/src/app/zelda3/overworld.h
@@ -517,21 +517,21 @@ class Overworld : public SharedROM, public core::ExperimentFlags {
   auto Sprites(int state) const { return all_sprites_[state]; }
   auto mutable_sprites(int state) { return &all_sprites_[state]; }
   auto AreaGraphics() const {
-    return overworld_maps_[current_map_].AreaGraphics();
+    return overworld_maps_[current_map_].current_graphics();
   }
   auto &Entrances() { return all_entrances_; }
   auto mutable_entrances() { return &all_entrances_; }
   auto &holes() { return all_holes_; }
   auto mutable_holes() { return &all_holes_; }
   auto AreaPalette() const {
-    return overworld_maps_[current_map_].AreaPalette();
+    return overworld_maps_[current_map_].current_palette();
   }
   auto AreaPaletteById(int id) const {
-    return overworld_maps_[id].AreaPalette();
+    return overworld_maps_[id].current_palette();
   }
-  auto BitmapData() const { return overworld_maps_[current_map_].BitmapData(); }
+  auto BitmapData() const { return overworld_maps_[current_map_].bitmap_data(); }
   auto Tile16Blockset() const {
-    return overworld_maps_[current_map_].Tile16Blockset();
+    return overworld_maps_[current_map_].current_tile16_blockset();
   }
   auto is_loaded() const { return is_loaded_; }
   void set_current_map(int i) { current_map_ = i; }
diff --git a/src/app/zelda3/overworld_map.h b/src/app/zelda3/overworld_map.h
index 3d17bd77..1f926965 100644
--- a/src/app/zelda3/overworld_map.h
+++ b/src/app/zelda3/overworld_map.h
@@ -41,13 +41,12 @@ class OverworldMap : public GfxContext {
 
   void DrawAnimatedTiles();
 
-  auto Tile16Blockset() const { return current_blockset_; }
-  auto AreaGraphics() const { return current_gfx_; }
-  auto AreaPalette() const { return current_palette_; }
-  auto BitmapData() const { return bitmap_data_; }
-  auto SetLargeMap(bool is_set) { large_map_ = is_set; }
+  auto current_tile16_blockset() const { return current_blockset_; }
+  auto current_graphics() const { return current_gfx_; }
+  auto current_palette() const { return current_palette_; }
+  auto bitmap_data() const { return bitmap_data_; }
   auto is_large_map() const { return large_map_; }
-  auto IsInitialized() const { return initialized_; }
+  auto is_initialized() const { return initialized_; }
   auto parent() const { return parent_; }
 
   auto mutable_current_palette() { return &current_palette_; }
@@ -59,6 +58,7 @@ class OverworldMap : public GfxContext {
   auto message_id() const { return message_id_; }
   auto area_music(int i) const { return area_music_[i]; }
   auto static_graphics(int i) const { return static_graphics_[i]; }
+  auto large_index() const { return large_index_; }
 
   auto mutable_area_graphics() { return &area_graphics_; }
   auto mutable_area_palette() { return &area_palette_; }
@@ -76,8 +76,6 @@ class OverworldMap : public GfxContext {
   auto set_sprite_palette(int i, uint8_t value) { sprite_palette_[i] = value; }
   auto set_message_id(uint16_t value) { message_id_ = value; }
 
-  auto large_index() const { return large_index_; }
-
   void SetAsLargeMap(int parent_index, int quadrant) {
     parent_ = parent_index;
     large_index_ = quadrant;