diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt
index b69d6eb8a17a7bdab434c18e25036a732078e0d1..bcdf386cd675f55d62e16168e4e3c343be10140f 100644
--- a/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt
@@ -2,39 +2,39 @@ dune_symlink_to_source_files(FILES "test_2pni.input")
 
 # non-isothermal tests
 if(HAVE_UG)
-  dune_add_test(SOURCES test_box2pni.cc
-                NAME test_box2pni
+  dune_add_test(SOURCES test_2pni_box.cc
+                NAME test_2pni_box
                 COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
                                --script fuzzy
                                --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnibox-simplex-reference.vtu
-                                       ${CMAKE_CURRENT_BINARY_DIR}/injection2pnibox-00007.vtu
-                               --command "${CMAKE_CURRENT_BINARY_DIR}/test_box2pni test_2pni.input -Problem.Name injection2pnibox -Grid.CellType Simplex")
+                                       ${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box-00007.vtu
+                               --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box test_2pni.input -Problem.Name test_2pni_box -Grid.CellType Simplex")
 else()
-dune_add_test(SOURCES test_box2pni.cc
-              NAME test_box2pni
+dune_add_test(SOURCES test_2pni_box.cc
+              NAME test_2pni_box
               COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
                              --script fuzzy
                              --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnibox-cube-reference.vtu
-                                     ${CMAKE_CURRENT_BINARY_DIR}/injection2pnibox-00007.vtu
-                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_box2pni test_2pni.input -Problem.Name injection2pnibox")
+                                     ${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box-00007.vtu
+                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box test_2pni.input -Problem.Name test_2pni_box")
 endif()
 
 if(HAVE_UG)
-dune_add_test(SOURCES test_cc2pni.cc
-              NAME test_cc2pni
+dune_add_test(SOURCES test_2pni_cc.cc
+              NAME test_2pni_tpfa
               COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
                              --script fuzzy
                              --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnicc-simplex-reference.vtu
-                                     ${CMAKE_CURRENT_BINARY_DIR}/injection2pnicc-00008.vtu
-                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc2pni test_2pni.input -Problem.Name injection2pnicc -Grid.CellType Simplex")
+                                     ${CMAKE_CURRENT_BINARY_DIR}/2pni_tpfa-00008.vtu
+                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa test_2pni.input -Problem.Name 2pni_tpfa -Grid.CellType Simplex")
 else()
-dune_add_test(SOURCES test_cc2pni.cc
-              NAME test_cc2pni
+dune_add_test(SOURCES test_2pni_cc.cc
+              NAME test_2pni_tpfa
               COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
                              --script fuzzy
                              --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnicc-cube-reference.vtu
-                                     ${CMAKE_CURRENT_BINARY_DIR}/injection2pnicc-00008.vtu
-                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc2pni test_2pni.input -Problem.Name injection2pnicc")
+                                     ${CMAKE_CURRENT_BINARY_DIR}/2pni_tpfa-00008.vtu
+                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa test_2pni.input -Problem.Name 2pni_tpfa")
 endif()
 
 set(CMAKE_BUILD_TYPE Release)
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/test_box2pni.cc b/test/porousmediumflow/2p/implicit/nonisothermal/test_2pni_box.cc
similarity index 100%
rename from test/porousmediumflow/2p/implicit/nonisothermal/test_box2pni.cc
rename to test/porousmediumflow/2p/implicit/nonisothermal/test_2pni_box.cc
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/test_cc2pni.cc b/test/porousmediumflow/2p/implicit/nonisothermal/test_2pni_cc.cc
similarity index 100%
rename from test/porousmediumflow/2p/implicit/nonisothermal/test_cc2pni.cc
rename to test/porousmediumflow/2p/implicit/nonisothermal/test_2pni_cc.cc