diff --git a/dumux/freeflow/staggered/properties.hh b/dumux/freeflow/staggered/properties.hh
index 0cf851a97db76983a80b87931a0c7b642389d43d..246bcc04d70650ea5e3aa111a6e78f5b7e49e1d8 100644
--- a/dumux/freeflow/staggered/properties.hh
+++ b/dumux/freeflow/staggered/properties.hh
@@ -44,10 +44,9 @@ namespace Properties {
 
 //! The type tags for the implicit single-phase problems
 NEW_TYPE_TAG(NavierStokes);
-// NEW_TYPE_TAG(NavierStokesNI);
 
 //! The type tags for the corresponding non-isothermal problems
-NEW_TYPE_TAG(NavierStokesNI, INHERITS_FROM(NavierStokes, StaggeredNonIsothermal));
+NEW_TYPE_TAG(NavierStokesNI, INHERITS_FROM(NavierStokes, NavierStokesNonIsothermal));
 
 //////////////////////////////////////////////////////////////////
 // Property tags
@@ -68,8 +67,8 @@ NEW_PROP_TAG(EnableComponentTransport); //!< Returns whether to consider compone
 NEW_PROP_TAG(EnableEnergyTransport); //!<  Returns whether to consider energy transport or not
 NEW_PROP_TAG(FaceVariables); //!<  Returns whether to consider energy transport or not
 NEW_PROP_TAG(NormalizePressure); //!<  Returns whether to normalize the pressure term in the momentum balance or not
-NEW_PROP_TAG(EnergyLocalResidual); //!<  Returns whether to normalize the pressure term in the momentum balance or not
-NEW_PROP_TAG(EnergyFluxVariables); //!<  Returns whether to normalize the pressure term in the momentum balance or not
+NEW_PROP_TAG(EnergyLocalResidual); //!<  The energy local residual
+NEW_PROP_TAG(EnergyFluxVariables); //!<  The energy flux variables
 // \}
 }
 
