diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options
index 045e37a344..01ebf2218b 100644
--- a/applications/solvers/combustion/fireFoam/Make/options
+++ b/applications/solvers/combustion/fireFoam/Make/options
@@ -9,7 +9,7 @@ EXE_INC = \
 
 
 EXE_LIBS = \
-    -lcombustionModels \
+    -lfireFoamCombustionModels \
     -lspecie \
     -lreactionThermophysicalModels \
     -lbasicThermophysicalModels \
diff --git a/applications/solvers/combustion/fireFoam/combustionModels/Make/files b/applications/solvers/combustion/fireFoam/combustionModels/Make/files
index 5b1262b70d..bef447f0b0 100644
--- a/applications/solvers/combustion/fireFoam/combustionModels/Make/files
+++ b/applications/solvers/combustion/fireFoam/combustionModels/Make/files
@@ -5,5 +5,5 @@ infinitelyFastChemistry/infinitelyFastChemistry.C
 
 noCombustion/noCombustion.C
 
-LIB = $(FOAM_LIBBIN)/libcombustionModels
+LIB = $(FOAM_LIBBIN)/libfireFoamCombustionModels
 
diff --git a/src/Allwmake b/src/Allwmake
index b1bbcea809..aa17b418e3 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -60,6 +60,7 @@ wmake $makeType randomProcesses
 thermophysicalModels/Allwmake $*
 transportModels/Allwmake $*
 turbulenceModels/Allwmake $*
+wmake $makeType combustionModels
 regionModels/Allwmake $*
 lagrangian/Allwmake $*
 postProcessing/Allwmake $*
diff --git a/src/thermophysicalModels/combustionModels/Make/files b/src/combustionModels/Make/files
similarity index 100%
rename from src/thermophysicalModels/combustionModels/Make/files
rename to src/combustionModels/Make/files
diff --git a/src/thermophysicalModels/combustionModels/Make/options b/src/combustionModels/Make/options
similarity index 100%
rename from src/thermophysicalModels/combustionModels/Make/options
rename to src/combustionModels/Make/options
diff --git a/src/thermophysicalModels/combustionModels/combustionModel/combustionModel.C b/src/combustionModels/combustionModel/combustionModel.C
similarity index 100%
rename from src/thermophysicalModels/combustionModels/combustionModel/combustionModel.C
rename to src/combustionModels/combustionModel/combustionModel.C
diff --git a/src/thermophysicalModels/combustionModels/combustionModel/combustionModel.H b/src/combustionModels/combustionModel/combustionModel.H
similarity index 100%
rename from src/thermophysicalModels/combustionModels/combustionModel/combustionModel.H
rename to src/combustionModels/combustionModel/combustionModel.H
diff --git a/src/thermophysicalModels/combustionModels/combustionModel/combustionModelNew.C b/src/combustionModels/combustionModel/combustionModelNew.C
similarity index 100%
rename from src/thermophysicalModels/combustionModels/combustionModel/combustionModelNew.C
rename to src/combustionModels/combustionModel/combustionModelNew.C
diff --git a/src/thermophysicalModels/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C
similarity index 100%
rename from src/thermophysicalModels/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C
rename to src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C
diff --git a/src/thermophysicalModels/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
similarity index 100%
rename from src/thermophysicalModels/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
rename to src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
diff --git a/src/thermophysicalModels/combustionModels/noCombustion/noCombustion.C b/src/combustionModels/noCombustion/noCombustion.C
similarity index 100%
rename from src/thermophysicalModels/combustionModels/noCombustion/noCombustion.C
rename to src/combustionModels/noCombustion/noCombustion.C
diff --git a/src/thermophysicalModels/combustionModels/noCombustion/noCombustion.H b/src/combustionModels/noCombustion/noCombustion.H
similarity index 100%
rename from src/thermophysicalModels/combustionModels/noCombustion/noCombustion.H
rename to src/combustionModels/noCombustion/noCombustion.H
diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake
index c27c4b6648..7927a97e69 100755
--- a/src/thermophysicalModels/Allwmake
+++ b/src/thermophysicalModels/Allwmake
@@ -20,8 +20,6 @@ wmake $makeType SLGThermo
 wmake $makeType basicSolidThermo
 wmake $makeType solidChemistryModel
 
-wmake $makeType combustionModels
-
 wmake $makeType radiationModels
 
 # ----------------------------------------------------------------- end-of-file