diff --git a/src/overset/oversetPolyPatch/oversetFvPatchField.C b/src/overset/oversetPolyPatch/oversetFvPatchField.C
index 0d38b83514c41bf607102da73ec12ee8a52374bb..de61b8c118e6c335a50c73a4ff3ffd7f690041b0 100644
--- a/src/overset/oversetPolyPatch/oversetFvPatchField.C
+++ b/src/overset/oversetPolyPatch/oversetFvPatchField.C
@@ -80,16 +80,8 @@ Foam::oversetFvPatchField<Type>::oversetFvPatchField
 {
     if (!isA<oversetFvPatch>(p))
     {
-        FatalIOErrorIn
-        (
-            "oversetFvPatchField<Type>::oversetFvPatchField"
-            "("
-                "const fvPatch&, "
-                "const DimensionedField<Type, volMesh>&, "
-                "const dictionary&"
-            ")",
-            dict
-        )   << "    patch type '" << p.type()
+        FatalIOErrorInFunction(dict)
+            << "    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()
diff --git a/src/overset/regionsToCell/findRefCells.C b/src/overset/regionsToCell/findRefCells.C
index 289bb1959b535381f6d63056e027660dcadb46d6..67ac1ba0f8e9c30be77485c7823684e95737eb0e 100644
--- a/src/overset/regionsToCell/findRefCells.C
+++ b/src/overset/regionsToCell/findRefCells.C
@@ -108,19 +108,8 @@ void Foam::setRefCells
 
             if (refCells.size() != regionNeedReference.size())
             {
-                FatalIOErrorIn
-                (
-                    "setRefCell\n"
-                    "(\n"
-                    "    const volScalarField&,\n"
-                    "    const volScalarField&,\n"
-                    "    const dictionary&,\n"
-                    "    labelList&,\n"
-                    "    scalarField&,\n"
-                    "    const bool\n"
-                    ")\n",
-                    dict
-                )   << "Number of refCells " << refCells.size()
+                FatalIOErrorInFunction(dict)
+                    << "Number of refCells " << refCells.size()
                     << " does not correspond to number of regions "
                     << regionNeedReference.size()
                     << exit(FatalIOError);
@@ -146,19 +135,8 @@ void Foam::setRefCells
                  && regionRefCells[regionI] == -1
                 )
                 {
-                    FatalIOErrorIn
-                    (
-                        "setRefCell\n"
-                        "(\n"
-                        "    const volScalarField&,\n"
-                        "    const volScalarField&,\n"
-                        "    const dictionary&,\n"
-                        "    labelList&,\n"
-                        "    scalarField&,\n"
-                        "    const bool\n"
-                        ")\n",
-                        dict
-                    )   << "Have no reference cell for region " << regionI
+                    FatalIOErrorInFunction(dict)
+                        << "Have no reference cell for region " << regionI
                         << nl
                         << "Overall per-region reference cells "
                         << regionRefCells
@@ -173,19 +151,8 @@ void Foam::setRefCells
 
         if (refPoints.size() != regionNeedReference.size())
         {
-            FatalIOErrorIn
-            (
-                "setRefCell\n"
-                "(\n"
-                "    const volScalarField&,\n"
-                "    const volScalarField&,\n"
-                "    const dictionary&,\n"
-                "    labelList&,\n"
-                "    scalarField&,\n"
-                "    const bool\n"
-                ")\n",
-                dict
-            )   << "Number of refPoints " << refPoints.size()
+            FatalIOErrorInFunction(dict)
+                << "Number of refPoints " << refPoints.size()
                 << " does not correspond to number of regions "
                 << regionNeedReference.size()
                 << exit(FatalIOError);
@@ -226,19 +193,8 @@ void Foam::setRefCells
         {
             if (hasRef[regionI] != 1)
             {
-                FatalIOErrorIn
-                (
-                    "setRefCell\n"
-                    "(\n"
-                    "    const volScalarField&,\n"
-                    "    const volScalarField&,\n"
-                    "    const dictionary&,\n"
-                    "    labelList&,\n"
-                    "    scalarField&,\n"
-                    "    const bool\n"
-                    ")\n",
-                    dict
-                )   << "Unable to set reference cell for field " << field.name()
+                FatalIOErrorInFunction(dict)
+                    << "Unable to set reference cell for field " << field.name()
                     << nl
                     << "    Reference points " << refPointName
                     << " " << refPoints
@@ -251,19 +207,8 @@ void Foam::setRefCells
     }
     else
     {
-        FatalIOErrorIn
-        (
-            "setRefCell\n"
-            "(\n"
-            "    const volScalarField&,\n"
-            "    const volScalarField&,\n"
-            "    const dictionary&,\n"
-            "    labelList&,\n"
-            "    scalarField&,\n"
-            "    const bool\n"
-            ")\n",
-            dict
-        )   << "Unable to set reference cell for field " << field.name()
+        FatalIOErrorInFunction(dict)
+            << "Unable to set reference cell for field " << field.name()
             << nl
             << "    Please supply either " << refCellName
             << " or " << refPointName << nl << exit(FatalIOError);
diff --git a/src/randomProcesses/windowModels/windowModel/windowModelNew.C b/src/randomProcesses/windowModels/windowModel/windowModelNew.C
index d4dd15b07ed81f0e9e2e39ca16eeff3d40c28d7f..7b1c8a7e7214e255d12235d581b0c6496e1515af 100644
--- a/src/randomProcesses/windowModels/windowModel/windowModelNew.C
+++ b/src/randomProcesses/windowModels/windowModel/windowModelNew.C
@@ -42,10 +42,8 @@ Foam::autoPtr<Foam::windowModel> Foam::windowModel::New
 
     if (!cstrIter.found())
     {
-        FatalErrorIn
-        (
-            "windowModel::New(const dictionary&, const label)"
-        )   << "Unknown windowModel type "
+        FatalErrorInFunction
+            << "Unknown windowModel type "
             << modelType << nl << nl
             << "Valid windowModel types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/surfMesh/surfaceFormats/fire/FLMAsurfaceFormat.C b/src/surfMesh/surfaceFormats/fire/FLMAsurfaceFormat.C
index de258c1010b627d4dca7107f909eb481b304c981..43eecf8ae56259b5f9f79194d880ee70f424f1f3 100644
--- a/src/surfMesh/surfaceFormats/fire/FLMAsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/fire/FLMAsurfaceFormat.C
@@ -159,11 +159,7 @@ void Foam::fileFormats::FLMAsurfaceFormat<Face>::write
 {
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::FLMAsurfaceFormat::write"
-            "(OSstream&, const MeshedSurfaceProxy<Face>&)"
-        )
+        FatalErrorInFunction
             << "bad output state "
             << exit(FatalError);
     }
@@ -352,11 +348,7 @@ void Foam::fileFormats::FLMAsurfaceFormat<Face>::write
     }
     else
     {
-        FatalErrorIn
-        (
-            "fileFormats::FLMAsurfaceFormat::write"
-            "(const fileName&, const MeshedSurfaceProxy<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }