From 937e0d23d02657c05879136aefb3b421ab2aa69f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 13 Apr 2010 18:47:47 +0200
Subject: [PATCH] STYLE: consistent naming of files containing the 'New' method

before:
    - 'new' prefixed to camel-cased class name: eg, someClass -> newSomeClass
    - 'New' prefixed to templated class name:   eg, TmplClass -> NewTmplClass
    - 'New' suffixed to class name:             eg, someClass -> someClassNew

after:
    - consistent 'New' suffixed to class name, no change of case
          eg, someClass -> someClassNew
          eg, TmplClass -> TmplClassNew
---
 .../solvers/combustion/PDRFoam/Make/files      |  8 ++++----
 .../{newPDRDragModel.C => PDRDragModelNew.C}   |  0
 .../{newXiEqModel.C => XiEqModelNew.C}         |  0
 .../XiGModel/{newXiGModel.C => XiGModelNew.C}  |  0
 .../XiModel/{newXiModel.C => XiModelNew.C}     |  0
 .../fireFoam/combustionModels/Make/files       |  2 +-
 ...wCombustionModel.C => combustionModelNew.C} |  0
 .../multiphase/interPhaseChangeFoam/Make/files |  2 +-
 .../phaseChangeTwoPhaseMixture.H               |  2 +-
 ...xture.C => phaseChangeTwoPhaseMixtureNew.C} |  0
 .../interfacialModels/Make/files               |  2 +-
 .../dragModels/dragModel/dragModel.H           |  2 +-
 .../{newDragModel.C => dragModelNew.C}         |  0
 .../kineticTheoryModels/Make/files             | 10 +++++-----
 ...ductivityModel.C => conductivityModelNew.C} |  0
 ...tressModel.C => frictionalStressModelNew.C} |  0
 ...ssureModel.C => granularPressureModelNew.C} |  0
 .../{newRadialModel.C => radialModelNew.C}     |  0
 ...newViscosityModel.C => viscosityModelNew.C} |  0
 .../extrudeMesh/extrudeModel/Make/files        |  2 +-
 .../{newExtrudeModel.C => extrudeModelNew.C}   |  0
 .../tabulatedWallFunction/Make/files           |  2 +-
 ...llFunction.C => tabulatedWallFunctionNew.C} |  0
 src/ODE/Make/files                             |  2 +-
 .../{newODESolver.C => ODESolverNew.C}         |  0
 src/OpenFOAM/Make/files                        | 14 +++++++-------
 .../pointPatchField/pointPatchField.C          |  2 +-
 ...wPointPatchField.C => pointPatchFieldNew.C} |  0
 ...nterfaceField.C => GAMGInterfaceFieldNew.C} |  0
 .../{newGAMGInterface.C => GAMGInterfaceNew.C} |  0
 ...newFacePointPatch.C => facePointPatchNew.C} |  0
 .../polyMesh/polyPatches/polyPatch/polyPatch.H |  2 +-
 .../{newPolyPatch.C => polyPatchNew.C}         |  0
 .../meshes/polyMesh/zones/cellZone/cellZone.H  |  2 +-
 .../cellZone/{newCellZone.C => cellZoneNew.C}  |  0
 .../meshes/polyMesh/zones/faceZone/faceZone.H  |  2 +-
 .../faceZone/{newFaceZone.C => faceZoneNew.C}  |  0
 .../polyMesh/zones/pointZone/pointZone.H       |  2 +-
 .../{newPointZone.C => pointZoneNew.C}         |  0
 src/dynamicFvMesh/Make/files                   |  4 ++--
 .../dynamicFvMesh/dynamicFvMesh.H              |  2 +-
 .../{newDynamicFvMesh.C => dynamicFvMeshNew.C} |  0
 .../solidBodyMotionFunction.H                  |  2 +-
 ...Function.C => solidBodyMotionFunctionNew.C} |  0
 src/dynamicMesh/Make/files                     |  2 +-
 ...olyMeshModifier.C => polyMeshModifierNew.C} |  0
 src/engine/Make/files                          |  2 +-
 .../{newEngineMesh.C => engineMeshNew.C}       |  0
 src/finiteVolume/Make/files                    |  4 ++--
 .../SRFModel/{newSRFModel.C => SRFModelNew.C}  |  0
 .../fvPatchFields/fvPatchField/fvPatchField.C  |  2 +-
 .../fvPatchFields/fvPatchField/fvPatchField.H  |  2 +-
 .../{newFvPatchField.C => fvPatchFieldNew.C}   |  0
 .../fvsPatchField/fvsPatchField.C              |  2 +-
 .../fvsPatchField/fvsPatchField.H              |  2 +-
 .../{newFvsPatchField.C => fvsPatchFieldNew.C} |  0
 .../fvMesh/fvPatches/fvPatch/fvPatch.H         |  2 +-
 .../fvPatch/{newFvPatch.C => fvPatchNew.C}     |  0
 .../interpolation/interpolation.C              |  2 +-
 .../{newInterpolation.C => interpolationNew.C} |  0
 src/lagrangian/dieselSpray/Make/files          | 18 +++++++++---------
 ...tomizationModel.C => atomizationModelNew.C} |  0
 .../{newBreakupModel.C => breakupModelNew.C}   |  0
 ...newCollisionModel.C => collisionModelNew.C} |  0
 ...wDispersionModel.C => dispersionModelNew.C} |  0
 .../{newDragModel.C => dragModelNew.C}         |  0
 ...vaporationModel.C => evaporationModelNew.C} |  0
 ...tTransferModel.C => heatTransferModelNew.C} |  0
 .../{newInjectorModel.C => injectorModelNew.C} |  0
 .../{newWallModel.C => wallModelNew.C}         |  0
 .../BinaryCollisionModel.C                     |  2 +-
 .../BinaryCollisionModel.H                     |  2 +-
 ...lisionModel.C => BinaryCollisionModelNew.C} |  0
 .../InflowBoundaryModel/InflowBoundaryModel.C  |  2 +-
 .../InflowBoundaryModel/InflowBoundaryModel.H  |  2 +-
 ...oundaryModel.C => InflowBoundaryModelNew.C} |  0
 .../WallInteractionModel.C                     |  2 +-
 .../WallInteractionModel.H                     |  2 +-
 ...actionModel.C => WallInteractionModelNew.C} |  0
 .../IntegrationScheme/IntegrationScheme.C      |  2 +-
 ...egrationScheme.C => IntegrationSchemeNew.C} |  0
 .../IO/DataEntry/DataEntry/DataEntry.H         |  4 ++--
 .../{NewDataEntry.C => DataEntryNew.C}         |  0
 .../DispersionModel/DispersionModel.C          |  2 +-
 ...wDispersionModel.C => DispersionModelNew.C} |  0
 .../Kinematic/DragModel/DragModel/DragModel.C  |  2 +-
 .../Kinematic/DragModel/DragModel/DragModel.H  |  2 +-
 .../{NewDragModel.C => DragModelNew.C}         |  0
 .../InjectionModel/InjectionModel.C            |  2 +-
 .../InjectionModel/InjectionModel.H            |  2 +-
 ...NewInjectionModel.C => InjectionModelNew.C} |  0
 .../PatchInteractionModel.C                    |  2 +-
 .../PatchInteractionModel.H                    |  2 +-
 ...ctionModel.C => PatchInteractionModelNew.C} |  0
 .../PostProcessingModel/PostProcessingModel.C  |  2 +-
 .../PostProcessingModel/PostProcessingModel.H  |  2 +-
 ...cessingModel.C => PostProcessingModelNew.C} |  0
 .../SurfaceFilmModel/SurfaceFilmModel.C        |  2 +-
 .../SurfaceFilmModel/SurfaceFilmModel.H        |  2 +-
 ...urfaceFilmModel.C => SurfaceFilmModelNew.C} |  0
 .../CompositionModel/CompositionModel.C        |  2 +-
 .../CompositionModel/CompositionModel.H        |  2 +-
 ...ompositionModel.C => CompositionModelNew.C} |  0
 .../PhaseChangeModel/PhaseChangeModel.C        |  2 +-
 .../PhaseChangeModel/PhaseChangeModel.H        |  2 +-
 ...haseChangeModel.C => PhaseChangeModelNew.C} |  0
 .../DevolatilisationModel.C                    |  2 +-
 .../DevolatilisationModel.H                    |  2 +-
 ...ationModel.C => DevolatilisationModelNew.C} |  0
 .../SurfaceReactionModel.C                     |  2 +-
 .../SurfaceReactionModel.H                     |  2 +-
 ...actionModel.C => SurfaceReactionModelNew.C} |  0
 .../HeatTransferModel/HeatTransferModel.C      |  2 +-
 .../HeatTransferModel/HeatTransferModel.H      |  2 +-
 ...tTransferModel.C => HeatTransferModelNew.C} |  0
 .../molecularDynamics/potential/Make/files     |  8 ++++----
 .../basic/energyScalingFunction.H              |  4 ++--
 ...ngFunction.C => energyScalingFunctionNew.C} |  0
 .../pairPotential/basic/pairPotential.H        |  4 ++--
 .../{newPairPotential.C => pairPotentialNew.C} |  0
 .../tetherPotential/basic/tetherPotential.H    |  2 +-
 ...wTetherPotential.C => tetherPotentialNew.C} |  0
 .../foamCalcFunctions/Make/files               |  2 +-
 .../calcType/{newCalcType.C => calcTypeNew.C}  |  0
 .../functionObjects/forces/Make/files          |  4 ++--
 .../sixDoFRigidBodyMotionConstraint.H          |  2 +-
 ....C => sixDoFRigidBodyMotionConstraintNew.C} |  0
 .../sixDoFRigidBodyMotionRestraint.H           |  2 +-
 ...t.C => sixDoFRigidBodyMotionRestraintNew.C} |  0
 src/surfaceFilmModels/Make/files               |  6 +++---
 ...newInjectionModel.C => injectionModelNew.C} |  0
 ...haseChangeModel.C => phaseChangeModelNew.C} |  0
 ...urfaceFilmModel.C => surfaceFilmModelNew.C} |  0
 .../barotropicCompressibilityModel/Make/files  |  2 +-
 ...l.C => barotropicCompressibilityModelNew.C} |  0
 src/thermophysicalModels/basic/Make/files      |  4 ++--
 .../psiThermo/basicPsiThermo/basicPsiThermo.H  |  2 +-
 ...newBasicPsiThermo.C => basicPsiThermoNew.C} |  0
 .../rhoThermo/basicRhoThermo/basicRhoThermo.H  |  2 +-
 ...newBasicRhoThermo.C => basicRhoThermoNew.C} |  0
 .../chemistryModel/Make/files                  |  4 ++--
 ...ChemistryModel.C => psiChemistryModelNew.C} |  0
 ...ChemistryModel.C => rhoChemistryModelNew.C} |  0
 .../chemistrySolver/chemistrySolver.H          |  2 +-
 ...wChemistrySolver.C => chemistrySolverNew.C} |  0
 .../laminarFlameSpeed/Make/files               |  2 +-
 .../laminarFlameSpeed/laminarFlameSpeed.H      |  2 +-
 ...inarFlameSpeed.C => laminarFlameSpeedNew.C} |  0
 src/thermophysicalModels/pdfs/Make/files       |  2 +-
 src/thermophysicalModels/pdfs/pdf/pdf.H        |  2 +-
 .../pdfs/pdf/{newPdf.C => pdfNew.C}            |  0
 src/thermophysicalModels/radiation/Make/files  |  6 +++---
 ...newRadiationModel.C => radiationModelNew.C} |  0
 ...ionModel.C => absorptionEmissionModelNew.C} |  0
 .../{newScatterModel.C => scatterModelNew.C}   |  0
 .../reactionThermo/Make/files                  | 10 +++++-----
 ...mbustionThermo.C => hCombustionThermoNew.C} |  0
 .../hhuCombustionThermo/hhuCombustionThermo.H  |  2 +-
 ...ustionThermo.C => hhuCombustionThermoNew.C} |  0
 ...bustionThermo.C => hsCombustionThermoNew.C} |  0
 ...whReactionThermo.C => hReactionThermoNew.C} |  0
 ...sReactionThermo.C => hsReactionThermoNew.C} |  0
 src/thermophysicalModels/solids/Make/files     |  2 +-
 .../solids/solid/{newSolid.C => solidNew.C}    |  0
 src/transportModels/incompressible/Make/files  |  2 +-
 .../viscosityModel/viscosityModel.H            |  2 +-
 ...newViscosityModel.C => viscosityModelNew.C} |  0
 167 files changed, 123 insertions(+), 123 deletions(-)
 rename applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/{newPDRDragModel.C => PDRDragModelNew.C} (100%)
 rename applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/{newXiEqModel.C => XiEqModelNew.C} (100%)
 rename applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/{newXiGModel.C => XiGModelNew.C} (100%)
 rename applications/solvers/combustion/PDRFoam/XiModels/XiModel/{newXiModel.C => XiModelNew.C} (100%)
 rename applications/solvers/combustion/fireFoam/combustionModels/combustionModel/{newCombustionModel.C => combustionModelNew.C} (100%)
 rename applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/{newPhaseChangeTwoPhaseMixture.C => phaseChangeTwoPhaseMixtureNew.C} (100%)
 rename applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/{newDragModel.C => dragModelNew.C} (100%)
 rename applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/{newConductivityModel.C => conductivityModelNew.C} (100%)
 rename applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/{newFrictionalStressModel.C => frictionalStressModelNew.C} (100%)
 rename applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/{newGranularPressureModel.C => granularPressureModelNew.C} (100%)
 rename applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/{newRadialModel.C => radialModelNew.C} (100%)
 rename applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/{newViscosityModel.C => viscosityModelNew.C} (100%)
 rename applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/{newExtrudeModel.C => extrudeModelNew.C} (100%)
 rename applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/{newTabulatedWallFunction.C => tabulatedWallFunctionNew.C} (100%)
 rename src/ODE/ODESolvers/ODESolver/{newODESolver.C => ODESolverNew.C} (100%)
 rename src/OpenFOAM/fields/pointPatchFields/pointPatchField/{newPointPatchField.C => pointPatchFieldNew.C} (100%)
 rename src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/{newGAMGInterfaceField.C => GAMGInterfaceFieldNew.C} (100%)
 rename src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/{newGAMGInterface.C => GAMGInterfaceNew.C} (100%)
 rename src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/{newFacePointPatch.C => facePointPatchNew.C} (100%)
 rename src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/{newPolyPatch.C => polyPatchNew.C} (100%)
 rename src/OpenFOAM/meshes/polyMesh/zones/cellZone/{newCellZone.C => cellZoneNew.C} (100%)
 rename src/OpenFOAM/meshes/polyMesh/zones/faceZone/{newFaceZone.C => faceZoneNew.C} (100%)
 rename src/OpenFOAM/meshes/polyMesh/zones/pointZone/{newPointZone.C => pointZoneNew.C} (100%)
 rename src/dynamicFvMesh/dynamicFvMesh/{newDynamicFvMesh.C => dynamicFvMeshNew.C} (100%)
 rename src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/{newSolidBodyMotionFunction.C => solidBodyMotionFunctionNew.C} (100%)
 rename src/dynamicMesh/polyTopoChange/polyMeshModifier/{newPolyMeshModifier.C => polyMeshModifierNew.C} (100%)
 rename src/engine/engineMesh/engineMesh/{newEngineMesh.C => engineMeshNew.C} (100%)
 rename src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/{newSRFModel.C => SRFModelNew.C} (100%)
 rename src/finiteVolume/fields/fvPatchFields/fvPatchField/{newFvPatchField.C => fvPatchFieldNew.C} (100%)
 rename src/finiteVolume/fields/fvsPatchFields/fvsPatchField/{newFvsPatchField.C => fvsPatchFieldNew.C} (100%)
 rename src/finiteVolume/fvMesh/fvPatches/fvPatch/{newFvPatch.C => fvPatchNew.C} (100%)
 rename src/finiteVolume/interpolation/interpolation/interpolation/{newInterpolation.C => interpolationNew.C} (100%)
 rename src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/{newAtomizationModel.C => atomizationModelNew.C} (100%)
 rename src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/{newBreakupModel.C => breakupModelNew.C} (100%)
 rename src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/{newCollisionModel.C => collisionModelNew.C} (100%)
 rename src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/{newDispersionModel.C => dispersionModelNew.C} (100%)
 rename src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/{newDragModel.C => dragModelNew.C} (100%)
 rename src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/{newEvaporationModel.C => evaporationModelNew.C} (100%)
 rename src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/{newHeatTransferModel.C => heatTransferModelNew.C} (100%)
 rename src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/{newInjectorModel.C => injectorModelNew.C} (100%)
 rename src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/{newWallModel.C => wallModelNew.C} (100%)
 rename src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/{NewBinaryCollisionModel.C => BinaryCollisionModelNew.C} (100%)
 rename src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/{NewInflowBoundaryModel.C => InflowBoundaryModelNew.C} (100%)
 rename src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/{NewWallInteractionModel.C => WallInteractionModelNew.C} (100%)
 rename src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/{newIntegrationScheme.C => IntegrationSchemeNew.C} (100%)
 rename src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/{NewDataEntry.C => DataEntryNew.C} (100%)
 rename src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/{NewDispersionModel.C => DispersionModelNew.C} (100%)
 rename src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/{NewDragModel.C => DragModelNew.C} (100%)
 rename src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/{NewInjectionModel.C => InjectionModelNew.C} (100%)
 rename src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/{NewPatchInteractionModel.C => PatchInteractionModelNew.C} (100%)
 rename src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/{NewPostProcessingModel.C => PostProcessingModelNew.C} (100%)
 rename src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/{NewSurfaceFilmModel.C => SurfaceFilmModelNew.C} (100%)
 rename src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/{NewCompositionModel.C => CompositionModelNew.C} (100%)
 rename src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/{NewPhaseChangeModel.C => PhaseChangeModelNew.C} (100%)
 rename src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/{NewDevolatilisationModel.C => DevolatilisationModelNew.C} (100%)
 rename src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/{NewSurfaceReactionModel.C => SurfaceReactionModelNew.C} (100%)
 rename src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/{NewHeatTransferModel.C => HeatTransferModelNew.C} (100%)
 rename src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/{newEnergyScalingFunction.C => energyScalingFunctionNew.C} (100%)
 rename src/lagrangian/molecularDynamics/potential/pairPotential/basic/{newPairPotential.C => pairPotentialNew.C} (100%)
 rename src/lagrangian/molecularDynamics/potential/tetherPotential/basic/{newTetherPotential.C => tetherPotentialNew.C} (100%)
 rename src/postProcessing/foamCalcFunctions/calcType/{newCalcType.C => calcTypeNew.C} (100%)
 rename src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/{newSixDoFRigidBodyMotionConstraint.C => sixDoFRigidBodyMotionConstraintNew.C} (100%)
 rename src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/{newSixDoFRigidBodyMotionRestraint.C => sixDoFRigidBodyMotionRestraintNew.C} (100%)
 rename src/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/{newInjectionModel.C => injectionModelNew.C} (100%)
 rename src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/{newPhaseChangeModel.C => phaseChangeModelNew.C} (100%)
 rename src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/{newSurfaceFilmModel.C => surfaceFilmModelNew.C} (100%)
 rename src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/{newBarotropicCompressibilityModel.C => barotropicCompressibilityModelNew.C} (100%)
 rename src/thermophysicalModels/basic/psiThermo/basicPsiThermo/{newBasicPsiThermo.C => basicPsiThermoNew.C} (100%)
 rename src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/{newBasicRhoThermo.C => basicRhoThermoNew.C} (100%)
 rename src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/{newPsiChemistryModel.C => psiChemistryModelNew.C} (100%)
 rename src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/{newRhoChemistryModel.C => rhoChemistryModelNew.C} (100%)
 rename src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/{newChemistrySolver.C => chemistrySolverNew.C} (100%)
 rename src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/{newLaminarFlameSpeed.C => laminarFlameSpeedNew.C} (100%)
 rename src/thermophysicalModels/pdfs/pdf/{newPdf.C => pdfNew.C} (100%)
 rename src/thermophysicalModels/radiation/radiationModel/radiationModel/{newRadiationModel.C => radiationModelNew.C} (100%)
 rename src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/{newAbsorptionEmissionModel.C => absorptionEmissionModelNew.C} (100%)
 rename src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/{newScatterModel.C => scatterModelNew.C} (100%)
 rename src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/{newhCombustionThermo.C => hCombustionThermoNew.C} (100%)
 rename src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/{newhhuCombustionThermo.C => hhuCombustionThermoNew.C} (100%)
 rename src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/{newhsCombustionThermo.C => hsCombustionThermoNew.C} (100%)
 rename src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/{newhReactionThermo.C => hReactionThermoNew.C} (100%)
 rename src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/{newhsReactionThermo.C => hsReactionThermoNew.C} (100%)
 rename src/thermophysicalModels/solids/solid/{newSolid.C => solidNew.C} (100%)
 rename src/transportModels/incompressible/viscosityModels/viscosityModel/{newViscosityModel.C => viscosityModelNew.C} (100%)

diff --git a/applications/solvers/combustion/PDRFoam/Make/files b/applications/solvers/combustion/PDRFoam/Make/files
index 889eebc33e6..d1b1d5a8f80 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 5b1262b70d4..86696b07093 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 5f65a3a4c24..5a7f01e980f 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 0aa466b06ef..5c345db148f 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 8d23cb95501..cf4603e1f8b 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 4dbcbe86e68..7e05bcb4645 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 a6ff2ca0f02..43c2f6df9d4 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 91b2eccf283..fdd7c3e7b7c 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 77c9217ded7..96d2bb2a859 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 bf01c691309..0e6c49a9157 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 17da5aefef5..0016b235f13 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 1b18dbdc218..764fa5b31b3 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 f9cbfcad9a3..c9e5a8c8530 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 2186ba2116e..fd0dfc5b11e 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 bdfc52bb589..291d18db74c 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 44f510d9586..0aaf2a6a059 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 ca9a99aca6f..ecfb8bc9f7d 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 31d68d43efd..adfd30fb2cd 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 0f0bcb7787b..367649d0769 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 8201b7236de..02e9ad7ce4c 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 81cb8ea6ba2..a11ecaf06fe 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 fecd16bd4e8..f1a91c869d5 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 4e7c797c11d..aba51a34041 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 1a8720af065..e43423b1b11 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 10660e68c1c..2b0514a5de3 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 b98fdcd4538..85d139ac743 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 fbadb7cdbee..ddadbd538e7 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 c5a6c944381..4a58469a7d2 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 7fd1ca7f2a4..a619925bbc4 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 ac7a5a3a976..c22949610e8 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 6343f44c288..f6f6e834e92 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 f9b0527ae68..81117e2250e 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 762c7dd047a..233aa384e6f 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 cc81903cd4f..454787cca63 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 dbf6eabb917..76c499bc3fe 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 d99eb2dbfef..f54635283dc 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 4fc46e49abf..bf4af83b0fd 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 64b5133d087..8e6853593ad 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 08a2ade296c..9138509a358 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 2d0d4367a58..a01ed90bbda 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 3ee135476b2..f7436f5ada6 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 999e249c724..0f7efefbf14 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 366a19f7748..e86ddefb420 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 b2e8055a45a..42fbe9be932 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 493005c5bd1..6bfb6e016c2 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 b32da26c7fd..d8454e9eb73 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 8c788686482..8f98590bf42 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 41d01f0eee5..2ba518788ff 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 eb8f6609c0e..bc97c3e6854 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 94d75492feb..f48ddd9a67a 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 42c6198987c..cd595e0a470 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 f73de254009..f05a0eb661c 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 03193e9eadd..6e3ab3fa1d5 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 d85d95ab6e6..d5be203a04d 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 40c5c0cd8c1..9aa949f4c43 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 2630ce6f99f..447bab94734 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 f19f694001e..1170ec97ac9 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 fb6b57af8a3..9019f021405 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 4afe4de3d95..db94eec41ed 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 227548b6efa..11f211b6643 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 a7e8198a133..f7d62c755f6 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 26d03fcf22d..b34beb19d66 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 55297ca8c80..8fa83c42e0c 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 0cde9d248e6..4f9cf092148 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 ccb684ed96e..3c63ece5dab 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 a5f053d3251..bab292bc4dd 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 aecce33191d..cbaf49b8100 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 999ee539184..deda1549170 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 59f8f822ea2..1a9d82af062 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 2fbae5388c3..52053470373 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 2e149af1700..dcc85aa8522 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 b92108d63a2..f78853a7ea1 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 37ae0bb73b4..544020eac1f 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 fb7ccec330d..468c086eea8 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 38b031de407..68e8c187dc0 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 7b0c50a9562..e032b86bc52 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 42318f2c936..b0c5ea671d1 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 efa6279d305..5c77d42f128 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 471dbb114d2..6f56f0ef004 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 f466c33a640..22f3214352d 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 5da964b97f8..9dfd710c3de 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 bf2c44863a9..898a3c648ce 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 ce68da15717..e95774991c6 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
-- 
GitLab