diff --git a/test/freeflow/CMakeLists.txt b/test/freeflow/CMakeLists.txt
index 75e6d9b300e0aef3ff805943db447b4a67737145..a2cd437fb9d68eb2705f3fbc35ae46184a45b7cf 100644
--- a/test/freeflow/CMakeLists.txt
+++ b/test/freeflow/CMakeLists.txt
@@ -1,2 +1,2 @@
-add_subdirectory("staggered")
-add_subdirectory("staggerednc")
+add_subdirectory("navierstokes")
+add_subdirectory("navierstokesnc")
diff --git a/test/freeflow/staggered/CMakeLists.txt b/test/freeflow/navierstokes/CMakeLists.txt
similarity index 100%
rename from test/freeflow/staggered/CMakeLists.txt
rename to test/freeflow/navierstokes/CMakeLists.txt
diff --git a/test/freeflow/staggered/angelitestproblem.hh b/test/freeflow/navierstokes/angelitestproblem.hh
similarity index 100%
rename from test/freeflow/staggered/angelitestproblem.hh
rename to test/freeflow/navierstokes/angelitestproblem.hh
diff --git a/test/freeflow/staggered/channeltestproblem.hh b/test/freeflow/navierstokes/channeltestproblem.hh
similarity index 100%
rename from test/freeflow/staggered/channeltestproblem.hh
rename to test/freeflow/navierstokes/channeltestproblem.hh
diff --git a/test/freeflow/staggered/closedsystemtestproblem.hh b/test/freeflow/navierstokes/closedsystemtestproblem.hh
similarity index 100%
rename from test/freeflow/staggered/closedsystemtestproblem.hh
rename to test/freeflow/navierstokes/closedsystemtestproblem.hh
diff --git a/test/freeflow/staggered/doneatestproblem.hh b/test/freeflow/navierstokes/doneatestproblem.hh
similarity index 100%
rename from test/freeflow/staggered/doneatestproblem.hh
rename to test/freeflow/navierstokes/doneatestproblem.hh
diff --git a/test/freeflow/staggered/kovasznaytestproblem.hh b/test/freeflow/navierstokes/kovasznaytestproblem.hh
similarity index 100%
rename from test/freeflow/staggered/kovasznaytestproblem.hh
rename to test/freeflow/navierstokes/kovasznaytestproblem.hh
diff --git a/test/freeflow/staggered/test_angeli.cc b/test/freeflow/navierstokes/test_angeli.cc
similarity index 100%
rename from test/freeflow/staggered/test_angeli.cc
rename to test/freeflow/navierstokes/test_angeli.cc
diff --git a/test/freeflow/staggered/test_channel.cc b/test/freeflow/navierstokes/test_channel.cc
similarity index 100%
rename from test/freeflow/staggered/test_channel.cc
rename to test/freeflow/navierstokes/test_channel.cc
diff --git a/test/freeflow/staggered/test_channel_navierstokes.input b/test/freeflow/navierstokes/test_channel_navierstokes.input
similarity index 100%
rename from test/freeflow/staggered/test_channel_navierstokes.input
rename to test/freeflow/navierstokes/test_channel_navierstokes.input
diff --git a/test/freeflow/staggered/test_channel_stokes.input b/test/freeflow/navierstokes/test_channel_stokes.input
similarity index 100%
rename from test/freeflow/staggered/test_channel_stokes.input
rename to test/freeflow/navierstokes/test_channel_stokes.input
diff --git a/test/freeflow/staggered/test_channel_stokesni_conduction.input b/test/freeflow/navierstokes/test_channel_stokesni_conduction.input
similarity index 100%
rename from test/freeflow/staggered/test_channel_stokesni_conduction.input
rename to test/freeflow/navierstokes/test_channel_stokesni_conduction.input
diff --git a/test/freeflow/staggered/test_channel_stokesni_convection.input b/test/freeflow/navierstokes/test_channel_stokesni_convection.input
similarity index 100%
rename from test/freeflow/staggered/test_channel_stokesni_convection.input
rename to test/freeflow/navierstokes/test_channel_stokesni_convection.input
diff --git a/test/freeflow/staggered/test_closedsystem.cc b/test/freeflow/navierstokes/test_closedsystem.cc
similarity index 100%
rename from test/freeflow/staggered/test_closedsystem.cc
rename to test/freeflow/navierstokes/test_closedsystem.cc
diff --git a/test/freeflow/staggered/test_donea.cc b/test/freeflow/navierstokes/test_donea.cc
similarity index 100%
rename from test/freeflow/staggered/test_donea.cc
rename to test/freeflow/navierstokes/test_donea.cc
diff --git a/test/freeflow/staggered/test_hydrostaticpressure.input b/test/freeflow/navierstokes/test_hydrostaticpressure.input
similarity index 100%
rename from test/freeflow/staggered/test_hydrostaticpressure.input
rename to test/freeflow/navierstokes/test_hydrostaticpressure.input
diff --git a/test/freeflow/staggered/test_kovasznay.cc b/test/freeflow/navierstokes/test_kovasznay.cc
similarity index 100%
rename from test/freeflow/staggered/test_kovasznay.cc
rename to test/freeflow/navierstokes/test_kovasznay.cc
diff --git a/test/freeflow/staggered/test_liddrivencavity.input b/test/freeflow/navierstokes/test_liddrivencavity.input
similarity index 100%
rename from test/freeflow/staggered/test_liddrivencavity.input
rename to test/freeflow/navierstokes/test_liddrivencavity.input
diff --git a/test/freeflow/staggered/test_navierstokes_angeli.input b/test/freeflow/navierstokes/test_navierstokes_angeli.input
similarity index 100%
rename from test/freeflow/staggered/test_navierstokes_angeli.input
rename to test/freeflow/navierstokes/test_navierstokes_angeli.input
diff --git a/test/freeflow/staggered/test_navierstokes_kovasznay.input b/test/freeflow/navierstokes/test_navierstokes_kovasznay.input
similarity index 100%
rename from test/freeflow/staggered/test_navierstokes_kovasznay.input
rename to test/freeflow/navierstokes/test_navierstokes_kovasznay.input
diff --git a/test/freeflow/staggered/test_stokes_donea.input b/test/freeflow/navierstokes/test_stokes_donea.input
similarity index 100%
rename from test/freeflow/staggered/test_stokes_donea.input
rename to test/freeflow/navierstokes/test_stokes_donea.input
diff --git a/test/freeflow/staggerednc/CMakeLists.txt b/test/freeflow/navierstokesnc/CMakeLists.txt
similarity index 100%
rename from test/freeflow/staggerednc/CMakeLists.txt
rename to test/freeflow/navierstokesnc/CMakeLists.txt
diff --git a/test/freeflow/staggerednc/channeltestproblem.hh b/test/freeflow/navierstokesnc/channeltestproblem.hh
similarity index 100%
rename from test/freeflow/staggerednc/channeltestproblem.hh
rename to test/freeflow/navierstokesnc/channeltestproblem.hh
diff --git a/test/freeflow/staggerednc/densityflowproblem.hh b/test/freeflow/navierstokesnc/densityflowproblem.hh
similarity index 100%
rename from test/freeflow/staggerednc/densityflowproblem.hh
rename to test/freeflow/navierstokesnc/densityflowproblem.hh
diff --git a/test/freeflow/staggerednc/test_channel.cc b/test/freeflow/navierstokesnc/test_channel.cc
similarity index 100%
rename from test/freeflow/staggerednc/test_channel.cc
rename to test/freeflow/navierstokesnc/test_channel.cc
diff --git a/test/freeflow/staggerednc/test_densitydrivenflow.cc b/test/freeflow/navierstokesnc/test_densitydrivenflow.cc
similarity index 100%
rename from test/freeflow/staggerednc/test_densitydrivenflow.cc
rename to test/freeflow/navierstokesnc/test_densitydrivenflow.cc
diff --git a/test/freeflow/staggerednc/test_stokes2c_advection.input b/test/freeflow/navierstokesnc/test_stokes2c_advection.input
similarity index 100%
rename from test/freeflow/staggerednc/test_stokes2c_advection.input
rename to test/freeflow/navierstokesnc/test_stokes2c_advection.input
diff --git a/test/freeflow/staggerednc/test_stokes2c_densitydrivenflow.input b/test/freeflow/navierstokesnc/test_stokes2c_densitydrivenflow.input
similarity index 100%
rename from test/freeflow/staggerednc/test_stokes2c_densitydrivenflow.input
rename to test/freeflow/navierstokesnc/test_stokes2c_densitydrivenflow.input
diff --git a/test/freeflow/staggerednc/test_stokes2c_purediffusion.input b/test/freeflow/navierstokesnc/test_stokes2c_purediffusion.input
similarity index 100%
rename from test/freeflow/staggerednc/test_stokes2c_purediffusion.input
rename to test/freeflow/navierstokesnc/test_stokes2c_purediffusion.input
diff --git a/test/freeflow/staggerednc/test_stokes2cni_advection.input b/test/freeflow/navierstokesnc/test_stokes2cni_advection.input
similarity index 100%
rename from test/freeflow/staggerednc/test_stokes2cni_advection.input
rename to test/freeflow/navierstokesnc/test_stokes2cni_advection.input
diff --git a/test/freeflow/staggerednc/test_stokes2cni_diffusion.input b/test/freeflow/navierstokesnc/test_stokes2cni_diffusion.input
similarity index 100%
rename from test/freeflow/staggerednc/test_stokes2cni_diffusion.input
rename to test/freeflow/navierstokesnc/test_stokes2cni_diffusion.input