diff --git a/tests/netedit/attributesEnum.py b/tests/netedit/attributesEnum.py
index 52425cf14da6..a9656b5ddd02 100644
--- a/tests/netedit/attributesEnum.py
+++ b/tests/netedit/attributesEnum.py
@@ -762,9 +762,9 @@ class inspectSelection:
         chargeInTrainsit = 5
         chargeDelay = 6
         chargeType = 7
-        waitingTime = 9
-        parkingArea = 10
-        parameters = 13
+        waitingTime = 8
+        parkingArea = 9
+        parameters = 12
 
 # access
 
diff --git a/tests/netedit/elements/additionals/chargingstation/inspect_selection/additionals.add.xml b/tests/netedit/elements/additionals/chargingstation/inspect_selection/additionals.add.xml
index 23aed75cfcaa..2f5497df0b3b 100644
--- a/tests/netedit/elements/additionals/chargingstation/inspect_selection/additionals.add.xml
+++ b/tests/netedit/elements/additionals/chargingstation/inspect_selection/additionals.add.xml
@@ -1,6 +1,6 @@
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <!-- chargingStation A -->
-    <chargingStation id="chargingStationA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeInTransit="0" chargeDelay="1.00" name="chargingStationNameA" chargeType="electric" waitingTime="600" friendlyPos="false">
+    <chargingStation id="chargingStationA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeInTransit="0" chargeDelay="1.00" name="chargingStationNameA" chargeType="battery-exchange" waitingTime="600" friendlyPos="false">
         <param key="KeyA1" value="valueA1"/>
         <param key="KeyA3" value="valueA2"/>
         <param key="KeyA2" value="valueA3"/>
diff --git a/tests/netedit/elements/additionals/chargingstation/inspect_selection/chargedelay/additionals.netedit b/tests/netedit/elements/additionals/chargingstation/inspect_selection/chargedelay/additionals.netedit
index 480276fd0968..372234a85fdf 100644
--- a/tests/netedit/elements/additionals/chargingstation/inspect_selection/chargedelay/additionals.netedit
+++ b/tests/netedit/elements/additionals/chargingstation/inspect_selection/chargedelay/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-06-21 15:51:17 by Eclipse SUMO netedit Version v1_20_0+0745-4885fc9a1a0
+<!-- generated on 2025-01-08 15:58:44 by Eclipse SUMO netedit Version v1_21_0+1753-5c4601afe0a
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -15,7 +15,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <!-- StoppingPlaces -->
-    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeDelay="6300" chargeType="electric" waitingTime="600.00">
+    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeDelay="6300" chargeType="battery-exchange" waitingTime="600.00">
         <param key="KeyA1" value="valueA1"/>
         <param key="KeyA2" value="valueA3"/>
         <param key="KeyA3" value="valueA2"/>
diff --git a/tests/netedit/elements/additionals/chargingstation/inspect_selection/chargeintransit/additionals.netedit b/tests/netedit/elements/additionals/chargingstation/inspect_selection/chargeintransit/additionals.netedit
index a2319af0eaa1..1409684d5ad9 100644
--- a/tests/netedit/elements/additionals/chargingstation/inspect_selection/chargeintransit/additionals.netedit
+++ b/tests/netedit/elements/additionals/chargingstation/inspect_selection/chargeintransit/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-06-21 15:51:02 by Eclipse SUMO netedit Version v1_20_0+0745-4885fc9a1a0
+<!-- generated on 2025-01-08 15:57:01 by Eclipse SUMO netedit Version v1_21_0+1753-5c4601afe0a
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -15,7 +15,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <!-- StoppingPlaces -->
-    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeInTransit="1" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
+    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeInTransit="1" chargeDelay="1000" chargeType="battery-exchange" waitingTime="600.00">
         <param key="KeyA1" value="valueA1"/>
         <param key="KeyA2" value="valueA3"/>
         <param key="KeyA3" value="valueA2"/>
