diff --git a/dumux/freeflow/navierstokesnc/model.hh b/dumux/freeflow/navierstokesnc/model.hh
index cfb250ad44679c36dd9f96ff3dba9b68f300868e..0677dd38915ba870b04ad6d38e8e0c8c4c1ff0bc 100644
--- a/dumux/freeflow/navierstokesnc/model.hh
+++ b/dumux/freeflow/navierstokesnc/model.hh
@@ -63,7 +63,7 @@
 #include "vtkoutputfields.hh"
 
 #include <dumux/assembly/staggeredlocalresidual.hh>
-#include <dumux/material/fluidsystems/gasphase.hh>
+#include <dumux/material/fluidsystems/1pgas.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
 
 #include <dumux/material/fluidstates/compositional.hh>
diff --git a/dumux/material/fluidsystems/gasphase.hh b/dumux/material/fluidsystems/1pgas.hh
similarity index 98%
rename from dumux/material/fluidsystems/gasphase.hh
rename to dumux/material/fluidsystems/1pgas.hh
index a7d41e98333bf8e9d395de9891918f230ee4f82e..d854137bab351a2c648aa0720870e82c4cac98ec 100644
--- a/dumux/material/fluidsystems/gasphase.hh
+++ b/dumux/material/fluidsystems/1pgas.hh
@@ -19,7 +19,7 @@
 /*!
  * \file
  * \ingroup Fluidsystems
- * \brief @copybrief Dumux::FluidSystems::GasPhase
+ * \brief @copybrief Dumux::FluidSystems::OnePGas
  */
 #ifndef DUMUX_GAS_PHASE_HH
 #define DUMUX_GAS_PHASE_HH
@@ -42,10 +42,10 @@ namespace FluidSystems
  * \brief A gaseous phase consisting of a single component
  */
 template <class Scalar, class ComponentT>
