diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H
index 4a7e0459b3447cca87c50c3ecc45b3291fd9a694..92c376611f3a6792714b4c8f4379a194ff24c5c4 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H
@@ -75,7 +75,7 @@ public:
         //- Clone
         autoPtr<searchableSurfaceModifier> clone() const
         {
-            notImplemented("autoPtr<searchableSurfaceModifier> clone() const");
+            NotImplemented;
             return autoPtr<searchableSurfaceModifier>(NULL);
         }
 
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
index 4081b753b3598837295c1eca243c1807e46d892d..fdc7ed1bd7a4c5f00e05fdc010280cf7d71b3450 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
@@ -99,7 +99,7 @@ public:
         //- Clone
         autoPtr<searchableSurfaceModifier> clone() const
         {
-            notImplemented("autoPtr<searchableSurfaceModifier> clone() const");
+            NotImplemented;
             return autoPtr<searchableSurfaceModifier>(NULL);
         }
 
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H
index 8955dea7416cdf715b8b80c46f8172d3b52978dd..c53eab8ac0f28c2005ee5517b513b4a2c5ca3e3f 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H
@@ -95,7 +95,7 @@ public:
         //- Clone
         autoPtr<searchableSurfaceModifier> clone() const
         {
-            notImplemented("autoPtr<searchableSurfaceModifier> clone() const");
+            NotImplemented;
             return autoPtr<searchableSurfaceModifier>(NULL);
         }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
index 9f88e0553492f335d6a91eb23cd911d222723904..80be2a8b9e4bc64f388b04b640fe9a31a65fcde0 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
@@ -447,10 +447,7 @@ public:
             //- Correct for topo change.
             void updateMesh(const mapPolyMesh&)
             {
-                notImplemented
-                (
-                    "mapDistributeBase::updateMesh(const mapPolyMesh&)"
-                );
+                NotImplemented;
             }
 
     // Member Operators
diff --git a/src/fvMotionSolver/motionInterpolation/patchTransformed/patchTransformedInterpolation.C b/src/fvMotionSolver/motionInterpolation/patchTransformed/patchTransformedInterpolation.C
index 60aae0ec6dc21ed5ec34f8360c698b747d5bb1c0..22c9d28c32e74c62dbdc100d141fb94ab91ef245 100644
--- a/src/fvMotionSolver/motionInterpolation/patchTransformed/patchTransformedInterpolation.C
+++ b/src/fvMotionSolver/motionInterpolation/patchTransformed/patchTransformedInterpolation.C
@@ -102,14 +102,7 @@ void Foam::patchTransformedInterpolation::interpolate
     pointScalarField&
 ) const
 {
-    notImplemented
-    (
-        "void Foam::patchTransformedInterpolation::interpolate"
-        "("
-            "const volScalarField&"
-            "pointScalarField&"
-         ")"
-    );
+    NotImplemented;
 }
 
 
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSourceIO.C b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSourceIO.C
index f89a05ea062bd24e20ccc52fb98e70aeddcb96cb..171b2dce209a3bdb31ba7c4dbc9c28e748cd969c 100644
--- a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSourceIO.C
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSourceIO.C
@@ -32,13 +32,7 @@ void Foam::fv::directionalPressureGradientExplicitSource::writeData
     Ostream& os
 ) const
 {
-    notImplemented
-    (
-        "void Foam::fv::directionalPressureGradientExplicitSource::writeData"
-        "("
-            "Ostream&"
-        ") const"
-    );
+    NotImplemented;
 }
 
 
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.H b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.H
index dd30d29c0186d691b74fd9d301f2a47b59a6e45b..e7449d16cdabde2d658c5862fedde073d4ab1a54 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.H
+++ b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.H
@@ -138,11 +138,7 @@ public:
         //-  Update local data for topology changes
         virtual void updateMesh(const mapPolyMesh&)
         {
-            notImplemented
-            (
-                "displacementMotionSolverMeshMover::updateMesh"
-                "(const mapPolyMesh&)"
-            );
+            NotImplemented;
         }
 };
 
diff --git a/src/mesh/blockMesh/curvedEdges/bezier.C b/src/mesh/blockMesh/curvedEdges/bezier.C
index 1d590457b9e61ff30c5941c09aeda611b11d8f40..28363be46137e32d26ec75798c129980a0008e64 100644
--- a/src/mesh/blockMesh/curvedEdges/bezier.C
+++ b/src/mesh/blockMesh/curvedEdges/bezier.C
@@ -89,7 +89,7 @@ Foam::point Foam::bezier::position(const scalar lambda) const
 
 Foam::scalar Foam::bezier::length() const
 {
-    notImplemented("bezier::length() const");
+    NotImplemented;
     return 1.0;
 }
 
diff --git a/src/meshTools/searchableSurface/searchableCone.H b/src/meshTools/searchableSurface/searchableCone.H
index 3b4d7c3d1f8ad26b0a8d5b1cdc7beb6761199b63..b3f2dbd53549d39b4262aa992b19d0c2f343d082 100644
--- a/src/meshTools/searchableSurface/searchableCone.H
+++ b/src/meshTools/searchableSurface/searchableCone.H
@@ -209,11 +209,7 @@ public:
         //- Does any part of the surface overlap the supplied bound box?
         virtual bool overlaps(const boundBox& bb) const
         {
-            notImplemented
-            (
-                "searchableCone::overlaps(const boundBox&) const"
-            );
-
+            NotImplemented;
             return false;
         }
 
@@ -279,7 +275,7 @@ public:
 
             virtual bool writeData(Ostream&) const
             {
-                notImplemented("searchableCone::writeData(Ostream&) const");
+                NotImplemented;
                 return false;
             }
 };
diff --git a/src/meshTools/searchableSurface/searchableRotatedBox.C b/src/meshTools/searchableSurface/searchableRotatedBox.C
index 3e9660ca802bfaf0e709d4c6a3d7ed21d94f5485..5fc3c79f58d84dadfb4b81a8b3e71f93c67e5c0c 100644
--- a/src/meshTools/searchableSurface/searchableRotatedBox.C
+++ b/src/meshTools/searchableSurface/searchableRotatedBox.C
@@ -207,11 +207,7 @@ Foam::pointIndexHit Foam::searchableRotatedBox::findNearest
     point& linePoint
 ) const
 {
-    notImplemented
-    (
-        "searchableRotatedBox::findNearest"
-        "(const linePointRef&, treeBoundBox&, point&)"
-    );
+    NotImplemented;
     return pointIndexHit();
 }
 
diff --git a/src/meshTools/searchableSurface/searchableRotatedBox.H b/src/meshTools/searchableSurface/searchableRotatedBox.H
index 5c5c9206ad8d16915618a216add07682bdd8a441..0b7f206e65b92656811c921ac9a4f1da6af9f3d1 100644
--- a/src/meshTools/searchableSurface/searchableRotatedBox.H
+++ b/src/meshTools/searchableSurface/searchableRotatedBox.H
@@ -245,10 +245,7 @@ public:
 
             bool writeData(Ostream&) const
             {
-                notImplemented
-                (
-                    "searchableRotatedBox::writeData(Ostream&) const"
-                );
+                NotImplemented;
                 return false;
             }
 };