diff --git a/opm/material/components/H2.hpp b/opm/material/components/H2.hpp
new file mode 100644
index 000000000..db2d03026
--- /dev/null
+++ b/opm/material/components/H2.hpp
@@ -0,0 +1,94 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
+*/
+/*!
+ * \file
+ * \copydoc Opm::H2
+ */
+#ifndef OPM_H2_HPP
+#define OPM_H2_HPP
+
+#include "Component.hpp"
+
+#include <opm/material/IdealGas.hpp>
+#include <opm/material/common/MathToolbox.hpp>
+
+#include <opm/material/common/Unused.hpp>
+
+#include <cmath>
+
+namespace Opm
+{
+
+/*!
+ * \ingroup Components
+ *
+ * \brief Properties of pure molecular hydrogen \f$H_2\f$.
+ *
+ * \tparam Scalar The type used for scalar values
+ */
+template <class Scalar>
+class H2 : public Component<Scalar, H2<Scalar> >
+{
+    typedef ::Opm::IdealGas<Scalar> IdealGas;
+
+public:
+    /*!
+     * \brief A human readable name for hydrogen.
+     */
+    static const char* name()
+    { return "H2"; }
+
+    /*!
+     * \brief The molar mass in \f$\mathrm{[kg/mol]}\f$ of molecular hydrogen.
+     */
+    static Scalar molarMass()
+    { return 0.0020156;}
+
+    /*!
+     * \brief Returns the critical temperature \f$\mathrm{[K]}\f$ of molecular hydrogen
+     */
+    static Scalar criticalTemperature()
+    { return 33.2; /* [K] */ }
+
+    /*!
+     * \brief Returns the critical pressure \f$\mathrm{[Pa]}\f$ of molecular hydrogen.
+     */
+    static Scalar criticalPressure()
+    { return 1.297e6; /* [N/m^2] */ }
+
+    /*!
+     * \brief Critical volume of \f$H_2\f$ [m2/kmol].
+     */
+    static Scalar criticalVolume() {return 6.45e-2; }
+
+    /*!
+     * \brief Acentric factor of \f$H_2\f$.
+     */
+    static Scalar acentricFactor() { return -0.22; }
+
+
+};
+
+} // namespace Opm
+
+#endif
diff --git a/opm/material/fluidsystems/chifluid/co2brinefluidsystem.hh b/opm/material/fluidsystems/Co2BrineFluidSystem.hh
similarity index 96%
rename from opm/material/fluidsystems/chifluid/co2brinefluidsystem.hh
rename to opm/material/fluidsystems/Co2BrineFluidSystem.hh
index 6a808d28f..e346216d6 100644
--- a/opm/material/fluidsystems/chifluid/co2brinefluidsystem.hh
+++ b/opm/material/fluidsystems/Co2BrineFluidSystem.hh
@@ -6,8 +6,8 @@
 #include <opm/material/components/H2O.hpp>
 #include <opm/material/components/Brine.hpp>
 
