diff --git a/data/config/mosquitto/public/default-dynamic-security.json b/data/config/mosquitto/public/default-dynamic-security.json
index 30b6b9a5d5..83a3ef1fc5 100644
--- a/data/config/mosquitto/public/default-dynamic-security.json
+++ b/data/config/mosquitto/public/default-dynamic-security.json
@@ -1099,19 +1099,19 @@
 				},
 				{
 					"acltype": "publishClientSend",
-					"topic": "openWB/set/general/consumer/config/switch_on_delay",
+					"topic": "openWB/set/general/chargemode_config/surplus/consumer/switch_on_delay",
 					"priority": 0,
 					"allow": true
 				},
 				{
 					"acltype": "publishClientSend",
-					"topic": "openWB/set/general/consumer/config/switch_off_delay",
+					"topic": "openWB/set/general/chargemode_config/surplus/consumer/switch_off_delay",
 					"priority": 0,
 					"allow": true
 				},
 				{
 					"acltype": "publishClientSend",
-					"topic": "openWB/set/general/consumer/config/switch_off_threshold",
+					"topic": "openWB/set/general/chargemode_config/surplus/consumer/switch_off_threshold",
 					"priority": 0,
 					"allow": true
 				},
@@ -1177,19 +1177,19 @@
 				},
 				{
 					"acltype": "publishClientReceive",
-					"topic": "openWB/general/consumer/config/switch_on_delay",
+					"topic": "openWB/general/chargemode_config/surplus/consumer/switch_on_delay",
 					"priority": 0,
 					"allow": true
 				},
 				{
 					"acltype": "publishClientReceive",
-					"topic": "openWB/general/consumer/config/switch_off_delay",
+					"topic": "openWB/general/chargemode_config/surplus/consumer/switch_off_delay",
 					"priority": 0,
 					"allow": true
 				},
 				{
 					"acltype": "publishClientReceive",
-					"topic": "openWB/general/consumer/config/switch_off_threshold",
+					"topic": "openWB/general/chargemode_config/surplus/consumer/switch_off_threshold",
 					"priority": 0,
 					"allow": true
 				}
diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py
index 264739c42c..f61ebee2ed 100644
--- a/packages/helpermodules/update_config.py
+++ b/packages/helpermodules/update_config.py
@@ -274,9 +274,9 @@ class UpdateConfig:
         "^openWB/general/chargemode_config/bat/power_reserve$",
         "^openWB/general/chargemode_config/bat/power_reserve_active$",
         "^openWB/general/chargemode_config/surplus/vehicle/retry_failed_phase_switches$",
-        "^openWB/general/consumer/config/switch_on_delay$",
-        "^openWB/general/consumer/config/switch_off_delay$",
-        "^openWB/general/consumer/config/switch_off_threshold$",
+        "^openWB/general/chargemode_config/surplus/consumer/switch_on_delay$",
+        "^openWB/general/chargemode_config/surplus/consumer/switch_off_delay$",
+        "^openWB/general/chargemode_config/surplus/consumer/switch_off_threshold$",
         # obsolet, Daten hieraus müssen nach prices/ überführt werden
         "^openWB/general/price_kwh$",
         "^openWB/general/prices/bat$",
@@ -663,11 +663,11 @@ class UpdateConfig:
         ("openWB/general/chargemode_config/surplus/vehicle/phase_switch_delay", 7),
         ("openWB/general/chargemode_config/surplus/vehicle/retry_failed_phase_switches",
          ChargemodeConfigSurplusVehicle().retry_failed_phase_switches),
+        ("openWB/general/chargemode_config/surplus/consumer/switch_on_delay", 60),
+        ("openWB/general/chargemode_config/surplus/consumer/switch_off_delay", 60),
+        ("openWB/general/chargemode_config/surplus/consumer/switch_off_threshold", 0),
         ("openWB/general/chargemode_config/unbalanced_load", False),
         ("openWB/general/chargemode_config/unbalanced_load_limit", 18),
-        ("openWB/general/consumer/config/switch_on_delay", 60),
-        ("openWB/general/consumer/config/switch_off_delay", 60),
-        ("openWB/general/consumer/config/switch_off_threshold", 0),
         ("openWB/general/control_interval", 10),
         ("openWB/general/extern", False),
         ("openWB/general/extern_display_mode", "primary"),
diff --git a/packages/modules/consumers/askoma/askoheat/config.py b/packages/modules/consumers/askoma/askoheat/config.py
index 1c52a288e8..2559a81dc8 100644
--- a/packages/modules/consumers/askoma/askoheat/config.py
+++ b/packages/modules/consumers/askoma/askoheat/config.py
@@ -20,7 +20,7 @@ def __init__(self,
 @auto_str
 class Askoheat(ConsumerSetup[AskoheatConfiguration]):
     def __init__(self,
-                 name: str = "Askoheat",
+                 name: str = "Askoheat+",
                  type: str = "askoheat",
                  id: int = 0,
                  configuration: AskoheatConfiguration = None,
diff --git a/packages/modules/consumers/lambda_/lambda_/config.py b/packages/modules/consumers/lambda_/lambda_/config.py
index f72ec12455..01b02a5970 100644
--- a/packages/modules/consumers/lambda_/lambda_/config.py
+++ b/packages/modules/consumers/lambda_/lambda_/config.py
@@ -23,7 +23,7 @@ def __init__(self,
 class Lambda(ConsumerSetup[LambdaConfiguration]):
     def __init__(self,
                  name: str = "Lambda Wärmepumpe",
-                 type: str = "lambda",
+                 type: str = "lambda_",
                  id: int = 0,
                  configuration: LambdaConfiguration = None,
                  usage: Tuple[ConsumerUsage, ...] = (ConsumerUsage.SUSPENDABLE_TUNABLE,