diff --git a/etc/templates/closedVolumeRotating/0/U b/etc/templates/closedVolumeRotating/0/U
index 21f84166b4..2209a593ef 100644
--- a/etc/templates/closedVolumeRotating/0/U
+++ b/etc/templates/closedVolumeRotating/0/U
@@ -19,11 +19,20 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
+    // For an MRF case, the rotating patch requires the MRFnoSlip BC
+    // For an NCC case, it requires a movingWallVelocity BC
+    // If steadyState, assume the case is MRF; otherwise, NCC.
     rotating
     {
+        timeScheme      ${${FOAM_CASE}/system/fvSchemes!ddtSchemes/default};
+    #ifeq $timeScheme steadyState
+        type            MRFnoSlip;
+    #else
         type            movingWallVelocity;
+    #endif
         value           uniform (0 0 0);
     }
+
     wall
     {
         type            noSlip;
diff --git a/etc/templates/closedVolumeRotating/README b/etc/templates/closedVolumeRotating/README
index 64b195a342..79b2edf379 100644
--- a/etc/templates/closedVolumeRotating/README
+++ b/etc/templates/closedVolumeRotating/README
@@ -74,3 +74,5 @@ NCC Simulation
 + createNonConformalCouples must then be run to generate the couple patches
   required by NCC, e.g. by
     createNonConformalCouples -overwrite
++ disable MRF by deleting the constant/MRFProperties file
++ enable NCC by changing 'mover-disabled' to 'mover' in constant/dynamicMeshDict
\ No newline at end of file
diff --git a/etc/templates/closedVolumeRotating/constant/dynamicMeshDict b/etc/templates/closedVolumeRotating/constant/dynamicMeshDict
index 2fbda092fe..b60e72cc6f 100644
--- a/etc/templates/closedVolumeRotating/constant/dynamicMeshDict
+++ b/etc/templates/closedVolumeRotating/constant/dynamicMeshDict
@@ -13,7 +13,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-mover
+// Disable motion for an MRF simulation
+// Enable motion for an NCC simulation by changing 'mover-disabled' to 'mover'
+mover-disabled
 {
     type            motionSolver;
 
diff --git a/etc/templates/inflowOutflowRotating/0/U b/etc/templates/inflowOutflowRotating/0/U
index e5e6275436..9a26e19138 100644
--- a/etc/templates/inflowOutflowRotating/0/U
+++ b/etc/templates/inflowOutflowRotating/0/U
@@ -34,9 +34,17 @@ boundaryField
         value           uniform (0 0 0);
     }
 
+    // For an MRF case, the rotating patch requires the MRFnoSlip BC
+    // For an NCC case, it requires a movingWallVelocity BC
+    // If steadyState, assume the case is MRF; otherwise, NCC.
     rotating
     {
+        timeScheme      ${${FOAM_CASE}/system/fvSchemes!ddtSchemes/default};
+    #ifeq $timeScheme steadyState
+        type            MRFnoSlip;
+    #else
         type            movingWallVelocity;
+    #endif
         value           uniform (0 0 0);
     }
 
diff --git a/etc/templates/inflowOutflowRotating/README b/etc/templates/inflowOutflowRotating/README
index f64143c0e1..d44a33e5a1 100644
--- a/etc/templates/inflowOutflowRotating/README
+++ b/etc/templates/inflowOutflowRotating/README
@@ -80,3 +80,5 @@ NCC Simulation
 + createNonConformalCouples must then be run to generate the couple patches
   required by NCC, e.g. by
     createNonConformalCouples -overwrite
++ disable MRF by deleting the constant/MRFProperties file
++ enable NCC by changing 'mover-disabled' to 'mover' in constant/dynamicMeshDict
\ No newline at end of file
diff --git a/etc/templates/inflowOutflowRotating/constant/dynamicMeshDict b/etc/templates/inflowOutflowRotating/constant/dynamicMeshDict
index 2fbda092fe..b60e72cc6f 100644
--- a/etc/templates/inflowOutflowRotating/constant/dynamicMeshDict
+++ b/etc/templates/inflowOutflowRotating/constant/dynamicMeshDict
@@ -13,7 +13,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-mover
+// Disable motion for an MRF simulation
+// Enable motion for an NCC simulation by changing 'mover-disabled' to 'mover'
+mover-disabled
 {
     type            motionSolver;