diff --git a/src/database/items.lua b/src/database/items.lua
index 22b8a4e..be6456b 100644
--- a/src/database/items.lua
+++ b/src/database/items.lua
@@ -36,10 +36,10 @@ local function event(n)
   }
 end
 
-local function gameMode(n, eve)
+local function objective(n, eve)
   return {
-    name = "Game Mode: " .. n,
-    attributes = {"gamemode"},
+    name = n,
+    attributes = {"objective"},
     placed = true,
     script = eve
   }
@@ -359,10 +359,10 @@ local function _itemData()
     ----------------
     -- GAME MODES --
     ----------------
-    gameBadEnd = gameMode("Bad Ending", "<FL+6003<EVE0091"),
-    gameNormalEnd = gameMode("Normal Ending", "<FL+6000<EVE0091"),
-    gameBestEnd = gameMode("Best Ending", "<FL+6001<EVE0091"),
-    gameAllBosses = gameMode("All Bosses", "<FL+6002<IT+0005<EVE0091")
+    objBadEnd = objective("Bad Ending", "<FL+6003<EVE0091"),
+    objNormalEnd = objective("Normal Ending", "<FL+6000<EVE0091"),
+    objBestEnd = objective("Best Ending", "<FL+6001<EVE0091"),
+    objAllBosses = objective("All Bosses", "<FL+6002<IT+0005<EVE0091")
   }
 
   local array = {}
diff --git a/src/database/world_graph.lua b/src/database/world_graph.lua
index b3feb92..0bf2ce3 100644
--- a/src/database/world_graph.lua
+++ b/src/database/world_graph.lua
@@ -16,7 +16,7 @@ function firstCave:new(worldGraph)
     firstCapsule = Location("First Cave Life Capsule", "Cave", "0401", self),
     gunsmithChest = Location("Hermit Gunsmith Chest", "Pole", "0202", self),
     gunsmith = Location("Tetsuzou", "Pole", "0303", self),
-    gameMode = Location("Game Mode Setup Script", "Start", "0201", self)
+    objective = Location("Objective", "Start", "0201", self)
   }
 
   self.locations.gunsmith.requirements = function(self, items)
@@ -442,8 +442,8 @@ function worldGraph:getLocations()
   return locations
 end
 
-function worldGraph:getGameModeSpot()
-  return {self.regions.firstCave.locations.gameMode}
+function worldGraph:getObjectiveSpot()
+  return {self.regions.firstCave.locations.objective}
 end
 
 function worldGraph:getPuppySpots()
diff --git a/src/randomizer.lua b/src/randomizer.lua
index 121cd16..c813fc7 100644
--- a/src/randomizer.lua
+++ b/src/randomizer.lua
@@ -34,7 +34,7 @@ function C:new()
   self.worldGraph = WorldGraph(self.itemDeck)
   self.customseed = nil
   self.puppy = false
-  self.game = ""
+  self.obj = ""
 end
 
 function C:setPath(path)
@@ -129,13 +129,13 @@ function C:_writePlaintext(tscFiles)
   end
 end
 
-function C:getGameMode()
-  return {self.itemDeck:getByKey(self.game)}
+function C:getObjective()
+  return {self.itemDeck:getByKey(self.obj)}
 end
 
 function C:_shuffleItems(tscFiles)
-  -- place the game mode scripts in Start Point
-  self:_fastFillItems(self:getGameMode(), self.worldGraph:getGameModeSpot())
+  -- place the objective scripts in Start Point
+  self:_fastFillItems(self:getObjective(), self.worldGraph:getObjectiveSpot())
 
   local mandatory = _.compact(_.shuffle(self.itemDeck:getMandatoryItems(true)))
   local optional = _.compact(_.shuffle(self.itemDeck:getOptionalItems(true)))
diff --git a/src/ui/draw.lua b/src/ui/draw.lua
index bc03ba0..f5791b9 100644
--- a/src/ui/draw.lua
+++ b/src/ui/draw.lua
@@ -30,13 +30,13 @@ layout.go:onPress(function()
     end
 
     --if settings.bad.value then
-    --  Randomizer.game = "gameBadEnd"
+    --  Randomizer.obj = "objBadEnd"
     if settings.norm.value then
-      Randomizer.game = "gameNormalEnd"
+      Randomizer.obj = "objNormalEnd"
     elseif settings.boss.value then
-      Randomizer.game = "gameAllBosses"
+      Randomizer.obj = "objAllBosses"
     else
-      Randomizer.game = "gameBestEnd"
+      Randomizer.obj = "objBestEnd"
     end
 
     Randomizer.puppy = settings.puppy.value