diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index 6815cee389..89ec5f9bed 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -378,7 +378,7 @@ public:
         //  \deprecated(2018-11) - should generally use construct from
         //      dictionary or primitiveEntry instead
         //      (additional checks on the input stream).
-        FOAM_DEPRECATED(2018-11)
+        FOAM_DEPRECATED_FOR(2018-11, "construct from dictionary or entry")
         explicit dimensioned(Istream& is);
 
         //- Deprecated(2018-11) Construct from Istream with given name
@@ -386,7 +386,7 @@ public:
         //  \deprecated(2018-11) - should generally use construct from
         //      dictionary or primitiveEntry instead
         //      (additional checks on the input stream).
-        FOAM_DEPRECATED(2018-11)
+        FOAM_DEPRECATED_FOR(2018-11, "construct from dictionary or entry")
         dimensioned(const word& name, Istream& is);
 
         //- Deprecated(2018-11) Construct from Istream with given name
@@ -397,7 +397,7 @@ public:
         //  \deprecated(2018-11) - should generally use construct from
         //      dictionary or primitiveEntry instead
         //      (additional checks on the input stream).
-        FOAM_DEPRECATED(2018-11)
+        FOAM_DEPRECATED_FOR(2018-11, "construct from dictionary or entry")
         dimensioned(const word& name, const dimensionSet& dims, Istream& is);
 
 
diff --git a/src/OpenFOAM/meshes/Identifiers/surface/geometricSurfacePatch.H b/src/OpenFOAM/meshes/Identifiers/surface/geometricSurfacePatch.H
index 855d237abe..382a24779c 100644
--- a/src/OpenFOAM/meshes/Identifiers/surface/geometricSurfacePatch.H
+++ b/src/OpenFOAM/meshes/Identifiers/surface/geometricSurfacePatch.H
@@ -196,7 +196,7 @@ public:
 
         //- Deprecated(2020-01) Construct from components
         //  \deprecated(2020-01) - order inconsistent with other identifiers
-        FOAM_DEPRECATED(2020-01)
+        FOAM_DEPRECATED_FOR(2020-01, "construct name/index/type")
         geometricSurfacePatch
         (
             const word& geometricType,
diff --git a/src/parallel/decompose/decompose/decompositionModel.H b/src/parallel/decompose/decompose/decompositionModel.H
index 2b162445d1..2624219caf 100644
--- a/src/parallel/decompose/decompose/decompositionModel.H
+++ b/src/parallel/decompose/decompose/decompositionModel.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef decompositionModel_H
-#define decompositionModel_H
+#ifndef Foam_decompositionModel_H
+#define Foam_decompositionModel_H
 
 #include "IOdictionary.H"
 #include "MeshObject.H"
@@ -126,7 +126,7 @@ public:
 
         //- Deprecated(2021-04) compatibility constructor
         //  \deprecated(2021-04)
-        FOAM_DEPRECATED(2021-04)
+        FOAM_DEPRECATED_FOR(2021-04, "construct mesh/fileName/dictionary")
         decompositionModel
         (
             const polyMesh& mesh,
@@ -139,7 +139,7 @@ public:
 
         //- Deprecated(2021-04) compatibility selector
         //  \deprecated(2021-04)
-        FOAM_DEPRECATED(2021-04)
+        FOAM_DEPRECATED_FOR(2021-04, "New mesh/fileName/dictionary")
         static const decompositionModel& New
         (
             const polyMesh& mesh,
diff --git a/src/surfMesh/triSurface/patches/surfacePatch.H b/src/surfMesh/triSurface/patches/surfacePatch.H
index c36ae7ce7b..77204bf608 100644
--- a/src/surfMesh/triSurface/patches/surfacePatch.H
+++ b/src/surfMesh/triSurface/patches/surfacePatch.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef surfacePatch_H
-#define surfacePatch_H
+#ifndef Foam_surfacePatch_H
+#define Foam_surfacePatch_H
 
 #include "geometricSurfacePatch.H"
 
@@ -81,7 +81,7 @@ public:
         //- Default construct, with zero start, size, index=-1
         surfacePatch();
 
-        //- Construct null with specified index
+        //- Default construct, with zero start, size, and specified index
         explicit surfacePatch(const label index);
 
         //- Construct from components
@@ -148,7 +148,7 @@ public:
 
         //- Deprecated(2020-01) Construct from components
         //  \deprecated(2020-01) - order inconsistent with other identifiers
-        FOAM_DEPRECATED(2020-01)
+        FOAM_DEPRECATED_FOR(2020-01, "construct name/size/start/index/type")
         surfacePatch
         (
             const word& geometricType,