diff --git a/Model_Library b/Model_Library
index 0bf4252b3f666e1ada519a9f63f213eb604ac4e0..5b5a3a82481cacaaba6df26ad95879e106ec3a1c 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit 0bf4252b3f666e1ada519a9f63f213eb604ac4e0
+Subproject commit 5b5a3a82481cacaaba6df26ad95879e106ec3a1c
diff --git a/examples/BusChargingDepot/depot.json b/examples/BusChargingDepot/depot.json
index 7f76e743aa15189112c9d6af232caa95de71fe62..8a4d5012fd0de4ac724985ace5f7ceaaeaff989c 100644
--- a/examples/BusChargingDepot/depot.json
+++ b/examples/BusChargingDepot/depot.json
@@ -38,7 +38,7 @@
             }
         },
         "bus_1_battery": {
-            "type": "LiionBattery",
+            "type": "Battery",
             "model": "bus_battery.json",
             "min_capacity": 0,
             "max_capacity": 5000,
@@ -60,7 +60,7 @@
             "type": "ElectricalGeneration"
         },
         "bus_2_battery": {
-            "type": "LiionBattery",
+            "type": "Battery",
             "model": "bus_battery.json",
             "min_capacity": 0,
             "max_capacity": 5000,
diff --git a/examples/BusChargingHPC/HPC.json b/examples/BusChargingHPC/HPC.json
index 6deccd23d2c5ac1add244152d7e7927085621501..fc21ac578d7c9fb1fdff1a2e8cbfca9500db1605 100644
--- a/examples/BusChargingHPC/HPC.json
+++ b/examples/BusChargingHPC/HPC.json
@@ -80,7 +80,7 @@
             }
         },
         "bus_1_battery": {
-            "type": "LiionBattery",
+            "type": "Battery",
             "model": "bus_battery.json",
             "min_capacity": 0,
             "max_capacity": 3000,
@@ -102,7 +102,7 @@
             "type": "ElectricalGeneration"
         },
         "bus_2_battery": {
-            "type": "LiionBattery",
+            "type": "Battery",
             "model": "bus_battery.json",
             "min_capacity": 0,
             "max_capacity": 3000,
diff --git a/examples/BusChargingIMC/IMC.json b/examples/BusChargingIMC/IMC.json
index 648ac9e4d2d7f70c9c663f8381538ca320ebe71e..3cd511cbd57a60205f5633f4b5a4484d59fc6ade 100644
--- a/examples/BusChargingIMC/IMC.json
+++ b/examples/BusChargingIMC/IMC.json
@@ -16,7 +16,7 @@
             "max_capacity": 10000
         },
         "wayside_battery": {
-            "type": "LiionBattery",
+            "type": "Battery",
             "model": "wayside_battery.json",
             "min_capacity": 0,
             "max_capacity": 1000
@@ -31,7 +31,7 @@
             "max_capacity": 500
         },
         "bus_1_battery": {
-            "type": "LiionBattery",
+            "type": "Battery",
             "model": "bus_battery.json",
             "min_capacity": 0,
             "max_capacity": 5000,
@@ -76,7 +76,7 @@
             "max_capacity": 500
         },
         "bus_2_battery": {
-            "type": "LiionBattery",
+            "type": "Battery",
             "model": "bus_battery.json",
             "min_capacity": 0,
             "max_capacity": 5000,
diff --git a/examples/complex_prosumer/prosumer.json b/examples/complex_prosumer/prosumer.json
index 0cd6801adb9b0baf31b43b89f858237fe5357ca8..5866cd47eb076bc3deafa0e8abafd50a24411080 100644
--- a/examples/complex_prosumer/prosumer.json
+++ b/examples/complex_prosumer/prosumer.json
@@ -13,7 +13,7 @@
             "max_capacity": 10.0
         },
         "battery": {
-            "type": "LiionBattery",
+            "type": "Battery",
             "model": "battery.json",
             "min_capacity": 10.0,
             "max_capacity": 10.0
diff --git a/examples/district/asset.json b/examples/district/asset.json
index ed79b4a7f8ab6c7d0ab22f24757c865e0c75d668..c5fe052430df542d6fe9e0ec64dd6128dc78ca49 100644
--- a/examples/district/asset.json
+++ b/examples/district/asset.json
@@ -1,7 +1,7 @@
 {
     "components": {
         "battery": {
-            "type": "LiionBattery",
+            "type": "Battery",
             "model": "battery.json",
             "min_capacity": 0,
             "max_capacity": 6
diff --git a/examples/district/prosumer_2.json b/examples/district/prosumer_2.json
index 4defdac6bf16e2759e9f96b8cdd87e1bdbe3edf6..952df496a180a031acb5833e68c2c2ed4744ba0d 100644
--- a/examples/district/prosumer_2.json
+++ b/examples/district/prosumer_2.json
@@ -13,7 +13,7 @@
             "max_capacity": 10
         },
         "battery": {
-            "type": "LiionBattery",
+            "type": "Battery",
             "model": "battery.json",
             "min_capacity": 10,
             "max_capacity": 10