-class GasPhase
-: public BaseFluidSystem<Scalar, GasPhase<Scalar, ComponentT> >
+class OnePGas
+: public BaseFluidSystem<Scalar, OnePGas<Scalar, ComponentT> >
 {
-    using ThisType = GasPhase<Scalar, ComponentT>;
+    using ThisType = OnePGas<Scalar, ComponentT>;
     using Base = BaseFluidSystem<Scalar, ThisType>;
 
 public:
diff --git a/dumux/material/fluidsystems/2pimmiscible.hh b/dumux/material/fluidsystems/2pimmiscible.hh
index 3af642db5b7fb743a0ec9555997671fef6e20db5..410f9d3b443fed379985bf77f960c3b73acfa539 100644
--- a/dumux/material/fluidsystems/2pimmiscible.hh
+++ b/dumux/material/fluidsystems/2pimmiscible.hh
@@ -30,7 +30,7 @@
 #include <dune/common/exceptions.hh>
 
 #include <dumux/material/fluidsystems/1pliquid.hh>
-#include <dumux/material/fluidsystems/gasphase.hh>
+#include <dumux/material/fluidsystems/1pgas.hh>
 #include <dumux/material/fluidstates/immiscible.hh>
 
 #include "base.hh"
@@ -47,11 +47,11 @@ namespace FluidSystems {
  * constituting components.
  * The wetting and the non-wetting phase can be defined individually
  * via FluidSystem::OnePLiquid<Component> and
- * FluidSystem::GasPhase<Component>. These phases consist of one pure
+ * FluidSystem::OnePGas<Component>. These phases consist of one pure
  * component.
  * \tparam Scalar the scalar type
- * \tparam WettingPhase the wetting phase fluid system (use FluidSystem::OnePLiquid<Component> / FluidSystem::GasPhase<Component>)
- * \tparam NonwettingPhase the wetting phase fluid system (use FluidSystem::OnePLiquid<Component> / FluidSystem::GasPhase<Component>)
+ * \tparam WettingPhase the wetting phase fluid system (use FluidSystem::OnePLiquid<Component> / FluidSystem::OnePGas<Component>)
+ * \tparam NonwettingPhase the wetting phase fluid system (use FluidSystem::OnePLiquid<Component> / FluidSystem::OnePGas<Component>)
  */
 template <class Scalar, class WettingPhase, class NonwettingPhase>
 class TwoPImmiscible
diff --git a/dumux/material/fluidsystems/2pliquidvapor.hh b/dumux/material/fluidsystems/2pliquidvapor.hh
index 34f2b6dc8eb98b3c00ace7ea6140707921d1c86b..d27ae7c2dbb799c4e46d6dfcd105c3b976e95d88 100644
--- a/dumux/material/fluidsystems/2pliquidvapor.hh
+++ b/dumux/material/fluidsystems/2pliquidvapor.hh
@@ -31,7 +31,7 @@
 #include <dune/common/exceptions.hh>
 
 #include <dumux/material/fluidsystems/1pliquid.hh>
-#include <dumux/material/fluidsystems/gasphase.hh>
+#include <dumux/material/fluidsystems/1pgas.hh>
 #include <dumux/material/fluidstates/compositional.hh>
 
 #include "base.hh"
diff --git a/dumux/material/fluidsystems/CMakeLists.txt b/dumux/material/fluidsystems/CMakeLists.txt
index 11610e716143ed3d2bd4443beffc42dfbb833eab..9226fb7542864a7507a4b80af333f1b8ad387482 100644
--- a/dumux/material/fluidsystems/CMakeLists.txt
+++ b/dumux/material/fluidsystems/CMakeLists.txt
@@ -4,7 +4,7 @@ install(FILES
   base.hh
   brineair.hh
   brineco2.hh
-  gasphase.hh
+  1pgas.hh
   h2oair.hh
   h2oairmesitylene.hh
   h2oairxylene.hh
diff --git a/test/freeflow/rans/pipelauferproblem.hh b/test/freeflow/rans/pipelauferproblem.hh
index 55da37fa2320f0fb653a17873d7a59a0849dd28f..9db008aba9c7ce8cab50bd90c246b1eef33e78ed 100644
--- a/test/freeflow/rans/pipelauferproblem.hh
+++ b/test/freeflow/rans/pipelauferproblem.hh
@@ -27,7 +27,7 @@
 #ifndef DUMUX_PIPE_LAUFER_PROBLEM_HH
 #define DUMUX_PIPE_LAUFER_PROBLEM_HH
 
-#include <dumux/material/fluidsystems/gasphase.hh>
+#include <dumux/material/fluidsystems/1pgas.hh>
 #include <dumux/material/components/air.hh>
 
 #include <dumux/freeflow/rans/zeroeq/model.hh>
@@ -51,7 +51,7 @@ NEW_TYPE_TAG(PipeLauferProblem, INHERITS_FROM(StaggeredFreeFlowModel, ZeroEq));
 SET_PROP(PipeLauferProblem, FluidSystem)
 {
     using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
-    using type = FluidSystems::GasPhase<Scalar, Air<Scalar> >;
+    using type = FluidSystems::OnePGas<Scalar, Air<Scalar> >;
 };
 
 // Set the grid type
diff --git a/test/material/fluidsystems/checkfluidsystem.hh b/test/material/fluidsystems/checkfluidsystem.hh
index 52208a03a2ff93118be8b5abf1ecff0a4f5e944b..2914a7b75e46de3f06189f38d5cdc130bfaecd12 100644
--- a/test/material/fluidsystems/checkfluidsystem.hh
+++ b/test/material/fluidsystems/checkfluidsystem.hh
@@ -35,7 +35,7 @@
 #include <dumux/material/fluidsystems/base.hh>
 #include <dumux/material/fluidsystems/brineair.hh>
 #include <dumux/material/fluidsystems/brineco2.hh>
-#include <dumux/material/fluidsystems/gasphase.hh>
+#include <dumux/material/fluidsystems/1pgas.hh>
 #include <dumux/material/fluidsystems/h2oair.hh>
 #include <dumux/material/fluidsystems/h2oairmesitylene.hh>
 #include <dumux/material/fluidsystems/h2oairxylene.hh>
diff --git a/test/material/fluidsystems/test_fluidsystems.cc b/test/material/fluidsystems/test_fluidsystems.cc
index b1c045bf1a1eb191fb0c52e578db62c20dcdf42f..4446f64f42df6826c8633f26ae7ef7c33e8a36cd 100644
--- a/test/material/fluidsystems/test_fluidsystems.cc
+++ b/test/material/fluidsystems/test_fluidsystems.cc
@@ -31,7 +31,7 @@
 #include <dumux/material/fluidsystems/base.hh>
 #include <dumux/material/fluidsystems/brineair.hh>
 #include <dumux/material/fluidsystems/brineco2.hh>
-#include <dumux/material/fluidsystems/gasphase.hh>
+#include <dumux/material/fluidsystems/1pgas.hh>
 #include <dumux/material/fluidsystems/h2oair.hh>
 #include <dumux/material/fluidsystems/h2oairmesitylene.hh>
 #include <dumux/material/fluidsystems/h2oairxylene.hh>
@@ -63,7 +63,7 @@ int main()
     using N2 = Components::N2<Scalar>;
 
     using Liquid = FluidSystems::OnePLiquid<Scalar, H2O>;
-    using Gas = FluidSystems::GasPhase<Scalar, N2>;
+    using Gas = FluidSystems::OnePGas<Scalar, N2>;
 
     int success = 0;
     std::vector<std::string> collectedExceptions;
@@ -169,7 +169,7 @@ int main()
         success += checkFluidSystem<Scalar, FluidSystem>(); }
 
     // gas phase
-    {   using FluidSystem = FluidSystems::GasPhase<Scalar, H2O>;
+    {   using FluidSystem = FluidSystems::OnePGas<Scalar, H2O>;
         success += checkFluidSystem<Scalar, FluidSystem>(); }
 
     // H2O -- Air -- Mesitylene
diff --git a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
index dd323af56f3b1e9e2e9b61e22e8f53c1c427258d..89d66ba9aded104450a2be495cd147b37d38e38f 100644
--- a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
@@ -26,7 +26,7 @@
 
 
 #include <dumux/material/fluidsystems/1pliquid.hh>
-#include <dumux/material/fluidsystems/gasphase.hh>
+#include <dumux/material/fluidsystems/1pgas.hh>
 #include <dumux/material/components/simpleh2o.hh>
 
 #include <dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureproperties.hh>