diff --git a/tests/netedit/elements/additionals/chargingstation/inspect_selection/efficiency/additionals.netedit b/tests/netedit/elements/additionals/chargingstation/inspect_selection/efficiency/additionals.netedit
index 0210ae6c5834..d068fabcfa6a 100644
--- a/tests/netedit/elements/additionals/chargingstation/inspect_selection/efficiency/additionals.netedit
+++ b/tests/netedit/elements/additionals/chargingstation/inspect_selection/efficiency/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-06-21 15:51:04 by Eclipse SUMO netedit Version v1_20_0+0745-4885fc9a1a0
+<!-- generated on 2025-01-08 15:55:32 by Eclipse SUMO netedit Version v1_21_0+1753-5c4601afe0a
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -15,7 +15,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <!-- StoppingPlaces -->
-    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.50" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
+    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.50" chargeDelay="1000" chargeType="battery-exchange" waitingTime="600.00">
         <param key="KeyA1" value="valueA1"/>
         <param key="KeyA2" value="valueA3"/>
         <param key="KeyA3" value="valueA2"/>
diff --git a/tests/netedit/elements/additionals/chargingstation/inspect_selection/friendlypos/additionals.netedit b/tests/netedit/elements/additionals/chargingstation/inspect_selection/friendlypos/additionals.netedit
index 375ee709d2e7..7f0701f054c7 100644
--- a/tests/netedit/elements/additionals/chargingstation/inspect_selection/friendlypos/additionals.netedit
+++ b/tests/netedit/elements/additionals/chargingstation/inspect_selection/friendlypos/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-06-21 15:50:38 by Eclipse SUMO netedit Version v1_20_0+0745-4885fc9a1a0
+<!-- generated on 2025-01-08 15:52:11 by Eclipse SUMO netedit Version v1_21_0+1753-5c4601afe0a
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -15,7 +15,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <!-- StoppingPlaces -->
-    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" friendlyPos="true" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
+    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" friendlyPos="true" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="battery-exchange" waitingTime="600.00">
         <param key="KeyA1" value="valueA1"/>
         <param key="KeyA2" value="valueA3"/>
         <param key="KeyA3" value="valueA2"/>
diff --git a/tests/netedit/elements/additionals/chargingstation/inspect_selection/name/additionals.netedit b/tests/netedit/elements/additionals/chargingstation/inspect_selection/name/additionals.netedit
index 5336e2c8d689..005a28438be7 100644
--- a/tests/netedit/elements/additionals/chargingstation/inspect_selection/name/additionals.netedit
+++ b/tests/netedit/elements/additionals/chargingstation/inspect_selection/name/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-06-21 15:50:33 by Eclipse SUMO netedit Version v1_20_0+0745-4885fc9a1a0
+<!-- generated on 2025-01-08 15:50:43 by Eclipse SUMO netedit Version v1_21_0+1753-5c4601afe0a
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -15,7 +15,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <!-- StoppingPlaces -->
-    <chargingStation id="chargingStationA" name="commonName" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
+    <chargingStation id="chargingStationA" name="commonName" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="battery-exchange" waitingTime="600.00">
         <param key="KeyA1" value="valueA1"/>
         <param key="KeyA2" value="valueA3"/>
         <param key="KeyA3" value="valueA2"/>
diff --git a/tests/netedit/elements/additionals/chargingstation/inspect_selection/parameters/additionals.netedit b/tests/netedit/elements/additionals/chargingstation/inspect_selection/parameters/additionals.netedit
index e72ab3c35e64..33b7ef99a49f 100644
--- a/tests/netedit/elements/additionals/chargingstation/inspect_selection/parameters/additionals.netedit
+++ b/tests/netedit/elements/additionals/chargingstation/inspect_selection/parameters/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-06-21 15:53:25 by Eclipse SUMO netedit Version v1_20_0+0745-4885fc9a1a0
+<!-- generated on 2025-01-08 16:06:48 by Eclipse SUMO netedit Version v1_21_0+1753-5c4601afe0a
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -15,7 +15,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <!-- StoppingPlaces -->
-    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
+    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="battery-exchange" waitingTime="600.00">
         <param key="keyFinal1" value="value1"/>
         <param key="keyFinal2" value="value2"/>
         <param key="keyFinal3" value="value3"/>
