diff --git a/applications/solvers/combustion/PDRFoam/Make/files b/applications/solvers/combustion/PDRFoam/Make/files
index 889eebc33e62a385afca9d096fc59ff4aa53eade..d1b1d5a8f8094b334bef4982922133167ac3da17 100644
--- a/applications/solvers/combustion/PDRFoam/Make/files
+++ b/applications/solvers/combustion/PDRFoam/Make/files
@@ -1,25 +1,25 @@
XiModels/XiModel/XiModel.C
-XiModels/XiModel/newXiModel.C
+XiModels/XiModel/XiModelNew.C
XiModels/fixed/fixed.C
XiModels/algebraic/algebraic.C
XiModels/transport/transport.C
XiModels/XiEqModels/XiEqModel/XiEqModel.C
-XiModels/XiEqModels/XiEqModel/newXiEqModel.C
+XiModels/XiEqModels/XiEqModel/XiEqModelNew.C
XiModels/XiEqModels/Gulder/Gulder.C
XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C
XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C
XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
XiModels/XiGModels/XiGModel/XiGModel.C
-XiModels/XiGModels/XiGModel/newXiGModel.C
+XiModels/XiGModels/XiGModel/XiGModelNew.C
XiModels/XiGModels/KTS/KTS.C
XiModels/XiGModels/instabilityG/instabilityG.C
PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
PDRModels/dragModels/PDRDragModel/PDRDragModel.C
-PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
+PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
PDRModels/dragModels/basic/basic.C
PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
similarity index 100%
rename from applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
rename to applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C
similarity index 100%
rename from applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C
rename to applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C
similarity index 100%
rename from applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C
rename to applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C
similarity index 100%
rename from applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C
rename to applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C
diff --git a/applications/solvers/combustion/fireFoam/combustionModels/Make/files b/applications/solvers/combustion/fireFoam/combustionModels/Make/files
index 5b1262b70d476c5b469d5fcad4404f3a75f08512..86696b0709373fbb8bb6c63f090564f55b85d740 100644
--- a/applications/solvers/combustion/fireFoam/combustionModels/Make/files
+++ b/applications/solvers/combustion/fireFoam/combustionModels/Make/files
@@ -1,5 +1,5 @@
combustionModel/combustionModel.C
-combustionModel/newCombustionModel.C
+combustionModel/combustionModelNew.C
infinitelyFastChemistry/infinitelyFastChemistry.C
diff --git a/applications/solvers/combustion/fireFoam/combustionModels/combustionModel/newCombustionModel.C b/applications/solvers/combustion/fireFoam/combustionModels/combustionModel/combustionModelNew.C
similarity index 100%
rename from applications/solvers/combustion/fireFoam/combustionModels/combustionModel/newCombustionModel.C
rename to applications/solvers/combustion/fireFoam/combustionModels/combustionModel/combustionModelNew.C
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Make/files b/applications/solvers/multiphase/interPhaseChangeFoam/Make/files
index 5f65a3a4c24cecc960a90944230ab84fee83fdfe..5a7f01e980fb6486431abd7a293e68a7609c8fc6 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/Make/files
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/Make/files
@@ -1,6 +1,6 @@
interPhaseChangeFoam.C
phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
-phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
+phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C
phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
index 0aa466b06ef803a758cdd816c9ac26eff6294956..5c345db148fa39fec5533aabe0c928c814c8deef 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
@@ -28,7 +28,7 @@ Description
SourceFiles
phaseChangeTwoPhaseMixture.C
- newPhaseChangeModel.C
+ phaseChangeModelNew.C
\*---------------------------------------------------------------------------*/
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C
similarity index 100%
rename from applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
rename to applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files
index 8d23cb95501ca817bd2e4e85715828025f76ebcf..cf4603e1f8bb470b31f0b46b70c817c5b2bce94f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files
@@ -1,5 +1,5 @@
dragModels/dragModel/dragModel.C
-dragModels/dragModel/newDragModel.C
+dragModels/dragModel/dragModelNew.C
dragModels/Ergun/Ergun.C
dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
index 4dbcbe86e680697e56728ed92b7dcd1908d9bb1b..7e05bcb46456b59408fe3217f023918643c42296 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
@@ -28,7 +28,7 @@ Description
SourceFiles
dragModel.C
- newDragModel.C
+ dragModelNew.C
\*---------------------------------------------------------------------------*/
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModelNew.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModelNew.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/Make/files b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/Make/files
index a6ff2ca0f0274499ca8c2a400e7b7c1d37f22d0c..43c2f6df9d4e607c79e1e6382e873d72a10d34ee 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/Make/files
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/Make/files
@@ -1,32 +1,32 @@
kineticTheoryModel/kineticTheoryModel.C
viscosityModel/viscosityModel/viscosityModel.C
-viscosityModel/viscosityModel/newViscosityModel.C
+viscosityModel/viscosityModel/viscosityModelNew.C
viscosityModel/Gidaspow/GidaspowViscosity.C
viscosityModel/Syamlal/SyamlalViscosity.C
viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
viscosityModel/none/noneViscosity.C
conductivityModel/conductivityModel/conductivityModel.C
-conductivityModel/conductivityModel/newConductivityModel.C
+conductivityModel/conductivityModel/conductivityModelNew.C
conductivityModel/Gidaspow/GidaspowConductivity.C
conductivityModel/Syamlal/SyamlalConductivity.C
conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
radialModel/radialModel/radialModel.C
-radialModel/radialModel/newRadialModel.C
+radialModel/radialModel/radialModelNew.C
radialModel/CarnahanStarling/CarnahanStarlingRadial.C
radialModel/Gidaspow/GidaspowRadial.C
radialModel/LunSavage/LunSavageRadial.C
radialModel/SinclairJackson/SinclairJacksonRadial.C
granularPressureModel/granularPressureModel/granularPressureModel.C
-granularPressureModel/granularPressureModel/newGranularPressureModel.C
+granularPressureModel/granularPressureModel/granularPressureModelNew.C
granularPressureModel/Lun/LunPressure.C
granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
frictionalStressModel/frictionalStressModel/frictionalStressModel.C
-frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
+frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C
frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModelNew.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModelNew.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModelNew.C
similarity index 100%
rename from applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
rename to applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModelNew.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/Make/files b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/Make/files
index 91b2eccf283d067797f8336d57935a96509293ab..fdd7c3e7b7c7cc2eb3e913bc31f9ff74768976fd 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/Make/files
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/Make/files
@@ -1,5 +1,5 @@
extrudeModel/extrudeModel.C
-extrudeModel/newExtrudeModel.C
+extrudeModel/extrudeModelNew.C
linearNormal/linearNormal.C
linearDirection/linearDirection.C
linearRadial/linearRadial.C
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/newExtrudeModel.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModelNew.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/newExtrudeModel.C
rename to applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModelNew.C
diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/Make/files b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/Make/files
index 77c9217ded71d0e5387e6ac154435516055bf011..96d2bb2a859ad220fd6d1217be82483223f15fc6 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/Make/files
+++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/Make/files
@@ -1,5 +1,5 @@
tabulatedWallFunction/tabulatedWallFunction.C
-tabulatedWallFunction/newTabulatedWallFunction.C
+tabulatedWallFunction/tabulatedWallFunctionNew.C
SpaldingsLaw/SpaldingsLaw.C
general/general.C
diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/newTabulatedWallFunction.C b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C
similarity index 100%
rename from applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/newTabulatedWallFunction.C
rename to applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C
diff --git a/src/ODE/Make/files b/src/ODE/Make/files
index bf01c691309bfa6ccd27a87199384b9a42e12b1b..0e6c49a9157f5670c8361a2f7eedb2be41ce84ba 100644
--- a/src/ODE/Make/files
+++ b/src/ODE/Make/files
@@ -6,7 +6,7 @@ ODESolversRK = ODESolvers/RK
ODESolversSIBS = ODESolvers/SIBS
$(ODESolversODESolver)/ODESolver.C
-$(ODESolversODESolver)/newODESolver.C
+$(ODESolversODESolver)/ODESolverNew.C
$(ODESolversRK)/RK.C
diff --git a/src/ODE/ODESolvers/ODESolver/newODESolver.C b/src/ODE/ODESolvers/ODESolver/ODESolverNew.C
similarity index 100%
rename from src/ODE/ODESolvers/ODESolver/newODESolver.C
rename to src/ODE/ODESolvers/ODESolver/ODESolverNew.C
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 17da5aefef5c108eff6d9aa9e81ca5e23385bb5b..0016b235f13982d1e02d030c8ed10c7fe27808bb 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -258,13 +258,13 @@ $(GAMG)/GAMGSolverSolve.C
GAMGInterfaces = $(GAMG)/interfaces
$(GAMGInterfaces)/GAMGInterface/GAMGInterface.C
-$(GAMGInterfaces)/GAMGInterface/newGAMGInterface.C
+$(GAMGInterfaces)/GAMGInterface/GAMGInterfaceNew.C
$(GAMGInterfaces)/processorGAMGInterface/processorGAMGInterface.C
$(GAMGInterfaces)/cyclicGAMGInterface/cyclicGAMGInterface.C
GAMGInterfaceFields = $(GAMG)/interfaceFields
$(GAMGInterfaceFields)/GAMGInterfaceField/GAMGInterfaceField.C
-$(GAMGInterfaceFields)/GAMGInterfaceField/newGAMGInterfaceField.C
+$(GAMGInterfaceFields)/GAMGInterfaceField/GAMGInterfaceFieldNew.C
$(GAMGInterfaceFields)/processorGAMGInterfaceField/processorGAMGInterfaceField.C
$(GAMGInterfaceFields)/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
@@ -328,7 +328,7 @@ polyMesh = meshes/polyMesh
polyPatches = $(polyMesh)/polyPatches
$(polyPatches)/polyPatch/polyPatch.C
-$(polyPatches)/polyPatch/newPolyPatch.C
+$(polyPatches)/polyPatch/polyPatchNew.C
basicPolyPatches = $(polyPatches)/basic
$(basicPolyPatches)/coupled/coupledPolyPatch.C
@@ -362,15 +362,15 @@ $(zone)/zone.C
cellZone = $(polyMesh)/zones/cellZone
$(cellZone)/cellZone.C
-$(cellZone)/newCellZone.C
+$(cellZone)/cellZoneNew.C
faceZone = $(polyMesh)/zones/faceZone
$(faceZone)/faceZone.C
-$(faceZone)/newFaceZone.C
+$(faceZone)/faceZoneNew.C
pointZone = $(polyMesh)/zones/pointZone
$(pointZone)/pointZone.C
-$(pointZone)/newPointZone.C
+$(pointZone)/pointZoneNew.C
$(polyMesh)/polyMesh.C
$(polyMesh)/polyMeshFromShapeMesh.C
@@ -438,7 +438,7 @@ $(pointMeshMapper)/pointPatchMapper.C
pointPatches = $(pointMesh)/pointPatches
$(pointPatches)/pointPatch/pointPatch.C
$(pointPatches)/facePointPatch/facePointPatch.C
-$(pointPatches)/facePointPatch/newFacePointPatch.C
+$(pointPatches)/facePointPatch/facePointPatchNew.C
basicPointPatches = $(pointPatches)/basic
$(basicPointPatches)/coupled/coupledPointPatch.C
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
index 1b18dbdc218497f86751e78a2091e23f63833c83..764fa5b31b319c84bec901167bcda4037bd0171d 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
@@ -346,6 +346,6 @@ Ostream& operator<<
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "newPointPatchField.C"
+#include "pointPatchFieldNew.C"
// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/newPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
similarity index 100%
rename from src/OpenFOAM/fields/pointPatchFields/pointPatchField/newPointPatchField.C
rename to src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/newGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C
similarity index 100%
rename from src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/newGAMGInterfaceField.C
rename to src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/newGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C
similarity index 100%
rename from src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/newGAMGInterface.C
rename to src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/newFacePointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C
similarity index 100%
rename from src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/newFacePointPatch.C
rename to src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
index f9cbfcad9a3973b8e619861feccf4802326ff333..c9e5a8c8530d42ca7f53a4d8acc33f418749ff61 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
@@ -32,7 +32,7 @@ Description
SourceFiles
polyPatch.C
- newPolyPatch.C
+ polyPatchNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/newPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C
similarity index 100%
rename from src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/newPolyPatch.C
rename to src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
index 2186ba2116e22c0fd33106559c8088a192fc4527..fd0dfc5b11e2fb6570629757d1f193db9dcbe6bb 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
@@ -34,7 +34,7 @@ Description
SourceFiles
cellZone.C
- newCellZone.C
+ cellZoneNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C
similarity index 100%
rename from src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C
rename to src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
index bdfc52bb589b936a2b463052b28590ffcacb7004..291d18db74c419acc7facadd2d5cd46d48562e46 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
@@ -33,7 +33,7 @@ Description
SourceFiles
faceZone.C
- newFaceZone.C
+ faceZoneNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C
similarity index 100%
rename from src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C
rename to src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
index 44f510d958652068f8f838ac233683afe9dbc12a..0aaf2a6a05972f8971922cce4c14162fd46a8faa 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
@@ -35,7 +35,7 @@ Description
SourceFiles
pointZone.C
- newPointZone.C
+ pointZoneNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C
similarity index 100%
rename from src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C
rename to src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C
diff --git a/src/dynamicFvMesh/Make/files b/src/dynamicFvMesh/Make/files
index ca9a99aca6fcaeb8837b1725331977cd89cf075a..ecfb8bc9f7d5dd57b9893504f273c91256c1376a 100644
--- a/src/dynamicFvMesh/Make/files
+++ b/src/dynamicFvMesh/Make/files
@@ -1,5 +1,5 @@
dynamicFvMesh/dynamicFvMesh.C
-dynamicFvMesh/newDynamicFvMesh.C
+dynamicFvMesh/dynamicFvMeshNew.C
staticFvMesh/staticFvMesh.C
dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.C
dynamicInkJetFvMesh/dynamicInkJetFvMesh.C
@@ -8,7 +8,7 @@ dynamicRefineFvMesh/dynamicRefineFvMesh.C
solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
solidBodyMotionFunctions = solidBodyMotionFvMesh/solidBodyMotionFunctions
$(solidBodyMotionFunctions)/solidBodyMotionFunction/solidBodyMotionFunction.C
-$(solidBodyMotionFunctions)/solidBodyMotionFunction/newSolidBodyMotionFunction.C
+$(solidBodyMotionFunctions)/solidBodyMotionFunction/solidBodyMotionFunctionNew.C
$(solidBodyMotionFunctions)/SDA/SDA.C
$(solidBodyMotionFunctions)/tabulated6DoFMotion/tabulated6DoFMotion.C
$(solidBodyMotionFunctions)/linearMotion/linearMotion.C
diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
index 31d68d43efda222d02504406b796b70ba5dcda3e..adfd30fb2cd0644d79f51f707db93e3ea314222e 100644
--- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
+++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
@@ -29,7 +29,7 @@ Description
SourceFiles
dynamicFvMesh.C
- newDynamicFvMesh.C
+ dynamicFvMeshNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/dynamicFvMesh/dynamicFvMesh/newDynamicFvMesh.C b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
similarity index 100%
rename from src/dynamicFvMesh/dynamicFvMesh/newDynamicFvMesh.C
rename to src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H
index 0f0bcb7787b6a128eff1a0776d3b9cb3f3709241..367649d0769f7b537228e9bd99e6f352d539d6ac 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H
@@ -36,7 +36,7 @@ Description
SourceFiles
solidBodyMotionFunction.C
- newDynamicFvMesh.C
+ dynamicFvMeshNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/newSolidBodyMotionFunction.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C
similarity index 100%
rename from src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/newSolidBodyMotionFunction.C
rename to src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C
diff --git a/src/dynamicMesh/Make/files b/src/dynamicMesh/Make/files
index 8201b7236de30acc08aa38d751cb6d1c04cf47cf..02e9ad7ce4c6ea9c7eb9f7298a791cd592221d35 100644
--- a/src/dynamicMesh/Make/files
+++ b/src/dynamicMesh/Make/files
@@ -19,7 +19,7 @@ $(enrichedPatch)/enrichedPatchMasterPoints.C
polyMeshModifier = polyTopoChange/polyMeshModifier
$(polyMeshModifier)/polyMeshModifier.C
-$(polyMeshModifier)/newPolyMeshModifier.C
+$(polyMeshModifier)/polyMeshModifierNew.C
polyTopoChange/polyTopoChange/topoAction/topoActions.C
polyTopoChange/polyTopoChanger/polyTopoChanger.C
diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/newPolyMeshModifier.C b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C
similarity index 100%
rename from src/dynamicMesh/polyTopoChange/polyMeshModifier/newPolyMeshModifier.C
rename to src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C
diff --git a/src/engine/Make/files b/src/engine/Make/files
index 81cb8ea6ba217d6b7975351524478de8d206c725..a11ecaf06fe9df15a560f979e401ce72b2915a74 100644
--- a/src/engine/Make/files
+++ b/src/engine/Make/files
@@ -8,7 +8,7 @@ engineValve/engineValve.C
enginePiston/enginePiston.C
engineMesh/engineMesh/engineMesh.C
-engineMesh/engineMesh/newEngineMesh.C
+engineMesh/engineMesh/engineMeshNew.C
engineMesh/staticEngineMesh/staticEngineMesh.C
engineMesh/layeredEngineMesh/layeredEngineMesh.C
engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C
diff --git a/src/engine/engineMesh/engineMesh/newEngineMesh.C b/src/engine/engineMesh/engineMesh/engineMeshNew.C
similarity index 100%
rename from src/engine/engineMesh/engineMesh/newEngineMesh.C
rename to src/engine/engineMesh/engineMesh/engineMeshNew.C
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index fecd16bd4e8aa8f6bdde2b57527933d75ff70594..f1a91c869d5e96a7c3b6a0fa95dac8a823fc4f9f 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -9,7 +9,7 @@ $(fvBoundaryMesh)/fvBoundaryMesh.C
fvPatches = fvMesh/fvPatches
$(fvPatches)/fvPatch/fvPatch.C
-$(fvPatches)/fvPatch/newFvPatch.C
+$(fvPatches)/fvPatch/fvPatchNew.C
basicFvPatches = $(fvPatches)/basic
$(basicFvPatches)/coupled/coupledFvPatch.C
@@ -334,7 +334,7 @@ $(MRF)/MRFZones.C
SRF = $(general)/SRF
$(SRF)/SRFModel/SRFModel/SRFModel.C
-$(SRF)/SRFModel/SRFModel/newSRFModel.C
+$(SRF)/SRFModel/SRFModel/SRFModelNew.C
$(SRF)/SRFModel/rpm/rpm.C
$(SRF)/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C
similarity index 100%
rename from src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C
rename to src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index 4e7c797c11d1aa23363c2b1bc1f2f383fb885ade..aba51a340415b9dac88acda16cc11106a7d9121d 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -479,6 +479,6 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const fvPatchField<Type>& ptf)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-# include "newFvPatchField.C"
+# include "fvPatchFieldNew.C"
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index 1a8720af0651e5b6660da43fd145214de74bc733..e43423b1b1108284b636c8e002d53cc1a4f96347 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -37,7 +37,7 @@ Description
SourceFiles
fvPatchField.C
- newFvPatchField.C
+ fvPatchFieldNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/newFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
similarity index 100%
rename from src/finiteVolume/fields/fvPatchFields/fvPatchField/newFvPatchField.C
rename to src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
index 10660e68c1c77bcbcb6edb990a0a315b4cc5dd9a..2b0514a5de3a6b1940f64bcf8e4aab5bc7bcbd67 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
@@ -403,6 +403,6 @@ Ostream& operator<<(Ostream& os, const fvsPatchField<Type>& ptf)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-# include "newFvsPatchField.C"
+# include "fvsPatchFieldNew.C"
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index b98fdcd4538f465ddab087fe473b34cd6d9ba48b..85d139ac743a3a1e031f42ae2fb28d0169785b31 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -37,7 +37,7 @@ Description
SourceFiles
fvsPatchField.C
- newFvsPatchField.C
+ fvsPatchFieldNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
similarity index 100%
rename from src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C
rename to src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
index fbadb7cdbeea6ec47f12b825fa2832e77673df20..ddadbd538e74901477dae637dff4d24223965e6f 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
@@ -29,7 +29,7 @@ Description
SourceFiles
fvPatch.C
- newFvPatch.C
+ fvPatchNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/newFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C
similarity index 100%
rename from src/finiteVolume/fvMesh/fvPatches/fvPatch/newFvPatch.C
rename to src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C
diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.C b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.C
index c5a6c944381f43c057215802d306a67b7e36544e..4a58469a7d231f8add40e2168bf31e7eaa829243 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.C
@@ -56,6 +56,6 @@ interpolation<Type>::interpolation
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-# include "newInterpolation.C"
+# include "interpolationNew.C"
// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/newInterpolation.C b/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C
similarity index 100%
rename from src/finiteVolume/interpolation/interpolation/interpolation/newInterpolation.C
rename to src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C
diff --git a/src/lagrangian/dieselSpray/Make/files b/src/lagrangian/dieselSpray/Make/files
index 7fd1ca7f2a48980a44c05565ed59f2dd78d908cb..a619925bbc48a24b131be4d9c063e80a5fc63c4d 100644
--- a/src/lagrangian/dieselSpray/Make/files
+++ b/src/lagrangian/dieselSpray/Make/files
@@ -32,12 +32,12 @@ $(injector)/swirlInjector/swirlInjector.C
$(injector)/definedInjector/definedInjector.C
$(atomizationModels)/atomizationModel/atomizationModel.C
-$(atomizationModels)/atomizationModel/newAtomizationModel.C
+$(atomizationModels)/atomizationModel/atomizationModelNew.C
$(atomizationModels)/LISA/LISA.C
$(atomizationModels)/noAtomization/noAtomization.C
$(atomizationModels)/blobsSheetAtomization/blobsSheetAtomization.C
-$(breakupModels)/breakupModel/newBreakupModel.C
+$(breakupModels)/breakupModel/breakupModelNew.C
$(breakupModels)/breakupModel/breakupModel.C
$(breakupModels)/noBreakup/noBreakup.C
$(breakupModels)/reitzDiwakar/reitzDiwakar.C
@@ -46,24 +46,24 @@ $(breakupModels)/SHF/SHF.C
$(breakupModels)/TAB/TAB.C
$(breakupModels)/ETAB/ETAB.C
-$(dragModels)/dragModel/newDragModel.C
+$(dragModels)/dragModel/dragModelNew.C
$(dragModels)/dragModel/dragModel.C
$(dragModels)/noDragModel/noDragModel.C
$(dragModels)/standardDragModel/standardDragModel.C
-$(evaporationModels)/evaporationModel/newEvaporationModel.C
+$(evaporationModels)/evaporationModel/evaporationModelNew.C
$(evaporationModels)/evaporationModel/evaporationModel.C
$(evaporationModels)/noEvaporation/noEvaporation.C
$(evaporationModels)/RutlandFlashBoil/RutlandFlashBoil.C
$(evaporationModels)/standardEvaporationModel/standardEvaporationModel.C
$(evaporationModels)/saturateEvaporationModel/saturateEvaporationModel.C
-$(heatTransferModels)/heatTransferModel/newHeatTransferModel.C
+$(heatTransferModels)/heatTransferModel/heatTransferModelNew.C
$(heatTransferModels)/heatTransferModel/heatTransferModel.C
$(heatTransferModels)/noHeatTransfer/noHeatTransfer.C
$(heatTransferModels)/RanzMarshall/RanzMarshall.C
-$(injectorModels)/injectorModel/newInjectorModel.C
+$(injectorModels)/injectorModel/injectorModelNew.C
$(injectorModels)/injectorModel/injectorModel.C
$(injectorModels)/constant/constInjector.C
$(injectorModels)/Chomiak/Chomiak.C
@@ -73,19 +73,19 @@ $(injectorModels)/definedHollowCone/definedHollowCone.C
$(injectorModels)/definedPressureSwirl/definedPressureSwirl.C
$(injectorModels)/blobsSwirl/blobsSwirlInjector.C
-$(wallModels)/wallModel/newWallModel.C
+$(wallModels)/wallModel/wallModelNew.C
$(wallModels)/wallModel/wallModel.C
$(wallModels)/removeParcel/removeParcel.C
$(wallModels)/reflectParcel/reflectParcel.C
$(collisionModels)/collisionModel/collisionModel.C
-$(collisionModels)/collisionModel/newCollisionModel.C
+$(collisionModels)/collisionModel/collisionModelNew.C
$(collisionModels)/noCollision/noCollision.C
$(collisionModels)/ORourke/ORourkeCollisionModel.C
$(collisionModels)/trajectoryModel/trajectoryModel.C
$(dispersionModels)/dispersionModel/dispersionModel.C
-$(dispersionModels)/dispersionModel/newDispersionModel.C
+$(dispersionModels)/dispersionModel/dispersionModelNew.C
$(dispersionModels)/dispersionRASModel/dispersionRASModel.C
$(dispersionModels)/dispersionLESModel/dispersionLESModel.C
$(dispersionModels)/noDispersion/noDispersion.C
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModelNew.C
similarity index 100%
rename from src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C
rename to src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModelNew.C
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/newBreakupModel.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C
similarity index 100%
rename from src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/newBreakupModel.C
rename to src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C
diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/newCollisionModel.C b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModelNew.C
similarity index 100%
rename from src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/newCollisionModel.C
rename to src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModelNew.C
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModelNew.C
similarity index 100%
rename from src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C
rename to src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModelNew.C
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/newDragModel.C b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModelNew.C
similarity index 100%
rename from src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/newDragModel.C
rename to src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModelNew.C
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModelNew.C
similarity index 100%
rename from src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C
rename to src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModelNew.C
diff --git a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/newHeatTransferModel.C b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModelNew.C
similarity index 100%
rename from src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/newHeatTransferModel.C
rename to src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModelNew.C
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/newInjectorModel.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModelNew.C
similarity index 100%
rename from src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/newInjectorModel.C
rename to src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModelNew.C
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/newWallModel.C b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModelNew.C
similarity index 100%
rename from src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/newWallModel.C
rename to src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModelNew.C
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C
index ac7a5a3a9760e49908db1dcfd4313a04095d0168..c22949610e8420862ae9dad786c5169a49c078bf 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C
@@ -84,7 +84,7 @@ Foam::BinaryCollisionModel<CloudType>::coeffDict() const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "NewBinaryCollisionModel.C"
+#include "BinaryCollisionModelNew.C"
// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
index 6343f44c288115400cf21f15bc53d25f2cc80160..f6f6e834e9229eeb0979fd9e3b88d2615cd83c90 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
@@ -29,7 +29,7 @@ Description
SourceFiles
BinaryCollisionModel.C
- NewBinaryCollisionModel.C
+ BinaryCollisionModelNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C
similarity index 100%
rename from src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C
rename to src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C
index f9b0527ae68fadfaafe1f2fd70abe3793e0c4d3e..81117e2250ecd7b4c8693b443ecedf1669e28225 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C
@@ -80,7 +80,7 @@ const Foam::dictionary& Foam::InflowBoundaryModel<CloudType>::coeffDict() const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "NewInflowBoundaryModel.C"
+#include "InflowBoundaryModelNew.C"
// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
index 762c7dd047ae7a3885f2973ae6575fd98f56ee08..233aa384e6f2fa79e74137bd319c969cccc771ca 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
@@ -30,7 +30,7 @@ Description
SourceFiles
InflowBoundaryModel.C
- NewInflowBoundaryModel.C
+ InflowBoundaryModelNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/NewInflowBoundaryModel.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C
similarity index 100%
rename from src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/NewInflowBoundaryModel.C
rename to src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
index cc81903cd4f17b01c5c4de468c09f760b045e45f..454787cca630df43e4da2ba2b772e3ac08ef7ed8 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
@@ -81,7 +81,7 @@ Foam::WallInteractionModel<CloudType>::coeffDict() const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "NewWallInteractionModel.C"
+#include "WallInteractionModelNew.C"
// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
index dbf6eabb9176d93878825f568ce68b393dacc3f4..76c499bc3fe10e57f7236b146e38d08d086a19e2 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
@@ -29,7 +29,7 @@ Description
SourceFiles
WallInteractionModel.C
- NewWallInteractionModel.C
+ WallInteractionModelNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C
similarity index 100%
rename from src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C
rename to src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.C b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.C
index d99eb2dbfef345b3f59604a784fc57ddfb53dbf5..f54635283dc0a2daf361176fda64f691e46fb31f 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.C
@@ -48,6 +48,6 @@ Foam::IntegrationScheme<Type>::~IntegrationScheme()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-#include "newIntegrationScheme.C"
+#include "IntegrationSchemeNew.C"
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/newIntegrationScheme.C b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
similarity index 100%
rename from src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/newIntegrationScheme.C
rename to src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
index 4fc46e49abfb568bd5369bf2c61b62d3a58f9556..bf4af83b0fd9e75fdb87b47256a26e7b52581a1f 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
@@ -32,7 +32,7 @@ Description
SourceFiles
DataEntry.C
- NewDataEntry.C
+ DataEntryNew.C
\*---------------------------------------------------------------------------*/
@@ -172,7 +172,7 @@ public:
#ifdef NoRepository
# include "DataEntry.C"
-# include "NewDataEntry.C"
+# include "DataEntryNew.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryNew.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C
rename to src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryNew.C
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C
index 64b5133d08704d9ecbb86f6f92919e7666f82296..8e6853593ad1be94ab55ecca40781798403b015f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C
@@ -79,6 +79,6 @@ const Foam::dictionary& Foam::DispersionModel<CloudType>::dict() const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "NewDispersionModel.C"
+#include "DispersionModelNew.C"
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
rename to src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
index 08a2ade296c40977453ac718c51c8811f3e29049..9138509a358f867706ed93e816e638a159961278 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
@@ -78,7 +78,7 @@ Foam::scalar Foam::DragModel<CloudType>::utc
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "NewDragModel.C"
+#include "DragModelNew.C"
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
index 2d0d4367a586113dd533b506b9207badb7b6a2a5..a01ed90bbdae70cef6fb40d15c45dac424f494b5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
@@ -29,7 +29,7 @@ Description
SourceFiles
DragModel.C
- NewDragModel.C
+ DragModelNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModelNew.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C
rename to src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModelNew.C
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 3ee135476b2888ef12f2c111988cffee5d77b971..f7436f5ada6284dee1a6b149680aa72e0e07a71f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -454,6 +454,6 @@ void Foam::InjectionModel<CloudType>::info(Ostream& os) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "NewInjectionModel.C"
+#include "InjectionModelNew.C"
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index 999e249c7241a0f4dc9a37305ec49edc6b528a94..0f7efefbf14bac6e421c0cca55a5cb4da5d81ceb 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -41,7 +41,7 @@ Description
SourceFiles
InjectionModel.C
- NewInjectionModel.C
+ InjectionModelNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C
rename to src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
index 366a19f774802489f35c86994023dd7cc8cfa483..e86ddefb420f302aa551126bcfd13d57d64b9d1b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
@@ -149,7 +149,7 @@ Foam::PatchInteractionModel<CloudType>::coeffDict() const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "NewPatchInteractionModel.C"
+#include "PatchInteractionModelNew.C"
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
index b2e8055a45aba098aa65641a1ab13903609bd411..42fbe9be9329b8cd2ebf5140001f8d6749ac301e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
@@ -29,7 +29,7 @@ Description
SourceFiles
PatchInteractionModel.C
- NewPatchInteractionModel.C
+ PatchInteractionModelNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C
rename to src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C
index 493005c5bd1f2ea6fc56988a8d54882db8b0b91d..6bfb6e016c224512c5f3497df50160f24d290454 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C
@@ -71,6 +71,6 @@ void Foam::PostProcessingModel<CloudType>::post()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "NewPostProcessingModel.C"
+#include "PostProcessingModelNew.C"
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H
index b32da26c7fd499efb63f7cc11c083763a07a9611..d8454e9eb73ade22a51c45c5ebcbc6c10d94b598 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H
@@ -29,7 +29,7 @@ Description
SourceFiles
PostProcessingModel.C
- NewPostProcessingModel.C
+ PostProcessingModelNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C
rename to src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
index 8c788686482a7c004bd7bbf8a9b9da59a6a6af75..8f98590bf42a43f303c73b22106fb71338b19d1f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
@@ -186,6 +186,6 @@ void Foam::SurfaceFilmModel<CloudType>::setParcelProperties
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "NewSurfaceFilmModel.C"
+#include "SurfaceFilmModelNew.C"
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
index 41d01f0eee51a9f1b1bd6477fd0dfd4d0d631f0c..2ba518788ff4cfd0ae2c94fe53b8b8861373d12b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
@@ -29,7 +29,7 @@ Description
SourceFiles
SurfaceFilmModel.C
- NewSurfaceFilmModel.C
+ SurfaceFilmModelNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/NewSurfaceFilmModel.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/NewSurfaceFilmModel.C
rename to src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index eb8f6609c0e868fb4e0481aaaffb227f2d2d4f7e..bc97c3e6854c084f7caca62ab5fb964eac5253ba 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
@@ -669,7 +669,7 @@ Foam::scalar Foam::CompositionModel<CloudType>::L
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "NewCompositionModel.C"
+#include "CompositionModelNew.C"
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index 94d75492feb04a21469243d1b1fb367ca4d951ca..f48ddd9a67ae1be94919b3f09498095a9d95ecab 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -31,7 +31,7 @@ Description
SourceFiles
CompositionModel.C
- NewCompositionModel.C
+ CompositionModelNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
rename to src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
index 42c6198987cc14375ac1b3f06d51c2d551b8c1ae..cd595e0a470a20ea5ff0c4a44f76982a2c3d65ae 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
@@ -139,7 +139,7 @@ Foam::PhaseChangeModel<CloudType>::enthalpyTransfer() const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "NewPhaseChangeModel.C"
+#include "PhaseChangeModelNew.C"
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index f73de2540093e06ebd733c3fa973d361aa2eacc8..f05a0eb661c2384a13dde57fcd7b2d26b09338f2 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -29,7 +29,7 @@ Description
SourceFiles
PhaseChangeModel.C
- NewPhaseChangeModel.C
+ PhaseChangeModelNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
rename to src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
index 03193e9eaddd0a45d1bd8f599fc4d53faf0470cd..6e3ab3fa1d5d7ab52f6770eee222d06239501b6e 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
@@ -84,7 +84,7 @@ const Foam::dictionary& Foam::DevolatilisationModel<CloudType>::coeffDict() cons
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "NewDevolatilisationModel.C"
+#include "DevolatilisationModelNew.C"
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
index d85d95ab6e68a4067ab6cb2a66dd677b90aa0fa3..d5be203a04d11bdb920116826b990b99572c5ee1 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
@@ -29,7 +29,7 @@ Description
SourceFiles
DevolatilisationModel.C
- NewDevolatilisationModel.C
+ DevolatilisationModelNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
index 40c5c0cd8c19d8c0bbdb777cda21d86587b3802d..9aa949f4c43c7a16812cff9394a01688bbb42422 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
@@ -85,7 +85,7 @@ const Foam::dictionary& Foam::SurfaceReactionModel<CloudType>::coeffDict() const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "NewSurfaceReactionModel.C"
+#include "SurfaceReactionModelNew.C"
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
index 2630ce6f99ff3a5e6f979dc32fc076963b3767e2..447bab9473426fab00c645415a678cd02830cdcb 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
@@ -29,7 +29,7 @@ Description
SourceFiles
SurfaceReactionModel.C
- NewSurfaceReactionModel.C
+ SurfaceReactionModelNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
index f19f694001e9e2e0b26a4eba3a18a54fe9c0cb33..1170ec97ac96279ed91bd6145568d3533c9eecf8 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
@@ -118,7 +118,7 @@ Foam::scalar Foam::HeatTransferModel<CloudType>::htc
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "NewHeatTransferModel.C"
+#include "HeatTransferModelNew.C"
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
index fb6b57af8a331b49dead9ed1e1b625c44bc15bd0..9019f0214052ed1cd0d549624774a28d691574df 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
@@ -29,7 +29,7 @@ Description
SourceFiles
HeatTransferModel.C
- NewHeatTransferModel.C
+ HeatTransferModelNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C
rename to src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C
diff --git a/src/lagrangian/molecularDynamics/potential/Make/files b/src/lagrangian/molecularDynamics/potential/Make/files
index 4afe4de3d950a1a9cc18af997d5324566b275fb2..db94eec41edc8e234cd311a2e3355ff9dc783fb3 100644
--- a/src/lagrangian/molecularDynamics/potential/Make/files
+++ b/src/lagrangian/molecularDynamics/potential/Make/files
@@ -8,7 +8,7 @@ $(pairPotential)/pairPotentialList/pairPotentialList.C
$(pairPotential)/basic/pairPotential.C
$(pairPotential)/basic/pairPotentialIO.C
-$(pairPotential)/basic/newPairPotential.C
+$(pairPotential)/basic/pairPotentialNew.C
$(pairPotential)/derived/lennardJones/lennardJones.C
$(pairPotential)/derived/maitlandSmith/maitlandSmith.C
@@ -21,7 +21,7 @@ $(pairPotential)/derived/noInteraction/noInteraction.C
energyScalingFunction = energyScalingFunction
$(energyScalingFunction)/basic/energyScalingFunction.C
-$(energyScalingFunction)/basic/newEnergyScalingFunction.C
+$(energyScalingFunction)/basic/energyScalingFunctionNew.C
$(energyScalingFunction)/derived/shifted/shifted.C
$(energyScalingFunction)/derived/shiftedForce/shiftedForce.C
@@ -34,7 +34,7 @@ tetherPotential = tetherPotential
$(tetherPotential)/tetherPotentialList/tetherPotentialList.C
$(tetherPotential)/basic/tetherPotential.C
-$(tetherPotential)/basic/newTetherPotential.C
+$(tetherPotential)/basic/tetherPotentialNew.C
$(tetherPotential)/derived/harmonicSpring/harmonicSpring.C
$(tetherPotential)/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.C
@@ -44,4 +44,4 @@ electrostaticPotential = electrostaticPotential
$(electrostaticPotential)/electrostaticPotential.C
-LIB = $(FOAM_LIBBIN)/libpotential
\ No newline at end of file
+LIB = $(FOAM_LIBBIN)/libpotential
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
index 227548b6efab1749bf616ecb0a939372e25c11b7..11f211b6643644c32ff5eb3df39d272732515d6a 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
@@ -28,7 +28,7 @@ Description
SourceFiles
energyScalingFunction.C
- newEnergyScalingFunction.C
+ energyScalingFunctionNew.C
\*---------------------------------------------------------------------------*/
@@ -47,7 +47,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class energyScalingFunction Declaration
+ Class energyScalingFunction Declaration
\*---------------------------------------------------------------------------*/
class energyScalingFunction
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C
similarity index 100%
rename from src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C
rename to src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
index a7e8198a13388a46d5b76f71a645699fb27f12fa..f7d62c755f6bb7341f0e8134592e02042d23c31f 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
@@ -28,7 +28,7 @@ Description
SourceFiles
pairPotential.C
- newPairPotential.C
+ pairPotentialNew.C
\*---------------------------------------------------------------------------*/
@@ -52,7 +52,7 @@ namespace Foam
class energyScalingFunction;
/*---------------------------------------------------------------------------*\
- Class pairPotential Declaration
+ Class pairPotential Declaration
\*---------------------------------------------------------------------------*/
class pairPotential
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C
similarity index 100%
rename from src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C
rename to src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
index 26d03fcf22d207ad721cc6a4f13fdb14863c7830..b34beb19d66d63e5206b93655e404fd540c64990 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
@@ -28,7 +28,7 @@ Description
SourceFiles
tetherPotential.C
- newTetherPotential.C
+ tetherPotentialNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C
similarity index 100%
rename from src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C
rename to src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C
diff --git a/src/postProcessing/foamCalcFunctions/Make/files b/src/postProcessing/foamCalcFunctions/Make/files
index 55297ca8c8025e958bb8303612eaa0234b7ceb7c..8fa83c42e0c460804e0a5702514670a06b982564 100644
--- a/src/postProcessing/foamCalcFunctions/Make/files
+++ b/src/postProcessing/foamCalcFunctions/Make/files
@@ -1,5 +1,5 @@
calcType/calcType.C
-calcType/newCalcType.C
+calcType/calcTypeNew.C
field/components/components.C
field/mag/mag.C
diff --git a/src/postProcessing/foamCalcFunctions/calcType/newCalcType.C b/src/postProcessing/foamCalcFunctions/calcType/calcTypeNew.C
similarity index 100%
rename from src/postProcessing/foamCalcFunctions/calcType/newCalcType.C
rename to src/postProcessing/foamCalcFunctions/calcType/calcTypeNew.C
diff --git a/src/postProcessing/functionObjects/forces/Make/files b/src/postProcessing/functionObjects/forces/Make/files
index 0cde9d248e6228f81bc20aaa446dee527c2a0887..4f9cf092148bd82a13509d7a9f9a79d0e6c59edb 100644
--- a/src/postProcessing/functionObjects/forces/Make/files
+++ b/src/postProcessing/functionObjects/forces/Make/files
@@ -14,7 +14,7 @@ $(sDoFRBM)/sixDoFRigidBodyMotionStateIO.C
sDoFRBMR = $(sDoFRBM)/sixDoFRigidBodyMotionRestraint
$(sDoFRBMR)/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C
-$(sDoFRBMR)/sixDoFRigidBodyMotionRestraint/newSixDoFRigidBodyMotionRestraint.C
+$(sDoFRBMR)/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C
$(sDoFRBMR)/linearAxialAngularSpring/linearAxialAngularSpring.C
$(sDoFRBMR)/linearSpring/linearSpring.C
$(sDoFRBMR)/sphericalAngularSpring/sphericalAngularSpring.C
@@ -23,7 +23,7 @@ $(sDoFRBMR)/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
sDoFRBMC = $(sDoFRBM)/sixDoFRigidBodyMotionConstraint
$(sDoFRBMC)/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C
-$(sDoFRBMC)/sixDoFRigidBodyMotionConstraint/newSixDoFRigidBodyMotionConstraint.C
+$(sDoFRBMC)/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C
$(sDoFRBMC)/fixedAxis/fixedAxis.C
$(sDoFRBMC)/fixedLine/fixedLine.C
$(sDoFRBMC)/fixedOrientation/fixedOrientation.C
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
index ccb684ed96e467daf10174663cff0a284adfc906..3c63ece5dab6fec115b6dbdb473ab8a3bcf54df0 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
@@ -36,7 +36,7 @@ Description
SourceFiles
sixDoFRigidBodyMotionConstraint.C
- newDynamicFvMesh.C
+ dynamicFvMeshNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/newSixDoFRigidBodyMotionConstraint.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C
similarity index 100%
rename from src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/newSixDoFRigidBodyMotionConstraint.C
rename to src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H
index a5f053d3251941fc32d49a267851b5fa4ef505b7..bab292bc4ddf0df3835431c1977b5a3109788713 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H
@@ -36,7 +36,7 @@ Description
SourceFiles
sixDoFRigidBodyMotionRestraint.C
- newDynamicFvMesh.C
+ dynamicFvMeshNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/newSixDoFRigidBodyMotionRestraint.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C
similarity index 100%
rename from src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/newSixDoFRigidBodyMotionRestraint.C
rename to src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C
diff --git a/src/surfaceFilmModels/Make/files b/src/surfaceFilmModels/Make/files
index aecce33191d01abaec33ae21139c0c5730a27485..cbaf49b8100f95f572949ed6d722f7e6a7da4adb 100644
--- a/src/surfaceFilmModels/Make/files
+++ b/src/surfaceFilmModels/Make/files
@@ -1,6 +1,6 @@
/* Surface film models */
surfaceFilmModel/surfaceFilmModel/surfaceFilmModel.C
-surfaceFilmModel/surfaceFilmModel/newSurfaceFilmModel.C
+surfaceFilmModel/surfaceFilmModel/surfaceFilmModelNew.C
surfaceFilmModel/noFilm/noFilm.C
surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.C
surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
@@ -8,12 +8,12 @@ surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
/* Sub-models */
submodels/kinematic/injectionModel/injectionModel/injectionModel.C
-submodels/kinematic/injectionModel/injectionModel/newInjectionModel.C
+submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C
submodels/kinematic/injectionModel/noInjection/noInjection.C
submodels/kinematic/injectionModel/removeInjection/removeInjection.C
submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C
-submodels/thermo/phaseChangeModel/phaseChangeModel/newPhaseChangeModel.C
+submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C
diff --git a/src/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/newInjectionModel.C b/src/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C
similarity index 100%
rename from src/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/newInjectionModel.C
rename to src/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C
diff --git a/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/newPhaseChangeModel.C b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
similarity index 100%
rename from src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/newPhaseChangeModel.C
rename to src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
diff --git a/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/newSurfaceFilmModel.C b/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModelNew.C
similarity index 100%
rename from src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/newSurfaceFilmModel.C
rename to src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModelNew.C
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/Make/files b/src/thermophysicalModels/barotropicCompressibilityModel/Make/files
index 999ee5391846251c0451f069cc3836e992c9f823..deda15491704bc224f83a52c19ed0358e836bd42 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/Make/files
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/Make/files
@@ -1,5 +1,5 @@
barotropicCompressibilityModel/barotropicCompressibilityModel.C
-barotropicCompressibilityModel/newBarotropicCompressibilityModel.C
+barotropicCompressibilityModel/barotropicCompressibilityModelNew.C
linear/linear.C
Wallis/Wallis.C
Chung/Chung.C
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModelNew.C
similarity index 100%
rename from src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C
rename to src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModelNew.C
diff --git a/src/thermophysicalModels/basic/Make/files b/src/thermophysicalModels/basic/Make/files
index 59f8f822ea2e6b6e6301c19e86fe8e6067740ef3..1a9d82af062507e937dcaa3fe2c4d3633f60dd97 100644
--- a/src/thermophysicalModels/basic/Make/files
+++ b/src/thermophysicalModels/basic/Make/files
@@ -4,13 +4,13 @@ mixtures/basicMixture/basicMixtures.C
basicThermo/basicThermo.C
psiThermo/basicPsiThermo/basicPsiThermo.C
-psiThermo/basicPsiThermo/newBasicPsiThermo.C
+psiThermo/basicPsiThermo/basicPsiThermoNew.C
psiThermo/hPsiThermo/hPsiThermos.C
psiThermo/hsPsiThermo/hsPsiThermos.C
psiThermo/ePsiThermo/ePsiThermos.C
rhoThermo/basicRhoThermo/basicRhoThermo.C
-rhoThermo/basicRhoThermo/newBasicRhoThermo.C
+rhoThermo/basicRhoThermo/basicRhoThermoNew.C
rhoThermo/hRhoThermo/hRhoThermos.C
rhoThermo/hsRhoThermo/hsRhoThermos.C
diff --git a/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermo.H b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermo.H
index 2fbae5388c3b9713bd9bd9bff2ae8ffb3295d57d..520534703734053fa95fdd5cfb01e4937d4ff346 100644
--- a/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermo.H
+++ b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermo.H
@@ -29,7 +29,7 @@ Description
SourceFiles
basicPsiThermo.C
- newBasicPsiThermo.C
+ basicPsiThermoNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermoNew.C
similarity index 100%
rename from src/thermophysicalModels/basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C
rename to src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermoNew.C
diff --git a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermo.H b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermo.H
index 2e149af170054ca0a31deb1195bb6024249ada61..dcc85aa852270290616bf33c631e8ae9ba5b664e 100644
--- a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermo.H
+++ b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermo.H
@@ -29,7 +29,7 @@ Description
SourceFiles
basicRhoThermo.C
- newBasicRhoThermo.C
+ basicRhoThermoNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermoNew.C
similarity index 100%
rename from src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C
rename to src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermoNew.C
diff --git a/src/thermophysicalModels/chemistryModel/Make/files b/src/thermophysicalModels/chemistryModel/Make/files
index b92108d63a23df223262b8b2e597a8a09100a1f1..f78853a7ea1f5b3767f609512f81f7c4c812a94e 100644
--- a/src/thermophysicalModels/chemistryModel/Make/files
+++ b/src/thermophysicalModels/chemistryModel/Make/files
@@ -1,11 +1,11 @@
chemistryModel/basicChemistryModel/basicChemistryModel.C
chemistryModel/psiChemistryModel/psiChemistryModel.C
-chemistryModel/psiChemistryModel/newPsiChemistryModel.C
+chemistryModel/psiChemistryModel/psiChemistryModelNew.C
chemistryModel/psiChemistryModel/psiChemistryModels.C
chemistryModel/rhoChemistryModel/rhoChemistryModel.C
-chemistryModel/rhoChemistryModel/newRhoChemistryModel.C
+chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C
chemistryModel/rhoChemistryModel/rhoChemistryModels.C
chemistrySolver/chemistrySolver/makeChemistrySolvers.C
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelNew.C
similarity index 100%
rename from src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C
rename to src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelNew.C
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C
similarity index 100%
rename from src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C
rename to src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
index 37ae0bb73b4cca8106bfc73793f42a64e6ca5109..544020eac1f5ebeda57899188480451606523e6c 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
@@ -170,7 +170,7 @@ public:
#ifdef NoRepository
# include "chemistrySolver.C"
-# include "newChemistrySolver.C"
+# include "chemistrySolverNew.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolverNew.C
similarity index 100%
rename from src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C
rename to src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolverNew.C
diff --git a/src/thermophysicalModels/laminarFlameSpeed/Make/files b/src/thermophysicalModels/laminarFlameSpeed/Make/files
index fb7ccec330d7e2eb21f8b3d66f03855148e19607..468c086eea8169d5892cf82ca95a81c22cf57292 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/Make/files
+++ b/src/thermophysicalModels/laminarFlameSpeed/Make/files
@@ -1,5 +1,5 @@
laminarFlameSpeed/laminarFlameSpeed.C
-laminarFlameSpeed/newLaminarFlameSpeed.C
+laminarFlameSpeed/laminarFlameSpeedNew.C
constant/constant.C
Gulders/Gulders.C
GuldersEGR/GuldersEGR.C
diff --git a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeed.H b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeed.H
index 38b031de407f529acccee44140db94869422b313..68e8c187dc097768e771bb3f349470df9e2b0f0b 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeed.H
+++ b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeed.H
@@ -36,7 +36,7 @@ Description
SourceFiles
laminarFlameSpeed.C
- newLaminarFlameSpeed.C
+ laminarFlameSpeedNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/newLaminarFlameSpeed.C b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C
similarity index 100%
rename from src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/newLaminarFlameSpeed.C
rename to src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C
diff --git a/src/thermophysicalModels/pdfs/Make/files b/src/thermophysicalModels/pdfs/Make/files
index 7b0c50a956263070702a3871522a156398dcf28c..e032b86bc52be99672ae84f30a90035956b266a1 100644
--- a/src/thermophysicalModels/pdfs/Make/files
+++ b/src/thermophysicalModels/pdfs/Make/files
@@ -1,5 +1,5 @@
pdf/pdf.C
-pdf/newPdf.C
+pdf/pdfNew.C
exponential/exponential.C
fixedValue/fixedValue.C
diff --git a/src/thermophysicalModels/pdfs/pdf/pdf.H b/src/thermophysicalModels/pdfs/pdf/pdf.H
index 42318f2c9363b2533e3e66625fa4b59c136b8be8..b0c5ea671d107b9154b44e54ed7589ffa1bd9198 100644
--- a/src/thermophysicalModels/pdfs/pdf/pdf.H
+++ b/src/thermophysicalModels/pdfs/pdf/pdf.H
@@ -45,7 +45,7 @@ Description
SourceFiles
pdf.C
- newPdf.C
+ pdfNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/thermophysicalModels/pdfs/pdf/newPdf.C b/src/thermophysicalModels/pdfs/pdf/pdfNew.C
similarity index 100%
rename from src/thermophysicalModels/pdfs/pdf/newPdf.C
rename to src/thermophysicalModels/pdfs/pdf/pdfNew.C
diff --git a/src/thermophysicalModels/radiation/Make/files b/src/thermophysicalModels/radiation/Make/files
index efa6279d30553c367e88b86c6d95f34f34956c76..5c77d42f128bb03128b0e05d241d419aec27beb5 100644
--- a/src/thermophysicalModels/radiation/Make/files
+++ b/src/thermophysicalModels/radiation/Make/files
@@ -1,6 +1,6 @@
/* Radiation model */
radiationModel/radiationModel/radiationModel.C
-radiationModel/radiationModel/newRadiationModel.C
+radiationModel/radiationModel/radiationModelNew.C
radiationModel/noRadiation/noRadiation.C
radiationModel/P1/P1.C
radiationModel/fvDOM/fvDOM/fvDOM.C
@@ -10,13 +10,13 @@ radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C
/* Scatter model */
submodels/scatterModel/scatterModel/scatterModel.C
-submodels/scatterModel/scatterModel/newScatterModel.C
+submodels/scatterModel/scatterModel/scatterModelNew.C
submodels/scatterModel/constantScatter/constantScatter.C
/* Absorption/Emission model */
submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C
-submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C
+submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C
submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C
submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C
submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C
diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModelNew.C
similarity index 100%
rename from src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C
rename to src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModelNew.C
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C
similarity index 100%
rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C
rename to src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C
diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/newScatterModel.C b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C
similarity index 100%
rename from src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/newScatterModel.C
rename to src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C
diff --git a/src/thermophysicalModels/reactionThermo/Make/files b/src/thermophysicalModels/reactionThermo/Make/files
index 471dbb114d2f8e0d08ee523660c0bcaf2415b5cb..6f56f0ef0046273707f6dd3ea0a8d8711354b4cc 100644
--- a/src/thermophysicalModels/reactionThermo/Make/files
+++ b/src/thermophysicalModels/reactionThermo/Make/files
@@ -5,23 +5,23 @@ chemistryReaders/chemistryReader/makeChemistryReaders.C
mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
combustionThermo/hCombustionThermo/hCombustionThermo.C
-combustionThermo/hCombustionThermo/newhCombustionThermo.C
+combustionThermo/hCombustionThermo/hCombustionThermoNew.C
combustionThermo/hCombustionThermo/hCombustionThermos.C
combustionThermo/hsCombustionThermo/hsCombustionThermo.C
-combustionThermo/hsCombustionThermo/newhsCombustionThermo.C
+combustionThermo/hsCombustionThermo/hsCombustionThermoNew.C
combustionThermo/hsCombustionThermo/hsCombustionThermos.C
combustionThermo/hhuCombustionThermo/hhuCombustionThermo.C
-combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C
+combustionThermo/hhuCombustionThermo/hhuCombustionThermoNew.C
combustionThermo/hhuCombustionThermo/hhuCombustionThermos.C
reactionThermo/hReactionThermo/hReactionThermo.C
-reactionThermo/hReactionThermo/newhReactionThermo.C
+reactionThermo/hReactionThermo/hReactionThermoNew.C
reactionThermo/hReactionThermo/hReactionThermos.C
reactionThermo/hsReactionThermo/hsReactionThermo.C
-reactionThermo/hsReactionThermo/newhsReactionThermo.C
+reactionThermo/hsReactionThermo/hsReactionThermoNew.C
reactionThermo/hsReactionThermo/hsReactionThermos.C
derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermoNew.C
similarity index 100%
rename from src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C
rename to src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermoNew.C
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermo.H b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermo.H
index f466c33a640c5af211dd91d047839a4dca954083..22f3214352d40b41c53b0a63c6cd1482b558927d 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermo.H
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermo.H
@@ -29,7 +29,7 @@ Description
SourceFiles
hhuCombustionThermo.C
- newhhuCombustionThermo.C
+ hhuCombustionThermoNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermoNew.C
similarity index 100%
rename from src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C
rename to src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermoNew.C
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/newhsCombustionThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermoNew.C
similarity index 100%
rename from src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/newhsCombustionThermo.C
rename to src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermoNew.C
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermoNew.C
similarity index 100%
rename from src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C
rename to src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermoNew.C
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/newhsReactionThermo.C b/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermoNew.C
similarity index 100%
rename from src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/newhsReactionThermo.C
rename to src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermoNew.C
diff --git a/src/thermophysicalModels/solids/Make/files b/src/thermophysicalModels/solids/Make/files
index 5da964b97f8ac1237b2d8f8c2dfd8eec89fadc7c..9dfd710c3de053532d571b79b95e0109b5855fa7 100644
--- a/src/thermophysicalModels/solids/Make/files
+++ b/src/thermophysicalModels/solids/Make/files
@@ -1,5 +1,5 @@
solid/solid.C
-solid/newSolid.C
+solid/solidNew.C
ash/ash.C
C/C.C
diff --git a/src/thermophysicalModels/solids/solid/newSolid.C b/src/thermophysicalModels/solids/solid/solidNew.C
similarity index 100%
rename from src/thermophysicalModels/solids/solid/newSolid.C
rename to src/thermophysicalModels/solids/solid/solidNew.C
diff --git a/src/transportModels/incompressible/Make/files b/src/transportModels/incompressible/Make/files
index bf2c44863a94eab21f02c3630335a1bf5afd726d..898a3c648ced0ae9d42af3f69203343561ca2f0d 100644
--- a/src/transportModels/incompressible/Make/files
+++ b/src/transportModels/incompressible/Make/files
@@ -1,5 +1,5 @@
viscosityModels/viscosityModel/viscosityModel.C
-viscosityModels/viscosityModel/newViscosityModel.C
+viscosityModels/viscosityModel/viscosityModelNew.C
viscosityModels/Newtonian/Newtonian.C
viscosityModels/powerLaw/powerLaw.C
viscosityModels/CrossPowerLaw/CrossPowerLaw.C
diff --git a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H
index ce68da15717fdb78470887dc7146a2d812cf841e..e95774991c6adf4494706bc8d07bdf249383a3fc 100644
--- a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H
+++ b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H
@@ -40,7 +40,7 @@ Description
SourceFiles
viscosityModel.C
- newViscosityModel.C
+ viscosityModelNew.C
\*---------------------------------------------------------------------------*/
diff --git a/src/transportModels/incompressible/viscosityModels/viscosityModel/newViscosityModel.C b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C
similarity index 100%
rename from src/transportModels/incompressible/viscosityModels/viscosityModel/newViscosityModel.C
rename to src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C