diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
index 3d254324b6..60b418053b 100644
--- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
+++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
@@ -42,7 +42,7 @@ thermalBaffleFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    turbulentTemperatureCoupledBaffleMixedFvPatchScalarField(p, iF),
+    turbulentTemperatureRadCoupledMixedFvPatchScalarField(p, iF),
     owner_(false),
     baffle_(),
     dict_(dictionary::null)
@@ -58,7 +58,7 @@ thermalBaffleFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+    turbulentTemperatureRadCoupledMixedFvPatchScalarField
     (
         ptf,
         p,
@@ -79,7 +79,7 @@ thermalBaffleFvPatchScalarField
     const dictionary& dict
 )
 :
-    turbulentTemperatureCoupledBaffleMixedFvPatchScalarField(p, iF, dict),
+    turbulentTemperatureRadCoupledMixedFvPatchScalarField(p, iF, dict),
     owner_(false),
     baffle_(),
     dict_(dict)
@@ -134,7 +134,7 @@ thermalBaffleFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    turbulentTemperatureCoupledBaffleMixedFvPatchScalarField(ptf, iF),
+    turbulentTemperatureRadCoupledMixedFvPatchScalarField(ptf, iF),
     owner_(ptf.owner_),
     baffle_(ptf.baffle_),
     dict_(ptf.dict_)
@@ -177,13 +177,13 @@ void thermalBaffleFvPatchScalarField::updateCoeffs()
         baffle_->evolve();
     }
 
-    turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs();
+    turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs();
 }
 
 
 void thermalBaffleFvPatchScalarField::write(Ostream& os) const
 {
-    turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::write(os);
+    turbulentTemperatureRadCoupledMixedFvPatchScalarField::write(os);
 
     const fvMesh& thisMesh = patch().boundaryMesh().mesh();
 
diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H
index 4097f05564..035e0fe866 100644
--- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H
+++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H
@@ -50,9 +50,11 @@ Description
         type                compressible::temperatureThermoBaffle;
 
         // Coupled boundary condition
-        neighbourFieldName  T;
-        kappa               fluidThermo;
-        KName               none;
+        Tnbr                T;
+        kappa               fluidThermo; // or solidThermo
+        KappaName           none;
+        QrNbr               Qr; // or none.Name of Qr field on neighbour region
+        Qr                  Qr; // or none.Name of Qr field on local region
 
 
         // Thermo baffle model
@@ -111,7 +113,7 @@ Description
     \endverbatim
 
 SeeAlso
-    Foam::turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+    Foam::turbulentTemperatureRadCoupledMixedFvPatchScalarField
     Foam::regionModels::thermalBaffleModels::thermalBaffleModel
 
 SourceFiles
@@ -126,7 +128,7 @@ SourceFiles
 #include "autoPtr.H"
 #include "regionModel.H"
 #include "thermalBaffleModel.H"
-#include "turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H"
+#include "turbulentTemperatureRadCoupledMixedFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -142,7 +144,7 @@ namespace compressible
 
 class thermalBaffleFvPatchScalarField
 :
-    public turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+    public turbulentTemperatureRadCoupledMixedFvPatchScalarField
 {
     // Private data
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict
index c325fcd699..5582d92c36 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict
@@ -23,9 +23,11 @@ dictionaryReplacement
             "region0_to.*"
             {
                 type                compressible::thermalBaffle;
-                neighbourFieldName  T;
+                Tnbr                T;
                 kappa               solidThermo;
                 kappaName           none;
+                QrNbr               none;
+                Qr                  none;
                 value               uniform 300;
             }
             baffleFaces2_side
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
index bcbf67f06d..a16a520686 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
@@ -94,9 +94,11 @@ dictionaryReplacement
                 type                compressible::thermalBaffle;
 
                 // Coupled BC.
-                neighbourFieldName  T;
+                Tnbr                T;
                 kappa               fluidThermo;
                 kappaName           none;
+                QrNbr               none;
+                Qr                  none;
 
                 // Thermo baffle model
                 thermalBaffleModel   thermalBaffle;