diff --git a/doc/engineering-reference/src/simulation-models-encyclopedic-reference-002/air-system-compound-component-groups.tex b/doc/engineering-reference/src/simulation-models-encyclopedic-reference-002/air-system-compound-component-groups.tex
index 135883736bb..da6b5eebf2f 100644
--- a/doc/engineering-reference/src/simulation-models-encyclopedic-reference-002/air-system-compound-component-groups.tex
+++ b/doc/engineering-reference/src/simulation-models-encyclopedic-reference-002/air-system-compound-component-groups.tex
@@ -2887,13 +2887,13 @@ \subsubsection{Final Calculation of Load and Energy, Power and Electricity, and
 EIRFPLR = {f(PLR_{operating})}
 \end{equation}
 \begin{equation}
-Power = \frac{\dot{Q}_{avail}}{COP_{ref}} \times EIRFT \times EIRFPLR \times Multipler_{heating,\; power} \times CyclingRatio
+Power = \frac{\dot{Q}_{load}}{COP_{ref}} \times EIRFT \times EIRFPLR \times Multipler_{heating,\; power} \times CyclingRatio
 \end{equation}
 \begin{equation}
 Energy = Power \times TimeStepInSeconds
 \end{equation}
 \begin{equation}
-{\dot{Q}_{source} = (\dot{Q}_{avail} \pm Power) \times PLR_{operating}}
+{\dot{Q}_{source} = (\dot{Q}_{load} \pm Power) \times CyclingRatio}
 \end{equation}
 \begin{equation}
 T{out,\;source} = T_{in,\;source} \pm \frac{\dot{Q}_{source}}{\dot{m}_{source} \times C_{p,\;source}}
diff --git a/src/EnergyPlus/PlantLoopHeatPumpEIR.cc b/src/EnergyPlus/PlantLoopHeatPumpEIR.cc
index 240932ea418..815735f5c38 100644
--- a/src/EnergyPlus/PlantLoopHeatPumpEIR.cc
+++ b/src/EnergyPlus/PlantLoopHeatPumpEIR.cc
@@ -567,7 +567,7 @@ void EIRPlantLoopHeatPump::doPhysics(EnergyPlusData &state, Real64 currentLoad)
     }
 
     this->powerUsage =
-        (availableCapacity / this->referenceCOP) * eirModifierFuncPLR * eirModifierFuncTemp * InputPowerMultiplier * this->cyclingRatio;
+        (this->loadSideHeatTransfer / this->referenceCOP) * eirModifierFuncPLR * eirModifierFuncTemp * InputPowerMultiplier * this->cyclingRatio;
     this->powerEnergy = this->powerUsage * reportingInterval;
 
     // energy balance on heat pump
diff --git a/testfiles/PlantLoopHeatPump_EIR_AirSource.idf b/testfiles/PlantLoopHeatPump_EIR_AirSource.idf
index 69c67bc3788..f0040ee733c 100644
--- a/testfiles/PlantLoopHeatPump_EIR_AirSource.idf
+++ b/testfiles/PlantLoopHeatPump_EIR_AirSource.idf
@@ -313,8 +313,8 @@
 
   Curve:Quadratic,
     EIRCurveFuncPLR,         !- Name
-    0.0,                     !- Coefficient1 Constant
-    1.0,                     !- Coefficient2 x
+    1.0,                     !- Coefficient1 Constant
+    0.0,                     !- Coefficient2 x
     0.0,                     !- Coefficient3 x**2
     0.0,                     !- Minimum Value of x
     1.0;                     !- Maximum Value of x
@@ -472,8 +472,8 @@
 
   Curve:Quadratic,
     EIRCurveFuncPLR2,        !- Name
-    0.0,                     !- Coefficient1 Constant
-    1.0,                     !- Coefficient2 x
+    1.0,                     !- Coefficient1 Constant
+    0.0,                     !- Coefficient2 x
     0.0,                     !- Coefficient3 x**2
     0.0,                     !- Minimum Value of x
     1.0;                     !- Maximum Value of x
diff --git a/testfiles/PlantLoopHeatPump_EIR_Large-Office-2-AWHP-DedHR-AuxBoiler-Pri-Sec-HW.idf b/testfiles/PlantLoopHeatPump_EIR_Large-Office-2-AWHP-DedHR-AuxBoiler-Pri-Sec-HW.idf
index 2f6a92e1738..4e514770619 100644
--- a/testfiles/PlantLoopHeatPump_EIR_Large-Office-2-AWHP-DedHR-AuxBoiler-Pri-Sec-HW.idf
+++ b/testfiles/PlantLoopHeatPump_EIR_Large-Office-2-AWHP-DedHR-AuxBoiler-Pri-Sec-HW.idf
@@ -211,7 +211,9 @@
 
   ConvergenceLimits,
     2,                       !- Minimum System Timestep {minutes}
-    25;                      !- Maximum HVAC Iterations
+    25,                      !- Maximum HVAC Iterations
+    4,                       !- Minimum Plant Iterations
+    12;                      !- Maximum Plant Iterations
 
   ShadowCalculation,
     PolygonClipping,
@@ -10300,8 +10302,8 @@ Curve:Biquadratic,
 
   Curve:Quadratic,
     EIRCurveFuncPLR,         !- Name
