diff --git a/dumux/discretization/staggered/freeflow/fourierslaw.hh b/dumux/discretization/staggered/freeflow/fourierslaw.hh
index 17f569d9522b3e52190f3d3855198ea796f53854..8fa97120606cd589b896c1a3c4ae6f296e33b618 100644
--- a/dumux/discretization/staggered/freeflow/fourierslaw.hh
+++ b/dumux/discretization/staggered/freeflow/fourierslaw.hh
@@ -41,7 +41,7 @@ class FouriersLawImplementation;
  * \brief Specialization of Fourier's Law for the staggered free flow method.
  */
 template <class TypeTag>
-class FouriersLawImplementation<TypeTag, DiscretizationMethod::staggered >
+class FouriersLawImplementation<TypeTag, DiscretizationMethod::staggered>
 {
     using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
     using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
@@ -51,8 +51,6 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethod::staggered >
     using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity;
     using Indices = typename GET_PROP_TYPE(TypeTag, ModelTraits)::Indices;
 
-    enum { energyBalanceIdx = Indices::energyBalanceIdx };
-
 public:
     // state the discretization method this implementation belongs to
     static const DiscretizationMethod discMethod = DiscretizationMethod::staggered;
@@ -72,7 +70,7 @@ public:
         Scalar flux(0.0);
 
         // conductive energy flux is zero for outflow boundary conditions
-        if (scvf.boundary() && problem.boundaryTypes(element, scvf).isOutflow(Indices::energyBalanceIdx))
+        if (scvf.boundary() && problem.boundaryTypes(element, scvf).isOutflow(Indices::energyEqIdx))
             return flux;
 
         const auto& insideScv = fvGeometry.scv(scvf.insideScvIdx());
diff --git a/dumux/freeflow/nonisothermal/indices.hh b/dumux/freeflow/nonisothermal/indices.hh
index 42d9edf3649d4616fa14ab22c13ef8729bb087e7..653331d1d31782fd414cca215b39f82350bbc34e 100644
--- a/dumux/freeflow/nonisothermal/indices.hh
+++ b/dumux/freeflow/nonisothermal/indices.hh
@@ -37,7 +37,7 @@ template <class IsothermalIndices, int numEq>
 class FreeflowNonIsothermalIndices : public IsothermalIndices
 {
 public:
-    static constexpr int energyBalanceIdx = numEq - 1;
+    static constexpr int energyEqIdx = numEq - 1;
     static constexpr int temperatureIdx = numEq - 1;
 };
 
diff --git a/dumux/freeflow/rans/twoeq/kepsilon/problem.hh b/dumux/freeflow/rans/twoeq/kepsilon/problem.hh
index c1b2bde7a231a22945fe5923c5599bc1c3f52113..7ff5f2d53b75935afd0c2f5ffa7baf66d411c720 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/problem.hh
+++ b/dumux/freeflow/rans/twoeq/kepsilon/problem.hh
@@ -428,7 +428,7 @@ public:
                                * elemVolVars[scvf.insideScvIdx()].density()
                                * elemVolVars[scvf.insideScvIdx()].heatCapacity()
                                / elemVolVars[scvf.insideScvIdx()].thermalConductivity();
-        wallFunctionFlux[Indices::energyBalanceIdx - cellCenterOffset] +=
+        wallFunctionFlux[Indices::energyEqIdx - cellCenterOffset] +=
             -1.0 * (asImp_().dirichlet(element, scvf)[Indices::temperatureIdx]
                     - elemVolVars[scvf.insideScvIdx()].temperature())
             * elemVolVars[scvf.insideScvIdx()].density()
diff --git a/test/freeflow/navierstokes/channeltestproblem.hh b/test/freeflow/navierstokes/channeltestproblem.hh
index 5bd7094cbd33388be398af85e9a98cbd51cdb6c2..36cd9aa48e37e9811a627330f9e0e5874ba48b3e 100644
--- a/test/freeflow/navierstokes/channeltestproblem.hh
+++ b/test/freeflow/navierstokes/channeltestproblem.hh
@@ -157,7 +157,7 @@ public:
         {
             values.setDirichlet(Indices::pressureIdx);
 #if NONISOTHERMAL
-            values.setOutflow(Indices::energyBalanceIdx);
+            values.setOutflow(Indices::energyEqIdx);
 #endif
         }
         else
@@ -165,7 +165,7 @@ public:
             values.setDirichlet(Indices::velocityXIdx);
             values.setDirichlet(Indices::velocityYIdx);
 #if NONISOTHERMAL
-            values.setNeumann(Indices::energyBalanceIdx);
+            values.setNeumann(Indices::energyEqIdx);
 #endif
         }
 
