diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml
new file mode 100644
index 0000000..dea1442
--- /dev/null
+++ b/.github/workflows/dev-ci.yml
@@ -0,0 +1,57 @@
+name: Dev CI
+
+on:
+  pull_request:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.9", "3.10"]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip build setuptools wheel
+          python -m pip install --upgrade flake8 pytest pytest-cov
+
+      - name: Build package
+        run: python -m build --wheel
+
+      - name: Install wheel
+        run: pip install dist/*.whl
+
+      # Pending to be added in the near future:
+      #   * flake8 src --count --exit-zero --max-complexity=10 
+      - name: Linting with flake8
+        run: |
+          # stop the build if there are Python syntax errors or undefined names
+          flake8 src --count --show-source --statistics
+          # exit-zero treats all errors as warnings. The GitHub editor is 99 chars wide
+          flake8 src --count --exit-zero --statistics 
+          
+      # - name: Run tests
+      #   run: pytest
+
+      - name: Generate coverage
+        run: pytest --cov=. --cov-report=xml 
+
+      #- name: Sonar analysis
+      #  uses: sonarsource/sonarcloud-github-action@v2.0.2
+      #  env:
+      #    GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+      #    SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      #  with:
+      #    args: |
+      #      -Dsonar.python.coverage.reportPaths=coverage.xml
+
diff --git a/attic/curves_creation.py b/attic/curves_creation.py
index 6b46362..7e74ee6 100644
--- a/attic/curves_creation.py
+++ b/attic/curves_creation.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
-# (c) 2023/24 RTE  
+# (c) 2023/24 RTE
 # Developed by Grupo AIA
 #     marinjl@aia.es
 #     omsg@aia.es
diff --git a/attic/steady_state.py b/attic/steady_state.py
index e4bdabe..16fb5f4 100644
--- a/attic/steady_state.py
+++ b/attic/steady_state.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
-# (c) 2023/24 RTE  
+# (c) 2023/24 RTE
 # Developed by Grupo AIA
 #     marinjl@aia.es
 #     omsg@aia.es
diff --git a/docs/manual/helps.py b/docs/manual/helps.py
index ada713a..7cdef18 100644
--- a/docs/manual/helps.py
+++ b/docs/manual/helps.py
@@ -6,7 +6,7 @@
 def write_output(file, text):
     for line in text.splitlines():
         file.write(f"\t{line}\n")
-    file.write(f"\n")
+    file.write("\n")
 
 
 def generate_help_files():
diff --git a/examples/Model/BESS/WECC/Dynawo/Zone1/Producer.dyd b/examples/Model/BESS/WECC/Dynawo/Zone1/Producer.dyd
index ad166f7..55a6eeb 100644
--- a/examples/Model/BESS/WECC/Dynawo/Zone1/Producer.dyd
+++ b/examples/Model/BESS/WECC/Dynawo/Zone1/Producer.dyd
@@ -2,7 +2,7 @@
 <dyn:dynamicModelsArchitecture xmlns:dyn="http://www.rte-france.com/dynawo">
   <!-- Producer -->
   <dyn:blackBoxModel id="StepUp_Xfmr" lib="TransformerTapChanger" parFile="Producer.par" parId="StepUp_Xfmr"/>
-  <dyn:blackBoxModel id="Wind_Turbine" lib="BESScbWeccCurrentSourceNoPlantControl" parFile="Producer.par" parId="Wind_Turbine"/>
+  <dyn:blackBoxModel id="Bess" lib="BESScbWeccCurrentSourceNoPlantControl" parFile="Producer.par" parId="Bess"/>
   <dyn:connect id1="StepUp_Xfmr" var1="transformer_terminal2" id2="BusPDR" var2="bus_terminal"/>
-  <dyn:connect id1="Wind_Turbine" var1="BESScb_terminal" id2="StepUp_Xfmr" var2="transformer_terminal1"/>
+  <dyn:connect id1="Bess" var1="BESScb_terminal" id2="StepUp_Xfmr" var2="transformer_terminal1"/>
 </dyn:dynamicModelsArchitecture>
diff --git a/examples/Model/BESS/WECC/Dynawo/Zone1/Producer.par b/examples/Model/BESS/WECC/Dynawo/Zone1/Producer.par
index a3926dc..e602352 100644
--- a/examples/Model/BESS/WECC/Dynawo/Zone1/Producer.par
+++ b/examples/Model/BESS/WECC/Dynawo/Zone1/Producer.par
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <parametersSet xmlns="http://www.rte-france.com/dynawo">
   <!-- Synchronous machine external parameters -->
-  <set id="Wind_Turbine">
+  <set id="Bess">
     <par type="DOUBLE" name="BESScb_P0Pu" value="-0.7"/>
     <par type="DOUBLE" name="BESScb_Q0Pu" value="-0.2"/>
     <par type="DOUBLE" name="BESScb_U0Pu" value="1.0"/>
diff --git a/examples/Model/BESS/WECC/Dynawo/Zone3/Producer.dyd b/examples/Model/BESS/WECC/Dynawo/Zone3/Producer.dyd
index 2283d94..591c0c5 100644
--- a/examples/Model/BESS/WECC/Dynawo/Zone3/Producer.dyd
+++ b/examples/Model/BESS/WECC/Dynawo/Zone3/Producer.dyd
@@ -4,9 +4,9 @@
   <dyn:blackBoxModel id="AuxLoad_Xfmr" lib="TransformerFixedRatio" parFile="Producer.par" parId="AuxLoad_Xfmr"/>
   <dyn:blackBoxModel id="Aux_Load" lib="LoadPQ" parFile="Producer.par" parId="Aux_Load"/>
   <dyn:blackBoxModel id="StepUp_Xfmr" lib="TransformerTapChanger" parFile="Producer.par" parId="StepUp_Xfmr"/>
-  <dyn:blackBoxModel id="Wind_Turbine" lib="BESScbWeccCurrentSource" parFile="Producer.par" parId="Wind_Turbine"/>
+  <dyn:blackBoxModel id="Bess" lib="BESScbWeccCurrentSource" parFile="Producer.par" parId="Bess"/>
   <dyn:connect id1="AuxLoad_Xfmr" var1="transformer_terminal1" id2="BusPDR" var2="bus_terminal"/>
   <dyn:connect id1="StepUp_Xfmr" var1="transformer_terminal1" id2="BusPDR" var2="bus_terminal"/>
   <dyn:connect id1="Aux_Load" var1="load_terminal" id2="AuxLoad_Xfmr" var2="transformer_terminal2"/>
-  <dyn:connect id1="Wind_Turbine" var1="BESScb_terminal" id2="StepUp_Xfmr" var2="transformer_terminal2"/>
+  <dyn:connect id1="Bess" var1="BESScb_terminal" id2="StepUp_Xfmr" var2="transformer_terminal2"/>
 </dyn:dynamicModelsArchitecture>
diff --git a/examples/Model/BESS/WECC/Dynawo/Zone3/Producer.par b/examples/Model/BESS/WECC/Dynawo/Zone3/Producer.par
index 88398fa..880e7a7 100644
--- a/examples/Model/BESS/WECC/Dynawo/Zone3/Producer.par
+++ b/examples/Model/BESS/WECC/Dynawo/Zone3/Producer.par
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <parametersSet xmlns="http://www.rte-france.com/dynawo">
   <!-- Synchronous machine external parameters -->
-  <set id="Wind_Turbine">
+  <set id="Bess">
     <par type="DOUBLE" name="BESScb_P0Pu" value="-0.7"/>
     <par type="DOUBLE" name="BESScb_Q0Pu" value="-0.2"/>
     <par type="DOUBLE" name="BESScb_U0Pu" value="1.0"/>
diff --git a/examples/Model/BESS/WECC/ProducerCurves/CurvesFiles.ini b/examples/Model/BESS/WECC/ProducerCurves/CurvesFiles.ini
index 31e4f58..0928232 100755
--- a/examples/Model/BESS/WECC/ProducerCurves/CurvesFiles.ini
+++ b/examples/Model/BESS/WECC/ProducerCurves/CurvesFiles.ini
@@ -45,17 +45,17 @@ StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
 # Wind Turbines or PV Arrays in Zone1
 [Curves-Dictionary-Zone1]
 NetworkFrequencyPu = NetworkFrequencyPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
 
 
 # Wind Turbines or PV Arrays in Zone3
 [Curves-Dictionary-Zone3]
 NetworkFrequencyPu = NetworkFrequencyPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridFreqRamp.W500mHz250ms.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridFreqRamp.W500mHz250ms.csv
index 49edab8..7183f20 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridFreqRamp.W500mHz250ms.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridFreqRamp.W500mHz250ms.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;InfiniteBus_BUS_NetworkFrequencyPu;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActivePower;Wind_Turbine_GEN_InjectedReactivePower;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_ActivePowerPu;Wind_Turbine_GEN_ReactivePowerPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;InfiniteBus_BUS_NetworkFrequencyPu;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActivePower;Bess_GEN_InjectedReactivePower;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_ActivePowerPu;Bess_GEN_ReactivePowerPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;1.0;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904;1.0
 0.0;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;1.0;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904;1.0
 0.00711;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;1.0;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904;1.0
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridFreqRamp.W500mHz250ms.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridFreqRamp.W500mHz250ms.dict
index 7ca8a8d..bfaae11 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridFreqRamp.W500mHz250ms.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridFreqRamp.W500mHz250ms.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridVoltageStep.Drop.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridVoltageStep.Drop.csv
index ea6e6d7..65a5cf3 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridVoltageStep.Drop.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridVoltageStep.Drop.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;InfiniteBus_BUS_NetworkFrequencyPu;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActivePower;Wind_Turbine_GEN_InjectedReactivePower;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_ActivePowerPu;Wind_Turbine_GEN_ReactivePowerPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;InfiniteBus_BUS_NetworkFrequencyPu;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActivePower;Bess_GEN_InjectedReactivePower;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_ActivePowerPu;Bess_GEN_ReactivePowerPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0966663296016708;-0.3749994061789999;-0.3419448523738361;-0.400000336623;-0.3647420603934174;1.0;10.0;-0.374932;-0.393889;-0.393889;-0.374932;-0.393889;-0.344705;0.362134;-0.374932;-0.393889;1.087688;0.4999625695799636;1.0
 0.0;1.0966663296016708;-0.3749983102;-0.3419438530005806;-0.400000375444;-0.3647420957925164;1.0;10.0;-0.374932;-0.393889;-0.393889;-0.37493;-0.393889;-0.344703;0.362134;-0.37493;-0.39389;1.087688;0.499961190658835;1.0
 1e-06;1.096666294203027;-0.374992414867;-0.341938488352572;-0.399999802383;-0.3647415850176094;1.0;10.0;-0.374932;-0.393889;-0.393889;-0.374924;-0.39389;-0.344699;0.362134;-0.374924;-0.39389;1.087688;0.4999584328291703;1.0
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridVoltageStep.Drop.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridVoltageStep.Drop.dict
index bf55570..fd7349c 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridVoltageStep.Drop.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridVoltageStep.Drop.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridVoltageStep.Rise.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridVoltageStep.Rise.csv
index 9f57679..99ca8a0 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridVoltageStep.Rise.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridVoltageStep.Rise.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;InfiniteBus_BUS_NetworkFrequencyPu;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActivePower;Wind_Turbine_GEN_InjectedReactivePower;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_ActivePowerPu;Wind_Turbine_GEN_ReactivePowerPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;InfiniteBus_BUS_NetworkFrequencyPu;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActivePower;Bess_GEN_InjectedReactivePower;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_ActivePowerPu;Bess_GEN_ReactivePowerPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;0.9922218996318314;0.374999374186;0.3779390218308478;0.40000033958;0.4031359716293523;1.0;10.0;0.375083;0.407465;0.407465;0.375083;0.407465;0.374252;-0.406561;0.375083;0.407465;1.002222;0.5525906316840704;1.0
 0.0;0.9922218996318314;0.374999374186;0.3779390218308478;0.40000033958;0.4031359716293523;1.0;10.0;0.375083;0.407465;0.407465;0.375083;0.407465;0.374252;-0.406561;0.375083;0.407465;1.002222;0.5525906316840704;1.0
 2e-05;0.9922209007927618;0.374999359642;0.3779393876327177;0.399992026566;0.4031279992655018;1.0;10.0;0.375083;0.407465;0.407465;0.375083;0.407457;0.374252;-0.406554;0.375083;0.407457;1.002221;0.5525854815501399;1.0
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridVoltageStep.Rise.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridVoltageStep.Rise.dict
index bf55570..fd7349c 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridVoltageStep.Rise.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.GridVoltageStep.Rise.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Active.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Active.csv
index 0579e86..c2b3da0 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Active.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Active.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActivePower;Wind_Turbine_GEN_InjectedReactivePower;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_ActivePowerPu;Wind_Turbine_GEN_ReactivePowerPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActivePower;Bess_GEN_InjectedReactivePower;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_ActivePowerPu;Bess_GEN_ReactivePowerPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.0444448220734306;0.750000701258;0.7180855181694515;0.399999680942;0.382978279453692;10.0;0.750181;0.416192;0.416192;0.750181;0.416192;0.711647;-0.394814;0.750181;0.416191;1.054148;0.8138301709847086
 0.0;1.044443880792549;0.749999896035;0.7180853943688025;0.399999562895;0.3829785115802208;10.0;0.750181;0.416192;0.416192;0.750181;0.416192;0.711647;-0.394813;0.750181;0.416191;1.054148;0.8138296858544791
 9e-06;1.0444407193254197;0.7499971174800001;0.7180849076474212;0.39999046386;0.3829709589629411;10.0;0.750181;0.416192;0.416192;0.750178;0.416183;0.711647;-0.394806;0.750178;0.416182;1.054144;0.81382628996918
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Active.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Active.dict
index 17880ce..f56b745 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Active.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Active.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Reactive.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Reactive.csv
index d958aaf..7a7bf1a 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Reactive.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Reactive.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActivePower;Wind_Turbine_GEN_InjectedReactivePower;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_ActivePowerPu;Wind_Turbine_GEN_ReactivePowerPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActivePower;Bess_GEN_InjectedReactivePower;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_ActivePowerPu;Bess_GEN_ReactivePowerPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;10.0;0.750141;0.012605;0.012605;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
 0.0;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;10.0;0.750141;0.012605;0.012605;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
 0.006933;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;10.0;0.750141;0.012605;0.012605;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Reactive.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Reactive.dict
index 17880ce..f56b745 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Reactive.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Reactive.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Voltage.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Voltage.csv
index 524c09b..536b16e 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Voltage.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Voltage.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActivePower;Wind_Turbine_GEN_InjectedReactivePower;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_ActivePowerPu;Wind_Turbine_GEN_ReactivePowerPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActivePower;Bess_GEN_InjectedReactivePower;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_ActivePowerPu;Bess_GEN_ReactivePowerPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;10.0;0.750141;1.044788;1.044788;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
 0.0;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;10.0;0.750141;1.044788;1.044788;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
 0.0;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;10.0;0.750141;1.044788;1.044788;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Voltage.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Voltage.dict
index 17880ce..f56b745 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Voltage.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.SetPointStep.Voltage.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.csv
index 44a5364..6347853 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActivePower;Wind_Turbine_GEN_InjectedReactivePower;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_ActivePowerPu;Wind_Turbine_GEN_ReactivePowerPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActivePower;Bess_GEN_InjectedReactivePower;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_ActivePowerPu;Bess_GEN_ReactivePowerPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.04444460284354;0.749999722973;0.7180847322405587;-7.564200000263203e-08;-7.242318050827573e-08;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
 0.0;1.04444460284354;0.749999722973;0.7180847322405587;-7.564200000263203e-08;-7.242318050827573e-08;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
 0.007047;1.04444460284354;0.749999722973;0.7180847322405587;-7.564200000263203e-08;-7.242318050827573e-08;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.dict
index bf55570..fd7349c 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.csv
index ca7fdcd..2dc9ea2 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActivePower;Wind_Turbine_GEN_InjectedReactivePower;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_ActivePowerPu;Wind_Turbine_GEN_ReactivePowerPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActivePower;Bess_GEN_InjectedReactivePower;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_ActivePowerPu;Bess_GEN_ReactivePowerPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.04444460284354;0.749999722973;0.7180847322405587;-7.564200000263203e-08;-7.242318050827573e-08;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
 0.0;1.04444460284354;0.749999722973;0.7180847322405587;-7.564200000263203e-08;-7.242318050827573e-08;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
 0.007047;1.04444460284354;0.749999722973;0.7180847322405587;-7.564200000263203e-08;-7.242318050827573e-08;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.dict
index f7c9cd1..1f2b3bc 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.dict
@@ -23,9 +23,9 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.csv
index 5515880..7aedec6 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActivePower;Wind_Turbine_GEN_InjectedReactivePower;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_ActivePowerPu;Wind_Turbine_GEN_ReactivePowerPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActivePower;Bess_GEN_InjectedReactivePower;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_ActivePowerPu;Bess_GEN_ReactivePowerPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.04444460284354;0.749999722973;0.7180847322405587;-7.564200000263203e-08;-7.242318050827573e-08;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
 0.0;1.04444460284354;0.749999722973;0.7180847322405587;-7.564200000263203e-08;-7.242318050827573e-08;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
 0.007047;1.04444460284354;0.749999722973;0.7180847322405587;-7.564200000263203e-08;-7.242318050827573e-08;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.dict
index 9f60092..af14983 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.csv
index 8be38ed..feb07da 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActivePower;Wind_Turbine_GEN_InjectedReactivePower;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_ActivePowerPu;Wind_Turbine_GEN_ReactivePowerPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActivePower;Bess_GEN_InjectedReactivePower;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_ActivePowerPu;Bess_GEN_ReactivePowerPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
 0.0;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
 0.007047;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.dict
index 865b1cd..e676160 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.dict
@@ -23,7 +23,7 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.csv
index 6e38307..7e08285 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActivePower;Wind_Turbine_GEN_InjectedReactivePower;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_ActivePowerPu;Wind_Turbine_GEN_ReactivePowerPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActivePower;Bess_GEN_InjectedReactivePower;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_ActivePowerPu;Bess_GEN_ReactivePowerPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.0444448220734306;0.750000701258;0.7180855181694515;0.399999680942;0.382978279453692;10.0;0.750181;0.416192;0.416192;0.750181;0.416192;0.711647;-0.394814;0.750181;0.416191;1.054148;0.8138301709847086
 0.0;1.044443880792549;0.749999896035;0.7180853943688025;0.399999562895;0.3829785115802208;10.0;0.750181;0.416192;0.416192;0.750181;0.416192;0.711647;-0.394813;0.750181;0.416191;1.054148;0.8138296858544791
 9e-06;1.0444407193254197;0.7499971174800001;0.7180849076474212;0.39999046386;0.3829709589629411;10.0;0.750181;0.416192;0.416192;0.750178;0.416183;0.711647;-0.394806;0.750178;0.416182;1.054144;0.81382628996918
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.dict
index 865b1cd..e676160 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.dict
@@ -23,7 +23,7 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.csv
index 35db939..3ebed48 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActivePower;Wind_Turbine_GEN_InjectedReactivePower;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_ActivePowerPu;Wind_Turbine_GEN_ReactivePowerPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActivePower;Bess_GEN_InjectedReactivePower;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_ActivePowerPu;Bess_GEN_ReactivePowerPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
 0.0;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
 0.007047;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.dict
index 908223a..2a4ccee 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.csv
index 547ff65..e0071ef 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActivePower;Wind_Turbine_GEN_InjectedReactivePower;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_ActivePowerPu;Wind_Turbine_GEN_ReactivePowerPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActivePower;Bess_GEN_InjectedReactivePower;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_ActivePowerPu;Bess_GEN_ReactivePowerPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
 0.0;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
 0.007047;1.0444448391609773;0.750000004028;0.7180848388608915;-3.733540000388449e-07;-3.574664606881177e-07;10.0;0.750141;0.012606;0.012606;0.750141;0.012606;0.717984;-0.012066;0.750141;0.012605;1.044788;0.718085379750904
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.dict
index e9afc9a..fc73079 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageDip.Qzero.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageDip.Qzero.csv
index d24fe1e..0afa163 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageDip.Qzero.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageDip.Qzero.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;0.9992878302616318;0.7171327810060001;0.7176438652497565;0.0009986992709999;0.0009994110212855;10.0;0.727473;-0.017174;1.044912;0.9997915697009052;1.0;0.7276756915034335;1.0
 0.0;0.9992878302616318;0.717132820121;0.7176439043926328;0.0009977007489999;0.0009984117876615;10.0;0.727473;-0.017174;1.044912;0.9997915697009052;1.0;0.7276756915034335;1.0
 2e-06;0.9992878302616318;0.717132937466;0.717644021821262;0.0009947051829999;0.0009954140867897;10.0;0.727473;-0.017174;1.044912;0.9997915697009052;1.0;0.7276756915034335;1.0
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageDip.Qzero.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageDip.Qzero.dict
index 74b44fa..f51890f 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageDip.Qzero.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageDip.Qzero.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageSwell.QMax.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageSwell.QMax.csv
index 3860244..8bfdd6f 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageSwell.QMax.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageSwell.QMax.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;0.9784223183968158;0.7028606550669999;0.7183612248529503;-0.3732901639999999;-0.3815225358019743;10.0;0.734085;0.365562;1.035552;0.9695848339289348;1.0;0.8200709500213992;1.0
 0.0;0.9784223183968158;0.702859715732;0.7183602648022828;-0.3732911800069999;-0.3815235742155315;10.0;0.734085;0.365563;1.035552;0.9695848339289348;1.0;0.8200713957906348;1.0
 1e-06;0.9784223183968158;0.702858891405;0.7183594222959493;-0.3732951290269999;-0.3815276103254257;10.0;0.734085;0.365564;1.035552;0.9695848339289348;1.0;0.8200718415608476;1.0
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageSwell.QMax.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageSwell.QMax.dict
index 74b44fa..f51890f 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageSwell.QMax.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageSwell.QMax.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageSwell.QMin.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageSwell.QMin.csv
index a00fb6f..31687e5 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageSwell.QMin.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageSwell.QMin.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0201525187034537;0.7319681431480001;0.7175085388979712;0.391247604227;0.3835187357320353;10.0;0.721053;-0.399916;1.054271;1.0299982792471063;1.0;0.8245303122778447;1.0
 0.0;1.0201525187034537;0.7319681830720001;0.7175085780332958;0.3912465848559999;0.3835177364981155;10.0;0.721053;-0.399916;1.054271;1.0299982792471063;1.0;0.8245303122778447;1.0
 3e-06;1.0201515194695343;0.731968670094;0.7175097582314186;0.391241172786;0.3835128069891425;10.0;0.721053;-0.399914;1.054271;1.0299972808318476;1.0;0.8245293422341015;1.0
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageSwell.QMin.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageSwell.QMin.dict
index 74b44fa..f51890f 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageSwell.QMin.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.GridVoltageSwell.QMin.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.csv
index 9298d98..8dc3711 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 7.170142;1.0444177160719743;0.6000000266099998;0.5744828121707691;-6.307500000122075e-07;-6.039250295221345e-07;10.0;0.583937;-0.012803;1.044818;1.04479153967191;1.0;0.5840773380109864;1.0
 8.409445;1.0441693077887322;0.599999507892;0.5746189850788053;-6.305999998746282e-08;-6.039250485250024e-08;10.0;0.584069;-0.013116;1.044818;1.0445434399784437;1.0;0.584216249531798;1.0
 9.205042;1.0432078536600458;0.599999516936;0.5751485812064487;4.770559999995823e-07;4.572971707659732e-07;10.0;0.584578;-0.014349;1.044818;1.0435826831928556;1.0;0.5847540781260102;1.0
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.dict
index 1b47997..e9fa2b0 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.PSetPointStep.Dec40.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.PSetPointStep.Dec40.csv
index 3425432..4e288c2 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.PSetPointStep.Dec40.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.PSetPointStep.Dec40.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0444441951219796;0.750000117442;0.7180853902437633;-7.101019999703212e-07;-6.798850558860055e-07;10.0;0.727473;-0.017174;1.044912;1.044912102877558;1.0;0.7276756915034335;1.0
 0.0;1.0444441951219796;0.750000117442;0.7180853902437633;-7.101019999703212e-07;-6.798850558860055e-07;10.0;0.727473;-0.017174;1.044912;1.044912102877558;1.0;0.7276756915034335;1.0
 0.008816;1.0444441951219796;0.750000117442;0.7180853902437633;-7.101019999703212e-07;-6.798850558860055e-07;10.0;0.727473;-0.017174;1.044912;1.044912102877558;1.0;0.7276756915034335;1.0
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.PSetPointStep.Dec40.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.PSetPointStep.Dec40.dict
index 11c2f83..ca63328 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.PSetPointStep.Dec40.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.PSetPointStep.Dec40.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.PSetPointStep.Inc40.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.PSetPointStep.Inc40.csv
index 34aad6b..517b925 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.PSetPointStep.Inc40.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.PSetPointStep.Inc40.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0444442947563073;0.450000145734;0.430851265111267;-1.5041399999964913e-07;-1.4401342489476104e-07;10.0;0.440353;-0.009325;1.044737;1.044737244472982;1.0;0.4404517229322641;1.0
 0.0;1.0444442947563073;0.450000145734;0.430851265111267;-1.5041399999964913e-07;-1.4401342489476104e-07;10.0;0.440353;-0.009325;1.044737;1.044737244472982;1.0;0.4404517229322641;1.0
 0.014567;1.0444442947563073;0.450000145734;0.430851265111267;-1.5041399999964913e-07;-1.4401342489476104e-07;10.0;0.440353;-0.009325;1.044737;1.044737244472982;1.0;0.4404517229322641;1.0
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.PSetPointStep.Inc40.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.PSetPointStep.Inc40.dict
index 11c2f83..ca63328 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.PSetPointStep.Inc40.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.PSetPointStep.Inc40.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.QSetPointStep.Dec20.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.QSetPointStep.Dec20.csv
index c681784..6833a3c 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.QSetPointStep.Dec20.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.QSetPointStep.Dec20.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0444445400929625;0.7500003868600001;0.718085411019761;0.0749996077599999;0.0718081285132904;10.0;0.726254;-0.088937;1.046666;1.046666785091129;1.0;0.7316793440332997;1.0
 0.0;1.0444445400929625;0.7500003868600001;0.718085411019761;0.0749996077599999;0.0718081285132904;10.0;0.726254;-0.088937;1.046666;1.046666785091129;1.0;0.7316793440332997;1.0
 0.008816;1.0444445400929625;0.7500003868600001;0.718085411019761;0.0749996077599999;0.0718081285132904;10.0;0.726254;-0.088937;1.046666;1.046666785091129;1.0;0.7316793440332997;1.0
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.QSetPointStep.Dec20.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.QSetPointStep.Dec20.dict
index 11c2f83..ca63328 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.QSetPointStep.Dec20.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.QSetPointStep.Dec20.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.QSetPointStep.Inc10.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.QSetPointStep.Inc10.csv
index dc3f34c..52d282c 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.QSetPointStep.Inc10.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.QSetPointStep.Inc10.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0444441951219796;0.750000117442;0.7180853902437633;-7.101019999703212e-07;-6.798850558860055e-07;10.0;0.727473;-0.017174;1.044912;1.044912102877558;1.0;0.7276756915034335;1.0
 0.0;1.0444441951219796;0.750000117442;0.7180853902437633;-7.101019999703212e-07;-6.798850558860055e-07;10.0;0.727473;-0.017174;1.044912;1.044912102877558;1.0;0.7276756915034335;1.0
 0.008816;1.0444441951219796;0.750000117442;0.7180853902437633;-7.101019999703212e-07;-6.798850558860055e-07;10.0;0.727473;-0.017174;1.044912;1.044912102877558;1.0;0.7276756915034335;1.0
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.QSetPointStep.Inc10.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.QSetPointStep.Inc10.dict
index 11c2f83..ca63328 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.QSetPointStep.Inc10.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.QSetPointStep.Inc10.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.csv
index 66a6e68..b3db0f5 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.044444857474534;0.750000087607;0.7180849062922279;5.55173999992629e-07;5.315493642575242e-07;10.0;0.727473;-0.017174;1.044912;1.0449114620148443;1.0;0.7276756915034335;1.0
 0.0;1.044444857474534;0.750000087607;0.7180849062922279;5.55173999992629e-07;5.315493642575242e-07;10.0;0.727473;-0.017174;1.044912;1.0449114620148443;1.0;0.7276756915034335;1.0
 0.009724;1.044444857474534;0.750000087607;0.7180849062922279;5.55173999992629e-07;5.315493642575242e-07;10.0;0.727473;-0.017174;1.044912;1.0449114620148443;1.0;0.7276756915034335;1.0
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.dict
index 0302d4c..dba0a48 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.USetPointStep.AReactance.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.USetPointStep.AReactance.csv
index b463eee..d7a2d9d 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.USetPointStep.AReactance.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.USetPointStep.AReactance.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0444445953912538;0.7500003744420001;0.7180853611110376;1.8345999999667842e-07;1.7565316610016393e-07;10.0;0.727473;-0.017174;1.044912;1.0449117948784004;1.0;0.7276756915034335;1.0
 0.0;1.0444445953912538;0.7500003744420001;0.7180853611110376;1.8345999999667842e-07;1.7565316610016393e-07;10.0;0.727473;-0.017174;1.044912;1.0449117948784004;1.0;0.7276756915034335;1.0
 0.008816;1.0444445953912538;0.7500003744420001;0.7180853611110376;1.8345999999667842e-07;1.7565316610016393e-07;10.0;0.727473;-0.017174;1.044912;1.0449117948784004;1.0;0.7276756915034335;1.0
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.USetPointStep.AReactance.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.USetPointStep.AReactance.dict
index 1b47997..e9fa2b0 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.USetPointStep.AReactance.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.USetPointStep.AReactance.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.USetPointStep.BReactance.csv b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.USetPointStep.BReactance.csv
index 8219ca8..72191c1 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.USetPointStep.BReactance.csv
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.USetPointStep.BReactance.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0444441951219796;0.750000117442;0.7180853902437633;-7.101019999703212e-07;-6.798850558860055e-07;10.0;0.727473;-0.017174;1.044912;1.044912102877558;1.0;0.7276756915034335;1.0
 0.0;1.0444441951219796;0.750000117442;0.7180853902437633;-7.101019999703212e-07;-6.798850558860055e-07;10.0;0.727473;-0.017174;1.044912;1.044912102877558;1.0;0.7276756915034335;1.0
 0.008816;1.0444441951219796;0.750000117442;0.7180853902437633;-7.101019999703212e-07;-6.798850558860055e-07;10.0;0.727473;-0.017174;1.044912;1.044912102877558;1.0;0.7276756915034335;1.0
diff --git a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.USetPointStep.BReactance.dict b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.USetPointStep.BReactance.dict
index 1b47997..e9fa2b0 100644
--- a/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.USetPointStep.BReactance.dict
+++ b/examples/Model/BESS/WECC/ProducerCurves/PCS_RTE-I16z3.USetPointStep.BReactance.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/CurvesFiles.ini b/examples/Model/BESS/WECC/ReferenceCurves/CurvesFiles.ini
index 31e4f58..0928232 100755
--- a/examples/Model/BESS/WECC/ReferenceCurves/CurvesFiles.ini
+++ b/examples/Model/BESS/WECC/ReferenceCurves/CurvesFiles.ini
@@ -45,17 +45,17 @@ StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
 # Wind Turbines or PV Arrays in Zone1
 [Curves-Dictionary-Zone1]
 NetworkFrequencyPu = NetworkFrequencyPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
 
 
 # Wind Turbines or PV Arrays in Zone3
 [Curves-Dictionary-Zone3]
 NetworkFrequencyPu = NetworkFrequencyPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridFreqRamp.W500mHz250ms.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridFreqRamp.W500mHz250ms.csv
index ff07cf2..32278a9 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridFreqRamp.W500mHz250ms.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridFreqRamp.W500mHz250ms.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;InfiniteBus_BUS_NetworkFrequencyPu;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;InfiniteBus_BUS_NetworkFrequencyPu;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0442310615797796;0.7499926971413914;0.7179238804138769;-3.653432237808261e-07;-3.9687683987632495e-07;0.9998847760937425;10.000094844900797;0.7500571084572264;0.01260691615064746;0.012602421699629317;0.7180235750037258;-0.012030173409518854;1.0449711246586093;0.7181336941767964;1.0000349983704786
 0.0;1.04423442345028;0.749992549199572;0.7179280125815427;-1.1455598341351611e-06;-1.1430846858267827e-06;0.999887372514081;10.000088167502355;0.7500588699474159;0.012606891428442528;0.012602499516279928;0.7180226097163874;-0.012028953050295419;1.044965924991738;0.7181330160289949;1.0000341665513157
 1e-06;1.0442365171137613;0.7499914541565684;0.7179320741384173;-5.69714377959498e-06;-5.500184219347536e-06;0.9998899450153733;10.000081628170332;0.7500606188354194;0.012606866946940872;0.012602577175058435;0.7180216552583701;-0.012025733022014085;1.044959729845064;0.7181323006507248;1.00003333153159
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridFreqRamp.W500mHz250ms.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridFreqRamp.W500mHz250ms.dict
index 7ca8a8d..bfaae11 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridFreqRamp.W500mHz250ms.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridFreqRamp.W500mHz250ms.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridVoltageStep.Drop.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridVoltageStep.Drop.csv
index 570a37c..3c38409 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridVoltageStep.Drop.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridVoltageStep.Drop.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;InfiniteBus_BUS_NetworkFrequencyPu;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;InfiniteBus_BUS_NetworkFrequencyPu;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0966027132122185;-0.37499940607123233;-0.341944842448293;-0.4000003372104705;-0.3647420834522253;0.9998677917987564;9.999442812343656;-0.3749320028949227;-0.39388896942334417;-0.3938889426686147;-0.34470496207107193;0.36187683394258036;1.087687559099625;0.4999962360827359;1.0000769986798752
 0.0;1.0966048054254873;-0.3749983490063974;-0.34194387867949927;-0.4000014719308026;-0.36474311761142864;0.9998710001303944;9.999453681289067;-0.3749320028137972;-0.3938889700387681;-0.3938889440378053;-0.3447029629843373;0.3618843200592549;1.0876881307213382;0.49999572883437643;1.0000756391760264
 1e-06;1.0966068553386026;-0.37499370502243706;-0.34193965519706737;-0.4000052438916772;-0.36474656832371743;0.9998742095163863;9.999464559292639;-0.37493200273692956;-0.39388897065446976;-0.39388894539919456;-0.3446999638944921;0.3618927935977833;1.0876876843182635;0.4999952553866986;1.0000742751548202
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridVoltageStep.Drop.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridVoltageStep.Drop.dict
index bf55570..fd7349c 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridVoltageStep.Drop.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridVoltageStep.Drop.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridVoltageStep.Rise.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridVoltageStep.Rise.csv
index 1f9518b..5fc1d53 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridVoltageStep.Rise.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridVoltageStep.Rise.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;InfiniteBus_BUS_NetworkFrequencyPu;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;InfiniteBus_BUS_NetworkFrequencyPu;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;0.9922223544851457;0.3749614693298093;0.3778680875589368;0.40000032030607136;0.40313597354798003;1.000002164116999;9.99996491855471;0.3750880476393939;0.4074485927801836;0.4075198742429984;0.37427198400621725;-0.4065712405186161;1.0022669272969122;0.5525383464887273;0.9999058982123171
 0.0;0.9922218973822182;0.3749623561004716;0.37786985636701914;0.3999993296470928;0.4031349746717165;1.0000025448157133;9.999964398911084;0.37508806582202675;0.40744888540641677;0.40751842575771857;0.3742715989823378;-0.4065699065759148;1.002265726714323;0.5525386345150624;0.9999079459189194
 1e-06;0.9922204496260111;0.37496312595200115;0.3778718857626359;0.39999200811123137;0.40312800111048475;1.0000029101077283;9.999963992855793;0.3750880759283655;0.40744918003565705;0.40751698840554934;0.37427121617565523;-0.40656357617339134;1.0022635353363305;0.5525352381719066;0.9999099870517079
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridVoltageStep.Rise.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridVoltageStep.Rise.dict
index bf55570..fd7349c 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridVoltageStep.Rise.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.GridVoltageStep.Rise.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Active.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Active.csv
index 9d40df2..0942852 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Active.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Active.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.0444360283109735;0.7499252689433542;0.7181485523067416;0.400021034943904;0.38299133003574815;10.00087863861751;0.7501994098655452;0.41622508468365793;0.4161135104696806;0.7117165079086251;-0.3948139969193476;1.0541311291899582;0.8137862392663282
 0.0;1.0444354521522832;0.7499259295021062;0.7181464544054013;0.400019136507539;0.3829899859153707;10.000859952507435;0.7501985145515361;0.41622434986221196;0.4161152122872801;0.7117148946374641;-0.39481199707503084;1.0541299885224216;0.8137861856315879
 1e-06;1.0444326533046784;0.7499258725878304;0.7181452008349143;0.4000109300897329;0.38298341573495254;10.000841298661925;0.7501976223236618;0.4162236211438866;0.41611691002384693;0.7117132820215591;-0.39480599722889326;1.0541268475982646;0.8137841922561817
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Active.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Active.dict
index 17880ce..f56b745 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Active.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Active.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Reactive.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Reactive.csv
index 449418b..dbbb71b 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Reactive.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Reactive.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.0447405512693904;0.7501686523579199;0.7181437918645596;-2.3752210899369662e-07;-3.4138965390496066e-07;9.9982472610372;0.7500117901323419;0.0126049216344471;0.7181328047207585;-0.012065889790334738;1.0452442191510867;0.7180849967280576
 0.0;1.0447497981341771;0.7501689938562547;0.7181423181435773;-2.3293115271694545e-07;-3.4235749703210676e-07;9.998165793639808;0.7500038757172007;0.012604918307065135;0.7181335279659548;-0.01206588947053475;1.0452570217936064;0.7180809749576772
 0.006933;1.0447592854978163;0.7501694126260939;0.7181407993847646;-2.282689321089399e-07;-3.4332174778501814e-07;9.998084782392135;0.7499957939686961;0.012604914915483807;0.7181343124581437;-0.012065889102794294;1.045270163270008;0.7180768523874004
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Reactive.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Reactive.dict
index 17880ce..f56b745 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Reactive.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Reactive.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Voltage.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Voltage.csv
index 5e0e715..920018e 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Voltage.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Voltage.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.044621463614589;0.7500784602468411;0.7181383096186591;-7.343566417191906e-07;-1.2759667799142696e-06;9.996883440563499;0.7502117129433351;1.0449790658456035;0.7180275163328692;-0.01206602601257585;1.0446603216679728;0.7180486449822149
 0.0;1.0446171673637743;0.7500767280135274;0.7181371860849909;-7.237041336757871e-07;-1.2558254944796375e-06;9.996952125252346;0.7502106269225639;1.0449743928609656;0.7180265822493298;-0.01206602550386099;1.0446632190354588;0.7180495972168867
 0.0;1.044612890317769;0.7500750004445996;0.718136064857917;-7.130025645411689e-07;-1.2356477844442918e-06;9.997020672628912;0.7502095389737448;1.0449697382429606;0.7180256364093306;-0.012066024999735633;1.0446661045966412;0.718050546409105
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Voltage.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Voltage.dict
index 17880ce..f56b745 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Voltage.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.SetPointStep.Voltage.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.csv
index f94433b..dd8ae14 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.0444549759804769;0.7500021141389037;0.7181009193859883;-3.972279409276925e-06;-3.718403734085387e-05;9.998086273495614;0.75015683111265;0.012606541411632581;0.012607518356268856;0.7178892723042326;-0.012066021875888426;1.0447890248966856;0.7178462626477804
 0.0;1.044454740606832;0.7500021689677385;0.7181005380976335;-4.963280251494631e-06;-3.7253404525835176e-05;9.99812945174103;0.7501567550472215;0.012606532389657926;0.012607479739670253;0.7178909837625733;-0.0120640213815786;1.0447890575701801;0.7178516166004044
 1e-06;1.0444535098889596;0.7500017980822673;0.7181004390957285;-9.008469083021476e-06;-4.025398846991089e-05;9.998172448177295;0.7501566633857737;0.012606523394023768;0.012607441489906866;0.7178926962686831;-0.012060020889665268;1.0447880861524257;0.7178569125364914
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.dict
index bf55570..fd7349c 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.csv
index 2e4c580..fd91b56 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.0444104580725564;0.750017307824119;0.7180368331973104;2.6587599614731115e-05;-6.465009770575574e-05;10.000602380016716;0.7501778925337249;0.012607329249196624;0.0126046830773243;0.717829182971461;-0.012066023703752243;1.0447289518161165;0.7178428076485771
 0.0;1.0444113691515415;0.7500168629458118;0.7180381266988525;2.4875444019121175e-05;-6.424240796105777e-05;10.000588590515353;0.7501768606275364;0.012607301074018178;0.012604714392090153;0.7178324769122815;-0.012064023030088973;1.044730240846839;0.717848802873138
 1e-06;1.0444112809454857;0.750015995947891;0.7180396877522708;2.0112767447426606e-05;-6.675995090261764e-05;10.000574841328579;0.7501758375623265;0.012607273074921925;0.01260474543816862;0.7178357620797307;-0.01206002236070452;1.0447305258919322;0.7178547332156345
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.dict
index f7c9cd1..1f2b3bc 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.dict
@@ -23,9 +23,9 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.csv
index dacd3f9..73f7279 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.044383704575138;0.7500519102953798;0.7181675517392776;-8.97044757053851e-08;-1.010845921372028e-07;10.001419546289503;0.7501818457023324;0.012604787821949596;0.012604934524102898;0.7179335928376933;-0.012074836985202486;1.0446990110555903;0.7182344609429765
 0.0;1.0443850357582398;0.7500511888734668;0.7181655291982303;-1.129450094365217e-06;-1.0961181266035473e-06;10.00138745500111;0.7501807479376094;0.012604822640370593;0.012604957349547;0.7179347146309253;-0.012072646138858573;1.0447012957606556;0.7182310064325269
 1e-06;1.044385365639259;0.7500500292925012;0.7181637937076935;-5.223045597352475e-06;-5.0150567082284055e-06;10.001355307085545;0.7501796616129373;0.012604857270557268;0.012604980034817194;0.7179358386107415;-0.012068454426283924;1.0447025611082297;0.718227526837937
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.dict
index 9f60092..af14983 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.csv
index b53a735..722ed2d 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.0444077669505047;0.749841640785621;0.7180620495780551;-4.3286952295926926e-07;-3.3761699857332875e-07;9.998722564545107;0.7503993688219986;0.012605500083588263;0.012605251802010612;0.7178585232628749;-0.012075759726235329;1.0448643477787387;0.7181757531863929
 0.0;1.0444076859184663;0.749844345828154;0.718062936880952;-1.211660159462184e-06;-1.0850807481732666e-06;9.998749169978058;0.7503932018751914;0.012605501086299282;0.012605269694401315;0.7178614641323491;-0.01207353159644346;1.044861668208327;0.7181739781006037
 1e-06;1.044406342981727;0.7498460867467697;0.7180637759831596;-5.7618183816467614e-06;-5.443436401276132e-06;9.998775704581165;0.7503870552828332;0.012605502319253533;0.012605287607737381;0.7178643919290308;-0.01206930461452529;1.044857996084637;0.7181721684880119
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.dict
index 865b1cd..e676160 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.dict
@@ -23,7 +23,7 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.csv
index 7d77555..c27bc26 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.0443020393000562;0.7499153745080411;0.718132520023724;0.40000026327282234;0.3829920410171657;10.000719695315267;0.7501713517100914;0.41617101209714874;0.41616221757790234;0.7117252570207485;-0.3948140491745798;1.0542007539576326;0.8139133579942619
 0.0;1.0443044213667205;0.749915439268056;0.7181308625922428;0.3999987642899929;0.3829906363277327;10.000706709499307;0.750171178636296;0.41617150398217523;0.41616276824026693;0.711723607983404;-0.394812048234575;1.0541985037363313;0.8139103235368162
 1e-06;1.0443045701624638;0.7499148000034691;0.7181300440757691;0.39999095638423493;0.3829840059722928;10.000693699580127;0.7501710086865996;0.4161719922699239;0.41616331779841254;0.7117219695029683;-0.3948060472966665;1.0541942501440997;0.8139053539837962
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.dict
index 865b1cd..e676160 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.dict
@@ -23,7 +23,7 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.csv
index 38ec10e..d0aeb51 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.0444083714865673;0.7499912482118613;0.7181438002380336;-3.815529905030758e-07;-3.885637306959921e-07;10.000467708773128;0.750384026466772;0.012604209571392605;0.012604923440337349;0.717936934168938;-0.01207615750134746;1.0447281463262812;0.7180254163841946
 0.0;1.044407623063541;0.7499908922335253;0.7181427631804039;-1.1615416533968381e-06;-1.134953089791657e-06;10.000453165930084;0.7503784829245626;0.012604250140152914;0.012604949178546845;0.7179384570012807;-0.012073935728174572;1.0447279600808548;0.7180266326724998
 1e-06;1.0444056356002163;0.7499895783192209;0.7181416906775276;-5.712898243790483e-06;-5.492236709598478e-06;10.000438655917154;0.7503729593334141;0.012604290710108792;0.012604974760187408;0.7179399576432762;-0.012069714810507694;1.044726793965591;0.7180278087447194
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.dict
index 908223a..2a4ccee 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.csv
index 76b6ee3..ac7096d 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_ActivePowerSetpointPu;Wind_Turbine_GEN_ReactivePowerSetpointPu;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_InjectedCurrent
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_ActivePowerSetpointPu;Bess_GEN_ReactivePowerSetpointPu;Bess_GEN_AVRSetpointPu;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_InjectedCurrent
 0.0;1.0445991805635804;0.7499097244394078;0.7179620417589325;-3.344579435962989e-07;-3.4928324791443897e-07;9.999957137757317;0.7502136455740183;0.012605507092661608;0.0126061231753956;0.7180574028820371;-0.012070917511175734;1.0448199443233654;0.7181574869338024
 0.0;1.044594590396712;0.7499112301370555;0.7179650374757814;-1.1155634278989651e-06;-1.0966510851064883e-06;9.99995835088109;0.7502119490245149;0.0126055187817741;0.012606123194137911;0.7180559203894341;-0.012068874208415039;1.0448181690473297;0.71815585879831
 1e-06;1.0445887574709665;0.7499117776529368;0.7179679743949221;-5.668026423120107e-06;-5.4549095413847425e-06;9.999959568668206;0.7502102547022294;0.012605530395194447;0.012606123054782408;0.718054444614058;-0.012064829111825241;1.044815397920893;0.7181542081973367
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.dict
index e9afc9a..fc73079 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.dict
@@ -23,8 +23,8 @@ BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 NetworkFrequencyPu = NetworkFrequencyPu
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageDip.Qzero.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageDip.Qzero.csv
index 6b4f5c0..5e4d085 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageDip.Qzero.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageDip.Qzero.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;0.9993514626394722;0.7171554438873474;0.7176800138114154;0.0010096841457520607;0.0009647579803774919;9.999024176699566;0.7274505202420153;-0.017173968971681032;1.0449774167618882;0.9998074583049912;0.9999896101486175;0.7276431321616849;1.000180532977395
 0.0;0.9993502856534555;0.7171551328209677;0.7176789788190102;0.0010084803911729208;0.0009645934447518058;9.999048836523349;0.7274511005890183;-0.017173969557216163;1.0449757273786204;0.999806891916612;0.9999902693008186;0.7276444287331374;1.00017644465637
 2e-06;0.9993491052742349;0.7171548995239749;0.7176780344151681;0.0010052785084968417;0.0009624302065510523;9.999073422379082;0.7274516773248468;-0.01717397013955583;1.04497404077682;0.9998053314331812;0.9999909152269406;0.7276456972997746;1.0001723715113406
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageDip.Qzero.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageDip.Qzero.dict
index 74b44fa..f51890f 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageDip.Qzero.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageDip.Qzero.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageSwell.QMax.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageSwell.QMax.csv
index 5aeba8b..e04c63b 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageSwell.QMax.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageSwell.QMax.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;0.9782458115576251;0.7029135200346291;0.7182901431902707;-0.37329022538238193;-0.3815225531682667;9.99948755966748;0.7340386576702771;0.36556944639756794;1.035552262394591;0.9696678462246394;1.0001163086058087;0.8201162599447;1.0000095399159779
 0.0;0.9782499538904854;0.7029113293223859;0.7182906247508286;-0.37329123993567875;-0.3815235912756861;9.999498174401294;0.7340395169997214;0.3655702862520914;1.0355522376141384;0.9696659803380911;1.000113316865233;0.8201158062568049;1.000009484985102
 1e-06;0.9782540669650587;0.7029092597997838;0.7182912188555285;-0.3732951875069852;-0.3815276270799255;9.999508790615511;0.734040371469374;0.36557112686021476;1.0355522236491532;0.9696641197298199;1.0001103367309965;0.8201153497766137;1.0000094185709436
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageSwell.QMax.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageSwell.QMax.dict
index 74b44fa..f51890f 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageSwell.QMax.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageSwell.QMax.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageSwell.QMin.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageSwell.QMin.csv
index 3aa7710..3a43051 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageSwell.QMin.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageSwell.QMin.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0199643221669032;0.7320885015347617;0.7176173446824241;0.3912483716290638;0.38351763234354713;10.00190276413377;0.7210375808157563;-0.39991595571006305;1.0542588066446708;1.0301429590430722;1.0000152584506594;0.8245491163779721;1.0001216903140622
 0.0;1.0199687803900463;0.7320859166536522;0.7176152057708308;0.3912473244676648;0.38351666978544;10.001859294922042;0.7210378056984973;-0.39991595676028946;1.0542593782613827;1.0301400393281894;1.0000148446221082;0.8245485202288313;1.0001189662446792
 3e-06;1.0199722214118274;0.7320837865121376;0.7176142190665729;0.3912418846198758;0.38351177686214133;10.001815915689704;0.721038030060698;-0.39991395781080885;1.0542599463577704;1.030137125277914;1.0000144274783975;0.8245469571725624;1.0001162522268328
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageSwell.QMin.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageSwell.QMin.dict
index 74b44fa..f51890f 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageSwell.QMin.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.GridVoltageSwell.QMin.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.csv
index 79ff6df..d18cecd 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 7.170142;1.0444088573493113;0.6000169579526892;0.5744675819127097;1.0145900366860434e-07;-7.04977467824513e-07;10.00024008955724;0.5839235206274945;-0.012803004908747797;1.0447838736835597;1.0447891379710097;1.0000021311460705;0.5840929228062773;1.0000017167326238
 8.409445;1.0441691721284534;0.600003066731925;0.5746289095715913;-1.1819923703712197e-07;6.632928418777666e-07;9.99992963452294;0.5840628545810458;-0.013116000522403123;1.0448182449766252;1.0445418648899913;1.0000000875003636;0.5842242527332683;1.0000017469551146
 9.205042;1.0432042639756978;0.5999951192981156;0.5751477737490631;3.3408271273160144e-07;8.164563584108515e-07;9.999869261785456;0.5845745479901329;-0.01434900163718718;1.044829720498712;1.0435890854969938;1.0000044805764974;0.5847505412810883;1.0000082514992108
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.dict
index 1b47997..e9fa2b0 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.tmp b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.tmp
index d5a1869..bc2f912 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.tmp
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.Islanding.DeltaP10DeltaQ4.tmp
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 5.820711;1.0444190277354195;0.6000380455789871;0.5744064372241795;3.0313235186404955e-06;-3.1375066910522437e-07;10.000719554456424;0.5839017200660872;-0.012771016677396491;1.0447373409261291;1.0448040301503911;0.9999899599268037;0.5841140296380004;0.9999852793289059
 7.170142;1.0444088573493113;0.6000169579526892;0.5744675819127097;1.0145900366860434e-07;-7.04977467824513e-07;10.00024008955724;0.5839235206274945;-0.012803004908747797;1.0447838736835597;1.0447891379710097;1.0000021311460705;0.5840929228062773;1.0000017167326238
 7.928402;1.0443375899156773;0.6000096362184747;0.5745304624999528;2.3683284829053475e-07;4.0766779041303833e-07;10.000060965133247;0.5839685211248213;-0.012904000713494259;1.0448053616523039;1.0447120166714368;0.9999992932130232;0.5841320879473051;1.000002954768675
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.PSetPointStep.Dec40.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.PSetPointStep.Dec40.csv
index d1cd40d..aab0bd2 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.PSetPointStep.Dec40.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.PSetPointStep.Dec40.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0445075449343935;0.7502728721073809;0.7180795443624696;-7.594607920847432e-07;-6.995433487406758e-07;9.998359301950128;0.7273894937501519;-0.017173982580030632;1.0450394217562382;1.0448203463656915;1.00006343319149;0.7277182963278249;0.9996403586575209
 0.0;1.0445090263874357;0.7502796912242882;0.7180753146434791;-7.598572094869362e-07;-7.016786546671785e-07;9.998319144031283;0.727386751684196;-0.017173979710579424;1.045047372098857;1.0448136564397554;1.0000597183991728;0.7277226330166794;0.9996418055828938
 0.008816;1.0445106574300038;0.7502866920583781;0.7180710744299742;-7.60238986138156e-07;-7.038463448808297e-07;9.99827919738173;0.7273838857214767;-0.017173976866050687;1.0450553935316695;1.0448067122578741;1.00005598600763;0.7277270221850867;0.9996432430765256
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.PSetPointStep.Dec40.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.PSetPointStep.Dec40.dict
index 11c2f83..ca63328 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.PSetPointStep.Dec40.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.PSetPointStep.Dec40.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.PSetPointStep.Inc40.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.PSetPointStep.Inc40.csv
index 149f692..3eabae5 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.PSetPointStep.Inc40.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.PSetPointStep.Inc40.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0446466528659384;0.450271251924794;0.4307308990550414;-4.037157379945761e-07;-1.2892908124377896e-06;10.001507940639247;0.44072558414271923;-0.009324999708553395;1.044826312933806;1.0447192072944325;0.9998898488611687;0.44002469205294437;0.9996727741735211
 0.0;1.0446512395043484;0.4502756314440408;0.4307221155440007;-4.1261097318510504e-07;-1.2985262665676083e-06;10.001554528842709;0.440734661909379;-0.009325000153140877;1.0448331606679586;1.044712031529104;0.9998914431498583;0.44001169194931744;0.9996562986480703
 0.014567;1.044655932778099;0.4502800664512764;0.4307132217006757;-4.2152466604345524e-07;-1.308079756067698e-06;10.001600334955983;0.440743875831873;-0.009325000546581856;1.044840189598955;1.0447046717992032;0.9998930450522069;0.43999851054310407;0.9996395543354888
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.PSetPointStep.Inc40.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.PSetPointStep.Inc40.dict
index 11c2f83..ca63328 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.PSetPointStep.Inc40.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.PSetPointStep.Inc40.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.QSetPointStep.Dec20.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.QSetPointStep.Dec20.csv
index c582200..4ec2732 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.QSetPointStep.Dec20.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.QSetPointStep.Dec20.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0441389802117267;0.7499164236179761;0.7175406726553694;0.0749996152032688;0.07180827161251598;10.00093768545138;0.7262081683261056;-0.08895534352309262;1.046511204175259;1.046270958920762;0.9998944232813665;0.7316556214854767;1.0002570128016766
 0.0;1.0441298034375754;0.7499140806963135;0.7175263085968153;0.07499961692499539;0.07180827662153573;10.00092542323926;0.7262105080985549;-0.08895604828024835;1.0465146571894408;1.0462611186481539;0.9998937319109271;0.7316578427923012;1.00026623009216
 0.008816;1.0441205484613074;0.7499117541600677;0.7175116117298852;0.07499961870857544;0.07180828165330783;10.000912873908916;0.7262128289527618;-0.08895675715833573;1.046517948630486;1.0462512193078308;0.9998930808942688;0.7316600491203922;1.0002756143947729
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.QSetPointStep.Dec20.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.QSetPointStep.Dec20.dict
index 11c2f83..ca63328 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.QSetPointStep.Dec20.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.QSetPointStep.Dec20.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.QSetPointStep.Inc10.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.QSetPointStep.Inc10.csv
index f03a894..3828420 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.QSetPointStep.Inc10.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.QSetPointStep.Inc10.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0442206041777637;0.7498994393021005;0.7179291091272645;-4.8757875971542875e-05;2.190144113222322e-05;9.998359389290394;0.7278320962205553;-0.017174269094098256;1.0451784772488553;1.0452724260771011;1.0000504005743711;0.7275295406569792;0.9997621567398117
 0.0;1.0442123611972578;0.7499003839948275;0.7179274653330003;-4.9424185746472124e-05;2.1497377805727032e-05;9.998284429066295;0.7278396039795496;-0.017174274854910222;1.0451777745622415;1.0452871687604794;1.0000518264019984;0.727523116712953;0.9997579469400022
 0.008816;1.0442039715780187;0.7499013679986887;0.7179258238828629;-5.0109203521814606e-05;2.1080119859007635e-05;9.998206160964001;0.7278472188161259;-0.017174280697502233;1.0451770554730635;1.0453021113047527;1.0000533799211402;0.7275165938994282;0.9997537627787515
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.QSetPointStep.Inc10.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.QSetPointStep.Inc10.dict
index 11c2f83..ca63328 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.QSetPointStep.Inc10.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.QSetPointStep.Inc10.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.csv
index 16406e2..b24d555 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.044429366091755;0.7496152193219904;0.7182120950346027;-8.02145232042634e-06;-1.4649683766965057e-05;9.998998112255471;0.7275471806559815;-0.017173981991521994;1.0450994736124424;1.0449301751919835;0.9998444788613342;0.7277009136931032;1.0003226906634142
 0.0;1.044412043443035;0.7496041831091672;0.7182144970430138;-7.755556795567273e-06;-1.5240735431372515e-05;9.999024655550626;0.7275461561619291;-0.017173980274032042;1.0450929694318039;1.0449338624564237;0.9998356232910643;0.7277033964892519;1.0003315459062816
 0.009724;1.0443944767904845;0.7495927674496725;0.7182169572294476;-7.487878402093023e-06;-1.5841817926280518e-05;9.999051278907363;0.7275451890538883;-0.01717397850803721;1.0450865001843839;1.0449375740729294;0.999826640739135;0.7277059463532677;1.0003407177441521
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.dict
index 0302d4c..dba0a48 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.USetPointStep.AReactance.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.USetPointStep.AReactance.csv
index aada3fe..f038e2f 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.USetPointStep.AReactance.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.USetPointStep.AReactance.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0443693472899802;0.7504136484702658;0.718006165858872;1.0952822000526606e-06;1.4011881894580996e-06;10.004241194959109;0.7275480588942949;-0.017174065362355672;1.0446723675396625;1.0445813036052622;1.00009101127429;0.7278494839963849;1.0000542989436354
 0.0;1.0443681930575386;0.750417697122962;0.7180057483887572;1.172587298104201e-06;1.518221882715011e-06;10.004314926607389;0.7275488200206173;-0.017174069350997835;1.0446757143069905;1.0445773032686023;1.0001034120235177;0.7278552045854879;1.000061476355453
 0.008816;1.0443669707762453;0.7504218337543679;0.7180052628490702;1.249493777342871e-06;1.6430525684827333e-06;10.004390198022282;0.7275495915816845;-0.017174073363053623;1.0446789672262087;1.04457322162618;1.0001157700386272;0.7278610199031018;1.000068807655881
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.USetPointStep.AReactance.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.USetPointStep.AReactance.dict
index 1b47997..e9fa2b0 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.USetPointStep.AReactance.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.USetPointStep.AReactance.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.USetPointStep.BReactance.csv b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.USetPointStep.BReactance.csv
index f699738..eef3442 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.USetPointStep.BReactance.csv
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.USetPointStep.BReactance.csv
@@ -1,4 +1,4 @@
-time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Wind_Turbine_GEN_InjectedActiveCurrent;Wind_Turbine_GEN_InjectedReactiveCurrent;Wind_Turbine_GEN_AVRSetpointPu;Wind_Turbine_GEN_MagnitudeControlledByAVRPu;Wind_Turbine_GEN_NetworkFrequencyPu;Wind_Turbine_GEN_InjectedCurrent;NetworkFrequencyPu
+time;BusPDR_BUS_Voltage;BusPDR_BUS_ActivePower;BusPDR_BUS_ActiveCurrent;BusPDR_BUS_ReactivePower;BusPDR_BUS_ReactiveCurrent;StepUp_Xfmr_XFMR_Tap;Bess_GEN_InjectedActiveCurrent;Bess_GEN_InjectedReactiveCurrent;Bess_GEN_AVRSetpointPu;Bess_GEN_MagnitudeControlledByAVRPu;Bess_GEN_NetworkFrequencyPu;Bess_GEN_InjectedCurrent;NetworkFrequencyPu
 0.0;1.0444982029327272;0.7500898619719892;0.7182688403851055;1.0974418705063418e-06;1.5502794088993104e-05;9.99959978812637;0.7275053235793665;-0.017173943797819544;1.0447521147054062;1.0451329666055698;0.9998020233993701;0.7274475480391352;1.0001259721313807
 0.0;1.0445092540422583;0.7500949095509055;0.7182693203525834;8.699558364231109e-07;1.5764139541971138e-05;9.999684227915937;0.727508645725917;-0.01717394248800492;1.0447629489016454;1.0451456300912192;0.9997970722188992;0.7274427187509821;1.0001286067222952
 0.008816;1.0445205378281837;0.7501000319442633;0.7182698731893409;6.406696870088896e-07;1.602909691967524e-05;9.999770258326416;0.7275119527962043;-0.01717394117773598;1.0447739710839352;1.0451584121016821;0.9997919871830111;0.7274378152270501;1.000131232067213
diff --git a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.USetPointStep.BReactance.dict b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.USetPointStep.BReactance.dict
index 1b47997..e9fa2b0 100644
--- a/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.USetPointStep.BReactance.dict
+++ b/examples/Model/BESS/WECC/ReferenceCurves/PCS_RTE-I16z3.USetPointStep.BReactance.dict
@@ -22,9 +22,9 @@ BusPDR_BUS_ActiveCurrent = BusPDR_BUS_ActiveCurrent
 BusPDR_BUS_ReactiveCurrent = BusPDR_BUS_ReactiveCurrent
 BusPDR_BUS_Voltage = BusPDR_BUS_Voltage
 StepUp_Xfmr_XFMR_Tap = StepUp_Xfmr_XFMR_Tap
-Wind_Turbine_GEN_MagnitudeControlledByAVRPu = Wind_Turbine_GEN_MagnitudeControlledByAVRPu
-Wind_Turbine_GEN_AVRSetpointPu = Wind_Turbine_GEN_AVRSetpointPu
-Wind_Turbine_GEN_InjectedActiveCurrent = Wind_Turbine_GEN_InjectedActiveCurrent
-Wind_Turbine_GEN_InjectedReactiveCurrent = Wind_Turbine_GEN_InjectedReactiveCurrent
-Wind_Turbine_GEN_InjectedCurrent = Wind_Turbine_GEN_InjectedCurrent
+Bess_GEN_MagnitudeControlledByAVRPu = Bess_GEN_MagnitudeControlledByAVRPu
+Bess_GEN_AVRSetpointPu = Bess_GEN_AVRSetpointPu
+Bess_GEN_InjectedActiveCurrent = Bess_GEN_InjectedActiveCurrent
+Bess_GEN_InjectedReactiveCurrent = Bess_GEN_InjectedReactiveCurrent
+Bess_GEN_InjectedCurrent = Bess_GEN_InjectedCurrent
 NetworkFrequencyPu = NetworkFrequencyPu
diff --git a/src/dgcv/core/input_template.py b/src/dgcv/core/input_template.py
index 68a871e..326857b 100644
--- a/src/dgcv/core/input_template.py
+++ b/src/dgcv/core/input_template.py
@@ -9,33 +9,7 @@
 from dgcv.logging.logging import dgcv_logging
 
 
-def create_input_template(launcher_dwo: Path, target: Path, topology: str, template: str) -> None:
-    """Create an input template in target path with the selected topology.
-
-    Parameters
-    ----------
-    launcher_dwo: Path
-        Dynawo launcher
-    target: Path
-        Target path
-    topology: str
-        Topology to the DYD file
-    template: str
-        Input template name:
-        * 'performance_SM' if it is electrical performance for Synchronous Machine Model
-        * 'performance_PPM' if it is electrical performance for Power Park Module Model
-        * 'performance_BESS' if it is electrical performance for Storage Model
-        * 'model_PPM' if it is model validation for Power Park Module Model
-        * 'model_BESS' if it is model validation for Storage Model
-    """
-
-    if target.exists():
-        dgcv_logging.get_logger("Create Input").error(
-            "The output path already exists, please indicate a new path"
-        )
-        return
-
-    manage_files.create_dir(target)
+def _copy_input_templates(target: Path, template: str) -> None:
     input_templates_path = config.get_value("Global", "input_templates_path")
     if template == "performance_SM":
         manage_files.copy_path(Path(input_templates_path) / "performance/SM", target)
@@ -44,6 +18,8 @@ def create_input_template(launcher_dwo: Path, target: Path, topology: str, templ
     elif template.startswith("model"):
         manage_files.copy_path(Path(input_templates_path) / "model", target)
 
+
+def _create_dyd_template(target: Path, topology: str, template: str) -> None:
     dgcv_logging.get_logger("Create input files").info(f"Creating the input DYD file in {target}.")
     create_producer_dyd_file(target, topology, template)
     input(
@@ -56,6 +32,8 @@ def create_input_template(launcher_dwo: Path, target: Path, topology: str, templ
             "model with a dynamic model. Press Enter when finishing editing."
         )
 
+
+def _create_par_template(launcher_dwo: Path, target: Path, topology: str, template: str) -> None:
     dgcv_logging.get_logger("Create input files").info(f"Creating the input PAR file in {target}.")
     create_producer_par_file(launcher_dwo, target, template)
     input(
@@ -68,6 +46,8 @@ def create_input_template(launcher_dwo: Path, target: Path, topology: str, templ
             "value. Press Enter when finishing editing."
         )
 
+
+def _create_ini_template(target: Path, topology: str, template: str) -> None:
     dgcv_logging.get_logger("Create input files").info(f"Creating the input INI file in {target}.")
     create_producer_ini_file(target, topology, template)
     input(
@@ -80,6 +60,8 @@ def create_input_template(launcher_dwo: Path, target: Path, topology: str, templ
             "value. Press Enter when finishing editing."
         )
 
+
+def _create_curves_template(target: Path, topology: str, template: str) -> None:
     ref_target = target / "ReferenceCurves"
     dgcv_logging.get_logger("Create input files").info(
         f"Creating the reference curves files in {ref_target}."
@@ -94,4 +76,42 @@ def create_input_template(launcher_dwo: Path, target: Path, topology: str, templ
             "Edit the CurvesFiles.ini file is necessary to complete each parameter with a "
             "curves file. Press Enter when finishing editing."
         )
+
+
+def create_input_template(launcher_dwo: Path, target: Path, topology: str, template: str) -> None:
+    """Create an input template in target path with the selected topology.
+
+    Parameters
+    ----------
+    launcher_dwo: Path
+        Dynawo launcher
+    target: Path
+        Target path
+    topology: str
+        Topology to the DYD file
+    template: str
+        Input template name:
+        * 'performance_SM' if it is electrical performance for Synchronous Machine Model
+        * 'performance_PPM' if it is electrical performance for Power Park Module Model
+        * 'performance_BESS' if it is electrical performance for Storage Model
+        * 'model_PPM' if it is model validation for Power Park Module Model
+        * 'model_BESS' if it is model validation for Storage Model
+    """
+
+    if target.exists():
+        dgcv_logging.get_logger("Create Input").error(
+            "The output path already exists, please indicate a new path"
+        )
+        return
+
+    manage_files.create_dir(target)
+    _copy_input_templates(target, template)
+
+    _create_dyd_template(target, topology, template)
+
+    _create_par_template(launcher_dwo, target, topology, template)
+
+    _create_ini_template(target, topology, template)
+
+    _create_curves_template(target, topology, template)
     print("Done")
diff --git a/src/dgcv/files/dynawo_curves_file.py b/src/dgcv/files/dynawo_curves_file.py
index e23b9bc..b2385b8 100644
--- a/src/dgcv/files/dynawo_curves_file.py
+++ b/src/dgcv/files/dynawo_curves_file.py
@@ -13,7 +13,6 @@
 
 from dgcv.configuration.cfg import config
 from dgcv.core.global_variables import (
-    ELECTRIC_PERFORMANCE_PPM,
     ELECTRIC_PERFORMANCE_SM,
     MODEL_VALIDATION_PPM,
 )
diff --git a/src/dgcv/logging/logger.py b/src/dgcv/logging/logger.py
index b730fb2..c9c5541 100644
--- a/src/dgcv/logging/logger.py
+++ b/src/dgcv/logging/logger.py
@@ -9,7 +9,6 @@
 #
 
 import logging
-from logging.handlers import RotatingFileHandler
 from pathlib import Path
 from dgcv.logging.custom_formatter import CustomFormatter
 import colorama
diff --git a/src/dgcv/templates/reports/create_figures.py b/src/dgcv/templates/reports/create_figures.py
index c8a553e..f452ae8 100644
--- a/src/dgcv/templates/reports/create_figures.py
+++ b/src/dgcv/templates/reports/create_figures.py
@@ -10,7 +10,7 @@
 MODEL_VALIDATION_BESS = 11
 
 
-def get_pcs_name(pcs_name, simulation_type):
+def _get_pcs_name(pcs_name, simulation_type):
     pcs = pcs_name.replace("PCS_", "")
     if simulation_type == ELECTRIC_PERFORMANCE_SM:
         return pcs + "SM"
@@ -20,7 +20,7 @@ def get_pcs_name(pcs_name, simulation_type):
     return pcs
 
 
-def get_pcs_figures(pcs):
+def _get_pcs_figures(pcs):
     with open(Path(__file__).parent / "figures.json", "r") as f:
         figures = json.load(f)
 
@@ -30,19 +30,19 @@ def get_pcs_figures(pcs):
     return []
 
 
-def create_pcs_figures(path, pcs):
-    figures = get_pcs_figures(pcs)
+def _create_pcs_figures(path, pcs):
+    figures = _get_pcs_figures(pcs)
     for figure in figures:
         shutil.copy(path / "fig_placeholder.pdf", path / figure)
 
 
 def create_figures(path, pcs_name, simulation_type):
-    pcs = get_pcs_name(pcs_name, simulation_type)
-    create_pcs_figures(path, pcs)
+    pcs = _get_pcs_name(pcs_name, simulation_type)
+    _create_pcs_figures(path, pcs)
 
 
 if __name__ == "__main__":
     source = Path(sys.argv[1])
     target = Path(sys.argv[2])
     pcs = sys.argv[3]
-    create_pcs_figures(source, target, pcs)
+    _create_pcs_figures(source, target, pcs)
diff --git a/src/dgcv/validation/sanity_checks.py b/src/dgcv/validation/sanity_checks.py
index af999c5..38b0ea9 100644
--- a/src/dgcv/validation/sanity_checks.py
+++ b/src/dgcv/validation/sanity_checks.py
@@ -52,6 +52,7 @@ def _check_topology_s(
             "      * 'Synch_Gen' if a synchronous generator is modeled\n"
             "      * 'Wind_Turbine' if a wind turbine or a wind turbine farm is modeled\n"
             "      * 'PV_Array' if a solar panel or a park of solar panels is modeled\n"
+            "      * 'Bess' if a storage or a park of storages is modeled\n"
             "  - A transformer with id 'StepUp_Xfmr' connected between the generator and the PDR "
             "bus\n"
         )
@@ -83,6 +84,7 @@ def _check_topology_si(
             "      * 'Synch_Gen' if a synchronous generator is modeled\n"
             "      * 'Wind_Turbine' if a wind turbine or a wind turbine farm is modeled\n"
             "      * 'PV_Array' if a solar panel or a park of solar panels is modeled\n"
+            "      * 'Bess' if a storage or a park of storages is modeled\n"
             "  - A transformer with id 'StepUp_Xfmr' connected between the generator and the "
             "internal line\n"
             "  - An internal line with id 'IntNetwork_Line' connected between the transformer "
@@ -122,6 +124,7 @@ def _check_topology_saux(
             "      * 'Synch_Gen' if a synchronous generator is modeled\n"
             "      * 'Wind_Turbine' if a wind turbine or a wind turbine farm is modeled\n"
             "      * 'PV_Array' if a solar panel or a park of solar panels is modeled\n"
+            "      * 'Bess' if a storage or a park of storages is modeled\n"
             "  - A transformer with id 'StepUp_Xfmr' connected between the generator and the PDR "
             "bus\n"
             "  - An auxiliary load with id 'auxiliary_load'\n"
@@ -164,6 +167,7 @@ def _check_topology_sauxi(
             "      * 'Synch_Gen' if a synchronous generator is modeled\n"
             "      * 'Wind_Turbine' if a wind turbine or a wind turbine farm is modeled\n"
             "      * 'PV_Array' if a solar panel or a park of solar panels is modeled\n"
+            "      * 'Bess' if a storage or a park of storages is modeled\n"
             "  - A transformer with id 'StepUp_Xfmr' connected between the generator and the "
             "internal bus\n"
             "  - An auxiliary load with id 'auxiliary_load'\n"
@@ -204,9 +208,10 @@ def _check_topology_m(
             "  - Two or more generators, their ids start with:\n"
             "      * 'Wind_Turbine' if a wind turbine or a wind turbine farm is modeled\n"
             "      * 'PV_Array' if a solar panel or a park of solar panels is modeled\n"
+            "      * 'Bess' if a storage or a park of storages is modeled\n"
             "  - A transformer for each generator, its id starts with 'StepUp_Xfmr' and it is "
             "connected between a generator and the internal bus\n"
-            "  - A transformer with id 'transformer' connected between the internal bus and the "
+            "  - A transformer with id 'Main_Xfmr' connected between the internal bus and the "
             "PDR bus\n"
         )
 
@@ -243,9 +248,10 @@ def _check_topology_mi(
             "  - Two or more generators, their ids start with:\n"
             "      * 'Wind_Turbine' if a wind turbine or a wind turbine farm is modeled\n"
             "      * 'PV_Array' if a solar panel or a park of solar panels is modeled\n"
+            "      * 'Bess' if a storage or a park of storages is modeled\n"
             "  - A transformer for each generator, its id starts with 'StepUp_Xfmr' and it is "
             "connected between a generator and the internal bus\n"
-            "  - A transformer with id 'transformer' connected between the internal bus and the "
+            "  - A transformer with id 'Main_Xfmr' connected between the internal bus and the "
             "internal line\n"
             "  - An internal line with id 'IntNetwork_Line' connected between the transformer "
             "with id 'transformer' and the PDR bus\n"
@@ -286,12 +292,13 @@ def _check_topology_maux(
             "  - Two or more generators, their ids start with:\n"
             "      * 'Wind_Turbine' if a wind turbine or a wind turbine farm is modeled\n"
             "      * 'PV_Array' if a solar panel or a park of solar panels is modeled\n"
+            "      * 'Bess' if a storage or a park of storages is modeled\n"
             "  - A transformer for each generator, its id starts with 'StepUp_Xfmr' and it is "
             "connected between a generator and the internal bus\n"
             "  - An auxiliary load with id 'auxiliary_load'\n"
             "  - A transformer with id 'auxiliary_transformer' connected between the auxiliary "
             "load and the internal bus\n"
-            "  - A transformer with id 'transformer' connected between the internal bus and the "
+            "  - A transformer with id 'Main_Xfmr' connected between the internal bus and the "
             "PDR bus\n"
         )
 
@@ -329,12 +336,13 @@ def _check_topology_mauxi(
             "  - Two or more generators, their ids start with:\n"
             "      * 'Wind_Turbine' if a wind turbine or a wind turbine farm is modeled\n"
             "      * 'PV_Array' if a solar panel or a park of solar panels is modeled\n"
+            "      * 'Bess' if a storage or a park of storages is modeled\n"
             "  - A transformer for each generator, its id starts with 'StepUp_Xfmr' and it is "
             "connected between a generator and the internal bus\n"
             "  - An auxiliary load with id 'auxiliary_load'\n"
             "  - A transformer with id 'auxiliary_transformer' connected between the auxiliary "
             "load and the internal bus\n"
-            "  - A transformer with id 'transformer' connected between the internal bus and the "
+            "  - A transformer with id 'Main_Xfmr' connected between the internal bus and the "
             "internal line\n"
             "  - An internal line with id 'IntNetwork_Line' connected between the transformer "
             "with id 'transformer' and the PDR bus\n"
@@ -344,7 +352,7 @@ def _check_topology_mauxi(
 def _is_valid_generator(gen_id, add_sm=True) -> None:
     # The generator id may contain numbered suffixes, for this reason it must be checked if the
     #  substring exists in the identifier
-    gen_types = ["Wind_Turbine", "PV_Array"]
+    gen_types = ["Wind_Turbine", "PV_Array", "Bess"]
     if add_sm:
         gen_types.append("Synch_Gen")
     if any(gen_type in gen_id for gen_type in gen_types):
diff --git a/tests/dgcv/curves/Wind_farm_comtrade_example.cfg b/tests/dgcv/curves/resources/Wind_farm_comtrade_example.cfg
similarity index 100%
rename from tests/dgcv/curves/Wind_farm_comtrade_example.cfg
rename to tests/dgcv/curves/resources/Wind_farm_comtrade_example.cfg
diff --git a/tests/dgcv/curves/Wind_farm_comtrade_example.dat b/tests/dgcv/curves/resources/Wind_farm_comtrade_example.dat
similarity index 100%
rename from tests/dgcv/curves/Wind_farm_comtrade_example.dat
rename to tests/dgcv/curves/resources/Wind_farm_comtrade_example.dat
diff --git a/tests/dgcv/curves/Wind_farm_comtrade_example.dict b/tests/dgcv/curves/resources/Wind_farm_comtrade_example.dict
similarity index 100%
rename from tests/dgcv/curves/Wind_farm_comtrade_example.dict
rename to tests/dgcv/curves/resources/Wind_farm_comtrade_example.dict
diff --git a/tests/dgcv/curves/resources/__init.py b/tests/dgcv/curves/resources/__init.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/dgcv/curves/curves_final.csv b/tests/dgcv/curves/resources/curves_final.csv
similarity index 100%
rename from tests/dgcv/curves/curves_final.csv
rename to tests/dgcv/curves/resources/curves_final.csv
diff --git a/tests/dgcv/curves/curves_final.dict b/tests/dgcv/curves/resources/curves_final.dict
similarity index 100%
rename from tests/dgcv/curves/curves_final.dict
rename to tests/dgcv/curves/resources/curves_final.dict
diff --git a/tests/dgcv/curves/fiche8.dict b/tests/dgcv/curves/resources/fiche8.dict
similarity index 100%
rename from tests/dgcv/curves/fiche8.dict
rename to tests/dgcv/curves/resources/fiche8.dict
diff --git a/tests/dgcv/curves/fiche8.exp b/tests/dgcv/curves/resources/fiche8.exp
similarity index 100%
rename from tests/dgcv/curves/fiche8.exp
rename to tests/dgcv/curves/resources/fiche8.exp
diff --git a/tests/dgcv/curves/test_comtrade.py b/tests/dgcv/curves/test_comtrade.py
index 51bde45..4df8ecb 100644
--- a/tests/dgcv/curves/test_comtrade.py
+++ b/tests/dgcv/curves/test_comtrade.py
@@ -4,9 +4,13 @@
 from dgcv.curves.importer import CurvesImporter
 
 
+def _get_resources_path():
+    return (Path(__file__).resolve().parent) / "resources"
+
+
 def test_comtrade():
-    path = Path(__file__).resolve().parent / "tmp"
-    shutil.copytree(Path(__file__).resolve().parent, path, dirs_exist_ok=True)
+    path = _get_resources_path() / "tmp"
+    shutil.copytree(_get_resources_path(), path, dirs_exist_ok=True)
 
     try:
         importer = CurvesImporter(path, "Wind_farm_comtrade_example")
diff --git a/tests/dgcv/curves/test_csv.py b/tests/dgcv/curves/test_csv.py
index 9c6bc4b..36a02af 100644
--- a/tests/dgcv/curves/test_csv.py
+++ b/tests/dgcv/curves/test_csv.py
@@ -4,10 +4,14 @@
 from dgcv.curves.importer import CurvesImporter
 
 
+def _get_resources_path():
+    return (Path(__file__).resolve().parent) / "resources"
+
+
 def test_csv():
 
-    path = Path(__file__).resolve().parent / "tmp"
-    shutil.copytree(Path(__file__).resolve().parent, path, dirs_exist_ok=True)
+    path = _get_resources_path() / "tmp"
+    shutil.copytree(_get_resources_path(), path, dirs_exist_ok=True)
 
     try:
         importer = CurvesImporter(path, "curves_final")
diff --git a/tests/dgcv/curves/test_eurostag.py b/tests/dgcv/curves/test_eurostag.py
index 8d000a2..4a2e1f1 100644
--- a/tests/dgcv/curves/test_eurostag.py
+++ b/tests/dgcv/curves/test_eurostag.py
@@ -4,10 +4,14 @@
 from dgcv.curves.importer import CurvesImporter
 
 
+def _get_resources_path():
+    return (Path(__file__).resolve().parent) / "resources"
+
+
 def test_eurostag():
 
-    path = Path(__file__).resolve().parent / "tmp"
-    shutil.copytree(Path(__file__).resolve().parent, path, dirs_exist_ok=True)
+    path = _get_resources_path() / "tmp"
+    shutil.copytree(_get_resources_path(), path, dirs_exist_ok=True)
 
     try:
         importer = CurvesImporter(path, "fiche8")
diff --git a/tests/dgcv/files/Producer.dyd b/tests/dgcv/files/resources/Producer.dyd
similarity index 100%
rename from tests/dgcv/files/Producer.dyd
rename to tests/dgcv/files/resources/Producer.dyd
diff --git a/tests/dgcv/files/TSOModel.par b/tests/dgcv/files/resources/TSOModel.par
similarity index 100%
rename from tests/dgcv/files/TSOModel.par
rename to tests/dgcv/files/resources/TSOModel.par
diff --git a/tests/dgcv/files/TableInfiniteBus.txt b/tests/dgcv/files/resources/TableInfiniteBus.txt
similarity index 100%
rename from tests/dgcv/files/TableInfiniteBus.txt
rename to tests/dgcv/files/resources/TableInfiniteBus.txt
diff --git a/tests/dgcv/files/ref/Invalid.par b/tests/dgcv/files/resources/ref/Invalid.par
similarity index 100%
rename from tests/dgcv/files/ref/Invalid.par
rename to tests/dgcv/files/resources/ref/Invalid.par
diff --git a/tests/dgcv/files/ref/MultipleAuxIPPM.dyd b/tests/dgcv/files/resources/ref/MultipleAuxIPPM.dyd
similarity index 100%
rename from tests/dgcv/files/ref/MultipleAuxIPPM.dyd
rename to tests/dgcv/files/resources/ref/MultipleAuxIPPM.dyd
diff --git a/tests/dgcv/files/ref/MultipleAuxPPM.dyd b/tests/dgcv/files/resources/ref/MultipleAuxPPM.dyd
similarity index 100%
rename from tests/dgcv/files/ref/MultipleAuxPPM.dyd
rename to tests/dgcv/files/resources/ref/MultipleAuxPPM.dyd
diff --git a/tests/dgcv/files/ref/MultipleIPPM.dyd b/tests/dgcv/files/resources/ref/MultipleIPPM.dyd
similarity index 100%
rename from tests/dgcv/files/ref/MultipleIPPM.dyd
rename to tests/dgcv/files/resources/ref/MultipleIPPM.dyd
diff --git a/tests/dgcv/files/ref/MultiplePPM.dyd b/tests/dgcv/files/resources/ref/MultiplePPM.dyd
similarity index 100%
rename from tests/dgcv/files/ref/MultiplePPM.dyd
rename to tests/dgcv/files/resources/ref/MultiplePPM.dyd
diff --git a/tests/dgcv/files/ref/Reference.par b/tests/dgcv/files/resources/ref/Reference.par
similarity index 100%
rename from tests/dgcv/files/ref/Reference.par
rename to tests/dgcv/files/resources/ref/Reference.par
diff --git a/tests/dgcv/files/ref/SingleAuxIPPM.dyd b/tests/dgcv/files/resources/ref/SingleAuxIPPM.dyd
similarity index 100%
rename from tests/dgcv/files/ref/SingleAuxIPPM.dyd
rename to tests/dgcv/files/resources/ref/SingleAuxIPPM.dyd
diff --git a/tests/dgcv/files/ref/SingleAuxSM.dyd b/tests/dgcv/files/resources/ref/SingleAuxSM.dyd
similarity index 100%
rename from tests/dgcv/files/ref/SingleAuxSM.dyd
rename to tests/dgcv/files/resources/ref/SingleAuxSM.dyd
diff --git a/tests/dgcv/files/ref/SingleISM.dyd b/tests/dgcv/files/resources/ref/SingleISM.dyd
similarity index 100%
rename from tests/dgcv/files/ref/SingleISM.dyd
rename to tests/dgcv/files/resources/ref/SingleISM.dyd
diff --git a/tests/dgcv/files/ref/SingleSM.dyd b/tests/dgcv/files/resources/ref/SingleSM.dyd
similarity index 100%
rename from tests/dgcv/files/ref/SingleSM.dyd
rename to tests/dgcv/files/resources/ref/SingleSM.dyd
diff --git a/tests/dgcv/files/test_jinja_variables.py b/tests/dgcv/files/test_jinja_variables.py
index 7f6de0f..921d147 100644
--- a/tests/dgcv/files/test_jinja_variables.py
+++ b/tests/dgcv/files/test_jinja_variables.py
@@ -3,8 +3,12 @@
 from dgcv.files.replace_placeholders import get_all_variables
 
 
+def _get_resources_path():
+    return (Path(__file__).resolve().parent) / "resources"
+
+
 def test_par_file():
-    path = Path(__file__).parent
+    path = _get_resources_path()
     variables = get_all_variables(path, "TSOModel.par")
     control_variables = dict.fromkeys(
         {
@@ -34,7 +38,7 @@ def test_par_file():
 
 
 def test_txt_file():
-    path = Path(__file__).parent
+    path = _get_resources_path()
     variables = get_all_variables(path, "TableInfiniteBus.txt")
     control_variables = dict.fromkeys(
         {
diff --git a/tests/dgcv/files/test_producer_files.py b/tests/dgcv/files/test_producer_files.py
index 7c0ded9..956f5a2 100644
--- a/tests/dgcv/files/test_producer_files.py
+++ b/tests/dgcv/files/test_producer_files.py
@@ -5,9 +5,13 @@
 from dgcv.files.producer_par_file import create_producer_par_file
 
 
+def _get_resources_path():
+    return (Path(__file__).resolve().parent) / "resources"
+
+
 def generate_dyd_file(topology, template):
-    path = Path(__file__).resolve().parent / "tmp"
-    shutil.copytree(Path(__file__).resolve().parent, path, dirs_exist_ok=True)
+    path = _get_resources_path() / "tmp"
+    shutil.copytree(_get_resources_path(), path, dirs_exist_ok=True)
 
     content = ""
     try:
@@ -20,8 +24,8 @@ def generate_dyd_file(topology, template):
 
 
 def generate_par_file():
-    path = Path(__file__).resolve().parent / "tmp"
-    shutil.copytree(Path(__file__).resolve().parent, path, dirs_exist_ok=True)
+    path = _get_resources_path() / "tmp"
+    shutil.copytree(_get_resources_path(), path, dirs_exist_ok=True)
 
     content = ""
     try:
@@ -35,7 +39,7 @@ def generate_par_file():
 
 
 def get_reference_content(reference):
-    path = Path(__file__).resolve().parent / "ref"
+    path = _get_resources_path() / "ref"
     with open(path / reference) as f:
         content = f.read()
 
@@ -92,9 +96,9 @@ def test_single_ppm_ko():
     assert get_reference_content("SingleSM.dyd") != generate_dyd_file("S", "performance_PPM")
 
 
-def test_par_file_ok():
+def dynawo_test_par_file_ok():
     assert get_reference_content("Reference.par") == generate_par_file()
 
 
-def test_par_file_ko():
+def dynawo_test_par_file_ko():
     assert get_reference_content("Invalid.par") != generate_par_file()
diff --git a/tests/dgcv/report/__init__.py b/tests/dgcv/report/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/dgcv/report/test_printable.py b/tests/dgcv/report/test_printable.py
new file mode 100644
index 0000000..37a7f99
--- /dev/null
+++ b/tests/dgcv/report/test_printable.py
@@ -0,0 +1,18 @@
+from dgcv.report import printable
+
+
+def test_format_time_error():
+    results = {"test1": 2.468392}
+    value = printable.format_time_error(results, "test1")
+    assert value == f"{2.468392}"
+
+    value = printable.format_time_error(results, "test1", apply_formatter=True)
+    assert value == f"{2.468392:.3g}"
+
+
+def test_format_compound_check():
+    text_value = printable.format_compound_check(True)
+    assert text_value == f"{{ {str(True)} }}"
+
+    text_value = printable.format_compound_check(False)
+    assert text_value == f"\\textcolor{{red}}{{ {str(False)} }}"
diff --git a/tests/dgcv/templates/__init__.py b/tests/dgcv/templates/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/dgcv/templates/reports/__init__.py b/tests/dgcv/templates/reports/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/dgcv/templates/reports/test_create_figures.py b/tests/dgcv/templates/reports/test_create_figures.py
new file mode 100644
index 0000000..86c0156
--- /dev/null
+++ b/tests/dgcv/templates/reports/test_create_figures.py
@@ -0,0 +1,32 @@
+from dgcv.templates.reports import create_figures
+
+
+def test_pcs_name():
+    pcs_names = ["PCS_RTE-I2", "PCS_RTE-I5", "PCS_RTE-I16z1"]
+    simulation_types = [
+        create_figures.ELECTRIC_PERFORMANCE_SM,
+        create_figures.ELECTRIC_PERFORMANCE_PPM,
+        create_figures.MODEL_VALIDATION_PPM,
+    ]
+    expected_ouputs = ["RTE-I2SM", "RTE-I5PPM", "RTE-I16z1"]
+    for pcs_name, simulation_type, expected_ouput in zip(
+        pcs_names, simulation_types, expected_ouputs
+    ):
+        pcs = create_figures._get_pcs_name(pcs_name, simulation_type)
+        assert pcs == expected_ouput
+
+
+def test_figures():
+    figures = create_figures._get_pcs_figures("RTE-I2SM")
+    assert figures == [
+        "fig_P_PCS_RTE-I2.USetPointStep.AReactance.pdf",
+        "fig_P_PCS_RTE-I2.USetPointStep.BReactance.pdf",
+        "fig_Q_PCS_RTE-I2.USetPointStep.AReactance.pdf",
+        "fig_Q_PCS_RTE-I2.USetPointStep.BReactance.pdf",
+        "fig_Ustator_PCS_RTE-I2.USetPointStep.AReactance.pdf",
+        "fig_Ustator_PCS_RTE-I2.USetPointStep.BReactance.pdf",
+        "fig_V_PCS_RTE-I2.USetPointStep.AReactance.pdf",
+        "fig_V_PCS_RTE-I2.USetPointStep.BReactance.pdf",
+        "fig_W_PCS_RTE-I2.USetPointStep.AReactance.pdf",
+        "fig_W_PCS_RTE-I2.USetPointStep.BReactance.pdf",
+    ]
diff --git a/tests/dgcv/test_tool.py b/tests/dgcv/test_tool.py
index 5cdadd6..98f2382 100644
--- a/tests/dgcv/test_tool.py
+++ b/tests/dgcv/test_tool.py
@@ -11,6 +11,13 @@ def _execute_tool(producer_model, producer_curves, reference_curves):
     testpath = Path(__file__).resolve().parent
     output_dir = Path(__file__).resolve().parent / "tmp"
     output_dir.mkdir(exist_ok=True)
+    assert output_dir.exists()
+    if producer_model:
+        assert (testpath / producer_model).exists()
+    if producer_curves:
+        assert (testpath / producer_curves).exists()
+    if reference_curves:
+        assert (testpath / reference_curves).exists()
 
     try:
         config._default_config.set("Dynawo", "simulation_limit", "120")
@@ -31,7 +38,7 @@ def _execute_tool(producer_model, producer_curves, reference_curves):
                 sim_type = 1
 
         ep = Parameters(
-            Path(shutil.which("dynawo.sh")).resolve(),
+            Path(shutil.which("dynawo.sh")).resolve() if shutil.which("dynawo.sh") else None,
             testpath / producer_model if producer_model else None,
             testpath / producer_curves if producer_curves else None,
             testpath / reference_curves if reference_curves else None,
@@ -43,17 +50,15 @@ def _execute_tool(producer_model, producer_curves, reference_curves):
         md = ModelValidation(ep)
 
         compliance = md.validate(True)
-        print(compliance)
-    except Exception:
-        compliance = []
+    except Exception as e:
+        compliance = str(e)
     finally:
         shutil.rmtree(output_dir)
         return compliance
 
 
-def test_perf_sm_model():
+def dynawo_test_perf_sm_model():
     compliance = _execute_tool("../../examples/SM/Dynawo/SingleAux", None, None)
-    print(compliance)
     assert [
         Compliance.NonCompliant,
         Compliance.NonCompliant,
@@ -82,7 +87,7 @@ def test_perf_sm_curves():
     ] == compliance
 
 
-def test_perf_sm_complete():
+def dynawo_test_perf_sm_complete():
     compliance = _execute_tool(
         "../../examples/SM/Dynawo/SingleAuxI", "../../examples/SM/ProducerCurves/", None
     )
@@ -99,7 +104,7 @@ def test_perf_sm_complete():
     ] == compliance
 
 
-def test_perf_ppm_model():
+def dynawo_test_perf_ppm_model():
     compliance = _execute_tool("../../examples/PPM/Dynawo/SingleAux/WECC", None, None)
     assert [
         Compliance.NonCompliant,
@@ -125,7 +130,7 @@ def test_perf_ppm_curves():
     ] == compliance
 
 
-def test_perf_ppm_complete():
+def dynawo_test_perf_ppm_complete():
     compliance = _execute_tool(
         "../../examples/PPM/Dynawo/SingleAux/IEC2020",
         "../../examples/PPM/ProducerCurves/",
@@ -142,7 +147,7 @@ def test_perf_ppm_complete():
     ] == compliance
 
 
-def test_model_validation_wecc_model():
+def dynawo_test_model_validation_wecc_model():
     compliance = _execute_tool(
         "../../examples/Model/Wind/WECC/Dynawo",
         None,
@@ -176,7 +181,7 @@ def test_model_validation_wecc_model():
     ] == compliance
 
 
-def test_model_validation_iec2015_model():
+def dynawo_test_model_validation_iec2015_model():
     compliance = _execute_tool(
         "../../examples/Model/Wind/IEC2015/Dynawo",
         None,
@@ -210,7 +215,7 @@ def test_model_validation_iec2015_model():
     ] == compliance
 
 
-def test_model_validation_iec2020_model():
+def dynawo_test_model_validation_iec2020_model():
     compliance = _execute_tool(
         "../../examples/Model/Wind/IEC2020/Dynawo",
         None,
@@ -346,11 +351,11 @@ def test_model_validation_iec2020_curves():
     ] == compliance
 
 
-def test_model_validation_partial_reference():
+def dynawo_test_model_validation_partial_reference():
     compliance = _execute_tool(
         "../../examples/Model/Wind/WECC/Dynawo",
         None,
-        "../partial_reference_curves",
+        "../resources/partial_reference_curves",
     )
     assert [
         Compliance.NonCompliant,
diff --git a/tests/dgcv/validation/resources/Curves/CurvesFiles.ini b/tests/dgcv/validation/resources/Curves/CurvesFiles.ini
new file mode 100644
index 0000000..e69de29
diff --git a/tests/dgcv/validation/resources/Curves/__init__.py b/tests/dgcv/validation/resources/Curves/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/dgcv/validation/resources/Non-Curves/__init__.py b/tests/dgcv/validation/resources/Non-Curves/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/dgcv/validation/resources/__init__.py b/tests/dgcv/validation/resources/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/dgcv/validation/badformed.xml b/tests/dgcv/validation/resources/badformed.xml
similarity index 100%
rename from tests/dgcv/validation/badformed.xml
rename to tests/dgcv/validation/resources/badformed.xml
diff --git a/tests/dgcv/validation/wellformed.xml b/tests/dgcv/validation/resources/wellformed.xml
similarity index 100%
rename from tests/dgcv/validation/wellformed.xml
rename to tests/dgcv/validation/resources/wellformed.xml
diff --git a/tests/dgcv/validation/test_sanity_checks.py b/tests/dgcv/validation/test_sanity_checks.py
index 6acff3f..37986bb 100644
--- a/tests/dgcv/validation/test_sanity_checks.py
+++ b/tests/dgcv/validation/test_sanity_checks.py
@@ -17,8 +17,12 @@
 from dgcv.validation import sanity_checks
 
 
+def _get_resources_path():
+    return (Path(__file__).resolve().parent) / "resources"
+
+
 def xml_check(xml_filename):
-    sanity_checks.check_well_formed_xml((Path(__file__).resolve().parent) / xml_filename)
+    sanity_checks.check_well_formed_xml(_get_resources_path() / xml_filename)
 
 
 def test_xmls():
@@ -70,6 +74,56 @@ def test_auxiliary_loads():
     )
 
 
+def test_generators():
+    sm = parameters.Gen_params(
+        id=None,
+        lib="GeneratorSynchronousFourWindingsTGov1SexsPss2a",
+        connectedXmfr="",
+        IMax=100.0,
+        par_id="",
+        P=0.1,
+        Q=0.05,
+    )
+    ppm = parameters.Gen_params(
+        id=None,
+        lib="WTG4AWeccCurrentSource",
+        connectedXmfr="",
+        IMax=100.0,
+        par_id="",
+        P=0.1,
+        Q=0.05,
+    )
+    bess = parameters.Gen_params(
+        id=None,
+        lib="BESScbWeccCurrentSource",
+        connectedXmfr="",
+        IMax=100.0,
+        par_id="",
+        P=0.1,
+        Q=0.05,
+    )
+    sm_models, ppm_models, bess_models = sanity_checks.check_generators([sm])
+    assert sm_models == 1
+    assert ppm_models == 0
+    assert bess_models == 0
+    sm_models, ppm_models, bess_models = sanity_checks.check_generators([ppm])
+    assert sm_models == 0
+    assert ppm_models == 1
+    assert bess_models == 0
+    sm_models, ppm_models, bess_models = sanity_checks.check_generators([bess])
+    assert sm_models == 0
+    assert ppm_models == 0
+    assert bess_models == 1
+
+    with pytest.raises(ValueError) as pytest_wrapped_e:
+        sm_models, ppm_models = sanity_checks.check_generators([sm, ppm])
+    assert pytest_wrapped_e.type == ValueError
+    assert (
+        pytest_wrapped_e.value.args[0]
+        == "The supplied network contains two or more different generator model types."
+    )
+
+
 def test_internal_lines():
     line = parameters.Line_params(
         id="Line", lib=None, connectedPdr=True, R=0.02, X=0.004, B=0.0, G=0.0
@@ -86,3 +140,18 @@ def test_internal_lines():
         pytest_wrapped_e.value.args[0]
         == "The reactance and admittance of the internal line must be greater than zero."
     )
+
+
+def test_launchers():
+    with pytest.raises(OSError) as pytest_wrapped_e:
+        sanity_checks.check_launchers("dynawo.sh")
+    assert pytest_wrapped_e.type == OSError
+    assert pytest_wrapped_e.value.args[0] == "Dynawo not found.\nPdfLatex not found.\n"
+
+
+def test_curves_file():
+    sanity_checks.check_curves_files(None, _get_resources_path() / "Curves", "")
+
+    with pytest.raises(FileNotFoundError) as pytest_wrapped_e:
+        sanity_checks.check_curves_files(None, _get_resources_path() / "Non-Curves", "")
+    assert pytest_wrapped_e.type == FileNotFoundError
diff --git a/tests/dgcv/validation/test_topologies.py b/tests/dgcv/validation/test_topologies.py
new file mode 100644
index 0000000..40f2b00
--- /dev/null
+++ b/tests/dgcv/validation/test_topologies.py
@@ -0,0 +1,338 @@
+from dgcv.model import parameters
+from dgcv.validation import sanity_checks
+
+
+def test_check_topology_s():
+    generators = [
+        parameters.Gen_params(
+            id="Synch_Gen",
+            lib="GeneratorSynchronousFourWindingsTGov1SexsPss2a",
+            connectedXmfr="",
+            IMax=100.0,
+            par_id="",
+            P=0.1,
+            Q=0.05,
+        )
+    ]
+    transformers = [
+        parameters.Xfmr_params(
+            id="StepUp_Xfmr", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+        )
+    ]
+    auxiliary_load = None
+    auxiliary_transformer = None
+    transformer = None
+    internal_line = None
+    sanity_checks.check_topology(
+        "S",
+        generators,
+        transformers,
+        auxiliary_load,
+        auxiliary_transformer,
+        transformer,
+        internal_line,
+    )
+
+
+def test_check_topology_si():
+    generators = [
+        parameters.Gen_params(
+            id="Synch_Gen",
+            lib="GeneratorSynchronousFourWindingsTGov1SexsPss2a",
+            connectedXmfr="",
+            IMax=100.0,
+            par_id="",
+            P=0.1,
+            Q=0.05,
+        )
+    ]
+    transformers = [
+        parameters.Xfmr_params(
+            id="StepUp_Xfmr", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+        )
+    ]
+    auxiliary_load = None
+    auxiliary_transformer = None
+    transformer = None
+    internal_line = parameters.Line_params(
+        id="IntNetwork_Line", lib=None, connectedPdr=None, R=0.01, X=0.01, B=0.1, G=0.3
+    )
+    sanity_checks.check_topology(
+        "S+i",
+        generators,
+        transformers,
+        auxiliary_load,
+        auxiliary_transformer,
+        transformer,
+        internal_line,
+    )
+
+
+def test_check_topology_saux():
+    generators = [
+        parameters.Gen_params(
+            id="Synch_Gen",
+            lib="GeneratorSynchronousFourWindingsTGov1SexsPss2a",
+            connectedXmfr="",
+            IMax=100.0,
+            par_id="",
+            P=0.1,
+            Q=0.05,
+        )
+    ]
+    transformers = [
+        parameters.Xfmr_params(
+            id="StepUp_Xfmr", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+        )
+    ]
+    auxiliary_load = parameters.Load_params(
+        id="Aux_Load", lib=None, connectedXmfr="", P=0.1, Q=0.05, U=1.0, UPhase=0.0
+    )
+    auxiliary_transformer = parameters.Xfmr_params(
+        id="AuxLoad_Xfmr", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+    )
+    transformer = None
+    internal_line = None
+    sanity_checks.check_topology(
+        "S+Aux",
+        generators,
+        transformers,
+        auxiliary_load,
+        auxiliary_transformer,
+        transformer,
+        internal_line,
+    )
+
+
+def test_check_topology_sauxi():
+    generators = [
+        parameters.Gen_params(
+            id="Synch_Gen",
+            lib="GeneratorSynchronousFourWindingsTGov1SexsPss2a",
+            connectedXmfr="",
+            IMax=100.0,
+            par_id="",
+            P=0.1,
+            Q=0.05,
+        )
+    ]
+    transformers = [
+        parameters.Xfmr_params(
+            id="StepUp_Xfmr", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+        )
+    ]
+    auxiliary_load = parameters.Load_params(
+        id="Aux_Load", lib=None, connectedXmfr="", P=0.1, Q=0.05, U=1.0, UPhase=0.0
+    )
+    auxiliary_transformer = parameters.Xfmr_params(
+        id="AuxLoad_Xfmr", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+    )
+    transformer = None
+    internal_line = parameters.Line_params(
+        id="IntNetwork_Line", lib=None, connectedPdr=None, R=0.01, X=0.01, B=0.1, G=0.3
+    )
+    sanity_checks.check_topology(
+        "S+Aux+i",
+        generators,
+        transformers,
+        auxiliary_load,
+        auxiliary_transformer,
+        transformer,
+        internal_line,
+    )
+
+
+def test_check_topology_m():
+    generators = [
+        parameters.Gen_params(
+            id="Wind_Turbine1",
+            lib="WTG4AWeccCurrentSource",
+            connectedXmfr="",
+            IMax=100.0,
+            par_id="",
+            P=0.1,
+            Q=0.05,
+        ),
+        parameters.Gen_params(
+            id="Wind_Turbine2",
+            lib="WTG4AWeccCurrentSource",
+            connectedXmfr="",
+            IMax=120.0,
+            par_id="",
+            P=0.12,
+            Q=0.025,
+        ),
+    ]
+    transformers = [
+        parameters.Xfmr_params(
+            id="StepUp_Xfmr1", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+        ),
+        parameters.Xfmr_params(
+            id="StepUp_Xfmr2", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+        ),
+    ]
+    auxiliary_load = None
+    auxiliary_transformer = None
+    transformer = parameters.Xfmr_params(
+        id="Main_Xfmr", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+    )
+    internal_line = None
+    sanity_checks.check_topology(
+        "M",
+        generators,
+        transformers,
+        auxiliary_load,
+        auxiliary_transformer,
+        transformer,
+        internal_line,
+    )
+
+
+def test_check_topology_mi():
+    generators = [
+        parameters.Gen_params(
+            id="Wind_Turbine1",
+            lib="WTG4AWeccCurrentSource",
+            connectedXmfr="",
+            IMax=100.0,
+            par_id="",
+            P=0.1,
+            Q=0.05,
+        ),
+        parameters.Gen_params(
+            id="Wind_Turbine2",
+            lib="WTG4AWeccCurrentSource",
+            connectedXmfr="",
+            IMax=120.0,
+            par_id="",
+            P=0.12,
+            Q=0.025,
+        ),
+    ]
+    transformers = [
+        parameters.Xfmr_params(
+            id="StepUp_Xfmr1", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+        ),
+        parameters.Xfmr_params(
+            id="StepUp_Xfmr2", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+        ),
+    ]
+    auxiliary_load = None
+    auxiliary_transformer = None
+    transformer = parameters.Xfmr_params(
+        id="Main_Xfmr", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+    )
+    internal_line = parameters.Line_params(
+        id="IntNetwork_Line", lib=None, connectedPdr=None, R=0.01, X=0.01, B=0.1, G=0.3
+    )
+    sanity_checks.check_topology(
+        "M+i",
+        generators,
+        transformers,
+        auxiliary_load,
+        auxiliary_transformer,
+        transformer,
+        internal_line,
+    )
+
+
+def test_check_topology_maux():
+    generators = [
+        parameters.Gen_params(
+            id="Wind_Turbine1",
+            lib="WTG4AWeccCurrentSource",
+            connectedXmfr="",
+            IMax=100.0,
+            par_id="",
+            P=0.1,
+            Q=0.05,
+        ),
+        parameters.Gen_params(
+            id="Wind_Turbine2",
+            lib="WTG4AWeccCurrentSource",
+            connectedXmfr="",
+            IMax=120.0,
+            par_id="",
+            P=0.12,
+            Q=0.025,
+        ),
+    ]
+    transformers = [
+        parameters.Xfmr_params(
+            id="StepUp_Xfmr1", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+        ),
+        parameters.Xfmr_params(
+            id="StepUp_Xfmr2", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+        ),
+    ]
+    auxiliary_load = parameters.Load_params(
+        id="Aux_Load", lib=None, connectedXmfr="", P=0.1, Q=0.05, U=1.0, UPhase=0.0
+    )
+    auxiliary_transformer = parameters.Xfmr_params(
+        id="AuxLoad_Xfmr", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+    )
+    transformer = parameters.Xfmr_params(
+        id="Main_Xfmr", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+    )
+    internal_line = None
+    sanity_checks.check_topology(
+        "M+Aux",
+        generators,
+        transformers,
+        auxiliary_load,
+        auxiliary_transformer,
+        transformer,
+        internal_line,
+    )
+
+
+def test_check_topology_mauxi():
+    generators = [
+        parameters.Gen_params(
+            id="Wind_Turbine1",
+            lib="WTG4AWeccCurrentSource",
+            connectedXmfr="",
+            IMax=100.0,
+            par_id="",
+            P=0.1,
+            Q=0.05,
+        ),
+        parameters.Gen_params(
+            id="Wind_Turbine2",
+            lib="WTG4AWeccCurrentSource",
+            connectedXmfr="",
+            IMax=120.0,
+            par_id="",
+            P=0.12,
+            Q=0.025,
+        ),
+    ]
+    transformers = [
+        parameters.Xfmr_params(
+            id="StepUp_Xfmr1", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+        ),
+        parameters.Xfmr_params(
+            id="StepUp_Xfmr2", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+        ),
+    ]
+    auxiliary_load = parameters.Load_params(
+        id="Aux_Load", lib=None, connectedXmfr="", P=0.1, Q=0.05, U=1.0, UPhase=0.0
+    )
+    auxiliary_transformer = parameters.Xfmr_params(
+        id="AuxLoad_Xfmr", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+    )
+    transformer = parameters.Xfmr_params(
+        id="Main_Xfmr", lib=None, R=0.0003, X=0.0268, B=0.0, G=0.0, rTfo=0.9574, par_id=""
+    )
+    internal_line = parameters.Line_params(
+        id="IntNetwork_Line", lib=None, connectedPdr=None, R=0.01, X=0.01, B=0.1, G=0.3
+    )
+    sanity_checks.check_topology(
+        "M+Aux+i",
+        generators,
+        transformers,
+        auxiliary_load,
+        auxiliary_transformer,
+        transformer,
+        internal_line,
+    )
diff --git a/tests/partial_reference_curves/CurvesFiles.ini b/tests/resources/partial_reference_curves/CurvesFiles.ini
similarity index 100%
rename from tests/partial_reference_curves/CurvesFiles.ini
rename to tests/resources/partial_reference_curves/CurvesFiles.ini
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.GridVoltageStep.Drop.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.GridVoltageStep.Drop.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.GridVoltageStep.Drop.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.GridVoltageStep.Drop.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.GridVoltageStep.Drop.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.GridVoltageStep.Drop.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.GridVoltageStep.Drop.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.GridVoltageStep.Drop.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.GridVoltageStep.Rise.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.GridVoltageStep.Rise.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.GridVoltageStep.Rise.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.GridVoltageStep.Rise.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.GridVoltageStep.Rise.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.GridVoltageStep.Rise.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.GridVoltageStep.Rise.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.GridVoltageStep.Rise.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Active.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Active.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Active.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Active.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Active.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Active.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Active.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Active.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Reactive.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Reactive.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Reactive.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Reactive.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Reactive.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Reactive.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Reactive.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Reactive.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Voltage.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Voltage.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Voltage.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Voltage.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Voltage.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Voltage.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Voltage.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.SetPointStep.Voltage.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.PermanentBolted.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.PermanentHiZ.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR10.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientBoltedSCR3Qmin.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc500.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z1.ThreePhaseFault.TransientHiZTc800.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.GridVoltageDip.Qzero.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.GridVoltageDip.Qzero.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.GridVoltageDip.Qzero.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.GridVoltageDip.Qzero.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.GridVoltageDip.Qzero.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.GridVoltageDip.Qzero.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.GridVoltageDip.Qzero.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.GridVoltageDip.Qzero.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.GridVoltageSwell.QMax.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.GridVoltageSwell.QMax.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.GridVoltageSwell.QMax.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.GridVoltageSwell.QMax.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.GridVoltageSwell.QMax.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.GridVoltageSwell.QMax.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.GridVoltageSwell.QMax.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.GridVoltageSwell.QMax.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.GridVoltageSwell.QMin.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.GridVoltageSwell.QMin.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.GridVoltageSwell.QMin.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.GridVoltageSwell.QMin.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.GridVoltageSwell.QMin.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.GridVoltageSwell.QMin.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.GridVoltageSwell.QMin.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.GridVoltageSwell.QMin.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.PSetPointStep.Dec40.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.PSetPointStep.Dec40.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.PSetPointStep.Dec40.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.PSetPointStep.Dec40.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.PSetPointStep.Dec40.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.PSetPointStep.Dec40.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.PSetPointStep.Dec40.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.PSetPointStep.Dec40.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.PSetPointStep.Inc40.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.PSetPointStep.Inc40.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.PSetPointStep.Inc40.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.PSetPointStep.Inc40.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.PSetPointStep.Inc40.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.PSetPointStep.Inc40.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.PSetPointStep.Inc40.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.PSetPointStep.Inc40.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.QSetPointStep.Dec20.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.QSetPointStep.Dec20.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.QSetPointStep.Dec20.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.QSetPointStep.Dec20.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.QSetPointStep.Dec20.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.QSetPointStep.Dec20.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.QSetPointStep.Dec20.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.QSetPointStep.Dec20.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.QSetPointStep.Inc10.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.QSetPointStep.Inc10.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.QSetPointStep.Inc10.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.QSetPointStep.Inc10.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.QSetPointStep.Inc10.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.QSetPointStep.Inc10.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.QSetPointStep.Inc10.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.QSetPointStep.Inc10.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.ThreePhaseFault.TransientBolted.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.USetPointStep.AReactance.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.USetPointStep.AReactance.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.USetPointStep.AReactance.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.USetPointStep.AReactance.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.USetPointStep.AReactance.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.USetPointStep.AReactance.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.USetPointStep.AReactance.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.USetPointStep.AReactance.dict
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.USetPointStep.BReactance.csv b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.USetPointStep.BReactance.csv
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.USetPointStep.BReactance.csv
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.USetPointStep.BReactance.csv
diff --git a/tests/partial_reference_curves/PCS_RTE-I16z3.USetPointStep.BReactance.dict b/tests/resources/partial_reference_curves/PCS_RTE-I16z3.USetPointStep.BReactance.dict
similarity index 100%
rename from tests/partial_reference_curves/PCS_RTE-I16z3.USetPointStep.BReactance.dict
rename to tests/resources/partial_reference_curves/PCS_RTE-I16z3.USetPointStep.BReactance.dict