-    0.0,                     !- Coefficient1 Constant
-    1.0,                     !- Coefficient2 x
+    1.0,                     !- Coefficient1 Constant
+    0.0,                     !- Coefficient2 x
     0.0,                     !- Coefficient3 x**2
     0.0,                     !- Minimum Value of x
     1.0;                     !- Maximum Value of x
@@ -10662,8 +10664,8 @@ Curve:Biquadratic,
 
   Curve:Quadratic,
     EIRCurveFuncPLR2,        !- Name
-    0.0,                     !- Coefficient1 Constant
-    1.0,                     !- Coefficient2 x
+    1.0,                     !- Coefficient1 Constant
+    0.0,                     !- Coefficient2 x
     0.0,                     !- Coefficient3 x**2
     0.0,                     !- Minimum Value of x
     1.0;                     !- Maximum Value of x
diff --git a/testfiles/PlantLoopHeatPump_EIR_LargeOffice-2-AWHP-AuxBoiler-Pri-Sec-4PipeBeam.idf b/testfiles/PlantLoopHeatPump_EIR_LargeOffice-2-AWHP-AuxBoiler-Pri-Sec-4PipeBeam.idf
index 10c69bc7908..0530ea6024c 100644
--- a/testfiles/PlantLoopHeatPump_EIR_LargeOffice-2-AWHP-AuxBoiler-Pri-Sec-4PipeBeam.idf
+++ b/testfiles/PlantLoopHeatPump_EIR_LargeOffice-2-AWHP-AuxBoiler-Pri-Sec-4PipeBeam.idf
@@ -209,7 +209,9 @@
 
   ConvergenceLimits,
     2,                       !- Minimum System Timestep {minutes}
-    25;                      !- Maximum HVAC Iterations
+    25,                      !- Maximum HVAC Iterations
+    4,                       !- Minimum Plant Iterations
+    12;                      !- Maximum Plant Iterations
 
   ShadowCalculation,
     PolygonClipping,         !- Shading Calculation Method
@@ -8645,8 +8647,8 @@ Curve:Biquadratic,
 
   Curve:Quadratic,
     EIRCurveFuncPLR,         !- Name
-    0.0,                     !- Coefficient1 Constant
-    1.0,                     !- Coefficient2 x
+    1.0,                     !- Coefficient1 Constant
+    0.0,                     !- Coefficient2 x
     0.0,                     !- Coefficient3 x**2
     0.0,                     !- Minimum Value of x
     1.0;                     !- Maximum Value of x
diff --git a/testfiles/PlantLoopHeatPump_EIR_WaterSource.idf b/testfiles/PlantLoopHeatPump_EIR_WaterSource.idf
index 966b9f4160d..ab2c0eae4ee 100644
--- a/testfiles/PlantLoopHeatPump_EIR_WaterSource.idf
+++ b/testfiles/PlantLoopHeatPump_EIR_WaterSource.idf
@@ -313,8 +313,8 @@
 
   Curve:Quadratic,
     EIRCurveFuncPLR,         !- Name
-    0.0,                     !- Coefficient1 Constant
-    1.0,                     !- Coefficient2 x
+    1.0,                     !- Coefficient1 Constant
+    0.0,                     !- Coefficient2 x
     0.0,                     !- Coefficient3 x**2
     0.0,                     !- Minimum Value of x
     1.0;                     !- Maximum Value of x
@@ -472,8 +472,8 @@
 
   Curve:Quadratic,
     EIRCurveFuncPLR2,        !- Name
-    0.0,                     !- Coefficient1 Constant
-    1.0,                     !- Coefficient2 x
+    1.0,                     !- Coefficient1 Constant
+    0.0,                     !- Coefficient2 x
     0.0,                     !- Coefficient3 x**2
     0.0,                     !- Minimum Value of x
     1.0;                     !- Maximum Value of x
diff --git a/tst/EnergyPlus/unit/PlantLoopHeatPumpEIR.unit.cc b/tst/EnergyPlus/unit/PlantLoopHeatPumpEIR.unit.cc
index fb56831ff24..d8296ee0b0e 100644
--- a/tst/EnergyPlus/unit/PlantLoopHeatPumpEIR.unit.cc
+++ b/tst/EnergyPlus/unit/PlantLoopHeatPumpEIR.unit.cc
@@ -2810,10 +2810,10 @@ TEST_F(EnergyPlusFixture, Test_DoPhysics)
                                                       "  Dimensionless;",
                                                       "Curve:Quadratic,",
                                                       "  EIRCurveFuncPLR,",
-                                                      "  0.0,",
                                                       "  1.0,",
                                                       "  0.0,",
                                                       "  0.0,",
+                                                      "  0.0,",
                                                       "  1.0;"});
 
     ASSERT_TRUE(process_idf(idf_objects));
@@ -3237,10 +3237,10 @@ TEST_F(EnergyPlusFixture, Test_Curve_Negative_Energy)
                                                       "  Dimensionless;",
                                                       "Curve:Quadratic,",
                                                       "  EIRCurveFuncPLR,",
-                                                      "  0.0,",
                                                       "  1.0,",
                                                       "  0.0,",
                                                       "  0.0,",
+                                                      "  0.0,",
                                                       "  1.0;"
                                                       "Curve:Quadratic,",
                                                       "  badEIRCurveFuncPLR,",