diff --git a/packages/helpermodules/measurement_log.py b/packages/helpermodules/measurement_log.py
index 9c22c61c98..c8346a743c 100644
--- a/packages/helpermodules/measurement_log.py
+++ b/packages/helpermodules/measurement_log.py
@@ -86,7 +86,8 @@ def save_log(folder):
             }
             "sh": {
                 "sh1": {
-                    "counter": Wh,
+                    "exported": Wh,
+                    "imported": Wh,
                     wenn konfiguriert:
                     "temp1": int in °C,
                     "temp2": int in °C,
@@ -108,7 +109,7 @@ def save_log(folder):
         },
         "names": {
             "counter0": "Mein EVU-Zähler",
-            "bat1": "Mein toller Speicher",
+            "bat2": "Mein toller Speicher",
             ...
         }
     }
diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py
index 85ebcb0307..2e757ec4e7 100644
--- a/packages/helpermodules/update_config.py
+++ b/packages/helpermodules/update_config.py
@@ -770,6 +770,7 @@ def upgrade_datastore_15(self) -> None:
                     for e in content["entries"]:
                         e.update({"sh": {}})
                     content["totals"].update({"sh": {}})
+                    content["names"] = measurement_log.get_names(content["totals"], {})
                     jsonFile.seek(0)
                     json.dump(content, jsonFile)
                     jsonFile.truncate()