diff --git a/etc/templates/closedVolume/system/snappyHexMeshDict b/etc/templates/closedVolume/system/snappyHexMeshDict
index 99a28f4d3f..6f0ec44e40 100644
--- a/etc/templates/closedVolume/system/snappyHexMeshDict
+++ b/etc/templates/closedVolume/system/snappyHexMeshDict
@@ -22,10 +22,10 @@ addLayers       off;
 
 geometry
 {
-    CAD.obj
+    CAD
     {
         type triSurfaceMesh;
-        name CAD;
+        file "CAD.obj";
         regions
         {
             <CADregionName> { name <patchName>; }
diff --git a/etc/templates/closedVolumeRotating/system/snappyHexMeshDict b/etc/templates/closedVolumeRotating/system/snappyHexMeshDict
index 4ef035765c..79d692cbe9 100644
--- a/etc/templates/closedVolumeRotating/system/snappyHexMeshDict
+++ b/etc/templates/closedVolumeRotating/system/snappyHexMeshDict
@@ -22,20 +22,20 @@ addLayers       off;
 
 geometry
 {
-    fixed.obj
+    fixed
     {
         type triSurfaceMesh;
-        name fixed;
+        file "fixed.obj";
     }
-    rotating.obj
+    rotating
     {
         type triSurfaceMesh;
-        name rotating;
+        file "rotating.obj";
     }
-    rotatingZone.obj
+    rotatingZone
     {
         type triSurfaceMesh;
-        name rotatingZone;
+        file "rotatingZone.obj";
     }
 };
 
diff --git a/etc/templates/compressibleInflowOutflow/system/snappyHexMeshDict b/etc/templates/compressibleInflowOutflow/system/snappyHexMeshDict
index b71e8a33da..a1e5e5ac55 100644
--- a/etc/templates/compressibleInflowOutflow/system/snappyHexMeshDict
+++ b/etc/templates/compressibleInflowOutflow/system/snappyHexMeshDict
@@ -22,10 +22,10 @@ addLayers       off;
 
 geometry
 {
-    CAD.obj
+    CAD
     {
         type triSurfaceMesh;
-        name CAD;
+        file "CAD.obj";
         regions
         {
             <inletPatch>  { name inlet; }
diff --git a/etc/templates/inflowOutflow/system/snappyHexMeshDict b/etc/templates/inflowOutflow/system/snappyHexMeshDict
index b71e8a33da..a1e5e5ac55 100644
--- a/etc/templates/inflowOutflow/system/snappyHexMeshDict
+++ b/etc/templates/inflowOutflow/system/snappyHexMeshDict
@@ -22,10 +22,10 @@ addLayers       off;
 
 geometry
 {
-    CAD.obj
+    CAD
     {
         type triSurfaceMesh;
-        name CAD;
+        file "CAD.obj";
         regions
         {
             <inletPatch>  { name inlet; }
diff --git a/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict b/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict
index 2717c2afa9..873f1360ac 100644
--- a/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict
+++ b/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict
@@ -22,25 +22,25 @@ addLayers       off;
 
 geometry
 {
-    fixed.obj
+    fixed
     {
         type triSurfaceMesh;
-        name fixed;
+        file "fixed.obj";
         regions
         {
             <inletPatch>  { name inlet; }
             <outletPatch> { name outlet; }
         }
     }
-    rotating.obj
+    rotating
     {
         type triSurfaceMesh;
-        name rotating;
+        file "rotating.obj";
     }
-    rotatingZone.obj
+    rotatingZone
     {
         type triSurfaceMesh;
-        name rotatingZone;
+        file "rotatingZone.obj";
     }
 };