diff --git a/applications/utilities/mesh/conversion/sammToFoam/readPoints.C b/applications/utilities/mesh/conversion/sammToFoam/readPoints.C
index 1b83a20d30..76e182dc12 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/readPoints.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/readPoints.C
@@ -30,6 +30,6 @@ Description
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #define starMesh sammMesh
-#include "../starToFoam/readPoints.C"
+#include "../star3ToFoam/readPoints.C"
 
 // ************************************************************************* //
diff --git a/applications/utilities/mesh/conversion/starToFoam/Make/files b/applications/utilities/mesh/conversion/star3ToFoam/Make/files
similarity index 85%
rename from applications/utilities/mesh/conversion/starToFoam/Make/files
rename to applications/utilities/mesh/conversion/star3ToFoam/Make/files
index cb233cf069..c50cf188d6 100644
--- a/applications/utilities/mesh/conversion/starToFoam/Make/files
+++ b/applications/utilities/mesh/conversion/star3ToFoam/Make/files
@@ -14,6 +14,6 @@ createBoundaryFaces.C
 createPolyBoundary.C
 purgeCellShapes.C
 writeMesh.C
-starToFoam.C
+star3ToFoam.C
 
-EXE = $(FOAM_APPBIN)/starToFoam
+EXE = $(FOAM_APPBIN)/star3ToFoam
diff --git a/applications/utilities/mesh/conversion/starToFoam/Make/options b/applications/utilities/mesh/conversion/star3ToFoam/Make/options
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/Make/options
rename to applications/utilities/mesh/conversion/star3ToFoam/Make/options
diff --git a/applications/utilities/mesh/conversion/starToFoam/calcPointCells.C b/applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/calcPointCells.C
rename to applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C
diff --git a/applications/utilities/mesh/conversion/starToFoam/coupledFacePair.C b/applications/utilities/mesh/conversion/star3ToFoam/coupledFacePair.C
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/coupledFacePair.C
rename to applications/utilities/mesh/conversion/star3ToFoam/coupledFacePair.C
diff --git a/applications/utilities/mesh/conversion/starToFoam/coupledFacePair.H b/applications/utilities/mesh/conversion/star3ToFoam/coupledFacePair.H
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/coupledFacePair.H
rename to applications/utilities/mesh/conversion/star3ToFoam/coupledFacePair.H
diff --git a/applications/utilities/mesh/conversion/starToFoam/createBoundaryFaces.C b/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/createBoundaryFaces.C
rename to applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C
diff --git a/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C
rename to applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
diff --git a/applications/utilities/mesh/conversion/starToFoam/createPolyBoundary.C b/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/createPolyBoundary.C
rename to applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C
diff --git a/applications/utilities/mesh/conversion/starToFoam/createPolyCells.C b/applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/createPolyCells.C
rename to applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C
diff --git a/applications/utilities/mesh/conversion/starToFoam/fixCollapsedEdges.C b/applications/utilities/mesh/conversion/star3ToFoam/fixCollapsedEdges.C
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/fixCollapsedEdges.C
rename to applications/utilities/mesh/conversion/star3ToFoam/fixCollapsedEdges.C
diff --git a/applications/utilities/mesh/conversion/starToFoam/mergeCoupleFacePoints.C b/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/mergeCoupleFacePoints.C
rename to applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
diff --git a/applications/utilities/mesh/conversion/starToFoam/purgeCellShapes.C b/applications/utilities/mesh/conversion/star3ToFoam/purgeCellShapes.C
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/purgeCellShapes.C
rename to applications/utilities/mesh/conversion/star3ToFoam/purgeCellShapes.C
diff --git a/applications/utilities/mesh/conversion/starToFoam/readBoundary.C b/applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/readBoundary.C
rename to applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C
diff --git a/applications/utilities/mesh/conversion/starToFoam/readCells.C b/applications/utilities/mesh/conversion/star3ToFoam/readCells.C
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/readCells.C
rename to applications/utilities/mesh/conversion/star3ToFoam/readCells.C
diff --git a/applications/utilities/mesh/conversion/starToFoam/readCouples.C b/applications/utilities/mesh/conversion/star3ToFoam/readCouples.C
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/readCouples.C
rename to applications/utilities/mesh/conversion/star3ToFoam/readCouples.C
diff --git a/applications/utilities/mesh/conversion/starToFoam/readPoints.C b/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/readPoints.C
rename to applications/utilities/mesh/conversion/star3ToFoam/readPoints.C
diff --git a/applications/utilities/mesh/conversion/starToFoam/readSeparatedPoints.C b/applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/readSeparatedPoints.C
rename to applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C
diff --git a/applications/utilities/mesh/conversion/starToFoam/starToFoam.C b/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
similarity index 99%
rename from applications/utilities/mesh/conversion/starToFoam/starToFoam.C
rename to applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
index f9d35109af..29d864e2aa 100644
--- a/applications/utilities/mesh/conversion/starToFoam/starToFoam.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Application
-    starToFoam
+    star3ToFoam
 
 Description
     Converts a Star-CD (v3) pro-STAR mesh into OpenFOAM format.
diff --git a/applications/utilities/mesh/conversion/starToFoam/starMesh.C b/applications/utilities/mesh/conversion/star3ToFoam/starMesh.C
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/starMesh.C
rename to applications/utilities/mesh/conversion/star3ToFoam/starMesh.C
diff --git a/applications/utilities/mesh/conversion/starToFoam/starMesh.H b/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/starMesh.H
rename to applications/utilities/mesh/conversion/star3ToFoam/starMesh.H
diff --git a/applications/utilities/mesh/conversion/starToFoam/writeMesh.C b/applications/utilities/mesh/conversion/star3ToFoam/writeMesh.C
similarity index 100%
rename from applications/utilities/mesh/conversion/starToFoam/writeMesh.C
rename to applications/utilities/mesh/conversion/star3ToFoam/writeMesh.C
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
index 29cc29abd5..c2ae406306 100755
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
@@ -7,11 +7,12 @@ application=`getApplication`
 
 runStarToFoam ()
 {
-    if [ -f log.starToFoam ] ; then
-        echo "starToFoam already run on $PWD: remove log file to run"
+    if [ -f log.star3ToFoam -o -f log.starToFoam ]
+    then
+        echo "star3ToFoam already run on $PWD: remove log file to run"
     else
-        echo "starToFoam: converting mesh $1"
-        starToFoam $1 > log.starToFoam 2>&1
+        echo "star3ToFoam: converting mesh $1"
+        star3ToFoam $1 > log.star3ToFoam 2>&1
     fi
 }
 
@@ -21,3 +22,5 @@ sed -e s/"\([\t ]*type[\t ]*\)symmetryPlane"/"\1empty"/g \
     temp > constant/polyMesh/boundary
 rm temp
 runApplication $application
+
+# end-of-file