diff --git a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/Make/files b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/Make/files
index 6c86e9a9c..83341cec2 100644
--- a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/Make/files
+++ b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/Make/files
@@ -34,10 +34,10 @@ $(BCs)/extendedWallHeatTransfer/extendedWallHeatTransferFvPatchScalarField.C
 
 $(BCs)/externalRadiation/externalRadiationSource/externalRadiationSource.C
 $(BCs)/externalRadiation/externalRadiationSource/newExternalRadiationSource.C
-$(BCs)/externalRadiation/constantFlux/constantFlux.C
-$(BCs)/externalRadiation/viewFactor/viewFactor.C
-$(BCs)/externalRadiation/planeToCylinder/planeToCylinder.C
-$(BCs)/externalRadiation/pointSource/pointSource.C
+$(BCs)/externalRadiation/ersConstantFlux/ersConstantFlux.C
+$(BCs)/externalRadiation/ersViewFactor/ersViewFactor.C
+$(BCs)/externalRadiation/ersPlaneToCylinder/ersPlaneToCylinder.C
+$(BCs)/externalRadiation/ersPointSource/ersPointSource.C
 $(BCs)/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.C
 $(BCs)/adiabatic/adiabaticFvPatchScalarField.C
 
diff --git a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/constantFlux/constantFlux.C b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersConstantFlux/ersConstantFlux.C
similarity index 87%
rename from applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/constantFlux/constantFlux.C
rename to applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersConstantFlux/ersConstantFlux.C
index a92487022..a9571bd18 100644
--- a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/constantFlux/constantFlux.C
+++ b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersConstantFlux/ersConstantFlux.C
@@ -24,18 +24,18 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "constantFlux.H"
+#include "ersConstantFlux.H"
 #include "addToRunTimeSelectionTable.H"
 
 namespace Foam
 {
 
-defineTypeNameAndDebug(constantFlux, 0);
-addToRunTimeSelectionTable(externalRadiationSource, constantFlux, dictionary);
+defineTypeNameAndDebug(ersConstantFlux, 0);
+addToRunTimeSelectionTable(externalRadiationSource, ersConstantFlux, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-constantFlux::constantFlux
+ersConstantFlux::ersConstantFlux
 (
     const word& name,
     const dictionary& dict,
@@ -46,7 +46,7 @@ constantFlux::constantFlux
     q_("q", dict, p.size())
 {}
 
-constantFlux::constantFlux
+ersConstantFlux::ersConstantFlux
 (
     const word& name
 )
@@ -57,7 +57,7 @@ constantFlux::constantFlux
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void constantFlux::write(Ostream& os) const
+void ersConstantFlux::write(Ostream& os) const
 {
     externalRadiationSource::write(os);
 
diff --git a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/constantFlux/constantFlux.H b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersConstantFlux/ersConstantFlux.H
similarity index 92%
rename from applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/constantFlux/constantFlux.H
rename to applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersConstantFlux/ersConstantFlux.H
index 7c7ad3edb..edc7c7da4 100644
--- a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/constantFlux/constantFlux.H
+++ b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersConstantFlux/ersConstantFlux.H
@@ -23,19 +23,19 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::constantFlux
+    Foam::ersConstantFlux
 
 Description
     helper class to sum up external radiation sources
 
       
 SourceFiles
-    constantFlux.C
+    ersConstantFlux.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef constantFlux_H
-#define constantFlux_H
+#ifndef ersConstantFlux_H
+#define ersConstantFlux_H
 
 #include "externalRadiationSource.H"
 
@@ -48,7 +48,7 @@ namespace Foam
                   Class wallHeatTransferFvPatch Declaration
 \*---------------------------------------------------------------------------*/
 
-class constantFlux
+class ersConstantFlux
 :
     public externalRadiationSource
 {
@@ -67,14 +67,14 @@ public:
     // Constructors
 
         //- Construct from components
-        explicit constantFlux
+        explicit ersConstantFlux
         (
             const word& name,
             const dictionary& dict,
             const fvPatch& p
         );
 
-        explicit constantFlux
+        explicit ersConstantFlux
         (
             const word& name
         );
@@ -84,13 +84,13 @@ public:
         {
             return autoPtr<externalRadiationSource>
             (
-                new constantFlux(*this)
+                new ersConstantFlux(*this)
             );
         }
 
     // Destructor
 
-        virtual ~constantFlux()
+        virtual ~ersConstantFlux()
         {};
 
 
diff --git a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/planeToCylinder/planeToCylinder.C b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPlaneToCylinder/ersPlaneToCylinder.C
similarity index 85%
rename from applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/planeToCylinder/planeToCylinder.C
rename to applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPlaneToCylinder/ersPlaneToCylinder.C
index cc6cd021a..b795291e1 100644
--- a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/planeToCylinder/planeToCylinder.C
+++ b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPlaneToCylinder/ersPlaneToCylinder.C
@@ -24,25 +24,25 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "planeToCylinder.H"
+#include "ersPlaneToCylinder.H"
 #include "addToRunTimeSelectionTable.H"
 
 namespace Foam
 {
 
-defineTypeNameAndDebug(planeToCylinder, 0);
-addToRunTimeSelectionTable(externalRadiationSource, planeToCylinder, dictionary);
+defineTypeNameAndDebug(ersPlaneToCylinder, 0);
+addToRunTimeSelectionTable(externalRadiationSource, ersPlaneToCylinder, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-planeToCylinder::planeToCylinder
+ersPlaneToCylinder::ersPlaneToCylinder
 (
     const word& name,
     const dictionary& dict,
     const fvPatch& p
 )
 :
-    viewFactor(name, dict),
+    ersViewFactor(name, dict),
     direction_(dict.lookup("direction"))
 {
     scalarField cosBeta = (direction_ & p.Sf()/p.magSf());
@@ -52,9 +52,9 @@ planeToCylinder::planeToCylinder
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void planeToCylinder::write(Ostream& os) const
+void ersPlaneToCylinder::write(Ostream& os) const
 {
-    viewFactor::write(os);
+    ersViewFactor::write(os);
     os.writeKeyword("direction") << direction_ << token::END_STATEMENT << nl;
 }
 
diff --git a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/planeToCylinder/planeToCylinder.H b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPlaneToCylinder/ersPlaneToCylinder.H
similarity index 89%
rename from applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/planeToCylinder/planeToCylinder.H
rename to applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPlaneToCylinder/ersPlaneToCylinder.H
index 56c6f932e..146d9feef 100644
--- a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/planeToCylinder/planeToCylinder.H
+++ b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPlaneToCylinder/ersPlaneToCylinder.H
@@ -23,21 +23,21 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::planeToCylinder
+    Foam::ersPlaneToCylinder
 
 Description
     helper class to sum up external radiation sources
 
       
 SourceFiles
-    planeToCylinder.C
+    ersPlaneToCylinder.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef planeToCylinder_H
-#define planeToCylinder_H
+#ifndef ersPlaneToCylinder_H
+#define ersPlaneToCylinder_H
 
-#include "viewFactor.H"
+#include "ersViewFactor.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,9 +48,9 @@ namespace Foam
                   Class wallHeatTransferFvPatch Declaration
 \*---------------------------------------------------------------------------*/
 
-class planeToCylinder
+class ersPlaneToCylinder
 :
-    public viewFactor
+    public ersViewFactor
 {
     // Private data
 
@@ -67,7 +67,7 @@ public:
     // Constructors
 
         //- Construct from components
-        explicit planeToCylinder
+        explicit ersPlaneToCylinder
         (
             const word& name,
             const dictionary& dict,
@@ -80,13 +80,13 @@ public:
         {
             return autoPtr<externalRadiationSource>
             (
-                new planeToCylinder(*this)
+                new ersPlaneToCylinder(*this)
             );
         }
 
     // Destructor
 
-        virtual ~planeToCylinder()
+        virtual ~ersPlaneToCylinder()
         {};
 
 
diff --git a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/pointSource/pointSource.C b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPointSource/ersPointSource.C
similarity index 88%
rename from applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/pointSource/pointSource.C
rename to applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPointSource/ersPointSource.C
index de8b9e447..5290e14d0 100644
--- a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/pointSource/pointSource.C
+++ b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPointSource/ersPointSource.C
@@ -24,25 +24,25 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "pointSource.H"
+#include "ersPointSource.H"
 #include "addToRunTimeSelectionTable.H"
 
 namespace Foam
 {
 
-defineTypeNameAndDebug(pointSource, 0);
-addToRunTimeSelectionTable(externalRadiationSource, pointSource, dictionary);
+defineTypeNameAndDebug(ersPointSource, 0);
+addToRunTimeSelectionTable(externalRadiationSource, ersPointSource, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-pointSource::pointSource
+ersPointSource::ersPointSource
 (
     const word& name,
     const dictionary& dict,
     const fvPatch& p
 )
 :
-    constantFlux(name),
+    ersConstantFlux(name),
     qmax_(readScalar(dict.lookup("qmax"))),
     alpha_(readScalar(dict.lookup("alpha"))),
     direction_(dict.lookup("direction"))
@@ -53,9 +53,9 @@ pointSource::pointSource
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void pointSource::write(Ostream& os) const
+void ersPointSource::write(Ostream& os) const
 {
-    constantFlux::write(os);
+    ersConstantFlux::write(os);
     os.writeKeyword("qmax") << qmax_ << token::END_STATEMENT << nl;
     os.writeKeyword("alpha") << alpha_ << token::END_STATEMENT << nl;
     os.writeKeyword("direction") << direction_ << token::END_STATEMENT << nl;
diff --git a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/pointSource/pointSource.H b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPointSource/ersPointSource.H
similarity index 89%
rename from applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/pointSource/pointSource.H
rename to applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPointSource/ersPointSource.H
index 17462887d..654e34880 100644
--- a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/pointSource/pointSource.H
+++ b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersPointSource/ersPointSource.H
@@ -23,21 +23,21 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::pointSource
+    Foam::ersPointSource
 
 Description
     helper class to sum up external radiation sources
 
       
 SourceFiles
-    pointSource.C
+    ersPointSource.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef pointSource_H
-#define pointSource_H
+#ifndef ersPointSource_H
+#define ersPointSource_H
 
-#include "constantFlux.H"
+#include "ersConstantFlux.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,9 +48,9 @@ namespace Foam
                   Class wallHeatTransferFvPatch Declaration
 \*---------------------------------------------------------------------------*/
 
-class pointSource
+class ersPointSource
 :
-    public constantFlux
+    public ersConstantFlux
 {
     // Private data
 
@@ -60,7 +60,7 @@ class pointSource
         //- radiation absorptivity
         scalar alpha_;
 
-        //- Direction of the pointSource
+        //- Direction of the ersPointSource
         vector direction_;
 
 public:
@@ -72,7 +72,7 @@ public:
     // Constructors
 
         //- Construct from components
-        explicit pointSource
+        explicit ersPointSource
         (
             const word& name,
             const dictionary& dict,
@@ -85,13 +85,13 @@ public:
         {
             return autoPtr<externalRadiationSource>
             (
-                new pointSource(*this)
+                new ersPointSource(*this)
             );
         }
 
     // Destructor
 
-        virtual ~pointSource()
+        virtual ~ersPointSource()
         {};
 
 
diff --git a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/viewFactor/viewFactor.C b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersViewFactor/ersViewFactor.C
similarity index 89%
rename from applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/viewFactor/viewFactor.C
rename to applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersViewFactor/ersViewFactor.C
index 9c37ba57e..66d4ef3b2 100644
--- a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/viewFactor/viewFactor.C
+++ b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersViewFactor/ersViewFactor.C
@@ -24,19 +24,19 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "viewFactor.H"
+#include "ersViewFactor.H"
 #include "addToRunTimeSelectionTable.H"
 #include "radiationConstants.H"
 
 namespace Foam
 {
 
-defineTypeNameAndDebug(viewFactor, 0);
-addToRunTimeSelectionTable(externalRadiationSource, viewFactor, dictionary);
+defineTypeNameAndDebug(ersViewFactor, 0);
+addToRunTimeSelectionTable(externalRadiationSource, ersViewFactor, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-viewFactor::viewFactor
+ersViewFactor::ersViewFactor
 (
     const word& name,
     const dictionary& dict,
@@ -49,7 +49,7 @@ viewFactor::viewFactor
     epsilon_(readScalar(dict.lookup("epsilon")))
 {}
 
-viewFactor::viewFactor
+ersViewFactor::ersViewFactor
 (
     const word& name,
     const dictionary& dict
@@ -63,7 +63,7 @@ viewFactor::viewFactor
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<scalarField> viewFactor::q
+tmp<scalarField> ersViewFactor::q
 (
     const scalarField& Tw
 ) const
@@ -72,7 +72,7 @@ tmp<scalarField> viewFactor::q
 }
 
 
-void viewFactor::write(Ostream& os) const
+void ersViewFactor::write(Ostream& os) const
 {
     externalRadiationSource::write(os);
 
diff --git a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/viewFactor/viewFactor.H b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersViewFactor/ersViewFactor.H
similarity index 93%
rename from applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/viewFactor/viewFactor.H
rename to applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersViewFactor/ersViewFactor.H
index 35a687a6b..537492424 100644
--- a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/viewFactor/viewFactor.H
+++ b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatTransfer/fvPatchFields/externalRadiation/ersViewFactor/ersViewFactor.H
@@ -23,19 +23,19 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::viewFactor
+    Foam::ersViewFactor
 
 Description
     helper class to sum up external radiation sources
 
       
 SourceFiles
-    viewFactor.C
+    ersViewFactor.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef viewFactor_H
-#define viewFactor_H
+#ifndef ersViewFactor_H
+#define ersViewFactor_H
 
 #include "externalRadiationSource.H"
 
@@ -48,7 +48,7 @@ namespace Foam
                   Class wallHeatTransferFvPatch Declaration
 \*---------------------------------------------------------------------------*/
 
-class viewFactor
+class ersViewFactor
 :
     public externalRadiationSource
 {
@@ -72,7 +72,7 @@ public:
     // Constructors
 
         //- Construct from components
-        explicit viewFactor
+        explicit ersViewFactor
         (
             const word& name,
             const dictionary& dict,
@@ -81,7 +81,7 @@ public:
 
 
         //- Construct from components
-        explicit viewFactor
+        explicit ersViewFactor
         (
             const word& name,
             const dictionary& dict
@@ -93,13 +93,13 @@ public:
         {
             return autoPtr<externalRadiationSource>
             (
-                new viewFactor(*this)
+                new ersViewFactor(*this)
             );
         }
 
     // Destructor
 
-        virtual ~viewFactor()
+        virtual ~ersViewFactor()
         {};