diff --git a/etc/caseDicts/postProcessing/multiphase/moments b/etc/caseDicts/postProcessing/multiphase/populationBalanceMoments
similarity index 100%
rename from etc/caseDicts/postProcessing/multiphase/moments
rename to etc/caseDicts/postProcessing/multiphase/populationBalanceMoments
diff --git a/etc/caseDicts/postProcessing/multiphase/sizeDistribution b/etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution
similarity index 100%
rename from etc/caseDicts/postProcessing/multiphase/sizeDistribution
rename to etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/controlDict b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/controlDict
index e49e4664ff..fbbd40179d 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/controlDict
@@ -52,7 +52,7 @@ maxDeltaT       1;
 
 functions
 {
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
     (
         populationBalance=bubbles,
         functionType=numberDensity,
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/controlDict b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/controlDict
index e49e4664ff..fbbd40179d 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/controlDict
@@ -52,7 +52,7 @@ maxDeltaT       1;
 
 functions
 {
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
     (
         populationBalance=bubbles,
         functionType=numberDensity,
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/controlDict b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/controlDict
index 67cfa50e52..e62ba9ad57 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/controlDict
@@ -52,7 +52,7 @@ maxDeltaT       1;
 
 functions
 {
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
     (
         populationBalance=bubbles,
         functionType=numberDensity,
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/controlDict b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/controlDict
index e1371517e6..2308379fe7 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/controlDict
@@ -52,7 +52,7 @@ maxDeltaT       1;
 
 functions
 {
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
     (
         populationBalance=bubbles,
         functionType=numberDensity,
@@ -60,7 +60,7 @@ functions
         funcName=numberDensity
     )
 
-    #includeFunc moments
+    #includeFunc populationBalanceMoments
     (
         populationBalance=bubbles,
         momentType=integerMoment,
@@ -68,7 +68,7 @@ functions
         order=1
     )
 
-    #includeFunc moments
+    #includeFunc populationBalanceMoments
     (
         populationBalance=bubbles,
         momentType=integerMoment,
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/controlDict b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/controlDict
index 829675d7d3..5a0f2fc5c1 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/controlDict
@@ -52,7 +52,7 @@ maxDeltaT       1;
 
 functions
 {
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
     (
         populationBalance=bubbles,
         functionType=numberDensity,
@@ -60,7 +60,7 @@ functions
         funcName=numberDensity
     )
 
-    #includeFunc moments
+    #includeFunc populationBalanceMoments
     (
         populationBalance=bubbles,
         momentType=integerMoment,
@@ -68,7 +68,7 @@ functions
         order=1
     )
 
-    #includeFunc moments
+    #includeFunc populationBalanceMoments
     (
         populationBalance=bubbles,
         momentType=integerMoment,
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/controlDict b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/controlDict
index 5f3ed4fb88..727ae9e9f2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/controlDict
@@ -52,7 +52,7 @@ maxDeltaT       1;
 
 functions
 {
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
     (
         populationBalance=bubbles,
         functionType=numberDensity,
@@ -61,7 +61,7 @@ functions
         funcName=numberDensity
     )
 
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
     (
         populationBalance=bubbles,
         functionType=volumeDensity,
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/controlDict
index 80d26373bd..b57f578e7f 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/controlDict
@@ -73,7 +73,7 @@ functions
         )
     )
 
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
     (
         populationBalance=bubbles,
         regionType=cellZone,
@@ -84,7 +84,7 @@ functions
         funcName=probabilityDensity.injection
     )
 
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
     (
         populationBalance=bubbles,
         regionType=cellZone,
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/pipeBend/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/pipeBend/system/controlDict
index 76efd24b93..b191293c0a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/pipeBend/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/pipeBend/system/controlDict
@@ -53,7 +53,7 @@ functions
 {
     #includeFunc writeObjects(d.particles)
 
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
     (
         populationBalance=agglomerates,
         regionType=cellZone,
@@ -64,7 +64,7 @@ functions
         funcName=probabilityDensity.afterBend_1d
     )
 
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
     (
         populationBalance=agglomerates,
         regionType=cellZone,
@@ -75,7 +75,7 @@ functions
         funcName=probabilityDensity.afterBend_5d
     )
 
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
     (
         populationBalance=agglomerates,
         regionType=cellZone,
@@ -86,7 +86,7 @@ functions
         funcName=probabilityDensity.afterBend_9d
     )
 
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
     (
         populationBalance=agglomerates,
         regionType=cellZone,
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/controlDict
index 4b62a7eae6..90940daaf4 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/controlDict
@@ -60,7 +60,7 @@ functions
         fields=(TiCl4.vapor O2.vapor Cl2.vapor alpha.particles)
     )
 
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
     (
         populationBalance=aggregates,
         regionType=cellZone,
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/controlDict
index c6feca716f..d691028a94 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/controlDict
@@ -60,7 +60,7 @@ functions
         fields=(TiCl4.vapor O2.vapor Cl2.vapor alpha.particles)
     )
 
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
     (
         populationBalance=aggregates,
         regionType=cellZone,