diff --git a/dumux/freeflow/staggeredni/indices.hh b/dumux/freeflow/staggeredni/indices.hh
index 3e2fc7d6919c036d2863d19da7db898864e5cb2c..1490e097dff97d24e488f0a6857087512165a51a 100644
--- a/dumux/freeflow/staggeredni/indices.hh
+++ b/dumux/freeflow/staggeredni/indices.hh
@@ -23,9 +23,6 @@
 #ifndef DUMUX_STAGGERED_NAVIERSTOKES_NI_INDICES_HH
 #define DUMUX_STAGGERED_NAVIERSTOKES_NI_INDICES_HH
 
-//#include <dumux/freeflow/staggered/indices.hh>
-//#include "properties.hh"
-
 namespace Dumux
 {
 // \{
@@ -37,7 +34,7 @@ namespace Dumux
  * \tparam PVOffset The first index in a primary variable vector.
  */
 template <class TypeTag, int PVOffset = 0>
-class NavierStokesNIIndices : public NavierStokesCommonIndices<TypeTag, PVOffset>
+class StaggeredNonIsothermalIndices : public GET_PROP_TYPE(TypeTag, IsothermalIndices)
 {
 public:
     static const int numEqCC = GET_PROP_VALUE(TypeTag, NumEqCellCenter);