diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/k b/tutorials/incompressible/simpleFoam/motorBike/0/k
index 257b472da8..457efefed2 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0/k
+++ b/tutorials/incompressible/simpleFoam/motorBike/0/k
@@ -20,6 +20,29 @@ dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform $turbulentKE;
 
-#include        "turbulentBoundaryField"
+boundaryField
+{
+    #include "fixedInlet"
+
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+
+    lowerWall
+    {
+        type            kqRWallFunction;
+    }
+
+    "motorBike_.*"
+    {
+        type            kqRWallFunction;
+    }
+
+    #include "frontBackUpperPatches"
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/omega b/tutorials/incompressible/simpleFoam/motorBike/0/omega
index 94cbf590c2..16424f9bb3 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0/omega
+++ b/tutorials/incompressible/simpleFoam/motorBike/0/omega
@@ -20,6 +20,29 @@ dimensions      [0 0 -1 0 0 0 0];
 
 internalField   uniform $turbulentOmega;
 
-#include        "turbulentBoundaryField"
+boundaryField
+{
+    #include "fixedInlet"
+
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+
+    lowerWall
+    {
+        type            omegaWallFunction;
+    }
+
+    "motorBike_.*"
+    {
+        type            omegaWallFunction;
+    }
+
+    #include "frontBackUpperPatches"
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/turbulentBoundaryField b/tutorials/incompressible/simpleFoam/motorBike/0/turbulentBoundaryField
deleted file mode 100644
index aa4e5eded9..0000000000
--- a/tutorials/incompressible/simpleFoam/motorBike/0/turbulentBoundaryField
+++ /dev/null
@@ -1,33 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-
-boundaryField
-{
-    #include "fixedInlet"
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
-    }
-
-    lowerWall
-    {
-        type            kqRWallFunction;
-    }
-
-    "motorBike_.*"
-    {
-        type            kqRWallFunction;
-    }
-
-    #include "frontBackUpperPatches"
-}
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
index e96b062da6..b79c6ad432 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/