diff --git a/tests/netedit/elements/additionals/chargingstation/inspect_selection/power/additionals.netedit b/tests/netedit/elements/additionals/chargingstation/inspect_selection/power/additionals.netedit
index 24acc5053e6d..51fdf08c7acd 100644
--- a/tests/netedit/elements/additionals/chargingstation/inspect_selection/power/additionals.netedit
+++ b/tests/netedit/elements/additionals/chargingstation/inspect_selection/power/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-06-21 15:50:56 by Eclipse SUMO netedit Version v1_20_0+0745-4885fc9a1a0
+<!-- generated on 2025-01-08 15:53:51 by Eclipse SUMO netedit Version v1_21_0+1753-5c4601afe0a
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -15,7 +15,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <!-- StoppingPlaces -->
-    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="11000.00" efficiency="0.65" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
+    <chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="11000.00" efficiency="0.65" chargeDelay="1000" chargeType="battery-exchange" waitingTime="600.00">
         <param key="KeyA1" value="valueA1"/>
         <param key="KeyA2" value="valueA3"/>
         <param key="KeyA3" value="valueA2"/>
diff --git a/tests/netedit/elements/additionals/rerouterelements/destprobreroute/load/probability/errors.netedit b/tests/netedit/elements/additionals/rerouterelements/destprobreroute/load/probability/errors.netedit
index 892792b3b3ca..1fc3f3dfcc82 100644
--- a/tests/netedit/elements/additionals/rerouterelements/destprobreroute/load/probability/errors.netedit
+++ b/tests/netedit/elements/additionals/rerouterelements/destprobreroute/load/probability/errors.netedit
@@ -1,3 +1,4 @@
 Error: Attribute 'probability' in definition of a destProbReroute Invalid Number Format (double) dummyProb.
-Error: Probability of destProbReroute must be equal or greater than 0
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.27Jun141222.28750/netedit.gui/elements/additionals/rerouterelements/destprobreroute/load/probability/additionals.add.xml failed.
+Error: Could not build destProbReroute with ID 'EdgeCenter0' in netedit; Attribute probability cannot be negative (-1.00).
+Error: Could not build destProbReroute with ID 'EdgeCenter0' in netedit; Attribute probability cannot be negative (-30.00).
+Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.08Jan140902.4912\netedit.gui\elements\additionals\rerouterelements\destprobreroute\load\probability\additionals.add.xml failed.
diff --git a/tests/netedit/elements/additionals/rerouterelements/destprobreroute/load/probability/log.netedit b/tests/netedit/elements/additionals/rerouterelements/destprobreroute/load/probability/log.netedit
index 892792b3b3ca..1fc3f3dfcc82 100644
--- a/tests/netedit/elements/additionals/rerouterelements/destprobreroute/load/probability/log.netedit
+++ b/tests/netedit/elements/additionals/rerouterelements/destprobreroute/load/probability/log.netedit
@@ -1,3 +1,4 @@
 Error: Attribute 'probability' in definition of a destProbReroute Invalid Number Format (double) dummyProb.
-Error: Probability of destProbReroute must be equal or greater than 0
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.27Jun141222.28750/netedit.gui/elements/additionals/rerouterelements/destprobreroute/load/probability/additionals.add.xml failed.
+Error: Could not build destProbReroute with ID 'EdgeCenter0' in netedit; Attribute probability cannot be negative (-1.00).
+Error: Could not build destProbReroute with ID 'EdgeCenter0' in netedit; Attribute probability cannot be negative (-30.00).
+Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.08Jan140902.4912\netedit.gui\elements\additionals\rerouterelements\destprobreroute\load\probability\additionals.add.xml failed.
diff --git a/tests/netedit/elements/additionals/rerouterelements/parkingareareroute/load/probability/errors.netedit b/tests/netedit/elements/additionals/rerouterelements/parkingareareroute/load/probability/errors.netedit
index 10bf3a483ed1..f115b941644a 100644
--- a/tests/netedit/elements/additionals/rerouterelements/parkingareareroute/load/probability/errors.netedit
+++ b/tests/netedit/elements/additionals/rerouterelements/parkingareareroute/load/probability/errors.netedit
@@ -1,3 +1,4 @@
 Error: Attribute 'probability' in definition of a parkingAreaReroute Invalid Number Format (double) dummyProb.
