diff --git a/dumux/material/fluidsystems/2pimmiscible.hh b/dumux/material/fluidsystems/2pimmiscible.hh
index d713d150d6ef3ba3feb38b693ecb2826635f0378..dcf2cafb8869292b0458886fd9f8318bb7d6364a 100644
--- a/dumux/material/fluidsystems/2pimmiscible.hh
+++ b/dumux/material/fluidsystems/2pimmiscible.hh
@@ -86,9 +86,9 @@ public:
         assert(0 <= phaseIdx && phaseIdx < numPhases);
 
         if (phaseIdx == phase0Idx)
-            return Fluid0::phaseName();
+            return Fluid0::isGas() ? "gas"+Fluid0::phaseName() : "liq"+Fluid0::phaseName();
         else
-            return Fluid1::phaseName();
+            return Fluid1::isGas() ? "gas"+Fluid1::phaseName() : "liq"+Fluid1::phaseName();
     }
 
     /*!
diff --git a/dumux/material/fluidsystems/3pimmiscible.hh b/dumux/material/fluidsystems/3pimmiscible.hh
index a670e8c49b1aeb10d4d2e01ef429485e37e52ac3..f26fc1751fcfaf69d0f83b3cf49a24cfcbbdff22 100644
--- a/dumux/material/fluidsystems/3pimmiscible.hh
+++ b/dumux/material/fluidsystems/3pimmiscible.hh
@@ -89,13 +89,13 @@ public:
     static std::string phaseName(int phaseIdx)
     {
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-
-        static std::string name[] = {
-            std::string("w"),
-            std::string("n"),
-            std::string("g")
-        };
-        return name[phaseIdx];
+        switch (phaseIdx)
+        {
+            case wPhaseIdx: return WettingFluid::phaseName();
+            case nPhaseIdx: return NonwettingFluid::phaseName();
+            case gPhaseIdx: return Gas::phaseName();
+        }
+        DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
 
     /*!
diff --git a/dumux/material/fluidsystems/brine.hh b/dumux/material/fluidsystems/brine.hh
index beba2dfe3e5dd5e96b659c81e6e23e561b8b6a3f..663ecd2acacc977ba8c2d8d0e3e2408d88c6f0d7 100644
--- a/dumux/material/fluidsystems/brine.hh
+++ b/dumux/material/fluidsystems/brine.hh
@@ -69,7 +69,7 @@ public:
     static const std::string phaseName(int phaseIdx = liquidPhaseIdx)
     {
         assert(phaseIdx == liquidPhaseIdx);
-        return "brine";
+        return "Brine";
     }
 
     /*!
diff --git a/dumux/material/fluidsystems/brineco2.hh b/dumux/material/fluidsystems/brineco2.hh
index 7c1c603735878c7a30d1fb19f0b0eb599c739493..55eb96777b8e02d83e99e9104fe1840af953bc17 100644
--- a/dumux/material/fluidsystems/brineco2.hh
+++ b/dumux/material/fluidsystems/brineco2.hh
@@ -195,8 +195,8 @@ public:
     {
         switch (phaseIdx)
         {
-            case liquidPhaseIdx: return "l";
-            case gasPhaseIdx: return "g";
+            case liquidPhaseIdx: return "liq";
+            case gasPhaseIdx: return "gas";
         }
         DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
diff --git a/dumux/material/fluidsystems/h2oair.hh b/dumux/material/fluidsystems/h2oair.hh
index 79f23ff2d78f41a929eed864ae2f2918effd316e..c97dcbe31c745d20b4ad3bc33ddf80adab7d6450 100644
--- a/dumux/material/fluidsystems/h2oair.hh
+++ b/dumux/material/fluidsystems/h2oair.hh
@@ -101,10 +101,11 @@ public:
      */
     static std::string phaseName(int phaseIdx)
     {
+        assert(0 <= phaseIdx && phaseIdx < numPhases);
         switch (phaseIdx)
         {
-            case liquidPhaseIdx: return "liquid";
-            case gasPhaseIdx: return "gas";
+            case liquidPhaseIdx: return "Water";
+            case gasPhaseIdx: return Air::name();
         }
         DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
diff --git a/dumux/material/fluidsystems/h2oairmesitylene.hh b/dumux/material/fluidsystems/h2oairmesitylene.hh
index e06bee221d9a4827a599241ec2148061f36a0a20..1658b93bf65b2b739370dc6ad3cf1dc8624508f7 100644
--- a/dumux/material/fluidsystems/h2oairmesitylene.hh
+++ b/dumux/material/fluidsystems/h2oairmesitylene.hh
@@ -194,10 +194,12 @@ public:
      */
     static std::string phaseName(int phaseIdx)
     {
-        switch (phaseIdx) {
-            case wPhaseIdx: return "w";
-            case nPhaseIdx: return "n";
-            case gPhaseIdx: return "g";
+        assert(0 <= phaseIdx && phaseIdx < numPhases);
+        switch (phaseIdx)
+        {
+            case wPhaseIdx: return "Water";
+            case nPhaseIdx: return "NAPL";
+            case gPhaseIdx: return Air::name();
         }
         DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
diff --git a/dumux/material/fluidsystems/h2oairxylene.hh b/dumux/material/fluidsystems/h2oairxylene.hh
index 15ead9572445235ff338391ef7dfb2442c3c7baa..a50fccefa6f9a5866d8f3c6e4b0a8fd2d6de8716 100644
--- a/dumux/material/fluidsystems/h2oairxylene.hh
+++ b/dumux/material/fluidsystems/h2oairxylene.hh
@@ -195,10 +195,12 @@ public:
      */
     static std::string phaseName(int phaseIdx)
     {
-        switch (phaseIdx) {
-            case wPhaseIdx: return "w";
-            case nPhaseIdx: return "n";
-            case gPhaseIdx: return "g";
+        assert(0 <= phaseIdx && phaseIdx < numPhases);
+        switch (phaseIdx)
+        {
+            case wPhaseIdx: return "Water";
+            case nPhaseIdx: return "NAPL";
+            case gPhaseIdx: return Air::name();
         }
         DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
diff --git a/dumux/material/fluidsystems/h2oheavyoil.hh b/dumux/material/fluidsystems/h2oheavyoil.hh
index 45ebf44435a496b3819859979c6c1cd84f7266e0..4c93f9a28646b8a671d904416d1573ed30abde0b 100644
--- a/dumux/material/fluidsystems/h2oheavyoil.hh
+++ b/dumux/material/fluidsystems/h2oheavyoil.hh
@@ -184,11 +184,13 @@ public:
      */
     static std::string phaseName(int phaseIdx)
     {
-        switch (phaseIdx) {
-            case wPhaseIdx: return "w";
-            case nPhaseIdx: return "n";
-            case gPhaseIdx: return "g";
-        };
+        assert(0 <= phaseIdx && phaseIdx < numPhases);
+        switch (phaseIdx)
+        {
+            case wPhaseIdx: return "Water";
+            case nPhaseIdx: return "NAPL";
+            case gPhaseIdx: return "Gas";
+        }
         DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
 
diff --git a/dumux/material/fluidsystems/h2on2.hh b/dumux/material/fluidsystems/h2on2.hh
index 68f8ba5b610029af2801249b44eee06502b0349a..cd834ba386febacf2c24c166a9f796fe188b79ef 100644
--- a/dumux/material/fluidsystems/h2on2.hh
+++ b/dumux/material/fluidsystems/h2on2.hh
@@ -100,11 +100,15 @@ public:
      *
      * \param phaseIdx The index of the fluid phase to consider
      */
-    static const std::string& phaseName(int phaseIdx)
+    static std::string phaseName(int phaseIdx)
     {
-        static const std::string name[] = { std::string("w"), std::string("n") };
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        return name[phaseIdx];
+        switch (phaseIdx)
+        {
+            case liquidPhaseIdx: return "Water";
+            case gasPhaseIdx: return "Nitrogen";
+        }
+        DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
 
     /*!
diff --git a/dumux/material/fluidsystems/h2on2o2.hh b/dumux/material/fluidsystems/h2on2o2.hh
index b0a32cb97b58ff9d84a4bbcc33d969f770eec481..b1e963919523b3f469fea5294ee44abc87f4eb70 100644
--- a/dumux/material/fluidsystems/h2on2o2.hh
+++ b/dumux/material/fluidsystems/h2on2o2.hh
@@ -119,15 +119,15 @@ public:
      *
      * \param phaseIdx The index of the fluid phase to consider
      */
-    static const std::string& phaseName(int phaseIdx)
+    static std::string phaseName(int phaseIdx)
     {
-        static const std::string name[] = {
-            std::string("l"),
-            std::string("g")
-        };
-
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        return name[phaseIdx];
+        switch (phaseIdx)
+        {
+            case liquidPhaseIdx: return "Water";
+            case gasPhaseIdx: return "Nitrogen";
+        }
+        DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
 
     /*!
diff --git a/dumux/material/fluidsystems/spe5.hh b/dumux/material/fluidsystems/spe5.hh
index bfdbef98bdba61855ce955a38e9ee3fe6c67c7c5..597bdb07bcb29d0cadcdd69fff2e83578d1e48d8 100644
--- a/dumux/material/fluidsystems/spe5.hh
+++ b/dumux/material/fluidsystems/spe5.hh
@@ -86,14 +86,14 @@ public:
      */
     static std::string phaseName(int phaseIdx)
     {
-        static std::string name[] = {
-            std::string("g"),
-            std::string("w"),
-            std::string("o"),
-        };
-
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        return name[phaseIdx];
+        switch (phaseIdx)
+        {
+            case gPhaseIdx: return "Gas";
+            case wPhaseIdx: return "Water";
+            case oPhaseIdx: return "Oil";
+        }
+        DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
 
     /*!
diff --git a/test/porousmediumflow/mpnc/implicit/combustionfluidsystem.hh b/test/porousmediumflow/mpnc/implicit/combustionfluidsystem.hh
index e3b95e4bc0f007a96d64bf7e8b8132d280d63131..d1deef98b1fe2ebf38a52bd6b971ec76a26c1d8f 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionfluidsystem.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionfluidsystem.hh
@@ -86,14 +86,14 @@ public:
      */
     static std::string phaseName(int phaseIdx)
     {
-        static std::string name[] = {
-            std::string("w"),
-            std::string("n"),
-            std::string("s")
-        };
-
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        return name[phaseIdx];
+        switch (phaseIdx)
+        {
+            case wPhaseIdx: return "Water";
+            case nPhaseIdx: return "Nitrogen";
+            case sPhaseIdx: return "Solid";
+        }
+        DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
 
     /*!