From 9933258bebfa35533586c9b6ba9451b4febd64a2 Mon Sep 17 00:00:00 2001
From: Weiqun Zhang <WeiqunZhang@lbl.gov>
Date: Wed, 11 Sep 2024 17:51:13 -0500
Subject: [PATCH] Use ERF_ prefix (#1799)

---
 CMake/BuildERFExe.cmake                       | 144 +++++++++---------
 Exec/ABL/CMakeLists.txt                       |   2 +-
 Exec/ABL/{prob.H => ERF_prob.H}               |  10 +-
 .../prob.cpp => ABL/ERF_prob.cpp}             |   2 +-
 Exec/ABL/Make.package                         |   4 +-
 Exec/ABL_input_sounding/CMakeLists.txt        |   2 +-
 .../ABL_input_sounding/{prob.H => ERF_prob.H} |  10 +-
 .../{prob.cpp => ERF_prob.cpp}                |   2 +-
 Exec/ABL_input_sounding/Make.package          |   4 +-
 Exec/DevTests/ABL_with_WW3/CMakeLists.txt     |   2 +-
 .../ABL_with_WW3/{prob.H => ERF_prob.H}       |  10 +-
 .../ABL_with_WW3/ERF_prob.cpp}                |   2 +-
 Exec/DevTests/ABL_with_WW3/Make.package       |   4 +-
 Exec/DevTests/EB_Test/CMakeLists.txt          |   2 +-
 Exec/DevTests/EB_Test/{prob.H => ERF_prob.H}  |   8 +-
 .../EB_Test/{prob.cpp => ERF_prob.cpp}        |   4 +-
 Exec/DevTests/EB_Test/Make.package            |   4 +-
 Exec/DevTests/LandSurfaceModel/CMakeLists.txt |   2 +-
 .../LandSurfaceModel/{prob.H => ERF_prob.H}   |   6 +-
 .../{prob.cpp => ERF_prob.cpp}                |   2 +-
 Exec/DevTests/LandSurfaceModel/Make.package   |   4 +-
 Exec/DevTests/MetGrid/CMakeLists.txt          |   2 +-
 Exec/DevTests/MetGrid/{prob.H => ERF_prob.H}  |   6 +-
 .../MetGrid/{prob.cpp => ERF_prob.cpp}        |   2 +-
 Exec/DevTests/MetGrid/Make.package            |   4 +-
 Exec/DevTests/MovingTerrain/CMakeLists.txt    |   2 +-
 .../MovingTerrain/{prob.H => ERF_prob.H}      |   8 +-
 .../MovingTerrain/{prob.cpp => ERF_prob.cpp}  |   6 +-
 Exec/DevTests/MovingTerrain/Make.package      |   4 +-
 Exec/DevTests/MultiBlock/CMakeLists.txt       |   2 +-
 .../MultiBlock/{prob.H => ERF_prob.H}         |   8 +-
 .../MultiBlock/{prob.cpp => ERF_prob.cpp}     |   4 +-
 Exec/DevTests/MultiBlock/Make.package         |   4 +-
 .../DevTests/TemperatureSource/CMakeLists.txt |   2 +-
 .../TemperatureSource/{prob.H => ERF_prob.H}  |  10 +-
 .../{prob.cpp => ERF_prob.cpp}                |   4 +-
 Exec/DevTests/TemperatureSource/Make.package  |   4 +-
 Exec/DevTests/TropicalCyclone/CMakeLists.txt  |   2 +-
 .../TropicalCyclone/{prob.H => ERF_prob.H}    |  10 +-
 .../{prob.cpp => ERF_prob.cpp}                |   2 +-
 Exec/DevTests/TropicalCyclone/Make.package    |   4 +-
 Exec/EWP/CMakeLists.txt                       |   2 +-
 .../prob.H => EWP/ERF_prob.H}                 |  10 +-
 Exec/EWP/{prob.cpp => ERF_prob.cpp}           |   2 +-
 Exec/EWP/Make.package                         |   4 +-
 Exec/LLJ/CMakeLists.txt                       |   4 +-
 Exec/LLJ/{prob.H => ERF_prob.H}               |   8 +-
 Exec/LLJ/{prob.cpp => ERF_prob.cpp}           |   2 +-
 Exec/LLJ/Make.package                         |   4 +-
 Exec/Radiation/CMakeLists.txt                 |   2 +-
 .../prob.H => Radiation/ERF_prob.H}           |   8 +-
 Exec/Radiation/{prob.cpp => ERF_prob.cpp}     |   4 +-
 Exec/Radiation/Make.package                   |   4 +-
 Exec/RegTests/Bomex/CMakeLists.txt            |   2 +-
 Exec/RegTests/Bomex/{prob.H => ERF_prob.H}    |  10 +-
 .../RegTests/Bomex/{prob.cpp => ERF_prob.cpp} |   4 +-
 Exec/RegTests/Bomex/Make.package              |   4 +-
 Exec/RegTests/Bubble/CMakeLists.txt           |   2 +-
 Exec/RegTests/Bubble/{prob.H => ERF_prob.H}   |  12 +-
 .../Bubble/{prob.cpp => ERF_prob.cpp}         |   6 +-
 Exec/RegTests/Bubble/Make.package             |   4 +-
 .../Couette_Poiseuille/CMakeLists.txt         |   2 +-
 .../Couette_Poiseuille/{prob.H => ERF_prob.H} |   8 +-
 .../{prob.cpp => ERF_prob.cpp}                |   2 +-
 Exec/RegTests/Couette_Poiseuille/Make.package |   4 +-
 Exec/RegTests/DensityCurrent/CMakeLists.txt   |   2 +-
 .../DensityCurrent/{prob.H => ERF_prob.H}     |   8 +-
 .../DensityCurrent/{prob.cpp => ERF_prob.cpp} |   4 +-
 Exec/RegTests/DensityCurrent/Make.package     |   4 +-
 .../RegTests/DynamicRefinement/CMakeLists.txt |   2 +-
 .../DynamicRefinement/{prob.H => ERF_prob.H}  |   8 +-
 .../{prob.cpp => ERF_prob.cpp}                |   2 +-
 Exec/RegTests/DynamicRefinement/Make.package  |   4 +-
 Exec/RegTests/EkmanSpiral/CMakeLists.txt      |   2 +-
 .../EkmanSpiral/{prob.H => ERF_prob.H}        |   8 +-
 .../EkmanSpiral/{prob.cpp => ERF_prob.cpp}    |   2 +-
 Exec/RegTests/EkmanSpiral/Make.package        |   4 +-
 Exec/RegTests/EkmanSpiral/README              |   2 +-
 Exec/RegTests/IsentropicVortex/CMakeLists.txt |   2 +-
 .../IsentropicVortex/{prob.H => ERF_prob.H}   |   8 +-
 .../{prob.cpp => ERF_prob.cpp}                |   4 +-
 Exec/RegTests/IsentropicVortex/Make.package   |   4 +-
 Exec/RegTests/ParticlesOverWoA/CMakeLists.txt |   2 +-
 .../ParticlesOverWoA/{prob.H => ERF_prob.H}   |   8 +-
 .../{prob.cpp => ERF_prob.cpp}                |   6 +-
 Exec/RegTests/ParticlesOverWoA/Make.package   |   4 +-
 Exec/RegTests/ScalarAdvDiff/CMakeLists.txt    |   2 +-
 .../ScalarAdvDiff/{prob.H => ERF_prob.H}      |   8 +-
 .../ScalarAdvDiff/{prob.cpp => ERF_prob.cpp}  |   2 +-
 Exec/RegTests/ScalarAdvDiff/Make.package      |   4 +-
 .../ScalarAdvDiff/prob.cpp.convergence        |   6 +-
 .../StokesSecondProblem/CMakeLists.txt        |   2 +-
 .../{prob.H => ERF_prob.H}                    |   8 +-
 .../{prob.cpp => ERF_prob.cpp}                |   4 +-
 .../RegTests/StokesSecondProblem/Make.package |   2 +-
 .../RegTests/TaylorGreenVortex/CMakeLists.txt |   2 +-
 .../TaylorGreenVortex/{prob.H => ERF_prob.H}  |   8 +-
 .../{prob.cpp => ERF_prob.cpp}                |   4 +-
 Exec/RegTests/TaylorGreenVortex/Make.package  |   4 +-
 .../Terrain2d_Cylinder/CMakeLists.txt         |   2 +-
 .../Terrain2d_Cylinder/{prob.H => ERF_prob.H} |   8 +-
 .../{prob.cpp => ERF_prob.cpp}                |   6 +-
 Exec/RegTests/Terrain2d_Cylinder/Make.package |   4 +-
 .../Terrain3d_Hemisphere/CMakeLists.txt       |   2 +-
 .../{prob.H => ERF_prob.H}                    |   8 +-
 .../{prob.cpp => ERF_prob.cpp}                |   4 +-
 .../Terrain3d_Hemisphere/Make.package         |   4 +-
 Exec/RegTests/TurbulentInflow/CMakeLists.txt  |   2 +-
 .../TurbulentInflow/{prob.H => ERF_prob.H}    |  10 +-
 .../{prob.cpp => ERF_prob.cpp}                |   2 +-
 Exec/RegTests/TurbulentInflow/Make.package    |   4 +-
 Exec/RegTests/WPS_Test/CMakeLists.txt         |   2 +-
 Exec/RegTests/WPS_Test/{prob.H => ERF_prob.H} |   8 +-
 .../WPS_Test/{prob.cpp => ERF_prob.cpp}       |   2 +-
 Exec/RegTests/WPS_Test/Make.package           |   4 +-
 Exec/RegTests/WitchOfAgnesi/CMakeLists.txt    |   2 +-
 .../WitchOfAgnesi/{prob.H => ERF_prob.H}      |  10 +-
 .../WitchOfAgnesi/{prob.cpp => ERF_prob.cpp}  |   4 +-
 Exec/RegTests/WitchOfAgnesi/Make.package      |   4 +-
 Exec/SimpleActuatorDisk/CMakeLists.txt        |   2 +-
 .../prob.H => SimpleActuatorDisk/ERF_prob.H}  |  10 +-
 .../{prob.cpp => ERF_prob.cpp}                |   2 +-
 Exec/SimpleActuatorDisk/Make.package          |   4 +-
 Exec/SpongeTest/CMakeLists.txt                |   2 +-
 Exec/SpongeTest/{prob.H => ERF_prob.H}        |   8 +-
 Exec/SpongeTest/{prob.cpp => ERF_prob.cpp}    |   6 +-
 Exec/SpongeTest/Make.package                  |   4 +-
 Exec/SquallLine_2D/CMakeLists.txt             |   2 +-
 Exec/SquallLine_2D/{prob.H => ERF_prob.H}     |  14 +-
 Exec/SquallLine_2D/{prob.cpp => ERF_prob.cpp} |   2 +-
 Exec/SquallLine_2D/Make.package               |   4 +-
 Exec/SuperCell/CMakeLists.txt                 |   2 +-
 .../prob.H => SuperCell/ERF_prob.H}           |   8 +-
 Exec/SuperCell/{prob.cpp => ERF_prob.cpp}     |   4 +-
 Exec/SuperCell/Make.package                   |   4 +-
 Exec/SuperCell_3D/CMakeLists.txt              |   2 +-
 Exec/SuperCell_3D/{prob.H => ERF_prob.H}      |  14 +-
 Exec/SuperCell_3D/{prob.cpp => ERF_prob.cpp}  |   2 +-
 Exec/SuperCell_3D/Make.package                |   4 +-
 .../{Advection.H => ERF_Advection.H}          |  10 +-
 ...cForMom.cpp => ERF_AdvectionSrcForMom.cpp} |   6 +-
 ...cForMom_N.H => ERF_AdvectionSrcForMom_N.H} |   4 +-
 ...cForMom_T.H => ERF_AdvectionSrcForMom_T.H} |   6 +-
 ...enBC.cpp => ERF_AdvectionSrcForOpenBC.cpp} |   2 +-
 ...Scalars.H => ERF_AdvectionSrcForScalars.H} |   4 +-
 ...State.cpp => ERF_AdvectionSrcForState.cpp} |   8 +-
 Source/Advection/Make.package                 |  16 +-
 .../{ABLMost.H => ERF_ABLMost.H}              |  14 +-
 .../{ABLMost.cpp => ERF_ABLMost.cpp}          |   2 +-
 ...pp => ERF_BoundaryConditions_bndryreg.cpp} |   0
 ...ns.cpp => ERF_BoundaryConditions_cons.cpp} |   0
 ...cpp => ERF_BoundaryConditions_realbdy.cpp} |   2 +-
 ...el.cpp => ERF_BoundaryConditions_xvel.cpp} |   2 +-
 ...el.cpp => ERF_BoundaryConditions_yvel.cpp} |   0
 ...el.cpp => ERF_BoundaryConditions_zvel.cpp} |   2 +-
 Source/BoundaryConditions/ERF_FillPatch.cpp   |   6 +-
 .../{MOSTAverage.H => ERF_MOSTAverage.H}      |   8 +-
 .../{MOSTAverage.cpp => ERF_MOSTAverage.cpp}  |   4 +-
 .../{MOSTRoughness.H => ERF_MOSTRoughness.H}  |   0
 .../{MOSTStress.H => ERF_MOSTStress.H}        |  10 +-
 Source/BoundaryConditions/ERF_PhysBCFunct.H   |  10 +-
 Source/BoundaryConditions/ERF_PhysBCFunct.cpp |   2 +-
 ...latedData.H => ERF_TimeInterpolatedData.H} |   0
 Source/BoundaryConditions/Make.package        |  24 +--
 .../{AdvStruct.H => ERF_AdvStruct.H}          |   6 +-
 .../{DataStruct.H => ERF_DataStruct.H}        |  16 +-
 .../{DiffStruct.H => ERF_DiffStruct.H}        |   4 +-
 ...SoundingData.H => ERF_InputSoundingData.H} |   8 +-
 ...nputSpongeData.H => ERF_InputSpongeData.H} |   6 +-
 .../{SpongeStruct.H => ERF_SpongeStruct.H}    |   4 +-
 ...{TurbPertStruct.H => ERF_TurbPertStruct.H} |   8 +-
 .../{TurbStruct.H => ERF_TurbStruct.H}        |   6 +-
 Source/DataStructs/Make.package               |  16 +-
 ...teStrain_N.cpp => ERF_ComputeStrain_N.cpp} |   2 +-
 ...teStrain_T.cpp => ERF_ComputeStrain_T.cpp} |   4 +-
 ...teStress_N.cpp => ERF_ComputeStress_N.cpp} |   2 +-
 ...teStress_T.cpp => ERF_ComputeStress_T.cpp} |   4 +-
 ....cpp => ERF_ComputeTurbulentViscosity.cpp} |  16 +-
 .../{Diffusion.H => ERF_Diffusion.H}          |  10 +-
 ...Mom_N.cpp => ERF_DiffusionSrcForMom_N.cpp} |   4 +-
 ...Mom_T.cpp => ERF_DiffusionSrcForMom_T.cpp} |   4 +-
 ...e_N.cpp => ERF_DiffusionSrcForState_N.cpp} |   6 +-
 ...e_T.cpp => ERF_DiffusionSrcForState_T.cpp} |   8 +-
 .../{EddyViscosity.H => ERF_EddyViscosity.H}  |  10 +-
 Source/Diffusion/Make.package                 |  22 +--
 Source/EB/{FlowerIF.H => ERF_FlowerIF.H}      |   4 +-
 Source/EB/{TerrainIF.H => ERF_TerrainIF.H}    |   4 +-
 Source/EB/{eb_box.cpp => ERF_eb_box.cpp}      |   0
 .../{eb_cylinder.cpp => ERF_eb_cylinder.cpp}  |   0
 Source/EB/{eb_if.H => ERF_eb_if.H}            |   0
 .../EB/{eb_regular.cpp => ERF_eb_regular.cpp} |   2 +-
 Source/EB/{initEB.cpp => ERF_initEB.cpp}      |   6 +-
 ...teEBsurface.cpp => ERF_writeEBsurface.cpp} |   0
 Source/EB/Make.package                        |  16 +-
 Source/ERF.H                                  |  32 ++--
 Source/ERF.cpp                                |   8 +-
 Source/{Derive.H => ERF_Derive.H}             |   4 +-
 Source/{Derive.cpp => ERF_Derive.cpp}         |   6 +-
 Source/{EOS.H => ERF_EOS.H}                   |   0
 Source/{HSE_utils.H => ERF_HSE_utils.H}       |   4 +-
 Source/{IndexDefines.H => ERF_IndexDefines.H} |   4 +-
 Source/ERF_Tagging.cpp                        |   2 +-
 Source/ERF_make_new_arrays.cpp                |  12 +-
 Source/ERF_make_new_level.cpp                 |   6 +-
 Source/{prob_common.H => ERF_prob_common.H}   |  12 +-
 Source/ERF_read_waves.cpp                     |   2 +-
 .../IO/{Checkpoint.cpp => ERF_Checkpoint.cpp} |   0
 ...{NCCheckpoint.cpp => ERF_NCCheckpoint.cpp} |   2 +-
 ...{NCColumnFile.cpp => ERF_NCColumnFile.cpp} |   4 +-
 .../IO/{NCInterface.H => ERF_NCInterface.H}   |   4 +-
 .../{NCInterface.cpp => ERF_NCInterface.cpp}  |   2 +-
 ...ultiFabFile.cpp => ERF_NCMultiFabFile.cpp} |   6 +-
 Source/IO/ERF_NCPlotFile.H                    |   4 +
 .../IO/{NCPlotFile.cpp => ERF_NCPlotFile.cpp} |   6 +-
 Source/IO/{NCWpsFile.H => ERF_NCWpsFile.H}    |   6 +-
 Source/IO/{Plotfile.cpp => ERF_Plotfile.cpp}  |   4 +-
 Source/IO/ERF_ReadBndryPlanes.H               |   4 +-
 Source/IO/ERF_ReadBndryPlanes.cpp             |   4 +-
 ...romMetgrid.cpp => ERF_ReadFromMetgrid.cpp} |   4 +-
 ...dFromWRFBdy.cpp => ERF_ReadFromWRFBdy.cpp} |  10 +-
 ...mWRFInput.cpp => ERF_ReadFromWRFInput.cpp} |   4 +-
 Source/IO/ERF_Write1DProfiles.cpp             |   2 +-
 Source/IO/ERF_Write1DProfiles_stag.cpp        |   2 +-
 Source/IO/ERF_WriteBndryPlanes.cpp            |   4 +-
 .../IO/{console_io.cpp => ERF_console_io.cpp} |   2 +-
 ...{writeJobInfo.cpp => ERF_writeJobInfo.cpp} |   0
 Source/IO/Make.package                        |  30 ++--
 Source/IO/NCPlotFile.H                        |   4 -
 .../{Metgrid_utils.H => ERF_Metgrid_utils.H}  |  10 +-
 Source/Initialization/ERF_init1d.cpp          |  16 +-
 Source/Initialization/ERF_init_TurbPert.cpp   |   6 +-
 Source/Initialization/ERF_init_custom.cpp     |   4 +-
 Source/Initialization/ERF_init_from_hse.cpp   |   4 +-
 .../ERF_init_from_input_sounding.cpp          |   6 +-
 .../Initialization/ERF_init_from_metgrid.cpp  |   2 +-
 .../Initialization/ERF_init_from_wrfinput.cpp |   8 +-
 Source/Initialization/ERF_init_uniform.cpp    |   2 +-
 Source/Initialization/ERF_input_sponge.cpp    |   6 +-
 Source/Initialization/Make.package            |   2 +-
 .../{LandSurface.H => ERF_LandSurface.H}      |  10 +-
 .../LandSurfaceModel/MM5/{MM5.H => ERF_MM5.H} |  10 +-
 .../MM5/{MM5.cpp => ERF_MM5.cpp}              |   2 +-
 Source/LandSurfaceModel/MM5/Make.package      |   4 +-
 Source/LandSurfaceModel/Make.package          |   2 +-
 .../Null/{NullSurf.H => ERF_NullSurf.H}       |   6 +-
 Source/LandSurfaceModel/Null/Make.package     |   2 +-
 .../LandSurfaceModel/SLM/{SLM.H => ERF_SLM.H} |  10 +-
 .../SLM/{SLM.cpp => ERF_SLM.cpp}              |   2 +-
 Source/LandSurfaceModel/SLM/Make.package      |   4 +-
 Source/Make.package                           |  12 +-
 ...rophysics.H => ERF_EulerianMicrophysics.H} |  14 +-
 ...physics.H => ERF_LagrangianMicrophysics.H} |  10 +-
 .../{Microphysics.H => ERF_Microphysics.H}    |   8 +-
 ...{Init_Kessler.cpp => ERF_Init_Kessler.cpp} |  10 +-
 .../Kessler/{Kessler.H => ERF_Kessler.H}      |  12 +-
 .../Kessler/{Kessler.cpp => ERF_Kessler.cpp}  |   8 +-
 ...ate_Kessler.cpp => ERF_Update_Kessler.cpp} |   6 +-
 Source/Microphysics/Kessler/Make.package      |   8 +-
 Source/Microphysics/Make.package              |   6 +-
 .../Null/{NullMoist.H => ERF_NullMoist.H}     |   6 +-
 ...Lagrangian.H => ERF_NullMoistLagrangian.H} |   8 +-
 Source/Microphysics/Null/Make.package         |   4 +-
 .../SAM/{Cloud_SAM.cpp => ERF_Cloud_SAM.cpp}  |   8 +-
 .../SAM/{IceFall.cpp => ERF_IceFall.cpp}      |   4 +-
 .../SAM/{Init_SAM.cpp => ERF_Init_SAM.cpp}    |  10 +-
 .../SAM/{Precip.cpp => ERF_Precip.cpp}        |   4 +-
 .../{PrecipFall.cpp => ERF_PrecipFall.cpp}    |   4 +-
 Source/Microphysics/SAM/{SAM.H => ERF_SAM.H}  |  12 +-
 .../{Update_SAM.cpp => ERF_Update_SAM.cpp}    |   6 +-
 Source/Microphysics/SAM/Make.package          |  14 +-
 ...kContainer.H => ERF_MultiBlockContainer.H} |   4 +-
 ...tainer.cpp => ERF_MultiBlockContainer.cpp} |   2 +-
 Source/MultiBlock/Make.package                |   4 +-
 ...5.cpp => ERF_ComputeDiffusivityMYNN25.cpp} |  10 +-
 ...yYSU.cpp => ERF_ComputeDiffusivityYSU.cpp} |  10 +-
 Source/PBL/{MYNNStruct.H => ERF_MYNNStruct.H} |   4 +-
 Source/PBL/{PBLHeight.H => ERF_PBLHeight.H}   |   8 +-
 Source/PBL/{PBLModels.H => ERF_PBLModels.H}   |   6 +-
 Source/PBL/Make.package                       |   8 +-
 Source/Particles/ERFPCEvolve.cpp              |   2 +-
 .../{ParticleData.H => ERF_ParticleData.H}    |   4 +-
 Source/Particles/Make.package                 |   2 +-
 ..._hse.H => ERF_init_constant_density_hse.H} |   0
 ...y_hse_dry.H => ERF_init_density_hse_dry.H} |   0
 ..._damping.H => ERF_init_rayleigh_damping.H} |   2 +-
 ...{Aero_rad_props.H => ERF_Aero_rad_props.H} |   6 +-
 ...o_rad_props.cpp => ERF_Aero_rad_props.cpp} |   4 +-
 Source/Radiation/{Albedo.H => ERF_Albedo.H}   |   0
 .../Radiation/{Albedo.cpp => ERF_Albedo.cpp}  |   2 +-
 ...loud_rad_props.H => ERF_Cloud_rad_props.H} |   4 +-
 ..._rad_props.cpp => ERF_Cloud_rad_props.cpp} |   2 +-
 .../{Ebert_curry.H => ERF_Ebert_curry.H}      |   0
 ...ize_rrtmgp.cpp => ERF_Finalize_rrtmgp.cpp} |   2 +-
 .../{Init_rrtmgp.cpp => ERF_Init_rrtmgp.cpp}  |   2 +-
 ...interpolate.H => ERF_Linear_interpolate.H} |   0
 .../{Mam4_aero.H => ERF_Mam4_aero.H}          |   6 +-
 ...constituents.H => ERF_Mam4_constituents.H} |   4 +-
 ...ruptake.H => ERF_Modal_aero_wateruptake.H} |   6 +-
 Source/Radiation/{Optics.H => ERF_Optics.H}   |   4 +-
 .../Radiation/{Optics.cpp => ERF_Optics.cpp}  |   8 +-
 ...eterizations.H => ERF_Parameterizations.H} |   2 +-
 .../{Phys_prop.H => ERF_Phys_prop.H}          |   2 +-
 .../{Rad_constants.H => ERF_Rad_constants.H}  |   0
 .../{Radiation.H => ERF_Radiation.H}          |  12 +-
 .../{Radiation.cpp => ERF_Radiation.cpp}      |  14 +-
 Source/Radiation/{Rrtmgp.H => ERF_Rrtmgp.H}   |   0
 ...rrtmgp.cpp => ERF_Run_longwave_rrtmgp.cpp} |   2 +-
 ...rtmgp.cpp => ERF_Run_shortwave_rrtmgp.cpp} |   2 +-
 Source/Radiation/{Slingo.H => ERF_Slingo.H}   |   0
 ...2005_effradius.H => ERF_m2005_effradius.H} |   2 +-
 Source/Radiation/Make.package                 |  20 +--
 Source/SourceTerms/ERF_ApplySpongeZoneBCs.cpp |   8 +-
 .../ERF_ApplySpongeZoneBCs_ReadFromFile.cpp   |  10 +-
 ...alDiffusion.H => ERF_NumericalDiffusion.H} |   6 +-
 ...ffusion.cpp => ERF_NumericalDiffusion.cpp} |   2 +-
 .../{Src_headers.H => ERF_Src_headers.H}      |  10 +-
 .../SourceTerms/ERF_add_thin_body_sources.cpp |  10 +-
 Source/SourceTerms/ERF_make_buoyancy.cpp      |  10 +-
 Source/SourceTerms/ERF_make_mom_sources.cpp   |  10 +-
 Source/SourceTerms/ERF_make_sources.cpp       |   6 +-
 Source/SourceTerms/ERF_moist_set_rhs.cpp      |   4 +-
 Source/SourceTerms/Make.package               |   6 +-
 Source/TimeIntegration/ERF_Advance.cpp        |   8 +-
 .../TimeIntegration/ERF_ComputeTimestep.cpp   |   2 +-
 Source/TimeIntegration/ERF_MRI.H              |   4 +-
 ...I_fast_headers.H => ERF_TI_fast_headers.H} |  14 +-
 ...I_fast_rhs_fun.H => ERF_TI_fast_rhs_fun.H} |   0
 ..._substep_fun.H => ERF_TI_no_substep_fun.H} |   0
 ...I_slow_headers.H => ERF_TI_slow_headers.H} |  22 +--
 ...I_slow_rhs_fun.H => ERF_TI_slow_rhs_fun.H} |   2 +-
 .../{TI_utils.H => ERF_TI_utils.H}            |   0
 Source/TimeIntegration/ERF_TimeStep.cpp       |   2 +-
 Source/TimeIntegration/ERF_advance_dycore.cpp |  22 +--
 Source/TimeIntegration/ERF_fast_rhs_MT.cpp    |   2 +-
 Source/TimeIntegration/ERF_fast_rhs_N.cpp     |   2 +-
 Source/TimeIntegration/ERF_fast_rhs_T.cpp     |   2 +-
 .../TimeIntegration/ERF_make_fast_coeffs.cpp  |   4 +-
 Source/TimeIntegration/ERF_make_tau_terms.cpp |   6 +-
 Source/TimeIntegration/ERF_slow_rhs_post.cpp  |   6 +-
 Source/TimeIntegration/ERF_slow_rhs_pre.cpp   |   6 +-
 Source/TimeIntegration/Make.package           |  13 +-
 .../{ChopGrids.cpp => ERF_ChopGrids.cpp}      |   2 +-
 ...tionSelector.H => ERF_DirectionSelector.H} |   6 +-
 ...stCells.cpp => ERF_InteriorGhostCells.cpp} |   2 +-
 .../{Interpolation.H => ERF_Interpolation.H}  |  12 +-
 ...erpolation_1D.H => ERF_Interpolation_1D.H} |   0
 ...polation_UPW.H => ERF_Interpolation_UPW.H} |   6 +-
 ...lation_WENO.H => ERF_Interpolation_WENO.H} |   6 +-
 ...on_WENO_Z.H => ERF_Interpolation_WENO_Z.H} |   6 +-
 ...ysics_Utils.H => ERF_Microphysics_Utils.H} |   4 +-
 ...elocity.cpp => ERF_MomentumToVelocity.cpp} |   4 +-
 Source/Utils/{Orbit.H => ERF_Orbit.H}         |   6 +-
 Source/Utils/{Orbit.cpp => ERF_Orbit.cpp}     |   2 +-
 .../{ParFunctions.H => ERF_ParFunctions.H}    |   6 +-
 .../{PlaneAverage.H => ERF_PlaneAverage.H}    |   8 +-
 Source/Utils/ERF_PoissonSolve.cpp             |   2 +-
 Source/Utils/ERF_PoissonSolve_ml.cpp          |   2 +-
 Source/Utils/ERF_PoissonSolve_tb.cpp          |   2 +-
 .../{Sat_methods.H => ERF_Sat_methods.H}      |   0
 ...{TerrainMetrics.H => ERF_TerrainMetrics.H} |   6 +-
 ...rainMetrics.cpp => ERF_TerrainMetrics.cpp} |   4 +-
 Source/Utils/{Thetav.H => ERF_Thetav.H}       |   4 +-
 Source/Utils/{TileNoZ.H => ERF_TileNoZ.H}     |   4 +-
 ...{Time_Avg_Vel.cpp => ERF_Time_Avg_Vel.cpp} |   2 +-
 Source/Utils/{Utils.H => ERF_Utils.H}         |  10 +-
 ...omentum.cpp => ERF_VelocityToMomentum.cpp} |   4 +-
 ...uration.H => ERF_Water_vapor_saturation.H} |   4 +-
 Source/Utils/{Wstar.H => ERF_Wstar.H}         |   4 +-
 Source/Utils/Make.package                     |  38 ++---
 ...{InitWindFarm.cpp => ERF_InitWindFarm.cpp} |   4 +-
 .../{WindFarm.H => ERF_WindFarm.H}            |  14 +-
 .../{AdvanceEWP.cpp => ERF_AdvanceEWP.cpp}    |   6 +-
 .../EWP/{EWP.H => ERF_EWP.H}                  |   6 +-
 .../WindFarmParametrization/EWP/Make.package  |   4 +-
 ...{AdvanceFitch.cpp => ERF_AdvanceFitch.cpp} |   6 +-
 .../Fitch/{Fitch.H => ERF_Fitch.H}            |   6 +-
 .../Fitch/Make.package                        |   4 +-
 Source/WindFarmParametrization/Make.package   |   4 +-
 .../{NullWindFarm.H => ERF_NullWindFarm.H}    |   6 +-
 .../WindFarmParametrization/Null/Make.package |   2 +-
 ...ceSimpleAD.cpp => ERF_AdvanceSimpleAD.cpp} |   4 +-
 .../{SimpleAD.H => ERF_SimpleAD.H}            |   6 +-
 .../SimpleActuatorDisk/Make.package           |   4 +-
 Source/main.cpp                               |   2 +-
 384 files changed, 1104 insertions(+), 1105 deletions(-)
 rename Exec/ABL/{prob.H => ERF_prob.H} (93%)
 rename Exec/{DevTests/ABL_with_WW3/prob.cpp => ABL/ERF_prob.cpp} (99%)
 rename Exec/ABL_input_sounding/{prob.H => ERF_prob.H} (92%)
 rename Exec/ABL_input_sounding/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/DevTests/ABL_with_WW3/{prob.H => ERF_prob.H} (93%)
 rename Exec/{ABL/prob.cpp => DevTests/ABL_with_WW3/ERF_prob.cpp} (99%)
 rename Exec/DevTests/EB_Test/{prob.H => ERF_prob.H} (94%)
 rename Exec/DevTests/EB_Test/{prob.cpp => ERF_prob.cpp} (98%)
 rename Exec/DevTests/LandSurfaceModel/{prob.H => ERF_prob.H} (83%)
 rename Exec/DevTests/LandSurfaceModel/{prob.cpp => ERF_prob.cpp} (92%)
 rename Exec/DevTests/MetGrid/{prob.H => ERF_prob.H} (82%)
 rename Exec/DevTests/MetGrid/{prob.cpp => ERF_prob.cpp} (92%)
 rename Exec/DevTests/MovingTerrain/{prob.H => ERF_prob.H} (93%)
 rename Exec/DevTests/MovingTerrain/{prob.cpp => ERF_prob.cpp} (98%)
 rename Exec/DevTests/MultiBlock/{prob.H => ERF_prob.H} (93%)
 rename Exec/DevTests/MultiBlock/{prob.cpp => ERF_prob.cpp} (98%)
 rename Exec/DevTests/TemperatureSource/{prob.H => ERF_prob.H} (94%)
 rename Exec/DevTests/TemperatureSource/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/DevTests/TropicalCyclone/{prob.H => ERF_prob.H} (86%)
 rename Exec/DevTests/TropicalCyclone/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/{SimpleActuatorDisk/prob.H => EWP/ERF_prob.H} (92%)
 rename Exec/EWP/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/LLJ/{prob.H => ERF_prob.H} (91%)
 rename Exec/LLJ/{prob.cpp => ERF_prob.cpp} (98%)
 rename Exec/{SuperCell/prob.H => Radiation/ERF_prob.H} (94%)
 rename Exec/Radiation/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/RegTests/Bomex/{prob.H => ERF_prob.H} (96%)
 rename Exec/RegTests/Bomex/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/RegTests/Bubble/{prob.H => ERF_prob.H} (97%)
 rename Exec/RegTests/Bubble/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/RegTests/Couette_Poiseuille/{prob.H => ERF_prob.H} (93%)
 rename Exec/RegTests/Couette_Poiseuille/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/RegTests/DensityCurrent/{prob.H => ERF_prob.H} (93%)
 rename Exec/RegTests/DensityCurrent/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/RegTests/DynamicRefinement/{prob.H => ERF_prob.H} (94%)
 rename Exec/RegTests/DynamicRefinement/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/RegTests/EkmanSpiral/{prob.H => ERF_prob.H} (91%)
 rename Exec/RegTests/EkmanSpiral/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/RegTests/IsentropicVortex/{prob.H => ERF_prob.H} (94%)
 rename Exec/RegTests/IsentropicVortex/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/RegTests/ParticlesOverWoA/{prob.H => ERF_prob.H} (94%)
 rename Exec/RegTests/ParticlesOverWoA/{prob.cpp => ERF_prob.cpp} (98%)
 rename Exec/RegTests/ScalarAdvDiff/{prob.H => ERF_prob.H} (94%)
 rename Exec/RegTests/ScalarAdvDiff/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/RegTests/StokesSecondProblem/{prob.H => ERF_prob.H} (73%)
 rename Exec/RegTests/StokesSecondProblem/{prob.cpp => ERF_prob.cpp} (97%)
 rename Exec/RegTests/TaylorGreenVortex/{prob.H => ERF_prob.H} (91%)
 rename Exec/RegTests/TaylorGreenVortex/{prob.cpp => ERF_prob.cpp} (98%)
 rename Exec/RegTests/Terrain2d_Cylinder/{prob.H => ERF_prob.H} (93%)
 rename Exec/RegTests/Terrain2d_Cylinder/{prob.cpp => ERF_prob.cpp} (98%)
 rename Exec/RegTests/Terrain3d_Hemisphere/{prob.H => ERF_prob.H} (94%)
 rename Exec/RegTests/Terrain3d_Hemisphere/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/RegTests/TurbulentInflow/{prob.H => ERF_prob.H} (93%)
 rename Exec/RegTests/TurbulentInflow/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/RegTests/WPS_Test/{prob.H => ERF_prob.H} (75%)
 rename Exec/RegTests/WPS_Test/{prob.cpp => ERF_prob.cpp} (94%)
 rename Exec/RegTests/WitchOfAgnesi/{prob.H => ERF_prob.H} (90%)
 rename Exec/RegTests/WitchOfAgnesi/{prob.cpp => ERF_prob.cpp} (98%)
 rename Exec/{EWP/prob.H => SimpleActuatorDisk/ERF_prob.H} (92%)
 rename Exec/SimpleActuatorDisk/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/SpongeTest/{prob.H => ERF_prob.H} (93%)
 rename Exec/SpongeTest/{prob.cpp => ERF_prob.cpp} (98%)
 rename Exec/SquallLine_2D/{prob.H => ERF_prob.H} (95%)
 rename Exec/SquallLine_2D/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/{Radiation/prob.H => SuperCell/ERF_prob.H} (94%)
 rename Exec/SuperCell/{prob.cpp => ERF_prob.cpp} (99%)
 rename Exec/SuperCell_3D/{prob.H => ERF_prob.H} (95%)
 rename Exec/SuperCell_3D/{prob.cpp => ERF_prob.cpp} (99%)
 rename Source/Advection/{Advection.H => ERF_Advection.H} (98%)
 rename Source/Advection/{AdvectionSrcForMom.cpp => ERF_AdvectionSrcForMom.cpp} (99%)
 rename Source/Advection/{AdvectionSrcForMom_N.H => ERF_AdvectionSrcForMom_N.H} (99%)
 rename Source/Advection/{AdvectionSrcForMom_T.H => ERF_AdvectionSrcForMom_T.H} (99%)
 rename Source/Advection/{AdvectionSrcForOpenBC.cpp => ERF_AdvectionSrcForOpenBC.cpp} (99%)
 rename Source/Advection/{AdvectionSrcForScalars.H => ERF_AdvectionSrcForScalars.H} (98%)
 rename Source/Advection/{AdvectionSrcForState.cpp => ERF_AdvectionSrcForState.cpp} (99%)
 rename Source/BoundaryConditions/{ABLMost.H => ERF_ABLMost.H} (99%)
 rename Source/BoundaryConditions/{ABLMost.cpp => ERF_ABLMost.cpp} (99%)
 rename Source/BoundaryConditions/{BoundaryConditions_bndryreg.cpp => ERF_BoundaryConditions_bndryreg.cpp} (100%)
 rename Source/BoundaryConditions/{BoundaryConditions_cons.cpp => ERF_BoundaryConditions_cons.cpp} (100%)
 rename Source/BoundaryConditions/{BoundaryConditions_realbdy.cpp => ERF_BoundaryConditions_realbdy.cpp} (99%)
 rename Source/BoundaryConditions/{BoundaryConditions_xvel.cpp => ERF_BoundaryConditions_xvel.cpp} (99%)
 rename Source/BoundaryConditions/{BoundaryConditions_yvel.cpp => ERF_BoundaryConditions_yvel.cpp} (100%)
 rename Source/BoundaryConditions/{BoundaryConditions_zvel.cpp => ERF_BoundaryConditions_zvel.cpp} (99%)
 rename Source/BoundaryConditions/{MOSTAverage.H => ERF_MOSTAverage.H} (98%)
 rename Source/BoundaryConditions/{MOSTAverage.cpp => ERF_MOSTAverage.cpp} (99%)
 rename Source/BoundaryConditions/{MOSTRoughness.H => ERF_MOSTRoughness.H} (100%)
 rename Source/BoundaryConditions/{MOSTStress.H => ERF_MOSTStress.H} (99%)
 rename Source/BoundaryConditions/{TimeInterpolatedData.H => ERF_TimeInterpolatedData.H} (100%)
 rename Source/DataStructs/{AdvStruct.H => ERF_AdvStruct.H} (99%)
 rename Source/DataStructs/{DataStruct.H => ERF_DataStruct.H} (99%)
 rename Source/DataStructs/{DiffStruct.H => ERF_DiffStruct.H} (98%)
 rename Source/DataStructs/{InputSoundingData.H => ERF_InputSoundingData.H} (99%)
 rename Source/DataStructs/{InputSpongeData.H => ERF_InputSpongeData.H} (97%)
 rename Source/DataStructs/{SpongeStruct.H => ERF_SpongeStruct.H} (97%)
 rename Source/DataStructs/{TurbPertStruct.H => ERF_TurbPertStruct.H} (99%)
 rename Source/DataStructs/{TurbStruct.H => ERF_TurbStruct.H} (99%)
 rename Source/Diffusion/{ComputeStrain_N.cpp => ERF_ComputeStrain_N.cpp} (99%)
 rename Source/Diffusion/{ComputeStrain_T.cpp => ERF_ComputeStrain_T.cpp} (99%)
 rename Source/Diffusion/{ComputeStress_N.cpp => ERF_ComputeStress_N.cpp} (99%)
 rename Source/Diffusion/{ComputeStress_T.cpp => ERF_ComputeStress_T.cpp} (99%)
 rename Source/Diffusion/{ComputeTurbulentViscosity.cpp => ERF_ComputeTurbulentViscosity.cpp} (99%)
 rename Source/Diffusion/{Diffusion.H => ERF_Diffusion.H} (98%)
 rename Source/Diffusion/{DiffusionSrcForMom_N.cpp => ERF_DiffusionSrcForMom_N.cpp} (98%)
 rename Source/Diffusion/{DiffusionSrcForMom_T.cpp => ERF_DiffusionSrcForMom_T.cpp} (98%)
 rename Source/Diffusion/{DiffusionSrcForState_N.cpp => ERF_DiffusionSrcForState_N.cpp} (99%)
 rename Source/Diffusion/{DiffusionSrcForState_T.cpp => ERF_DiffusionSrcForState_T.cpp} (99%)
 rename Source/Diffusion/{EddyViscosity.H => ERF_EddyViscosity.H} (96%)
 rename Source/EB/{FlowerIF.H => ERF_FlowerIF.H} (96%)
 rename Source/EB/{TerrainIF.H => ERF_TerrainIF.H} (96%)
 rename Source/EB/{eb_box.cpp => ERF_eb_box.cpp} (100%)
 rename Source/EB/{eb_cylinder.cpp => ERF_eb_cylinder.cpp} (100%)
 rename Source/EB/{eb_if.H => ERF_eb_if.H} (100%)
 rename Source/EB/{eb_regular.cpp => ERF_eb_regular.cpp} (91%)
 rename Source/EB/{initEB.cpp => ERF_initEB.cpp} (96%)
 rename Source/EB/{writeEBsurface.cpp => ERF_writeEBsurface.cpp} (100%)
 rename Source/{Derive.H => ERF_Derive.H} (98%)
 rename Source/{Derive.cpp => ERF_Derive.cpp} (99%)
 rename Source/{EOS.H => ERF_EOS.H} (100%)
 rename Source/{HSE_utils.H => ERF_HSE_utils.H} (99%)
 rename Source/{IndexDefines.H => ERF_IndexDefines.H} (98%)
 rename Source/{prob_common.H => ERF_prob_common.H} (99%)
 rename Source/IO/{Checkpoint.cpp => ERF_Checkpoint.cpp} (100%)
 rename Source/IO/{NCCheckpoint.cpp => ERF_NCCheckpoint.cpp} (99%)
 rename Source/IO/{NCColumnFile.cpp => ERF_NCColumnFile.cpp} (99%)
 rename Source/IO/{NCInterface.H => ERF_NCInterface.H} (99%)
 rename Source/IO/{NCInterface.cpp => ERF_NCInterface.cpp} (99%)
 rename Source/IO/{NCMultiFabFile.cpp => ERF_NCMultiFabFile.cpp} (98%)
 create mode 100644 Source/IO/ERF_NCPlotFile.H
 rename Source/IO/{NCPlotFile.cpp => ERF_NCPlotFile.cpp} (99%)
 rename Source/IO/{NCWpsFile.H => ERF_NCWpsFile.H} (99%)
 rename Source/IO/{Plotfile.cpp => ERF_Plotfile.cpp} (99%)
 rename Source/IO/{ReadFromMetgrid.cpp => ERF_ReadFromMetgrid.cpp} (99%)
 rename Source/IO/{ReadFromWRFBdy.cpp => ERF_ReadFromWRFBdy.cpp} (99%)
 rename Source/IO/{ReadFromWRFInput.cpp => ERF_ReadFromWRFInput.cpp} (99%)
 rename Source/IO/{console_io.cpp => ERF_console_io.cpp} (99%)
 rename Source/IO/{writeJobInfo.cpp => ERF_writeJobInfo.cpp} (100%)
 delete mode 100644 Source/IO/NCPlotFile.H
 rename Source/Initialization/{Metgrid_utils.H => ERF_Metgrid_utils.H} (99%)
 rename Source/LandSurfaceModel/{LandSurface.H => ERF_LandSurface.H} (96%)
 rename Source/LandSurfaceModel/MM5/{MM5.H => ERF_MM5.H} (96%)
 rename Source/LandSurfaceModel/MM5/{MM5.cpp => ERF_MM5.cpp} (99%)
 rename Source/LandSurfaceModel/Null/{NullSurf.H => ERF_NullSurf.H} (94%)
 rename Source/LandSurfaceModel/SLM/{SLM.H => ERF_SLM.H} (96%)
 rename Source/LandSurfaceModel/SLM/{SLM.cpp => ERF_SLM.cpp} (99%)
 rename Source/Microphysics/{EulerianMicrophysics.H => ERF_EulerianMicrophysics.H} (95%)
 rename Source/Microphysics/{LagrangianMicrophysics.H => ERF_LagrangianMicrophysics.H} (96%)
 rename Source/Microphysics/{Microphysics.H => ERF_Microphysics.H} (95%)
 rename Source/Microphysics/Kessler/{Init_Kessler.cpp => ERF_Init_Kessler.cpp} (96%)
 rename Source/Microphysics/Kessler/{Kessler.H => ERF_Kessler.H} (95%)
 rename Source/Microphysics/Kessler/{Kessler.cpp => ERF_Kessler.cpp} (99%)
 rename Source/Microphysics/Kessler/{Update_Kessler.cpp => ERF_Update_Kessler.cpp} (94%)
 rename Source/Microphysics/Null/{NullMoist.H => ERF_NullMoist.H} (94%)
 rename Source/Microphysics/Null/{NullMoistLagrangian.H => ERF_NullMoistLagrangian.H} (90%)
 rename Source/Microphysics/SAM/{Cloud_SAM.cpp => ERF_Cloud_SAM.cpp} (98%)
 rename Source/Microphysics/SAM/{IceFall.cpp => ERF_IceFall.cpp} (98%)
 rename Source/Microphysics/SAM/{Init_SAM.cpp => ERF_Init_SAM.cpp} (98%)
 rename Source/Microphysics/SAM/{Precip.cpp => ERF_Precip.cpp} (99%)
 rename Source/Microphysics/SAM/{PrecipFall.cpp => ERF_PrecipFall.cpp} (99%)
 rename Source/Microphysics/SAM/{SAM.H => ERF_SAM.H} (98%)
 rename Source/Microphysics/SAM/{Update_SAM.cpp => ERF_Update_SAM.cpp} (96%)
 rename Source/MultiBlock/{MultiBlockContainer.H => ERF_MultiBlockContainer.H} (94%)
 rename Source/MultiBlock/{MultiBlockContainer.cpp => ERF_MultiBlockContainer.cpp} (99%)
 rename Source/PBL/{ComputeDiffusivityMYNN25.cpp => ERF_ComputeDiffusivityMYNN25.cpp} (98%)
 rename Source/PBL/{ComputeDiffusivityYSU.cpp => ERF_ComputeDiffusivityYSU.cpp} (98%)
 rename Source/PBL/{MYNNStruct.H => ERF_MYNNStruct.H} (98%)
 rename Source/PBL/{PBLHeight.H => ERF_PBLHeight.H} (99%)
 rename Source/PBL/{PBLModels.H => ERF_PBLModels.H} (99%)
 rename Source/Particles/{ParticleData.H => ERF_ParticleData.H} (99%)
 rename Source/Prob/{init_constant_density_hse.H => ERF_init_constant_density_hse.H} (100%)
 rename Source/Prob/{init_density_hse_dry.H => ERF_init_density_hse_dry.H} (100%)
 rename Source/Prob/{init_rayleigh_damping.H => ERF_init_rayleigh_damping.H} (98%)
 rename Source/Radiation/{Aero_rad_props.H => ERF_Aero_rad_props.H} (98%)
 rename Source/Radiation/{Aero_rad_props.cpp => ERF_Aero_rad_props.cpp} (99%)
 rename Source/Radiation/{Albedo.H => ERF_Albedo.H} (100%)
 rename Source/Radiation/{Albedo.cpp => ERF_Albedo.cpp} (95%)
 rename Source/Radiation/{Cloud_rad_props.H => ERF_Cloud_rad_props.H} (97%)
 rename Source/Radiation/{Cloud_rad_props.cpp => ERF_Cloud_rad_props.cpp} (99%)
 rename Source/Radiation/{Ebert_curry.H => ERF_Ebert_curry.H} (100%)
 rename Source/Radiation/{Finalize_rrtmgp.cpp => ERF_Finalize_rrtmgp.cpp} (93%)
 rename Source/Radiation/{Init_rrtmgp.cpp => ERF_Init_rrtmgp.cpp} (98%)
 rename Source/Radiation/{Linear_interpolate.H => ERF_Linear_interpolate.H} (100%)
 rename Source/Radiation/{Mam4_aero.H => ERF_Mam4_aero.H} (99%)
 rename Source/Radiation/{Mam4_constituents.H => ERF_Mam4_constituents.H} (99%)
 rename Source/Radiation/{Modal_aero_wateruptake.H => ERF_Modal_aero_wateruptake.H} (99%)
 rename Source/Radiation/{Optics.H => ERF_Optics.H} (98%)
 rename Source/Radiation/{Optics.cpp => ERF_Optics.cpp} (99%)
 rename Source/Radiation/{Parameterizations.H => ERF_Parameterizations.H} (98%)
 rename Source/Radiation/{Phys_prop.H => ERF_Phys_prop.H} (99%)
 rename Source/Radiation/{Rad_constants.H => ERF_Rad_constants.H} (100%)
 rename Source/Radiation/{Radiation.H => ERF_Radiation.H} (98%)
 rename Source/Radiation/{Radiation.cpp => ERF_Radiation.cpp} (99%)
 rename Source/Radiation/{Rrtmgp.H => ERF_Rrtmgp.H} (100%)
 rename Source/Radiation/{Run_longwave_rrtmgp.cpp => ERF_Run_longwave_rrtmgp.cpp} (99%)
 rename Source/Radiation/{Run_shortwave_rrtmgp.cpp => ERF_Run_shortwave_rrtmgp.cpp} (99%)
 rename Source/Radiation/{Slingo.H => ERF_Slingo.H} (100%)
 rename Source/Radiation/{m2005_effradius.H => ERF_m2005_effradius.H} (99%)
 rename Source/SourceTerms/{NumericalDiffusion.H => ERF_NumericalDiffusion.H} (91%)
 rename Source/SourceTerms/{NumericalDiffusion.cpp => ERF_NumericalDiffusion.cpp} (99%)
 rename Source/SourceTerms/{Src_headers.H => ERF_Src_headers.H} (97%)
 rename Source/TimeIntegration/{TI_fast_headers.H => ERF_TI_fast_headers.H} (96%)
 rename Source/TimeIntegration/{TI_fast_rhs_fun.H => ERF_TI_fast_rhs_fun.H} (100%)
 rename Source/TimeIntegration/{TI_no_substep_fun.H => ERF_TI_no_substep_fun.H} (100%)
 rename Source/TimeIntegration/{TI_slow_headers.H => ERF_TI_slow_headers.H} (97%)
 rename Source/TimeIntegration/{TI_slow_rhs_fun.H => ERF_TI_slow_rhs_fun.H} (99%)
 rename Source/TimeIntegration/{TI_utils.H => ERF_TI_utils.H} (100%)
 rename Source/Utils/{ChopGrids.cpp => ERF_ChopGrids.cpp} (97%)
 rename Source/Utils/{DirectionSelector.H => ERF_DirectionSelector.H} (96%)
 rename Source/Utils/{InteriorGhostCells.cpp => ERF_InteriorGhostCells.cpp} (99%)
 rename Source/Utils/{Interpolation.H => ERF_Interpolation.H} (97%)
 rename Source/Utils/{Interpolation_1D.H => ERF_Interpolation_1D.H} (100%)
 rename Source/Utils/{Interpolation_UPW.H => ERF_Interpolation_UPW.H} (99%)
 rename Source/Utils/{Interpolation_WENO.H => ERF_Interpolation_WENO.H} (98%)
 rename Source/Utils/{Interpolation_WENO_Z.H => ERF_Interpolation_WENO_Z.H} (99%)
 rename Source/Utils/{Microphysics_Utils.H => ERF_Microphysics_Utils.H} (98%)
 rename Source/Utils/{MomentumToVelocity.cpp => ERF_MomentumToVelocity.cpp} (98%)
 rename Source/Utils/{Orbit.H => ERF_Orbit.H} (98%)
 rename Source/Utils/{Orbit.cpp => ERF_Orbit.cpp} (98%)
 rename Source/Utils/{ParFunctions.H => ERF_ParFunctions.H} (90%)
 rename Source/Utils/{PlaneAverage.H => ERF_PlaneAverage.H} (98%)
 rename Source/Utils/{Sat_methods.H => ERF_Sat_methods.H} (100%)
 rename Source/Utils/{TerrainMetrics.H => ERF_TerrainMetrics.H} (99%)
 rename Source/Utils/{TerrainMetrics.cpp => ERF_TerrainMetrics.cpp} (99%)
 rename Source/Utils/{Thetav.H => ERF_Thetav.H} (93%)
 rename Source/Utils/{TileNoZ.H => ERF_TileNoZ.H} (89%)
 rename Source/Utils/{Time_Avg_Vel.cpp => ERF_Time_Avg_Vel.cpp} (98%)
 rename Source/Utils/{Utils.H => ERF_Utils.H} (99%)
 rename Source/Utils/{VelocityToMomentum.cpp => ERF_VelocityToMomentum.cpp} (98%)
 rename Source/Utils/{Water_vapor_saturation.H => ERF_Water_vapor_saturation.H} (99%)
 rename Source/Utils/{Wstar.H => ERF_Wstar.H} (94%)
 rename Source/WindFarmParametrization/{InitWindFarm.cpp => ERF_InitWindFarm.cpp} (99%)
 rename Source/WindFarmParametrization/{WindFarm.H => ERF_WindFarm.H} (95%)
 rename Source/WindFarmParametrization/EWP/{AdvanceEWP.cpp => ERF_AdvanceEWP.cpp} (98%)
 rename Source/WindFarmParametrization/EWP/{EWP.H => ERF_EWP.H} (95%)
 rename Source/WindFarmParametrization/Fitch/{AdvanceFitch.cpp => ERF_AdvanceFitch.cpp} (98%)
 rename Source/WindFarmParametrization/Fitch/{Fitch.H => ERF_Fitch.H} (95%)
 rename Source/WindFarmParametrization/Null/{NullWindFarm.H => ERF_NullWindFarm.H} (96%)
 rename Source/WindFarmParametrization/SimpleActuatorDisk/{AdvanceSimpleAD.cpp => ERF_AdvanceSimpleAD.cpp} (98%)
 rename Source/WindFarmParametrization/SimpleActuatorDisk/{SimpleAD.H => ERF_SimpleAD.H} (94%)

diff --git a/CMake/BuildERFExe.cmake b/CMake/BuildERFExe.cmake
index 70f3e2478..d25c22ba1 100644
--- a/CMake/BuildERFExe.cmake
+++ b/CMake/BuildERFExe.cmake
@@ -19,7 +19,7 @@ function(build_erf_lib erf_lib_name)
 
   if(ERF_ENABLE_MULTIBLOCK)
     target_sources(${erf_lib_name} PRIVATE
-                   ${SRC_DIR}/MultiBlock/MultiBlockContainer.cpp)
+                   ${SRC_DIR}/MultiBlock/ERF_MultiBlockContainer.cpp)
     target_compile_definitions(${erf_lib_name} PUBLIC ERF_USE_MULTIBLOCK)
     target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/MultiBlock)
   endif()
@@ -49,40 +49,40 @@ function(build_erf_lib erf_lib_name)
   if(ERF_ENABLE_EB)
     target_sources(${erf_lib_name} PRIVATE
                    ${SRC_DIR}/EB/Init_EB.cpp
-                   ${SRC_DIR}/EB/eb_box.cpp
-                   ${SRC_DIR}/EB/eb_cylinder.cpp
-                   ${SRC_DIR}/EB/eb_regular.cpp
-                   ${SRC_DIR}/EB/initEB.cpp
-                   ${SRC_DIR}/EB/writeEBsurface.cpp)
+                   ${SRC_DIR}/EB/ERF_eb_box.cpp
+                   ${SRC_DIR}/EB/ERF_eb_cylinder.cpp
+                   ${SRC_DIR}/EB/ERF_eb_regular.cpp
+                   ${SRC_DIR}/EB/ERF_initEB.cpp
+                   ${SRC_DIR}/EB/ERF_writeEBsurface.cpp)
     target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/EB)
     target_compile_definitions(${erf_lib_name} PUBLIC ERF_USE_EB)
   endif()
 
   if(ERF_ENABLE_NETCDF)
     target_sources(${erf_lib_name} PRIVATE
-                   ${SRC_DIR}/IO/NCInterface.cpp
-                   ${SRC_DIR}/IO/NCPlotFile.cpp
-                   ${SRC_DIR}/IO/NCCheckpoint.cpp
-                   ${SRC_DIR}/IO/NCMultiFabFile.cpp
-                   ${SRC_DIR}/IO/ReadFromMetgrid.cpp
-                   ${SRC_DIR}/IO/ReadFromWRFBdy.cpp
-                   ${SRC_DIR}/IO/ReadFromWRFInput.cpp
-                   ${SRC_DIR}/IO/NCColumnFile.cpp)
+                   ${SRC_DIR}/IO/ERF_NCInterface.cpp
+                   ${SRC_DIR}/IO/ERF_NCPlotFile.cpp
+                   ${SRC_DIR}/IO/ERF_NCCheckpoint.cpp
+                   ${SRC_DIR}/IO/ERF_NCMultiFabFile.cpp
+                   ${SRC_DIR}/IO/ERF_ReadFromMetgrid.cpp
+                   ${SRC_DIR}/IO/ERF_ReadFromWRFBdy.cpp
+                   ${SRC_DIR}/IO/ERF_ReadFromWRFInput.cpp
+                   ${SRC_DIR}/IO/ERF_NCColumnFile.cpp)
     target_compile_definitions(${erf_lib_name} PUBLIC ERF_USE_NETCDF)
   endif()
 
   if(ERF_ENABLE_RRTMGP)
     target_sources(${erf_lib_name} PRIVATE
-                   ${SRC_DIR}/Utils/Orbit.cpp
-                   ${SRC_DIR}/Radiation/Init_rrtmgp.cpp
-                   ${SRC_DIR}/Radiation/Finalize_rrtmgp.cpp
-                   ${SRC_DIR}/Radiation/Run_longwave_rrtmgp.cpp
-                   ${SRC_DIR}/Radiation/Run_shortwave_rrtmgp.cpp
-                   ${SRC_DIR}/Radiation/Cloud_rad_props.cpp
-                   ${SRC_DIR}/Radiation/Aero_rad_props.cpp
-                   ${SRC_DIR}/Radiation/Optics.cpp
-                   ${SRC_DIR}/Radiation/Radiation.cpp
-                   ${SRC_DIR}/Radiation/Albedo.cpp
+                   ${SRC_DIR}/Utils/ERF_Orbit.cpp
+                   ${SRC_DIR}/Radiation/ERF_Init_rrtmgp.cpp
+                   ${SRC_DIR}/Radiation/ERF_Finalize_rrtmgp.cpp
+                   ${SRC_DIR}/Radiation/ERF_Run_longwave_rrtmgp.cpp
+                   ${SRC_DIR}/Radiation/ERF_Run_shortwave_rrtmgp.cpp
+                   ${SRC_DIR}/Radiation/ERF_Cloud_rad_props.cpp
+                   ${SRC_DIR}/Radiation/ERF_Aero_rad_props.cpp
+                   ${SRC_DIR}/Radiation/ERF_Optics.cpp
+                   ${SRC_DIR}/Radiation/ERF_Radiation.cpp
+                   ${SRC_DIR}/Radiation/ERF_Albedo.cpp
                    ${CMAKE_SOURCE_DIR}/Submodules/RRTMGP/cpp/examples/mo_load_coefficients.cpp
                    ${CMAKE_SOURCE_DIR}/Submodules/RRTMGP/cpp/extensions/fluxes_byband/mo_fluxes_byband_kernels.cpp
                   )
@@ -103,35 +103,35 @@ function(build_erf_lib erf_lib_name)
 
   target_sources(${erf_lib_name}
      PRIVATE
-       ${SRC_DIR}/Derive.cpp
+       ${SRC_DIR}/ERF_Derive.cpp
        ${SRC_DIR}/ERF.cpp
        ${SRC_DIR}/ERF_make_new_arrays.cpp
        ${SRC_DIR}/ERF_make_new_level.cpp
        ${SRC_DIR}/ERF_read_waves.cpp
        ${SRC_DIR}/ERF_Tagging.cpp
-       ${SRC_DIR}/Advection/AdvectionSrcForMom.cpp
-       ${SRC_DIR}/Advection/AdvectionSrcForState.cpp
-       ${SRC_DIR}/Advection/AdvectionSrcForOpenBC.cpp
-       ${SRC_DIR}/BoundaryConditions/ABLMost.cpp
-       ${SRC_DIR}/BoundaryConditions/MOSTAverage.cpp
-       ${SRC_DIR}/BoundaryConditions/BoundaryConditions_cons.cpp
-       ${SRC_DIR}/BoundaryConditions/BoundaryConditions_xvel.cpp
-       ${SRC_DIR}/BoundaryConditions/BoundaryConditions_yvel.cpp
-       ${SRC_DIR}/BoundaryConditions/BoundaryConditions_zvel.cpp
-       ${SRC_DIR}/BoundaryConditions/BoundaryConditions_bndryreg.cpp
-       ${SRC_DIR}/BoundaryConditions/BoundaryConditions_realbdy.cpp
+       ${SRC_DIR}/Advection/ERF_AdvectionSrcForMom.cpp
+       ${SRC_DIR}/Advection/ERF_AdvectionSrcForState.cpp
+       ${SRC_DIR}/Advection/ERF_AdvectionSrcForOpenBC.cpp
+       ${SRC_DIR}/BoundaryConditions/ERF_ABLMost.cpp
+       ${SRC_DIR}/BoundaryConditions/ERF_MOSTAverage.cpp
+       ${SRC_DIR}/BoundaryConditions/ERF_BoundaryConditions_cons.cpp
+       ${SRC_DIR}/BoundaryConditions/ERF_BoundaryConditions_xvel.cpp
+       ${SRC_DIR}/BoundaryConditions/ERF_BoundaryConditions_yvel.cpp
+       ${SRC_DIR}/BoundaryConditions/ERF_BoundaryConditions_zvel.cpp
+       ${SRC_DIR}/BoundaryConditions/ERF_BoundaryConditions_bndryreg.cpp
+       ${SRC_DIR}/BoundaryConditions/ERF_BoundaryConditions_realbdy.cpp
        ${SRC_DIR}/BoundaryConditions/ERF_FillPatch.cpp
        ${SRC_DIR}/BoundaryConditions/ERF_FillPatcher.cpp
        ${SRC_DIR}/BoundaryConditions/ERF_PhysBCFunct.cpp
-       ${SRC_DIR}/Diffusion/DiffusionSrcForMom_N.cpp
-       ${SRC_DIR}/Diffusion/DiffusionSrcForMom_T.cpp
-       ${SRC_DIR}/Diffusion/DiffusionSrcForState_N.cpp
-       ${SRC_DIR}/Diffusion/DiffusionSrcForState_T.cpp
-       ${SRC_DIR}/Diffusion/ComputeStress_N.cpp
-       ${SRC_DIR}/Diffusion/ComputeStress_T.cpp
-       ${SRC_DIR}/Diffusion/ComputeStrain_N.cpp
-       ${SRC_DIR}/Diffusion/ComputeStrain_T.cpp
-       ${SRC_DIR}/Diffusion/ComputeTurbulentViscosity.cpp
+       ${SRC_DIR}/Diffusion/ERF_DiffusionSrcForMom_N.cpp
+       ${SRC_DIR}/Diffusion/ERF_DiffusionSrcForMom_T.cpp
+       ${SRC_DIR}/Diffusion/ERF_DiffusionSrcForState_N.cpp
+       ${SRC_DIR}/Diffusion/ERF_DiffusionSrcForState_T.cpp
+       ${SRC_DIR}/Diffusion/ERF_ComputeStress_N.cpp
+       ${SRC_DIR}/Diffusion/ERF_ComputeStress_T.cpp
+       ${SRC_DIR}/Diffusion/ERF_ComputeStrain_N.cpp
+       ${SRC_DIR}/Diffusion/ERF_ComputeStrain_T.cpp
+       ${SRC_DIR}/Diffusion/ERF_ComputeTurbulentViscosity.cpp
        ${SRC_DIR}/Initialization/ERF_init_custom.cpp
        ${SRC_DIR}/Initialization/ERF_init_from_hse.cpp
        ${SRC_DIR}/Initialization/ERF_init_from_input_sounding.cpp
@@ -141,17 +141,17 @@ function(build_erf_lib erf_lib_name)
        ${SRC_DIR}/Initialization/ERF_init1d.cpp
        ${SRC_DIR}/Initialization/ERF_init_TurbPert.cpp
        ${SRC_DIR}/Initialization/ERF_input_sponge.cpp
-       ${SRC_DIR}/IO/Checkpoint.cpp
+       ${SRC_DIR}/IO/ERF_Checkpoint.cpp
        ${SRC_DIR}/IO/ERF_ReadBndryPlanes.cpp
        ${SRC_DIR}/IO/ERF_WriteBndryPlanes.cpp
        ${SRC_DIR}/IO/ERF_Write1DProfiles.cpp
        ${SRC_DIR}/IO/ERF_Write1DProfiles_stag.cpp
        ${SRC_DIR}/IO/ERF_WriteScalarProfiles.cpp
-       ${SRC_DIR}/IO/Plotfile.cpp
-       ${SRC_DIR}/IO/writeJobInfo.cpp
-       ${SRC_DIR}/IO/console_io.cpp
-       ${SRC_DIR}/PBL/ComputeDiffusivityMYNN25.cpp
-       ${SRC_DIR}/PBL/ComputeDiffusivityYSU.cpp
+       ${SRC_DIR}/IO/ERF_Plotfile.cpp
+       ${SRC_DIR}/IO/ERF_writeJobInfo.cpp
+       ${SRC_DIR}/IO/ERF_console_io.cpp
+       ${SRC_DIR}/PBL/ERF_ComputeDiffusivityMYNN25.cpp
+       ${SRC_DIR}/PBL/ERF_ComputeDiffusivityYSU.cpp
        ${SRC_DIR}/SourceTerms/ERF_ApplySpongeZoneBCs.cpp
        ${SRC_DIR}/SourceTerms/ERF_ApplySpongeZoneBCs_ReadFromFile.cpp	  
        ${SRC_DIR}/SourceTerms/ERF_make_buoyancy.cpp
@@ -159,7 +159,7 @@ function(build_erf_lib erf_lib_name)
        ${SRC_DIR}/SourceTerms/ERF_make_mom_sources.cpp
        ${SRC_DIR}/SourceTerms/ERF_make_sources.cpp
        ${SRC_DIR}/SourceTerms/ERF_moist_set_rhs.cpp
-       ${SRC_DIR}/SourceTerms/NumericalDiffusion.cpp
+       ${SRC_DIR}/SourceTerms/ERF_NumericalDiffusion.cpp
        ${SRC_DIR}/TimeIntegration/ERF_ComputeTimestep.cpp
        ${SRC_DIR}/TimeIntegration/ERF_Advance.cpp
        ${SRC_DIR}/TimeIntegration/ERF_TimeStep.cpp
@@ -174,26 +174,26 @@ function(build_erf_lib erf_lib_name)
        ${SRC_DIR}/TimeIntegration/ERF_fast_rhs_N.cpp
        ${SRC_DIR}/TimeIntegration/ERF_fast_rhs_T.cpp
        ${SRC_DIR}/TimeIntegration/ERF_fast_rhs_MT.cpp
-       ${SRC_DIR}/Utils/ChopGrids.cpp
-       ${SRC_DIR}/Utils/MomentumToVelocity.cpp
-       ${SRC_DIR}/Utils/TerrainMetrics.cpp
-       ${SRC_DIR}/Utils/VelocityToMomentum.cpp
-       ${SRC_DIR}/Utils/InteriorGhostCells.cpp
-       ${SRC_DIR}/Utils/Time_Avg_Vel.cpp
-       ${SRC_DIR}/Microphysics/SAM/Init_SAM.cpp
-       ${SRC_DIR}/Microphysics/SAM/Cloud_SAM.cpp
-       ${SRC_DIR}/Microphysics/SAM/IceFall.cpp
-       ${SRC_DIR}/Microphysics/SAM/Precip.cpp
-       ${SRC_DIR}/Microphysics/SAM/PrecipFall.cpp
-       ${SRC_DIR}/Microphysics/SAM/Update_SAM.cpp
-       ${SRC_DIR}/Microphysics/Kessler/Init_Kessler.cpp
-       ${SRC_DIR}/Microphysics/Kessler/Kessler.cpp
-       ${SRC_DIR}/Microphysics/Kessler/Update_Kessler.cpp
-	   ${SRC_DIR}/WindFarmParametrization/Fitch/AdvanceFitch.cpp
-	   ${SRC_DIR}/WindFarmParametrization/EWP/AdvanceEWP.cpp
-	   ${SRC_DIR}/WindFarmParametrization/SimpleActuatorDisk/AdvanceSimpleAD.cpp
-       ${SRC_DIR}/LandSurfaceModel/SLM/SLM.cpp
-       ${SRC_DIR}/LandSurfaceModel/MM5/MM5.cpp
+       ${SRC_DIR}/Utils/ERF_ChopGrids.cpp
+       ${SRC_DIR}/Utils/ERF_MomentumToVelocity.cpp
+       ${SRC_DIR}/Utils/ERF_TerrainMetrics.cpp
+       ${SRC_DIR}/Utils/ERF_VelocityToMomentum.cpp
+       ${SRC_DIR}/Utils/ERF_InteriorGhostCells.cpp
+       ${SRC_DIR}/Utils/ERF_Time_Avg_Vel.cpp
+       ${SRC_DIR}/Microphysics/SAM/ERF_Init_SAM.cpp
+       ${SRC_DIR}/Microphysics/SAM/ERF_Cloud_SAM.cpp
+       ${SRC_DIR}/Microphysics/SAM/ERF_IceFall.cpp
+       ${SRC_DIR}/Microphysics/SAM/ERF_Precip.cpp
+       ${SRC_DIR}/Microphysics/SAM/ERF_PrecipFall.cpp
+       ${SRC_DIR}/Microphysics/SAM/ERF_Update_SAM.cpp
+       ${SRC_DIR}/Microphysics/Kessler/ERF_Init_Kessler.cpp
+       ${SRC_DIR}/Microphysics/Kessler/ERF_Kessler.cpp
+       ${SRC_DIR}/Microphysics/Kessler/ERF_Update_Kessler.cpp
+	   ${SRC_DIR}/WindFarmParametrization/Fitch/ERF_AdvanceFitch.cpp
+	   ${SRC_DIR}/WindFarmParametrization/EWP/ERF_AdvanceEWP.cpp
+	   ${SRC_DIR}/WindFarmParametrization/SimpleActuatorDisk/ERF_AdvanceSimpleAD.cpp
+       ${SRC_DIR}/LandSurfaceModel/SLM/ERF_SLM.cpp
+       ${SRC_DIR}/LandSurfaceModel/MM5/ERF_MM5.cpp
   )
 
   if(NOT "${erf_exe_name}" STREQUAL "erf_unit_tests")
diff --git a/Exec/ABL/CMakeLists.txt b/Exec/ABL/CMakeLists.txt
index 7f631621a..55492b0eb 100644
--- a/Exec/ABL/CMakeLists.txt
+++ b/Exec/ABL/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_abl)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/ABL/prob.H b/Exec/ABL/ERF_prob.H
similarity index 93%
rename from Exec/ABL/prob.H
rename to Exec/ABL/ERF_prob.H
index ed45c8e3a..ec5714d17 100644
--- a/Exec/ABL/prob.H
+++ b/Exec/ABL/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 0.0;
@@ -51,8 +51,8 @@ class Problem : public ProblemBase
 public:
     Problem(const amrex::Real* problo, const amrex::Real* probhi);
 
-#include "Prob/init_constant_density_hse.H"
-#include "Prob/init_rayleigh_damping.H"
+#include "Prob/ERF_init_constant_density_hse.H"
+#include "Prob/ERF_init_rayleigh_damping.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/DevTests/ABL_with_WW3/prob.cpp b/Exec/ABL/ERF_prob.cpp
similarity index 99%
rename from Exec/DevTests/ABL_with_WW3/prob.cpp
rename to Exec/ABL/ERF_prob.cpp
index d5f5bad19..be148e972 100644
--- a/Exec/DevTests/ABL_with_WW3/prob.cpp
+++ b/Exec/ABL/ERF_prob.cpp
@@ -1,4 +1,4 @@
-#include "prob.H"
+#include "ERF_prob.H"
 #include "AMReX_Random.H"
 
 using namespace amrex;
diff --git a/Exec/ABL/Make.package b/Exec/ABL/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/ABL/Make.package
+++ b/Exec/ABL/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/ABL_input_sounding/CMakeLists.txt b/Exec/ABL_input_sounding/CMakeLists.txt
index a9e46689b..101cb762d 100644
--- a/Exec/ABL_input_sounding/CMakeLists.txt
+++ b/Exec/ABL_input_sounding/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_abl_input_sounding)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/ABL_input_sounding/prob.H b/Exec/ABL_input_sounding/ERF_prob.H
similarity index 92%
rename from Exec/ABL_input_sounding/prob.H
rename to Exec/ABL_input_sounding/ERF_prob.H
index cc019e0f7..05c61f893 100644
--- a/Exec/ABL_input_sounding/prob.H
+++ b/Exec/ABL_input_sounding/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 0.0;
@@ -45,8 +45,8 @@ class Problem : public ProblemBase
 public:
     Problem(const amrex::Real* problo, const amrex::Real* probhi);
 
-#include "Prob/init_constant_density_hse.H"
-#include "Prob/init_rayleigh_damping.H"
+#include "Prob/ERF_init_constant_density_hse.H"
+#include "Prob/ERF_init_rayleigh_damping.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/ABL_input_sounding/prob.cpp b/Exec/ABL_input_sounding/ERF_prob.cpp
similarity index 99%
rename from Exec/ABL_input_sounding/prob.cpp
rename to Exec/ABL_input_sounding/ERF_prob.cpp
index 18403b816..8d5905239 100644
--- a/Exec/ABL_input_sounding/prob.cpp
+++ b/Exec/ABL_input_sounding/ERF_prob.cpp
@@ -1,4 +1,4 @@
-#include "prob.H"
+#include "ERF_prob.H"
 #include "AMReX_Random.H"
 
 using namespace amrex;
diff --git a/Exec/ABL_input_sounding/Make.package b/Exec/ABL_input_sounding/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/ABL_input_sounding/Make.package
+++ b/Exec/ABL_input_sounding/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/DevTests/ABL_with_WW3/CMakeLists.txt b/Exec/DevTests/ABL_with_WW3/CMakeLists.txt
index 7f631621a..55492b0eb 100644
--- a/Exec/DevTests/ABL_with_WW3/CMakeLists.txt
+++ b/Exec/DevTests/ABL_with_WW3/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_abl)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/DevTests/ABL_with_WW3/prob.H b/Exec/DevTests/ABL_with_WW3/ERF_prob.H
similarity index 93%
rename from Exec/DevTests/ABL_with_WW3/prob.H
rename to Exec/DevTests/ABL_with_WW3/ERF_prob.H
index d26cfd595..7d6667f98 100644
--- a/Exec/DevTests/ABL_with_WW3/prob.H
+++ b/Exec/DevTests/ABL_with_WW3/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 0.0;
@@ -51,8 +51,8 @@ class Problem : public ProblemBase
 public:
     Problem(const amrex::Real* problo, const amrex::Real* probhi);
 
-#include "Prob/init_constant_density_hse.H"
-#include "Prob/init_rayleigh_damping.H"
+#include "Prob/ERF_init_constant_density_hse.H"
+#include "Prob/ERF_init_rayleigh_damping.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/ABL/prob.cpp b/Exec/DevTests/ABL_with_WW3/ERF_prob.cpp
similarity index 99%
rename from Exec/ABL/prob.cpp
rename to Exec/DevTests/ABL_with_WW3/ERF_prob.cpp
index d5f5bad19..be148e972 100644
--- a/Exec/ABL/prob.cpp
+++ b/Exec/DevTests/ABL_with_WW3/ERF_prob.cpp
@@ -1,4 +1,4 @@
-#include "prob.H"
+#include "ERF_prob.H"
 #include "AMReX_Random.H"
 
 using namespace amrex;
diff --git a/Exec/DevTests/ABL_with_WW3/Make.package b/Exec/DevTests/ABL_with_WW3/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/DevTests/ABL_with_WW3/Make.package
+++ b/Exec/DevTests/ABL_with_WW3/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/DevTests/EB_Test/CMakeLists.txt b/Exec/DevTests/EB_Test/CMakeLists.txt
index b6a3c20c1..ec05a3ecc 100644
--- a/Exec/DevTests/EB_Test/CMakeLists.txt
+++ b/Exec/DevTests/EB_Test/CMakeLists.txt
@@ -4,7 +4,7 @@ if(ERF_ENABLE_PARTICLES)
   add_executable(${erf_exe_name} "")
   target_sources(${erf_exe_name}
      PRIVATE
-       prob.cpp
+       ERF_prob.cpp
   )
 
   target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/DevTests/EB_Test/prob.H b/Exec/DevTests/EB_Test/ERF_prob.H
similarity index 94%
rename from Exec/DevTests/EB_Test/prob.H
rename to Exec/DevTests/EB_Test/ERF_prob.H
index e4ad6808d..4b87a0f30 100644
--- a/Exec/DevTests/EB_Test/prob.H
+++ b/Exec/DevTests/EB_Test/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 0.0;
@@ -31,7 +31,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_constant_density_hse.H"
+#include "Prob/ERF_init_constant_density_hse.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/DevTests/EB_Test/prob.cpp b/Exec/DevTests/EB_Test/ERF_prob.cpp
similarity index 98%
rename from Exec/DevTests/EB_Test/prob.cpp
rename to Exec/DevTests/EB_Test/ERF_prob.cpp
index 6bfef28df..8f955d7d7 100644
--- a/Exec/DevTests/EB_Test/prob.cpp
+++ b/Exec/DevTests/EB_Test/ERF_prob.cpp
@@ -1,5 +1,5 @@
-#include "prob.H"
-#include "TerrainMetrics.H"
+#include "ERF_prob.H"
+#include "ERF_TerrainMetrics.H"
 
 using namespace amrex;
 
diff --git a/Exec/DevTests/EB_Test/Make.package b/Exec/DevTests/EB_Test/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/DevTests/EB_Test/Make.package
+++ b/Exec/DevTests/EB_Test/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/DevTests/LandSurfaceModel/CMakeLists.txt b/Exec/DevTests/LandSurfaceModel/CMakeLists.txt
index 5d962cef3..9b2f3441a 100644
--- a/Exec/DevTests/LandSurfaceModel/CMakeLists.txt
+++ b/Exec/DevTests/LandSurfaceModel/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_lsm)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/DevTests/LandSurfaceModel/prob.H b/Exec/DevTests/LandSurfaceModel/ERF_prob.H
similarity index 83%
rename from Exec/DevTests/LandSurfaceModel/prob.H
rename to Exec/DevTests/LandSurfaceModel/ERF_prob.H
index 92ead6942..a3f11b565 100644
--- a/Exec/DevTests/LandSurfaceModel/prob.H
+++ b/Exec/DevTests/LandSurfaceModel/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
 }; // namespace ProbParm
diff --git a/Exec/DevTests/LandSurfaceModel/prob.cpp b/Exec/DevTests/LandSurfaceModel/ERF_prob.cpp
similarity index 92%
rename from Exec/DevTests/LandSurfaceModel/prob.cpp
rename to Exec/DevTests/LandSurfaceModel/ERF_prob.cpp
index c01e06833..2697a5cd1 100644
--- a/Exec/DevTests/LandSurfaceModel/prob.cpp
+++ b/Exec/DevTests/LandSurfaceModel/ERF_prob.cpp
@@ -1,4 +1,4 @@
-#include "prob.H"
+#include "ERF_prob.H"
 
 using namespace amrex;
 
diff --git a/Exec/DevTests/LandSurfaceModel/Make.package b/Exec/DevTests/LandSurfaceModel/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/DevTests/LandSurfaceModel/Make.package
+++ b/Exec/DevTests/LandSurfaceModel/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/DevTests/MetGrid/CMakeLists.txt b/Exec/DevTests/MetGrid/CMakeLists.txt
index 1af4084e0..3bed6582d 100644
--- a/Exec/DevTests/MetGrid/CMakeLists.txt
+++ b/Exec/DevTests/MetGrid/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_metgrid)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/DevTests/MetGrid/prob.H b/Exec/DevTests/MetGrid/ERF_prob.H
similarity index 82%
rename from Exec/DevTests/MetGrid/prob.H
rename to Exec/DevTests/MetGrid/ERF_prob.H
index 6ad4ec3fe..9084063df 100644
--- a/Exec/DevTests/MetGrid/prob.H
+++ b/Exec/DevTests/MetGrid/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
 }; // namespace ProbParm
diff --git a/Exec/DevTests/MetGrid/prob.cpp b/Exec/DevTests/MetGrid/ERF_prob.cpp
similarity index 92%
rename from Exec/DevTests/MetGrid/prob.cpp
rename to Exec/DevTests/MetGrid/ERF_prob.cpp
index c01e06833..2697a5cd1 100644
--- a/Exec/DevTests/MetGrid/prob.cpp
+++ b/Exec/DevTests/MetGrid/ERF_prob.cpp
@@ -1,4 +1,4 @@
-#include "prob.H"
+#include "ERF_prob.H"
 
 using namespace amrex;
 
diff --git a/Exec/DevTests/MetGrid/Make.package b/Exec/DevTests/MetGrid/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/DevTests/MetGrid/Make.package
+++ b/Exec/DevTests/MetGrid/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/DevTests/MovingTerrain/CMakeLists.txt b/Exec/DevTests/MovingTerrain/CMakeLists.txt
index 4cedafdc9..a137b55b5 100644
--- a/Exec/DevTests/MovingTerrain/CMakeLists.txt
+++ b/Exec/DevTests/MovingTerrain/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_moving_terrain)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/DevTests/MovingTerrain/prob.H b/Exec/DevTests/MovingTerrain/ERF_prob.H
similarity index 93%
rename from Exec/DevTests/MovingTerrain/prob.H
rename to Exec/DevTests/MovingTerrain/ERF_prob.H
index 272c3b007..ae8682349 100644
--- a/Exec/DevTests/MovingTerrain/prob.H
+++ b/Exec/DevTests/MovingTerrain/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real Ampl = 0.16;
@@ -17,7 +17,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_density_hse_dry.H"
+#include "Prob/ERF_init_density_hse_dry.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/DevTests/MovingTerrain/prob.cpp b/Exec/DevTests/MovingTerrain/ERF_prob.cpp
similarity index 98%
rename from Exec/DevTests/MovingTerrain/prob.cpp
rename to Exec/DevTests/MovingTerrain/ERF_prob.cpp
index 9a66b965a..3aafffde6 100644
--- a/Exec/DevTests/MovingTerrain/prob.cpp
+++ b/Exec/DevTests/MovingTerrain/ERF_prob.cpp
@@ -1,6 +1,6 @@
-#include "prob.H"
-#include "EOS.H"
-#include "TerrainMetrics.H"
+#include "ERF_prob.H"
+#include "ERF_EOS.H"
+#include "ERF_TerrainMetrics.H"
 
 using namespace amrex;
 
diff --git a/Exec/DevTests/MovingTerrain/Make.package b/Exec/DevTests/MovingTerrain/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/DevTests/MovingTerrain/Make.package
+++ b/Exec/DevTests/MovingTerrain/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/DevTests/MultiBlock/CMakeLists.txt b/Exec/DevTests/MultiBlock/CMakeLists.txt
index cc0db24bd..51fa8be1f 100644
--- a/Exec/DevTests/MultiBlock/CMakeLists.txt
+++ b/Exec/DevTests/MultiBlock/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_multiblock)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/DevTests/MultiBlock/prob.H b/Exec/DevTests/MultiBlock/ERF_prob.H
similarity index 93%
rename from Exec/DevTests/MultiBlock/prob.H
rename to Exec/DevTests/MultiBlock/ERF_prob.H
index 87e3668fd..41f4c39df 100644
--- a/Exec/DevTests/MultiBlock/prob.H
+++ b/Exec/DevTests/MultiBlock/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real T_0 = 300.0; // surface temperature == mean potential temperature
@@ -25,7 +25,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_density_hse_dry.H"
+#include "Prob/ERF_init_density_hse_dry.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/DevTests/MultiBlock/prob.cpp b/Exec/DevTests/MultiBlock/ERF_prob.cpp
similarity index 98%
rename from Exec/DevTests/MultiBlock/prob.cpp
rename to Exec/DevTests/MultiBlock/ERF_prob.cpp
index 4fb74626b..94b42ac77 100644
--- a/Exec/DevTests/MultiBlock/prob.cpp
+++ b/Exec/DevTests/MultiBlock/ERF_prob.cpp
@@ -1,5 +1,5 @@
-#include "prob.H"
-#include "EOS.H"
+#include "ERF_prob.H"
+#include "ERF_EOS.H"
 
 using namespace amrex;
 
diff --git a/Exec/DevTests/MultiBlock/Make.package b/Exec/DevTests/MultiBlock/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/DevTests/MultiBlock/Make.package
+++ b/Exec/DevTests/MultiBlock/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/DevTests/TemperatureSource/CMakeLists.txt b/Exec/DevTests/TemperatureSource/CMakeLists.txt
index 1582f8d13..e50cc3385 100644
--- a/Exec/DevTests/TemperatureSource/CMakeLists.txt
+++ b/Exec/DevTests/TemperatureSource/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_abl_with_temperature_source)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/DevTests/TemperatureSource/prob.H b/Exec/DevTests/TemperatureSource/ERF_prob.H
similarity index 94%
rename from Exec/DevTests/TemperatureSource/prob.H
rename to Exec/DevTests/TemperatureSource/ERF_prob.H
index 088847195..2fb8f1d72 100644
--- a/Exec/DevTests/TemperatureSource/prob.H
+++ b/Exec/DevTests/TemperatureSource/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 0.0;
@@ -55,8 +55,8 @@ class Problem : public ProblemBase
 public:
     Problem(const amrex::Real* problo, const amrex::Real* probhi);
 
-#include "Prob/init_constant_density_hse.H"
-#include "Prob/init_rayleigh_damping.H"
+#include "Prob/ERF_init_constant_density_hse.H"
+#include "Prob/ERF_init_rayleigh_damping.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/DevTests/TemperatureSource/prob.cpp b/Exec/DevTests/TemperatureSource/ERF_prob.cpp
similarity index 99%
rename from Exec/DevTests/TemperatureSource/prob.cpp
rename to Exec/DevTests/TemperatureSource/ERF_prob.cpp
index 1740379a8..8f4aa7abe 100644
--- a/Exec/DevTests/TemperatureSource/prob.cpp
+++ b/Exec/DevTests/TemperatureSource/ERF_prob.cpp
@@ -1,6 +1,6 @@
-#include "prob.H"
+#include "ERF_prob.H"
 #include "AMReX_Random.H"
-#include <Utils/ParFunctions.H>
+#include <Utils/ERF_ParFunctions.H>
 
 using namespace amrex;
 
diff --git a/Exec/DevTests/TemperatureSource/Make.package b/Exec/DevTests/TemperatureSource/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/DevTests/TemperatureSource/Make.package
+++ b/Exec/DevTests/TemperatureSource/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/DevTests/TropicalCyclone/CMakeLists.txt b/Exec/DevTests/TropicalCyclone/CMakeLists.txt
index a20b600df..df93bd794 100644
--- a/Exec/DevTests/TropicalCyclone/CMakeLists.txt
+++ b/Exec/DevTests/TropicalCyclone/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_tropical_cyclone)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/DevTests/TropicalCyclone/prob.H b/Exec/DevTests/TropicalCyclone/ERF_prob.H
similarity index 86%
rename from Exec/DevTests/TropicalCyclone/prob.H
rename to Exec/DevTests/TropicalCyclone/ERF_prob.H
index b7c583c1e..071dd3fe1 100644
--- a/Exec/DevTests/TropicalCyclone/prob.H
+++ b/Exec/DevTests/TropicalCyclone/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
     amrex::Real QKE_0   = 0.1;
@@ -31,8 +31,8 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-//#include "Prob/init_constant_density_hse.H" // not needed if init_type=="input_sounding"
-#include "Prob/init_rayleigh_damping.H" // provides WRF-style damping layer, with U_0, V_0, W_0, and T_0 as ref values
+//#include "Prob/ERF_init_constant_density_hse.H" // not needed if init_type=="input_sounding"
+#include "Prob/ERF_init_rayleigh_damping.H" // provides WRF-style damping layer, with U_0, V_0, W_0, and T_0 as ref values
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/DevTests/TropicalCyclone/prob.cpp b/Exec/DevTests/TropicalCyclone/ERF_prob.cpp
similarity index 99%
rename from Exec/DevTests/TropicalCyclone/prob.cpp
rename to Exec/DevTests/TropicalCyclone/ERF_prob.cpp
index 43afe9bc8..1d56ccc0e 100644
--- a/Exec/DevTests/TropicalCyclone/prob.cpp
+++ b/Exec/DevTests/TropicalCyclone/ERF_prob.cpp
@@ -1,4 +1,4 @@
-#include "prob.H"
+#include "ERF_prob.H"
 
 using namespace amrex;
 
diff --git a/Exec/DevTests/TropicalCyclone/Make.package b/Exec/DevTests/TropicalCyclone/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/DevTests/TropicalCyclone/Make.package
+++ b/Exec/DevTests/TropicalCyclone/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/EWP/CMakeLists.txt b/Exec/EWP/CMakeLists.txt
index 2e6da768c..d6967632f 100644
--- a/Exec/EWP/CMakeLists.txt
+++ b/Exec/EWP/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_fitch)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/SimpleActuatorDisk/prob.H b/Exec/EWP/ERF_prob.H
similarity index 92%
rename from Exec/SimpleActuatorDisk/prob.H
rename to Exec/EWP/ERF_prob.H
index aa0c28435..b509c8d45 100644
--- a/Exec/SimpleActuatorDisk/prob.H
+++ b/Exec/EWP/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 0.0;
@@ -46,8 +46,8 @@ class Problem : public ProblemBase
 public:
     Problem(const amrex::Real* problo, const amrex::Real* probhi);
 
-#include "Prob/init_constant_density_hse.H"
-#include "Prob/init_rayleigh_damping.H"
+#include "Prob/ERF_init_constant_density_hse.H"
+#include "Prob/ERF_init_rayleigh_damping.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/EWP/prob.cpp b/Exec/EWP/ERF_prob.cpp
similarity index 99%
rename from Exec/EWP/prob.cpp
rename to Exec/EWP/ERF_prob.cpp
index 1748499a1..7f5fdda42 100644
--- a/Exec/EWP/prob.cpp
+++ b/Exec/EWP/ERF_prob.cpp
@@ -1,4 +1,4 @@
-#include "prob.H"
+#include "ERF_prob.H"
 #include "AMReX_Random.H"
 
 using namespace amrex;
diff --git a/Exec/EWP/Make.package b/Exec/EWP/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/EWP/Make.package
+++ b/Exec/EWP/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/LLJ/CMakeLists.txt b/Exec/LLJ/CMakeLists.txt
index 832a7a4d1..ec4bd37bc 100644
--- a/Exec/LLJ/CMakeLists.txt
+++ b/Exec/LLJ/CMakeLists.txt
@@ -3,8 +3,8 @@ set(erf_exe_name erf_llj_real)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.H
-     prob.cpp
+     ERF_prob.H
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/LLJ/prob.H b/Exec/LLJ/ERF_prob.H
similarity index 91%
rename from Exec/LLJ/prob.H
rename to Exec/LLJ/ERF_prob.H
index 862e00221..058257806 100644
--- a/Exec/LLJ/prob.H
+++ b/Exec/LLJ/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 1.0;
@@ -18,7 +18,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_constant_density_hse.H"
+#include "Prob/ERF_init_constant_density_hse.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/LLJ/prob.cpp b/Exec/LLJ/ERF_prob.cpp
similarity index 98%
rename from Exec/LLJ/prob.cpp
rename to Exec/LLJ/ERF_prob.cpp
index bd9863687..0ed693178 100644
--- a/Exec/LLJ/prob.cpp
+++ b/Exec/LLJ/ERF_prob.cpp
@@ -1,4 +1,4 @@
-#include "prob.H"
+#include "ERF_prob.H"
 
 using namespace amrex;
 
diff --git a/Exec/LLJ/Make.package b/Exec/LLJ/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/LLJ/Make.package
+++ b/Exec/LLJ/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/Radiation/CMakeLists.txt b/Exec/Radiation/CMakeLists.txt
index 0d03acf75..211a9b076 100644
--- a/Exec/Radiation/CMakeLists.txt
+++ b/Exec/Radiation/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_radiation)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/SuperCell/prob.H b/Exec/Radiation/ERF_prob.H
similarity index 94%
rename from Exec/SuperCell/prob.H
rename to Exec/Radiation/ERF_prob.H
index cdfa91fb8..0a77b3ebc 100644
--- a/Exec/SuperCell/prob.H
+++ b/Exec/Radiation/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real T_0 = 300.0; // surface temperature == mean potential temperature
@@ -25,7 +25,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_density_hse_dry.H"
+#include "Prob/ERF_init_density_hse_dry.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/Radiation/prob.cpp b/Exec/Radiation/ERF_prob.cpp
similarity index 99%
rename from Exec/Radiation/prob.cpp
rename to Exec/Radiation/ERF_prob.cpp
index dc2e4a407..5091230bf 100644
--- a/Exec/Radiation/prob.cpp
+++ b/Exec/Radiation/ERF_prob.cpp
@@ -1,5 +1,5 @@
-#include "prob.H"
-#include "EOS.H"
+#include "ERF_prob.H"
+#include "ERF_EOS.H"
 
 using namespace amrex;
 
diff --git a/Exec/Radiation/Make.package b/Exec/Radiation/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/Radiation/Make.package
+++ b/Exec/Radiation/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/RegTests/Bomex/CMakeLists.txt b/Exec/RegTests/Bomex/CMakeLists.txt
index 2c45ce8b0..ae6c7c2ad 100644
--- a/Exec/RegTests/Bomex/CMakeLists.txt
+++ b/Exec/RegTests/Bomex/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_bomex)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/RegTests/Bomex/prob.H b/Exec/RegTests/Bomex/ERF_prob.H
similarity index 96%
rename from Exec/RegTests/Bomex/prob.H
rename to Exec/RegTests/Bomex/ERF_prob.H
index 44ee89000..00940160f 100644
--- a/Exec/RegTests/Bomex/prob.H
+++ b/Exec/RegTests/Bomex/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
     amrex::Real rho_0 = 0.0;
@@ -67,8 +67,8 @@ class Problem : public ProblemBase
 public:
     Problem (const amrex::Real* problo, const amrex::Real* probhi);
 
-#include "Prob/init_constant_density_hse.H"
-#include "Prob/init_rayleigh_damping.H"
+#include "Prob/ERF_init_constant_density_hse.H"
+#include "Prob/ERF_init_rayleigh_damping.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/RegTests/Bomex/prob.cpp b/Exec/RegTests/Bomex/ERF_prob.cpp
similarity index 99%
rename from Exec/RegTests/Bomex/prob.cpp
rename to Exec/RegTests/Bomex/ERF_prob.cpp
index 322987f75..673261072 100644
--- a/Exec/RegTests/Bomex/prob.cpp
+++ b/Exec/RegTests/Bomex/ERF_prob.cpp
@@ -1,6 +1,6 @@
-#include "prob.H"
+#include "ERF_prob.H"
 #include "AMReX_Random.H"
-#include <Utils/ParFunctions.H>
+#include <Utils/ERF_ParFunctions.H>
 
 using namespace amrex;
 
diff --git a/Exec/RegTests/Bomex/Make.package b/Exec/RegTests/Bomex/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/RegTests/Bomex/Make.package
+++ b/Exec/RegTests/Bomex/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/RegTests/Bubble/CMakeLists.txt b/Exec/RegTests/Bubble/CMakeLists.txt
index d3df39427..8070e0220 100644
--- a/Exec/RegTests/Bubble/CMakeLists.txt
+++ b/Exec/RegTests/Bubble/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_bubble)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/RegTests/Bubble/prob.H b/Exec/RegTests/Bubble/ERF_prob.H
similarity index 97%
rename from Exec/RegTests/Bubble/prob.H
rename to Exec/RegTests/Bubble/ERF_prob.H
index 57200a181..08382cfc3 100644
--- a/Exec/RegTests/Bubble/prob.H
+++ b/Exec/RegTests/Bubble/ERF_prob.H
@@ -1,12 +1,12 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
-#include "EOS.H"
+#include "ERF_prob_common.H"
+#include "ERF_EOS.H"
 
 struct ProbParm : ProbParmDefaults {
     // background conditions
@@ -47,7 +47,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_density_hse_dry.H"
+#include "Prob/ERF_init_density_hse_dry.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
@@ -124,7 +124,7 @@ public:
                                         const amrex::Real& dz,
                                         const int& khi);
 
-#include "Prob/init_rayleigh_damping.H"
+#include "Prob/ERF_init_rayleigh_damping.H"
 
 protected:
     std::string name() override { return "Bubble"; }
diff --git a/Exec/RegTests/Bubble/prob.cpp b/Exec/RegTests/Bubble/ERF_prob.cpp
similarity index 99%
rename from Exec/RegTests/Bubble/prob.cpp
rename to Exec/RegTests/Bubble/ERF_prob.cpp
index bfabdb5ab..667b9d2bd 100644
--- a/Exec/RegTests/Bubble/prob.cpp
+++ b/Exec/RegTests/Bubble/ERF_prob.cpp
@@ -1,5 +1,5 @@
-#include "prob.H"
-#include "Microphysics_Utils.H"
+#include "ERF_prob.H"
+#include "ERF_Microphysics_Utils.H"
 #include "ERF_Constants.H"
 
 using namespace amrex;
@@ -425,7 +425,7 @@ Problem::init_custom_pert(
                         omn = 1.0;
                     } else {
                         omn = 0.0;
-                        Abort("Bubble/prob.cpp: invalid moisture type specified");
+                        Abort("Bubble/ERF_prob.cpp: invalid moisture type specified");
                     }
                     Real qn  = state_pert(i, j, k, RhoQ2_comp);
                     state_pert(i, j, k, RhoQ2_comp) = qn * omn;
diff --git a/Exec/RegTests/Bubble/Make.package b/Exec/RegTests/Bubble/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/RegTests/Bubble/Make.package
+++ b/Exec/RegTests/Bubble/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/RegTests/Couette_Poiseuille/CMakeLists.txt b/Exec/RegTests/Couette_Poiseuille/CMakeLists.txt
index cfa90fd97..f4d451c81 100644
--- a/Exec/RegTests/Couette_Poiseuille/CMakeLists.txt
+++ b/Exec/RegTests/Couette_Poiseuille/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_couette_poiseuille)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/RegTests/Couette_Poiseuille/prob.H b/Exec/RegTests/Couette_Poiseuille/ERF_prob.H
similarity index 93%
rename from Exec/RegTests/Couette_Poiseuille/prob.H
rename to Exec/RegTests/Couette_Poiseuille/ERF_prob.H
index 2a7380b15..32da28155 100644
--- a/Exec/RegTests/Couette_Poiseuille/prob.H
+++ b/Exec/RegTests/Couette_Poiseuille/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 1.0;
@@ -22,7 +22,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_constant_density_hse.H"
+#include "Prob/ERF_init_constant_density_hse.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/RegTests/Couette_Poiseuille/prob.cpp b/Exec/RegTests/Couette_Poiseuille/ERF_prob.cpp
similarity index 99%
rename from Exec/RegTests/Couette_Poiseuille/prob.cpp
rename to Exec/RegTests/Couette_Poiseuille/ERF_prob.cpp
index 1053d04ca..c687ff7d1 100644
--- a/Exec/RegTests/Couette_Poiseuille/prob.cpp
+++ b/Exec/RegTests/Couette_Poiseuille/ERF_prob.cpp
@@ -1,4 +1,4 @@
-#include "prob.H"
+#include "ERF_prob.H"
 
 using namespace amrex;
 
diff --git a/Exec/RegTests/Couette_Poiseuille/Make.package b/Exec/RegTests/Couette_Poiseuille/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/RegTests/Couette_Poiseuille/Make.package
+++ b/Exec/RegTests/Couette_Poiseuille/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/RegTests/DensityCurrent/CMakeLists.txt b/Exec/RegTests/DensityCurrent/CMakeLists.txt
index b05f5145a..e81f65dd4 100644
--- a/Exec/RegTests/DensityCurrent/CMakeLists.txt
+++ b/Exec/RegTests/DensityCurrent/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_density_current)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/RegTests/DensityCurrent/prob.H b/Exec/RegTests/DensityCurrent/ERF_prob.H
similarity index 93%
rename from Exec/RegTests/DensityCurrent/prob.H
rename to Exec/RegTests/DensityCurrent/ERF_prob.H
index 8bd192774..1a866f1a9 100644
--- a/Exec/RegTests/DensityCurrent/prob.H
+++ b/Exec/RegTests/DensityCurrent/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real T_0 = 300.0; // surface temperature == mean potential temperature
@@ -23,7 +23,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_density_hse_dry.H"
+#include "Prob/ERF_init_density_hse_dry.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/RegTests/DensityCurrent/prob.cpp b/Exec/RegTests/DensityCurrent/ERF_prob.cpp
similarity index 99%
rename from Exec/RegTests/DensityCurrent/prob.cpp
rename to Exec/RegTests/DensityCurrent/ERF_prob.cpp
index 69c1912a0..bc40daece 100644
--- a/Exec/RegTests/DensityCurrent/prob.cpp
+++ b/Exec/RegTests/DensityCurrent/ERF_prob.cpp
@@ -1,5 +1,5 @@
-#include "prob.H"
-#include "EOS.H"
+#include "ERF_prob.H"
+#include "ERF_EOS.H"
 
 using namespace amrex;
 
diff --git a/Exec/RegTests/DensityCurrent/Make.package b/Exec/RegTests/DensityCurrent/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/RegTests/DensityCurrent/Make.package
+++ b/Exec/RegTests/DensityCurrent/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/RegTests/DynamicRefinement/CMakeLists.txt b/Exec/RegTests/DynamicRefinement/CMakeLists.txt
index 863a4270a..f5e544b89 100644
--- a/Exec/RegTests/DynamicRefinement/CMakeLists.txt
+++ b/Exec/RegTests/DynamicRefinement/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_dynamic_refinement)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/RegTests/DynamicRefinement/prob.H b/Exec/RegTests/DynamicRefinement/ERF_prob.H
similarity index 94%
rename from Exec/RegTests/DynamicRefinement/prob.H
rename to Exec/RegTests/DynamicRefinement/ERF_prob.H
index 6c396be46..c759964b8 100644
--- a/Exec/RegTests/DynamicRefinement/prob.H
+++ b/Exec/RegTests/DynamicRefinement/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 #include "ERF_Constants.H"
 
 struct ProbParm : ProbParmDefaults {
@@ -30,7 +30,7 @@ class Problem : public ProblemBase
 public:
     Problem(const amrex_real* problo, const amrex_real* probhi);
 
-#include "Prob/init_constant_density_hse.H"
+#include "Prob/ERF_init_constant_density_hse.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/RegTests/DynamicRefinement/prob.cpp b/Exec/RegTests/DynamicRefinement/ERF_prob.cpp
similarity index 99%
rename from Exec/RegTests/DynamicRefinement/prob.cpp
rename to Exec/RegTests/DynamicRefinement/ERF_prob.cpp
index 12c7ef14b..3f6bbd304 100644
--- a/Exec/RegTests/DynamicRefinement/prob.cpp
+++ b/Exec/RegTests/DynamicRefinement/ERF_prob.cpp
@@ -1,4 +1,4 @@
-#include "prob.H"
+#include "ERF_prob.H"
 
 using namespace amrex;
 
diff --git a/Exec/RegTests/DynamicRefinement/Make.package b/Exec/RegTests/DynamicRefinement/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/RegTests/DynamicRefinement/Make.package
+++ b/Exec/RegTests/DynamicRefinement/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/RegTests/EkmanSpiral/CMakeLists.txt b/Exec/RegTests/EkmanSpiral/CMakeLists.txt
index 8dd363950..e807ba61b 100644
--- a/Exec/RegTests/EkmanSpiral/CMakeLists.txt
+++ b/Exec/RegTests/EkmanSpiral/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_ekman_spiral)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/RegTests/EkmanSpiral/prob.H b/Exec/RegTests/EkmanSpiral/ERF_prob.H
similarity index 91%
rename from Exec/RegTests/EkmanSpiral/prob.H
rename to Exec/RegTests/EkmanSpiral/ERF_prob.H
index bb854cf14..7af5ff805 100644
--- a/Exec/RegTests/EkmanSpiral/prob.H
+++ b/Exec/RegTests/EkmanSpiral/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 1.0;
@@ -18,7 +18,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_constant_density_hse.H"
+#include "Prob/ERF_init_constant_density_hse.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/RegTests/EkmanSpiral/prob.cpp b/Exec/RegTests/EkmanSpiral/ERF_prob.cpp
similarity index 99%
rename from Exec/RegTests/EkmanSpiral/prob.cpp
rename to Exec/RegTests/EkmanSpiral/ERF_prob.cpp
index af2372aba..2f390064f 100644
--- a/Exec/RegTests/EkmanSpiral/prob.cpp
+++ b/Exec/RegTests/EkmanSpiral/ERF_prob.cpp
@@ -1,4 +1,4 @@
-#include "prob.H"
+#include "ERF_prob.H"
 
 using namespace amrex;
 
diff --git a/Exec/RegTests/EkmanSpiral/Make.package b/Exec/RegTests/EkmanSpiral/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/RegTests/EkmanSpiral/Make.package
+++ b/Exec/RegTests/EkmanSpiral/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/RegTests/EkmanSpiral/README b/Exec/RegTests/EkmanSpiral/README
index 2950db095..139e8b699 100644
--- a/Exec/RegTests/EkmanSpiral/README
+++ b/Exec/RegTests/EkmanSpiral/README
@@ -6,7 +6,7 @@ A description of the problem, including the exact solution, can be found at
 https://exawind.github.io/amr-wind/developer/verification.html#ekman-spiral .
 
 When the executable here is run with inputs_custom, the solution is initialized
-in prob.cpp from the exact solution.
+in ERF_prob.cpp from the exact solution.
 
 When the executable here is run with inputs_ideal, the solution is initialized
 from the wrfinput_ekman_d01 file, thus this is also a test of ERF's ability to 
diff --git a/Exec/RegTests/IsentropicVortex/CMakeLists.txt b/Exec/RegTests/IsentropicVortex/CMakeLists.txt
index a9afcd68e..67ab8fbc6 100644
--- a/Exec/RegTests/IsentropicVortex/CMakeLists.txt
+++ b/Exec/RegTests/IsentropicVortex/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_isentropic_vortex)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/RegTests/IsentropicVortex/prob.H b/Exec/RegTests/IsentropicVortex/ERF_prob.H
similarity index 94%
rename from Exec/RegTests/IsentropicVortex/prob.H
rename to Exec/RegTests/IsentropicVortex/ERF_prob.H
index d73699392..3a2b5ef3a 100644
--- a/Exec/RegTests/IsentropicVortex/prob.H
+++ b/Exec/RegTests/IsentropicVortex/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real p_inf = p_0; //freestream pressure [Pa]
@@ -29,7 +29,7 @@ class Problem : public ProblemBase
 public:
     Problem(const amrex_real* problo, const amrex_real* probhi);
 
-#include "Prob/init_constant_density_hse.H"
+#include "Prob/ERF_init_constant_density_hse.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/RegTests/IsentropicVortex/prob.cpp b/Exec/RegTests/IsentropicVortex/ERF_prob.cpp
similarity index 99%
rename from Exec/RegTests/IsentropicVortex/prob.cpp
rename to Exec/RegTests/IsentropicVortex/ERF_prob.cpp
index 68794856a..37d5027c0 100644
--- a/Exec/RegTests/IsentropicVortex/prob.cpp
+++ b/Exec/RegTests/IsentropicVortex/ERF_prob.cpp
@@ -1,5 +1,5 @@
-#include "prob.H"
-#include "EOS.H"
+#include "ERF_prob.H"
+#include "ERF_EOS.H"
 #include "ERF_Constants.H"
 
 using namespace amrex;
diff --git a/Exec/RegTests/IsentropicVortex/Make.package b/Exec/RegTests/IsentropicVortex/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/RegTests/IsentropicVortex/Make.package
+++ b/Exec/RegTests/IsentropicVortex/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/RegTests/ParticlesOverWoA/CMakeLists.txt b/Exec/RegTests/ParticlesOverWoA/CMakeLists.txt
index 67ef7c879..45fc89383 100644
--- a/Exec/RegTests/ParticlesOverWoA/CMakeLists.txt
+++ b/Exec/RegTests/ParticlesOverWoA/CMakeLists.txt
@@ -4,7 +4,7 @@ if(ERF_ENABLE_PARTICLES)
   add_executable(${erf_exe_name} "")
   target_sources(${erf_exe_name}
      PRIVATE
-       prob.cpp
+       ERF_prob.cpp
   )
 
   target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/RegTests/ParticlesOverWoA/prob.H b/Exec/RegTests/ParticlesOverWoA/ERF_prob.H
similarity index 94%
rename from Exec/RegTests/ParticlesOverWoA/prob.H
rename to Exec/RegTests/ParticlesOverWoA/ERF_prob.H
index 4daf3d58b..666ca26bd 100644
--- a/Exec/RegTests/ParticlesOverWoA/prob.H
+++ b/Exec/RegTests/ParticlesOverWoA/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real T_0 = 300.0; // surface temperature == mean potential temperature
@@ -25,7 +25,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_density_hse_dry.H"
+#include "Prob/ERF_init_density_hse_dry.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/RegTests/ParticlesOverWoA/prob.cpp b/Exec/RegTests/ParticlesOverWoA/ERF_prob.cpp
similarity index 98%
rename from Exec/RegTests/ParticlesOverWoA/prob.cpp
rename to Exec/RegTests/ParticlesOverWoA/ERF_prob.cpp
index d184c1883..8e8b95334 100644
--- a/Exec/RegTests/ParticlesOverWoA/prob.cpp
+++ b/Exec/RegTests/ParticlesOverWoA/ERF_prob.cpp
@@ -1,6 +1,6 @@
-#include "prob.H"
-#include "EOS.H"
-#include "TerrainMetrics.H"
+#include "ERF_prob.H"
+#include "ERF_EOS.H"
+#include "ERF_TerrainMetrics.H"
 
 using namespace amrex;
 
diff --git a/Exec/RegTests/ParticlesOverWoA/Make.package b/Exec/RegTests/ParticlesOverWoA/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/RegTests/ParticlesOverWoA/Make.package
+++ b/Exec/RegTests/ParticlesOverWoA/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/RegTests/ScalarAdvDiff/CMakeLists.txt b/Exec/RegTests/ScalarAdvDiff/CMakeLists.txt
index c4785f8e6..ed42e69bd 100644
--- a/Exec/RegTests/ScalarAdvDiff/CMakeLists.txt
+++ b/Exec/RegTests/ScalarAdvDiff/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_scalar_advdiff)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/RegTests/ScalarAdvDiff/prob.H b/Exec/RegTests/ScalarAdvDiff/ERF_prob.H
similarity index 94%
rename from Exec/RegTests/ScalarAdvDiff/prob.H
rename to Exec/RegTests/ScalarAdvDiff/ERF_prob.H
index c598e9f72..0e2392e09 100644
--- a/Exec/RegTests/ScalarAdvDiff/prob.H
+++ b/Exec/RegTests/ScalarAdvDiff/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 0.0;
@@ -32,7 +32,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_constant_density_hse.H"
+#include "Prob/ERF_init_constant_density_hse.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/RegTests/ScalarAdvDiff/prob.cpp b/Exec/RegTests/ScalarAdvDiff/ERF_prob.cpp
similarity index 99%
rename from Exec/RegTests/ScalarAdvDiff/prob.cpp
rename to Exec/RegTests/ScalarAdvDiff/ERF_prob.cpp
index f41b10ae5..8dbc229a5 100644
--- a/Exec/RegTests/ScalarAdvDiff/prob.cpp
+++ b/Exec/RegTests/ScalarAdvDiff/ERF_prob.cpp
@@ -1,4 +1,4 @@
-#include "prob.H"
+#include "ERF_prob.H"
 
 using namespace amrex;
 
diff --git a/Exec/RegTests/ScalarAdvDiff/Make.package b/Exec/RegTests/ScalarAdvDiff/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/RegTests/ScalarAdvDiff/Make.package
+++ b/Exec/RegTests/ScalarAdvDiff/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/RegTests/ScalarAdvDiff/prob.cpp.convergence b/Exec/RegTests/ScalarAdvDiff/prob.cpp.convergence
index 460f96575..feb27e20d 100644
--- a/Exec/RegTests/ScalarAdvDiff/prob.cpp.convergence
+++ b/Exec/RegTests/ScalarAdvDiff/prob.cpp.convergence
@@ -1,10 +1,10 @@
-#include "prob.H"
-#include "prob_common.H"
+#include "ERF_prob.H"
+#include "ERF_prob_common.H"
 
 #include "AMReX_ParmParse.H"
 #include "AMReX_MultiFab.H"
 #include "ERF_Constants.H"
-#include "IndexDefines.H"
+#include "ERF_IndexDefines.H"
 
 using namespace amrex;
 
diff --git a/Exec/RegTests/StokesSecondProblem/CMakeLists.txt b/Exec/RegTests/StokesSecondProblem/CMakeLists.txt
index 04fd9dd9b..b3465933c 100644
--- a/Exec/RegTests/StokesSecondProblem/CMakeLists.txt
+++ b/Exec/RegTests/StokesSecondProblem/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_stokes_second_problem)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/RegTests/StokesSecondProblem/prob.H b/Exec/RegTests/StokesSecondProblem/ERF_prob.H
similarity index 73%
rename from Exec/RegTests/StokesSecondProblem/prob.H
rename to Exec/RegTests/StokesSecondProblem/ERF_prob.H
index 71f6ac522..65963386d 100644
--- a/Exec/RegTests/StokesSecondProblem/prob.H
+++ b/Exec/RegTests/StokesSecondProblem/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include <AMReX_REAL.H>
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 1.2;
@@ -16,7 +16,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_constant_density_hse.H"
+#include "Prob/ERF_init_constant_density_hse.H"
 
 protected:
     std::string name() override { return "Stokes Second Problem"; }
diff --git a/Exec/RegTests/StokesSecondProblem/prob.cpp b/Exec/RegTests/StokesSecondProblem/ERF_prob.cpp
similarity index 97%
rename from Exec/RegTests/StokesSecondProblem/prob.cpp
rename to Exec/RegTests/StokesSecondProblem/ERF_prob.cpp
index ee93a841e..c93e99131 100644
--- a/Exec/RegTests/StokesSecondProblem/prob.cpp
+++ b/Exec/RegTests/StokesSecondProblem/ERF_prob.cpp
@@ -1,5 +1,5 @@
-#include "prob.H"
-#include "TerrainMetrics.H"
+#include "ERF_prob.H"
+#include "ERF_TerrainMetrics.H"
 
 using namespace amrex;
 
diff --git a/Exec/RegTests/StokesSecondProblem/Make.package b/Exec/RegTests/StokesSecondProblem/Make.package
index e89a809bb..037b74169 100644
--- a/Exec/RegTests/StokesSecondProblem/Make.package
+++ b/Exec/RegTests/StokesSecondProblem/Make.package
@@ -1 +1 @@
-CEXE_sources += prob.cpp
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/RegTests/TaylorGreenVortex/CMakeLists.txt b/Exec/RegTests/TaylorGreenVortex/CMakeLists.txt
index 1c031e57d..d388dc44f 100644
--- a/Exec/RegTests/TaylorGreenVortex/CMakeLists.txt
+++ b/Exec/RegTests/TaylorGreenVortex/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_taylor_green)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/RegTests/TaylorGreenVortex/prob.H b/Exec/RegTests/TaylorGreenVortex/ERF_prob.H
similarity index 91%
rename from Exec/RegTests/TaylorGreenVortex/prob.H
rename to Exec/RegTests/TaylorGreenVortex/ERF_prob.H
index 2a256a113..c0869d34f 100644
--- a/Exec/RegTests/TaylorGreenVortex/prob.H
+++ b/Exec/RegTests/TaylorGreenVortex/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 1.0;
@@ -18,7 +18,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_constant_density_hse.H"
+#include "Prob/ERF_init_constant_density_hse.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/RegTests/TaylorGreenVortex/prob.cpp b/Exec/RegTests/TaylorGreenVortex/ERF_prob.cpp
similarity index 98%
rename from Exec/RegTests/TaylorGreenVortex/prob.cpp
rename to Exec/RegTests/TaylorGreenVortex/ERF_prob.cpp
index 33af051e3..0242a9027 100644
--- a/Exec/RegTests/TaylorGreenVortex/prob.cpp
+++ b/Exec/RegTests/TaylorGreenVortex/ERF_prob.cpp
@@ -1,5 +1,5 @@
-#include "prob.H"
-#include "EOS.H"
+#include "ERF_prob.H"
+#include "ERF_EOS.H"
 
 using namespace amrex;
 
diff --git a/Exec/RegTests/TaylorGreenVortex/Make.package b/Exec/RegTests/TaylorGreenVortex/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/RegTests/TaylorGreenVortex/Make.package
+++ b/Exec/RegTests/TaylorGreenVortex/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/RegTests/Terrain2d_Cylinder/CMakeLists.txt b/Exec/RegTests/Terrain2d_Cylinder/CMakeLists.txt
index 06d172eaf..1f146be86 100644
--- a/Exec/RegTests/Terrain2d_Cylinder/CMakeLists.txt
+++ b/Exec/RegTests/Terrain2d_Cylinder/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_2d_cylinder)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/RegTests/Terrain2d_Cylinder/prob.H b/Exec/RegTests/Terrain2d_Cylinder/ERF_prob.H
similarity index 93%
rename from Exec/RegTests/Terrain2d_Cylinder/prob.H
rename to Exec/RegTests/Terrain2d_Cylinder/ERF_prob.H
index 3de42008b..cafceffb1 100644
--- a/Exec/RegTests/Terrain2d_Cylinder/prob.H
+++ b/Exec/RegTests/Terrain2d_Cylinder/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 1.2;
@@ -19,7 +19,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_density_hse_dry.H"
+#include "Prob/ERF_init_density_hse_dry.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/RegTests/Terrain2d_Cylinder/prob.cpp b/Exec/RegTests/Terrain2d_Cylinder/ERF_prob.cpp
similarity index 98%
rename from Exec/RegTests/Terrain2d_Cylinder/prob.cpp
rename to Exec/RegTests/Terrain2d_Cylinder/ERF_prob.cpp
index 26dbb4343..f5d3c146b 100644
--- a/Exec/RegTests/Terrain2d_Cylinder/prob.cpp
+++ b/Exec/RegTests/Terrain2d_Cylinder/ERF_prob.cpp
@@ -1,6 +1,6 @@
-#include "prob.H"
-#include "EOS.H"
-#include "TerrainMetrics.H"
+#include "ERF_prob.H"
+#include "ERF_EOS.H"
+#include "ERF_TerrainMetrics.H"
 
 using namespace amrex;
 
diff --git a/Exec/RegTests/Terrain2d_Cylinder/Make.package b/Exec/RegTests/Terrain2d_Cylinder/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/RegTests/Terrain2d_Cylinder/Make.package
+++ b/Exec/RegTests/Terrain2d_Cylinder/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/RegTests/Terrain3d_Hemisphere/CMakeLists.txt b/Exec/RegTests/Terrain3d_Hemisphere/CMakeLists.txt
index 0353dd5f3..eeb04a113 100644
--- a/Exec/RegTests/Terrain3d_Hemisphere/CMakeLists.txt
+++ b/Exec/RegTests/Terrain3d_Hemisphere/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_3d_hemisphere)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/RegTests/Terrain3d_Hemisphere/prob.H b/Exec/RegTests/Terrain3d_Hemisphere/ERF_prob.H
similarity index 94%
rename from Exec/RegTests/Terrain3d_Hemisphere/prob.H
rename to Exec/RegTests/Terrain3d_Hemisphere/ERF_prob.H
index 38db615d2..1c19146ba 100644
--- a/Exec/RegTests/Terrain3d_Hemisphere/prob.H
+++ b/Exec/RegTests/Terrain3d_Hemisphere/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 1.2;
@@ -37,7 +37,7 @@ class Problem : public ProblemBase
 public:
     Problem (const amrex::Real* problo, const amrex::Real* probhi);
 
-#include "Prob/init_density_hse_dry.H"
+#include "Prob/ERF_init_density_hse_dry.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/RegTests/Terrain3d_Hemisphere/prob.cpp b/Exec/RegTests/Terrain3d_Hemisphere/ERF_prob.cpp
similarity index 99%
rename from Exec/RegTests/Terrain3d_Hemisphere/prob.cpp
rename to Exec/RegTests/Terrain3d_Hemisphere/ERF_prob.cpp
index 82254690f..b0e2b335b 100644
--- a/Exec/RegTests/Terrain3d_Hemisphere/prob.cpp
+++ b/Exec/RegTests/Terrain3d_Hemisphere/ERF_prob.cpp
@@ -1,5 +1,5 @@
-#include "prob.H"
-#include "TerrainMetrics.H"
+#include "ERF_prob.H"
+#include "ERF_TerrainMetrics.H"
 
 using namespace amrex;
 
diff --git a/Exec/RegTests/Terrain3d_Hemisphere/Make.package b/Exec/RegTests/Terrain3d_Hemisphere/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/RegTests/Terrain3d_Hemisphere/Make.package
+++ b/Exec/RegTests/Terrain3d_Hemisphere/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/RegTests/TurbulentInflow/CMakeLists.txt b/Exec/RegTests/TurbulentInflow/CMakeLists.txt
index 4b3451914..b9b05f480 100644
--- a/Exec/RegTests/TurbulentInflow/CMakeLists.txt
+++ b/Exec/RegTests/TurbulentInflow/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_turbulent_inflow)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/RegTests/TurbulentInflow/prob.H b/Exec/RegTests/TurbulentInflow/ERF_prob.H
similarity index 93%
rename from Exec/RegTests/TurbulentInflow/prob.H
rename to Exec/RegTests/TurbulentInflow/ERF_prob.H
index 74bac8eb1..e354feaab 100644
--- a/Exec/RegTests/TurbulentInflow/prob.H
+++ b/Exec/RegTests/TurbulentInflow/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 1.0;
@@ -51,8 +51,8 @@ class Problem : public ProblemBase
 public:
     Problem(const amrex::Real* problo, const amrex::Real* probhi);
 
-#include "Prob/init_constant_density_hse.H"
-#include "Prob/init_rayleigh_damping.H"
+#include "Prob/ERF_init_constant_density_hse.H"
+#include "Prob/ERF_init_rayleigh_damping.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/RegTests/TurbulentInflow/prob.cpp b/Exec/RegTests/TurbulentInflow/ERF_prob.cpp
similarity index 99%
rename from Exec/RegTests/TurbulentInflow/prob.cpp
rename to Exec/RegTests/TurbulentInflow/ERF_prob.cpp
index d5f5bad19..be148e972 100644
--- a/Exec/RegTests/TurbulentInflow/prob.cpp
+++ b/Exec/RegTests/TurbulentInflow/ERF_prob.cpp
@@ -1,4 +1,4 @@
-#include "prob.H"
+#include "ERF_prob.H"
 #include "AMReX_Random.H"
 
 using namespace amrex;
diff --git a/Exec/RegTests/TurbulentInflow/Make.package b/Exec/RegTests/TurbulentInflow/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/RegTests/TurbulentInflow/Make.package
+++ b/Exec/RegTests/TurbulentInflow/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/RegTests/WPS_Test/CMakeLists.txt b/Exec/RegTests/WPS_Test/CMakeLists.txt
index 92ae99409..2b4d60d5c 100644
--- a/Exec/RegTests/WPS_Test/CMakeLists.txt
+++ b/Exec/RegTests/WPS_Test/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_wps_test)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/RegTests/WPS_Test/prob.H b/Exec/RegTests/WPS_Test/ERF_prob.H
similarity index 75%
rename from Exec/RegTests/WPS_Test/prob.H
rename to Exec/RegTests/WPS_Test/ERF_prob.H
index 421a441d0..9aa843633 100644
--- a/Exec/RegTests/WPS_Test/prob.H
+++ b/Exec/RegTests/WPS_Test/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include <AMReX_REAL.H>
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 1.0;
@@ -18,7 +18,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_constant_density_hse.H"
+#include "Prob/ERF_init_constant_density_hse.H"
 
 protected:
     std::string name() override { return "WPS Test"; }
diff --git a/Exec/RegTests/WPS_Test/prob.cpp b/Exec/RegTests/WPS_Test/ERF_prob.cpp
similarity index 94%
rename from Exec/RegTests/WPS_Test/prob.cpp
rename to Exec/RegTests/WPS_Test/ERF_prob.cpp
index bca733e37..95460ab69 100644
--- a/Exec/RegTests/WPS_Test/prob.cpp
+++ b/Exec/RegTests/WPS_Test/ERF_prob.cpp
@@ -1,4 +1,4 @@
-#include "prob.H"
+#include "ERF_prob.H"
 
 using namespace amrex;
 
diff --git a/Exec/RegTests/WPS_Test/Make.package b/Exec/RegTests/WPS_Test/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/RegTests/WPS_Test/Make.package
+++ b/Exec/RegTests/WPS_Test/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/RegTests/WitchOfAgnesi/CMakeLists.txt b/Exec/RegTests/WitchOfAgnesi/CMakeLists.txt
index b97575974..1b0c8295f 100644
--- a/Exec/RegTests/WitchOfAgnesi/CMakeLists.txt
+++ b/Exec/RegTests/WitchOfAgnesi/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_witch_of_agnesi)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/RegTests/WitchOfAgnesi/prob.H b/Exec/RegTests/WitchOfAgnesi/ERF_prob.H
similarity index 90%
rename from Exec/RegTests/WitchOfAgnesi/prob.H
rename to Exec/RegTests/WitchOfAgnesi/ERF_prob.H
index 984653d05..d144402e8 100644
--- a/Exec/RegTests/WitchOfAgnesi/prob.H
+++ b/Exec/RegTests/WitchOfAgnesi/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real U_0 = 0.0;
@@ -20,8 +20,8 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_density_hse_dry.H"
-#include "Prob/init_rayleigh_damping.H"
+#include "Prob/ERF_init_density_hse_dry.H"
+#include "Prob/ERF_init_rayleigh_damping.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/RegTests/WitchOfAgnesi/prob.cpp b/Exec/RegTests/WitchOfAgnesi/ERF_prob.cpp
similarity index 98%
rename from Exec/RegTests/WitchOfAgnesi/prob.cpp
rename to Exec/RegTests/WitchOfAgnesi/ERF_prob.cpp
index c37537255..e20d69e8e 100644
--- a/Exec/RegTests/WitchOfAgnesi/prob.cpp
+++ b/Exec/RegTests/WitchOfAgnesi/ERF_prob.cpp
@@ -1,5 +1,5 @@
-#include "prob.H"
-#include "TerrainMetrics.H"
+#include "ERF_prob.H"
+#include "ERF_TerrainMetrics.H"
 
 using namespace amrex;
 
diff --git a/Exec/RegTests/WitchOfAgnesi/Make.package b/Exec/RegTests/WitchOfAgnesi/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/RegTests/WitchOfAgnesi/Make.package
+++ b/Exec/RegTests/WitchOfAgnesi/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/SimpleActuatorDisk/CMakeLists.txt b/Exec/SimpleActuatorDisk/CMakeLists.txt
index 2e6da768c..d6967632f 100644
--- a/Exec/SimpleActuatorDisk/CMakeLists.txt
+++ b/Exec/SimpleActuatorDisk/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_fitch)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/EWP/prob.H b/Exec/SimpleActuatorDisk/ERF_prob.H
similarity index 92%
rename from Exec/EWP/prob.H
rename to Exec/SimpleActuatorDisk/ERF_prob.H
index aa0c28435..b509c8d45 100644
--- a/Exec/EWP/prob.H
+++ b/Exec/SimpleActuatorDisk/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 0.0;
@@ -46,8 +46,8 @@ class Problem : public ProblemBase
 public:
     Problem(const amrex::Real* problo, const amrex::Real* probhi);
 
-#include "Prob/init_constant_density_hse.H"
-#include "Prob/init_rayleigh_damping.H"
+#include "Prob/ERF_init_constant_density_hse.H"
+#include "Prob/ERF_init_rayleigh_damping.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/SimpleActuatorDisk/prob.cpp b/Exec/SimpleActuatorDisk/ERF_prob.cpp
similarity index 99%
rename from Exec/SimpleActuatorDisk/prob.cpp
rename to Exec/SimpleActuatorDisk/ERF_prob.cpp
index 1748499a1..7f5fdda42 100644
--- a/Exec/SimpleActuatorDisk/prob.cpp
+++ b/Exec/SimpleActuatorDisk/ERF_prob.cpp
@@ -1,4 +1,4 @@
-#include "prob.H"
+#include "ERF_prob.H"
 #include "AMReX_Random.H"
 
 using namespace amrex;
diff --git a/Exec/SimpleActuatorDisk/Make.package b/Exec/SimpleActuatorDisk/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/SimpleActuatorDisk/Make.package
+++ b/Exec/SimpleActuatorDisk/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/SpongeTest/CMakeLists.txt b/Exec/SpongeTest/CMakeLists.txt
index 54678203c..c9aaa46ce 100644
--- a/Exec/SpongeTest/CMakeLists.txt
+++ b/Exec/SpongeTest/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_sponge_test)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/SpongeTest/prob.H b/Exec/SpongeTest/ERF_prob.H
similarity index 93%
rename from Exec/SpongeTest/prob.H
rename to Exec/SpongeTest/ERF_prob.H
index 3de42008b..cafceffb1 100644
--- a/Exec/SpongeTest/prob.H
+++ b/Exec/SpongeTest/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 1.2;
@@ -19,7 +19,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_density_hse_dry.H"
+#include "Prob/ERF_init_density_hse_dry.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/SpongeTest/prob.cpp b/Exec/SpongeTest/ERF_prob.cpp
similarity index 98%
rename from Exec/SpongeTest/prob.cpp
rename to Exec/SpongeTest/ERF_prob.cpp
index 3562386c5..44da4e849 100644
--- a/Exec/SpongeTest/prob.cpp
+++ b/Exec/SpongeTest/ERF_prob.cpp
@@ -1,6 +1,6 @@
-#include "prob.H"
-#include "EOS.H"
-#include "TerrainMetrics.H"
+#include "ERF_prob.H"
+#include "ERF_EOS.H"
+#include "ERF_TerrainMetrics.H"
 
 using namespace amrex;
 
diff --git a/Exec/SpongeTest/Make.package b/Exec/SpongeTest/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/SpongeTest/Make.package
+++ b/Exec/SpongeTest/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/SquallLine_2D/CMakeLists.txt b/Exec/SquallLine_2D/CMakeLists.txt
index 2dd0979b2..b6462b880 100644
--- a/Exec/SquallLine_2D/CMakeLists.txt
+++ b/Exec/SquallLine_2D/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_squallline_2d)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/SquallLine_2D/prob.H b/Exec/SquallLine_2D/ERF_prob.H
similarity index 95%
rename from Exec/SquallLine_2D/prob.H
rename to Exec/SquallLine_2D/ERF_prob.H
index 09bff61d1..fba6b1d5f 100644
--- a/Exec/SquallLine_2D/prob.H
+++ b/Exec/SquallLine_2D/ERF_prob.H
@@ -1,5 +1,5 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
@@ -7,10 +7,10 @@
 #include "AMReX_ParmParse.H"
 #include "AMReX_MultiFab.H"
 
-#include "prob_common.H"
-#include "EOS.H"
-#include "IndexDefines.H"
-#include "TileNoZ.H"
+#include "ERF_prob_common.H"
+#include "ERF_EOS.H"
+#include "ERF_IndexDefines.H"
+#include "ERF_TileNoZ.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real z_tr = 12000.0;
@@ -35,7 +35,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_density_hse_dry.H"
+#include "Prob/ERF_init_density_hse_dry.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/SquallLine_2D/prob.cpp b/Exec/SquallLine_2D/ERF_prob.cpp
similarity index 99%
rename from Exec/SquallLine_2D/prob.cpp
rename to Exec/SquallLine_2D/ERF_prob.cpp
index be774c014..11988c5f6 100644
--- a/Exec/SquallLine_2D/prob.cpp
+++ b/Exec/SquallLine_2D/ERF_prob.cpp
@@ -1,4 +1,4 @@
-#include "prob.H"
+#include "ERF_prob.H"
 #include <ERF_Constants.H>
 
 using namespace amrex;
diff --git a/Exec/SquallLine_2D/Make.package b/Exec/SquallLine_2D/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/SquallLine_2D/Make.package
+++ b/Exec/SquallLine_2D/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/SuperCell/CMakeLists.txt b/Exec/SuperCell/CMakeLists.txt
index 31565e89f..5fc424233 100644
--- a/Exec/SuperCell/CMakeLists.txt
+++ b/Exec/SuperCell/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_super_cell)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/Radiation/prob.H b/Exec/SuperCell/ERF_prob.H
similarity index 94%
rename from Exec/Radiation/prob.H
rename to Exec/SuperCell/ERF_prob.H
index cdfa91fb8..0a77b3ebc 100644
--- a/Exec/Radiation/prob.H
+++ b/Exec/SuperCell/ERF_prob.H
@@ -1,11 +1,11 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
 #include "AMReX_REAL.H"
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real T_0 = 300.0; // surface temperature == mean potential temperature
@@ -25,7 +25,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_density_hse_dry.H"
+#include "Prob/ERF_init_density_hse_dry.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/SuperCell/prob.cpp b/Exec/SuperCell/ERF_prob.cpp
similarity index 99%
rename from Exec/SuperCell/prob.cpp
rename to Exec/SuperCell/ERF_prob.cpp
index 9c36f4421..bffb64235 100644
--- a/Exec/SuperCell/prob.cpp
+++ b/Exec/SuperCell/ERF_prob.cpp
@@ -1,5 +1,5 @@
-#include "prob.H"
-#include "EOS.H"
+#include "ERF_prob.H"
+#include "ERF_EOS.H"
 
 using namespace amrex;
 
diff --git a/Exec/SuperCell/Make.package b/Exec/SuperCell/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/SuperCell/Make.package
+++ b/Exec/SuperCell/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Exec/SuperCell_3D/CMakeLists.txt b/Exec/SuperCell_3D/CMakeLists.txt
index 0d4e4cea7..ab1b8d3e6 100644
--- a/Exec/SuperCell_3D/CMakeLists.txt
+++ b/Exec/SuperCell_3D/CMakeLists.txt
@@ -3,7 +3,7 @@ set(erf_exe_name erf_supercell_3d)
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}
    PRIVATE
-     prob.cpp
+     ERF_prob.cpp
 )
 
 target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Exec/SuperCell_3D/prob.H b/Exec/SuperCell_3D/ERF_prob.H
similarity index 95%
rename from Exec/SuperCell_3D/prob.H
rename to Exec/SuperCell_3D/ERF_prob.H
index 7b6d4639f..8c5a9da49 100644
--- a/Exec/SuperCell_3D/prob.H
+++ b/Exec/SuperCell_3D/ERF_prob.H
@@ -1,5 +1,5 @@
-#ifndef _PROB_H_
-#define _PROB_H_
+#ifndef ERF_PROB_H_
+#define ERF_PROB_H_
 
 #include <string>
 
@@ -7,10 +7,10 @@
 #include "AMReX_ParmParse.H"
 #include "AMReX_MultiFab.H"
 
-#include "prob_common.H"
-#include "EOS.H"
-#include "IndexDefines.H"
-#include "TileNoZ.H"
+#include "ERF_prob_common.H"
+#include "ERF_EOS.H"
+#include "ERF_IndexDefines.H"
+#include "ERF_TileNoZ.H"
 
 struct ProbParm : ProbParmDefaults {
   amrex::Real z_tr = 12000.0;
@@ -38,7 +38,7 @@ class Problem : public ProblemBase
 public:
     Problem();
 
-#include "Prob/init_density_hse_dry.H"
+#include "Prob/ERF_init_density_hse_dry.H"
 
     void init_custom_pert (
         const amrex::Box&  bx,
diff --git a/Exec/SuperCell_3D/prob.cpp b/Exec/SuperCell_3D/ERF_prob.cpp
similarity index 99%
rename from Exec/SuperCell_3D/prob.cpp
rename to Exec/SuperCell_3D/ERF_prob.cpp
index 8899bc6f9..43fd1a81d 100644
--- a/Exec/SuperCell_3D/prob.cpp
+++ b/Exec/SuperCell_3D/ERF_prob.cpp
@@ -1,4 +1,4 @@
-#include "prob.H"
+#include "ERF_prob.H"
 #include <ERF_Constants.H>
 
 using namespace amrex;
diff --git a/Exec/SuperCell_3D/Make.package b/Exec/SuperCell_3D/Make.package
index aeacb72f0..5fc21f61c 100644
--- a/Exec/SuperCell_3D/Make.package
+++ b/Exec/SuperCell_3D/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += prob.H
-CEXE_sources += prob.cpp
+CEXE_headers += ERF_prob.H
+CEXE_sources += ERF_prob.cpp
diff --git a/Source/Advection/Advection.H b/Source/Advection/ERF_Advection.H
similarity index 98%
rename from Source/Advection/Advection.H
rename to Source/Advection/ERF_Advection.H
index c425b2baa..d780b7238 100644
--- a/Source/Advection/Advection.H
+++ b/Source/Advection/ERF_Advection.H
@@ -1,13 +1,13 @@
-#ifndef _ADVECTION_H_
-#define _ADVECTION_H_
+#ifndef ERF_ADVECTION_H_
+#define ERF_ADVECTION_H_
 
 #include <AMReX.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_BCRec.H>
 #include <AMReX_YAFluxRegister.H>
-#include <DataStruct.H>
-#include <IndexDefines.H>
-#include <ABLMost.H>
+#include <ERF_DataStruct.H>
+#include <ERF_IndexDefines.H>
+#include <ERF_ABLMost.H>
 
 
 /** Compute advection tendency for density and potential temperature */
diff --git a/Source/Advection/AdvectionSrcForMom.cpp b/Source/Advection/ERF_AdvectionSrcForMom.cpp
similarity index 99%
rename from Source/Advection/AdvectionSrcForMom.cpp
rename to Source/Advection/ERF_AdvectionSrcForMom.cpp
index 39589d4db..82279759f 100644
--- a/Source/Advection/AdvectionSrcForMom.cpp
+++ b/Source/Advection/ERF_AdvectionSrcForMom.cpp
@@ -1,8 +1,8 @@
 #include "AMReX_BCRec.H"
 
-#include <Advection.H>
-#include <AdvectionSrcForMom_N.H>
-#include <AdvectionSrcForMom_T.H>
+#include <ERF_Advection.H>
+#include <ERF_AdvectionSrcForMom_N.H>
+#include <ERF_AdvectionSrcForMom_T.H>
 
 using namespace amrex;
 
diff --git a/Source/Advection/AdvectionSrcForMom_N.H b/Source/Advection/ERF_AdvectionSrcForMom_N.H
similarity index 99%
rename from Source/Advection/AdvectionSrcForMom_N.H
rename to Source/Advection/ERF_AdvectionSrcForMom_N.H
index e188e6d28..c4056f394 100644
--- a/Source/Advection/AdvectionSrcForMom_N.H
+++ b/Source/Advection/ERF_AdvectionSrcForMom_N.H
@@ -1,5 +1,5 @@
-#include <IndexDefines.H>
-#include <Interpolation.H>
+#include <ERF_IndexDefines.H>
+#include <ERF_Interpolation.H>
 
 /**
  * Function for computing the advective tendency for the x-component of momentum
diff --git a/Source/Advection/AdvectionSrcForMom_T.H b/Source/Advection/ERF_AdvectionSrcForMom_T.H
similarity index 99%
rename from Source/Advection/AdvectionSrcForMom_T.H
rename to Source/Advection/ERF_AdvectionSrcForMom_T.H
index 1ebd2efef..e36f1aa8c 100644
--- a/Source/Advection/AdvectionSrcForMom_T.H
+++ b/Source/Advection/ERF_AdvectionSrcForMom_T.H
@@ -1,6 +1,6 @@
-#include <IndexDefines.H>
-#include <TerrainMetrics.H>
-#include <Interpolation.H>
+#include <ERF_IndexDefines.H>
+#include <ERF_TerrainMetrics.H>
+#include <ERF_Interpolation.H>
 
 /**
  * Function for computing the advective tendency for the x-component of momentum
diff --git a/Source/Advection/AdvectionSrcForOpenBC.cpp b/Source/Advection/ERF_AdvectionSrcForOpenBC.cpp
similarity index 99%
rename from Source/Advection/AdvectionSrcForOpenBC.cpp
rename to Source/Advection/ERF_AdvectionSrcForOpenBC.cpp
index fc7b5a442..790289fc2 100644
--- a/Source/Advection/AdvectionSrcForOpenBC.cpp
+++ b/Source/Advection/ERF_AdvectionSrcForOpenBC.cpp
@@ -1,4 +1,4 @@
-#include <Advection.H>
+#include <ERF_Advection.H>
 
 using namespace amrex;
 
diff --git a/Source/Advection/AdvectionSrcForScalars.H b/Source/Advection/ERF_AdvectionSrcForScalars.H
similarity index 98%
rename from Source/Advection/AdvectionSrcForScalars.H
rename to Source/Advection/ERF_AdvectionSrcForScalars.H
index 503872a89..fea4fd58b 100644
--- a/Source/Advection/AdvectionSrcForScalars.H
+++ b/Source/Advection/ERF_AdvectionSrcForScalars.H
@@ -1,5 +1,5 @@
-#include <IndexDefines.H>
-#include <Interpolation.H>
+#include <ERF_IndexDefines.H>
+#include <ERF_Interpolation.H>
 
 /**
  * Wrapper function for computing the advective tendency w/ spatial order > 2.
diff --git a/Source/Advection/AdvectionSrcForState.cpp b/Source/Advection/ERF_AdvectionSrcForState.cpp
similarity index 99%
rename from Source/Advection/AdvectionSrcForState.cpp
rename to Source/Advection/ERF_AdvectionSrcForState.cpp
index f9fbc1fe7..74b4f238c 100644
--- a/Source/Advection/AdvectionSrcForState.cpp
+++ b/Source/Advection/ERF_AdvectionSrcForState.cpp
@@ -1,7 +1,7 @@
-#include <IndexDefines.H>
-#include <TerrainMetrics.H>
-#include <Advection.H>
-#include <AdvectionSrcForScalars.H>
+#include <ERF_IndexDefines.H>
+#include <ERF_TerrainMetrics.H>
+#include <ERF_Advection.H>
+#include <ERF_AdvectionSrcForScalars.H>
 
 using namespace amrex;
 
diff --git a/Source/Advection/Make.package b/Source/Advection/Make.package
index 3093a4de8..cfde03d07 100644
--- a/Source/Advection/Make.package
+++ b/Source/Advection/Make.package
@@ -1,9 +1,9 @@
-CEXE_sources += AdvectionSrcForMom.cpp
-CEXE_sources += AdvectionSrcForState.cpp
-CEXE_sources += AdvectionSrcForOpenBC.cpp
+CEXE_sources += ERF_AdvectionSrcForMom.cpp
+CEXE_sources += ERF_AdvectionSrcForState.cpp
+CEXE_sources += ERF_AdvectionSrcForOpenBC.cpp
 
-CEXE_headers += Advection.H
-CEXE_headers += AdvectionSrcForMom_N.H
-CEXE_headers += AdvectionSrcForMom_T.H
-CEXE_headers += AdvectionSrcForScalars.H
-CEXE_headers += Interpolation.H
+CEXE_headers += ERF_Advection.H
+CEXE_headers += ERF_AdvectionSrcForMom_N.H
+CEXE_headers += ERF_AdvectionSrcForMom_T.H
+CEXE_headers += ERF_AdvectionSrcForScalars.H
+CEXE_headers += ERF_Interpolation.H
diff --git a/Source/BoundaryConditions/ABLMost.H b/Source/BoundaryConditions/ERF_ABLMost.H
similarity index 99%
rename from Source/BoundaryConditions/ABLMost.H
rename to Source/BoundaryConditions/ERF_ABLMost.H
index 40aed0ae5..e821f2e46 100644
--- a/Source/BoundaryConditions/ABLMost.H
+++ b/Source/BoundaryConditions/ERF_ABLMost.H
@@ -1,5 +1,5 @@
-#ifndef ABLMOST_H
-#define ABLMOST_H
+#ifndef ERF_ABLMOST_H
+#define ERF_ABLMOST_H
 
 #include <AMReX_Geometry.H>
 #include <AMReX_ParmParse.H>
@@ -8,12 +8,12 @@
 #include <AMReX_iMultiFab.H>
 #include <AMReX_Interpolater.H>
 
-#include <IndexDefines.H>
+#include <ERF_IndexDefines.H>
 #include <ERF_Constants.H>
-#include <MOSTAverage.H>
-#include <MOSTStress.H>
-#include <TerrainMetrics.H>
-#include <PBLHeight.H>
+#include <ERF_MOSTAverage.H>
+#include <ERF_MOSTStress.H>
+#include <ERF_TerrainMetrics.H>
+#include <ERF_PBLHeight.H>
 
 /** Monin-Obukhov surface layer profile
  *
diff --git a/Source/BoundaryConditions/ABLMost.cpp b/Source/BoundaryConditions/ERF_ABLMost.cpp
similarity index 99%
rename from Source/BoundaryConditions/ABLMost.cpp
rename to Source/BoundaryConditions/ERF_ABLMost.cpp
index 61f3a7c92..f95ba33d4 100644
--- a/Source/BoundaryConditions/ABLMost.cpp
+++ b/Source/BoundaryConditions/ERF_ABLMost.cpp
@@ -1,4 +1,4 @@
-#include <ABLMost.H>
+#include <ERF_ABLMost.H>
 
 using namespace amrex;
 
diff --git a/Source/BoundaryConditions/BoundaryConditions_bndryreg.cpp b/Source/BoundaryConditions/ERF_BoundaryConditions_bndryreg.cpp
similarity index 100%
rename from Source/BoundaryConditions/BoundaryConditions_bndryreg.cpp
rename to Source/BoundaryConditions/ERF_BoundaryConditions_bndryreg.cpp
diff --git a/Source/BoundaryConditions/BoundaryConditions_cons.cpp b/Source/BoundaryConditions/ERF_BoundaryConditions_cons.cpp
similarity index 100%
rename from Source/BoundaryConditions/BoundaryConditions_cons.cpp
rename to Source/BoundaryConditions/ERF_BoundaryConditions_cons.cpp
diff --git a/Source/BoundaryConditions/BoundaryConditions_realbdy.cpp b/Source/BoundaryConditions/ERF_BoundaryConditions_realbdy.cpp
similarity index 99%
rename from Source/BoundaryConditions/BoundaryConditions_realbdy.cpp
rename to Source/BoundaryConditions/ERF_BoundaryConditions_realbdy.cpp
index b548bda72..111d81739 100644
--- a/Source/BoundaryConditions/BoundaryConditions_realbdy.cpp
+++ b/Source/BoundaryConditions/ERF_BoundaryConditions_realbdy.cpp
@@ -1,5 +1,5 @@
 #include "ERF.H"
-#include "Utils.H"
+#include "ERF_Utils.H"
 
 using namespace amrex;
 
diff --git a/Source/BoundaryConditions/BoundaryConditions_xvel.cpp b/Source/BoundaryConditions/ERF_BoundaryConditions_xvel.cpp
similarity index 99%
rename from Source/BoundaryConditions/BoundaryConditions_xvel.cpp
rename to Source/BoundaryConditions/ERF_BoundaryConditions_xvel.cpp
index a42da9d39..1b82f7dc5 100644
--- a/Source/BoundaryConditions/BoundaryConditions_xvel.cpp
+++ b/Source/BoundaryConditions/ERF_BoundaryConditions_xvel.cpp
@@ -1,7 +1,7 @@
 #include "AMReX_PhysBCFunct.H"
 #include <ERF_PhysBCFunct.H>
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 
 using namespace amrex;
 
diff --git a/Source/BoundaryConditions/BoundaryConditions_yvel.cpp b/Source/BoundaryConditions/ERF_BoundaryConditions_yvel.cpp
similarity index 100%
rename from Source/BoundaryConditions/BoundaryConditions_yvel.cpp
rename to Source/BoundaryConditions/ERF_BoundaryConditions_yvel.cpp
diff --git a/Source/BoundaryConditions/BoundaryConditions_zvel.cpp b/Source/BoundaryConditions/ERF_BoundaryConditions_zvel.cpp
similarity index 99%
rename from Source/BoundaryConditions/BoundaryConditions_zvel.cpp
rename to Source/BoundaryConditions/ERF_BoundaryConditions_zvel.cpp
index 935177505..24d027ebd 100644
--- a/Source/BoundaryConditions/BoundaryConditions_zvel.cpp
+++ b/Source/BoundaryConditions/ERF_BoundaryConditions_zvel.cpp
@@ -1,6 +1,6 @@
 #include "AMReX_PhysBCFunct.H"
 #include <ERF_PhysBCFunct.H>
-#include <prob_common.H>
+#include <ERF_prob_common.H>
 
 using namespace amrex;
 
diff --git a/Source/BoundaryConditions/ERF_FillPatch.cpp b/Source/BoundaryConditions/ERF_FillPatch.cpp
index 6574e07b5..364d9bd22 100644
--- a/Source/BoundaryConditions/ERF_FillPatch.cpp
+++ b/Source/BoundaryConditions/ERF_FillPatch.cpp
@@ -1,9 +1,9 @@
 #include <ERF.H>
 #include <ERF_PhysBCFunct.H>
-#include <IndexDefines.H>
-#include <TimeInterpolatedData.H>
+#include <ERF_IndexDefines.H>
+#include <ERF_TimeInterpolatedData.H>
 #include <ERF_FillPatcher.H>
-#include <Utils.H>
+#include <ERF_Utils.H>
 
 using namespace amrex;
 
diff --git a/Source/BoundaryConditions/MOSTAverage.H b/Source/BoundaryConditions/ERF_MOSTAverage.H
similarity index 98%
rename from Source/BoundaryConditions/MOSTAverage.H
rename to Source/BoundaryConditions/ERF_MOSTAverage.H
index 6b8f534e2..9317f8e16 100644
--- a/Source/BoundaryConditions/MOSTAverage.H
+++ b/Source/BoundaryConditions/ERF_MOSTAverage.H
@@ -1,13 +1,13 @@
-#ifndef MOSTAverage_H
-#define MOSTAverage_H
+#ifndef ERF_MOSTAverage_H
+#define ERF_MOSTAverage_H
 
 #include <AMReX_Gpu.H>
 #include <AMReX_FArrayBox.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_iMultiFab.H>
 #include <AMReX_ParmParse.H>
-#include <IndexDefines.H>
-#include <TerrainMetrics.H>
+#include <ERF_IndexDefines.H>
+#include <ERF_TerrainMetrics.H>
 
 class MOSTAverage {
 public:
diff --git a/Source/BoundaryConditions/MOSTAverage.cpp b/Source/BoundaryConditions/ERF_MOSTAverage.cpp
similarity index 99%
rename from Source/BoundaryConditions/MOSTAverage.cpp
rename to Source/BoundaryConditions/ERF_MOSTAverage.cpp
index 60b8b9d37..ba5d051ba 100644
--- a/Source/BoundaryConditions/MOSTAverage.cpp
+++ b/Source/BoundaryConditions/ERF_MOSTAverage.cpp
@@ -1,6 +1,6 @@
-#include <MOSTAverage.H>
+#include <ERF_MOSTAverage.H>
 #include <utility>
-#include <TileNoZ.H>
+#include <ERF_TileNoZ.H>
 
 using namespace amrex;
 
diff --git a/Source/BoundaryConditions/MOSTRoughness.H b/Source/BoundaryConditions/ERF_MOSTRoughness.H
similarity index 100%
rename from Source/BoundaryConditions/MOSTRoughness.H
rename to Source/BoundaryConditions/ERF_MOSTRoughness.H
diff --git a/Source/BoundaryConditions/MOSTStress.H b/Source/BoundaryConditions/ERF_MOSTStress.H
similarity index 99%
rename from Source/BoundaryConditions/MOSTStress.H
rename to Source/BoundaryConditions/ERF_MOSTStress.H
index 01b76addb..1f6c3028e 100644
--- a/Source/BoundaryConditions/MOSTStress.H
+++ b/Source/BoundaryConditions/ERF_MOSTStress.H
@@ -1,10 +1,10 @@
-#ifndef MOSTStress_H
-#define MOSTStress_H
+#ifndef ERF_MOSTStress_H
+#define ERF_MOSTStress_H
 
 #include <ERF_Constants.H>
-#include <IndexDefines.H>
-#include <MOSTRoughness.H>
-#include <Wstar.H>
+#include <ERF_IndexDefines.H>
+#include <ERF_MOSTRoughness.H>
+#include <ERF_Wstar.H>
 
 /**
  * Structure of plain old data relevant to MOST BCs
diff --git a/Source/BoundaryConditions/ERF_PhysBCFunct.H b/Source/BoundaryConditions/ERF_PhysBCFunct.H
index b11ac0373..6787887d0 100644
--- a/Source/BoundaryConditions/ERF_PhysBCFunct.H
+++ b/Source/BoundaryConditions/ERF_PhysBCFunct.H
@@ -14,11 +14,11 @@
 #include "AMReX_Orientation.H"
 
 #include <ERF_ReadBndryPlanes.H>
-#include <TimeInterpolatedData.H>
-#include <IndexDefines.H>
-#include <DataStruct.H>
-#include <EddyViscosity.H>
-#include <TerrainMetrics.H>
+#include <ERF_TimeInterpolatedData.H>
+#include <ERF_IndexDefines.H>
+#include <ERF_DataStruct.H>
+#include <ERF_EddyViscosity.H>
+#include <ERF_TerrainMetrics.H>
 
 class ERFPhysBCFunct_cons
 {
diff --git a/Source/BoundaryConditions/ERF_PhysBCFunct.cpp b/Source/BoundaryConditions/ERF_PhysBCFunct.cpp
index 7e2509caa..c791b4ae9 100644
--- a/Source/BoundaryConditions/ERF_PhysBCFunct.cpp
+++ b/Source/BoundaryConditions/ERF_PhysBCFunct.cpp
@@ -1,5 +1,5 @@
 #include "AMReX_PhysBCFunct.H"
-#include "IndexDefines.H"
+#include "ERF_IndexDefines.H"
 #include <ERF_PhysBCFunct.H>
 
 using namespace amrex;
diff --git a/Source/BoundaryConditions/TimeInterpolatedData.H b/Source/BoundaryConditions/ERF_TimeInterpolatedData.H
similarity index 100%
rename from Source/BoundaryConditions/TimeInterpolatedData.H
rename to Source/BoundaryConditions/ERF_TimeInterpolatedData.H
diff --git a/Source/BoundaryConditions/Make.package b/Source/BoundaryConditions/Make.package
index 41886ad34..4ab53b8d9 100644
--- a/Source/BoundaryConditions/Make.package
+++ b/Source/BoundaryConditions/Make.package
@@ -1,12 +1,12 @@
-CEXE_sources += BoundaryConditions_xvel.cpp
-CEXE_sources += BoundaryConditions_yvel.cpp
-CEXE_sources += BoundaryConditions_zvel.cpp
-CEXE_sources += BoundaryConditions_cons.cpp
-CEXE_sources += BoundaryConditions_bndryreg.cpp
-CEXE_sources += BoundaryConditions_realbdy.cpp
+CEXE_sources += ERF_BoundaryConditions_xvel.cpp
+CEXE_sources += ERF_BoundaryConditions_yvel.cpp
+CEXE_sources += ERF_BoundaryConditions_zvel.cpp
+CEXE_sources += ERF_BoundaryConditions_cons.cpp
+CEXE_sources += ERF_BoundaryConditions_bndryreg.cpp
+CEXE_sources += ERF_BoundaryConditions_realbdy.cpp
 
-CEXE_headers += ABLMost.H
-CEXE_sources += ABLMost.cpp
+CEXE_headers += ERF_ABLMost.H
+CEXE_sources += ERF_ABLMost.cpp
 
 CEXE_sources += ERF_FillPatch.cpp
 CEXE_sources += ERF_FillPatcher.cpp
@@ -15,9 +15,9 @@ CEXE_sources += ERF_PhysBCFunct.cpp
 CEXE_headers += ERF_PhysBCFunct.H
 CEXE_headers += ERF_FillPatcher.H
 
-CEXE_headers += TimeInterpolatedData.H
+CEXE_headers += ERF_TimeInterpolatedData.H
 
-CEXE_headers += MOSTAverage.H
-CEXE_sources += MOSTAverage.cpp
+CEXE_headers += ERF_MOSTAverage.H
+CEXE_sources += ERF_MOSTAverage.cpp
 
-CEXE_headers += MOSTStress.H
+CEXE_headers += ERF_MOSTStress.H
diff --git a/Source/DataStructs/AdvStruct.H b/Source/DataStructs/ERF_AdvStruct.H
similarity index 99%
rename from Source/DataStructs/AdvStruct.H
rename to Source/DataStructs/ERF_AdvStruct.H
index 4c9b2acb1..604bf1994 100644
--- a/Source/DataStructs/AdvStruct.H
+++ b/Source/DataStructs/ERF_AdvStruct.H
@@ -1,5 +1,5 @@
-#ifndef _ADV_STRUCT_H_
-#define _ADV_STRUCT_H_
+#ifndef ERF_ADV_STRUCT_H_
+#define ERF_ADV_STRUCT_H_
 
 #include <string>
 #include <iostream>
@@ -10,7 +10,7 @@
 #include <AMReX_Geometry.H>
 
 #include <ERF_Constants.H>
-#include <IndexDefines.H>
+#include <ERF_IndexDefines.H>
 
 /**
  * Container holding the advection-related choices
diff --git a/Source/DataStructs/DataStruct.H b/Source/DataStructs/ERF_DataStruct.H
similarity index 99%
rename from Source/DataStructs/DataStruct.H
rename to Source/DataStructs/ERF_DataStruct.H
index f478e604b..36f772a5c 100644
--- a/Source/DataStructs/DataStruct.H
+++ b/Source/DataStructs/ERF_DataStruct.H
@@ -1,5 +1,5 @@
-#ifndef _DATA_STRUCT_H_
-#define _DATA_STRUCT_H_
+#ifndef ERF_DATA_STRUCT_H_
+#define ERF_DATA_STRUCT_H_
 
 #include <string>
 #include <iostream>
@@ -10,12 +10,12 @@
 #include <AMReX_Geometry.H>
 
 #include <ERF_Constants.H>
-#include <IndexDefines.H>
-#include <AdvStruct.H>
-#include <DiffStruct.H>
-#include <SpongeStruct.H>
-#include <TurbStruct.H>
-#include <TurbPertStruct.H>
+#include <ERF_IndexDefines.H>
+#include <ERF_AdvStruct.H>
+#include <ERF_DiffStruct.H>
+#include <ERF_SpongeStruct.H>
+#include <ERF_TurbStruct.H>
+#include <ERF_TurbPertStruct.H>
 
 enum struct ABLDriverType {
     None, PressureGradient, GeostrophicWind
diff --git a/Source/DataStructs/DiffStruct.H b/Source/DataStructs/ERF_DiffStruct.H
similarity index 98%
rename from Source/DataStructs/DiffStruct.H
rename to Source/DataStructs/ERF_DiffStruct.H
index 25d9ddb89..66a1ae715 100644
--- a/Source/DataStructs/DiffStruct.H
+++ b/Source/DataStructs/ERF_DiffStruct.H
@@ -1,5 +1,5 @@
-#ifndef _DIFF_STRUCT_H_
-#define _DIFF_STRUCT_H_
+#ifndef ERF_DIFF_STRUCT_H_
+#define ERF_DIFF_STRUCT_H_
 
 #include <string>
 #include <iostream>
diff --git a/Source/DataStructs/InputSoundingData.H b/Source/DataStructs/ERF_InputSoundingData.H
similarity index 99%
rename from Source/DataStructs/InputSoundingData.H
rename to Source/DataStructs/ERF_InputSoundingData.H
index 8a2992164..50d9fe7bf 100644
--- a/Source/DataStructs/InputSoundingData.H
+++ b/Source/DataStructs/ERF_InputSoundingData.H
@@ -1,5 +1,5 @@
-#ifndef _INPUT_SOUNDING_DATA_H_
-#define _INPUT_SOUNDING_DATA_H_
+#ifndef ERF_INPUT_SOUNDING_DATA_H_
+#define ERF_INPUT_SOUNDING_DATA_H_
 
 #include <string>
 #include <iostream>
@@ -9,9 +9,9 @@
 #include <AMReX_Gpu.H>
 #include <AMReX_Geometry.H>
 
-#include <EOS.H>
+#include <ERF_EOS.H>
 #include <ERF_Constants.H>
-#include <Interpolation_1D.H>
+#include <ERF_Interpolation_1D.H>
 
 /**
  * Data structure storing input sounding data. Also
diff --git a/Source/DataStructs/InputSpongeData.H b/Source/DataStructs/ERF_InputSpongeData.H
similarity index 97%
rename from Source/DataStructs/InputSpongeData.H
rename to Source/DataStructs/ERF_InputSpongeData.H
index cd9fa9285..ce3a4b5b1 100644
--- a/Source/DataStructs/InputSpongeData.H
+++ b/Source/DataStructs/ERF_InputSpongeData.H
@@ -1,5 +1,5 @@
-#ifndef _INPUT_SPONGE_DATA_H_
-#define _INPUT_SPONGE_DATA_H_
+#ifndef ERF_INPUT_SPONGE_DATA_H_
+#define ERF_INPUT_SPONGE_DATA_H_
 
 #include <string>
 #include <iostream>
@@ -10,7 +10,7 @@
 #include <AMReX_Geometry.H>
 
 #include <ERF_Constants.H>
-#include <Interpolation_1D.H>
+#include <ERF_Interpolation_1D.H>
 
 /**
  * Data structure storing input sponge data. Also
diff --git a/Source/DataStructs/SpongeStruct.H b/Source/DataStructs/ERF_SpongeStruct.H
similarity index 97%
rename from Source/DataStructs/SpongeStruct.H
rename to Source/DataStructs/ERF_SpongeStruct.H
index 8f8615d8e..764eb07e3 100644
--- a/Source/DataStructs/SpongeStruct.H
+++ b/Source/DataStructs/ERF_SpongeStruct.H
@@ -1,5 +1,5 @@
-#ifndef _SPONGE_STRUCT_H_
-#define _SPONGE_STRUCT_H_
+#ifndef ERF_SPONGE_STRUCT_H_
+#define ERF_SPONGE_STRUCT_H_
 
 #include <string>
 #include <iostream>
diff --git a/Source/DataStructs/TurbPertStruct.H b/Source/DataStructs/ERF_TurbPertStruct.H
similarity index 99%
rename from Source/DataStructs/TurbPertStruct.H
rename to Source/DataStructs/ERF_TurbPertStruct.H
index 8e6bdf4cf..48180046b 100644
--- a/Source/DataStructs/TurbPertStruct.H
+++ b/Source/DataStructs/ERF_TurbPertStruct.H
@@ -1,9 +1,9 @@
-#ifndef _TURB_PERT_STRUCT_H_
-#define _TURB_PERT_STRUCT_H_
+#ifndef ERF_TURB_PERT_STRUCT_H_
+#define ERF_TURB_PERT_STRUCT_H_
 
-#include <DataStruct.H>
+#include <ERF_DataStruct.H>
 #include <AMReX_MultiFabUtil.H>
-#include <TileNoZ.H>
+#include <ERF_TileNoZ.H>
 #include <time.h>
 /**
  * Container holding quantities related to turbulent perturbation parameters
diff --git a/Source/DataStructs/TurbStruct.H b/Source/DataStructs/ERF_TurbStruct.H
similarity index 99%
rename from Source/DataStructs/TurbStruct.H
rename to Source/DataStructs/ERF_TurbStruct.H
index 0de7526a0..25eef0d32 100644
--- a/Source/DataStructs/TurbStruct.H
+++ b/Source/DataStructs/ERF_TurbStruct.H
@@ -1,7 +1,7 @@
-#ifndef _TURB_STRUCT_H_
-#define _TURB_STRUCT_H_
+#ifndef ERF_TURB_STRUCT_H_
+#define ERF_TURB_STRUCT_H_
 
-#include <MYNNStruct.H>
+#include <ERF_MYNNStruct.H>
 
 AMREX_ENUM(LESType, None, Smagorinsky, Deardorff);
 
diff --git a/Source/DataStructs/Make.package b/Source/DataStructs/Make.package
index 621730239..969039a21 100644
--- a/Source/DataStructs/Make.package
+++ b/Source/DataStructs/Make.package
@@ -1,8 +1,8 @@
-CEXE_headers += DataStruct.H
-CEXE_headers += DiffStruct.H
-CEXE_headers += AdvStruct.H
-CEXE_headers += InputSoundingData.H
-CEXE_headers += InputSpongeData.H
-CEXE_headers += SpongeStruct.H
-CEXE_headers += TurbStruct.H
-CEXE_headers += TurbPertStruct.H
+CEXE_headers += ERF_DataStruct.H
+CEXE_headers += ERF_DiffStruct.H
+CEXE_headers += ERF_AdvStruct.H
+CEXE_headers += ERF_InputSoundingData.H
+CEXE_headers += ERF_InputSpongeData.H
+CEXE_headers += ERF_SpongeStruct.H
+CEXE_headers += ERF_TurbStruct.H
+CEXE_headers += ERF_TurbPertStruct.H
diff --git a/Source/Diffusion/ComputeStrain_N.cpp b/Source/Diffusion/ERF_ComputeStrain_N.cpp
similarity index 99%
rename from Source/Diffusion/ComputeStrain_N.cpp
rename to Source/Diffusion/ERF_ComputeStrain_N.cpp
index 6bad2ae75..996851723 100644
--- a/Source/Diffusion/ComputeStrain_N.cpp
+++ b/Source/Diffusion/ERF_ComputeStrain_N.cpp
@@ -1,4 +1,4 @@
-#include <Diffusion.H>
+#include <ERF_Diffusion.H>
 
 using namespace amrex;
 
diff --git a/Source/Diffusion/ComputeStrain_T.cpp b/Source/Diffusion/ERF_ComputeStrain_T.cpp
similarity index 99%
rename from Source/Diffusion/ComputeStrain_T.cpp
rename to Source/Diffusion/ERF_ComputeStrain_T.cpp
index 5304e01de..450d4317d 100644
--- a/Source/Diffusion/ComputeStrain_T.cpp
+++ b/Source/Diffusion/ERF_ComputeStrain_T.cpp
@@ -1,5 +1,5 @@
-#include <Diffusion.H>
-#include <TerrainMetrics.H>
+#include <ERF_Diffusion.H>
+#include <ERF_TerrainMetrics.H>
 
 using namespace amrex;
 
diff --git a/Source/Diffusion/ComputeStress_N.cpp b/Source/Diffusion/ERF_ComputeStress_N.cpp
similarity index 99%
rename from Source/Diffusion/ComputeStress_N.cpp
rename to Source/Diffusion/ERF_ComputeStress_N.cpp
index 4a2131ea3..1eef5b552 100644
--- a/Source/Diffusion/ComputeStress_N.cpp
+++ b/Source/Diffusion/ERF_ComputeStress_N.cpp
@@ -1,4 +1,4 @@
-#include <Diffusion.H>
+#include <ERF_Diffusion.H>
 
 using namespace amrex;
 
diff --git a/Source/Diffusion/ComputeStress_T.cpp b/Source/Diffusion/ERF_ComputeStress_T.cpp
similarity index 99%
rename from Source/Diffusion/ComputeStress_T.cpp
rename to Source/Diffusion/ERF_ComputeStress_T.cpp
index 265bf7ca9..391cc47f8 100644
--- a/Source/Diffusion/ComputeStress_T.cpp
+++ b/Source/Diffusion/ERF_ComputeStress_T.cpp
@@ -1,5 +1,5 @@
-#include <Diffusion.H>
-#include <TerrainMetrics.H>
+#include <ERF_Diffusion.H>
+#include <ERF_TerrainMetrics.H>
 
 using namespace amrex;
 
diff --git a/Source/Diffusion/ComputeTurbulentViscosity.cpp b/Source/Diffusion/ERF_ComputeTurbulentViscosity.cpp
similarity index 99%
rename from Source/Diffusion/ComputeTurbulentViscosity.cpp
rename to Source/Diffusion/ERF_ComputeTurbulentViscosity.cpp
index 710f2673a..5e9bc6e5c 100644
--- a/Source/Diffusion/ComputeTurbulentViscosity.cpp
+++ b/Source/Diffusion/ERF_ComputeTurbulentViscosity.cpp
@@ -1,11 +1,11 @@
-/** \file ComputeTurbulentViscosity.cpp */
-
-#include <ABLMost.H>
-#include <EddyViscosity.H>
-#include <Diffusion.H>
-#include <PBLModels.H>
-#include <TileNoZ.H>
-#include <TerrainMetrics.H>
+/** \file ERF_ComputeTurbulentViscosity.cpp */
+
+#include <ERF_ABLMost.H>
+#include <ERF_EddyViscosity.H>
+#include <ERF_Diffusion.H>
+#include <ERF_PBLModels.H>
+#include <ERF_TileNoZ.H>
+#include <ERF_TerrainMetrics.H>
 
 using namespace amrex;
 
diff --git a/Source/Diffusion/Diffusion.H b/Source/Diffusion/ERF_Diffusion.H
similarity index 98%
rename from Source/Diffusion/Diffusion.H
rename to Source/Diffusion/ERF_Diffusion.H
index 7a00db15d..e316194d0 100644
--- a/Source/Diffusion/Diffusion.H
+++ b/Source/Diffusion/ERF_Diffusion.H
@@ -1,12 +1,12 @@
-#ifndef _DIFFUSION_H_
-#define _DIFFUSION_H_
+#ifndef ERF_DIFFUSION_H_
+#define ERF_DIFFUSION_H_
 
 #include <AMReX.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_BCRec.H>
-#include <DataStruct.H>
-#include <IndexDefines.H>
-#include <ABLMost.H>
+#include <ERF_DataStruct.H>
+#include <ERF_IndexDefines.H>
+#include <ERF_ABLMost.H>
 
 void DiffusionSrcForMom_N (const amrex::Box& bxx, const amrex::Box& bxy, const amrex::Box& bxz,
                            const amrex::Array4<      amrex::Real>& rho_u_rhs,
diff --git a/Source/Diffusion/DiffusionSrcForMom_N.cpp b/Source/Diffusion/ERF_DiffusionSrcForMom_N.cpp
similarity index 98%
rename from Source/Diffusion/DiffusionSrcForMom_N.cpp
rename to Source/Diffusion/ERF_DiffusionSrcForMom_N.cpp
index a5ece6dfa..94eca6cd1 100644
--- a/Source/Diffusion/DiffusionSrcForMom_N.cpp
+++ b/Source/Diffusion/ERF_DiffusionSrcForMom_N.cpp
@@ -1,6 +1,6 @@
 #include <AMReX.H>
-#include <Diffusion.H>
-#include <IndexDefines.H>
+#include <ERF_Diffusion.H>
+#include <ERF_IndexDefines.H>
 
 using namespace amrex;
 
diff --git a/Source/Diffusion/DiffusionSrcForMom_T.cpp b/Source/Diffusion/ERF_DiffusionSrcForMom_T.cpp
similarity index 98%
rename from Source/Diffusion/DiffusionSrcForMom_T.cpp
rename to Source/Diffusion/ERF_DiffusionSrcForMom_T.cpp
index 463b74c72..573b48c42 100644
--- a/Source/Diffusion/DiffusionSrcForMom_T.cpp
+++ b/Source/Diffusion/ERF_DiffusionSrcForMom_T.cpp
@@ -1,6 +1,6 @@
 #include <AMReX.H>
-#include <Diffusion.H>
-#include <IndexDefines.H>
+#include <ERF_Diffusion.H>
+#include <ERF_IndexDefines.H>
 
 using namespace amrex;
 
diff --git a/Source/Diffusion/DiffusionSrcForState_N.cpp b/Source/Diffusion/ERF_DiffusionSrcForState_N.cpp
similarity index 99%
rename from Source/Diffusion/DiffusionSrcForState_N.cpp
rename to Source/Diffusion/ERF_DiffusionSrcForState_N.cpp
index aa13818f4..d0fa0a17f 100644
--- a/Source/Diffusion/DiffusionSrcForState_N.cpp
+++ b/Source/Diffusion/ERF_DiffusionSrcForState_N.cpp
@@ -1,6 +1,6 @@
-#include <Diffusion.H>
-#include <EddyViscosity.H>
-#include <PBLModels.H>
+#include <ERF_Diffusion.H>
+#include <ERF_EddyViscosity.H>
+#include <ERF_PBLModels.H>
 
 using namespace amrex;
 
diff --git a/Source/Diffusion/DiffusionSrcForState_T.cpp b/Source/Diffusion/ERF_DiffusionSrcForState_T.cpp
similarity index 99%
rename from Source/Diffusion/DiffusionSrcForState_T.cpp
rename to Source/Diffusion/ERF_DiffusionSrcForState_T.cpp
index 1c0eae48a..2f30c2a04 100644
--- a/Source/Diffusion/DiffusionSrcForState_T.cpp
+++ b/Source/Diffusion/ERF_DiffusionSrcForState_T.cpp
@@ -1,7 +1,7 @@
-#include <Diffusion.H>
-#include <EddyViscosity.H>
-#include <TerrainMetrics.H>
-#include <PBLModels.H>
+#include <ERF_Diffusion.H>
+#include <ERF_EddyViscosity.H>
+#include <ERF_TerrainMetrics.H>
+#include <ERF_PBLModels.H>
 
 using namespace amrex;
 
diff --git a/Source/Diffusion/EddyViscosity.H b/Source/Diffusion/ERF_EddyViscosity.H
similarity index 96%
rename from Source/Diffusion/EddyViscosity.H
rename to Source/Diffusion/ERF_EddyViscosity.H
index e805283e0..cc47191dc 100644
--- a/Source/Diffusion/EddyViscosity.H
+++ b/Source/Diffusion/ERF_EddyViscosity.H
@@ -1,10 +1,10 @@
-/** \file EddyViscosity.H */
+/** \file ERF_EddyViscosity.H */
 
-#ifndef _EDDY_VISCOSITY_H_
-#define _EDDY_VISCOSITY_H_
+#ifndef ERF_EDDY_VISCOSITY_H_
+#define ERF_EDDY_VISCOSITY_H_
 
-#include <ABLMost.H>
-#include <DataStruct.H>
+#include <ERF_ABLMost.H>
+#include <ERF_DataStruct.H>
 #include <AMReX_BCRec.H>
 
 void
diff --git a/Source/Diffusion/Make.package b/Source/Diffusion/Make.package
index ce8ababb7..1399dcfd8 100644
--- a/Source/Diffusion/Make.package
+++ b/Source/Diffusion/Make.package
@@ -1,16 +1,16 @@
-CEXE_sources += DiffusionSrcForMom_N.cpp
-CEXE_sources += DiffusionSrcForMom_T.cpp
+CEXE_sources += ERF_DiffusionSrcForMom_N.cpp
+CEXE_sources += ERF_DiffusionSrcForMom_T.cpp
 
-CEXE_sources += DiffusionSrcForState_N.cpp
-CEXE_sources += DiffusionSrcForState_T.cpp
+CEXE_sources += ERF_DiffusionSrcForState_N.cpp
+CEXE_sources += ERF_DiffusionSrcForState_T.cpp
 
-CEXE_sources += ComputeStress_N.cpp
-CEXE_sources += ComputeStress_T.cpp
+CEXE_sources += ERF_ComputeStress_N.cpp
+CEXE_sources += ERF_ComputeStress_T.cpp
 
-CEXE_sources += ComputeStrain_N.cpp
-CEXE_sources += ComputeStrain_T.cpp
+CEXE_sources += ERF_ComputeStrain_N.cpp
+CEXE_sources += ERF_ComputeStrain_T.cpp
 
-CEXE_sources += ComputeTurbulentViscosity.cpp
+CEXE_sources += ERF_ComputeTurbulentViscosity.cpp
 
-CEXE_headers += Diffusion.H
-CEXE_headers += EddyViscosity.H
+CEXE_headers += ERF_Diffusion.H
+CEXE_headers += ERF_EddyViscosity.H
diff --git a/Source/EB/FlowerIF.H b/Source/EB/ERF_FlowerIF.H
similarity index 96%
rename from Source/EB/FlowerIF.H
rename to Source/EB/ERF_FlowerIF.H
index 688ad373f..fd36b203a 100644
--- a/Source/EB/FlowerIF.H
+++ b/Source/EB/ERF_FlowerIF.H
@@ -1,5 +1,5 @@
-#ifndef FLOWER_IF_H_
-#define FLOWER_IF_H_
+#ifndef ERF_FLOWER_IF_H_
+#define ERF_FLOWER_IF_H_
 
 #include <AMReX_Array.H>
 #include <AMReX_EB2_IF_Base.H>
diff --git a/Source/EB/TerrainIF.H b/Source/EB/ERF_TerrainIF.H
similarity index 96%
rename from Source/EB/TerrainIF.H
rename to Source/EB/ERF_TerrainIF.H
index 066a6be45..15373cb0f 100644
--- a/Source/EB/TerrainIF.H
+++ b/Source/EB/ERF_TerrainIF.H
@@ -1,5 +1,5 @@
-#ifndef TERRAIN_IF_H_
-#define TERRAIN_IF_H_
+#ifndef ERF_TERRAIN_IF_H_
+#define ERF_TERRAIN_IF_H_
 
 #include <AMReX_Array.H>
 #include <AMReX_EB2_IF_Base.H>
diff --git a/Source/EB/eb_box.cpp b/Source/EB/ERF_eb_box.cpp
similarity index 100%
rename from Source/EB/eb_box.cpp
rename to Source/EB/ERF_eb_box.cpp
diff --git a/Source/EB/eb_cylinder.cpp b/Source/EB/ERF_eb_cylinder.cpp
similarity index 100%
rename from Source/EB/eb_cylinder.cpp
rename to Source/EB/ERF_eb_cylinder.cpp
diff --git a/Source/EB/eb_if.H b/Source/EB/ERF_eb_if.H
similarity index 100%
rename from Source/EB/eb_if.H
rename to Source/EB/ERF_eb_if.H
diff --git a/Source/EB/eb_regular.cpp b/Source/EB/ERF_eb_regular.cpp
similarity index 91%
rename from Source/EB/eb_regular.cpp
rename to Source/EB/ERF_eb_regular.cpp
index bf7af3b40..be5e1fca8 100644
--- a/Source/EB/eb_regular.cpp
+++ b/Source/EB/ERF_eb_regular.cpp
@@ -1,7 +1,7 @@
 #include <AMReX_EB2.H>
 #include <AMReX_EB2_IF.H>
 
-#include <eb_if.H>
+#include <ERF_eb_if.H>
 #include <ERF.H>
 
 using namespace amrex;
diff --git a/Source/EB/initEB.cpp b/Source/EB/ERF_initEB.cpp
similarity index 96%
rename from Source/EB/initEB.cpp
rename to Source/EB/ERF_initEB.cpp
index aae2c2e44..4469f77be 100644
--- a/Source/EB/initEB.cpp
+++ b/Source/EB/ERF_initEB.cpp
@@ -3,9 +3,9 @@
 
 #include <algorithm>
 #include <ERF.H>
-#include <FlowerIF.H>
-#include <TerrainIF.H>
-#include <prob_common.H>
+#include <ERF_FlowerIF.H>
+#include <ERF_TerrainIF.H>
+#include <ERF_prob_common.H>
 
 using namespace amrex;
 
diff --git a/Source/EB/writeEBsurface.cpp b/Source/EB/ERF_writeEBsurface.cpp
similarity index 100%
rename from Source/EB/writeEBsurface.cpp
rename to Source/EB/ERF_writeEBsurface.cpp
diff --git a/Source/EB/Make.package b/Source/EB/Make.package
index ea783cd80..c4ebcec52 100644
--- a/Source/EB/Make.package
+++ b/Source/EB/Make.package
@@ -1,11 +1,11 @@
 
 CEXE_sources += main.cpp
-CEXE_sources += initEB.cpp
-CEXE_sources += eb_box.cpp
-CEXE_sources += eb_cylinder.cpp
-CEXE_sources += eb_regular.cpp
-CEXE_sources += writeEBsurface.cpp
+CEXE_sources += ERF_initEB.cpp
+CEXE_sources += ERF_eb_box.cpp
+CEXE_sources += ERF_eb_cylinder.cpp
+CEXE_sources += ERF_eb_regular.cpp
+CEXE_sources += ERF_writeEBsurface.cpp
 
-CEXE_headers += eb_if.H
-CEXE_headers += FlowerIF.H
-CEXE_headers += TerrainIF.H
+CEXE_headers += ERF_eb_if.H
+CEXE_headers += ERF_FlowerIF.H
+CEXE_headers += ERF_TerrainIF.H
diff --git a/Source/ERF.H b/Source/ERF.H
index dfffe7aee..c9d3afa04 100644
--- a/Source/ERF.H
+++ b/Source/ERF.H
@@ -26,15 +26,15 @@
 #include <AMReX_MemProfiler.H>
 #endif
 
-#include "prob_common.H"
-
-#include <IndexDefines.H>
-#include <DataStruct.H>
-#include <TurbPertStruct.H>
-#include <InputSoundingData.H>
-#include <InputSpongeData.H>
-#include <ABLMost.H>
-#include <Derive.H>
+#include "ERF_prob_common.H"
+
+#include <ERF_IndexDefines.H>
+#include <ERF_DataStruct.H>
+#include <ERF_TurbPertStruct.H>
+#include <ERF_InputSoundingData.H>
+#include <ERF_InputSpongeData.H>
+#include <ERF_ABLMost.H>
+#include <ERF_Derive.H>
 #include <ERF_ReadBndryPlanes.H>
 #include <ERF_WriteBndryPlanes.H>
 #include <ERF_MRI.H>
@@ -42,18 +42,18 @@
 #include <ERF_FillPatcher.H>
 
 #ifdef ERF_USE_PARTICLES
-#include "ParticleData.H"
+#include "ERF_ParticleData.H"
 #endif
 
-#include "EulerianMicrophysics.H"
-#include "LagrangianMicrophysics.H"
-#include "LandSurface.H"
+#include "ERF_EulerianMicrophysics.H"
+#include "ERF_LagrangianMicrophysics.H"
+#include "ERF_LandSurface.H"
 #ifdef ERF_USE_WINDFARM
-#include "WindFarm.H"
+#include "ERF_WindFarm.H"
 #endif
 
 #ifdef ERF_USE_RRTMGP
-#include "Radiation.H"
+#include "ERF_Radiation.H"
 #endif
 
 #include <iostream>
@@ -870,7 +870,7 @@ private:
                                                      "rhoQ1", "rhoQ2", "rhoQ3",
                                                      "rhoQ4", "rhoQ5", "rhoQ6"};
 
-    // Note that the order of variable names here must match the order in Derive.cpp
+    // Note that the order of variable names here must match the order in ERF_Derive.cpp
     const amrex::Vector<std::string> derived_names {"soundspeed", "temp", "theta", "KE", "QKE", "scalar",
                                                     "vorticity_x","vorticity_y","vorticity_z",
                                                     "magvel", "divU",
diff --git a/Source/ERF.cpp b/Source/ERF.cpp
index 19f13a01f..ed15458d3 100644
--- a/Source/ERF.cpp
+++ b/Source/ERF.cpp
@@ -6,17 +6,17 @@
  * Main class in ERF code, instantiated from main.cpp
 */
 
-#include <EOS.H>
+#include <ERF_EOS.H>
 #include <ERF.H>
 
 #include <AMReX_buildInfo.H>
 
-#include <Utils.H>
-#include <TerrainMetrics.H>
+#include <ERF_Utils.H>
+#include <ERF_TerrainMetrics.H>
 #include <memory>
 
 #ifdef ERF_USE_MULTIBLOCK
-#include <MultiBlockContainer.H>
+#include <ERF_MultiBlockContainer.H>
 #endif
 
 using namespace amrex;
diff --git a/Source/Derive.H b/Source/ERF_Derive.H
similarity index 98%
rename from Source/Derive.H
rename to Source/ERF_Derive.H
index ef974f73b..0090ef07b 100644
--- a/Source/Derive.H
+++ b/Source/ERF_Derive.H
@@ -1,5 +1,5 @@
-#ifndef _Derive_H_
-#define _Derive_H_
+#ifndef ERF_Derive_H_
+#define ERF_Derive_H_
 
 #include <AMReX_FArrayBox.H>
 #include <AMReX_Geometry.H>
diff --git a/Source/Derive.cpp b/Source/ERF_Derive.cpp
similarity index 99%
rename from Source/Derive.cpp
rename to Source/ERF_Derive.cpp
index 5d3ed57d9..75ff631ba 100644
--- a/Source/Derive.cpp
+++ b/Source/ERF_Derive.cpp
@@ -1,6 +1,6 @@
-#include "Derive.H"
-#include "EOS.H"
-#include "IndexDefines.H"
+#include "ERF_Derive.H"
+#include "ERF_EOS.H"
+#include "ERF_IndexDefines.H"
 
 using namespace amrex;
 
diff --git a/Source/EOS.H b/Source/ERF_EOS.H
similarity index 100%
rename from Source/EOS.H
rename to Source/ERF_EOS.H
diff --git a/Source/HSE_utils.H b/Source/ERF_HSE_utils.H
similarity index 99%
rename from Source/HSE_utils.H
rename to Source/ERF_HSE_utils.H
index 9d15a9807..da00f3226 100644
--- a/Source/HSE_utils.H
+++ b/Source/ERF_HSE_utils.H
@@ -1,5 +1,5 @@
-#ifndef _HSEUTIL_H_
-#define _HSEUTIL_H_
+#ifndef ERF_HSEUTIL_H_
+#define ERF_HSEUTIL_H_
 
 /**
  * Utility functions for calculating a hydrostatic equilibrium (HSE) base state
diff --git a/Source/IndexDefines.H b/Source/ERF_IndexDefines.H
similarity index 98%
rename from Source/IndexDefines.H
rename to Source/ERF_IndexDefines.H
index 0b972037a..322a2b884 100644
--- a/Source/IndexDefines.H
+++ b/Source/ERF_IndexDefines.H
@@ -1,5 +1,5 @@
-#ifndef INDEX_DEFINES_H_
-#define INDEX_DEFINES_H_
+#ifndef ERF_INDEX_DEFINES_H_
+#define ERF_INDEX_DEFINES_H_
 
 #include <AMReX_REAL.H>
 #include <AMReX_Arena.H>
diff --git a/Source/ERF_Tagging.cpp b/Source/ERF_Tagging.cpp
index a75e1d5a5..dbabe401a 100644
--- a/Source/ERF_Tagging.cpp
+++ b/Source/ERF_Tagging.cpp
@@ -1,5 +1,5 @@
 #include <ERF.H>
-#include <Derive.H>
+#include <ERF_Derive.H>
 
 using namespace amrex;
 
diff --git a/Source/ERF_make_new_arrays.cpp b/Source/ERF_make_new_arrays.cpp
index 4311b85b9..65ae38e2c 100644
--- a/Source/ERF_make_new_arrays.cpp
+++ b/Source/ERF_make_new_arrays.cpp
@@ -6,19 +6,19 @@
  * Worker routines for filling data at new levels after initialization, restart or regridding
 */
 
-#include "prob_common.H"
-#include <EOS.H>
+#include "ERF_prob_common.H"
+#include <ERF_EOS.H>
 #include <ERF.H>
 
 #include <AMReX_buildInfo.H>
 
-#include <Utils.H>
-#include <TerrainMetrics.H>
-#include <Utils/ParFunctions.H>
+#include <ERF_Utils.H>
+#include <ERF_TerrainMetrics.H>
+#include <Utils/ERF_ParFunctions.H>
 #include <memory>
 
 #ifdef ERF_USE_MULTIBLOCK
-#include <MultiBlockContainer.H>
+#include <ERF_MultiBlockContainer.H>
 #endif
 
 using namespace amrex;
diff --git a/Source/ERF_make_new_level.cpp b/Source/ERF_make_new_level.cpp
index 66ea423c2..12eb9fbcc 100644
--- a/Source/ERF_make_new_level.cpp
+++ b/Source/ERF_make_new_level.cpp
@@ -7,14 +7,14 @@
  * The routines here call common routines in ERF_make_new_arrays.cpp
 */
 
-#include "prob_common.H"
+#include "ERF_prob_common.H"
 #include <ERF.H>
 #include <AMReX_buildInfo.H>
-#include <Utils.H>
+#include <ERF_Utils.H>
 #include <memory>
 
 #ifdef ERF_USE_MULTIBLOCK
-#include <MultiBlockContainer.H>
+#include <ERF_MultiBlockContainer.H>
 #endif
 
 using namespace amrex;
diff --git a/Source/prob_common.H b/Source/ERF_prob_common.H
similarity index 99%
rename from Source/prob_common.H
rename to Source/ERF_prob_common.H
index 8b65314d9..a427db1bd 100644
--- a/Source/prob_common.H
+++ b/Source/ERF_prob_common.H
@@ -1,15 +1,15 @@
-#ifndef _PROBCOMMON_H_
-#define _PROBCOMMON_H_
+#ifndef ERF_PROBCOMMON_H_
+#define ERF_PROBCOMMON_H_
 
 #include <AMReX_ParmParse.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_FArrayBox.H>
 #include <AMReX_MultiFab.H>
 
-#include "DataStruct.H"
-#include "EOS.H"
-#include "HSE_utils.H"
-#include "TileNoZ.H"
+#include "ERF_DataStruct.H"
+#include "ERF_EOS.H"
+#include "ERF_HSE_utils.H"
+#include "ERF_TileNoZ.H"
 
 struct ProbParmDefaults {
     amrex::Real rho_0 = 1.0;
diff --git a/Source/ERF_read_waves.cpp b/Source/ERF_read_waves.cpp
index 11f8fcace..cbc8b83ba 100644
--- a/Source/ERF_read_waves.cpp
+++ b/Source/ERF_read_waves.cpp
@@ -1,7 +1,7 @@
 #ifdef ERF_USE_WW3_COUPLING
 
 #include <ERF.H>
-#include <Utils.H>
+#include <ERF_Utils.H>
 #include <mpi.h>
 #include <AMReX_MPMD.H>
 #include <AMReX_MultiFab.H>
diff --git a/Source/IO/Checkpoint.cpp b/Source/IO/ERF_Checkpoint.cpp
similarity index 100%
rename from Source/IO/Checkpoint.cpp
rename to Source/IO/ERF_Checkpoint.cpp
diff --git a/Source/IO/NCCheckpoint.cpp b/Source/IO/ERF_NCCheckpoint.cpp
similarity index 99%
rename from Source/IO/NCCheckpoint.cpp
rename to Source/IO/ERF_NCCheckpoint.cpp
index 18d993ad7..3ff06b215 100644
--- a/Source/IO/NCCheckpoint.cpp
+++ b/Source/IO/ERF_NCCheckpoint.cpp
@@ -1,5 +1,5 @@
 #include <ERF.H>
-#include <NCInterface.H>
+#include <ERF_NCInterface.H>
 #include <AMReX_PlotFileUtil.H>
 
 using namespace amrex;
diff --git a/Source/IO/NCColumnFile.cpp b/Source/IO/ERF_NCColumnFile.cpp
similarity index 99%
rename from Source/IO/NCColumnFile.cpp
rename to Source/IO/ERF_NCColumnFile.cpp
index fad1ef2b3..eba2f2931 100644
--- a/Source/IO/NCColumnFile.cpp
+++ b/Source/IO/ERF_NCColumnFile.cpp
@@ -1,6 +1,6 @@
 #include "ERF.H"
-#include "NCInterface.H"
-#include "IndexDefines.H"
+#include "ERF_NCInterface.H"
+#include "ERF_IndexDefines.H"
 
 using namespace amrex;
 
diff --git a/Source/IO/NCInterface.H b/Source/IO/ERF_NCInterface.H
similarity index 99%
rename from Source/IO/NCInterface.H
rename to Source/IO/ERF_NCInterface.H
index e8f3a590c..4589fbe2e 100644
--- a/Source/IO/NCInterface.H
+++ b/Source/IO/ERF_NCInterface.H
@@ -6,8 +6,8 @@
  *  OOP-like manner.
  */
 
-#ifndef NC_INTERFACE_H
-#define NC_INTERFACE_H
+#ifndef ERF_NC_INTERFACE_H
+#define ERF_NC_INTERFACE_H
 
 #ifndef USE_NETCDF
 #include <string>
diff --git a/Source/IO/NCInterface.cpp b/Source/IO/ERF_NCInterface.cpp
similarity index 99%
rename from Source/IO/NCInterface.cpp
rename to Source/IO/ERF_NCInterface.cpp
index 77294f8e8..2f43a7c09 100644
--- a/Source/IO/NCInterface.cpp
+++ b/Source/IO/ERF_NCInterface.cpp
@@ -1,6 +1,6 @@
 #include <cstdio>
 
-#include "NCInterface.H"
+#include "ERF_NCInterface.H"
 #include <AMReX.H>
 
 #define abort_func amrex::Abort
diff --git a/Source/IO/NCMultiFabFile.cpp b/Source/IO/ERF_NCMultiFabFile.cpp
similarity index 98%
rename from Source/IO/NCMultiFabFile.cpp
rename to Source/IO/ERF_NCMultiFabFile.cpp
index 327e49eb9..58e4872f9 100644
--- a/Source/IO/NCMultiFabFile.cpp
+++ b/Source/IO/ERF_NCMultiFabFile.cpp
@@ -13,9 +13,9 @@
 #include <AMReX_ParmParse.H>
 
 #include "ERF.H"
-#include "NCInterface.H"
-#include "NCPlotFile.H"
-#include "IndexDefines.H"
+#include "ERF_NCInterface.H"
+#include "ERF_NCPlotFile.H"
+#include "ERF_IndexDefines.H"
 
 using namespace amrex;
 
diff --git a/Source/IO/ERF_NCPlotFile.H b/Source/IO/ERF_NCPlotFile.H
new file mode 100644
index 000000000..14ad02b79
--- /dev/null
+++ b/Source/IO/ERF_NCPlotFile.H
@@ -0,0 +1,4 @@
+#ifndef ERF_NCPLOTFILE_H_
+#define ERF_NCPLOTFILE_H_
+extern std::string inputs_name;
+#endif
diff --git a/Source/IO/NCPlotFile.cpp b/Source/IO/ERF_NCPlotFile.cpp
similarity index 99%
rename from Source/IO/NCPlotFile.cpp
rename to Source/IO/ERF_NCPlotFile.cpp
index 63afc79ad..4b52d4e60 100644
--- a/Source/IO/NCPlotFile.cpp
+++ b/Source/IO/ERF_NCPlotFile.cpp
@@ -12,9 +12,9 @@
 #include <AMReX_ParmParse.H>
 
 #include "ERF.H"
-#include "NCInterface.H"
-#include "NCPlotFile.H"
-#include "IndexDefines.H"
+#include "ERF_NCInterface.H"
+#include "ERF_NCPlotFile.H"
+#include "ERF_IndexDefines.H"
 
 using namespace amrex;
 
diff --git a/Source/IO/NCWpsFile.H b/Source/IO/ERF_NCWpsFile.H
similarity index 99%
rename from Source/IO/NCWpsFile.H
rename to Source/IO/ERF_NCWpsFile.H
index 268968a04..35b97ae9c 100644
--- a/Source/IO/NCWpsFile.H
+++ b/Source/IO/ERF_NCWpsFile.H
@@ -1,5 +1,5 @@
-#ifndef _NCWPSFILE_H_
-#define _NCWPSFILE_H_
+#ifndef ERF_NCWPSFILE_H_
+#define ERF_NCWPSFILE_H_
 
 #include <sstream>
 #include <string>
@@ -8,7 +8,7 @@
 
 #include "AMReX_FArrayBox.H"
 #include "AMReX_IArrayBox.H"
-#include "NCInterface.H"
+#include "ERF_NCInterface.H"
 
 using PlaneVector = amrex::Vector<amrex::FArrayBox>;
 
diff --git a/Source/IO/Plotfile.cpp b/Source/IO/ERF_Plotfile.cpp
similarity index 99%
rename from Source/IO/Plotfile.cpp
rename to Source/IO/ERF_Plotfile.cpp
index 7f9f48a3d..fa3593475 100644
--- a/Source/IO/Plotfile.cpp
+++ b/Source/IO/ERF_Plotfile.cpp
@@ -1,8 +1,8 @@
-#include <EOS.H>
+#include <ERF_EOS.H>
 #include <ERF.H>
 #include "AMReX_Interp_3D_C.H"
 #include "AMReX_PlotFileUtil.H"
-#include "TerrainMetrics.H"
+#include "ERF_TerrainMetrics.H"
 #include "ERF_Constants.H"
 
 using namespace amrex;
diff --git a/Source/IO/ERF_ReadBndryPlanes.H b/Source/IO/ERF_ReadBndryPlanes.H
index a05f0c96d..8435daedc 100644
--- a/Source/IO/ERF_ReadBndryPlanes.H
+++ b/Source/IO/ERF_ReadBndryPlanes.H
@@ -4,8 +4,8 @@
 #include "AMReX_Gpu.H"
 #include "AMReX_AmrCore.H"
 #include <AMReX_BndryRegister.H>
-#include "IndexDefines.H"
-#include "DataStruct.H"
+#include "ERF_IndexDefines.H"
+#include "ERF_DataStruct.H"
 
 using PlaneVector = amrex::Vector<amrex::FArrayBox>;
 
diff --git a/Source/IO/ERF_ReadBndryPlanes.cpp b/Source/IO/ERF_ReadBndryPlanes.cpp
index 0d73b7f1a..b95710f38 100644
--- a/Source/IO/ERF_ReadBndryPlanes.cpp
+++ b/Source/IO/ERF_ReadBndryPlanes.cpp
@@ -2,9 +2,9 @@
 #include "AMReX_ParmParse.H"
 #include <AMReX_PlotFileUtil.H>
 #include "ERF_ReadBndryPlanes.H"
-#include "IndexDefines.H"
+#include "ERF_IndexDefines.H"
 #include "AMReX_MultiFabUtil.H"
-#include "EOS.H"
+#include "ERF_EOS.H"
 
 using namespace amrex;
 
diff --git a/Source/IO/ReadFromMetgrid.cpp b/Source/IO/ERF_ReadFromMetgrid.cpp
similarity index 99%
rename from Source/IO/ReadFromMetgrid.cpp
rename to Source/IO/ERF_ReadFromMetgrid.cpp
index 7c66b5b9f..d02c9df95 100644
--- a/Source/IO/ReadFromMetgrid.cpp
+++ b/Source/IO/ERF_ReadFromMetgrid.cpp
@@ -1,7 +1,7 @@
-#include <NCWpsFile.H>
+#include <ERF_NCWpsFile.H>
 #include <AMReX_FArrayBox.H>
 #include <AMReX_IArrayBox.H>
-#include <Metgrid_utils.H>
+#include <ERF_Metgrid_utils.H>
 
 using namespace amrex;
 
diff --git a/Source/IO/ReadFromWRFBdy.cpp b/Source/IO/ERF_ReadFromWRFBdy.cpp
similarity index 99%
rename from Source/IO/ReadFromWRFBdy.cpp
rename to Source/IO/ERF_ReadFromWRFBdy.cpp
index bf37898aa..df47a822c 100644
--- a/Source/IO/ReadFromWRFBdy.cpp
+++ b/Source/IO/ERF_ReadFromWRFBdy.cpp
@@ -1,15 +1,15 @@
 #include "AMReX_FArrayBox.H"
-#include "NCWpsFile.H"
-#include "IndexDefines.H"
-#include "EOS.H"
+#include "ERF_NCWpsFile.H"
+#include "ERF_IndexDefines.H"
+#include "ERF_EOS.H"
 
 #include <sstream>
 #include <string>
 #include <ctime>
 #include <atomic>
 
-#include "DataStruct.H"
-#include "NCInterface.H"
+#include "ERF_DataStruct.H"
+#include "ERF_NCInterface.H"
 #include "AMReX_FArrayBox.H"
 #include "AMReX_Print.H"
 
diff --git a/Source/IO/ReadFromWRFInput.cpp b/Source/IO/ERF_ReadFromWRFInput.cpp
similarity index 99%
rename from Source/IO/ReadFromWRFInput.cpp
rename to Source/IO/ERF_ReadFromWRFInput.cpp
index bec7da68e..f44a4a2b4 100644
--- a/Source/IO/ReadFromWRFInput.cpp
+++ b/Source/IO/ERF_ReadFromWRFInput.cpp
@@ -1,6 +1,6 @@
-#include "NCWpsFile.H"
+#include "ERF_NCWpsFile.H"
 #include "AMReX_FArrayBox.H"
-#include "DataStruct.H"
+#include "ERF_DataStruct.H"
 
 using namespace amrex;
 
diff --git a/Source/IO/ERF_Write1DProfiles.cpp b/Source/IO/ERF_Write1DProfiles.cpp
index 3cbc0741f..43c473d90 100644
--- a/Source/IO/ERF_Write1DProfiles.cpp
+++ b/Source/IO/ERF_Write1DProfiles.cpp
@@ -1,7 +1,7 @@
 #include <iomanip>
 
 #include "ERF.H"
-#include "EOS.H"
+#include "ERF_EOS.H"
 
 using namespace amrex;
 
diff --git a/Source/IO/ERF_Write1DProfiles_stag.cpp b/Source/IO/ERF_Write1DProfiles_stag.cpp
index 6faa07d6d..693da0e26 100644
--- a/Source/IO/ERF_Write1DProfiles_stag.cpp
+++ b/Source/IO/ERF_Write1DProfiles_stag.cpp
@@ -1,7 +1,7 @@
 #include <iomanip>
 
 #include "ERF.H"
-#include "EOS.H"
+#include "ERF_EOS.H"
 
 using namespace amrex;
 
diff --git a/Source/IO/ERF_WriteBndryPlanes.cpp b/Source/IO/ERF_WriteBndryPlanes.cpp
index 679756074..5ddc4c458 100644
--- a/Source/IO/ERF_WriteBndryPlanes.cpp
+++ b/Source/IO/ERF_WriteBndryPlanes.cpp
@@ -3,8 +3,8 @@
 #include "AMReX_PlotFileUtil.H"
 #include "AMReX_MultiFabUtil.H"
 #include "ERF_WriteBndryPlanes.H"
-#include "IndexDefines.H"
-#include "Derive.H"
+#include "ERF_IndexDefines.H"
+#include "ERF_Derive.H"
 
 using namespace amrex;
 
diff --git a/Source/IO/console_io.cpp b/Source/IO/ERF_console_io.cpp
similarity index 99%
rename from Source/IO/console_io.cpp
rename to Source/IO/ERF_console_io.cpp
index 7ec11aa76..cd853d14e 100644
--- a/Source/IO/console_io.cpp
+++ b/Source/IO/ERF_console_io.cpp
@@ -5,7 +5,7 @@
 #include "AMReX_Vector.H"
 
 #ifdef ERF_USE_NETCDF
-#include "NCInterface.H"
+#include "ERF_NCInterface.H"
 #include "netcdf_meta.h"
 #endif
 
diff --git a/Source/IO/writeJobInfo.cpp b/Source/IO/ERF_writeJobInfo.cpp
similarity index 100%
rename from Source/IO/writeJobInfo.cpp
rename to Source/IO/ERF_writeJobInfo.cpp
diff --git a/Source/IO/Make.package b/Source/IO/Make.package
index 5af468489..4f6f079c9 100644
--- a/Source/IO/Make.package
+++ b/Source/IO/Make.package
@@ -1,7 +1,7 @@
 
-CEXE_sources += Plotfile.cpp
-CEXE_sources += Checkpoint.cpp
-CEXE_sources += writeJobInfo.cpp
+CEXE_sources += ERF_Plotfile.cpp
+CEXE_sources += ERF_Checkpoint.cpp
+CEXE_sources += ERF_writeJobInfo.cpp
 
 CEXE_headers += ERF_WriteBndryPlanes.H
 CEXE_headers += ERF_ReadBndryPlanes.H
@@ -12,18 +12,18 @@ CEXE_sources += ERF_Write1DProfiles.cpp
 CEXE_sources += ERF_Write1DProfiles_stag.cpp
 CEXE_sources += ERF_WriteScalarProfiles.cpp
 
-CEXE_sources += console_io.cpp
+CEXE_sources += ERF_console_io.cpp
 
 ifeq ($(USE_NETCDF), TRUE)
-  CEXE_sources += ReadFromWRFBdy.cpp
-  CEXE_sources += ReadFromWRFInput.cpp
-  CEXE_sources += ReadFromMetgrid.cpp
-  CEXE_sources += NCInterface.cpp
-  CEXE_sources += NCPlotFile.cpp
-  CEXE_sources += NCColumnFile.cpp
-  CEXE_sources += NCCheckpoint.cpp
-  CEXE_sources += NCMultiFabFile.cpp
-  CEXE_headers += NCWpsFile.H
-  CEXE_headers += NCInterface.H
-  CEXE_headers += NCPlotFile.H
+  CEXE_sources += ERF_ReadFromWRFBdy.cpp
+  CEXE_sources += ERF_ReadFromWRFInput.cpp
+  CEXE_sources += ERF_ReadFromMetgrid.cpp
+  CEXE_sources += ERF_NCInterface.cpp
+  CEXE_sources += ERF_NCPlotFile.cpp
+  CEXE_sources += ERF_NCColumnFile.cpp
+  CEXE_sources += ERF_NCCheckpoint.cpp
+  CEXE_sources += ERF_NCMultiFabFile.cpp
+  CEXE_headers += ERF_NCWpsFile.H
+  CEXE_headers += ERF_NCInterface.H
+  CEXE_headers += ERF_NCPlotFile.H
 endif
diff --git a/Source/IO/NCPlotFile.H b/Source/IO/NCPlotFile.H
deleted file mode 100644
index 5ce09e412..000000000
--- a/Source/IO/NCPlotFile.H
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _NCPLOTFILE_H_
-#define _NCPLOTFILE_H_
-extern std::string inputs_name;
-#endif
diff --git a/Source/Initialization/Metgrid_utils.H b/Source/Initialization/ERF_Metgrid_utils.H
similarity index 99%
rename from Source/Initialization/Metgrid_utils.H
rename to Source/Initialization/ERF_Metgrid_utils.H
index 30629b49d..84e5acad8 100644
--- a/Source/Initialization/Metgrid_utils.H
+++ b/Source/Initialization/ERF_Metgrid_utils.H
@@ -1,11 +1,11 @@
-#ifndef _METGRIDUTIL_H_
-#define _METGRIDUTIL_H_
+#ifndef ERF_METGRIDUTIL_H_
+#define ERF_METGRIDUTIL_H_
 
 #include <ERF.H>
-#include <EOS.H>
+#include <ERF_EOS.H>
 #include <ERF_Constants.H>
-#include <Utils.H>
-#include <prob_common.H>
+#include <ERF_Utils.H>
+#include <ERF_prob_common.H>
 
 void
 read_from_metgrid (int lev,
diff --git a/Source/Initialization/ERF_init1d.cpp b/Source/Initialization/ERF_init1d.cpp
index 45a629c44..77bd4f771 100644
--- a/Source/Initialization/ERF_init1d.cpp
+++ b/Source/Initialization/ERF_init1d.cpp
@@ -1,14 +1,14 @@
 /**
  * \file ERF_init1d.cpp
  */
-#include <EOS.H>
+#include <ERF_EOS.H>
 #include <ERF.H>
-#include <TileNoZ.H>
-#include <prob_common.H>
-#include <ParFunctions.H>
-#include <Utils.H>
+#include <ERF_TileNoZ.H>
+#include <ERF_prob_common.H>
+#include <ERF_ParFunctions.H>
+#include <ERF_Utils.H>
 
-#include <Interpolation_1D.H>
+#include <ERF_Interpolation_1D.H>
 
 using namespace amrex;
 
@@ -229,7 +229,7 @@ ERF::initHSE (int lev)
 
     if (all_boxes_touch_bottom || lev > 0) {
 
-        // Initial r_hse may or may not be in HSE -- defined in prob.cpp
+        // Initial r_hse may or may not be in HSE -- defined in ERF_prob.cpp
         if (solverChoice.use_moist_background){
             prob->erf_init_dens_hse_moist(r_hse, z_phys_nd[lev], geom[lev]);
         } else {
@@ -265,7 +265,7 @@ ERF::initHSE (int lev)
             new_z_phys_nd->ParallelCopy(*z_phys_nd[lev],0,0,1,1,1);
         }
 
-        // Initial r_hse may or may not be in HSE -- defined in prob.cpp
+        // Initial r_hse may or may not be in HSE -- defined in ERF_prob.cpp
         if (solverChoice.use_moist_background){
             prob->erf_init_dens_hse_moist(new_r_hse, new_z_phys_nd, geom[lev]);
         } else {
diff --git a/Source/Initialization/ERF_init_TurbPert.cpp b/Source/Initialization/ERF_init_TurbPert.cpp
index 606ef0a2a..7f8ee6958 100644
--- a/Source/Initialization/ERF_init_TurbPert.cpp
+++ b/Source/Initialization/ERF_init_TurbPert.cpp
@@ -6,8 +6,8 @@
 
 #include <ERF.H>
 #include <AMReX_MultiFabUtil.H>
-#include <TileNoZ.H>
-#include <prob_common.H>
+#include <ERF_TileNoZ.H>
+#include <ERF_prob_common.H>
 
 using namespace amrex;
 
@@ -23,7 +23,7 @@ ERF::turbPert_update (const int lev, const Real local_dt)
     MultiFab xvel_data(lev_new[Vars::xvel], make_alias, 0, 1);
     MultiFab yvel_data(lev_new[Vars::yvel], make_alias, 0, 1);
 
-    // This logic is done once then stored within TurbPertStruct.H
+    // This logic is done once then stored within ERF_TurbPertStruct.H
     turbPert.pt_type = -1;
     if (solverChoice.pert_type == PerturbationType::perturbSource) {
         turbPert.pt_type = 0;
diff --git a/Source/Initialization/ERF_init_custom.cpp b/Source/Initialization/ERF_init_custom.cpp
index b07533531..984c57004 100644
--- a/Source/Initialization/ERF_init_custom.cpp
+++ b/Source/Initialization/ERF_init_custom.cpp
@@ -5,8 +5,8 @@
 
 #include <ERF.H>
 #include <ERF_Constants.H>
-#include <TileNoZ.H>
-#include <prob_common.H>
+#include <ERF_TileNoZ.H>
+#include <ERF_prob_common.H>
 
 using namespace amrex;
 
diff --git a/Source/Initialization/ERF_init_from_hse.cpp b/Source/Initialization/ERF_init_from_hse.cpp
index 2daf050e0..9623cb8e7 100644
--- a/Source/Initialization/ERF_init_from_hse.cpp
+++ b/Source/Initialization/ERF_init_from_hse.cpp
@@ -3,8 +3,8 @@
  */
 
 #include <ERF.H>
-#include <TileNoZ.H>
-#include <EOS.H>
+#include <ERF_TileNoZ.H>
+#include <ERF_EOS.H>
 
 #include "AMReX_Print.H"
 
diff --git a/Source/Initialization/ERF_init_from_input_sounding.cpp b/Source/Initialization/ERF_init_from_input_sounding.cpp
index 0daf2b496..9aeeec2ef 100644
--- a/Source/Initialization/ERF_init_from_input_sounding.cpp
+++ b/Source/Initialization/ERF_init_from_input_sounding.cpp
@@ -3,10 +3,10 @@
  */
 
 #include <ERF.H>
-#include <EOS.H>
+#include <ERF_EOS.H>
 #include <ERF_Constants.H>
-#include <Utils.H>
-#include <prob_common.H>
+#include <ERF_Utils.H>
+#include <ERF_prob_common.H>
 
 using namespace amrex;
 
diff --git a/Source/Initialization/ERF_init_from_metgrid.cpp b/Source/Initialization/ERF_init_from_metgrid.cpp
index 6478de9dc..d693ee3ab 100644
--- a/Source/Initialization/ERF_init_from_metgrid.cpp
+++ b/Source/Initialization/ERF_init_from_metgrid.cpp
@@ -2,7 +2,7 @@
  * \file ERF_init_from_metgrid.cpp
  */
 
-#include <Metgrid_utils.H>
+#include <ERF_Metgrid_utils.H>
 
 using namespace amrex;
 
diff --git a/Source/Initialization/ERF_init_from_wrfinput.cpp b/Source/Initialization/ERF_init_from_wrfinput.cpp
index 49d7d9b84..29661b54b 100644
--- a/Source/Initialization/ERF_init_from_wrfinput.cpp
+++ b/Source/Initialization/ERF_init_from_wrfinput.cpp
@@ -3,11 +3,11 @@
  */
 
 #include <ERF.H>
-#include <EOS.H>
+#include <ERF_EOS.H>
 #include <ERF_Constants.H>
-#include <Utils.H>
-#include <prob_common.H>
-#include <DataStruct.H>
+#include <ERF_Utils.H>
+#include <ERF_prob_common.H>
+#include <ERF_DataStruct.H>
 
 using namespace amrex;
 
diff --git a/Source/Initialization/ERF_init_uniform.cpp b/Source/Initialization/ERF_init_uniform.cpp
index 6f6d1fe49..1d6b0e291 100644
--- a/Source/Initialization/ERF_init_uniform.cpp
+++ b/Source/Initialization/ERF_init_uniform.cpp
@@ -3,7 +3,7 @@
  */
 
 #include <ERF.H>
-#include <prob_common.H>
+#include <ERF_prob_common.H>
 
 using namespace amrex;
 
diff --git a/Source/Initialization/ERF_input_sponge.cpp b/Source/Initialization/ERF_input_sponge.cpp
index 47f5d77cf..433c72805 100644
--- a/Source/Initialization/ERF_input_sponge.cpp
+++ b/Source/Initialization/ERF_input_sponge.cpp
@@ -3,10 +3,10 @@
  */
 
 #include <ERF.H>
-#include <EOS.H>
+#include <ERF_EOS.H>
 #include <ERF_Constants.H>
-#include <Utils.H>
-#include <prob_common.H>
+#include <ERF_Utils.H>
+#include <ERF_prob_common.H>
 
 using namespace amrex;
 
diff --git a/Source/Initialization/Make.package b/Source/Initialization/Make.package
index 18743032d..51f054856 100644
--- a/Source/Initialization/Make.package
+++ b/Source/Initialization/Make.package
@@ -12,7 +12,7 @@ CEXE_sources += ERF_init_windfarm.cpp
 endif
 
 ifeq ($(USE_NETCDF),TRUE)
-CEXE_headers += Metgrid_utils.H
+CEXE_headers += ERF_Metgrid_utils.H
 CEXE_sources += ERF_init_from_wrfinput.cpp
 CEXE_sources += ERF_init_from_metgrid.cpp
 endif
diff --git a/Source/LandSurfaceModel/LandSurface.H b/Source/LandSurfaceModel/ERF_LandSurface.H
similarity index 96%
rename from Source/LandSurfaceModel/LandSurface.H
rename to Source/LandSurfaceModel/ERF_LandSurface.H
index 37f56d919..9db80be66 100644
--- a/Source/LandSurfaceModel/LandSurface.H
+++ b/Source/LandSurfaceModel/ERF_LandSurface.H
@@ -1,11 +1,11 @@
-#ifndef LANDSURFACE_H
-#define LANDSURFACE_H
+#ifndef ERF_LANDSURFACE_H
+#define ERF_LANDSURFACE_H
 
 #include <AMReX_PlotFileUtil.H>
 
-#include <NullSurf.H>
-#include <SLM.H>
-#include <MM5.H>
+#include <ERF_NullSurf.H>
+#include <ERF_SLM.H>
+#include <ERF_MM5.H>
 
 class LandSurface {
 
diff --git a/Source/LandSurfaceModel/MM5/MM5.H b/Source/LandSurfaceModel/MM5/ERF_MM5.H
similarity index 96%
rename from Source/LandSurfaceModel/MM5/MM5.H
rename to Source/LandSurfaceModel/MM5/ERF_MM5.H
index b0ac5878a..ffc5dfed1 100644
--- a/Source/LandSurfaceModel/MM5/MM5.H
+++ b/Source/LandSurfaceModel/MM5/ERF_MM5.H
@@ -1,5 +1,5 @@
-#ifndef MM5_H
-#define MM5_H
+#ifndef ERF_MM5_H
+#define ERF_MM5_H
 
 #include <string>
 #include <vector>
@@ -9,10 +9,10 @@
 #include <AMReX_Geometry.H>
 #include <AMReX_MultiFabUtil.H>
 
-#include <NullSurf.H>
+#include <ERF_NullSurf.H>
 #include <ERF_Constants.H>
-#include <IndexDefines.H>
-#include <DataStruct.H>
+#include <ERF_IndexDefines.H>
+#include <ERF_DataStruct.H>
 
 namespace LsmVar_MM5 {
    enum {
diff --git a/Source/LandSurfaceModel/MM5/MM5.cpp b/Source/LandSurfaceModel/MM5/ERF_MM5.cpp
similarity index 99%
rename from Source/LandSurfaceModel/MM5/MM5.cpp
rename to Source/LandSurfaceModel/MM5/ERF_MM5.cpp
index b548b1d54..60388a8bd 100644
--- a/Source/LandSurfaceModel/MM5/MM5.cpp
+++ b/Source/LandSurfaceModel/MM5/ERF_MM5.cpp
@@ -1,4 +1,4 @@
-#include <MM5.H>
+#include <ERF_MM5.H>
 
 using namespace amrex;
 
diff --git a/Source/LandSurfaceModel/MM5/Make.package b/Source/LandSurfaceModel/MM5/Make.package
index c844c2c58..365adc01e 100644
--- a/Source/LandSurfaceModel/MM5/Make.package
+++ b/Source/LandSurfaceModel/MM5/Make.package
@@ -1,2 +1,2 @@
-CEXE_sources += MM5.cpp
-CEXE_headers += MM5.H
+CEXE_sources += ERF_MM5.cpp
+CEXE_headers += ERF_MM5.H
diff --git a/Source/LandSurfaceModel/Make.package b/Source/LandSurfaceModel/Make.package
index 4bdd1f1c0..77f996b99 100644
--- a/Source/LandSurfaceModel/Make.package
+++ b/Source/LandSurfaceModel/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += LandSurface.H
+CEXE_headers += ERF_LandSurface.H
 
diff --git a/Source/LandSurfaceModel/Null/NullSurf.H b/Source/LandSurfaceModel/Null/ERF_NullSurf.H
similarity index 94%
rename from Source/LandSurfaceModel/Null/NullSurf.H
rename to Source/LandSurfaceModel/Null/ERF_NullSurf.H
index ccdc485dc..7e99fac88 100644
--- a/Source/LandSurfaceModel/Null/NullSurf.H
+++ b/Source/LandSurfaceModel/Null/ERF_NullSurf.H
@@ -1,9 +1,9 @@
-#ifndef NULLSURF_H
-#define NULLSURF_H
+#ifndef ERF_NULLSURF_H
+#define ERF_NULLSURF_H
 
 #include <AMReX_MultiFabUtil.H>
 #include <AMReX_Geometry.H>
-#include <DataStruct.H>
+#include <ERF_DataStruct.H>
 
 class NullSurf {
 
diff --git a/Source/LandSurfaceModel/Null/Make.package b/Source/LandSurfaceModel/Null/Make.package
index c8876d592..d3de52c5b 100644
--- a/Source/LandSurfaceModel/Null/Make.package
+++ b/Source/LandSurfaceModel/Null/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += NullSurf.H
+CEXE_headers += ERF_NullSurf.H
 
diff --git a/Source/LandSurfaceModel/SLM/SLM.H b/Source/LandSurfaceModel/SLM/ERF_SLM.H
similarity index 96%
rename from Source/LandSurfaceModel/SLM/SLM.H
rename to Source/LandSurfaceModel/SLM/ERF_SLM.H
index 3742acd78..fc9e7ed69 100644
--- a/Source/LandSurfaceModel/SLM/SLM.H
+++ b/Source/LandSurfaceModel/SLM/ERF_SLM.H
@@ -1,5 +1,5 @@
-#ifndef SLM_H
-#define SLM_H
+#ifndef ERF_SLM_H
+#define ERF_SLM_H
 
 #include <string>
 #include <vector>
@@ -9,10 +9,10 @@
 #include <AMReX_Geometry.H>
 #include <AMReX_MultiFabUtil.H>
 
-#include <NullSurf.H>
+#include <ERF_NullSurf.H>
 #include <ERF_Constants.H>
-#include <IndexDefines.H>
-#include <DataStruct.H>
+#include <ERF_IndexDefines.H>
+#include <ERF_DataStruct.H>
 
 namespace LsmVar_SLM {
    enum {
diff --git a/Source/LandSurfaceModel/SLM/SLM.cpp b/Source/LandSurfaceModel/SLM/ERF_SLM.cpp
similarity index 99%
rename from Source/LandSurfaceModel/SLM/SLM.cpp
rename to Source/LandSurfaceModel/SLM/ERF_SLM.cpp
index d9e7905dd..356e2394c 100644
--- a/Source/LandSurfaceModel/SLM/SLM.cpp
+++ b/Source/LandSurfaceModel/SLM/ERF_SLM.cpp
@@ -1,4 +1,4 @@
-#include <SLM.H>
+#include <ERF_SLM.H>
 
 using namespace amrex;
 
diff --git a/Source/LandSurfaceModel/SLM/Make.package b/Source/LandSurfaceModel/SLM/Make.package
index cc472527e..c88bf2aba 100644
--- a/Source/LandSurfaceModel/SLM/Make.package
+++ b/Source/LandSurfaceModel/SLM/Make.package
@@ -1,2 +1,2 @@
-CEXE_sources += SLM.cpp
-CEXE_headers += SLM.H
+CEXE_sources += ERF_SLM.cpp
+CEXE_headers += ERF_SLM.H
diff --git a/Source/Make.package b/Source/Make.package
index 5cfbc4860..e5b5fe0e1 100644
--- a/Source/Make.package
+++ b/Source/Make.package
@@ -1,18 +1,18 @@
 CEXE_sources += main.cpp
 CEXE_sources += ERF.cpp
 CEXE_headers += ERF.H
-CEXE_headers += prob_common.H
-CEXE_headers += HSE_utils.H
+CEXE_headers += ERF_prob_common.H
+CEXE_headers += ERF_HSE_utils.H
 
-CEXE_headers += IndexDefines.H
-CEXE_headers += EOS.H
+CEXE_headers += ERF_IndexDefines.H
+CEXE_headers += ERF_EOS.H
 CEXE_headers += ERF_Constants.H
 CEXE_sources += ERF_Tagging.cpp
 
 CEXE_sources += ERF_make_new_level.cpp
 CEXE_sources += ERF_make_new_arrays.cpp
-CEXE_sources += Derive.cpp
-CEXE_headers += Derive.H
+CEXE_sources += ERF_Derive.cpp
+CEXE_headers += ERF_Derive.H
 
 ifeq ($(USE_WW3_COUPLING),TRUE)
 CEXE_sources += ERF_read_waves.cpp
diff --git a/Source/Microphysics/EulerianMicrophysics.H b/Source/Microphysics/ERF_EulerianMicrophysics.H
similarity index 95%
rename from Source/Microphysics/EulerianMicrophysics.H
rename to Source/Microphysics/ERF_EulerianMicrophysics.H
index de056e20d..3ac22d487 100644
--- a/Source/Microphysics/EulerianMicrophysics.H
+++ b/Source/Microphysics/ERF_EulerianMicrophysics.H
@@ -1,14 +1,14 @@
-/*! @file EulerianMicrophysics.H
+/*! @file ERF_EulerianMicrophysics.H
  *  \brief Contains the Eulerian microphysics class
  */
 
-#ifndef EULERIANMICROPHYSICS_H
-#define EULERIANMICROPHYSICS_H
+#ifndef ERF_EULERIANMICROPHYSICS_H
+#define ERF_EULERIANMICROPHYSICS_H
 
-#include "NullMoist.H"
-#include "SAM.H"
-#include "Kessler.H"
-#include "Microphysics.H"
+#include "ERF_NullMoist.H"
+#include "ERF_SAM.H"
+#include "ERF_Kessler.H"
+#include "ERF_Microphysics.H"
 
 /*! \brief Eulerian microphysics interface */
 class EulerianMicrophysics : public Microphysics {
diff --git a/Source/Microphysics/LagrangianMicrophysics.H b/Source/Microphysics/ERF_LagrangianMicrophysics.H
similarity index 96%
rename from Source/Microphysics/LagrangianMicrophysics.H
rename to Source/Microphysics/ERF_LagrangianMicrophysics.H
index 9daafd242..d38073c98 100644
--- a/Source/Microphysics/LagrangianMicrophysics.H
+++ b/Source/Microphysics/ERF_LagrangianMicrophysics.H
@@ -1,17 +1,17 @@
-/*! @file LagrangianMicrophysics.H
+/*! @file ERF_LagrangianMicrophysics.H
  *  \brief Contains the Lagrangian microphysics class
  */
 
-#ifndef LAGRANGIANMICROPHYSICS_H
-#define LAGRANGIANMICROPHYSICS_H
+#ifndef ERF_LAGRANGIANMICROPHYSICS_H
+#define ERF_LAGRANGIANMICROPHYSICS_H
 
 #ifdef ERF_USE_PARTICLES
 
 #include <utility>
 #include <string>
 
-#include "NullMoistLagrangian.H"
-#include "Microphysics.H"
+#include "ERF_NullMoistLagrangian.H"
+#include "ERF_Microphysics.H"
 
 /* forward declaration */
 class ERFPC;
diff --git a/Source/Microphysics/Microphysics.H b/Source/Microphysics/ERF_Microphysics.H
similarity index 95%
rename from Source/Microphysics/Microphysics.H
rename to Source/Microphysics/ERF_Microphysics.H
index fc8d480f0..aa45bca4f 100644
--- a/Source/Microphysics/Microphysics.H
+++ b/Source/Microphysics/ERF_Microphysics.H
@@ -1,11 +1,11 @@
-/*! @file Microphysics.H
+/*! @file ERF_Microphysics.H
  *  \brief Contains the base class for microphysics
  */
 
-#ifndef MICROPHYSICS_H
-#define MICROPHYSICS_H
+#ifndef ERF_MICROPHYSICS_H
+#define ERF_MICROPHYSICS_H
 
-#include "DataStruct.H"
+#include "ERF_DataStruct.H"
 
 /*! \brief Base class for microphysics interface */
 class Microphysics {
diff --git a/Source/Microphysics/Kessler/Init_Kessler.cpp b/Source/Microphysics/Kessler/ERF_Init_Kessler.cpp
similarity index 96%
rename from Source/Microphysics/Kessler/Init_Kessler.cpp
rename to Source/Microphysics/Kessler/ERF_Init_Kessler.cpp
index 18406c8e5..66f724049 100644
--- a/Source/Microphysics/Kessler/Init_Kessler.cpp
+++ b/Source/Microphysics/Kessler/ERF_Init_Kessler.cpp
@@ -1,9 +1,9 @@
 #include <AMReX_GpuContainers.H>
-#include "Kessler.H"
-#include "IndexDefines.H"
-#include "PlaneAverage.H"
-#include "EOS.H"
-#include "TileNoZ.H"
+#include "ERF_Kessler.H"
+#include "ERF_IndexDefines.H"
+#include "ERF_PlaneAverage.H"
+#include "ERF_EOS.H"
+#include "ERF_TileNoZ.H"
 
 using namespace amrex;
 
diff --git a/Source/Microphysics/Kessler/Kessler.H b/Source/Microphysics/Kessler/ERF_Kessler.H
similarity index 95%
rename from Source/Microphysics/Kessler/Kessler.H
rename to Source/Microphysics/Kessler/ERF_Kessler.H
index 230facf10..1766cd7d0 100644
--- a/Source/Microphysics/Kessler/Kessler.H
+++ b/Source/Microphysics/Kessler/ERF_Kessler.H
@@ -6,8 +6,8 @@
  * 2): Marat Khairoutdinov and David Randall, cloud resolving modeling of the ARM summer 1997 IOP:
  * model formulation, results, unvertainties, and sensitivities, Journal of the atmospheric sciences, vol60, p607
  */
-#ifndef Kessler_H
-#define Kessler_H
+#ifndef ERF_Kessler_H
+#define ERF_Kessler_H
 
 #include <string>
 #include <vector>
@@ -19,10 +19,10 @@
 #include <AMReX_MultiFabUtil.H>
 
 #include "ERF_Constants.H"
-#include "Microphysics_Utils.H"
-#include "IndexDefines.H"
-#include "DataStruct.H"
-#include "NullMoist.H"
+#include "ERF_Microphysics_Utils.H"
+#include "ERF_IndexDefines.H"
+#include "ERF_DataStruct.H"
+#include "ERF_NullMoist.H"
 
 namespace MicVar_Kess {
    enum {
diff --git a/Source/Microphysics/Kessler/Kessler.cpp b/Source/Microphysics/Kessler/ERF_Kessler.cpp
similarity index 99%
rename from Source/Microphysics/Kessler/Kessler.cpp
rename to Source/Microphysics/Kessler/ERF_Kessler.cpp
index 2c67ffdd9..349d65c13 100644
--- a/Source/Microphysics/Kessler/Kessler.cpp
+++ b/Source/Microphysics/Kessler/ERF_Kessler.cpp
@@ -1,7 +1,7 @@
-#include <EOS.H>
-#include <TileNoZ.H>
-#include "Kessler.H"
-#include "DataStruct.H"
+#include <ERF_EOS.H>
+#include <ERF_TileNoZ.H>
+#include "ERF_Kessler.H"
+#include "ERF_DataStruct.H"
 
 using namespace amrex;
 
diff --git a/Source/Microphysics/Kessler/Update_Kessler.cpp b/Source/Microphysics/Kessler/ERF_Update_Kessler.cpp
similarity index 94%
rename from Source/Microphysics/Kessler/Update_Kessler.cpp
rename to Source/Microphysics/Kessler/ERF_Update_Kessler.cpp
index 7bf8022fb..c26a3ac8e 100644
--- a/Source/Microphysics/Kessler/Update_Kessler.cpp
+++ b/Source/Microphysics/Kessler/ERF_Update_Kessler.cpp
@@ -1,6 +1,6 @@
-#include "Kessler.H"
-#include "IndexDefines.H"
-#include "TileNoZ.H"
+#include "ERF_Kessler.H"
+#include "ERF_IndexDefines.H"
+#include "ERF_TileNoZ.H"
 
 using namespace amrex;
 
diff --git a/Source/Microphysics/Kessler/Make.package b/Source/Microphysics/Kessler/Make.package
index 9f4a9b0cd..62f12237d 100644
--- a/Source/Microphysics/Kessler/Make.package
+++ b/Source/Microphysics/Kessler/Make.package
@@ -1,4 +1,4 @@
-CEXE_sources += Init_Kessler.cpp
-CEXE_sources += Update_Kessler.cpp
-CEXE_sources += Kessler.cpp
-CEXE_headers += Kessler.H
+CEXE_sources += ERF_Init_Kessler.cpp
+CEXE_sources += ERF_Update_Kessler.cpp
+CEXE_sources += ERF_Kessler.cpp
+CEXE_headers += ERF_Kessler.H
diff --git a/Source/Microphysics/Make.package b/Source/Microphysics/Make.package
index d2b85471d..7123bdb00 100644
--- a/Source/Microphysics/Make.package
+++ b/Source/Microphysics/Make.package
@@ -1,4 +1,4 @@
-CEXE_headers += Microphysics.H
-CEXE_headers += EulerianMicrophysics.H
-CEXE_headers += LagrangianMicrophysics.H
+CEXE_headers += ERF_Microphysics.H
+CEXE_headers += ERF_EulerianMicrophysics.H
+CEXE_headers += ERF_LagrangianMicrophysics.H
 
diff --git a/Source/Microphysics/Null/NullMoist.H b/Source/Microphysics/Null/ERF_NullMoist.H
similarity index 94%
rename from Source/Microphysics/Null/NullMoist.H
rename to Source/Microphysics/Null/ERF_NullMoist.H
index f52382e47..c3734c62c 100644
--- a/Source/Microphysics/Null/NullMoist.H
+++ b/Source/Microphysics/Null/ERF_NullMoist.H
@@ -1,9 +1,9 @@
-#ifndef NULLMOIST_H
-#define NULLMOIST_H
+#ifndef ERF_NULLMOIST_H
+#define ERF_NULLMOIST_H
 
 #include <AMReX_MultiFabUtil.H>
 #include <AMReX_Geometry.H>
-#include <DataStruct.H>
+#include <ERF_DataStruct.H>
 
 class NullMoist {
 
diff --git a/Source/Microphysics/Null/NullMoistLagrangian.H b/Source/Microphysics/Null/ERF_NullMoistLagrangian.H
similarity index 90%
rename from Source/Microphysics/Null/NullMoistLagrangian.H
rename to Source/Microphysics/Null/ERF_NullMoistLagrangian.H
index 11d080244..a6e9f02e7 100644
--- a/Source/Microphysics/Null/NullMoistLagrangian.H
+++ b/Source/Microphysics/Null/ERF_NullMoistLagrangian.H
@@ -1,12 +1,12 @@
-/*! @file NullMoistLagrangian.H
+/*! @file ERF_NullMoistLagrangian.H
  *  \brief Contains the Lagrangian moisture model base class */
 
-#ifndef NULLMOISTLAGRANGIAN_H
-#define NULLMOISTLAGRANGIAN_H
+#ifndef ERF_NULLMOISTLAGRANGIAN_H
+#define ERF_NULLMOISTLAGRANGIAN_H
 
 #ifdef ERF_USE_PARTICLES
 
-#include "NullMoist.H"
+#include "ERF_NullMoist.H"
 
 /* forward declaration */
 class ERFPC;
diff --git a/Source/Microphysics/Null/Make.package b/Source/Microphysics/Null/Make.package
index d918b542d..d94920a4d 100644
--- a/Source/Microphysics/Null/Make.package
+++ b/Source/Microphysics/Null/Make.package
@@ -1,3 +1,3 @@
-CEXE_headers += NullMoist.H
-CEXE_headers += NullMoistLagrangian.H
+CEXE_headers += ERF_NullMoist.H
+CEXE_headers += ERF_NullMoistLagrangian.H
 
diff --git a/Source/Microphysics/SAM/Cloud_SAM.cpp b/Source/Microphysics/SAM/ERF_Cloud_SAM.cpp
similarity index 98%
rename from Source/Microphysics/SAM/Cloud_SAM.cpp
rename to Source/Microphysics/SAM/ERF_Cloud_SAM.cpp
index 8f5ec071d..e527bdac7 100644
--- a/Source/Microphysics/SAM/Cloud_SAM.cpp
+++ b/Source/Microphysics/SAM/ERF_Cloud_SAM.cpp
@@ -1,7 +1,7 @@
-#include "SAM.H"
-#include "IndexDefines.H"
-#include "TileNoZ.H"
-#include "EOS.H"
+#include "ERF_SAM.H"
+#include "ERF_IndexDefines.H"
+#include "ERF_TileNoZ.H"
+#include "ERF_EOS.H"
 
 using namespace amrex;
 
diff --git a/Source/Microphysics/SAM/IceFall.cpp b/Source/Microphysics/SAM/ERF_IceFall.cpp
similarity index 98%
rename from Source/Microphysics/SAM/IceFall.cpp
rename to Source/Microphysics/SAM/ERF_IceFall.cpp
index 4951c70f9..9518a9401 100644
--- a/Source/Microphysics/SAM/IceFall.cpp
+++ b/Source/Microphysics/SAM/ERF_IceFall.cpp
@@ -1,6 +1,6 @@
 #include <AMReX_ParReduce.H>
-#include "SAM.H"
-#include "TileNoZ.H"
+#include "ERF_SAM.H"
+#include "ERF_TileNoZ.H"
 
 using namespace amrex;
 
diff --git a/Source/Microphysics/SAM/Init_SAM.cpp b/Source/Microphysics/SAM/ERF_Init_SAM.cpp
similarity index 98%
rename from Source/Microphysics/SAM/Init_SAM.cpp
rename to Source/Microphysics/SAM/ERF_Init_SAM.cpp
index 69abdf31f..e14841d9d 100644
--- a/Source/Microphysics/SAM/Init_SAM.cpp
+++ b/Source/Microphysics/SAM/ERF_Init_SAM.cpp
@@ -1,9 +1,9 @@
 #include <AMReX_GpuContainers.H>
-#include "SAM.H"
-#include "IndexDefines.H"
-#include "PlaneAverage.H"
-#include "EOS.H"
-#include "TileNoZ.H"
+#include "ERF_SAM.H"
+#include "ERF_IndexDefines.H"
+#include "ERF_PlaneAverage.H"
+#include "ERF_EOS.H"
+#include "ERF_TileNoZ.H"
 
 using namespace amrex;
 
diff --git a/Source/Microphysics/SAM/Precip.cpp b/Source/Microphysics/SAM/ERF_Precip.cpp
similarity index 99%
rename from Source/Microphysics/SAM/Precip.cpp
rename to Source/Microphysics/SAM/ERF_Precip.cpp
index 466efa074..ba8de5e20 100644
--- a/Source/Microphysics/SAM/Precip.cpp
+++ b/Source/Microphysics/SAM/ERF_Precip.cpp
@@ -1,5 +1,5 @@
-#include "SAM.H"
-#include "EOS.H"
+#include "ERF_SAM.H"
+#include "ERF_EOS.H"
 
 using namespace amrex;
 
diff --git a/Source/Microphysics/SAM/PrecipFall.cpp b/Source/Microphysics/SAM/ERF_PrecipFall.cpp
similarity index 99%
rename from Source/Microphysics/SAM/PrecipFall.cpp
rename to Source/Microphysics/SAM/ERF_PrecipFall.cpp
index d72277cc7..abbfec8fd 100644
--- a/Source/Microphysics/SAM/PrecipFall.cpp
+++ b/Source/Microphysics/SAM/ERF_PrecipFall.cpp
@@ -1,6 +1,6 @@
 #include "ERF_Constants.H"
-#include "SAM.H"
-#include "TileNoZ.H"
+#include "ERF_SAM.H"
+#include "ERF_TileNoZ.H"
 
 using namespace amrex;
 
diff --git a/Source/Microphysics/SAM/SAM.H b/Source/Microphysics/SAM/ERF_SAM.H
similarity index 98%
rename from Source/Microphysics/SAM/SAM.H
rename to Source/Microphysics/SAM/ERF_SAM.H
index 0ba1a59c5..2a62c99ca 100644
--- a/Source/Microphysics/SAM/SAM.H
+++ b/Source/Microphysics/SAM/ERF_SAM.H
@@ -6,8 +6,8 @@
  * 2): Marat Khairoutdinov and David Randall, cloud resolving modeling of the ARM summer 1997 IOP:
  * model formulation, results, unvertainties, and sensitivities, Journal of the atmospheric sciences, vol60, p607
  */
-#ifndef SAM_H
-#define SAM_H
+#ifndef ERF_SAM_H
+#define ERF_SAM_H
 
 #include <string>
 #include <vector>
@@ -19,10 +19,10 @@
 #include <AMReX_MultiFabUtil.H>
 
 #include "ERF_Constants.H"
-#include "Microphysics_Utils.H"
-#include "IndexDefines.H"
-#include "DataStruct.H"
-#include "NullMoist.H"
+#include "ERF_Microphysics_Utils.H"
+#include "ERF_IndexDefines.H"
+#include "ERF_DataStruct.H"
+#include "ERF_NullMoist.H"
 
 namespace MicVar {
    enum {
diff --git a/Source/Microphysics/SAM/Update_SAM.cpp b/Source/Microphysics/SAM/ERF_Update_SAM.cpp
similarity index 96%
rename from Source/Microphysics/SAM/Update_SAM.cpp
rename to Source/Microphysics/SAM/ERF_Update_SAM.cpp
index ce4bb29ba..7fa9900fd 100644
--- a/Source/Microphysics/SAM/Update_SAM.cpp
+++ b/Source/Microphysics/SAM/ERF_Update_SAM.cpp
@@ -1,6 +1,6 @@
-#include "SAM.H"
-#include "IndexDefines.H"
-#include "TileNoZ.H"
+#include "ERF_SAM.H"
+#include "ERF_IndexDefines.H"
+#include "ERF_TileNoZ.H"
 
 using namespace amrex;
 
diff --git a/Source/Microphysics/SAM/Make.package b/Source/Microphysics/SAM/Make.package
index 567568770..9eb7eb632 100644
--- a/Source/Microphysics/SAM/Make.package
+++ b/Source/Microphysics/SAM/Make.package
@@ -1,8 +1,8 @@
-CEXE_sources += Cloud_SAM.cpp
-CEXE_sources += Init_SAM.cpp
-CEXE_sources += Update_SAM.cpp
-CEXE_sources += IceFall.cpp
-CEXE_sources += Precip.cpp
-CEXE_sources += PrecipFall.cpp
-CEXE_headers += SAM.H
+CEXE_sources += ERF_Cloud_SAM.cpp
+CEXE_sources += ERF_Init_SAM.cpp
+CEXE_sources += ERF_Update_SAM.cpp
+CEXE_sources += ERF_IceFall.cpp
+CEXE_sources += ERF_Precip.cpp
+CEXE_sources += ERF_PrecipFall.cpp
+CEXE_headers += ERF_SAM.H
 
diff --git a/Source/MultiBlock/MultiBlockContainer.H b/Source/MultiBlock/ERF_MultiBlockContainer.H
similarity index 94%
rename from Source/MultiBlock/MultiBlockContainer.H
rename to Source/MultiBlock/ERF_MultiBlockContainer.H
index a22748186..8aa968d7a 100644
--- a/Source/MultiBlock/MultiBlockContainer.H
+++ b/Source/MultiBlock/ERF_MultiBlockContainer.H
@@ -1,5 +1,5 @@
-#ifndef MultiBlockContainer_H_
-#define MultiBlockContainer_H_
+#ifndef ERF_MultiBlockContainer_H_
+#define ERF_MultiBlockContainer_H_
 
 #include <AMReX_NonLocalBC.H>
 #include <ERF.H>
diff --git a/Source/MultiBlock/MultiBlockContainer.cpp b/Source/MultiBlock/ERF_MultiBlockContainer.cpp
similarity index 99%
rename from Source/MultiBlock/MultiBlockContainer.cpp
rename to Source/MultiBlock/ERF_MultiBlockContainer.cpp
index b5131de65..a0898f617 100644
--- a/Source/MultiBlock/MultiBlockContainer.cpp
+++ b/Source/MultiBlock/ERF_MultiBlockContainer.cpp
@@ -1,4 +1,4 @@
-#include "MultiBlockContainer.H"
+#include "ERF_MultiBlockContainer.H"
 #include <AMReX_NonLocalBC.H>
 #include <ERF.H>
 
diff --git a/Source/MultiBlock/Make.package b/Source/MultiBlock/Make.package
index 32e178cc4..8a8752729 100644
--- a/Source/MultiBlock/Make.package
+++ b/Source/MultiBlock/Make.package
@@ -1,4 +1,4 @@
 ifeq ($(USE_MULTIBLOCK),TRUE)
-CEXE_sources += MultiBlockContainer.cpp
-CEXE_headers += MultiBlockContainer.H
+CEXE_sources += ERF_MultiBlockContainer.cpp
+CEXE_headers += ERF_MultiBlockContainer.H
 endif
diff --git a/Source/PBL/ComputeDiffusivityMYNN25.cpp b/Source/PBL/ERF_ComputeDiffusivityMYNN25.cpp
similarity index 98%
rename from Source/PBL/ComputeDiffusivityMYNN25.cpp
rename to Source/PBL/ERF_ComputeDiffusivityMYNN25.cpp
index 32907cef9..d2da5568f 100644
--- a/Source/PBL/ComputeDiffusivityMYNN25.cpp
+++ b/Source/PBL/ERF_ComputeDiffusivityMYNN25.cpp
@@ -1,9 +1,9 @@
-#include "ABLMost.H"
-#include "DirectionSelector.H"
-#include "Diffusion.H"
+#include "ERF_ABLMost.H"
+#include "ERF_DirectionSelector.H"
+#include "ERF_Diffusion.H"
 #include "ERF_Constants.H"
-#include "TurbStruct.H"
-#include "PBLModels.H"
+#include "ERF_TurbStruct.H"
+#include "ERF_PBLModels.H"
 
 using namespace amrex;
 
diff --git a/Source/PBL/ComputeDiffusivityYSU.cpp b/Source/PBL/ERF_ComputeDiffusivityYSU.cpp
similarity index 98%
rename from Source/PBL/ComputeDiffusivityYSU.cpp
rename to Source/PBL/ERF_ComputeDiffusivityYSU.cpp
index 7ccf6a4f2..3a9c92839 100644
--- a/Source/PBL/ComputeDiffusivityYSU.cpp
+++ b/Source/PBL/ERF_ComputeDiffusivityYSU.cpp
@@ -1,9 +1,9 @@
-#include "ABLMost.H"
-#include "DirectionSelector.H"
-#include "Diffusion.H"
+#include "ERF_ABLMost.H"
+#include "ERF_DirectionSelector.H"
+#include "ERF_Diffusion.H"
 #include "ERF_Constants.H"
-#include "TurbStruct.H"
-#include "PBLModels.H"
+#include "ERF_TurbStruct.H"
+#include "ERF_PBLModels.H"
 
 using namespace amrex;
 
diff --git a/Source/PBL/MYNNStruct.H b/Source/PBL/ERF_MYNNStruct.H
similarity index 98%
rename from Source/PBL/MYNNStruct.H
rename to Source/PBL/ERF_MYNNStruct.H
index 15575f2d2..15fbde688 100644
--- a/Source/PBL/MYNNStruct.H
+++ b/Source/PBL/ERF_MYNNStruct.H
@@ -1,5 +1,5 @@
-#ifndef _MYNN_STRUCT_H_
-#define _MYNN_STRUCT_H_
+#ifndef ERF_MYNN_STRUCT_H_
+#define ERF_MYNN_STRUCT_H_
 
 enum struct MYNNConfigType {
     NN09 = 0, // Nakanishi & Niino 2009, J Met Soc Japan
diff --git a/Source/PBL/PBLHeight.H b/Source/PBL/ERF_PBLHeight.H
similarity index 99%
rename from Source/PBL/PBLHeight.H
rename to Source/PBL/ERF_PBLHeight.H
index f6320c7d2..772ba6b05 100644
--- a/Source/PBL/PBLHeight.H
+++ b/Source/PBL/ERF_PBLHeight.H
@@ -1,9 +1,9 @@
-#ifndef _PBL_HEIGHT_H_
-#define _PBL_HEIGHT_H_
+#ifndef ERF_PBL_HEIGHT_H_
+#define ERF_PBL_HEIGHT_H_
 
 #include <AMReX_MultiFabUtil.H>
-#include <TileNoZ.H>
-#include <Thetav.H>
+#include <ERF_TileNoZ.H>
+#include <ERF_Thetav.H>
 
 struct MYNNPBLH {
     /*
diff --git a/Source/PBL/PBLModels.H b/Source/PBL/ERF_PBLModels.H
similarity index 99%
rename from Source/PBL/PBLModels.H
rename to Source/PBL/ERF_PBLModels.H
index a72a017b3..3f948b103 100644
--- a/Source/PBL/PBLModels.H
+++ b/Source/PBL/ERF_PBLModels.H
@@ -1,7 +1,7 @@
-#ifndef _PBLMODELS_H_
-#define _PBLMODELS_H_
+#ifndef ERF_PBLMODELS_H_
+#define ERF_PBLMODELS_H_
 
-#include <Thetav.H>
+#include <ERF_Thetav.H>
 
 /**
  * Compute eddy diffusivities of momentum (eddy viscosity) and heat using the
diff --git a/Source/PBL/Make.package b/Source/PBL/Make.package
index 6dc2fadec..83af2fd97 100644
--- a/Source/PBL/Make.package
+++ b/Source/PBL/Make.package
@@ -1,5 +1,5 @@
-CEXE_headers += PBLModels.H
-CEXE_sources += ComputeDiffusivityMYNN25.cpp
-CEXE_sources += ComputeDiffusivityYSU.cpp
+CEXE_headers += ERF_PBLModels.H
+CEXE_sources += ERF_ComputeDiffusivityMYNN25.cpp
+CEXE_sources += ERF_ComputeDiffusivityYSU.cpp
 
-CEXE_headers += PBLHeight.H
+CEXE_headers += ERF_PBLHeight.H
diff --git a/Source/Particles/ERFPCEvolve.cpp b/Source/Particles/ERFPCEvolve.cpp
index 8d5fea7ee..745957a55 100644
--- a/Source/Particles/ERFPCEvolve.cpp
+++ b/Source/Particles/ERFPCEvolve.cpp
@@ -2,7 +2,7 @@
 
 #ifdef ERF_USE_PARTICLES
 
-#include <IndexDefines.H>
+#include <ERF_IndexDefines.H>
 #include <ERF_Constants.H>
 #include <AMReX_TracerParticle_mod_K.H>
 
diff --git a/Source/Particles/ParticleData.H b/Source/Particles/ERF_ParticleData.H
similarity index 99%
rename from Source/Particles/ParticleData.H
rename to Source/Particles/ERF_ParticleData.H
index 437d2f5b6..acc06ccd1 100644
--- a/Source/Particles/ParticleData.H
+++ b/Source/Particles/ERF_ParticleData.H
@@ -1,5 +1,5 @@
-#ifndef _PARTICLE_DATA_H_
-#define _PARTICLE_DATA_H_
+#ifndef ERF_PARTICLE_DATA_H_
+#define ERF_PARTICLE_DATA_H_
 
 #ifdef ERF_USE_PARTICLES
 
diff --git a/Source/Particles/Make.package b/Source/Particles/Make.package
index f04d396ac..5fddce05a 100644
--- a/Source/Particles/Make.package
+++ b/Source/Particles/Make.package
@@ -3,5 +3,5 @@ CEXE_sources += ERFPCInitializations.cpp
 CEXE_sources += ERFPCEvolve.cpp
 CEXE_sources += ERFPCUtils.cpp
 
-CEXE_headers += ParticleData.H
+CEXE_headers += ERF_ParticleData.H
 CEXE_headers += ERFPC.H
diff --git a/Source/Prob/init_constant_density_hse.H b/Source/Prob/ERF_init_constant_density_hse.H
similarity index 100%
rename from Source/Prob/init_constant_density_hse.H
rename to Source/Prob/ERF_init_constant_density_hse.H
diff --git a/Source/Prob/init_density_hse_dry.H b/Source/Prob/ERF_init_density_hse_dry.H
similarity index 100%
rename from Source/Prob/init_density_hse_dry.H
rename to Source/Prob/ERF_init_density_hse_dry.H
diff --git a/Source/Prob/init_rayleigh_damping.H b/Source/Prob/ERF_init_rayleigh_damping.H
similarity index 98%
rename from Source/Prob/init_rayleigh_damping.H
rename to Source/Prob/ERF_init_rayleigh_damping.H
index ee16f35d4..ff169dddf 100644
--- a/Source/Prob/init_rayleigh_damping.H
+++ b/Source/Prob/ERF_init_rayleigh_damping.H
@@ -1,4 +1,4 @@
-#include <Utils/ParFunctions.H>
+#include <Utils/ERF_ParFunctions.H>
 
 /**
  * Initialize a Rayleigh damping layer with the same structure as in WRF, based
diff --git a/Source/Radiation/Aero_rad_props.H b/Source/Radiation/ERF_Aero_rad_props.H
similarity index 98%
rename from Source/Radiation/Aero_rad_props.H
rename to Source/Radiation/ERF_Aero_rad_props.H
index 36945d72e..f6af4b542 100644
--- a/Source/Radiation/Aero_rad_props.H
+++ b/Source/Radiation/ERF_Aero_rad_props.H
@@ -5,11 +5,11 @@
 #define ERF_AER_RAD_PROPS_H_
 
 #include <AMReX_MultiFabUtil.H>
-#include "Mam4_aero.H"
+#include "ERF_Mam4_aero.H"
 #include "YAKL_netcdf.h"
 #include "rrtmgp_const.h"
-#include "Rad_constants.H"
-#include "Mam4_constituents.H"
+#include "ERF_Rad_constants.H"
+#include "ERF_Mam4_constituents.H"
 
 //
 // AerRadProps class converts the aerosol mass to bulk optical properties for short wave
diff --git a/Source/Radiation/Aero_rad_props.cpp b/Source/Radiation/ERF_Aero_rad_props.cpp
similarity index 99%
rename from Source/Radiation/Aero_rad_props.cpp
rename to Source/Radiation/ERF_Aero_rad_props.cpp
index 19f807a13..01139c6ee 100644
--- a/Source/Radiation/Aero_rad_props.cpp
+++ b/Source/Radiation/ERF_Aero_rad_props.cpp
@@ -4,8 +4,8 @@
 #include <cmath>
 
 #include "ERF_Constants.H"
-#include "Aero_rad_props.H"
-#include "Water_vapor_saturation.H"
+#include "ERF_Aero_rad_props.H"
+#include "ERF_Water_vapor_saturation.H"
 using yakl::fortran::parallel_for;
 using yakl::fortran::SimpleBounds;
 
diff --git a/Source/Radiation/Albedo.H b/Source/Radiation/ERF_Albedo.H
similarity index 100%
rename from Source/Radiation/Albedo.H
rename to Source/Radiation/ERF_Albedo.H
diff --git a/Source/Radiation/Albedo.cpp b/Source/Radiation/ERF_Albedo.cpp
similarity index 95%
rename from Source/Radiation/Albedo.cpp
rename to Source/Radiation/ERF_Albedo.cpp
index f402a0cd6..08422db4f 100644
--- a/Source/Radiation/Albedo.cpp
+++ b/Source/Radiation/ERF_Albedo.cpp
@@ -1,6 +1,6 @@
 
 #include <rrtmgp_const.h>
-#include "Albedo.H"
+#include "ERF_Albedo.H"
 
 void set_albedo (const real1d& coszrs, real2d& albedo_dir, real2d& albedo_dif)
 {
diff --git a/Source/Radiation/Cloud_rad_props.H b/Source/Radiation/ERF_Cloud_rad_props.H
similarity index 97%
rename from Source/Radiation/Cloud_rad_props.H
rename to Source/Radiation/ERF_Cloud_rad_props.H
index dd01f43aa..15646a7d2 100644
--- a/Source/Radiation/Cloud_rad_props.H
+++ b/Source/Radiation/ERF_Cloud_rad_props.H
@@ -8,8 +8,8 @@
 #include "ERF_Constants.H"
 #include "ERF_Config.H"
 #include "rrtmgp_const.h"
-#include "Water_vapor_saturation.H"
-#include "Linear_interpolate.H"
+#include "ERF_Water_vapor_saturation.H"
+#include "ERF_Linear_interpolate.H"
 
 class CloudRadProps {
   public:
diff --git a/Source/Radiation/Cloud_rad_props.cpp b/Source/Radiation/ERF_Cloud_rad_props.cpp
similarity index 99%
rename from Source/Radiation/Cloud_rad_props.cpp
rename to Source/Radiation/ERF_Cloud_rad_props.cpp
index 7eab28aab..ca086256b 100644
--- a/Source/Radiation/Cloud_rad_props.cpp
+++ b/Source/Radiation/ERF_Cloud_rad_props.cpp
@@ -3,7 +3,7 @@
 //
 #include <cstdlib>
 #include "YAKL_netcdf.h"
-#include "Cloud_rad_props.H"
+#include "ERF_Cloud_rad_props.H"
 
 using yakl::fortran::parallel_for;
 using yakl::fortran::SimpleBounds;
diff --git a/Source/Radiation/Ebert_curry.H b/Source/Radiation/ERF_Ebert_curry.H
similarity index 100%
rename from Source/Radiation/Ebert_curry.H
rename to Source/Radiation/ERF_Ebert_curry.H
diff --git a/Source/Radiation/Finalize_rrtmgp.cpp b/Source/Radiation/ERF_Finalize_rrtmgp.cpp
similarity index 93%
rename from Source/Radiation/Finalize_rrtmgp.cpp
rename to Source/Radiation/ERF_Finalize_rrtmgp.cpp
index 910f799bc..135d10726 100644
--- a/Source/Radiation/Finalize_rrtmgp.cpp
+++ b/Source/Radiation/ERF_Finalize_rrtmgp.cpp
@@ -8,7 +8,7 @@
 #include "mo_fluxes_byband.h"
 
 // Rrtmgp
-#include "Rrtmgp.H"
+#include "ERF_Rrtmgp.H"
 
 void Rrtmgp::finalize ()
 {
diff --git a/Source/Radiation/Init_rrtmgp.cpp b/Source/Radiation/ERF_Init_rrtmgp.cpp
similarity index 98%
rename from Source/Radiation/Init_rrtmgp.cpp
rename to Source/Radiation/ERF_Init_rrtmgp.cpp
index 3cdf89ec7..0540099e9 100644
--- a/Source/Radiation/Init_rrtmgp.cpp
+++ b/Source/Radiation/ERF_Init_rrtmgp.cpp
@@ -8,7 +8,7 @@
 #include "mo_fluxes_byband.h"
 
 // Rrtmgp
-#include "Rrtmgp.H"
+#include "ERF_Rrtmgp.H"
 
 void Rrtmgp::initialize (int num_gas, const std::vector<std::string>& active_gas_names,
                          const char* rrtmgp_coefficients_file_sw,
diff --git a/Source/Radiation/Linear_interpolate.H b/Source/Radiation/ERF_Linear_interpolate.H
similarity index 100%
rename from Source/Radiation/Linear_interpolate.H
rename to Source/Radiation/ERF_Linear_interpolate.H
diff --git a/Source/Radiation/Mam4_aero.H b/Source/Radiation/ERF_Mam4_aero.H
similarity index 99%
rename from Source/Radiation/Mam4_aero.H
rename to Source/Radiation/ERF_Mam4_aero.H
index eec2f6a3d..b36792830 100644
--- a/Source/Radiation/Mam4_aero.H
+++ b/Source/Radiation/ERF_Mam4_aero.H
@@ -11,11 +11,11 @@
 
 #include "YAKL_netcdf.h"
 #include "rrtmgp_const.h"
-#include "Mam4_constituents.H"
-#include "Rad_constants.H"
+#include "ERF_Mam4_constituents.H"
+#include "ERF_Rad_constants.H"
 #include "ERF_Constants.H"
 #include "ERF_Config.H"
-#include "Modal_aero_wateruptake.H"
+#include "ERF_Modal_aero_wateruptake.H"
 
 using yakl::fortran::parallel_for;
 using yakl::fortran::SimpleBounds;
diff --git a/Source/Radiation/Mam4_constituents.H b/Source/Radiation/ERF_Mam4_constituents.H
similarity index 99%
rename from Source/Radiation/Mam4_constituents.H
rename to Source/Radiation/ERF_Mam4_constituents.H
index d0906164f..679331ccc 100644
--- a/Source/Radiation/Mam4_constituents.H
+++ b/Source/Radiation/ERF_Mam4_constituents.H
@@ -8,8 +8,8 @@
 #include <cstdlib>
 #include "YAKL_netcdf.h"
 #include "rrtmgp_const.h"
-#include "Phys_prop.H"
-#include "Rad_constants.H"
+#include "ERF_Phys_prop.H"
+#include "ERF_Rad_constants.H"
 #include "ERF_Config.H"
 
 #ifndef ERF_MAM4_CONSTITUENTS_H_
diff --git a/Source/Radiation/Modal_aero_wateruptake.H b/Source/Radiation/ERF_Modal_aero_wateruptake.H
similarity index 99%
rename from Source/Radiation/Modal_aero_wateruptake.H
rename to Source/Radiation/ERF_Modal_aero_wateruptake.H
index 22ae2cfba..e6394f590 100644
--- a/Source/Radiation/Modal_aero_wateruptake.H
+++ b/Source/Radiation/ERF_Modal_aero_wateruptake.H
@@ -8,9 +8,9 @@
 #include <memory>
 #include <AMReX_GpuComplex.H>
 #include "ERF_Constants.H"
-#include "Aero_rad_props.H"
-#include "Cloud_rad_props.H"
-#include "Mam4_constituents.H"
+#include "ERF_Aero_rad_props.H"
+#include "ERF_Cloud_rad_props.H"
+#include "ERF_Mam4_constituents.H"
 
 using yakl::fortran::parallel_for;
 using yakl::fortran::SimpleBounds;
diff --git a/Source/Radiation/Optics.H b/Source/Radiation/ERF_Optics.H
similarity index 98%
rename from Source/Radiation/Optics.H
rename to Source/Radiation/ERF_Optics.H
index 744f88b47..34a0fdeb0 100644
--- a/Source/Radiation/Optics.H
+++ b/Source/Radiation/ERF_Optics.H
@@ -17,8 +17,8 @@
 #include <AMReX_MultiFabUtil.H>
 
 #include "ERF_Constants.H"
-#include "Aero_rad_props.H"
-#include "Cloud_rad_props.H"
+#include "ERF_Aero_rad_props.H"
+#include "ERF_Cloud_rad_props.H"
 
 // Radiation code interface class
 class Optics {
diff --git a/Source/Radiation/Optics.cpp b/Source/Radiation/ERF_Optics.cpp
similarity index 99%
rename from Source/Radiation/Optics.cpp
rename to Source/Radiation/ERF_Optics.cpp
index 7e04406e3..1eeacc8c3 100644
--- a/Source/Radiation/Optics.cpp
+++ b/Source/Radiation/ERF_Optics.cpp
@@ -1,10 +1,10 @@
 //
 // get cloud and aerosol optics for short wave and long wave
 //
-#include "Optics.H"
-#include "Slingo.H"
-#include "Ebert_curry.H"
-#include "Rad_constants.H"
+#include "ERF_Optics.H"
+#include "ERF_Slingo.H"
+#include "ERF_Ebert_curry.H"
+#include "ERF_Rad_constants.H"
 #include "AMReX_Random.H"
 using yakl::fortran::parallel_for;
 using yakl::fortran::SimpleBounds;
diff --git a/Source/Radiation/Parameterizations.H b/Source/Radiation/ERF_Parameterizations.H
similarity index 98%
rename from Source/Radiation/Parameterizations.H
rename to Source/Radiation/ERF_Parameterizations.H
index 50909abfe..e7dede2f8 100644
--- a/Source/Radiation/Parameterizations.H
+++ b/Source/Radiation/ERF_Parameterizations.H
@@ -6,7 +6,7 @@
 #define ERF_PARAMETERIZATIONS_H_
 
 #include "rrtmgp_const.h"
-#include "Rad_constants.H"
+#include "ERF_Rad_constants.H"
 #include "ERF_Constants.H"
 
  AMREX_FORCE_INLINE
diff --git a/Source/Radiation/Phys_prop.H b/Source/Radiation/ERF_Phys_prop.H
similarity index 99%
rename from Source/Radiation/Phys_prop.H
rename to Source/Radiation/ERF_Phys_prop.H
index d2b7745e9..8c11c1733 100644
--- a/Source/Radiation/Phys_prop.H
+++ b/Source/Radiation/ERF_Phys_prop.H
@@ -6,7 +6,7 @@
 
 #include "YAKL_netcdf.h"
 #include "rrtmgp_const.h"
-#include "Rad_constants.H"
+#include "ERF_Rad_constants.H"
 #include <complex>
 #include <cstring>
 #include <fstream>
diff --git a/Source/Radiation/Rad_constants.H b/Source/Radiation/ERF_Rad_constants.H
similarity index 100%
rename from Source/Radiation/Rad_constants.H
rename to Source/Radiation/ERF_Rad_constants.H
diff --git a/Source/Radiation/Radiation.H b/Source/Radiation/ERF_Radiation.H
similarity index 98%
rename from Source/Radiation/Radiation.H
rename to Source/Radiation/ERF_Radiation.H
index 26f2d4f7e..a04bba1c5 100644
--- a/Source/Radiation/Radiation.H
+++ b/Source/Radiation/ERF_Radiation.H
@@ -25,12 +25,12 @@
 
 #include "ERF_Config.H"
 #include "ERF_Constants.H"
-#include "Rad_constants.H"
-#include "Rrtmgp.H"
-#include "Optics.H"
-#include "Aero_rad_props.H"
-#include "Parameterizations.H"
-#include "Albedo.H"
+#include "ERF_Rad_constants.H"
+#include "ERF_Rrtmgp.H"
+#include "ERF_Optics.H"
+#include "ERF_Aero_rad_props.H"
+#include "ERF_Parameterizations.H"
+#include "ERF_Albedo.H"
 
 // Radiation code interface class
 class Radiation {
diff --git a/Source/Radiation/Radiation.cpp b/Source/Radiation/ERF_Radiation.cpp
similarity index 99%
rename from Source/Radiation/Radiation.cpp
rename to Source/Radiation/ERF_Radiation.cpp
index 4635ae906..658cb42ee 100644
--- a/Source/Radiation/Radiation.cpp
+++ b/Source/Radiation/ERF_Radiation.cpp
@@ -15,8 +15,8 @@
 #include <vector>
 #include <memory>
 
-#include "Radiation.H"
-#include "m2005_effradius.H"
+#include "ERF_Radiation.H"
+#include "ERF_m2005_effradius.H"
 #include <AMReX_GpuContainers.H>
 #include <AMReX_FArrayBox.H>
 #include <AMReX_Geometry.H>
@@ -24,11 +24,11 @@
 #include <AMReX_MultiFabUtil.H>
 #include <AMReX_PlotFileUtil.H>
 #include "ERF_Constants.H"
-#include "IndexDefines.H"
-#include "DataStruct.H"
-#include "EOS.H"
-#include "TileNoZ.H"
-#include "Orbit.H"
+#include "ERF_IndexDefines.H"
+#include "ERF_DataStruct.H"
+#include "ERF_EOS.H"
+#include "ERF_TileNoZ.H"
+#include "ERF_Orbit.H"
 
 using namespace amrex;
 using yakl::intrinsics::size;
diff --git a/Source/Radiation/Rrtmgp.H b/Source/Radiation/ERF_Rrtmgp.H
similarity index 100%
rename from Source/Radiation/Rrtmgp.H
rename to Source/Radiation/ERF_Rrtmgp.H
diff --git a/Source/Radiation/Run_longwave_rrtmgp.cpp b/Source/Radiation/ERF_Run_longwave_rrtmgp.cpp
similarity index 99%
rename from Source/Radiation/Run_longwave_rrtmgp.cpp
rename to Source/Radiation/ERF_Run_longwave_rrtmgp.cpp
index 236a6978f..676198332 100644
--- a/Source/Radiation/Run_longwave_rrtmgp.cpp
+++ b/Source/Radiation/ERF_Run_longwave_rrtmgp.cpp
@@ -5,7 +5,7 @@
 #include "mo_rte_lw.h"
 #include "mo_optical_props.h"
 #include "mo_fluxes_byband.h"
-#include "Rrtmgp.H"
+#include "ERF_Rrtmgp.H"
 
 void Rrtmgp::run_longwave_rrtmgp (int ngas, int ncol, int nlay,
                                   const real3d& gas_vmr,
diff --git a/Source/Radiation/Run_shortwave_rrtmgp.cpp b/Source/Radiation/ERF_Run_shortwave_rrtmgp.cpp
similarity index 99%
rename from Source/Radiation/Run_shortwave_rrtmgp.cpp
rename to Source/Radiation/ERF_Run_shortwave_rrtmgp.cpp
index 3e29d62d5..300f72616 100644
--- a/Source/Radiation/Run_shortwave_rrtmgp.cpp
+++ b/Source/Radiation/ERF_Run_shortwave_rrtmgp.cpp
@@ -1,4 +1,4 @@
-#include "Rrtmgp.H"
+#include "ERF_Rrtmgp.H"
 #include <AMReX_BLassert.H>
 
 void Rrtmgp::run_shortwave_rrtmgp (int ngas, int ncol, int nlay,
diff --git a/Source/Radiation/Slingo.H b/Source/Radiation/ERF_Slingo.H
similarity index 100%
rename from Source/Radiation/Slingo.H
rename to Source/Radiation/ERF_Slingo.H
diff --git a/Source/Radiation/m2005_effradius.H b/Source/Radiation/ERF_m2005_effradius.H
similarity index 99%
rename from Source/Radiation/m2005_effradius.H
rename to Source/Radiation/ERF_m2005_effradius.H
index b66142d75..6d9dc8a64 100644
--- a/Source/Radiation/m2005_effradius.H
+++ b/Source/Radiation/ERF_m2005_effradius.H
@@ -13,7 +13,7 @@
  NOTE: this code is modified from E3SM
 -------------------------------------------------------------------------------------------*/
 #include "ERF_Constants.H"
-#include "Rad_constants.H"
+#include "ERF_Rad_constants.H"
 #include <cmath>
 
 using namespace amrex;
diff --git a/Source/Radiation/Make.package b/Source/Radiation/Make.package
index 812d78765..e170c39b0 100644
--- a/Source/Radiation/Make.package
+++ b/Source/Radiation/Make.package
@@ -1,13 +1,13 @@
 
-CEXE_headers += Rrtmgp.H
-CEXE_headers += Rad_constants.H
-CEXE_headers += Slingo.H
-CEXE_headers += Ebert_curry.H
-CEXE_headers += Linear_interpolate.H
-CEXE_headers += Phys_prop.H
+CEXE_headers += ERF_Rrtmgp.H
+CEXE_headers += ERF_Rad_constants.H
+CEXE_headers += ERF_Slingo.H
+CEXE_headers += ERF_Ebert_curry.H
+CEXE_headers += ERF_Linear_interpolate.H
+CEXE_headers += ERF_Phys_prop.H
 
-CEXE_sources += Finalize_rrtmgp.cpp
-CEXE_sources += Init_rrtmgp.cpp 
-CEXE_sources += Run_longwave_rrtmgp.cpp 
-CEXE_sources += Run_shortwave_rrtmgp.cpp 
+CEXE_sources += ERF_Finalize_rrtmgp.cpp
+CEXE_sources += ERF_Init_rrtmgp.cpp 
+CEXE_sources += ERF_Run_longwave_rrtmgp.cpp 
+CEXE_sources += ERF_Run_shortwave_rrtmgp.cpp 
 
diff --git a/Source/SourceTerms/ERF_ApplySpongeZoneBCs.cpp b/Source/SourceTerms/ERF_ApplySpongeZoneBCs.cpp
index c8c391446..bbfa5de02 100644
--- a/Source/SourceTerms/ERF_ApplySpongeZoneBCs.cpp
+++ b/Source/SourceTerms/ERF_ApplySpongeZoneBCs.cpp
@@ -1,9 +1,9 @@
 #include <AMReX_MultiFab.H>
-#include <Src_headers.H>
+#include <ERF_Src_headers.H>
 
-//#include <TerrainMetrics.H>
-//#include <IndexDefines.H>
-//#include <PlaneAverage.H>
+//#include <ERF_TerrainMetrics.H>
+//#include <ERF_IndexDefines.H>
+//#include <ERF_PlaneAverage.H>
 
 using namespace amrex;
 
diff --git a/Source/SourceTerms/ERF_ApplySpongeZoneBCs_ReadFromFile.cpp b/Source/SourceTerms/ERF_ApplySpongeZoneBCs_ReadFromFile.cpp
index ea350f1d9..b4d8b52d3 100644
--- a/Source/SourceTerms/ERF_ApplySpongeZoneBCs_ReadFromFile.cpp
+++ b/Source/SourceTerms/ERF_ApplySpongeZoneBCs_ReadFromFile.cpp
@@ -1,10 +1,10 @@
 #include <AMReX_MultiFab.H>
-#include <Src_headers.H>
-#include <InputSpongeData.H>
+#include <ERF_Src_headers.H>
+#include <ERF_InputSpongeData.H>
 
-//#include <TerrainMetrics.H>
-//#include <IndexDefines.H>
-//#include <PlaneAverage.H>
+//#include <ERF_TerrainMetrics.H>
+//#include <ERF_IndexDefines.H>
+//#include <ERF_PlaneAverage.H>
 
 using namespace amrex;
 
diff --git a/Source/SourceTerms/NumericalDiffusion.H b/Source/SourceTerms/ERF_NumericalDiffusion.H
similarity index 91%
rename from Source/SourceTerms/NumericalDiffusion.H
rename to Source/SourceTerms/ERF_NumericalDiffusion.H
index 23753f52b..14212e417 100644
--- a/Source/SourceTerms/NumericalDiffusion.H
+++ b/Source/SourceTerms/ERF_NumericalDiffusion.H
@@ -1,8 +1,8 @@
-#ifndef _NUMERICALDIFFUSION_H_
-#define _NUMERICALDIFFUSION_H_
+#ifndef ERF_NUMERICALDIFFUSION_H_
+#define ERF_NUMERICALDIFFUSION_H_
 
 #include <AMReX.H>
-#include <DataStruct.H>
+#include <ERF_DataStruct.H>
 #include <AMReX_MultiFab.H>
 
 void NumericalDiffusion (const amrex::Box& bx,
diff --git a/Source/SourceTerms/NumericalDiffusion.cpp b/Source/SourceTerms/ERF_NumericalDiffusion.cpp
similarity index 99%
rename from Source/SourceTerms/NumericalDiffusion.cpp
rename to Source/SourceTerms/ERF_NumericalDiffusion.cpp
index 4e9d59961..e5d287d40 100644
--- a/Source/SourceTerms/NumericalDiffusion.cpp
+++ b/Source/SourceTerms/ERF_NumericalDiffusion.cpp
@@ -1,4 +1,4 @@
-#include <NumericalDiffusion.H>
+#include <ERF_NumericalDiffusion.H>
 
 using namespace amrex;
 
diff --git a/Source/SourceTerms/Src_headers.H b/Source/SourceTerms/ERF_Src_headers.H
similarity index 97%
rename from Source/SourceTerms/Src_headers.H
rename to Source/SourceTerms/ERF_Src_headers.H
index fee64e7db..0eba05509 100644
--- a/Source/SourceTerms/Src_headers.H
+++ b/Source/SourceTerms/ERF_Src_headers.H
@@ -1,10 +1,10 @@
-#ifndef _INTEGRATION_H_
-#define _INTEGRATION_H_
+#ifndef ERF_INTEGRATION_H_
+#define ERF_INTEGRATION_H_
 
 #include <AMReX_MultiFab.H>
-#include "DataStruct.H"
-#include "InputSoundingData.H"
-#include "TurbPertStruct.H"
+#include "ERF_DataStruct.H"
+#include "ERF_InputSoundingData.H"
+#include "ERF_TurbPertStruct.H"
 
 #ifdef ERF_USE_EB
 #include <AMReX_EBMultiFabUtil.H>
diff --git a/Source/SourceTerms/ERF_add_thin_body_sources.cpp b/Source/SourceTerms/ERF_add_thin_body_sources.cpp
index eb7b210d1..fdc47b3bd 100644
--- a/Source/SourceTerms/ERF_add_thin_body_sources.cpp
+++ b/Source/SourceTerms/ERF_add_thin_body_sources.cpp
@@ -4,11 +4,11 @@
 #include <AMReX_TableData.H>
 #include <AMReX_GpuContainers.H>
 
-#include <NumericalDiffusion.H>
-#include <PlaneAverage.H>
-#include <TI_slow_headers.H>
-#include <Src_headers.H>
-#include <Utils.H>
+#include <ERF_NumericalDiffusion.H>
+#include <ERF_PlaneAverage.H>
+#include <ERF_TI_slow_headers.H>
+#include <ERF_Src_headers.H>
+#include <ERF_Utils.H>
 
 using namespace amrex;
 
diff --git a/Source/SourceTerms/ERF_make_buoyancy.cpp b/Source/SourceTerms/ERF_make_buoyancy.cpp
index 36446809c..1488daf80 100644
--- a/Source/SourceTerms/ERF_make_buoyancy.cpp
+++ b/Source/SourceTerms/ERF_make_buoyancy.cpp
@@ -3,11 +3,11 @@
 #include <AMReX_GpuContainers.H>
 
 #include <ERF_Constants.H>
-#include <EOS.H>
-#include <IndexDefines.H>
-#include <PlaneAverage.H>
-#include <Src_headers.H>
-//#include <TerrainMetrics.H>
+#include <ERF_EOS.H>
+#include <ERF_IndexDefines.H>
+#include <ERF_PlaneAverage.H>
+#include <ERF_Src_headers.H>
+//#include <ERF_TerrainMetrics.H>
 
 using namespace amrex;
 
diff --git a/Source/SourceTerms/ERF_make_mom_sources.cpp b/Source/SourceTerms/ERF_make_mom_sources.cpp
index aebc09595..d5ca82d84 100644
--- a/Source/SourceTerms/ERF_make_mom_sources.cpp
+++ b/Source/SourceTerms/ERF_make_mom_sources.cpp
@@ -4,11 +4,11 @@
 #include <AMReX_TableData.H>
 #include <AMReX_GpuContainers.H>
 
-#include <NumericalDiffusion.H>
-#include <PlaneAverage.H>
-#include <TI_slow_headers.H>
-#include <Src_headers.H>
-#include <Utils.H>
+#include <ERF_NumericalDiffusion.H>
+#include <ERF_PlaneAverage.H>
+#include <ERF_TI_slow_headers.H>
+#include <ERF_Src_headers.H>
+#include <ERF_Utils.H>
 
 using namespace amrex;
 
diff --git a/Source/SourceTerms/ERF_make_sources.cpp b/Source/SourceTerms/ERF_make_sources.cpp
index 2800592d7..6c6f1c58c 100644
--- a/Source/SourceTerms/ERF_make_sources.cpp
+++ b/Source/SourceTerms/ERF_make_sources.cpp
@@ -4,9 +4,9 @@
 #include <AMReX_TableData.H>
 #include <AMReX_GpuContainers.H>
 
-#include <NumericalDiffusion.H>
-#include <Src_headers.H>
-#include <TI_slow_headers.H>
+#include <ERF_NumericalDiffusion.H>
+#include <ERF_Src_headers.H>
+#include <ERF_TI_slow_headers.H>
 
 using namespace amrex;
 
diff --git a/Source/SourceTerms/ERF_moist_set_rhs.cpp b/Source/SourceTerms/ERF_moist_set_rhs.cpp
index e5ee94b58..08313dbc9 100644
--- a/Source/SourceTerms/ERF_moist_set_rhs.cpp
+++ b/Source/SourceTerms/ERF_moist_set_rhs.cpp
@@ -1,7 +1,7 @@
 #if defined(ERF_USE_NETCDF)
 
-#include <Src_headers.H>
-#include <Utils.H>
+#include <ERF_Src_headers.H>
+#include <ERF_Utils.H>
 
 using namespace amrex;
 
diff --git a/Source/SourceTerms/Make.package b/Source/SourceTerms/Make.package
index 0f1df167e..32cf2443a 100644
--- a/Source/SourceTerms/Make.package
+++ b/Source/SourceTerms/Make.package
@@ -4,12 +4,12 @@ CEXE_sources += ERF_make_mom_sources.cpp
 CEXE_sources += ERF_make_sources.cpp
 CEXE_sources += ERF_ApplySpongeZoneBCs.cpp
 CEXE_sources += ERF_ApplySpongeZoneBCs_ReadFromFile.cpp
-CEXE_sources += NumericalDiffusion.cpp
+CEXE_sources += ERF_NumericalDiffusion.cpp
 
 ifeq ($(USE_NETCDF),TRUE)
 CEXE_sources += ERF_moist_set_rhs.cpp
 endif
 
-CEXE_headers += NumericalDiffusion.H
-CEXE_headers += Src_headers.H
+CEXE_headers += ERF_NumericalDiffusion.H
+CEXE_headers += ERF_Src_headers.H
 
diff --git a/Source/TimeIntegration/ERF_Advance.cpp b/Source/TimeIntegration/ERF_Advance.cpp
index decca8f39..ca33d1aaa 100644
--- a/Source/TimeIntegration/ERF_Advance.cpp
+++ b/Source/TimeIntegration/ERF_Advance.cpp
@@ -1,8 +1,8 @@
 #include <ERF.H>
-#include <Utils.H>
+#include <ERF_Utils.H>
 
 #ifdef ERF_USE_WINDFARM
-#include <WindFarm.H>
+#include <ERF_WindFarm.H>
 #endif
 
 using namespace amrex;
@@ -115,11 +115,11 @@ ERF::Advance (int lev, Real time, Real dt_lev, int iteration, int /*ncycle*/)
     int nvars = S_old.nComp();
 
     // Source array for conserved cell-centered quantities -- this will be filled
-    //     in the call to make_sources in TI_slow_rhs_fun.H
+    //     in the call to make_sources in ERF_TI_slow_rhs_fun.H
     MultiFab cc_source(ba,dm,nvars,1); cc_source.setVal(0.0);
 
     // Source arrays for momenta -- these will be filled
-    //     in the call to make_mom_sources in TI_slow_rhs_fun.H
+    //     in the call to make_mom_sources in ERF_TI_slow_rhs_fun.H
     BoxArray ba_x(ba); ba_x.surroundingNodes(0);
     MultiFab xmom_source(ba_x,dm,nvars,1); xmom_source.setVal(0.0);
 
diff --git a/Source/TimeIntegration/ERF_ComputeTimestep.cpp b/Source/TimeIntegration/ERF_ComputeTimestep.cpp
index 38d27e165..91f19fb19 100644
--- a/Source/TimeIntegration/ERF_ComputeTimestep.cpp
+++ b/Source/TimeIntegration/ERF_ComputeTimestep.cpp
@@ -1,4 +1,4 @@
-#include <EOS.H>
+#include <ERF_EOS.H>
 #include <ERF.H>
 
 using namespace amrex;
diff --git a/Source/TimeIntegration/ERF_MRI.H b/Source/TimeIntegration/ERF_MRI.H
index 2cf7bc780..c5605a8db 100644
--- a/Source/TimeIntegration/ERF_MRI.H
+++ b/Source/TimeIntegration/ERF_MRI.H
@@ -6,8 +6,8 @@
 #include <AMReX_ParmParse.H>
 #include <AMReX_IntegratorBase.H>
 
-#include <TI_slow_headers.H>
-#include <TI_fast_headers.H>
+#include <ERF_TI_slow_headers.H>
+#include <ERF_TI_fast_headers.H>
 
 #include <functional>
 
diff --git a/Source/TimeIntegration/TI_fast_headers.H b/Source/TimeIntegration/ERF_TI_fast_headers.H
similarity index 96%
rename from Source/TimeIntegration/TI_fast_headers.H
rename to Source/TimeIntegration/ERF_TI_fast_headers.H
index 775f3d3f6..4504db371 100644
--- a/Source/TimeIntegration/TI_fast_headers.H
+++ b/Source/TimeIntegration/ERF_TI_fast_headers.H
@@ -1,15 +1,15 @@
-#ifndef _FAST_INTEGRATION_H_
-#define _FAST_INTEGRATION_H_
+#ifndef ERF_FAST_INTEGRATION_H_
+#define ERF_FAST_INTEGRATION_H_
 
 #include <AMReX_MultiFab.H>
 #include <AMReX_BCRec.H>
 #include <AMReX_YAFluxRegister.H>
-#include "DataStruct.H"
-#include "IndexDefines.H"
-#include <TerrainMetrics.H>
+#include "ERF_DataStruct.H"
+#include "ERF_IndexDefines.H"
+#include <ERF_TerrainMetrics.H>
 
-#include <TileNoZ.H>
-#include <prob_common.H>
+#include <ERF_TileNoZ.H>
+#include <ERF_prob_common.H>
 
 #ifdef ERF_USE_EB
 #include <AMReX_EBMultiFabUtil.H>
diff --git a/Source/TimeIntegration/TI_fast_rhs_fun.H b/Source/TimeIntegration/ERF_TI_fast_rhs_fun.H
similarity index 100%
rename from Source/TimeIntegration/TI_fast_rhs_fun.H
rename to Source/TimeIntegration/ERF_TI_fast_rhs_fun.H
diff --git a/Source/TimeIntegration/TI_no_substep_fun.H b/Source/TimeIntegration/ERF_TI_no_substep_fun.H
similarity index 100%
rename from Source/TimeIntegration/TI_no_substep_fun.H
rename to Source/TimeIntegration/ERF_TI_no_substep_fun.H
diff --git a/Source/TimeIntegration/TI_slow_headers.H b/Source/TimeIntegration/ERF_TI_slow_headers.H
similarity index 97%
rename from Source/TimeIntegration/TI_slow_headers.H
rename to Source/TimeIntegration/ERF_TI_slow_headers.H
index 28be5a056..ff7d04645 100644
--- a/Source/TimeIntegration/TI_slow_headers.H
+++ b/Source/TimeIntegration/ERF_TI_slow_headers.H
@@ -1,19 +1,19 @@
-#ifndef _SLOW_INTEGRATION_H_
-#define _SLOW_INTEGRATION_H_
+#ifndef ERF_SLOW_INTEGRATION_H_
+#define ERF_SLOW_INTEGRATION_H_
 
 #include <AMReX_MultiFab.H>
 #include <AMReX_BCRec.H>
 #include <AMReX_YAFluxRegister.H>
-#include "DataStruct.H"
-#include "IndexDefines.H"
-#include "ABLMost.H"
+#include "ERF_DataStruct.H"
+#include "ERF_IndexDefines.H"
+#include "ERF_ABLMost.H"
 
-#include <Advection.H>
-#include <Diffusion.H>
-#include <EddyViscosity.H>
-#include <PlaneAverage.H>
-#include <TerrainMetrics.H>
-#include <TileNoZ.H>
+#include <ERF_Advection.H>
+#include <ERF_Diffusion.H>
+#include <ERF_EddyViscosity.H>
+#include <ERF_PlaneAverage.H>
+#include <ERF_TerrainMetrics.H>
+#include <ERF_TileNoZ.H>
 
 #ifdef ERF_USE_EB
 #include <AMReX_MultiCutFab.H>
diff --git a/Source/TimeIntegration/TI_slow_rhs_fun.H b/Source/TimeIntegration/ERF_TI_slow_rhs_fun.H
similarity index 99%
rename from Source/TimeIntegration/TI_slow_rhs_fun.H
rename to Source/TimeIntegration/ERF_TI_slow_rhs_fun.H
index 59e715ad9..73efeecae 100644
--- a/Source/TimeIntegration/TI_slow_rhs_fun.H
+++ b/Source/TimeIntegration/ERF_TI_slow_rhs_fun.H
@@ -1,4 +1,4 @@
-#include "Src_headers.H"
+#include "ERF_Src_headers.H"
 
 /**
  *  Wrapper for calling the routine that creates the slow RHS
diff --git a/Source/TimeIntegration/TI_utils.H b/Source/TimeIntegration/ERF_TI_utils.H
similarity index 100%
rename from Source/TimeIntegration/TI_utils.H
rename to Source/TimeIntegration/ERF_TI_utils.H
diff --git a/Source/TimeIntegration/ERF_TimeStep.cpp b/Source/TimeIntegration/ERF_TimeStep.cpp
index cf9b7361d..3460582fd 100644
--- a/Source/TimeIntegration/ERF_TimeStep.cpp
+++ b/Source/TimeIntegration/ERF_TimeStep.cpp
@@ -1,5 +1,5 @@
 #include <ERF.H>
-#include <Utils.H>
+#include <ERF_Utils.H>
 
 using namespace amrex;
 
diff --git a/Source/TimeIntegration/ERF_advance_dycore.cpp b/Source/TimeIntegration/ERF_advance_dycore.cpp
index c79927cdf..aaeaa8089 100644
--- a/Source/TimeIntegration/ERF_advance_dycore.cpp
+++ b/Source/TimeIntegration/ERF_advance_dycore.cpp
@@ -1,15 +1,15 @@
 #include <AMReX_BC_TYPES.H>
 #include <AMReX_TimeIntegrator.H>
 #include <ERF_MRI.H>
-#include <EddyViscosity.H>
-#include <EOS.H>
+#include <ERF_EddyViscosity.H>
+#include <ERF_EOS.H>
 #include <ERF.H>
-#include <TerrainMetrics.H>
+#include <ERF_TerrainMetrics.H>
 //#include <TI_headers.H>
-//#include <PlaneAverage.H>
-#include <Diffusion.H>
-#include <TileNoZ.H>
-#include <Utils.H>
+//#include <ERF_PlaneAverage.H>
+#include <ERF_Diffusion.H>
+#include <ERF_TileNoZ.H>
+#include <ERF_Utils.H>
 
 using namespace amrex;
 
@@ -188,7 +188,7 @@ void ERF::advance_dycore(int level,
 
     MultiFab Omega (state_old[IntVars::zmom].boxArray(),dm,1,1);
 
-#include "TI_utils.H"
+#include "ERF_TI_utils.H"
 
     // Additional SFS quantities, calculated once per timestep
     MultiFab* Hfx1 = SFS_hfx1_lev[level].get();
@@ -277,9 +277,9 @@ void ERF::advance_dycore(int level,
               fast_only, vel_and_mom_synced);
     cons_to_prim(state_old[IntVars::cons], state_old[IntVars::cons].nGrow());
 
-#include "TI_no_substep_fun.H"
-#include "TI_slow_rhs_fun.H"
-#include "TI_fast_rhs_fun.H"
+#include "ERF_TI_no_substep_fun.H"
+#include "ERF_TI_slow_rhs_fun.H"
+#include "ERF_TI_fast_rhs_fun.H"
 
     // ***************************************************************************************
     // Setup the integrator and integrate for a single timestep
diff --git a/Source/TimeIntegration/ERF_fast_rhs_MT.cpp b/Source/TimeIntegration/ERF_fast_rhs_MT.cpp
index 8a0f53676..64aa958d8 100644
--- a/Source/TimeIntegration/ERF_fast_rhs_MT.cpp
+++ b/Source/TimeIntegration/ERF_fast_rhs_MT.cpp
@@ -1,5 +1,5 @@
 
-#include <TI_fast_headers.H>
+#include <ERF_TI_fast_headers.H>
 
 using namespace amrex;
 
diff --git a/Source/TimeIntegration/ERF_fast_rhs_N.cpp b/Source/TimeIntegration/ERF_fast_rhs_N.cpp
index 36d9e2ba4..2f6473d9b 100644
--- a/Source/TimeIntegration/ERF_fast_rhs_N.cpp
+++ b/Source/TimeIntegration/ERF_fast_rhs_N.cpp
@@ -1,5 +1,5 @@
 
-#include <TI_fast_headers.H>
+#include <ERF_TI_fast_headers.H>
 
 using namespace amrex;
 
diff --git a/Source/TimeIntegration/ERF_fast_rhs_T.cpp b/Source/TimeIntegration/ERF_fast_rhs_T.cpp
index 7cf306284..c689a8942 100644
--- a/Source/TimeIntegration/ERF_fast_rhs_T.cpp
+++ b/Source/TimeIntegration/ERF_fast_rhs_T.cpp
@@ -1,5 +1,5 @@
 
-#include <TI_fast_headers.H>
+#include <ERF_TI_fast_headers.H>
 
 using namespace amrex;
 
diff --git a/Source/TimeIntegration/ERF_make_fast_coeffs.cpp b/Source/TimeIntegration/ERF_make_fast_coeffs.cpp
index 7ca0d9644..8f057c8e5 100644
--- a/Source/TimeIntegration/ERF_make_fast_coeffs.cpp
+++ b/Source/TimeIntegration/ERF_make_fast_coeffs.cpp
@@ -1,7 +1,7 @@
 #include <AMReX.H>
 
-#include <TI_fast_headers.H>
-#include <prob_common.H>
+#include <ERF_TI_fast_headers.H>
+#include <ERF_prob_common.H>
 
 using namespace amrex;
 
diff --git a/Source/TimeIntegration/ERF_make_tau_terms.cpp b/Source/TimeIntegration/ERF_make_tau_terms.cpp
index f575f3ba1..30c8251b0 100644
--- a/Source/TimeIntegration/ERF_make_tau_terms.cpp
+++ b/Source/TimeIntegration/ERF_make_tau_terms.cpp
@@ -3,9 +3,9 @@
 #include <AMReX_BCRec.H>
 #include <AMReX_GpuContainers.H>
 
-#include <TI_slow_headers.H>
-#include <EOS.H>
-#include <Utils.H>
+#include <ERF_TI_slow_headers.H>
+#include <ERF_EOS.H>
+#include <ERF_Utils.H>
 
 using namespace amrex;
 
diff --git a/Source/TimeIntegration/ERF_slow_rhs_post.cpp b/Source/TimeIntegration/ERF_slow_rhs_post.cpp
index d1e839fcd..7e8538ff9 100644
--- a/Source/TimeIntegration/ERF_slow_rhs_post.cpp
+++ b/Source/TimeIntegration/ERF_slow_rhs_post.cpp
@@ -1,9 +1,9 @@
 #include <AMReX.H>
-#include <Src_headers.H>
-#include <TI_slow_headers.H>
+#include <ERF_Src_headers.H>
+#include <ERF_TI_slow_headers.H>
 
 #if defined(ERF_USE_NETCDF)
-// #include <Utils.H>
+// #include <ERF_Utils.H>
 #endif
 
 using namespace amrex;
diff --git a/Source/TimeIntegration/ERF_slow_rhs_pre.cpp b/Source/TimeIntegration/ERF_slow_rhs_pre.cpp
index 8af804969..de218c81d 100644
--- a/Source/TimeIntegration/ERF_slow_rhs_pre.cpp
+++ b/Source/TimeIntegration/ERF_slow_rhs_pre.cpp
@@ -4,9 +4,9 @@
 #include <AMReX_GpuContainers.H>
 #include <AMReX_GpuPrint.H>
 
-#include <TI_slow_headers.H>
-#include <EOS.H>
-#include <Utils.H>
+#include <ERF_TI_slow_headers.H>
+#include <ERF_EOS.H>
+#include <ERF_Utils.H>
 
 using namespace amrex;
 
diff --git a/Source/TimeIntegration/Make.package b/Source/TimeIntegration/Make.package
index 7f38f3eab..d117f5e87 100644
--- a/Source/TimeIntegration/Make.package
+++ b/Source/TimeIntegration/Make.package
@@ -12,13 +12,12 @@ CEXE_sources += ERF_fast_rhs_N.cpp
 CEXE_sources += ERF_fast_rhs_T.cpp
 CEXE_sources += ERF_fast_rhs_MT.cpp
 
-CEXE_headers += TI_fast_rhs_fun.H
-CEXE_headers += TI_slow_rhs_fun.H
-CEXE_headers += TI_no_substep_fun.H
-CEXE_headers += TI_fast_headers.H
-CEXE_headers += TI_slow_headers.H
-CEXE_headers += TI_utils.H
+CEXE_headers += ERF_TI_fast_rhs_fun.H
+CEXE_headers += ERF_TI_slow_rhs_fun.H
+CEXE_headers += ERF_TI_no_substep_fun.H
+CEXE_headers += ERF_TI_fast_headers.H
+CEXE_headers += ERF_TI_slow_headers.H
+CEXE_headers += ERF_TI_utils.H
 
 CEXE_headers += ERF_MRI.H
-CEXE_headers += TimeIntegration.H
 
diff --git a/Source/Utils/ChopGrids.cpp b/Source/Utils/ERF_ChopGrids.cpp
similarity index 97%
rename from Source/Utils/ChopGrids.cpp
rename to Source/Utils/ERF_ChopGrids.cpp
index 21d5ef166..20d9effbd 100644
--- a/Source/Utils/ChopGrids.cpp
+++ b/Source/Utils/ERF_ChopGrids.cpp
@@ -1,4 +1,4 @@
-#include <Utils.H>
+#include <ERF_Utils.H>
 
 using namespace amrex;
 
diff --git a/Source/Utils/DirectionSelector.H b/Source/Utils/ERF_DirectionSelector.H
similarity index 96%
rename from Source/Utils/DirectionSelector.H
rename to Source/Utils/ERF_DirectionSelector.H
index 84e51fe05..372ced903 100644
--- a/Source/Utils/DirectionSelector.H
+++ b/Source/Utils/ERF_DirectionSelector.H
@@ -1,6 +1,6 @@
 
-#ifndef DirectionSelector_H
-#define DirectionSelector_H
+#ifndef ERF_DirectionSelector_H
+#define ERF_DirectionSelector_H
 
 #include "AMReX_Box.H"
 #include "AMReX_Gpu.H"
@@ -100,4 +100,4 @@ ParallelBox (const amrex::Box& bx, const amrex::IntVect& iv)
     return lbx;
 }
 
-#endif /* DirectionSelector_H */
+#endif /* ERF_DirectionSelector.H */
diff --git a/Source/Utils/InteriorGhostCells.cpp b/Source/Utils/ERF_InteriorGhostCells.cpp
similarity index 99%
rename from Source/Utils/InteriorGhostCells.cpp
rename to Source/Utils/ERF_InteriorGhostCells.cpp
index 81d1a7d6c..c1ba8cd39 100644
--- a/Source/Utils/InteriorGhostCells.cpp
+++ b/Source/Utils/ERF_InteriorGhostCells.cpp
@@ -1,4 +1,4 @@
-#include <Utils.H>
+#include <ERF_Utils.H>
 
 using namespace amrex;
 
diff --git a/Source/Utils/Interpolation.H b/Source/Utils/ERF_Interpolation.H
similarity index 97%
rename from Source/Utils/Interpolation.H
rename to Source/Utils/ERF_Interpolation.H
index 92209e7aa..57e12c005 100644
--- a/Source/Utils/Interpolation.H
+++ b/Source/Utils/ERF_Interpolation.H
@@ -1,10 +1,10 @@
-#ifndef INTERPOLATE_H_
-#define INTERPOLATE_H_
+#ifndef ERF_INTERPOLATE_H_
+#define ERF_INTERPOLATE_H_
 
-#include "DataStruct.H"
-#include "Interpolation_UPW.H"
-#include "Interpolation_WENO.H"
-#include "Interpolation_WENO_Z.H"
+#include "ERF_DataStruct.H"
+#include "ERF_Interpolation_UPW.H"
+#include "ERF_Interpolation_WENO.H"
+#include "ERF_Interpolation_WENO_Z.H"
 
 /**
  * Interpolation operators used in construction of advective fluxes using non-WENO schemes
diff --git a/Source/Utils/Interpolation_1D.H b/Source/Utils/ERF_Interpolation_1D.H
similarity index 100%
rename from Source/Utils/Interpolation_1D.H
rename to Source/Utils/ERF_Interpolation_1D.H
diff --git a/Source/Utils/Interpolation_UPW.H b/Source/Utils/ERF_Interpolation_UPW.H
similarity index 99%
rename from Source/Utils/Interpolation_UPW.H
rename to Source/Utils/ERF_Interpolation_UPW.H
index cf48be331..89feb6108 100644
--- a/Source/Utils/Interpolation_UPW.H
+++ b/Source/Utils/ERF_Interpolation_UPW.H
@@ -1,7 +1,7 @@
-#ifndef INTERPOLATE_UPW_H_
-#define INTERPOLATE_UPW_H_
+#ifndef ERF_INTERPOLATE_UPW_H_
+#define ERF_INTERPOLATE_UPW_H_
 
-#include "DataStruct.H"
+#include "ERF_DataStruct.H"
 
 /**
  * Interpolation operators used for 2nd order centered scheme
diff --git a/Source/Utils/Interpolation_WENO.H b/Source/Utils/ERF_Interpolation_WENO.H
similarity index 98%
rename from Source/Utils/Interpolation_WENO.H
rename to Source/Utils/ERF_Interpolation_WENO.H
index 7648388ec..e6325424c 100644
--- a/Source/Utils/Interpolation_WENO.H
+++ b/Source/Utils/ERF_Interpolation_WENO.H
@@ -1,7 +1,7 @@
-#ifndef INTERPOLATE_WENO_H_
-#define INTERPOLATE_WENO_H_
+#ifndef ERF_INTERPOLATE_WENO_H_
+#define ERF_INTERPOLATE_WENO_H_
 
-#include "DataStruct.H"
+#include "ERF_DataStruct.H"
 
 /**
  * Interpolation operators used for WENO-5 scheme
diff --git a/Source/Utils/Interpolation_WENO_Z.H b/Source/Utils/ERF_Interpolation_WENO_Z.H
similarity index 99%
rename from Source/Utils/Interpolation_WENO_Z.H
rename to Source/Utils/ERF_Interpolation_WENO_Z.H
index 402c45d72..62e008e1a 100644
--- a/Source/Utils/Interpolation_WENO_Z.H
+++ b/Source/Utils/ERF_Interpolation_WENO_Z.H
@@ -1,7 +1,7 @@
-#ifndef INTERPOLATE_WENO_Z_H_
-#define INTERPOLATE_WENO_Z_H_
+#ifndef ERF_INTERPOLATE_WENO_Z_H_
+#define ERF_INTERPOLATE_WENO_Z_H_
 
-#include "DataStruct.H"
+#include "ERF_DataStruct.H"
 
 /**
  * Interpolation operators used for WENO_Z-3 scheme
diff --git a/Source/Utils/Microphysics_Utils.H b/Source/Utils/ERF_Microphysics_Utils.H
similarity index 98%
rename from Source/Utils/Microphysics_Utils.H
rename to Source/Utils/ERF_Microphysics_Utils.H
index c5eb5b66f..a4fbeaab3 100644
--- a/Source/Utils/Microphysics_Utils.H
+++ b/Source/Utils/ERF_Microphysics_Utils.H
@@ -2,8 +2,8 @@
  * utility tools for microphysics
  *
  */
-#ifndef Microphysics_Utils_H
-#define Microphysics_Utils_H
+#ifndef ERF_Microphysics_Utils_H
+#define ERF_Microphysics_Utils_H
 
 #include <cmath>
 #include <vector>
diff --git a/Source/Utils/MomentumToVelocity.cpp b/Source/Utils/ERF_MomentumToVelocity.cpp
similarity index 98%
rename from Source/Utils/MomentumToVelocity.cpp
rename to Source/Utils/ERF_MomentumToVelocity.cpp
index 9ca10654c..72126997d 100644
--- a/Source/Utils/MomentumToVelocity.cpp
+++ b/Source/Utils/ERF_MomentumToVelocity.cpp
@@ -1,9 +1,9 @@
 /**
- * \file MomentumToVelocity.cpp
+ * \file ERF_MomentumToVelocity.cpp
  */
 #include <AMReX.H>
 #include <AMReX_MultiFab.H>
-#include <Utils.H>
+#include <ERF_Utils.H>
 
 using namespace amrex;
 
diff --git a/Source/Utils/Orbit.H b/Source/Utils/ERF_Orbit.H
similarity index 98%
rename from Source/Utils/Orbit.H
rename to Source/Utils/ERF_Orbit.H
index d33c50c78..52c339f7a 100644
--- a/Source/Utils/Orbit.H
+++ b/Source/Utils/ERF_Orbit.H
@@ -1,9 +1,9 @@
-#ifndef _ORBIT_H_
-#define _ORBIT_H_
+#ifndef ERF_ORBIT_H_
+#define ERF_ORBIT_H_
 
 #include <AMReX.H>
 #include <AMReX_MultiFab.H>
-#include <Rrtmgp.H>
+#include <ERF_Rrtmgp.H>
 #include <ERF_Constants.H>
 
 void
diff --git a/Source/Utils/Orbit.cpp b/Source/Utils/ERF_Orbit.cpp
similarity index 98%
rename from Source/Utils/Orbit.cpp
rename to Source/Utils/ERF_Orbit.cpp
index fafa81337..25e61f12f 100644
--- a/Source/Utils/Orbit.cpp
+++ b/Source/Utils/ERF_Orbit.cpp
@@ -1,4 +1,4 @@
-#include <Orbit.H>
+#include <ERF_Orbit.H>
 
 using namespace amrex;
 
diff --git a/Source/Utils/ParFunctions.H b/Source/Utils/ERF_ParFunctions.H
similarity index 90%
rename from Source/Utils/ParFunctions.H
rename to Source/Utils/ERF_ParFunctions.H
index feaa267d0..03c6ea9ea 100644
--- a/Source/Utils/ParFunctions.H
+++ b/Source/Utils/ERF_ParFunctions.H
@@ -1,5 +1,5 @@
-#ifndef ParFunctions_H
-#define ParFunctions_H
+#ifndef ERF_ParFunctions_H
+#define ERF_ParFunctions_H
 
 /**
  * Reduce a multifab to a vector of max values at each height
@@ -23,4 +23,4 @@ void reduce_to_max_per_height (amrex::Vector<amrex::Real>& v,
     amrex::ParallelDescriptor::ReduceRealMax(v.data(), v.size());
 }
 
-#endif /* ParFunctions_H */
+#endif /* ERF_ParFunctions.H */
diff --git a/Source/Utils/PlaneAverage.H b/Source/Utils/ERF_PlaneAverage.H
similarity index 98%
rename from Source/Utils/PlaneAverage.H
rename to Source/Utils/ERF_PlaneAverage.H
index 3fc902181..061da85c4 100644
--- a/Source/Utils/PlaneAverage.H
+++ b/Source/Utils/ERF_PlaneAverage.H
@@ -1,11 +1,11 @@
-#ifndef PlaneAverage_H
-#define PlaneAverage_H
+#ifndef ERF_PlaneAverage_H
+#define ERF_PlaneAverage_H
 
 #include "AMReX_Gpu.H"
 #include "AMReX_iMultiFab.H"
 #include "AMReX_MultiFab.H"
 #include "AMReX_GpuContainers.H"
-#include "DirectionSelector.H"
+#include "ERF_DirectionSelector.H"
 
 /**
  * Basic averaging and interpolation operations
@@ -237,4 +237,4 @@ PlaneAverage::compute_averages (const IndexSelector& idxOp, const amrex::MultiFa
     lavg.copyToHost(m_line_average.data(), m_line_average.size());
     amrex::ParallelDescriptor::ReduceRealSum(m_line_average.data(), m_line_average.size());
 }
-#endif /* PlaneAverage_H */
+#endif /* ERF_PlaneAverage.H */
diff --git a/Source/Utils/ERF_PoissonSolve.cpp b/Source/Utils/ERF_PoissonSolve.cpp
index 812d4e87f..c0dc4e1ad 100644
--- a/Source/Utils/ERF_PoissonSolve.cpp
+++ b/Source/Utils/ERF_PoissonSolve.cpp
@@ -1,7 +1,7 @@
 #include "ERF.H"
 #include <AMReX_MLMG.H>
 #include <AMReX_MLABecLaplacian.H>
-#include "Utils.H"
+#include "ERF_Utils.H"
 
 #ifdef ERF_USE_POISSON_SOLVE
 
diff --git a/Source/Utils/ERF_PoissonSolve_ml.cpp b/Source/Utils/ERF_PoissonSolve_ml.cpp
index 5c5d5c612..45d933ced 100644
--- a/Source/Utils/ERF_PoissonSolve_ml.cpp
+++ b/Source/Utils/ERF_PoissonSolve_ml.cpp
@@ -1,7 +1,7 @@
 #include "ERF.H"
 #include <AMReX_MLMG.H>
 #include <AMReX_MLABecLaplacian.H>
-#include "Utils.H"
+#include "ERF_Utils.H"
 
 #ifdef ERF_USE_POISSON_SOLVE
 
diff --git a/Source/Utils/ERF_PoissonSolve_tb.cpp b/Source/Utils/ERF_PoissonSolve_tb.cpp
index 2daa04013..152666d8f 100644
--- a/Source/Utils/ERF_PoissonSolve_tb.cpp
+++ b/Source/Utils/ERF_PoissonSolve_tb.cpp
@@ -1,7 +1,7 @@
 #include "ERF.H"
 #include <AMReX_MLMG.H>
 #include <AMReX_MLPoisson.H>
-#include "Utils.H"
+#include "ERF_Utils.H"
 
 #ifdef ERF_USE_POISSON_SOLVE
 
diff --git a/Source/Utils/Sat_methods.H b/Source/Utils/ERF_Sat_methods.H
similarity index 100%
rename from Source/Utils/Sat_methods.H
rename to Source/Utils/ERF_Sat_methods.H
diff --git a/Source/Utils/TerrainMetrics.H b/Source/Utils/ERF_TerrainMetrics.H
similarity index 99%
rename from Source/Utils/TerrainMetrics.H
rename to Source/Utils/ERF_TerrainMetrics.H
index 83aaac61d..f63a45523 100644
--- a/Source/Utils/TerrainMetrics.H
+++ b/Source/Utils/ERF_TerrainMetrics.H
@@ -1,10 +1,10 @@
-#ifndef _TERRAIN_METRIC_H_
-#define _TERRAIN_METRIC_H_
+#ifndef ERF_TERRAIN_METRIC_H_
+#define ERF_TERRAIN_METRIC_H_
 
 #include <AMReX.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_MultiFab.H>
-#include <IndexDefines.H>
+#include <ERF_IndexDefines.H>
 
 /**
  * Utility routines for constructing terrain metric terms
diff --git a/Source/Utils/TerrainMetrics.cpp b/Source/Utils/ERF_TerrainMetrics.cpp
similarity index 99%
rename from Source/Utils/TerrainMetrics.cpp
rename to Source/Utils/ERF_TerrainMetrics.cpp
index 49ec665ec..437c2530f 100644
--- a/Source/Utils/TerrainMetrics.cpp
+++ b/Source/Utils/ERF_TerrainMetrics.cpp
@@ -1,5 +1,5 @@
-#include <TerrainMetrics.H>
-#include <Utils.H>
+#include <ERF_TerrainMetrics.H>
+#include <ERF_Utils.H>
 #include <AMReX_ParmParse.H>
 #include <ERF_Constants.H>
 #include <cmath>
diff --git a/Source/Utils/Thetav.H b/Source/Utils/ERF_Thetav.H
similarity index 93%
rename from Source/Utils/Thetav.H
rename to Source/Utils/ERF_Thetav.H
index a3522772b..36d63cc50 100644
--- a/Source/Utils/Thetav.H
+++ b/Source/Utils/ERF_Thetav.H
@@ -1,5 +1,5 @@
-#ifndef _UTILS_THETAV_H_
-#define _UTILS_THETAV_H_
+#ifndef ERF_UTILS_THETAV_H_
+#define ERF_UTILS_THETAV_H_
 /*
  * Calculate virtual potential temperature, returning potential temperature in
  * the absence of moisture.
diff --git a/Source/Utils/TileNoZ.H b/Source/Utils/ERF_TileNoZ.H
similarity index 89%
rename from Source/Utils/TileNoZ.H
rename to Source/Utils/ERF_TileNoZ.H
index b43bd24a7..90ce1b884 100644
--- a/Source/Utils/TileNoZ.H
+++ b/Source/Utils/ERF_TileNoZ.H
@@ -1,5 +1,5 @@
-#ifndef _TILE_NO_Z_H_
-#define _TILE_NO_Z_H_
+#ifndef ERF_TILE_NO_Z_H_
+#define ERF_TILE_NO_Z_H_
 
 #include <AMReX.H>
 
diff --git a/Source/Utils/Time_Avg_Vel.cpp b/Source/Utils/ERF_Time_Avg_Vel.cpp
similarity index 98%
rename from Source/Utils/Time_Avg_Vel.cpp
rename to Source/Utils/ERF_Time_Avg_Vel.cpp
index 5121ede60..4a9d3a6ad 100644
--- a/Source/Utils/Time_Avg_Vel.cpp
+++ b/Source/Utils/ERF_Time_Avg_Vel.cpp
@@ -1,4 +1,4 @@
-#include <Utils.H>
+#include <ERF_Utils.H>
 
 using namespace amrex;
 
diff --git a/Source/Utils/Utils.H b/Source/Utils/ERF_Utils.H
similarity index 99%
rename from Source/Utils/Utils.H
rename to Source/Utils/ERF_Utils.H
index f2aa8ab35..e70c62187 100644
--- a/Source/Utils/Utils.H
+++ b/Source/Utils/ERF_Utils.H
@@ -1,12 +1,12 @@
-#ifndef _UTILS_H_
-#define _UTILS_H_
+#ifndef ERF_UTILS_H_
+#define ERF_UTILS_H_
 
 #include <AMReX.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_BCRec.H>
-#include <DataStruct.H>
-#include <IndexDefines.H>
-#include <ABLMost.H>
+#include <ERF_DataStruct.H>
+#include <ERF_IndexDefines.H>
+#include <ERF_ABLMost.H>
 #include <ERF_FillPatcher.H>
 
 /*
diff --git a/Source/Utils/VelocityToMomentum.cpp b/Source/Utils/ERF_VelocityToMomentum.cpp
similarity index 98%
rename from Source/Utils/VelocityToMomentum.cpp
rename to Source/Utils/ERF_VelocityToMomentum.cpp
index e94346c5c..271356276 100644
--- a/Source/Utils/VelocityToMomentum.cpp
+++ b/Source/Utils/ERF_VelocityToMomentum.cpp
@@ -1,9 +1,9 @@
 /**
- * \file VelocityToMomentum.cpp
+ * \file ERF_VelocityToMomentum.cpp
  */
 #include <AMReX.H>
 #include <AMReX_MultiFab.H>
-#include <Utils.H>
+#include <ERF_Utils.H>
 #include <AMReX_MultiFabUtil.H>
 
 using namespace amrex;
diff --git a/Source/Utils/Water_vapor_saturation.H b/Source/Utils/ERF_Water_vapor_saturation.H
similarity index 99%
rename from Source/Utils/Water_vapor_saturation.H
rename to Source/Utils/ERF_Water_vapor_saturation.H
index 330a709f6..b98a2e2c4 100644
--- a/Source/Utils/Water_vapor_saturation.H
+++ b/Source/Utils/ERF_Water_vapor_saturation.H
@@ -22,7 +22,7 @@
 #include <memory>
 
 #include "ERF_Constants.H"
-#include "Sat_methods.H"
+#include "ERF_Sat_methods.H"
 
 // Radiation code interface class
 class WaterVaporSat {
@@ -379,4 +379,4 @@ public:
         return;
     }
 };
-#endif // WATER_VAPOR_SATURATION_H_
+#endif // ERF_WATER_VAPOR_SATURATION_H_
diff --git a/Source/Utils/Wstar.H b/Source/Utils/ERF_Wstar.H
similarity index 94%
rename from Source/Utils/Wstar.H
rename to Source/Utils/ERF_Wstar.H
index 965e19c48..5f9304b3d 100644
--- a/Source/Utils/Wstar.H
+++ b/Source/Utils/ERF_Wstar.H
@@ -1,5 +1,5 @@
-#ifndef _UTILS_WSTAR_H_
-#define _UTILS_WSTAR_H_
+#ifndef ERF_UTILS_WSTAR_H_
+#define ERF_UTILS_WSTAR_H_
 
 #include <ERF_Constants.H>
 
diff --git a/Source/Utils/Make.package b/Source/Utils/Make.package
index 98a4e0998..d979b2049 100644
--- a/Source/Utils/Make.package
+++ b/Source/Utils/Make.package
@@ -1,25 +1,25 @@
-CEXE_headers += TerrainMetrics.H
-CEXE_headers += Microphysics_Utils.H
-CEXE_headers += TileNoZ.H
-CEXE_headers += Utils.H
-CEXE_headers += Interpolation_UPW.H
-CEXE_headers += Interpolation_WENO.H
-CEXE_headers += Interpolation_WENO_Z.H
-CEXE_headers += Interpolation.H
-CEXE_headers += Interpolation_1D.H
+CEXE_headers += ERF_TerrainMetrics.H
+CEXE_headers += ERF_Microphysics_Utils.H
+CEXE_headers += ERF_TileNoZ.H
+CEXE_headers += ERF_Utils.H
+CEXE_headers += ERF_Interpolation_UPW.H
+CEXE_headers += ERF_Interpolation_WENO.H
+CEXE_headers += ERF_Interpolation_WENO_Z.H
+CEXE_headers += ERF_Interpolation.H
+CEXE_headers += ERF_Interpolation_1D.H
 
-CEXE_headers += ParFunctions.H
+CEXE_headers += ERF_ParFunctions.H
 
-CEXE_headers += Sat_methods.H
-CEXE_headers += Water_vapor_saturation.H
-CEXE_headers += DirectionSelector.H
+CEXE_headers += ERF_Sat_methods.H
+CEXE_headers += ERF_Water_vapor_saturation.H
+CEXE_headers += ERF_DirectionSelector.H
 
-CEXE_sources += ChopGrids.cpp
-CEXE_sources += MomentumToVelocity.cpp
-CEXE_sources += VelocityToMomentum.cpp
-CEXE_sources += InteriorGhostCells.cpp
-CEXE_sources += TerrainMetrics.cpp
-CEXE_sources += Time_Avg_Vel.cpp  
+CEXE_sources += ERF_ChopGrids.cpp
+CEXE_sources += ERF_MomentumToVelocity.cpp
+CEXE_sources += ERF_VelocityToMomentum.cpp
+CEXE_sources += ERF_InteriorGhostCells.cpp
+CEXE_sources += ERF_TerrainMetrics.cpp
+CEXE_sources += ERF_Time_Avg_Vel.cpp  
 
 ifeq ($(USE_POISSON_SOLVE),TRUE)
 CEXE_sources += ERF_PoissonSolve.cpp
diff --git a/Source/WindFarmParametrization/InitWindFarm.cpp b/Source/WindFarmParametrization/ERF_InitWindFarm.cpp
similarity index 99%
rename from Source/WindFarmParametrization/InitWindFarm.cpp
rename to Source/WindFarmParametrization/ERF_InitWindFarm.cpp
index b0f829c62..74290866c 100644
--- a/Source/WindFarmParametrization/InitWindFarm.cpp
+++ b/Source/WindFarmParametrization/ERF_InitWindFarm.cpp
@@ -1,8 +1,8 @@
 /**
- * \file InitWindFarm.cpp
+ * \file ERF_InitWindFarm.cpp
  */
 
-#include <WindFarm.H>
+#include <ERF_WindFarm.H>
 
 using namespace amrex;
 
diff --git a/Source/WindFarmParametrization/WindFarm.H b/Source/WindFarmParametrization/ERF_WindFarm.H
similarity index 95%
rename from Source/WindFarmParametrization/WindFarm.H
rename to Source/WindFarmParametrization/ERF_WindFarm.H
index 377e60a3b..fde7f518c 100644
--- a/Source/WindFarmParametrization/WindFarm.H
+++ b/Source/WindFarmParametrization/ERF_WindFarm.H
@@ -1,14 +1,14 @@
-#ifndef WINDFARM_H
-#define WINDFARM_H
+#ifndef ERF_WINDFARM_H
+#define ERF_WINDFARM_H
 
-#include <DataStruct.H>
+#include <ERF_DataStruct.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_MultiFab.H>
 
-#include "NullWindFarm.H"
-#include "Fitch.H"
-#include "EWP.H"
-#include "SimpleAD.H"
+#include "ERF_NullWindFarm.H"
+#include "ERF_Fitch.H"
+#include "ERF_EWP.H"
+#include "ERF_SimpleAD.H"
 
 class WindFarm : public NullWindFarm {
 
diff --git a/Source/WindFarmParametrization/EWP/AdvanceEWP.cpp b/Source/WindFarmParametrization/EWP/ERF_AdvanceEWP.cpp
similarity index 98%
rename from Source/WindFarmParametrization/EWP/AdvanceEWP.cpp
rename to Source/WindFarmParametrization/EWP/ERF_AdvanceEWP.cpp
index 899b864a7..021669775 100644
--- a/Source/WindFarmParametrization/EWP/AdvanceEWP.cpp
+++ b/Source/WindFarmParametrization/EWP/ERF_AdvanceEWP.cpp
@@ -1,7 +1,7 @@
-#include <EWP.H>
-#include <IndexDefines.H>
+#include <ERF_EWP.H>
+#include <ERF_IndexDefines.H>
 #include <ERF_Constants.H>
-#include <Interpolation_1D.H>
+#include <ERF_Interpolation_1D.H>
 
 using namespace amrex;
 
diff --git a/Source/WindFarmParametrization/EWP/EWP.H b/Source/WindFarmParametrization/EWP/ERF_EWP.H
similarity index 95%
rename from Source/WindFarmParametrization/EWP/EWP.H
rename to Source/WindFarmParametrization/EWP/ERF_EWP.H
index 031416f00..123ece6a2 100644
--- a/Source/WindFarmParametrization/EWP/EWP.H
+++ b/Source/WindFarmParametrization/EWP/ERF_EWP.H
@@ -1,10 +1,10 @@
-#ifndef EWP_H
-#define EWP_H
+#ifndef ERF_EWP_H
+#define ERF_EWP_H
 
 #include <AMReX_Geometry.H>
 #include <AMReX_MultiFab.H>
 
-#include "NullWindFarm.H"
+#include "ERF_NullWindFarm.H"
 
 class EWP : public NullWindFarm {
 
diff --git a/Source/WindFarmParametrization/EWP/Make.package b/Source/WindFarmParametrization/EWP/Make.package
index 56789f3d1..400792fa5 100644
--- a/Source/WindFarmParametrization/EWP/Make.package
+++ b/Source/WindFarmParametrization/EWP/Make.package
@@ -1,2 +1,2 @@
-CEXE_sources += AdvanceEWP.cpp
-CEXE_headers += EWP.H
+CEXE_sources += ERF_AdvanceEWP.cpp
+CEXE_headers += ERF_EWP.H
diff --git a/Source/WindFarmParametrization/Fitch/AdvanceFitch.cpp b/Source/WindFarmParametrization/Fitch/ERF_AdvanceFitch.cpp
similarity index 98%
rename from Source/WindFarmParametrization/Fitch/AdvanceFitch.cpp
rename to Source/WindFarmParametrization/Fitch/ERF_AdvanceFitch.cpp
index ce9ef9892..7825a3572 100644
--- a/Source/WindFarmParametrization/Fitch/AdvanceFitch.cpp
+++ b/Source/WindFarmParametrization/Fitch/ERF_AdvanceFitch.cpp
@@ -1,7 +1,7 @@
-#include <Fitch.H>
-#include <IndexDefines.H>
+#include <ERF_Fitch.H>
+#include <ERF_IndexDefines.H>
 #include <ERF_Constants.H>
-#include <Interpolation_1D.H>
+#include <ERF_Interpolation_1D.H>
 
 using namespace amrex;
 
diff --git a/Source/WindFarmParametrization/Fitch/Fitch.H b/Source/WindFarmParametrization/Fitch/ERF_Fitch.H
similarity index 95%
rename from Source/WindFarmParametrization/Fitch/Fitch.H
rename to Source/WindFarmParametrization/Fitch/ERF_Fitch.H
index 78bf2b375..309aa996c 100644
--- a/Source/WindFarmParametrization/Fitch/Fitch.H
+++ b/Source/WindFarmParametrization/Fitch/ERF_Fitch.H
@@ -1,10 +1,10 @@
-#ifndef FITCH_H
-#define FITCH_H
+#ifndef ERF_FITCH_H
+#define ERF_FITCH_H
 
 #include <AMReX_Geometry.H>
 #include <AMReX_MultiFab.H>
 
-#include "NullWindFarm.H"
+#include "ERF_NullWindFarm.H"
 
 class Fitch : public NullWindFarm {
 
diff --git a/Source/WindFarmParametrization/Fitch/Make.package b/Source/WindFarmParametrization/Fitch/Make.package
index 814a15862..de56e7275 100644
--- a/Source/WindFarmParametrization/Fitch/Make.package
+++ b/Source/WindFarmParametrization/Fitch/Make.package
@@ -1,2 +1,2 @@
-CEXE_sources += AdvanceFitch.cpp
-CEXE_headers += Fitch.H
+CEXE_sources += ERF_AdvanceFitch.cpp
+CEXE_headers += ERF_Fitch.H
diff --git a/Source/WindFarmParametrization/Make.package b/Source/WindFarmParametrization/Make.package
index ebe5c58cb..10f6ffb07 100644
--- a/Source/WindFarmParametrization/Make.package
+++ b/Source/WindFarmParametrization/Make.package
@@ -1,2 +1,2 @@
-CEXE_headers += WindFarm.H
-CEXE_sources += InitWindFarm.cpp
+CEXE_headers += ERF_WindFarm.H
+CEXE_sources += ERF_InitWindFarm.cpp
diff --git a/Source/WindFarmParametrization/Null/NullWindFarm.H b/Source/WindFarmParametrization/Null/ERF_NullWindFarm.H
similarity index 96%
rename from Source/WindFarmParametrization/Null/NullWindFarm.H
rename to Source/WindFarmParametrization/Null/ERF_NullWindFarm.H
index 4cbdd73c3..ebfc5f195 100644
--- a/Source/WindFarmParametrization/Null/NullWindFarm.H
+++ b/Source/WindFarmParametrization/Null/ERF_NullWindFarm.H
@@ -1,7 +1,7 @@
-#ifndef NULLWINDFARM_H
-#define NULLWINDFARM_H
+#ifndef ERF_NULLWINDFARM_H
+#define ERF_NULLWINDFARM_H
 
-#include <DataStruct.H>
+#include <ERF_DataStruct.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_MultiFab.H>
 
diff --git a/Source/WindFarmParametrization/Null/Make.package b/Source/WindFarmParametrization/Null/Make.package
index 571b0c2b8..be55d7e31 100644
--- a/Source/WindFarmParametrization/Null/Make.package
+++ b/Source/WindFarmParametrization/Null/Make.package
@@ -1 +1 @@
-CEXE_headers += NullWindFarm.H
+CEXE_headers += ERF_NullWindFarm.H
diff --git a/Source/WindFarmParametrization/SimpleActuatorDisk/AdvanceSimpleAD.cpp b/Source/WindFarmParametrization/SimpleActuatorDisk/ERF_AdvanceSimpleAD.cpp
similarity index 98%
rename from Source/WindFarmParametrization/SimpleActuatorDisk/AdvanceSimpleAD.cpp
rename to Source/WindFarmParametrization/SimpleActuatorDisk/ERF_AdvanceSimpleAD.cpp
index 3f26533ab..f9125cc08 100644
--- a/Source/WindFarmParametrization/SimpleActuatorDisk/AdvanceSimpleAD.cpp
+++ b/Source/WindFarmParametrization/SimpleActuatorDisk/ERF_AdvanceSimpleAD.cpp
@@ -1,5 +1,5 @@
-#include <SimpleAD.H>
-#include <IndexDefines.H>
+#include <ERF_SimpleAD.H>
+#include <ERF_IndexDefines.H>
 
 using namespace amrex;
 
diff --git a/Source/WindFarmParametrization/SimpleActuatorDisk/SimpleAD.H b/Source/WindFarmParametrization/SimpleActuatorDisk/ERF_SimpleAD.H
similarity index 94%
rename from Source/WindFarmParametrization/SimpleActuatorDisk/SimpleAD.H
rename to Source/WindFarmParametrization/SimpleActuatorDisk/ERF_SimpleAD.H
index ce56c3f79..79a919704 100644
--- a/Source/WindFarmParametrization/SimpleActuatorDisk/SimpleAD.H
+++ b/Source/WindFarmParametrization/SimpleActuatorDisk/ERF_SimpleAD.H
@@ -1,9 +1,9 @@
-#ifndef SIMPLEAD_H
-#define SIMPLEAD_H
+#ifndef ERF_SIMPLEAD_H
+#define ERF_SIMPLEAD_H
 
 #include <AMReX_Geometry.H>
 #include <AMReX_MultiFab.H>
-#include "NullWindFarm.H"
+#include "ERF_NullWindFarm.H"
 
 class SimpleAD : public NullWindFarm {
 
diff --git a/Source/WindFarmParametrization/SimpleActuatorDisk/Make.package b/Source/WindFarmParametrization/SimpleActuatorDisk/Make.package
index 86ae21ded..d2940e3a3 100644
--- a/Source/WindFarmParametrization/SimpleActuatorDisk/Make.package
+++ b/Source/WindFarmParametrization/SimpleActuatorDisk/Make.package
@@ -1,2 +1,2 @@
-CEXE_sources += AdvanceSimpleAD.cpp
-CEXE_headers += SimpleAD.H
+CEXE_sources += ERF_AdvanceSimpleAD.cpp
+CEXE_headers += ERF_SimpleAD.H
diff --git a/Source/main.cpp b/Source/main.cpp
index 3efd76e9b..f6a19c0a6 100644
--- a/Source/main.cpp
+++ b/Source/main.cpp
@@ -8,7 +8,7 @@
 #include "ERF.H"
 
 #ifdef ERF_USE_MULTIBLOCK
-#include <MultiBlockContainer.H>
+#include <ERF_MultiBlockContainer.H>
 #endif
 
 #ifdef ERF_USE_WW3_COUPLING