-#include "ChiParameterCache.hpp"
-#include "LBCviscosity.hpp"
+#include <opm/material/fluidsystems/PTFlashParameterCache.hpp>
+#include <opm/material/fluidsystems/chifluid/LBCviscosity.hpp>
 
 namespace Opm {
 /*!
@@ -35,7 +35,7 @@ namespace Opm {
         using Comp1 = Opm::Brine<Scalar, Opm::H2O<Scalar>>;
 
         template <class ValueType>
-        using ParameterCache = Opm::ChiParameterCache<ValueType, Co2BrineFluidSystem<Scalar>>;
+        using ParameterCache = Opm::PTFlashParameterCache<ValueType, Co2BrineFluidSystem<Scalar>>;
         using LBCviscosity = typename Opm::LBCviscosity<Scalar, Co2BrineFluidSystem<Scalar>>;
         using PengRobinsonMixture = typename Opm::PengRobinsonMixture<Scalar, Co2BrineFluidSystem<Scalar>>;
 
diff --git a/opm/material/fluidsystems/chifluid/ChiParameterCache.hpp b/opm/material/fluidsystems/PTFlashParameterCache.hpp
similarity index 97%
rename from opm/material/fluidsystems/chifluid/ChiParameterCache.hpp
rename to opm/material/fluidsystems/PTFlashParameterCache.hpp
index b16b712f5..2fb1e76f1 100644
--- a/opm/material/fluidsystems/chifluid/ChiParameterCache.hpp
+++ b/opm/material/fluidsystems/PTFlashParameterCache.hpp
@@ -22,10 +22,10 @@
 */
 /*!
  * \file
- * \copydoc Opm::ChiParameterCache
+ * \copydoc Opm::PTFlashParameterCache
  */
-#ifndef OPM_CHI_PARAMETER_CACHE_HPP
-#define OPM_CHI_PARAMETER_CACHE_HPP
+#ifndef OPM_PTFlash_PARAMETER_CACHE_HPP
+#define OPM_PTFlash_PARAMETER_CACHE_HPP
 
 #include <cassert>
 
@@ -42,10 +42,10 @@ namespace Opm {
  * \brief Specifies the parameter cache used by the SPE-5 fluid system.
  */
 template <class Scalar, class FluidSystem>
-class ChiParameterCache
-    : public Opm::ParameterCacheBase<ChiParameterCache<Scalar, FluidSystem> >
+class PTFlashParameterCache
+    : public Opm::ParameterCacheBase<PTFlashParameterCache<Scalar, FluidSystem> >
 {
-    using ThisType = ChiParameterCache<Scalar, FluidSystem>;
+    using ThisType = PTFlashParameterCache<Scalar, FluidSystem>;
     using ParentType = Opm::ParameterCacheBase<ThisType>;
     using PengRobinson = Opm::PengRobinson<Scalar>;
 
@@ -59,7 +59,7 @@ public:
     //! The cached parameters for the gas phase
     using GasPhaseParams = Opm::PengRobinsonParamsMixture<Scalar, FluidSystem, gasPhaseIdx, /*useChi=*/false>;
 
-    ChiParameterCache()
+    PTFlashParameterCache()
     {
             VmUpToDate_[oilPhaseIdx] = false;
             Valgrind::SetUndefined(Vm_[oilPhaseIdx]);
diff --git a/opm/material/fluidsystems/chifluid/threecomponentfluidsystem.hh b/opm/material/fluidsystems/ThreeComponentFluidSystem.hh
similarity index 96%
rename from opm/material/fluidsystems/chifluid/threecomponentfluidsystem.hh
rename to opm/material/fluidsystems/ThreeComponentFluidSystem.hh
index 3127c4803..706601bb8 100644
--- a/opm/material/fluidsystems/chifluid/threecomponentfluidsystem.hh
+++ b/opm/material/fluidsystems/ThreeComponentFluidSystem.hh
@@ -2,15 +2,14 @@
 #define OPM_THREECOMPONENTFLUIDSYSTEM_HH
 
 #include <opm/material/fluidsystems/BaseFluidSystem.hpp>
-#include <opm/material/fluidsystems/chifluid/components.hh>
 #include <opm/material/components/SimpleCO2.hpp>
 #include <opm/material/components/C10.hpp>
 #include <opm/material/components/C1.hpp>
 
 
 // TODO: this is something else need to check
-#include "ChiParameterCache.hpp"
-#include "LBCviscosity.hpp"
+#include <opm/material/fluidsystems/PTFlashParameterCache.hpp>
+#include <opm/material/fluidsystems/chifluid/LBCviscosity.hpp>
 
 namespace Opm {
 /*!
@@ -43,7 +42,7 @@ namespace Opm {
         using Comp2 = Opm::C10<Scalar>;
 
         template <class ValueType>
-        using ParameterCache = Opm::ChiParameterCache<ValueType, ThreeComponentFluidSystem<Scalar>>;
+        using ParameterCache = Opm::PTFlashParameterCache<ValueType, ThreeComponentFluidSystem<Scalar>>;
         using LBCviscosity = typename Opm::LBCviscosity<Scalar, ThreeComponentFluidSystem<Scalar>>;
         using PengRobinsonMixture = typename Opm::PengRobinsonMixture<Scalar, ThreeComponentFluidSystem<Scalar>>;
 
diff --git a/tests/test_chiflash.cpp b/tests/test_chiflash.cpp
index bd8bf280a..50a488358 100644
--- a/tests/test_chiflash.cpp
+++ b/tests/test_chiflash.cpp
@@ -28,7 +28,7 @@
 #include "config.h"
 
 #include <opm/material/constraintsolvers/ChiFlash.hpp>
-#include <opm/material/fluidsystems/chifluid/threecomponentfluidsystem.hh>
+#include <opm/material/fluidsystems/ThreeComponentFluidSystem.hh>
 
 #include <opm/material/densead/Evaluation.hpp>
 #include <opm/material/constraintsolvers/ComputeFromReferencePhase.hpp>
diff --git a/tests/test_co2brine_flash.cpp b/tests/test_co2brine_flash.cpp
index 63b12776a..3c96cefd8 100644
--- a/tests/test_co2brine_flash.cpp
+++ b/tests/test_co2brine_flash.cpp
@@ -28,7 +28,7 @@
 #include "config.h"
 
 #include <opm/material/constraintsolvers/ChiFlash.hpp>
-#include <opm/material/fluidsystems/chifluid/co2brinefluidsystem.hh>
+#include <opm/material/fluidsystems/Co2BrineFluidSystem.hh>
 #include <opm/material/densead/Evaluation.hpp>
 #include <opm/material/constraintsolvers/ComputeFromReferencePhase.hpp>
 #include <opm/material/fluidstates/CompositionalFluidState.hpp>