diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C
index f311eb4761b4181dfc95b4cf11bf4ab568fa8627..a814b96852882849d7f5e9efca58c8b799c48683 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C
@@ -44,7 +44,7 @@ autoPtr<filmThermoModel> filmThermoModel::New
     const dictionary& dict
 )
 {
-    word modelType(dict.get<word>("filmThermoModel"));
+    const word modelType(dict.get<word>("filmThermoModel"));
 
     Info<< "    Selecting filmThermoModel " << modelType << endl;
 
diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
index 6d1082805540074d91156501d50a9c5c07756dca..e96f92639398ad46567d8c42e165a16ec81bc11f 100644
--- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
+++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015-2018 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2015-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ Foam::radiation::boundaryRadiationPropertiesPatch::New
     const polyPatch& pp
 )
 {
-    word modelType(dict.lookupCompat("type", {{"mode", 1812}}));
+    const word modelType(dict.getCompat<word>("type", {{"mode", 1812}}));
 
     Info<< "Selecting boundary radiation Model: "
         << modelType << endl;
diff --git a/src/waveModels/waveModel/waveModelNew.C b/src/waveModels/waveModel/waveModelNew.C
index 5d452594cbfbd15cbc3db349c16611dcbbde61e2..6c07dc29b778243c6f18d925ea6018da3b157eac 100644
--- a/src/waveModels/waveModel/waveModelNew.C
+++ b/src/waveModels/waveModel/waveModelNew.C
@@ -48,7 +48,7 @@ Foam::autoPtr<Foam::waveModel> Foam::waveModel::New
         )
     );
 
-    word modelType = "none";
+    word modelType("none");
     dictionary patchDict;
     if (waveDict.found(patch.name()))
     {
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties
index c0d2e8686409b1019af4fbf25e11e2ce004e16bc..57594a617537391e65c308254292b42a6d7e980b 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties
@@ -29,5 +29,4 @@ inlet
     absorptivity    0.9;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties
index 59430dda024f6ccf841f6124d16296ce7a2964a5..0d8498890407abddf2e8ea948a2a206cacaa73b6 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties
@@ -15,6 +15,13 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+".*"
+{
+    type            lookup;
+    emissivity      1.0;
+    absorptivity    1.0;
+    transmissivity  0.0;
+}
 
 region0_to_pyrolysisRegion_coupledWall
 {
@@ -25,13 +32,4 @@ region0_to_pyrolysisRegion_coupledWall
     }
 }
 
-".*"
-{
-    type            lookup;
-    emissivity      1.0;
-    absorptivity    1.0;
-    transmissivity  0.0;
-}
-
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/boundaryRadiationProperties
index 397bae330be4d515616c62d2732c287c4527702a..c0cd21bce3c41209ad5ab3129491e795d18785c4 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/boundaryRadiationProperties
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/boundaryRadiationProperties
@@ -15,7 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 ".*"
 {
     type            lookup;
@@ -31,5 +30,4 @@ FoamFile
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/boundaryRadiationProperties
index 0873938f8c8dba76f0d25694e8e9d626f0d6b6f8..5a0d6c2cc26a96b9cc619b5b2da6241e0d06e72e 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/boundaryRadiationProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/boundaryRadiationProperties
@@ -39,5 +39,4 @@ inlet
     emissivity      1.0;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/boundaryRadiationProperties
index 3d597f2a67b1dcbe37f5b894165576d7439cc57d..dab7e2979881746903e8ee1e6af48b06ea752c46 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/boundaryRadiationProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/boundaryRadiationProperties
@@ -21,5 +21,4 @@ FoamFile
     emissivity      1.0;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/boundaryRadiationProperties b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/boundaryRadiationProperties
index 76b5b1030b548b40d26b8849703d3921fa99d67e..be4b67e973be237ffa88af0ea05bbdaafd6cf3f1 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/boundaryRadiationProperties
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/boundaryRadiationProperties
@@ -17,10 +17,9 @@ FoamFile
 
 ".*"
 {
-    mode            lookup;
+    type            lookup;
     emissivity      1;
     absorptivity    0;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/boundaryRadiationProperties
index c7aace78679c552d4237aa07d9c46c5d900daec9..01ed536a7d85a29969f440b9addb85714283eb50 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/boundaryRadiationProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/boundaryRadiationProperties
@@ -22,5 +22,4 @@ FoamFile
     absorptivity    1.0;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties
index c7aace78679c552d4237aa07d9c46c5d900daec9..01ed536a7d85a29969f440b9addb85714283eb50 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties
@@ -22,5 +22,4 @@ FoamFile
     absorptivity    1.0;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties
index c7aace78679c552d4237aa07d9c46c5d900daec9..01ed536a7d85a29969f440b9addb85714283eb50 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties
@@ -22,5 +22,4 @@ FoamFile
     absorptivity    1.0;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/boundaryRadiationProperties
index 0ab2c1e8494e929481f0c4971641e75cdc17f32c..29f0e981c64c27768abf5cb84444a512985bc239 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/boundaryRadiationProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/boundaryRadiationProperties
@@ -73,3 +73,5 @@ ZMin
         emissivity      (0.3 0.7);
     };
 }
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties
index 5886f0d2c477f9572a90ed5746e21476c02d689c..3bffba0aa68b937a9cf9abd41063306488e4b2cd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties
@@ -15,7 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 ".*"
 {
     type            lookup;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties
index adabddc64188ef6f23cb385dbd62e6e6bf912a39..0760baff80b429384b2b49740fbbfe62b119ad32 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties
@@ -15,10 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 ".*"
 {
-    mode            lookup;
+    type            lookup;
     emissivity      1.0;
     absorptivity    0.0;
 }