diff --git a/dumux/freeflow/zeroeq/model.hh b/dumux/freeflow/zeroeq/model.hh
index 53f1d2c356640f9c076af783239c9c04927a9fb7..b64c307105edddf719d879011fb129e92bfdcd08 100644
--- a/dumux/freeflow/zeroeq/model.hh
+++ b/dumux/freeflow/zeroeq/model.hh
@@ -967,7 +967,7 @@ public:
     /*!
      * \brief Returns the name of the used eddy viscosity model.
      */
-    const char *eddyViscosityModelName() const
+    std::string eddyViscosityModelName() const
     {
         switch (GET_PARAM_FROM_GROUP(TypeTag, int, ZeroEq, EddyViscosityModel))
         {
diff --git a/dumux/freeflow/zeroeqnc/model.hh b/dumux/freeflow/zeroeqnc/model.hh
index 38d24e68ccd8ac0eb0386d146ea22ed101c87350..dcb92d2be285aa314bcb29b7376162833b4a6391 100644
--- a/dumux/freeflow/zeroeqnc/model.hh
+++ b/dumux/freeflow/zeroeqnc/model.hh
@@ -348,7 +348,7 @@ public:
     /*!
      * \brief Returns the name of used the eddy diffusivity model.
      */
-    const char *eddyDiffusivityModelName() const
+    std::string eddyDiffusivityModelName() const
     {
         switch (GET_PARAM_FROM_GROUP(TypeTag, int, ZeroEq, EddyDiffusivityModel))
         {
diff --git a/dumux/freeflow/zeroeqncni/model.hh b/dumux/freeflow/zeroeqncni/model.hh
index 20b1afc4f7cf734d700752fe7143b82984bb8e98..a9da7b57b715d3001eaa0983641c25a13663b941 100644
--- a/dumux/freeflow/zeroeqncni/model.hh
+++ b/dumux/freeflow/zeroeqncni/model.hh
@@ -360,7 +360,7 @@ public:
     /*!
      * \brief Returns the name of used the eddy conductivity model.
      */
-    const char *eddyConductivityModelName() const
+    std::string eddyConductivityModelName() const
     {
         switch (GET_PARAM_FROM_GROUP(TypeTag, int, ZeroEq, EddyConductivityModel))
         {
diff --git a/dumux/material/components/air.hh b/dumux/material/components/air.hh
index e9ecbc4052629816419bd834e883bbcc2388fdad..9d8e45b57d1ef1c923420d4b82281964b19f7efe 100644
--- a/dumux/material/components/air.hh
+++ b/dumux/material/components/air.hh
@@ -48,7 +48,7 @@ public:
     /*!
      * \brief A human readable name for Air.
      */
-    static const char *name()
+    static std::string name()
     { return "Air"; }
 
     /*!
diff --git a/dumux/material/components/benzene.hh b/dumux/material/components/benzene.hh
index 61f29bfd71e4d6eda9716453b165af255f7b5692..645dc1eb79a20631faf9f6887c7263016c727d2b 100644
--- a/dumux/material/components/benzene.hh
+++ b/dumux/material/components/benzene.hh
@@ -45,7 +45,7 @@ public:
     /*!
      * \brief A human readable name for the benzene
      */
-    static const char *name()
+    static std::string name()
     { return "benzene"; }
 
     /*!
diff --git a/dumux/material/components/brine.hh b/dumux/material/components/brine.hh
index 152c2f669e6f4b3c2bd865106fbb14450c9067c2..dc50cf4bf25bfe897942c373ba69d173e55386a9 100644
--- a/dumux/material/components/brine.hh
+++ b/dumux/material/components/brine.hh
@@ -58,7 +58,7 @@ public:
     /*!
      * \brief A human readable name for the brine.
      */
-    static const char *name()
+    static std::string name()
     { return "Brine"; }
 
     /*!
diff --git a/dumux/material/components/ch4.hh b/dumux/material/components/ch4.hh
index 6634cbc2aef24f5b916ae29ee37004941d49d504..066990a03c61a31abb3349996457d262c92fb038 100644
--- a/dumux/material/components/ch4.hh
+++ b/dumux/material/components/ch4.hh
@@ -51,7 +51,7 @@ public:
     /*!
      * \brief A human readable name for methane.
      */
-    static const char *name()
+    static std::string name()
     { return "CH4"; }
 
     /*!
diff --git a/dumux/material/components/co2.hh b/dumux/material/components/co2.hh
index 14b00c851cfa29e1c4908d3f6770c2f004d84e8b..b64aa41426b36342cc2309473f694533b946953c 100644
--- a/dumux/material/components/co2.hh
+++ b/dumux/material/components/co2.hh
@@ -57,7 +57,7 @@ public:
     /*!
      * \brief A human readable name for the CO2.
      */
-    static const char *name()
+    static std::string name()
     { return "CO2"; }
 
     /*!
diff --git a/dumux/material/components/component.hh b/dumux/material/components/component.hh
index b24f699af026f021d6f913f2ef707155a1ead35a..4cee3ab519a21d6c6b722ed7c19d6b8d55dc72dc 100644
--- a/dumux/material/components/component.hh
+++ b/dumux/material/components/component.hh
@@ -81,7 +81,7 @@ public:
     /*!
      * \brief A human readable name for the component.
      */
-    static const char *name()
+    static std::string name()
     { DUNE_THROW(Dune::NotImplemented, "Component::name()"); }
 
     /*!
diff --git a/dumux/material/components/constant.hh b/dumux/material/components/constant.hh
index eb545337eac4c379dc3c61d6d2c75fb009f5b81f..5298cd86369dbda5e48615f9aa64c2b526af0769 100644
--- a/dumux/material/components/constant.hh
+++ b/dumux/material/components/constant.hh
@@ -65,7 +65,7 @@ public:
     /*!
      * \brief A human readable name for the component.
      */
-    static const char *name()
+    static std::string name()
     { return "Constant"; }
 
     /*!
diff --git a/dumux/material/components/dnapl.hh b/dumux/material/components/dnapl.hh
index 57126aec160555b42d9f49ef740c024b491a6d08..485387e1cf2369f74b872746a8b0fe1e2a89af6b 100644
--- a/dumux/material/components/dnapl.hh
+++ b/dumux/material/components/dnapl.hh
@@ -44,7 +44,7 @@ public:
     /*!
      * \brief A human readable name for the dense NAPL TCE.
      */
-    static const char *name()
+    static std::string name()
     { return "DNAPL_TCE"; }
 
     /*!
diff --git a/dumux/material/components/h2.hh b/dumux/material/components/h2.hh
index e6ea4c9948c349c305a6023dd7e8bf3948475d75..d95d1d2844f719010c83d07da1c314e90e4908e6 100644
--- a/dumux/material/components/h2.hh
+++ b/dumux/material/components/h2.hh
@@ -51,7 +51,7 @@ public:
     /*!
      * \brief A human readable name for the \f$H_2\f$.
      */
-    static const char *name()
+    static std::string name()
     { return "H2"; }
 
     /*!
diff --git a/dumux/material/components/heavyoil.hh b/dumux/material/components/heavyoil.hh
index 697efdb0cbd793538f0dc754c1e2655351ccbd16..149234b1a2bc6c218f5a0cd9b24a3dfb45df414d 100644
--- a/dumux/material/components/heavyoil.hh
+++ b/dumux/material/components/heavyoil.hh
@@ -48,7 +48,7 @@ public:
     /*!
      * \brief A human readable name for heavyoil
      */
-    static const char *name()
+    static std::string name()
     { return "heavyoil"; }
 
     /*!
diff --git a/dumux/material/components/lnapl.hh b/dumux/material/components/lnapl.hh
index 53eb32238c34f988818fed065d8bf36357d1147a..0a08a279d1c0c9cb6c2a9f5bf90204b91b84317c 100644
--- a/dumux/material/components/lnapl.hh
+++ b/dumux/material/components/lnapl.hh
@@ -44,7 +44,7 @@ public:
     /*!
      * \brief A human readable name for the LNAPL.
      */
-    static const char *name()
+    static std::string name()
     { return "LNAPL"; }
 
     /*!
diff --git a/dumux/material/components/mesitylene.hh b/dumux/material/components/mesitylene.hh
index 2204685ef50da93a8e631272797b903f33a5e652..3c483fe355054db8063c19f9722e7ba092079a9d 100644
--- a/dumux/material/components/mesitylene.hh
+++ b/dumux/material/components/mesitylene.hh
@@ -48,7 +48,7 @@ public:
     /*!
      * \brief A human readable name for the mesitylene
      */
-    static const char *name()
+    static std::string name()
     { return "mesitylene"; }
 
     /*!
diff --git a/dumux/material/components/nacl.hh b/dumux/material/components/nacl.hh
index 3d3d271f596690dc7154b91e93f484ad1f790f71..6f6acdfa468d45f7b3ccb96bc9285c4b6b259729 100644
--- a/dumux/material/components/nacl.hh
+++ b/dumux/material/components/nacl.hh
@@ -45,7 +45,7 @@ public:
     /*!
      * \brief A human readable name for the NaCl.
      */
-    static const char *name()
+    static std::string name()
     {
         return "NaCl";
     }
diff --git a/dumux/material/components/simpleco2.hh b/dumux/material/components/simpleco2.hh
index e5af02cdd796c594e936172a22fb12b80a71a01c..54153940b76a6216fe402e62604303ccedac5389 100644
--- a/dumux/material/components/simpleco2.hh
+++ b/dumux/material/components/simpleco2.hh
@@ -50,7 +50,7 @@ public:
     /*!
      * \brief A human readable name for the \f$CO_2\f$.
      */
-    static const char *name()
+    static std::string name()
     { return "CO2"; }
 
     /*!
diff --git a/dumux/material/components/simpleh2o.hh b/dumux/material/components/simpleh2o.hh
index 7316c85d2b0b3aac8081166a296093531e0a8a64..ce465b702021e796f7a76aba768e66419bd0aa99 100644
--- a/dumux/material/components/simpleh2o.hh
+++ b/dumux/material/components/simpleh2o.hh
@@ -52,7 +52,7 @@ public:
     /*!
      * \brief A human readable name for the water.
      */
-    static const char *name()
+    static std::string name()
     { return "H2O"; }
 
     /*!
diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh
index 77d885c41f27439b8926927184571122f2fdb2b8..7330808a7ea783074419aaf01c0e88bd4638cfdc 100644
--- a/dumux/material/components/tabulatedcomponent.hh
+++ b/dumux/material/components/tabulatedcomponent.hh
@@ -557,7 +557,7 @@ public:
 private:
     // prints a warning if the result is not in range or the table has
     // not been initialized
-    static void printWarning_(const char *quantity, Scalar arg1, Scalar arg2)
+    static void printWarning_(std::string quantity, Scalar arg1, Scalar arg2)
     {
 #ifndef NDEBUG
         if (warningPrinted_)
diff --git a/dumux/material/components/unit.hh b/dumux/material/components/unit.hh
index 2007313b5b77cfb558786dbf0d010eb4863aa0f7..844c0c052d5a7c028a9d368b04d3acd923740a81 100644
--- a/dumux/material/components/unit.hh
+++ b/dumux/material/components/unit.hh
@@ -43,7 +43,7 @@ public:
     /*!
      * \brief A human readable name for the component.
      */
-    static const char *name()
+    static std::string name()
     { return "Unit"; }
 
     /*!
diff --git a/dumux/material/components/xylene.hh b/dumux/material/components/xylene.hh
index 785685281e92826ef1f65ebfcab16a3445d1d370..904e7aadf76fa60d6c64d79f868de5f827428d3d 100644
--- a/dumux/material/components/xylene.hh
+++ b/dumux/material/components/xylene.hh
@@ -49,7 +49,7 @@ public:
     /*!
      * \brief A human readable name for the xylene
      */
-    static const char *name()
+    static std::string name()
     { return "xylene"; }
 
     /*!
diff --git a/dumux/material/fluidsystems/1p.hh b/dumux/material/fluidsystems/1p.hh
index 7679e52b13e54ecd832ac9ecd07b982c6b256f98..e77f8efd89192d9e73a171a2cbc88ad1da7d8e75 100644
--- a/dumux/material/fluidsystems/1p.hh
+++ b/dumux/material/fluidsystems/1p.hh
@@ -75,7 +75,7 @@ public:
      *
      * \param phaseIdx The index of the fluid phase to consider
      */
-    static const char *phaseName(int phaseIdx)
+    static std::string phaseName(int phaseIdx)
     {
         assert(0 <= phaseIdx && phaseIdx < numPhases);
 
@@ -159,7 +159,7 @@ public:
      *
      * \param compIdx The index of the component to consider
      */
-    static const char *componentName(int compIdx)
+    static std::string componentName(int compIdx)
     {
         assert(0 <= compIdx && compIdx < numComponents);
 
diff --git a/dumux/material/fluidsystems/2pimmiscible.hh b/dumux/material/fluidsystems/2pimmiscible.hh
index 49eb242469aff9c5b1f97a1a18a438dbab75bd0d..bd7751f1d4aa81684db91e2472bf4a12d38f0c0b 100644
--- a/dumux/material/fluidsystems/2pimmiscible.hh
+++ b/dumux/material/fluidsystems/2pimmiscible.hh
@@ -82,13 +82,13 @@ public:
      * \brief Return the human readable name of a fluid phase
      * \param phaseIdx The index of the fluid phase to consider
      */
-    static const char *phaseName(int phaseIdx)
+    static std::string phaseName(int phaseIdx)
     {
         assert(0 <= phaseIdx && phaseIdx < numPhases);
 
-        static const char *name[] = {
-            "w",
-            "n"
+        static std::string name[] = {
+            std::string("w"),
+            std::string("n")
         };
         return name[phaseIdx];
     }
@@ -179,7 +179,7 @@ public:
      *
      * \param compIdx index of the component
      */
-    static const char *componentName(int compIdx)
+    static std::string componentName(int compIdx)
     {
         assert(0 <= compIdx && compIdx < numComponents);
 
diff --git a/dumux/material/fluidsystems/2pliquidvapor.hh b/dumux/material/fluidsystems/2pliquidvapor.hh
index eccfc792e6797565d5c57d6277f251397cfbeff4..be319c91ef7965f5cc444e12ca7b212d6e88ccbc 100644
--- a/dumux/material/fluidsystems/2pliquidvapor.hh
+++ b/dumux/material/fluidsystems/2pliquidvapor.hh
@@ -81,11 +81,11 @@ public:
      *
      * \param phaseIdx The index of the fluid phase to consider
      */
-    static const char *phaseName(int phaseIdx)
+    static std::string phaseName(int phaseIdx)
     {
-        static const char *name[] = {
-            "liquid",
-            "vapor",
+        static std::string name[] = {
+            std::string("liquid"),
+            std::string("vapor"),
         };
 
         assert(0 <= phaseIdx && phaseIdx < numPhases);
@@ -177,9 +177,9 @@ public:
      *
      * \param compIdx The index of the component to consider
      */
-    static const char *componentName(int compIdx)
+    static std::string componentName(int compIdx)
     {
-        static const char *name[] = {
+        static std::string name[] = {
             Component::name()
         };
 
diff --git a/dumux/material/fluidsystems/brineair.hh b/dumux/material/fluidsystems/brineair.hh
index 1bb1b3a9610dcc5ac8709c7685bf7afdd3c189ac..6f442966bd0b9677bd376d20a38267ba3a217154 100644
--- a/dumux/material/fluidsystems/brineair.hh
+++ b/dumux/material/fluidsystems/brineair.hh
@@ -127,7 +127,7 @@ public:
      *
      * \param phaseIdx index of the phase
      */
-    static const char *phaseName(int phaseIdx)
+    static std::string phaseName(int phaseIdx)
     {
         switch (phaseIdx) {
         case wPhaseIdx: return "liquid";
@@ -223,7 +223,7 @@ public:
      *
      * \param compIdx The index of the component to consider
      */
-    static const char *componentName(int compIdx)
+    static std::string componentName(int compIdx)
     {
         switch (compIdx)
         {
diff --git a/dumux/material/fluidsystems/brineco2.hh b/dumux/material/fluidsystems/brineco2.hh
index 9ccc5362acb8b266eafa265f7eefe88da72482f9..a238f8a10115c395760d53f1983be08c5cbbd424 100644
--- a/dumux/material/fluidsystems/brineco2.hh
+++ b/dumux/material/fluidsystems/brineco2.hh
@@ -95,11 +95,11 @@ public:
      *
      * \param phaseIdx The index of the fluid phase to consider
      */
-    static const char *phaseName(int phaseIdx)
+    static std::string phaseName(int phaseIdx)
     {
-        static const char *name[] = {
-            "l",
-            "g"
+        static std::string name[] = {
+            std::string("l"),
+            std::string("g")
         };
 
         assert(0 <= phaseIdx && phaseIdx < numPhases);
@@ -160,9 +160,9 @@ public:
      *
      * \param compIdx The index of the component to consider
      */
-    static const char *componentName(int compIdx)
+    static std::string componentName(int compIdx)
     {
-        static const char *name[] = {
+        static std::string name[] = {
             Brine::name(),
             CO2::name(),
         };
diff --git a/dumux/material/fluidsystems/gasphase.hh b/dumux/material/fluidsystems/gasphase.hh
index c8f979f7aa654d0592f36f03d17d09036c46675e..bfbe8fcf06541ec7c131bf295c556db53a5544f1 100644
--- a/dumux/material/fluidsystems/gasphase.hh
+++ b/dumux/material/fluidsystems/gasphase.hh
@@ -69,7 +69,7 @@ public:
      *
      * \param phaseIdx The index of the fluid phase to consider
      */
-    static const char *phaseName(int phaseIdx = 0)
+    static std::string phaseName(int phaseIdx = 0)
     { return Component::name(); }
 
     /*!
@@ -77,13 +77,13 @@ public:
      *
      * \param compIdx The index of the component to consider
      */
-    static const char *componentName(int compIdx = 0)
+    static std::string componentName(int compIdx = 0)
     { return Component::name(); }
 
     /*!
      * \brief A human readable name for the component.
      */
-    static const char *name()
+    static std::string name()
     { return Component::name(); }
 
     /*!
diff --git a/dumux/material/fluidsystems/h2oairxylene.hh b/dumux/material/fluidsystems/h2oairxylene.hh
index 41e652b32a54016b5548c31b48532ed3737d06dc..f1586b027e768e645b250c92ca3fa456b9feb75d 100644
--- a/dumux/material/fluidsystems/h2oairxylene.hh
+++ b/dumux/material/fluidsystems/h2oairxylene.hh
@@ -184,7 +184,7 @@ public:
      * \brief Return the human readable name of a phase (used in indices)
      * \param phaseIdx The index of the fluid phase to consider
      */
-    static const char *phaseName(int phaseIdx)
+    static std::string phaseName(int phaseIdx)
     {
         switch (phaseIdx) {
         case wPhaseIdx: return "w";
@@ -198,7 +198,7 @@ public:
      * \brief Return the human readable name of a component (used in indices)
      * \param compIdx The index of the component to consider
      */
-    static const char *componentName(int compIdx)
+    static std::string componentName(int compIdx)
     {
         switch (compIdx) {
         case H2OIdx: return H2O::name();
diff --git a/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh b/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh
index 701b72e3985729daa3c24238d8aa80d8729c73e8..e08409edfdb5b2e5912bd6c94fe9b064af0c7946 100644
--- a/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh
@@ -179,7 +179,7 @@ public:
     /*!
      * \brief Return the human readable name of a phase (used in indices)
      */
-    static const char *phaseName(int phaseIdx)
+    static std::string phaseName(int phaseIdx)
     {
         switch (phaseIdx) {
         case wPhaseIdx: return "w";
@@ -192,7 +192,7 @@ public:
     /*!
      * \brief Return the human readable name of a component (used in indices)
      */
-    static const char *componentName(int compIdx)
+    static std::string componentName(int compIdx)
     {
         switch (compIdx) {
         case H2OIdx: return H2O::name();
diff --git a/dumux/material/fluidsystems/h2on2.hh b/dumux/material/fluidsystems/h2on2.hh
index e422c7d6017489e5945597f4df85fca1603f45e2..2a939a938af494482225faa0e932a1c7301ff24a 100644
--- a/dumux/material/fluidsystems/h2on2.hh
+++ b/dumux/material/fluidsystems/h2on2.hh
@@ -98,13 +98,8 @@ public:
      */
     static const std::string& phaseName(int phaseIdx)
     {
-        static const std::string name[] = {
-            "w",
-            "n"
-        };
-
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        return name[phaseIdx];
+        return phaseIdx == wPhaseIdx ? "w" : "n";
     }
 
     /*!
diff --git a/dumux/material/fluidsystems/h2on2kinetic.hh b/dumux/material/fluidsystems/h2on2kinetic.hh
index 3b09cf1075cc1c5bd8318e66271b08824818c3d9..5d24e2aa3fdcba2188f8ed5350707324e752989b 100644
--- a/dumux/material/fluidsystems/h2on2kinetic.hh
+++ b/dumux/material/fluidsystems/h2on2kinetic.hh
@@ -61,7 +61,7 @@ public:
     //! Index of the solid phase
     static constexpr int sPhaseIdx = 2;
 
-    static const char *phaseName(int phaseIdx)
+    static std::string phaseName(int phaseIdx)
     {
         if (phaseIdx == sPhaseIdx)
             return "s";
diff --git a/dumux/material/fluidsystems/h2on2o2.hh b/dumux/material/fluidsystems/h2on2o2.hh
index 74f513dbbaee9e4e3be705b5c5a08d84e1194cbe..26eee94949a979271b127d84b8301a0066f59a66 100644
--- a/dumux/material/fluidsystems/h2on2o2.hh
+++ b/dumux/material/fluidsystems/h2on2o2.hh
@@ -111,8 +111,8 @@ public:
     static const std::string& phaseName(int phaseIdx)
     {
         static const std::string name[] = {
-            "l",
-            "g"
+            std::string("l"),
+            std::string("g")
         };
 
         assert(0 <= phaseIdx && phaseIdx < numPhases);
diff --git a/dumux/material/fluidsystems/liquidphase.hh b/dumux/material/fluidsystems/liquidphase.hh
index b073cec32fa37502442d60640afdabae05ed66f0..c774bed530ae287e7b05bb50e94b3b210e7496e4 100644
--- a/dumux/material/fluidsystems/liquidphase.hh
+++ b/dumux/material/fluidsystems/liquidphase.hh
@@ -68,7 +68,7 @@ public:
      *
      * \param phaseIdx The index of the fluid phase to consider
      */
-    static const char *phaseName(int phaseIdx = 0)
+    static std::string phaseName(int phaseIdx = 0)
     { return Component::name(); }
 
     /*!
@@ -76,13 +76,13 @@ public:
      *
      * \param compIdx The index of the component to consider
      */
-    static const char *componentName(int compIdx = 0)
+    static std::string componentName(int compIdx = 0)
     { return Component::name(); }
 
     /*!
      * \brief A human readable name for the component.
      */
-    static const char *name()
+    static std::string name()
     { return Component::name(); }
 
     /*!
diff --git a/dumux/material/fluidsystems/purewatersimple.hh b/dumux/material/fluidsystems/purewatersimple.hh
index fef356f2d2531b1beaf4fa3d631e65f0cfb17853..338bce8fd5104d2fddba639d3628413dcb60c0b2 100644
--- a/dumux/material/fluidsystems/purewatersimple.hh
+++ b/dumux/material/fluidsystems/purewatersimple.hh
@@ -96,12 +96,12 @@ public:
      *
      * \param phaseIdx The index of the fluid phase to consider
      */
-    static const char *phaseName(int phaseIdx)
+    static std::string phaseName(int phaseIdx)
     {
-        static const char *name[] = {
-            "w",
-            "n",
-            "s"
+        static std::string name[] = {
+            std::string("w"),
+            std::string("n"),
+            std::string("s")
         };
 
         assert(0 <= phaseIdx && phaseIdx < numPhases);
@@ -198,9 +198,9 @@ public:
      *
      * \param compIdx The index of the component to consider
      */
-    static const char *componentName(int compIdx)
+    static std::string componentName(int compIdx)
     {
-        static const char *name[] = {
+        static std::string name[] = {
             H2O::name(),
             N2::name()
         };
diff --git a/dumux/material/fluidsystems/spe5.hh b/dumux/material/fluidsystems/spe5.hh
index 496d49727a1f22f03cef6d3ed2fc254459fa679f..97685a3cee11af1da00d43354a9474aaf3bfc616 100644
--- a/dumux/material/fluidsystems/spe5.hh
+++ b/dumux/material/fluidsystems/spe5.hh
@@ -84,12 +84,12 @@ public:
      * \brief Return the human readable name of a fluid phase
      * \param phaseIdx The index of the fluid phase to consider
      */
-    static const char *phaseName(int phaseIdx)
+    static std::string phaseName(int phaseIdx)
     {
-        static const char *name[] = {
-            "g",
-            "w",
-            "o",
+        static std::string name[] = {
+            std::string("g"),
+            std::string("w"),
+            std::string("o"),
         };
 
         assert(0 <= phaseIdx && phaseIdx < numPhases);
@@ -170,16 +170,16 @@ public:
      * \brief Return the human readable name of a component
      * \param compIdx The index of the component to consider
      */
-    static const char *componentName(int compIdx)
+    static std::string componentName(int compIdx)
     {
-        static const char *name[] = {
+        static std::string name[] = {
             H2O::name(),
-            "C1",
-            "C3",
-            "C6",
-            "C10",
-            "C15",
-            "C20"
+            std::string("C1"),
+            std::string("C3"),
+            std::string("C6"),
+            std::string("C10"),
+            std::string("C15"),
+            std::string("C20")
         };
 
         assert(0 <= compIdx && compIdx < numComponents);
diff --git a/dumux/multidomain/problem.hh b/dumux/multidomain/problem.hh
index 4f0879ae1576dc0b9c0dc4f3b64c0e4bcbb938de..1aff9346c781b3c129746bf1d33efd321389b4c6 100644
--- a/dumux/multidomain/problem.hh
+++ b/dumux/multidomain/problem.hh
@@ -265,11 +265,11 @@ public:
     // \}
 
     //! \copydoc ImplicitProblem::name()
-    const char *name() const
-    { return simname_.c_str(); }
+    const std::string& name() const
+    { return simname_; }
 
     //! \copydoc ImplicitProblem::setName()
-    static void setName(const char *newName)
+    static void setName(std::string newName)
     { simname_ = newName; }
 
     //! \copydoc ImplicitProblem::timeManager()
diff --git a/dumux/porousmediumflow/mpnc/implicit/energy/vtkwriterkinetic.hh b/dumux/porousmediumflow/mpnc/implicit/energy/vtkwriterkinetic.hh
index b811f641b12cff750ffcc648df7a5bf762d407b7..7fb5dd96449d6662a9c3ef717eb842f9d682c15d 100644
--- a/dumux/porousmediumflow/mpnc/implicit/energy/vtkwriterkinetic.hh
+++ b/dumux/porousmediumflow/mpnc/implicit/energy/vtkwriterkinetic.hh
@@ -238,7 +238,7 @@ private:
      */
     template <class MultiWriter>
     void commitTemperaturesBuffer_(MultiWriter & writer,
-                                   const char *pattern,
+                                   std::string pattern,
                                    EnergyEqVector & buffer,
                                    bool vertexCentered = true)
     {
@@ -466,13 +466,13 @@ private:
      */
     template <class MultiWriter>
     void commitTemperaturesBuffer_(MultiWriter & writer,
-                                   const char *pattern,
+                                   std::string pattern,
                                    EnergyEqVector & buffer,
                                    bool vertexCentered = true)
     {
-        static const char *name[] = {
-                    "fluid",
-                    "solid"
+        static std::string name[] = {
+                    std::string("fluid"),
+                    std::string("solid")
                 };
 
         for (int energyEqIdx = 0; energyEqIdx < numEnergyEqs; ++energyEqIdx) {
@@ -486,9 +486,9 @@ private:
         }
     }
 
-//    static const char *phaseName(int phaseIdx)
+//    static std::string phaseName(int phaseIdx)
 //    {
-//        static const char *name[] = {
+//        static std::string name[] = {
 //            "w",
 //            "n"
 //        };
diff --git a/dumux/porousmediumflow/mpnc/implicit/vtkwritermodule.hh b/dumux/porousmediumflow/mpnc/implicit/vtkwritermodule.hh
index 7d13ad1d3afe20af3f443b8438ff5320d88f3761..a886b4747606264c2fd2abf67000ce36248aad5a 100644
--- a/dumux/porousmediumflow/mpnc/implicit/vtkwritermodule.hh
+++ b/dumux/porousmediumflow/mpnc/implicit/vtkwritermodule.hh
@@ -181,7 +181,7 @@ protected:
      */
     template <class MultiWriter>
     void commitScalarBuffer_(MultiWriter &writer,
-                             const char *name,
+                             std::string name,
                              ScalarVector &buffer,
                              bool vertexCentered = true)
     {
@@ -196,7 +196,7 @@ protected:
      */
     template <class MultiWriter>
     void commitPhaseBuffer_(MultiWriter &writer,
-                            const char *pattern,
+                            std::string pattern,
                             PhaseVector &buffer,
                             bool vertexCentered = true)
     {
@@ -216,7 +216,7 @@ protected:
      */
     template <class MultiWriter>
     void commitComponentBuffer_(MultiWriter &writer,
-                                const char *pattern,
+                                std::string pattern,
                                 ComponentVector &buffer,
                                 bool vertexCentered = true)
     {
@@ -236,7 +236,7 @@ protected:
      */
     template <class MultiWriter>
     void commitPhaseComponentBuffer_(MultiWriter &writer,
-                                     const char *pattern,
+                                     std::string pattern,
                                      PhaseComponentMatrix &buffer,
                                      bool vertexCentered = true)
     {
diff --git a/dumux/porousmediumflow/sequential/impetproblem.hh b/dumux/porousmediumflow/sequential/impetproblem.hh
index d881b904dd2747f4b8026463b39c400d8d63c6d1..c529f5d63a5014d097b04f51f7b0c22a89fa3564 100644
--- a/dumux/porousmediumflow/sequential/impetproblem.hh
+++ b/dumux/porousmediumflow/sequential/impetproblem.hh
@@ -539,9 +539,9 @@ public:
      * It could be either overwritten by the problem files, or simply
      * declared over the setName() function in the application file.
      */
-    const char *name() const
+    const std::string& name() const
     {
-        return simname_.c_str();
+        return simname_;
     }
 
     /*!
@@ -553,7 +553,7 @@ public:
      *
      * \param newName The problem's name
      */
-    void setName(const char *newName)
+    void setName(std::string newName)
     {
         simname_ = newName;
     }
diff --git a/dumux/porousmediumflow/sequential/onemodelproblem.hh b/dumux/porousmediumflow/sequential/onemodelproblem.hh
index e3e095cf5b40843464daddff3732b97481182842..e28c6e0fd0eeba11e33facaa065e757858d394ae 100644
--- a/dumux/porousmediumflow/sequential/onemodelproblem.hh
+++ b/dumux/porousmediumflow/sequential/onemodelproblem.hh
@@ -489,9 +489,9 @@ public:
      * It could be either overwritten by the problem files, or simply
      * declared over the setName() function in the application file.
      */
-    const char *name() const
+    const std::string& name() const
     {
-        return simname_.c_str();
+        return simname_;
     }
 
     /*!
@@ -501,7 +501,7 @@ public:
      * the application problem is declared! If not, the default name "sim"
      * will be used.
      */
-    void setName(const char *newName)
+    void setName(std::string newName)
     {
         simname_ = newName;
     }
diff --git a/test/freeflow/navierstokes/navierstokestestproblem.hh b/test/freeflow/navierstokes/navierstokestestproblem.hh
index ab468207239f3265279ea65f8d71aaeb756c8dab..f11f1ab21cfeeacaabb6cf97c201e4a7d1c8df24 100644
--- a/test/freeflow/navierstokes/navierstokestestproblem.hh
+++ b/test/freeflow/navierstokes/navierstokestestproblem.hh
@@ -123,7 +123,7 @@ namespace Dumux
        *
        * This is used as a prefix for files generated by the simulation.
        */
-      const char *name() const
+      std::string name() const
       {
         return "navierstokes";
       }
diff --git a/test/freeflow/stokes/stokestestproblem.hh b/test/freeflow/stokes/stokestestproblem.hh
index dc79c2ec8abcc381c4ae449abd6d477e6e3dff98..b99fc961da66f8c0e7ad3913073b38511ff71810 100644
--- a/test/freeflow/stokes/stokestestproblem.hh
+++ b/test/freeflow/stokes/stokestestproblem.hh
@@ -124,7 +124,7 @@ public:
      *
      * This is used as a prefix for files generated by the simulation.
      */
-    const char *name() const
+    std::string name() const
     { return "stokes"; }
 
     /*!
diff --git a/test/geomechanics/el1p2c/el1p2cproblem.hh b/test/geomechanics/el1p2c/el1p2cproblem.hh
index 592bda3fa9fa217850b1046645c8b9104a8b5da1..cb7d81761ec017b6293cc72cef3a0c07f7bda01c 100644
--- a/test/geomechanics/el1p2c/el1p2cproblem.hh
+++ b/test/geomechanics/el1p2c/el1p2cproblem.hh
@@ -124,7 +124,7 @@ class El1P2CProblem: public ImplicitPorousMediaProblem<TypeTag>
      *
      * This is used as a prefix for files generated by the simulation.
      */
-    const char *name() const
+    std::string name() const
     {   return "el1p2c";}
 
     /*!
diff --git a/test/geomechanics/el2p/el2pproblem.hh b/test/geomechanics/el2p/el2pproblem.hh
index d0627913fae854b7bb888a2fb7a84bfb752dcfee..ae4f7fe3feca429a5fa025468a5be3215b39807a 100644
--- a/test/geomechanics/el2p/el2pproblem.hh
+++ b/test/geomechanics/el2p/el2pproblem.hh
@@ -365,7 +365,7 @@ public:
      *
      * This is used as a prefix for files generated by the simulation.
      */
-    const char *name() const
+    std::string name() const
     {
         return "el2p";
     }
diff --git a/test/geomechanics/elastic/elasticmatrixproblem.hh b/test/geomechanics/elastic/elasticmatrixproblem.hh
index 612599adacde51b4c874ba96f5e7101975854405..9a88e31e5df13cf832e73f0d4ec6f0b59da21f85 100644
--- a/test/geomechanics/elastic/elasticmatrixproblem.hh
+++ b/test/geomechanics/elastic/elasticmatrixproblem.hh
@@ -130,7 +130,7 @@ public:
      *
      * This is used as a prefix for files generated by the simulation.
      */
-    const char *name() const
+    std::string name() const
     {    return "elasticmatrix";}
     // \}
 
diff --git a/test/porousmediumflow/1p/sequential/test_1pproblem.hh b/test/porousmediumflow/1p/sequential/test_1pproblem.hh
index 2533b5f75ce8f0fa660b4bebecc7745db4eb7a68..58e7b158e01ee75c4ebad0fb347d0a78162a68a5 100644
--- a/test/porousmediumflow/1p/sequential/test_1pproblem.hh
+++ b/test/porousmediumflow/1p/sequential/test_1pproblem.hh
@@ -123,7 +123,7 @@ public:
     *
     * This is used as a prefix for files generated by the simulation.
     */
-    const char *name() const
+    std::string name() const
     {
         return "test_1p";
     }
diff --git a/test/porousmediumflow/1p/sequential/test_diffusion3d.cc b/test/porousmediumflow/1p/sequential/test_diffusion3d.cc
index 0ae5d30ec37a7e279f8de14153bba03cc519504a..3587552f365299d71cac090c459d9bf77dcab2a3 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusion3d.cc
+++ b/test/porousmediumflow/1p/sequential/test_diffusion3d.cc
@@ -139,7 +139,7 @@ int start(int argc,
     std::string fvOutput = "test_diffusion3d_fv" + outputName;
     if (numRefine > 0)
         fvOutput += "_numRefine" + std::to_string(numRefine);
-    fvProblem->setName(fvOutput.c_str());
+    fvProblem->setName(fvOutput);
 
     timer.reset();
 
@@ -167,7 +167,7 @@ int start(int argc,
     std::string fvmpfaOutput = "test_diffusion3d_fvmpfal" + outputName;
     if (numRefine > 0)
         fvmpfaOutput += "_numRefine" + std::to_string(numRefine);
-    mpfaProblem->setName(fvmpfaOutput.c_str());
+    mpfaProblem->setName(fvmpfaOutput);
 
     timer.reset();
 
@@ -195,7 +195,7 @@ int start(int argc,
     std::string mimeticOutput = "test_diffusion3d_mimetic" + outputName;
     if (numRefine > 0)
         mimeticOutput += "_numRefine" + std::to_string(numRefine);
-    mimeticProblem->setName(mimeticOutput.c_str());
+    mimeticProblem->setName(mimeticOutput);
 
     timer.reset();
 
diff --git a/test/porousmediumflow/2p/implicit/cc2pcornerpointproblem.hh b/test/porousmediumflow/2p/implicit/cc2pcornerpointproblem.hh
index a0fcee16206369c90a3f3f055b7d227abce67bad..3da4ba0aaabb2f513ac881ed5dab4b0b1d39a6c2 100644
--- a/test/porousmediumflow/2p/implicit/cc2pcornerpointproblem.hh
+++ b/test/porousmediumflow/2p/implicit/cc2pcornerpointproblem.hh
@@ -150,9 +150,9 @@ public:
      *
      * This is used as a prefix for files generated by the simulation.
      */
-    const char *name() const
+    const std::string& name() const
     {
-        return name_.c_str();
+        return name_;
     }
 
     /*!
diff --git a/test/porousmediumflow/2p/implicit/generalizeddirichletproblem.hh b/test/porousmediumflow/2p/implicit/generalizeddirichletproblem.hh
index a43fbdf1138e06513d6cbe4b48c8ca349395ed05..3f8a05f0be56c9adcb1bc3b9cf6fff96a7285248 100644
--- a/test/porousmediumflow/2p/implicit/generalizeddirichletproblem.hh
+++ b/test/porousmediumflow/2p/implicit/generalizeddirichletproblem.hh
@@ -119,8 +119,8 @@ public:
 
     //! Specifies the problem name. This is used as a prefix for files
     //! generated by the simulation.
-    const char *name() const
-    { return name_.c_str(); }
+    const std::string& name() const
+    { return name_; }
 
     //! Returns the temperature within a finite volume. We use constant
     //! 10 degrees Celsius.
diff --git a/test/porousmediumflow/2p/implicit/lensproblem.hh b/test/porousmediumflow/2p/implicit/lensproblem.hh
index 4c5d81e480eec369dca2cf251e9237cda21cc9c0..1e7d797f9f474214365e05a81b9a4bc48f842bc9 100644
--- a/test/porousmediumflow/2p/implicit/lensproblem.hh
+++ b/test/porousmediumflow/2p/implicit/lensproblem.hh
@@ -229,9 +229,9 @@ public:
      *
      * This is used as a prefix for files generated by the simulation.
      */
-    const char *name() const
+    const std::string& name() const
     {
-        return name_.c_str();
+        return name_;
     }
 
     /*!
diff --git a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
index cad2120f2995053c9980dcd85e132003eaf8516e..bad603a222f1323511d8f002caade0af00fc268b 100644
--- a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
@@ -230,13 +230,10 @@ ParentType(timeManager, gridView), inflowEdge_(0), outflowEdge_(0)
  *
  * This is used as a prefix for files generated by the simulation.
  */
-const char *name() const
+std::string name() const
 {
     if (ParameterTree::tree().hasKey("Problem.OutputName"))
-    {
-        std::string name(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, OutputName));
-        return name.c_str();
-    }
+        return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, OutputName);
     else
         return "test_3d2p";
 }
diff --git a/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh b/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
index 3a45ef74c5fb43f675b966e3e15f303fc982be0b..2f61a59e981ae1f898c7e9af5fa9adc6f483e875 100644
--- a/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
@@ -170,9 +170,9 @@ public:
      *
      * This is used as a prefix for files generated by the simulation.
      */
-    const char *name() const
+    const std::string& name() const
     {
-        return name_.c_str();
+        return name_;
     }
 
     bool shouldWriteRestartFile() const
diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
index 6b5e854b40a4601c3efd5ec1d6482b45ea75df93..3ff1f29c3968615490a4e01d97aa598b140e4764 100644
--- a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
@@ -270,17 +270,12 @@ void addOutputVtkFields()
  *
  * This is used as a prefix for files generated by the simulation.
  */
-const char *name() const
+std::string name() const
 {
     if (ParameterTree::tree().hasKey("Problem.OutputFileName"))
-    {
-        std::string fileName(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, OutputFileName));
-        return fileName.c_str();
-    }
+        return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, OutputFileName);
     else
-    {
         return "test_mpfa2p";
-    }
 }
 
 bool shouldWriteRestartFile() const
diff --git a/test/porousmediumflow/2p/sequential/test_transportproblem.hh b/test/porousmediumflow/2p/sequential/test_transportproblem.hh
index b833a0d3c0a4ce7e0e3f66dcbe7d38f5cc64e204..8f3a41fd4159789341296a5158db1190470ac2dd 100644
--- a/test/porousmediumflow/2p/sequential/test_transportproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_transportproblem.hh
@@ -170,7 +170,7 @@ public:
      *
      * This is used as a prefix for files generated by the simulation.
      */
-    const char *name() const
+    std::string name() const
     {
         return "test_transport";
     }
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
index c66fca6f71be0c830d20cd0591cd2ce4cabab7ba..f4221dfde648b554d0e19de4dc85b1b543536b33 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
@@ -136,8 +136,7 @@ Adaptive2p2c2d(TimeManager &timeManager, const GridView& gridView) :
             debugWriter_(gridView, "gridAfterAdapt")
 {
     this->setGrid(GridCreator::grid());
-    std::string s = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, SimulationName);
-    this->setName(s.c_str());
+    this->setName(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, SimulationName));
     this->setOutputInterval(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Problem, OutputInterval));
 }
 
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
index 126e9e8fd711c3b5850a96568f1ed0cb4f7d0094..90bf8199f0a2a26c7e76b3ae3fa31323a5c8be1f 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
@@ -151,9 +151,9 @@ Adaptive2p2c3d(TimeManager &timeManager, const GridView& gridView) :
  */
 // \{
 //! @copydoc TestDecTwoPTwoCProblem::name()
-const char *name() const
+std::string name() const
 {
-    return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, Name).c_str();
+    return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, Name);
 }
 
 //! @copydoc TestDecTwoPTwoCProblem::shouldWriteRestartFile()
diff --git a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
index f2d09ca79fd9b730cc8248e26f38837513c4ebca..83c5627822ce371ff59ce840b9950600a6d2eb1c 100644
--- a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
@@ -125,7 +125,7 @@ ParentType(timeManager, gridView), depthBOR_(1000.0)
 //! The problem name.
 /*! This is used as a prefix for files generated by the simulation.
 */
-const char *name() const
+std::string name() const
 {
     return "test_dec2p2c";
 }
diff --git a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
index 31b4affa42aa49de1ed362a041314bbe1bba44e7..ec36912639258423a6ca6bbc290bcc610d238f1d 100644
--- a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
@@ -135,7 +135,7 @@ ParentType(timeManager, gridView), lowerLeft_(0), upperRight_(upperRight), depth
 //! The problem name.
 /*! This is used as a prefix for files generated by the simulation.
 */
-const char *name() const
+std::string name() const
 {
     return "test_multiphysics2p2c";
 }
diff --git a/test/porousmediumflow/2pdfm/implicit/2pdfmtestproblem.hh b/test/porousmediumflow/2pdfm/implicit/2pdfmtestproblem.hh
index 0dc4fbee5be9a5eda9816acc141303ca0b0e1d88..367c3946108ee1523396cd24b6f45abc8195191d 100644
--- a/test/porousmediumflow/2pdfm/implicit/2pdfmtestproblem.hh
+++ b/test/porousmediumflow/2pdfm/implicit/2pdfmtestproblem.hh
@@ -158,7 +158,7 @@ public:
      *
      * This is used as a prefix for files generated by the simulation.
      */
-    const char *name() const
+    std::string name() const
     { return "2pdfm"; }
 
     /*!
diff --git a/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
index f5b32b5d21fec08d7082fb25093fc452533dead7..b5adb99f47318162535a1dccc82c17b5d576a350 100644
--- a/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
+++ b/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
@@ -231,9 +231,9 @@ public:
      *
      * This is used as a prefix for files generated by the simulation.
      */
-    const char *name() const
+    const std::string& name() const
     {
-        return name_.c_str();
+        return name_;
     }
     // \}
 
diff --git a/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
index 86cde5f6a9aae6fbfa7a0479355a4e800c638989..c6c2eac4fadea6992ab57bf6b6d832122383479e 100644
--- a/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
+++ b/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
@@ -236,9 +236,9 @@ public:
      *
      * This is used as a prefix for files generated by the simulation.
      */
-    const char *name() const
+    const std::string& name() const
     {
-        return name_.c_str();
+        return name_;
     }
 
     // \}
diff --git a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh b/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
index 2e3e7ea52777399442ec64d81f43892469a295e2..f2f445cb46ed73c0a9631c5983524db1161e408f 100644
--- a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
@@ -213,9 +213,9 @@ public:
      *
      * This is used as a prefix for files generated by the simulation.
      */
-    const char *name() const
+    const std::string& name() const
     {
-        return name_.c_str();
+        return name_;
     }
     // \}
 
diff --git a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh b/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
index c8476248c1446e99cffda6d7de85ceabb49ce79b..43ba330f784528f0e82a16c34dfb00579d0c823b 100644
--- a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
@@ -223,9 +223,9 @@ public:
      *
      * This is used as a prefix for files generated by the simulation.
      */
-    const char *name() const
+    const std::string& name() const
     {
-        return name_.c_str();
+        return name_;
     }
 
     // \}
diff --git a/tutorial/solutions_implicit/ex2_tutorialproblem_implicit.hh b/tutorial/solutions_implicit/ex2_tutorialproblem_implicit.hh
index 337cf77c2f629aa7509bef5297c8e956769f3d25..53f7716b82c5601556033a237e11a7d84753de24 100644
--- a/tutorial/solutions_implicit/ex2_tutorialproblem_implicit.hh
+++ b/tutorial/solutions_implicit/ex2_tutorialproblem_implicit.hh
@@ -121,7 +121,7 @@ public:
 
     //! Specifies the problem name. This is used as a prefix for files
     //! generated by the simulation.
-    const char *name() const
+    std::string name() const
     { return "tutorial_implicit"; }
 
     //! Returns true if a restart file should be written.
diff --git a/tutorial/solutions_implicit/ex4_benzene.hh b/tutorial/solutions_implicit/ex4_benzene.hh
index 0d2b878bd383dcda3ac1361bdc8a1c55c862ad9a..14c8f23eb34074faf46667e787a328e19672635a 100644
--- a/tutorial/solutions_implicit/ex4_benzene.hh
+++ b/tutorial/solutions_implicit/ex4_benzene.hh
@@ -45,7 +45,7 @@ public:
     /*!
      * \brief A human readable name for the benzene
      */
-    static const char *name()
+    static std::string name()
     { return "benzene"; }
 
     /*!
diff --git a/tutorial/solutions_implicit/ex5_tutorialproblem_implicit.hh b/tutorial/solutions_implicit/ex5_tutorialproblem_implicit.hh
index 98091278765b07e306c2bc6d2ff5789dad993b2a..05203fc7a82236476f8cfe9e2449e1ef5a5be94c 100644
--- a/tutorial/solutions_implicit/ex5_tutorialproblem_implicit.hh
+++ b/tutorial/solutions_implicit/ex5_tutorialproblem_implicit.hh
@@ -119,7 +119,7 @@ public:
 
     //! Specifies the problem name. This is used as a prefix for files
     //! generated by the simulation.
-    const char *name() const
+    std::string name() const
     { return "ex5_tutorial_implicit"; }
 
     //! Returns true if a restart file should be written.
diff --git a/tutorial/solutions_sequential/ex2tutorialproblem_sequential.hh b/tutorial/solutions_sequential/ex2tutorialproblem_sequential.hh
index ebf5c1c76ce1f888b997bfae9a483104e741dc99..f263fbabfe385bc2a5ea010da1ffdb9686b97737 100644
--- a/tutorial/solutions_sequential/ex2tutorialproblem_sequential.hh
+++ b/tutorial/solutions_sequential/ex2tutorialproblem_sequential.hh
@@ -135,7 +135,7 @@ public:
     //! The problem name.
     /*! This is used as a prefix for files generated by the simulation.
     */
-    const char *name() const    /*@\label{tutorial-sequential:name}@*/
+    std::string name() const    /*@\label{tutorial-sequential:name}@*/
     {
         return "tutorial_sequential";
     }
diff --git a/tutorial/solutions_sequential/ex4_benzene.hh b/tutorial/solutions_sequential/ex4_benzene.hh
index 0d2b878bd383dcda3ac1361bdc8a1c55c862ad9a..14c8f23eb34074faf46667e787a328e19672635a 100644
--- a/tutorial/solutions_sequential/ex4_benzene.hh
+++ b/tutorial/solutions_sequential/ex4_benzene.hh
@@ -45,7 +45,7 @@ public:
     /*!
      * \brief A human readable name for the benzene
      */
-    static const char *name()
+    static std::string name()
     { return "benzene"; }
 
     /*!
diff --git a/tutorial/solutions_sequential/ex5_tutorialproblem_sequential.hh b/tutorial/solutions_sequential/ex5_tutorialproblem_sequential.hh
index a4580d29fdc5bd3033178fb14fb6f8c45f3529bf..24398cc52ca8cccb501428b2377b142e8c41c0ab 100644
--- a/tutorial/solutions_sequential/ex5_tutorialproblem_sequential.hh
+++ b/tutorial/solutions_sequential/ex5_tutorialproblem_sequential.hh
@@ -136,7 +136,7 @@ public:
     //! The problem name.
     /*! This is used as a prefix for files generated by the simulation.
     */
-    const char *name() const    /*@\label{tutorial-sequential:name}@*/
+    std::string name() const    /*@\label{tutorial-sequential:name}@*/
     {
         return "ex5_tutorial_sequential";
     }
diff --git a/tutorial/tutorialproblem_implicit.hh b/tutorial/tutorialproblem_implicit.hh
index d39495bfab3bd6a7e1ebe413d66477ece5605dbc..562c075af4d5013420838ae70fd633c03611de0e 100644
--- a/tutorial/tutorialproblem_implicit.hh
+++ b/tutorial/tutorialproblem_implicit.hh
@@ -121,7 +121,7 @@ public:
 
     //! Specifies the problem name. This is used as a prefix for files
     //! generated by the simulation.
-    const char *name() const
+    std::string name() const
     { return "tutorial_implicit"; }
 
     //! Returns true if a restart file should be written.
diff --git a/tutorial/tutorialproblem_sequential.hh b/tutorial/tutorialproblem_sequential.hh
index ccef75d33ead625a6591897fd6b926600dc54e60..2402a4c2dba6a22fbcc8912039beaff6e138cef4 100644
--- a/tutorial/tutorialproblem_sequential.hh
+++ b/tutorial/tutorialproblem_sequential.hh
@@ -135,7 +135,7 @@ public:
     //! The problem name.
     /*! This is used as a prefix for files generated by the simulation.
     */
-    const char *name() const    /*@\label{tutorial-sequential:name}@*/
+    std::string name() const    /*@\label{tutorial-sequential:name}@*/
     {
         return "tutorial_sequential";
     }