Remove End Year from variable names

definitions/variable/energy/energy-services.yaml

@@ -42,6 +42,6 @@
 - Energy Service|Transportation|Passenger|{Transport}:
     description: Provision of energy services related to passenger {Transport}
     unit: Gpkm/yr
-- Energy Service|Residential|End Year|Average:
+- Energy Service|Residential|Average:
     description:  Annual electricity consumption per household that is expected to be achieved at the end pf the study.
-    unit: kWh
+    unit: kWh

definitions/variable/technology/electricity-expansion.yaml

@@ -25,27 +25,27 @@
     description: Removed capacity for the electricity network,
       this capacity is substracted from the existing capacity
     unit: MW
-- Network|Electricity|Capacity|Expansion|End Year:
+- Network|Electricity|Capacity|Expansion:
     description: The additional Capacity required by the expansion of the existing grid
         to fully cover the demand at the end of the study.
     unit: kW
-- Solar PV|Standalone|Capacity|Expansion|End Year:
+- Solar PV|Standalone|Capacity|Expansion:
     description: The additional Capacity required by the expansion of the standalone Solar PV
         to fully cover the demand at the end of the study.
     unit: kW
-- Solar PV|Mini Grid|Capacity|Expansion|End Year:
+- Solar PV|Mini Grid|Capacity|Expansion:
     description: The additional Capacity required by the expansion of the PV minigrid
         to fully cover the demand at the end of the study.
     unit: kW
-- Hydro|Mini Grid|Capacity|Expansion|End Year:
+- Hydro|Mini Grid|Capacity|Expansion:
     description: The additional Capacity required by the expansion of the hydropower mini grid
         to fully cover the demand at the end of the study.
     unit: kW
-- Wind|Mini Grid|Capacity|Expansion|End Year:
+- Wind|Mini Grid|Capacity|Expansion:
     description: The additional Capacity required by the expansion of the existing wind power mini
         to fully cover the demand at the end of the study.
     unit: kW
-- Network|Electricity|Expansion Cost:
+- Network|Electricity|Total Expansion Cost:
     description: The investment required by expanding the electric grid to reach the electrification target
       at the end of the study.
     unit: US$2020