diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options
index 09322fe8653fce1d4fc6c1d32be26232a6a4726e..29dd6139689a4f39f7cb5d771489cad88dc8c0d7 100644
--- a/applications/solvers/combustion/PDRFoam/Make/options
+++ b/applications/solvers/combustion/PDRFoam/Make/options
@@ -20,7 +20,7 @@ EXE_INC = \
EXE_LIBS = \
-lengine \
-lmeshTools \
- -lcompressibleTurbulenceModels \
+ -lcompressibleRASmodels \
-lbasicThermophysicalModels \
-lcombustionThermophysicalModels \
-lspecie \
diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options
index c6457c2826bd661e210509e27bf91cc71b59eb4d..2b553eed811c5d51577358a20c0ccf2cd23894d4 100644
--- a/applications/solvers/combustion/XiFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/Make/options
@@ -12,7 +12,7 @@ EXE_LIBS = \
-lengine \
-lfiniteVolume \
-lmeshTools \
- -lcompressibleTurbulenceModels \
+ -lcompressibleRASmodels \
-lbasicThermophysicalModels \
-lcombustionThermophysicalModels \
-lspecie \
diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options
index d932a5dbc16df7fa185e0f49bc6765b6085cff62..249e46bef160da35d9b0231cbcf4c2b8ca9d262b 100644
--- a/applications/solvers/combustion/coldEngineFoam/Make/options
+++ b/applications/solvers/combustion/coldEngineFoam/Make/options
@@ -11,6 +11,6 @@ EXE_INC = \
EXE_LIBS = \
-lengine \
-lfiniteVolume \
- -lcompressibleTurbulenceModels \
+ -lcompressibleRASmodels \
-lbasicThermophysicalModels \
-lspecie
diff --git a/applications/solvers/combustion/dieselEngineFoam/Make/options b/applications/solvers/combustion/dieselEngineFoam/Make/options
index c3928b42749466682c0c9b4232133eccd55fac3c..65b7d2478f66e25ee56cf2563cb54a2a6a83dd11 100644
--- a/applications/solvers/combustion/dieselEngineFoam/Make/options
+++ b/applications/solvers/combustion/dieselEngineFoam/Make/options
@@ -18,7 +18,7 @@ EXE_INC = \
EXE_LIBS = \
-lengine \
- -lcompressibleTurbulenceModels \
+ -lcompressibleRASmodels \
-lcombustionThermophysicalModels \
-lfiniteVolume \
-llagrangian \
diff --git a/applications/solvers/combustion/dieselFoam/Make/options b/applications/solvers/combustion/dieselFoam/Make/options
index b19c304f706872ccbd1ae99eb32b7aa8eb19be1e..6ebc1c61917b2897a4ba3106155f7eebe8fac6c7 100644
--- a/applications/solvers/combustion/dieselFoam/Make/options
+++ b/applications/solvers/combustion/dieselFoam/Make/options
@@ -16,7 +16,7 @@ EXE_INC = \
-I$(LIB_SRC)/ODE/lnInclude
EXE_LIBS = \
- -lcompressibleTurbulenceModels \
+ -lcompressibleRASmodels \
-lcombustionThermophysicalModels \
-lfiniteVolume \
-llagrangian \
diff --git a/applications/solvers/combustion/engineFoam/Make/options b/applications/solvers/combustion/engineFoam/Make/options
index 952aa3091a9644136d0ac1355fc87e93dd526e72..afda5ce4a5300c785750f162443622afccd88285 100644
--- a/applications/solvers/combustion/engineFoam/Make/options
+++ b/applications/solvers/combustion/engineFoam/Make/options
@@ -11,7 +11,7 @@ EXE_INC = \
EXE_LIBS = \
-lengine \
-lfiniteVolume \
- -lcompressibleTurbulenceModels \
+ -lcompressibleRASmodels \
-lbasicThermophysicalModels \
-lcombustionThermophysicalModels \
-lspecie \
diff --git a/applications/solvers/combustion/reactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/Make/options
index ad9827feb7b118ec075c9f58b783e428ddb509dc..179a2cfd6bda78cf4c62cf2933e985ab74d0bd62 100644
--- a/applications/solvers/combustion/reactingFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/Make/options
@@ -9,7 +9,7 @@ EXE_INC = \
-I$(LIB_SRC)/ODE/lnInclude
EXE_LIBS = \
- -lcompressibleTurbulenceModels \
+ -lcompressibleRASmodels \
-lcombustionThermophysicalModels \
-lfiniteVolume \
-lspecie \
diff --git a/applications/solvers/compressible/rhoPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/Make/options
index 1679646dc1d5e583abef143049181c094ab11994..dcd95f76616244483d8063a50909a7ba82535646 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options
@@ -9,4 +9,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleTurbulenceModels
+ -lcompressibleRASmodels
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options
index 46c3f63621b64bb1c5814819f6742c60f091f3e1..7325d5b42028dc21141dbd8331da2c91dc55452e 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options
@@ -10,4 +10,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleTurbulenceModels
+ -lcompressibleRASmodels
diff --git a/applications/solvers/compressible/rhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/Make/options
index 1679646dc1d5e583abef143049181c094ab11994..dcd95f76616244483d8063a50909a7ba82535646 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options
@@ -9,4 +9,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleTurbulenceModels
+ -lcompressibleRASmodels
diff --git a/applications/solvers/compressible/rhoTurbFoam/Make/options b/applications/solvers/compressible/rhoTurbFoam/Make/options
index 9a953a45d4f68083c3b7db49cc0a345e7d3383b4..c28d6dac5f91b9801b8d243cd213e24ced0abdd9 100644
--- a/applications/solvers/compressible/rhoTurbFoam/Make/options
+++ b/applications/solvers/compressible/rhoTurbFoam/Make/options
@@ -9,4 +9,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleTurbulenceModels
+ -lcompressibleRASmodels
diff --git a/applications/solvers/compressible/sonicTurbFoam/Make/options b/applications/solvers/compressible/sonicTurbFoam/Make/options
index 42838550d116d18cae971a6ed2f241d76967f2a0..ebdb2234e7cb5b8d73fb108416c9af1b630bc7fa 100644
--- a/applications/solvers/compressible/sonicTurbFoam/Make/options
+++ b/applications/solvers/compressible/sonicTurbFoam/Make/options
@@ -7,6 +7,6 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
- -lcompressibleTurbulenceModels \
+ -lcompressibleRASmodels \
-lbasicThermophysicalModels \
-lspecie
diff --git a/applications/solvers/heatTransfer/buoyantFoam/Make/options b/applications/solvers/heatTransfer/buoyantFoam/Make/options
index ea9f7366bc877d0044a20242e93c742ba52fef85..0a3761fdc6601a371174ccbba206d02588c2bef3 100644
--- a/applications/solvers/heatTransfer/buoyantFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantFoam/Make/options
@@ -9,4 +9,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleTurbulenceModels
+ -lcompressibleRASmodels
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
index 1679646dc1d5e583abef143049181c094ab11994..dcd95f76616244483d8063a50909a7ba82535646 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
@@ -9,4 +9,4 @@ EXE_LIBS = \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleTurbulenceModels
+ -lcompressibleRASmodels
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options
index 521010871707a8c9731005eee0332c1d8c2cf612..54af7f6d9640d4f30186ebd5ed60e01043a9395e 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options
@@ -11,4 +11,4 @@ EXE_LIBS = \
-lbasicThermophysicalModels \
-lspecie \
-lradiation \
- -lcompressibleTurbulenceModels
+ -lcompressibleRASmodels
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
index 2fe2cc72a361466d3ad3b39d04b5ac6b5521c4c6..dc9d23c632682b2c22cf2ff0c1b7a77ae6263f50 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
@@ -13,4 +13,4 @@ EXE_LIBS = \
-lfiniteVolume \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleTurbulenceModels
+ -lcompressibleRASmodels
diff --git a/applications/solvers/incompressible/boundaryFoam/Make/options b/applications/solvers/incompressible/boundaryFoam/Make/options
index 89e1642a87fd0e3095f4aa9a0a7c79db03399b6f..73c556dcf0f3c9d6fb97737fe527b37c8875d634 100644
--- a/applications/solvers/incompressible/boundaryFoam/Make/options
+++ b/applications/solvers/incompressible/boundaryFoam/Make/options
@@ -5,7 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume \
-lmeshTools \
diff --git a/applications/solvers/incompressible/simpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/Make/options
index 13680640c47645c2b35150c57bec51b351db7dd2..c1232be74c2f0199c7998c84ee4b10e241504923 100644
--- a/applications/solvers/incompressible/simpleFoam/Make/options
+++ b/applications/solvers/incompressible/simpleFoam/Make/options
@@ -4,7 +4,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume \
-lmeshTools \
diff --git a/applications/solvers/incompressible/turbDyMFoam/Make/options b/applications/solvers/incompressible/turbDyMFoam/Make/options
index 633daf3e733a70f11fa36d67863095d8fad1e23b..53b2a61605dcded887b42bb3ec71fa8270ed5da9 100644
--- a/applications/solvers/incompressible/turbDyMFoam/Make/options
+++ b/applications/solvers/incompressible/turbDyMFoam/Make/options
@@ -10,6 +10,6 @@ EXE_LIBS = \
-ldynamicFvMesh \
-ldynamicMesh \
-lmeshTools \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume
diff --git a/applications/solvers/incompressible/turbFoam/Make/options b/applications/solvers/incompressible/turbFoam/Make/options
index b8036f1d38cf2d1801e6e23e752f29bbb0178712..4c0e0228c1d6ac59e8fad168bd822c9d9ced439a 100644
--- a/applications/solvers/incompressible/turbFoam/Make/options
+++ b/applications/solvers/incompressible/turbFoam/Make/options
@@ -4,7 +4,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume \
-lmeshTools
diff --git a/applications/solvers/multiphase/interDyMFoam/Make/options b/applications/solvers/multiphase/interDyMFoam/Make/options
index ddd0160b0074b4ae66f03c0443a82b7df863939a..7b811aa97d93c37173bf7821aac686db3604a51b 100644
--- a/applications/solvers/multiphase/interDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interDyMFoam/Make/options
@@ -13,7 +13,7 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-lfiniteVolume \
-ldynamicMesh \
-lmeshTools \
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/Make/options b/applications/solvers/multiphase/rasCavitatingFoam/Make/options
index 4c09b3efbede5be855353157a50cfb3236ec03fc..0450978390fc15aed2c32f21fe83c59dd0f6819b 100644
--- a/applications/solvers/multiphase/rasCavitatingFoam/Make/options
+++ b/applications/solvers/multiphase/rasCavitatingFoam/Make/options
@@ -8,7 +8,7 @@ EXE_INC = \
EXE_LIBS = \
-lincompressibleTransportModels \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-lfiniteVolume \
-lbarotropicCompressibilityModel
diff --git a/applications/solvers/multiphase/rasInterFoam/Make/options b/applications/solvers/multiphase/rasInterFoam/Make/options
index 27d86562c3772978db626aca384917cc87e78bf4..9289b0f35eb004473552196c9bb9cc5d0fbb7409 100644
--- a/applications/solvers/multiphase/rasInterFoam/Make/options
+++ b/applications/solvers/multiphase/rasInterFoam/Make/options
@@ -9,5 +9,5 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-lfiniteVolume
diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
index 161b9c3c8ee9eeb2257f97f725c79c14a32ec91b..ffed4ff037693d57f91b71f279c978f12d05c206 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
@@ -4,7 +4,7 @@ EXE_LIBS = \
-lchemistryModel \
-lcombustionThermophysicalModels \
-lcompressibleLESmodels \
- -lcompressibleTurbulenceModels \
+ -lcompressibleRASmodels \
-ldecompositionMethods \
-ldieselSpray \
-ldynamicFvMesh \
@@ -17,7 +17,7 @@ EXE_LIBS = \
-lfvMotionSolvers \
-lincompressibleLESmodels \
-lincompressibleTransportModels \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-linterfaceProperties \
-llagrangianIntermediate \
-llagrangian \
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
index f6c92548fc5b12c7426577cb628d106255bca542..42c58cc6ab806e9ed17ed214eefb3f6d6acea9c6 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
@@ -11,9 +11,9 @@ EXE_LIBS = \
$(FOAM_LIBBIN)/postCalc.o \
-lfiniteVolume \
-lincompressibleTransportModels \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-lincompressibleLESmodels \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleTurbulenceModels \
+ -lcompressibleRASmodels \
-lcompressibleLESmodels
diff --git a/applications/utilities/postProcessing/stressField/stressComponents/Make/options b/applications/utilities/postProcessing/stressField/stressComponents/Make/options
index b0d119d8887aaaf86e47349542e031c5a772fd20..458b040fcbbc8a107e2af389fc6e9a08438f80e9 100644
--- a/applications/utilities/postProcessing/stressField/stressComponents/Make/options
+++ b/applications/utilities/postProcessing/stressField/stressComponents/Make/options
@@ -5,5 +5,5 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-lincompressibleTransportModels
diff --git a/applications/utilities/postProcessing/turbulence/R/Make/options b/applications/utilities/postProcessing/turbulence/R/Make/options
index 8b6867b6fc917bd146cf2704b5fe3f267603beca..90c4889f03b6e7e10fe1d6473e4a545c4baaadc3 100644
--- a/applications/utilities/postProcessing/turbulence/R/Make/options
+++ b/applications/utilities/postProcessing/turbulence/R/Make/options
@@ -5,6 +5,6 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
index b0d119d8887aaaf86e47349542e031c5a772fd20..458b040fcbbc8a107e2af389fc6e9a08438f80e9 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
@@ -5,5 +5,5 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-lincompressibleTransportModels
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Make/options b/applications/utilities/postProcessing/velocityField/Pe/Make/options
index eae57baa897cf5f51fa6e8adb5b43bae74a91584..ae1ccb29ac8e3216421bdfa06fe22dd9141685f5 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Make/options
+++ b/applications/utilities/postProcessing/velocityField/Pe/Make/options
@@ -14,9 +14,9 @@ EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lincompressibleTransportModels \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-lincompressibleLESmodels \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleTurbulenceModels \
+ -lcompressibleRASmodels \
-lcompressibleLESmodels
diff --git a/applications/utilities/postProcessing/wall/wallGradU/Make/options b/applications/utilities/postProcessing/wall/wallGradU/Make/options
index 6437903e0c05c3ff367197a834b0bc565108cb3c..882657bf9f2be1a55a12519fc59c4b9d9cff2aed 100644
--- a/applications/utilities/postProcessing/wall/wallGradU/Make/options
+++ b/applications/utilities/postProcessing/wall/wallGradU/Make/options
@@ -4,6 +4,6 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
index bcd694b4251f6f48287bfc53340c0fb032b562f3..525ab7dffdfb75368f2a06e4b8de8f340ac974bd 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
@@ -6,7 +6,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
EXE_LIBS = \
- -lcompressibleTurbulenceModels \
+ -lcompressibleRASmodels \
-lcombustionThermophysicalModels \
-lfiniteVolume \
-lspecie \
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/Make/options b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
index 6437903e0c05c3ff367197a834b0bc565108cb3c..882657bf9f2be1a55a12519fc59c4b9d9cff2aed 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/Make/options
+++ b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
@@ -4,6 +4,6 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
index 6437903e0c05c3ff367197a834b0bc565108cb3c..882657bf9f2be1a55a12519fc59c4b9d9cff2aed 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
@@ -4,6 +4,6 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume
diff --git a/src/lagrangian/dieselSpray/Make/options b/src/lagrangian/dieselSpray/Make/options
index 247a700715f3e320d753ce241ad35fea46f98ee7..c5989a9bc9748ab95bf66cbe5c5e5989dceacd99 100644
--- a/src/lagrangian/dieselSpray/Make/options
+++ b/src/lagrangian/dieselSpray/Make/options
@@ -15,7 +15,7 @@ EXE_INC = \
LIB_LIBS = \
-llagrangian \
-lfiniteVolume \
- -lcompressibleTurbulenceModels \
+ -lcompressibleRASmodels \
-lcompressibleLESmodels \
-lLESdeltas \
-lliquids \
diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options
index 82e57d5c5ed71defcf96d346d8bfaf28081dd89b..f1ee6e0b4b0aaa185ee86a1629994d8efce402e6 100644
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@@ -23,4 +23,4 @@ LIB_LIBS = \
-lspecie \
-lbasicThermophysicalModels \
-lcombustionThermophysicalModels \
- -lcompressibleTurbulenceModels
+ -lcompressibleRASmodels
diff --git a/src/postProcessing/forces/Make/options b/src/postProcessing/forces/Make/options
index d6e9934f5d1aee08805cd219e95bd2907d313199..e936181ee1e4b73e840ba7378f4860c007911624 100644
--- a/src/postProcessing/forces/Make/options
+++ b/src/postProcessing/forces/Make/options
@@ -1,22 +1,20 @@
EXE_INC = \
- -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
- -I$(LIB_SRC)/LESmodels \
- -I$(LIB_SRC)/turbulenceModels \
- -I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/sampling/lnInclude \
+ -I$(LIB_SRC)/transportModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
+ -I$(LIB_SRC)/turbulenceModels/LES \
+ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
+ -lincompressibleTransportModels \
+ -lincompressibleTurbulenceModels \
+ -lincompressibleLESmodels \
-lbasicThermophysicalModels \
-lspecie \
- -lcompressibleLESmodels \
- -lincompressibleLESmodels \
-lcompressibleTurbulenceModels \
- -lincompressibleTurbulenceModels \
- -lincompressibleTransportModels \
- -lfiniteVolume \
- -lmeshTools \
- -lsampling
+ -lcompressibleLESmodels
diff --git a/src/turbulenceModels/RAS/compressible/Make/files b/src/turbulenceModels/RAS/compressible/Make/files
index 03430510a0a3a8b09b5d2c42e3f88d4a51e99a72..1b5a588bdb25a1788f58264c629f4d5c8a49b879 100644
--- a/src/turbulenceModels/RAS/compressible/Make/files
+++ b/src/turbulenceModels/RAS/compressible/Make/files
@@ -12,4 +12,4 @@ kOmegaSST/kOmegaSST.C
wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C
-LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModels
+LIB = $(FOAM_LIBBIN)/libcompressibleRASmodels
diff --git a/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C b/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C
index ca5bc764118499f297450bdd4676a9702d59eb66..ecbd901c3b7a990c7572838b5c0141b8ced1998f 100644
--- a/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C
+++ b/src/turbulenceModels/RAS/compressible/RASmodel/RASmodel.C
@@ -172,8 +172,8 @@ bool RASmodel::read()
lookup("turbulence") >> turbulence_;
RASmodelCoeffs_ = subDict(type() + "Coeffs");
- subDict("wallFunctionCoeffs").lookup("kappa") >> kappa_;
- subDict("wallFunctionCoeffs").lookup("E") >> E_;
+ subDict("wallFunctionCoeffs").readIfPresent<scalar>("kappa", kappa_);
+ subDict("wallFunctionCoeffs").readIfPresent<scalar>("E", E_);
yPlusLam_ = yPlusLam(kappa_, E_);
diff --git a/src/turbulenceModels/RAS/incompressible/Make/files b/src/turbulenceModels/RAS/incompressible/Make/files
index a8f6b81c8866ed8575a76c3b661253ad58043e2e..7c0bba95c7d5afe67d931205e7b14edaebb67384 100644
--- a/src/turbulenceModels/RAS/incompressible/Make/files
+++ b/src/turbulenceModels/RAS/incompressible/Make/files
@@ -20,4 +20,4 @@ wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField
wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C
wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C
-LIB = $(FOAM_LIBBIN)/libincompressibleTurbulenceModels
+LIB = $(FOAM_LIBBIN)/libincompressibleRASmodels
diff --git a/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C b/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C
index e1c09563fa76a55dc7baa5fbad8fa0cf9c315278..a6e9b14d1617859fb31fa05e75845fe0318748e1 100644
--- a/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C
+++ b/src/turbulenceModels/RAS/incompressible/RASmodel/RASmodel.C
@@ -169,8 +169,8 @@ bool RASmodel::read()
lookup("turbulence") >> turbulence_;
RASmodelCoeffs_ = subDict(type() + "Coeffs");
- subDict("wallFunctionCoeffs").lookup("kappa") >> kappa_;
- subDict("wallFunctionCoeffs").lookup("E") >> E_;
+ subDict("wallFunctionCoeffs").readIfPresent<scalar>("kappa", kappa_);
+ subDict("wallFunctionCoeffs").readIfPresent<scalar>("E", E_);
yPlusLam_ = yPlusLam(kappa_, E_);
diff --git a/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options b/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options
index 6437903e0c05c3ff367197a834b0bc565108cb3c..882657bf9f2be1a55a12519fc59c4b9d9cff2aed 100644
--- a/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options
+++ b/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options
@@ -4,6 +4,6 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume
diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options
index ac65c845e2859b4e4a02ccd9cbc33709c881eb61..a551b9c721fe96ca8ae06c84374374e66e2cd43a 100644
--- a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options
+++ b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options
@@ -18,4 +18,4 @@ EXE_LIBS = \
-lcombustionThermophysicalModels \
-lspecie \
-lradiation \
- -lcompressibleTurbulenceModels
+ -lcompressibleRASmodels
diff --git a/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options b/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options
index be658f22d059a6495b6d6437ebbca2f42e4bff8a..54831153fa8a42dc3346573fe2145f573b061336 100644
--- a/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options
+++ b/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options
@@ -4,7 +4,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
- -lincompressibleTurbulenceModels \
+ -lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume \
-lmeshTools