diff --git a/dumux/porousmediumflow/2pliquidvapor/CMakeLists.txt b/dumux/porousmediumflow/2p1c/CMakeLists.txt
similarity index 100%
rename from dumux/porousmediumflow/2pliquidvapor/CMakeLists.txt
rename to dumux/porousmediumflow/2p1c/CMakeLists.txt
diff --git a/dumux/porousmediumflow/2pliquidvapor/implicit/CMakeLists.txt b/dumux/porousmediumflow/2p1c/implicit/CMakeLists.txt
similarity index 89%
rename from dumux/porousmediumflow/2pliquidvapor/implicit/CMakeLists.txt
rename to dumux/porousmediumflow/2p1c/implicit/CMakeLists.txt
index 594673dc3775f6c5c1349c9ae2460a68ba010656..d5c0899adf06164a0f194e86e8a06f13d6b90c91 100644
--- a/dumux/porousmediumflow/2pliquidvapor/implicit/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p1c/implicit/CMakeLists.txt
@@ -8,4 +8,4 @@ newtoncontroller.hh
 properties.hh
 propertydefaults.hh
 volumevariables.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2pliquidvapour/implicit)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p1c/implicit)
diff --git a/dumux/porousmediumflow/2pliquidvapor/implicit/indices.hh b/dumux/porousmediumflow/2p1c/implicit/indices.hh
similarity index 100%
rename from dumux/porousmediumflow/2pliquidvapor/implicit/indices.hh
rename to dumux/porousmediumflow/2p1c/implicit/indices.hh
diff --git a/dumux/porousmediumflow/2pliquidvapor/implicit/localresidual.hh b/dumux/porousmediumflow/2p1c/implicit/localresidual.hh
similarity index 100%
rename from dumux/porousmediumflow/2pliquidvapor/implicit/localresidual.hh
rename to dumux/porousmediumflow/2p1c/implicit/localresidual.hh
diff --git a/dumux/porousmediumflow/2pliquidvapor/implicit/model.hh b/dumux/porousmediumflow/2p1c/implicit/model.hh
similarity index 100%
rename from dumux/porousmediumflow/2pliquidvapor/implicit/model.hh
rename to dumux/porousmediumflow/2p1c/implicit/model.hh
diff --git a/dumux/porousmediumflow/2pliquidvapor/implicit/newtoncontroller.hh b/dumux/porousmediumflow/2p1c/implicit/newtoncontroller.hh
similarity index 100%
rename from dumux/porousmediumflow/2pliquidvapor/implicit/newtoncontroller.hh
rename to dumux/porousmediumflow/2p1c/implicit/newtoncontroller.hh
diff --git a/dumux/porousmediumflow/2pliquidvapor/implicit/properties.hh b/dumux/porousmediumflow/2p1c/implicit/properties.hh
similarity index 100%
rename from dumux/porousmediumflow/2pliquidvapor/implicit/properties.hh
rename to dumux/porousmediumflow/2p1c/implicit/properties.hh
diff --git a/dumux/porousmediumflow/2pliquidvapor/implicit/propertydefaults.hh b/dumux/porousmediumflow/2p1c/implicit/propertydefaults.hh
similarity index 100%
rename from dumux/porousmediumflow/2pliquidvapor/implicit/propertydefaults.hh
rename to dumux/porousmediumflow/2p1c/implicit/propertydefaults.hh
diff --git a/dumux/porousmediumflow/2pliquidvapor/implicit/volumevariables.hh b/dumux/porousmediumflow/2p1c/implicit/volumevariables.hh
similarity index 100%
rename from dumux/porousmediumflow/2pliquidvapor/implicit/volumevariables.hh
rename to dumux/porousmediumflow/2p1c/implicit/volumevariables.hh
diff --git a/dumux/porousmediumflow/CMakeLists.txt b/dumux/porousmediumflow/CMakeLists.txt
index 643a57f0eeca6fe8ce47b7462bdbdeb2aa64f9ee..9f3095a65c2cafbdb57875366fe4583d141f8a7c 100644
--- a/dumux/porousmediumflow/CMakeLists.txt
+++ b/dumux/porousmediumflow/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_subdirectory("1p")
 add_subdirectory("1p2c")
 add_subdirectory("2p")
+add_subdirectory("2p1c")
 add_subdirectory("2p2c")
 add_subdirectory("2pdfm")
 add_subdirectory("2pminc")
