diff --git a/src/main/java/com/pahimar/ee3/handler/ConfigurationHandler.java b/src/main/java/com/pahimar/ee3/handler/ConfigurationHandler.java
index ea4dd2ee..b8c553de 100644
--- a/src/main/java/com/pahimar/ee3/handler/ConfigurationHandler.java
+++ b/src/main/java/com/pahimar/ee3/handler/ConfigurationHandler.java
@@ -89,9 +89,9 @@ public class ConfigurationHandler {
         private static final int ENERGY_VALUE_SYNC_THRESHOLD_MAX = Short.MAX_VALUE;
 
         public static String regenerateEnergyValuesWhen;
-        private static final String ENERGY_VALUE_REGENERATE_WHEN_NAME = "regenerate_when";
-        private static final String ENERGY_VALUE_REGENERATE_WHEN_LABEL = "energy_value.regenerate_when.label";
-        private static final String ENERGY_VALUE_REGENERATE_WHEN_COMMENT = "energy_value.regenerate_when.comment";
+        private static final String ENERGY_VALUE_REGENERATE_WHEN_NAME = "regenerate_values_when";
+        private static final String ENERGY_VALUE_REGENERATE_WHEN_LABEL = "energy_value.regenerate_values_when.label";
+        private static final String ENERGY_VALUE_REGENERATE_WHEN_COMMENT = "energy_value.regenerate_values_when.comment";
         private static final String ENERGY_VALUE_REGENERATE_WHEN_DEFAULT = "Always"; // TODO This is set for during mod dev, set to As Needed for release
         private static final String[] ENERGY_VALUE_REGENERATE_WHEN_OPTIONS = new String[]{"As Needed", "Always"};
 
diff --git a/src/main/resources/assets/ee3/lang/en_US.lang b/src/main/resources/assets/ee3/lang/en_US.lang
index a826199a..d9741f75 100644
--- a/src/main/resources/assets/ee3/lang/en_US.lang
+++ b/src/main/resources/assets/ee3/lang/en_US.lang
@@ -2,8 +2,8 @@
 energy_value=Energy Value Options
 energy_value.sync_threshold.label=Sync Threshold
 energy_value.sync_threshold.comment=The number of seconds a player must wait before they can sync their energy values for objects with the server again
-energy_value.regenerate_when.label=Regenerate EnergyValues
-energy_value.regenerate_when.comment=When to regenerate energy values for objects. Options are "Always" (every time Minecraft starts) or "As Needed" (whenever the mod cannot the calculated energy values file).
+energy_value.regenerate_values_when.label=Regenerate Energy Values When
+energy_value.regenerate_values_when.comment=When to regenerate energy values for objects. Options are "Always" (every time Minecraft starts) or "As Needed" (whenever the mod cannot the calculated energy values file).
 energy_value.debug_logging_enabled.label=Enable Debug Logging
 energy_value.debug_logging_enabled.comment=Additional debug logging for when energy values are calculated for objects