diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C
index 36ac002845484f47dd01e14d27b3c119a5176410..c87faab832c01d90347ec6b26891823eac0c42f9 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C
@@ -66,14 +66,14 @@ void icoPolynomial<PolySize>::write(Ostream& os) const
 {
     specie::write(os);
 
-    dictionaryEntry dict("equationOfState");
+    dictionary dict("equationOfState");
     dict.add
     (
         word("rhoCoeffs<" + Foam::name(PolySize) + '>'),
         rhoCoeffs_/this->W()
     );
 
-    os  << dict;
+    os  << dict.dictName() << nl << dict;
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressible/incompressible.C b/src/thermophysicalModels/specie/equationOfState/incompressible/incompressible.C
index 8f658e92c128277175c10eadc533420a4af6c0d7..c9a0b81989b6c93ac08800a2222983428eee561f 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressible/incompressible.C
+++ b/src/thermophysicalModels/specie/equationOfState/incompressible/incompressible.C
@@ -50,10 +50,10 @@ void Foam::incompressible::write(Ostream& os) const
 {
     specie::write(os);
 
-    dictionaryEntry dict("equationOfState");
+    dictionary dict("equationOfState");
     dict.add("rho", rho_);
 
-    os  << dict;
+    os  << dict.dictName() << nl << dict;
 }
 
 
diff --git a/src/thermophysicalModels/specie/specie/specie.C b/src/thermophysicalModels/specie/specie/specie.C
index e361c21bd7f72b172a38af7a25f26142d27eee7f..6ae423bf2e915fe8f67e8ce49e15168f54b2e67c 100644
--- a/src/thermophysicalModels/specie/specie/specie.C
+++ b/src/thermophysicalModels/specie/specie/specie.C
@@ -63,10 +63,10 @@ Foam::specie::specie(const dictionary& dict)
 
 void Foam::specie::write(Ostream& os) const
 {
-    dictionaryEntry dict("specie");
+    dictionary dict("specie");
     dict.add("nMoles", nMoles_);
     dict.add("molWeight", molWeight_);
-    os  << dict;
+    os  << dict.dictName() << nl << dict;
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
index 6f154ce181744f323173179aa7360dce00c9d3eb..cd36e3d6aab505936f7304f475f399516af0dced 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
@@ -55,10 +55,10 @@ void Foam::eConstThermo<EquationOfState>::write(Ostream& os) const
 {
     EquationOfState::write(os);
 
-    dictionaryEntry dict("thermodynamics");
+    dictionary dict("thermodynamics");
     dict.add("Cv", Cv_);
     dict.add("Hf", Hf_);
-    os  << dict;
+    os  << dict.dictName() << nl << dict;
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
index 857d53eed6541ec9c12f36bbcb2d06fcbaccedc2..ca3ee834a2f8fd3d59421aa44b7ccb2f2379bb6b 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
@@ -55,10 +55,10 @@ void Foam::hConstThermo<equationOfState>::write(Ostream& os) const
 {
     equationOfState::write(os);
 
-    dictionaryEntry dict("thermodynamics");
+    dictionary dict("thermodynamics");
     dict.add("Cp", Cp_);
     dict.add("Hf", Hf_);
-    os  << dict;
+    os  << dict.dictName() << nl << dict;
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
index 319c7af5fb5d5892eeb1737200ddc4a8ec7790fa..7de0696cf5d2bdbda90312414e7711c35a9fe8be 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
@@ -100,7 +100,7 @@ void Foam::hPolynomialThermo<EquationOfState, PolySize>::write
 {
     EquationOfState::write(os);
 
-    dictionaryEntry dict("thermodynamics");
+    dictionary dict("thermodynamics");
     dict.add("Hf", Hf_);
     dict.add("Sf", Sf_);
     dict.add
@@ -108,7 +108,7 @@ void Foam::hPolynomialThermo<EquationOfState, PolySize>::write
         word("CpCoeffs<" + Foam::name(PolySize) + '>'),
         CpCoeffs_/this->W()
     );
-    os  << dict;
+    os  << dict.dictName() << nl << dict;
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
index aa744f2532b151e88ecedec0048faf2bcec033e1..f254236c47689c853d38d4d8e905593007b5324f 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
@@ -102,13 +102,13 @@ void Foam::janafThermo<EquationOfState>::write(Ostream& os) const
 {
     EquationOfState::write(os);
 
-    dictionaryEntry dict("thermodynamics");
+    dictionary dict("thermodynamics");
     dict.add("Tlow", Tlow_);
     dict.add("Thigh", Thigh_);
     dict.add("Tcommon", Tcommon_);
     dict.add("highCpCoeffs", highCpCoeffs_);
     dict.add("lowCpCoeffs", lowCpCoeffs_);
-    os  << dict;
+    os  << dict.dictName() << nl << dict;
 }
 
 
diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.C b/src/thermophysicalModels/specie/transport/const/constTransport.C
index 373404d04b7c1315f69dc103492669a54970d928..5ec86a7d3b27fdffe4e5a99797b49cd157c75347 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransport.C
+++ b/src/thermophysicalModels/specie/transport/const/constTransport.C
@@ -58,10 +58,10 @@ void Foam::constTransport<Thermo>::constTransport::write(Ostream& os) const
 
     Thermo::write(os);
 
-    dictionaryEntry dict("transport");
+    dictionary dict("transport");
     dict.add("mu", mu_);
     dict.add("Pr", 1.0/rPr_);
-    os  << dict;
+    os  << dict.dictName() << nl << dict;
 
     os  << decrIndent << token::END_BLOCK << nl;
 }
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
index 98db9a794c8b9ae75ad51b3a4808a06a0b94280a..b67a72d8908b19f4a5bfcc83f3a9b1f65a7e084f 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
@@ -77,7 +77,7 @@ void Foam::polynomialTransport<Thermo, PolySize>::write(Ostream& os) const
 
     Thermo::write(os);
 
-    dictionaryEntry dict("transport");
+    dictionary dict("transport");
     dict.add
     (
         word("muCoeffs<" + Foam::name(PolySize) + '>'),
@@ -88,7 +88,7 @@ void Foam::polynomialTransport<Thermo, PolySize>::write(Ostream& os) const
         word("kappaCoeffs<" + Foam::name(PolySize) + '>'),
         kappaCoeffs_/this->W()
     );
-    os  << dict;
+    os  << dict.dictName() << nl << dict;
 
     os  << decrIndent << token::END_BLOCK << nl;
 }
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
index bb63dbadac3228c175babac811cbe594b20b00ef..08b270aceadf2d3505e4266a1db6e5ee49c19952 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
@@ -58,10 +58,10 @@ void Foam::sutherlandTransport<Thermo>::write(Ostream& os) const
 
     Thermo::write(os);
 
-    dictionaryEnrtry dict("transport");
+    dictionary dict("transport");
     dict.add("As", As_);
     dict.add("Ts", Ts_);
-    os  << dict;
+    os  << dict.dictName() << nl << dict;
 
     os  << decrIndent << token::END_BLOCK << nl;
 }