diff --git a/test/porousmediumflow/2pliquidvapor/CMakeLists.txt b/test/porousmediumflow/2p1c/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/2pliquidvapor/CMakeLists.txt
rename to test/porousmediumflow/2p1c/CMakeLists.txt
diff --git a/test/porousmediumflow/2pliquidvapor/implicit/CMakeLists.txt b/test/porousmediumflow/2p1c/implicit/CMakeLists.txt
similarity index 100%
rename from test/porousmediumflow/2pliquidvapor/implicit/CMakeLists.txt
rename to test/porousmediumflow/2p1c/implicit/CMakeLists.txt
diff --git a/test/porousmediumflow/2pliquidvapor/implicit/steaminjectionproblem.hh b/test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh
similarity index 99%
rename from test/porousmediumflow/2pliquidvapor/implicit/steaminjectionproblem.hh
rename to test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh
index 8ca19c9cc6d92e0a41fd1ef4e8af01cffe0dc017..59ad310cfd684e8f5edc5d504620a9c1030f8adf 100644
--- a/test/porousmediumflow/2pliquidvapor/implicit/steaminjectionproblem.hh
+++ b/test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh
@@ -25,7 +25,7 @@
 #ifndef DUMUX_STEAM_INJECTIONPROBLEM_HH
 #define DUMUX_STEAM_INJECTIONPROBLEM_HH
 
-#include <dumux/porousmediumflow/2pliquidvapor/implicit/model.hh>
+#include <dumux/porousmediumflow/2p1c/implicit/model.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
 
 #include "steaminjectionspatialparams.hh"
diff --git a/test/porousmediumflow/2pliquidvapor/implicit/steaminjectionspatialparams.hh b/test/porousmediumflow/2p1c/implicit/steaminjectionspatialparams.hh
similarity index 100%
rename from test/porousmediumflow/2pliquidvapor/implicit/steaminjectionspatialparams.hh
rename to test/porousmediumflow/2p1c/implicit/steaminjectionspatialparams.hh
diff --git a/test/porousmediumflow/2pliquidvapor/implicit/test_boxsteaminjection.cc b/test/porousmediumflow/2p1c/implicit/test_boxsteaminjection.cc
similarity index 100%
rename from test/porousmediumflow/2pliquidvapor/implicit/test_boxsteaminjection.cc
rename to test/porousmediumflow/2p1c/implicit/test_boxsteaminjection.cc
diff --git a/test/porousmediumflow/2pliquidvapor/implicit/test_boxsteaminjection.input b/test/porousmediumflow/2p1c/implicit/test_boxsteaminjection.input
similarity index 100%
rename from test/porousmediumflow/2pliquidvapor/implicit/test_boxsteaminjection.input
rename to test/porousmediumflow/2p1c/implicit/test_boxsteaminjection.input
diff --git a/test/porousmediumflow/2pliquidvapor/implicit/test_ccsteaminjection.cc b/test/porousmediumflow/2p1c/implicit/test_ccsteaminjection.cc
similarity index 100%
rename from test/porousmediumflow/2pliquidvapor/implicit/test_ccsteaminjection.cc
rename to test/porousmediumflow/2p1c/implicit/test_ccsteaminjection.cc
diff --git a/test/porousmediumflow/2pliquidvapor/implicit/test_ccsteaminjection.input b/test/porousmediumflow/2p1c/implicit/test_ccsteaminjection.input
similarity index 100%
rename from test/porousmediumflow/2pliquidvapor/implicit/test_ccsteaminjection.input
rename to test/porousmediumflow/2p1c/implicit/test_ccsteaminjection.input
diff --git a/test/porousmediumflow/CMakeLists.txt b/test/porousmediumflow/CMakeLists.txt
index e706edb68c370e45a36ce08b5a1183bef2c4a335..53b792a0788106bfcc0a516db26aedac9df0d4b7 100644
--- a/test/porousmediumflow/CMakeLists.txt
+++ b/test/porousmediumflow/CMakeLists.txt
@@ -1,8 +1,8 @@
 add_subdirectory("1p")
 add_subdirectory("1p2c")
 add_subdirectory("2p")
+add_subdirectory("2p1c")
 add_subdirectory("2p2c")
-add_subdirectory("2pliquidvapor")
 add_subdirectory("2pminc")
 add_subdirectory("2pnc")
 add_subdirectory("2pncmin")