diff --git a/core/src/com/unciv/logic/city/City.kt b/core/src/com/unciv/logic/city/City.kt
index ec924d9619..5b2d6c8c92 100644
--- a/core/src/com/unciv/logic/city/City.kt
+++ b/core/src/com/unciv/logic/city/City.kt
@@ -82,7 +82,7 @@ class City : IsPartOfGameInfoSerialization, INamed {
     var attackedThisTurn = false
     var hasSoldBuildingThisTurn = false
     var isPuppet = false
-    var reassignPopulation = false  // flag so that on startTurn() we reassign population
+    var shouldReassignPopulation = false  // flag so that on startTurn() we reassign population
 
     @delegate:Transient
     val neighboringCities: List<City> by lazy { 
@@ -139,7 +139,7 @@ class City : IsPartOfGameInfoSerialization, INamed {
         toReturn.isOriginalCapital = isOriginalCapital
         toReturn.flagsCountdown.putAll(flagsCountdown)
         toReturn.demandedResource = demandedResource
-        toReturn.reassignPopulation = reassignPopulation
+        toReturn.shouldReassignPopulation = shouldReassignPopulation
         toReturn.cityAIFocus = cityAIFocus
         toReturn.avoidGrowth = avoidGrowth
         toReturn.manualSpecialists = manualSpecialists
@@ -315,19 +315,19 @@ class City : IsPartOfGameInfoSerialization, INamed {
         }
         if (!manualSpecialists)
             population.specialistAllocations.clear()
-        reassignPopulation = false
+        shouldReassignPopulation = false
         population.autoAssignPopulation()
     }
 
     /** Apply worked tiles optimization (aka CityFocus) -
      *  immediately for a human player whoes turn it is (interactive),
      *  or deferred to the next startTurn while nextTurn is running (for AI)
-     *  @see reassignPopulation
+     *  @see shouldReassignPopulation
      */
     fun reassignPopulationDeferred() {
         // TODO - is this the best (or even correct) way to detect "interactive" UI calls?
         if (GUI.isMyTurn() && GUI.getViewingPlayer() == civ) reassignPopulation()
-        else reassignPopulation = true
+        else shouldReassignPopulation = true
     }
 
     fun destroyCity(overrideSafeties: Boolean = false) {
diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt
index 4c5dc9c183..f4b12668bd 100644
--- a/core/src/com/unciv/logic/city/CityStats.kt
+++ b/core/src/com/unciv/logic/city/CityStats.kt
@@ -358,7 +358,7 @@ class CityStats(val city: City) {
             if (tile.isBlockaded() && city.isWorked(tile)) {
                 city.workedTiles.remove(tile.position)
                 city.lockedTiles.remove(tile.position)
-                city.reassignPopulation = true
+                city.shouldReassignPopulation = true
                 continue
             }
             val tileStats = tile.stats.getTileStats(city, city.civ, localUniqueCache)
@@ -468,7 +468,7 @@ class CityStats(val city: City) {
 
         if (DebugUtils.SUPERCHARGED) {
             val stats = Stats()
-            for (stat in Stat.values()) stats[stat] = 10000f
+            for (stat in Stat.entries) stats[stat] = 10000f
             newStatsBonusTree.addStats(stats, "Supercharged")
         }
 
diff --git a/core/src/com/unciv/logic/city/managers/CityConquestFunctions.kt b/core/src/com/unciv/logic/city/managers/CityConquestFunctions.kt
index 9d5708e761..547f1338de 100644
--- a/core/src/com/unciv/logic/city/managers/CityConquestFunctions.kt
+++ b/core/src/com/unciv/logic/city/managers/CityConquestFunctions.kt
@@ -134,7 +134,7 @@ class CityConquestFunctions(val city: City) {
     fun annexCity() {
         city.isPuppet = false
         city.cityConstructions.inProgressConstructions.clear() // undo all progress of the previous civ on units etc.
-        if (!city.isInResistance()) city.reassignPopulation = true
+        if (!city.isInResistance()) city.shouldReassignPopulation = true
         city.setCityFocus(CityFocus.NoFocus)
         city.cityStats.update()
         GUI.setUpdateWorldOnNextRender()
diff --git a/core/src/com/unciv/logic/city/managers/CityPopulationManager.kt b/core/src/com/unciv/logic/city/managers/CityPopulationManager.kt
index f90f2d925a..ab3f5d90f3 100644
--- a/core/src/com/unciv/logic/city/managers/CityPopulationManager.kt
+++ b/core/src/com/unciv/logic/city/managers/CityPopulationManager.kt
@@ -118,7 +118,7 @@ class CityPopulationManager : IsPartOfGameInfoSerialization {
                 .coerceAtMost(95)  // Try to avoid runaway food gain in mods, just in case
         foodStored += (foodNeededToGrow * percentOfFoodCarriedOver / 100f).toInt()
         addPopulation(1)
-        city.reassignPopulation = true
+        city.shouldReassignPopulation = true
         city.civ.addNotification("[${city.name}] has grown!", city.location,
             NotificationCategory.Cities, NotificationIcon.Growth)
     }
diff --git a/core/src/com/unciv/logic/city/managers/CityTurnManager.kt b/core/src/com/unciv/logic/city/managers/CityTurnManager.kt
index e7c080f5f3..a2b9f27399 100644
--- a/core/src/com/unciv/logic/city/managers/CityTurnManager.kt
+++ b/core/src/com/unciv/logic/city/managers/CityTurnManager.kt
@@ -34,7 +34,7 @@ class CityTurnManager(val city: City) {
         if (city.isPuppet) {
             city.setCityFocus(CityFocus.GoldFocus)
             city.reassignAllPopulation()
-        } else if (city.reassignPopulation) {
+        } else if (city.shouldReassignPopulation) {
             city.reassignPopulation()  // includes cityStats.update
         } else
             city.cityStats.update()
@@ -77,7 +77,7 @@ class CityTurnManager(val city: City) {
                         demandNewResource()
                     }
                     CityFlags.Resistance.name -> {
-                        city.reassignPopulation = true
+                        city.shouldReassignPopulation = true
                         city.civ.addNotification(
                             "The resistance in [${city.name}] has ended!",
                             CityAction.withLocation(city), NotificationCategory.General, "StatIcons/Resistance")
diff --git a/core/src/com/unciv/logic/map/mapunit/UnitTurnManager.kt b/core/src/com/unciv/logic/map/mapunit/UnitTurnManager.kt
index 7348647398..5ee79aef79 100644
--- a/core/src/com/unciv/logic/map/mapunit/UnitTurnManager.kt
+++ b/core/src/com/unciv/logic/map/mapunit/UnitTurnManager.kt
@@ -21,7 +21,7 @@ class UnitTurnManager(val unit: MapUnit) {
         ) {
             val tile = unit.getTile()
             if (tile.doWorkerTurn(unit))
-                tile.getCity()?.reassignPopulation = true
+                tile.getCity()?.shouldReassignPopulation = true
         }
 
         if (!unit.hasUnitMovedThisTurn() && unit.isFortified() && unit.turnsFortified < 2) {