-Error: Probability of parkingAreaReroute must be equal or greater than 0
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.27Jun141222.28750/netedit.gui/elements/additionals/rerouterelements/parkingareareroute/load/probability/additionals.add.xml failed.
+Error: Could not build parkingAreaReroute with ID 'parkingArea' in netedit; Attribute probability cannot be negative (-1.00).
+Error: Could not build parkingAreaReroute with ID 'parkingArea' in netedit; Attribute probability cannot be negative (-30.00).
+Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.08Jan140902.4912\netedit.gui\elements\additionals\rerouterelements\parkingareareroute\load\probability\additionals.add.xml failed.
diff --git a/tests/netedit/elements/additionals/rerouterelements/parkingareareroute/load/probability/log.netedit b/tests/netedit/elements/additionals/rerouterelements/parkingareareroute/load/probability/log.netedit
index 10bf3a483ed1..f115b941644a 100644
--- a/tests/netedit/elements/additionals/rerouterelements/parkingareareroute/load/probability/log.netedit
+++ b/tests/netedit/elements/additionals/rerouterelements/parkingareareroute/load/probability/log.netedit
@@ -1,3 +1,4 @@
 Error: Attribute 'probability' in definition of a parkingAreaReroute Invalid Number Format (double) dummyProb.
-Error: Probability of parkingAreaReroute must be equal or greater than 0
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.27Jun141222.28750/netedit.gui/elements/additionals/rerouterelements/parkingareareroute/load/probability/additionals.add.xml failed.
+Error: Could not build parkingAreaReroute with ID 'parkingArea' in netedit; Attribute probability cannot be negative (-1.00).
+Error: Could not build parkingAreaReroute with ID 'parkingArea' in netedit; Attribute probability cannot be negative (-30.00).
+Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.08Jan140902.4912\netedit.gui\elements\additionals\rerouterelements\parkingareareroute\load\probability\additionals.add.xml failed.
diff --git a/tests/netedit/elements/additionals/rerouterelements/routeprobreroute/load/probability/errors.netedit b/tests/netedit/elements/additionals/rerouterelements/routeprobreroute/load/probability/errors.netedit
index 286a3ad8df3e..10e0a2148f7d 100644
--- a/tests/netedit/elements/additionals/rerouterelements/routeprobreroute/load/probability/errors.netedit
+++ b/tests/netedit/elements/additionals/rerouterelements/routeprobreroute/load/probability/errors.netedit
@@ -1,3 +1,4 @@
 Error: Attribute 'probability' in definition of a routeProbReroute Invalid Number Format (double) dummyProbability.
-Error: Probability of routeProbReroute must be equal or greater than 0
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.27Jun141222.28750/netedit.gui/elements/additionals/rerouterelements/routeprobreroute/load/probability/additionals.add.xml failed.
+Error: Could not build routeProbReroute with ID 'route_0' in netedit; Attribute probability cannot be negative (-1.00).
+Error: Could not build routeProbReroute with ID 'route_0' in netedit; Attribute probability cannot be negative (-50.00).
+Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.08Jan140902.4912\netedit.gui\elements\additionals\rerouterelements\routeprobreroute\load\probability\additionals.add.xml failed.
diff --git a/tests/netedit/elements/additionals/rerouterelements/routeprobreroute/load/probability/log.netedit b/tests/netedit/elements/additionals/rerouterelements/routeprobreroute/load/probability/log.netedit
index 286a3ad8df3e..10e0a2148f7d 100644
--- a/tests/netedit/elements/additionals/rerouterelements/routeprobreroute/load/probability/log.netedit
+++ b/tests/netedit/elements/additionals/rerouterelements/routeprobreroute/load/probability/log.netedit
@@ -1,3 +1,4 @@
 Error: Attribute 'probability' in definition of a routeProbReroute Invalid Number Format (double) dummyProbability.
-Error: Probability of routeProbReroute must be equal or greater than 0
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.27Jun141222.28750/netedit.gui/elements/additionals/rerouterelements/routeprobreroute/load/probability/additionals.add.xml failed.
+Error: Could not build routeProbReroute with ID 'route_0' in netedit; Attribute probability cannot be negative (-1.00).
+Error: Could not build routeProbReroute with ID 'route_0' in netedit; Attribute probability cannot be negative (-50.00).
+Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.08Jan140902.4912\netedit.gui\elements\additionals\rerouterelements\routeprobreroute\load\probability\additionals.add.xml failed.