diff --git a/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt b/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt
index 39096375f2e2470d095250f8c893e2b846c3b516..da4898c23f0dd11597537f61e9385053d869f068 100644
--- a/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt
@@ -1,26 +1,26 @@
-add_input_file_links()
+add_input_file_links(FILES params.input)
 
-dune_add_test(SOURCES test_richardsnc_fv.cc
-              NAME test_richardsnc_box
+dune_add_test(NAME test_richardsnc_box
+              SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
-                       --files ${CMAKE_SOURCE_DIR}/test/references/richardswelltracerbox-reference.vtu
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsnc_box-reference.vtu
                                ${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_box-00035.vtu
-                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_box test_richardsnc.input -Problem.Name test_richardsnc_box")
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_box params.input -Problem.Name test_richardsnc_box")
 
-dune_add_test(SOURCES test_richardsnc_fv.cc
-              NAME test_richardsnc_tpfa
+dune_add_test(NAME test_richardsnc_tpfa
+              SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerCC
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
-                       --files ${CMAKE_SOURCE_DIR}/test/references/richardswelltracercc-reference.vtu
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsnc_tpfa-reference.vtu
                                ${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_tpfa-00033.vtu
-                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_tpfa test_richardsnc.input -Problem.Name test_richardsnc_tpfa")
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_tpfa params.input -Problem.Name test_richardsnc_tpfa")
 
 #install sources
 install(FILES
-richardswelltracerproblem.hh
-richardswelltracerspatialparams.hh
-test_richardsnc_fv.cc
+problem.hh
+spatialparams.hh
+main.cc
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/porousmediumflow/richardsnc/implicit)
diff --git a/test/porousmediumflow/richardsnc/implicit/test_richardsnc_fv.cc b/test/porousmediumflow/richardsnc/implicit/main.cc
similarity index 99%
rename from test/porousmediumflow/richardsnc/implicit/test_richardsnc_fv.cc
rename to test/porousmediumflow/richardsnc/implicit/main.cc
index 7197c7c0a60c1e6675c9574c6e2fe5b822d954a7..89fa2370ccc0b2a9417de9dd392b391063adbf89 100644
--- a/test/porousmediumflow/richardsnc/implicit/test_richardsnc_fv.cc
+++ b/test/porousmediumflow/richardsnc/implicit/main.cc
@@ -23,7 +23,7 @@
  */
 #include <config.h>
 
-#include "richardswelltracerproblem.hh"
+#include "problem.hh"
 
 #include <ctime>
 #include <iostream>
diff --git a/test/porousmediumflow/richardsnc/implicit/test_richardsnc.input b/test/porousmediumflow/richardsnc/implicit/params.input
similarity index 100%
rename from test/porousmediumflow/richardsnc/implicit/test_richardsnc.input
rename to test/porousmediumflow/richardsnc/implicit/params.input
diff --git a/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh b/test/porousmediumflow/richardsnc/implicit/problem.hh
similarity index 99%
rename from test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh
rename to test/porousmediumflow/richardsnc/implicit/problem.hh
index 8f6784989c2604b68c1494e4d99567c6fa38a2dd..9372c56f0125882ac550a864b48e5a6dd184ead0 100644
--- a/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh
+++ b/test/porousmediumflow/richardsnc/implicit/problem.hh
@@ -33,7 +33,7 @@
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/richardsnc/model.hh>
 
-#include "richardswelltracerspatialparams.hh"
+#include "spatialparams.hh"
 
 namespace Dumux {
 
diff --git a/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh b/test/porousmediumflow/richardsnc/implicit/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh
rename to test/porousmediumflow/richardsnc/implicit/spatialparams.hh
diff --git a/test/references/richardswelltracerbox-reference.vtu b/test/references/test_richardsnc_box-reference.vtu
similarity index 100%
rename from test/references/richardswelltracerbox-reference.vtu
rename to test/references/test_richardsnc_box-reference.vtu
diff --git a/test/references/richardswelltracercc-reference.vtu b/test/references/test_richardsnc_tpfa-reference.vtu
similarity index 100%
rename from test/references/richardswelltracercc-reference.vtu
rename to test/references/test_richardsnc_tpfa-reference.vtu