diff --git a/dumux/freeflow/staggered/propertydefaults.hh b/dumux/freeflow/staggered/propertydefaults.hh
index 183415654aa1c3579d69ff7826b61f3da9951344..df8c3069f2c18431e09fd724949215f10f42072d 100644
--- a/dumux/freeflow/staggered/propertydefaults.hh
+++ b/dumux/freeflow/staggered/propertydefaults.hh
@@ -206,9 +206,6 @@ SET_TYPE_PROP(NavierStokes, EnergyFluxVariables, FreeFlowEnergyFluxVariables<Typ
 // set isothermal Model
 SET_TYPE_PROP(NavierStokesNI, IsothermalModel, NavierStokesModel<TypeTag>);
 
-//set isothermal VolumeVariables
-SET_TYPE_PROP(NavierStokesNI, IsothermalVolumeVariables, NavierStokesVolumeVariables<TypeTag>);
-
 //set isothermal Indices
 SET_TYPE_PROP(NavierStokesNI, IsothermalIndices, NavierStokesCommonIndices<TypeTag>);
 
diff --git a/dumux/freeflow/staggered/volumevariables.hh b/dumux/freeflow/staggered/volumevariables.hh
index 192ec02d30197be63b1220c73f31fa56c6812590..463710c46dd8192ca90270007ce47b0f012886d1 100644
--- a/dumux/freeflow/staggered/volumevariables.hh
+++ b/dumux/freeflow/staggered/volumevariables.hh
@@ -44,7 +44,7 @@ class NavierStokesVolumeVariablesImplementation;
  *        is specialized for isothermal and non-isothermal models.
  */
 template <class TypeTag>
-using NavierStokesVolumeVariables = NavierStokesVolumeVariablesImplementation<TypeTag, GET_PROP_VALUE(TypeTag, EnableEnergyBalanceStokes)>;
+using NavierStokesVolumeVariables = NavierStokesVolumeVariablesImplementation<TypeTag, GET_PROP_VALUE(TypeTag, EnableEnergyBalance)>;
 
 /*!
  * \ingroup NavierStokesModel
diff --git a/dumux/freeflow/staggeredni/fluxvariables.hh b/dumux/freeflow/staggeredni/fluxvariables.hh
index 346fe740a542fff78e7488929014dcf6905fcc91..34d8b7f6b49de94ec130adbb7d76310073871297 100644
--- a/dumux/freeflow/staggeredni/fluxvariables.hh
+++ b/dumux/freeflow/staggeredni/fluxvariables.hh
@@ -28,12 +28,6 @@
 namespace Dumux
 {
 
-namespace Properties
-{
-// forward declaration
-NEW_PROP_TAG(EnableEnergyBalanceStokes);
-}
-
 /*!
  * \ingroup ImplicitModel
  * \brief The flux variables class
@@ -46,7 +40,7 @@ template<class TypeTag, bool enableEnergyBalance>
 class FreeFlowEnergyFluxVariablesImplementation;
 
 template<class TypeTag>
-using FreeFlowEnergyFluxVariables = FreeFlowEnergyFluxVariablesImplementation<TypeTag, GET_PROP_VALUE(TypeTag, EnableEnergyBalanceStokes)>;
+using FreeFlowEnergyFluxVariables = FreeFlowEnergyFluxVariablesImplementation<TypeTag, GET_PROP_VALUE(TypeTag, EnableEnergyBalance)>;
 
 // specialization for isothermal flow
 template<class TypeTag>
@@ -94,7 +88,6 @@ class FreeFlowEnergyFluxVariablesImplementation<TypeTag, true>
     using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
 
     using HeatConductionType = typename GET_PROP_TYPE(TypeTag, HeatConductionType);
-    static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
 
     enum { energyBalanceIdx = Indices::energyBalanceIdx };
 
@@ -152,8 +145,8 @@ private:
         const auto& downstreamVolVars = insideIsUpstream ? outsideVolVars : insideVolVars;
 
         const Scalar upWindWeight = GET_PROP_VALUE(TypeTag, ImplicitUpwindWeight);
-        const Scalar upstreamDensity = useMoles ? upstreamVolVars.molarDensity() : upstreamVolVars.density();
-        const Scalar downstreamDensity = useMoles ? downstreamVolVars.molarDensity() : downstreamVolVars.density();
+        const Scalar upstreamDensity = upstreamVolVars.density();
+        const Scalar downstreamDensity = downstreamVolVars.density();
         const Scalar upstreamEnthalpy = upstreamVolVars.enthalpy();
         const Scalar downstreamEnthalpy = downstreamVolVars.enthalpy();
 
diff --git a/dumux/freeflow/staggeredni/indices.hh b/dumux/freeflow/staggeredni/indices.hh
index 1490e097dff97d24e488f0a6857087512165a51a..63bf022ab84878d2b2c299cc11633147410123e3 100644
--- a/dumux/freeflow/staggeredni/indices.hh
+++ b/dumux/freeflow/staggeredni/indices.hh
@@ -34,7 +34,7 @@ namespace Dumux
  * \tparam PVOffset The first index in a primary variable vector.
  */
 template <class TypeTag, int PVOffset = 0>
-class StaggeredNonIsothermalIndices : public GET_PROP_TYPE(TypeTag, IsothermalIndices)
+class NavierStokesNonIsothermalIndices : public GET_PROP_TYPE(TypeTag, IsothermalIndices)
 {
 public:
     static const int numEqCC = GET_PROP_VALUE(TypeTag, NumEqCellCenter);
diff --git a/dumux/freeflow/staggeredni/localresidual.hh b/dumux/freeflow/staggeredni/localresidual.hh
index 39ad52191a418f72197960d582e94a7280d6e18b..b6517c21ac64c4422f937f2e0e078c979d415594 100644
--- a/dumux/freeflow/staggeredni/localresidual.hh
+++ b/dumux/freeflow/staggeredni/localresidual.hh
@@ -46,7 +46,7 @@ class FreeFlowEnergyLocalResidualImplementation;
  * \brief Element-wise calculation of the energy residual for non-isothermal problems.
  */
 template<class TypeTag>
-using FreeFlowEnergyLocalResidual = FreeFlowEnergyLocalResidualImplementation<TypeTag, GET_PROP_VALUE(TypeTag, EnableEnergyBalanceStokes)>;
+using FreeFlowEnergyLocalResidual = FreeFlowEnergyLocalResidualImplementation<TypeTag, GET_PROP_VALUE(TypeTag, EnableEnergyBalance)>;
 
 template<class TypeTag>
 class FreeFlowEnergyLocalResidualImplementation<TypeTag, false>
diff --git a/dumux/freeflow/staggeredni/model.hh b/dumux/freeflow/staggeredni/model.hh
index f3dd02701a75ce22aeaf106d5f6708938db239b2..668a5a07651e949c8f7af121a8a3b8143f4d94d9 100644
--- a/dumux/freeflow/staggeredni/model.hh
+++ b/dumux/freeflow/staggeredni/model.hh
@@ -40,7 +40,7 @@ namespace Dumux
  * The model supports compressible as well as incompressible fluids.
  */
 template<class TypeTag >
-class StaggeredNonIsothermalModel : public GET_PROP_TYPE(TypeTag, IsothermalModel)
+class NavierStokesNonIsothermalModel : public GET_PROP_TYPE(TypeTag, IsothermalModel)
 {
     using ParentType = typename GET_PROP_TYPE(TypeTag, IsothermalModel);
     using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
diff --git a/dumux/freeflow/staggeredni/properties.hh b/dumux/freeflow/staggeredni/properties.hh
index eafcdbdaf5a2a4e7c89ebd24a84041bd9e8e657f..26683412f7d942ad7fb6397f38c2c4ea431560eb 100644
--- a/dumux/freeflow/staggeredni/properties.hh
+++ b/dumux/freeflow/staggeredni/properties.hh
@@ -42,28 +42,14 @@ namespace Properties {
 //////////////////////////////////////////////////////////////////
 
 //! The type tags for the non-isothermal Navier Stokes problems
-NEW_TYPE_TAG(StaggeredNonIsothermal);
-
-NEW_PROP_TAG(EnableEnergyBalanceStokes);
-
-//! The type tags for the corresponding non-isothermal problems
-// NEW_TYPE_TAG(NavierStokesNI, INHERITS_FROM(NavierStokes, NonIsothermal));
-
-//////////////////////////////////////////////////////////////////
-// Property tags
-//////////////////////////////////////////////////////////////////
-NEW_PROP_TAG(PhaseIdx); //!< Defines the phaseIdx
-
+NEW_TYPE_TAG(NavierStokesNonIsothermal);
 
 //////////////////////////////////////////////////////////////////
 // Property tags required for the non-isothermal models
 //////////////////////////////////////////////////////////////////
 
-//TODO cleanup
-
 NEW_PROP_TAG(IsothermalModel);
 NEW_PROP_TAG(IsothermalFluxVariables);
-NEW_PROP_TAG(IsothermalVolumeVariables);
 NEW_PROP_TAG(IsothermalIndices);
 NEW_PROP_TAG(IsothermalNumEqCellCenter);
 NEW_PROP_TAG(IsothermalNumEqFace);
@@ -71,12 +57,6 @@ NEW_PROP_TAG(HaveVariableFormulation);
 NEW_PROP_TAG(ThermalConductivityModel);
 NEW_PROP_TAG(NiOutputLevel);
 
-// forward declaration of other property tags
-NEW_PROP_TAG(Indices);
-NEW_PROP_TAG(NumPhases);
-NEW_PROP_TAG(FluidSystem);
-
-
 // \}
 }
 
diff --git a/dumux/freeflow/staggeredni/propertydefaults.hh b/dumux/freeflow/staggeredni/propertydefaults.hh
index 2e6e6fb7ffd28c21fa90283935b1c08dd030338f..958025a64070de12f368be21137ee5120643d830 100644
--- a/dumux/freeflow/staggeredni/propertydefaults.hh
+++ b/dumux/freeflow/staggeredni/propertydefaults.hh
@@ -29,9 +29,8 @@
 
 #include "properties.hh"
 #include "model.hh"
-#include "../staggered/volumevariables.hh"
 #include "indices.hh"
-#include "../staggered/propertydefaults.hh" //TODO: why do we need this include?
+#include "../staggered/propertydefaults.hh"
 
 namespace Dumux
 {
@@ -43,7 +42,7 @@ namespace Dumux
 ///////////////////////////////////////////////////////////////////////////
 namespace Properties {
 
-SET_PROP(StaggeredNonIsothermal, NumEqCellCenter)
+SET_PROP(NavierStokesNonIsothermal, NumEqCellCenter)
 {
 private:
     static constexpr auto isothermalNumEqCellCenter = GET_PROP_VALUE(TypeTag, IsothermalNumEqCellCenter);
@@ -51,21 +50,13 @@ public:
     static constexpr auto value = isothermalNumEqCellCenter + 1;
 };
 
-// SET_INT_PROP(StaggeredNonIsothermal, NumEqCellCenter, 2);
-//
-// //! the VolumeVariables property
-SET_TYPE_PROP(StaggeredNonIsothermal, VolumeVariables, NavierStokesVolumeVariables<TypeTag>);
-SET_TYPE_PROP(StaggeredNonIsothermal, Model, StaggeredNonIsothermalModel<TypeTag>);
-SET_TYPE_PROP(StaggeredNonIsothermal, Indices, StaggeredNonIsothermalIndices<TypeTag>);
-//
-SET_BOOL_PROP(StaggeredNonIsothermal, EnableEnergyBalanceStokes, true);
-//
-SET_BOOL_PROP(StaggeredNonIsothermal, UseMoles, true);
-//
-SET_TYPE_PROP(StaggeredNonIsothermal, HeatConductionType, FouriersLaw<TypeTag>);
-//
-SET_INT_PROP(StaggeredNonIsothermal, PhaseIdx, 0); //!< Defines the phaseIdx
+SET_TYPE_PROP(NavierStokesNonIsothermal, Model, NavierStokesNonIsothermalModel<TypeTag>);
 
+SET_TYPE_PROP(NavierStokesNonIsothermal, Indices, NavierStokesNonIsothermalIndices<TypeTag>);
+
+SET_BOOL_PROP(NavierStokesNonIsothermal, EnableEnergyBalance, true);
+
+SET_TYPE_PROP(NavierStokesNonIsothermal, HeatConductionType, FouriersLaw<TypeTag>);
 
 } // end namespace Properties