diff --git a/src/lagrangian/distributionModels/RosinRammler/RosinRammler.H b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.H
index 64cc13ca3f929437e36acd51ac2e5791212ca40e..5817d5427132755849dfde2ce2beee35b6c123e7 100644
--- a/src/lagrangian/distributionModels/RosinRammler/RosinRammler.H
+++ b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::RosinRammler
+    Foam::distributionModels::RosinRammler
 
 Description
     Rosin-Rammler distributionModel
@@ -39,8 +39,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef RosinRammler_H
-#define RosinRammler_H
+#ifndef distributionModels_RosinRammler_H
+#define distributionModels_RosinRammler_H
 
 #include "distributionModel.H"
 
diff --git a/src/lagrangian/distributionModels/exponential/exponential.H b/src/lagrangian/distributionModels/exponential/exponential.H
index 0bcadfc0b8a2d5213495345855cbe8f84da7c240..5743a8c37d1ece1f95023c21da9621b729e517bf 100644
--- a/src/lagrangian/distributionModels/exponential/exponential.H
+++ b/src/lagrangian/distributionModels/exponential/exponential.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::exponential
+    Foam::distributionModels::exponential
 
 Description
     exponential distribution model
@@ -32,8 +32,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef exponential_H
-#define exponential_H
+#ifndef distributionModels_exponential_H
+#define distributionModels_exponential_H
 
 #include "distributionModel.H"
 
diff --git a/src/lagrangian/distributionModels/fixedValue/fixedValue.H b/src/lagrangian/distributionModels/fixedValue/fixedValue.H
index 3de10f43b621d24bcb6b6140118ee3b71c493c16..e7da3e03b0efce89f9970a4d9f2083fa9e440b64 100644
--- a/src/lagrangian/distributionModels/fixedValue/fixedValue.H
+++ b/src/lagrangian/distributionModels/fixedValue/fixedValue.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::fixedValue
+    Foam::distributionModels::fixedValue
 
 Description
     Returns a fixed value
@@ -32,8 +32,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef distributionModelFixedValue_H
-#define distributionModelFixedValue_H
+#ifndef distributionModels_fixedValue_H
+#define distributionModels_fixedValue_H
 
 #include "distributionModel.H"
 
@@ -44,7 +44,7 @@ namespace Foam
 namespace distributionModels
 {
 /*---------------------------------------------------------------------------*\
-                       Class fixedValue Declaration
+                         Class fixedValue Declaration
 \*---------------------------------------------------------------------------*/
 
 class fixedValue
diff --git a/src/lagrangian/distributionModels/general/general.H b/src/lagrangian/distributionModels/general/general.H
index eee4b7f9c4fd3af844498f15f8ea5d4bd5d458df..63d5d74d8911ddf614e35ded6781b23727a73d6e 100644
--- a/src/lagrangian/distributionModels/general/general.H
+++ b/src/lagrangian/distributionModels/general/general.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::general
+    Foam::distributionModels::general
 
 Description
     general distribution model
diff --git a/src/lagrangian/distributionModels/multiNormal/multiNormal.H b/src/lagrangian/distributionModels/multiNormal/multiNormal.H
index c1fc3adf7914213e10f845417cfb74623797e54b..03bb0e270d9e38fde46f802e81e4c635de4d05ff 100644
--- a/src/lagrangian/distributionModels/multiNormal/multiNormal.H
+++ b/src/lagrangian/distributionModels/multiNormal/multiNormal.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::multiNormal
+    Foam::distributionModels::multiNormal
 
 Description
     A multiNormal distribution model
@@ -37,8 +37,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef multiNormal_H
-#define multiNormal_H
+#ifndef distributionModels_multiNormal_H
+#define distributionModels_multiNormal_H
 
 #include "distributionModel.H"
 
@@ -50,7 +50,7 @@ namespace distributionModels
 {
 
 /*---------------------------------------------------------------------------*\
-                        Class multiNormal Declaration
+                         Class multiNormal Declaration
 \*---------------------------------------------------------------------------*/
 
 class multiNormal
diff --git a/src/lagrangian/distributionModels/normal/normal.H b/src/lagrangian/distributionModels/normal/normal.H
index 01ecdb04ed91591cf2698c793cb48e0096cbf746..d78ec5a86af1f67c84cb7bd72222e8d67918740a 100644
--- a/src/lagrangian/distributionModels/normal/normal.H
+++ b/src/lagrangian/distributionModels/normal/normal.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::normal
+    Foam::distributionModels::normal
 
 Description
     A normal distribution model
@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef normal_H
-#define normal_H
+#ifndef distributionModels_normal_H
+#define distributionModels_normal_H
 
 #include "distributionModel.H"
 
diff --git a/src/lagrangian/distributionModels/uniform/uniform.H b/src/lagrangian/distributionModels/uniform/uniform.H
index 21d0e1c14bdee9519d59c07223264acc7c54092e..da880347d1009ddb21f610b4a20ac762b0891fce 100644
--- a/src/lagrangian/distributionModels/uniform/uniform.H
+++ b/src/lagrangian/distributionModels/uniform/uniform.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::uniform
+    Foam::distributionModels::uniform
 
 Description
     Uniform/equally-weighted distribution model
@@ -32,8 +32,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef uniform_H
-#define uniform_H
+#ifndef distributionModels_uniform_H
+#define distributionModels_uniform_H
 
 #include "distributionModel.H"