diff --git a/applications/solvers/heatTransfer/buoyantFoam/Make/files b/applications/solvers/heatTransfer/buoyantFoam/Make/files
deleted file mode 100644
index fccde862b263aca3909e34fc47dbb69a0d06f658..0000000000000000000000000000000000000000
--- a/applications/solvers/heatTransfer/buoyantFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-buoyantFoam.C
-
-EXE = $(FOAM_APPBIN)/buoyantFoam
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/Make/files b/applications/solvers/heatTransfer/buoyantPisoFoam/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..65e5d52305884cf1ae68525236f7aee9537a4528
--- /dev/null
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/Make/files
@@ -0,0 +1,3 @@
+buoyantPisoFoam.C
+
+EXE = $(FOAM_APPBIN)/buoyantPisoFoam
diff --git a/applications/solvers/heatTransfer/buoyantFoam/Make/options b/applications/solvers/heatTransfer/buoyantPisoFoam/Make/options
similarity index 100%
rename from applications/solvers/heatTransfer/buoyantFoam/Make/options
rename to applications/solvers/heatTransfer/buoyantPisoFoam/Make/options
diff --git a/applications/solvers/heatTransfer/buoyantFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantPisoFoam/UEqn.H
similarity index 100%
rename from applications/solvers/heatTransfer/buoyantFoam/UEqn.H
rename to applications/solvers/heatTransfer/buoyantPisoFoam/UEqn.H
diff --git a/applications/solvers/heatTransfer/buoyantFoam/buoyantFoam.C b/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
similarity index 99%
rename from applications/solvers/heatTransfer/buoyantFoam/buoyantFoam.C
rename to applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
index 75eb401d3db5a512a14734f29460b6bfc76957f2..18dadabf8baaf398d16e0be06cb69eb726fd7fae 100644
--- a/applications/solvers/heatTransfer/buoyantFoam/buoyantFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Application
-    buoyantFoam
+    buoyantPisoFoam
 
 Description
     Transient Solver for buoyant, turbulent flow of compressible fluids for
diff --git a/applications/solvers/heatTransfer/buoyantFoam/createFields.H b/applications/solvers/heatTransfer/buoyantPisoFoam/createFields.H
similarity index 100%
rename from applications/solvers/heatTransfer/buoyantFoam/createFields.H
rename to applications/solvers/heatTransfer/buoyantPisoFoam/createFields.H
diff --git a/applications/solvers/heatTransfer/buoyantFoam/hEqn.H b/applications/solvers/heatTransfer/buoyantPisoFoam/hEqn.H
similarity index 100%
rename from applications/solvers/heatTransfer/buoyantFoam/hEqn.H
rename to applications/solvers/heatTransfer/buoyantPisoFoam/hEqn.H
diff --git a/applications/solvers/heatTransfer/buoyantFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPisoFoam/pEqn.H
similarity index 100%
rename from applications/solvers/heatTransfer/buoyantFoam/pEqn.H
rename to applications/solvers/heatTransfer/buoyantPisoFoam/pEqn.H
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/T
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/0/T
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/T
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/0/T.org b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/T.org
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/0/T.org
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/T.org
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/U
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/0/U
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/U
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/0/epsilon b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/epsilon
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/0/epsilon
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/epsilon
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/k
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/0/k
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/k
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/p
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/0/p
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/p
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/0/pd b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/pd
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/0/pd
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/pd
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allclean
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/Allclean
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allclean
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/Allrun
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/RASProperties b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/RASProperties
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/constant/RASProperties
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/RASProperties
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/environmentalProperties
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/constant/environmentalProperties
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/environmentalProperties
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/polyMesh/blockMeshDict
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/constant/polyMesh/boundary
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/polyMesh/boundary
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/constant/thermophysicalProperties
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/thermophysicalProperties
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/turbulenceProperties
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/constant/turbulenceProperties
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/turbulenceProperties
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/setHotRoom/Make/files b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/Make/files
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/setHotRoom/Make/files
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/Make/files
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/setHotRoom/Make/options b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/Make/options
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/setHotRoom/Make/options
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/Make/options
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/setHotRoom/createFields.H b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/createFields.H
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/setHotRoom/createFields.H
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/createFields.H
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/setHotRoom/setHotRoom.C b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/setHotRoom/setHotRoom.C
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/system/controlDict
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSchemes
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/system/fvSchemes
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSchemes
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSolution
similarity index 100%
rename from tutorials/heatTransfer/buoyantFoam/hotRoom/system/fvSolution
rename to tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSolution