diff --git a/src/app/core/constants.h b/src/app/core/constants.h
index 4986be5a..a736d560 100644
--- a/src/app/core/constants.h
+++ b/src/app/core/constants.h
@@ -84,10 +84,10 @@ constexpr int NumberOfSheets = 223;
 constexpr int LimitOfMap32 = 8864;
 constexpr int NumberOfRooms = 296;
 
-constexpr int NumberOfOWMaps = 160;
+constexpr int kNumOverworldMaps = 160;
 constexpr int Map32PerScreen = 256;
 constexpr int NumberOfMap16 = 3752;  // 4096
-constexpr int NumberOfMap32 = Map32PerScreen * NumberOfOWMaps;
+constexpr int NumberOfMap32 = Map32PerScreen * kNumOverworldMaps;
 constexpr int NumberOfOWSprites = 352;
 constexpr int NumberOfColors = 3143;
 
diff --git a/src/app/zelda3/overworld.cc b/src/app/zelda3/overworld.cc
index ac323edd..6cad4655 100644
--- a/src/app/zelda3/overworld.cc
+++ b/src/app/zelda3/overworld.cc
@@ -18,13 +18,13 @@ absl::Status Overworld::Load(ROM &rom, uchar *ow_blockset) {
     return decompression_status;
   }
 
-  for (int map_index = 0; map_index < core::NumberOfOWMaps; ++map_index)
+  for (int map_index = 0; map_index < core::kNumOverworldMaps; ++map_index)
     overworld_maps_.emplace_back(map_index, rom_, tiles16);
 
   FetchLargeMaps();
 
   auto size = tiles16.size();
-  for (int i = 0; i < core::NumberOfOWMaps; ++i) {
+  for (int i = 0; i < core::kNumOverworldMaps; ++i) {
     auto map_status =
         overworld_maps_[i].BuildMapV2(size, game_state_, map_parent_);
     if (!map_status.ok()) {