diff --git a/test/freeflow/navierstokesnc/channeltestproblem.hh b/test/freeflow/navierstokesnc/channeltestproblem.hh
index 5d02ca23d59b8557ed7e316bc77321817dab52da..cb37248a958fa851414fcab9623a6c7a69b1ffbc 100644
--- a/test/freeflow/navierstokesnc/channeltestproblem.hh
+++ b/test/freeflow/navierstokesnc/channeltestproblem.hh
@@ -176,7 +176,7 @@ public:
             values.setDirichlet(Indices::pressureIdx);
             values.setOutflow(transportEqIdx);
 #if NONISOTHERMAL
-            values.setOutflow(Indices::energyBalanceIdx);
+            values.setOutflow(Indices::energyEqIdx);
 #endif
         }
         else
@@ -187,7 +187,7 @@ public:
             values.setNeumann(Indices::conti0EqIdx);
             values.setNeumann(transportEqIdx);
 #if NONISOTHERMAL
-            values.setNeumann(Indices::energyBalanceIdx);
+            values.setNeumann(Indices::energyEqIdx);
 #endif
         }
 
diff --git a/test/freeflow/rans/pipelauferproblem.hh b/test/freeflow/rans/pipelauferproblem.hh
index f867489324aebf34098f965c23058318c4b55878..0670ffdd782bdb2d9ab45469f1ed6592157c965e 100644
--- a/test/freeflow/rans/pipelauferproblem.hh
+++ b/test/freeflow/rans/pipelauferproblem.hh
@@ -237,7 +237,7 @@ public:
             values.setDirichlet(Indices::pressureIdx);
 
 #if NONISOTHERMAL
-            values.setOutflow(Indices::energyBalanceIdx);
+            values.setOutflow(Indices::energyEqIdx);
 #endif
 
 #if LOWREKEPSILON || KEPSILON || KOMEGA
diff --git a/test/freeflow/ransnc/flatplatetestproblem.hh b/test/freeflow/ransnc/flatplatetestproblem.hh
index 116d31324216e827650009794c5e79e30732c58e..652983948fafe93131f6904d8750540f7a5f5957 100644
--- a/test/freeflow/ransnc/flatplatetestproblem.hh
+++ b/test/freeflow/ransnc/flatplatetestproblem.hh
@@ -255,7 +255,7 @@ public:
             values.setOutflow(transportEqIdx);
 
 #if NONISOTHERMAL
-            values.setOutflow(Indices::energyBalanceIdx);
+            values.setOutflow(Indices::energyEqIdx);
 #endif
 
 #if KEPSILON || KOMEGA || LOWREKEPSILON
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/stokesproblem.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/stokesproblem.hh
index 587b0ed22498894dfb3a70954638a8cde661fb06..be1585920757bf14cc5df9505bc6345cef1f670f 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/stokesproblem.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/stokesproblem.hh
@@ -162,7 +162,7 @@ public:
         const auto& globalPos = scvf.center();
 
 #if NONISOTHERMAL
-            values.setNeumann(Indices::energyBalanceIdx);
+            values.setNeumann(Indices::energyEqIdx);
 #endif
 
         if (onUpperBoundary_(globalPos) || onLeftBoundary_(globalPos))
@@ -179,7 +179,7 @@ public:
             values.setOutflow(Indices::conti0EqIdx + 1);
 
 #if NONISOTHERMAL
-            values.setOutflow(Indices::energyBalanceIdx);
+            values.setOutflow(Indices::energyEqIdx);
 #endif
         }
 
@@ -239,7 +239,7 @@ public:
             values[Indices::conti0EqIdx] = -xVelocity * density * (1.0 - refMoleFrac());
 
 #if NONISOTHERMAL
-            values[Indices::energyBalanceIdx] = -xVelocity * fluidState.density(0) * fluidState.enthalpy(0);
+            values[Indices::energyEqIdx] = -xVelocity * fluidState.density(0) * fluidState.enthalpy(0);
 #endif
         }
 
@@ -252,7 +252,7 @@ public:
             values[Indices::conti0EqIdx + 1] = massFlux[1];
 
 #if NONISOTHERMAL
-            values[Indices::energyBalanceIdx] = couplingManager().couplingData().energyCouplingCondition(fvGeometry, elemVolVars, elemFaceVars, scvf, diffCoeffAvgType_);
+            values[Indices::energyEqIdx] = couplingManager().couplingData().energyCouplingCondition(fvGeometry, elemVolVars, elemFaceVars, scvf, diffCoeffAvgType_);
 #endif
 
         }