diff --git a/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C b/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
index 66612e2e12..fa9e048bad 100644
--- a/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
+++ b/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
@@ -23,13 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "coalParcel.H"
+#include "coalCloud.H"
 
 // Kinematic
 #include "makeThermoParcelForces.H" // thermo variant
 #include "makeParcelDispersionModels.H"
 #include "makeReactingMultiphaseParcelInjectionModels.H" // MP variant
-#include "makeParcelCollisionModels.H"
 #include "makeParcelPatchInteractionModels.H"
 #include "makeParcelPostProcessingModels.H"
 
@@ -51,25 +50,28 @@ License
 
 namespace Foam
 {
+    typedef coalCloud::cloudType coalCloud_R;
+    typedef coalCloud_R::cloudType coalCloud_T;
+    typedef coalCloud_T::cloudType coalCloud_K;
+
     // Kinematic sub-models
-    makeThermoParcelForces(coalParcel);
-    makeParcelDispersionModels(coalParcel);
-    makeReactingMultiphaseParcelInjectionModels(coalParcel);
-    makeParcelCollisionModels(coalParcel);
-    makeParcelPatchInteractionModels(coalParcel);
-    makeParcelPostProcessingModels(coalParcel);
+    makeThermoParcelForces(coalCloud_K);
+    makeParcelDispersionModels(coalCloud_K);
+    makeReactingMultiphaseParcelInjectionModels(coalCloud_K);
+    makeParcelPatchInteractionModels(coalCloud_K);
+    makeParcelPostProcessingModels(coalCloud_K);
 
     // Thermo sub-models
-    makeParcelHeatTransferModels(coalParcel);
+    makeParcelHeatTransferModels(coalCloud_T);
 
     // Reacting sub-models
-    makeReactingMultiphaseParcelCompositionModels(coalParcel);
-    makeReactingParcelPhaseChangeModels(coalParcel);
+    makeReactingMultiphaseParcelCompositionModels(coalCloud_R);
+    makeReactingParcelPhaseChangeModels(coalCloud_R);
 
     // Reacting multiphase sub-models
-    makeReactingMultiphaseParcelDevolatilisationModels(coalParcel);
-    makeReactingParcelSurfaceFilmModels(coalParcel);
-    makeCoalParcelSurfaceReactionModels(coalParcel);
+    makeReactingMultiphaseParcelDevolatilisationModels(coalCloud);
+    makeReactingParcelSurfaceFilmModels(coalCloud_K);
+    makeCoalParcelSurfaceReactionModels(coalCloud);
 }
 
 
diff --git a/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
index 391e189858..781f0c6d47 100644
--- a/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
+++ b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
@@ -28,12 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "Cloud.H"
-#include "KinematicCloud.H"
-#include "ThermoCloud.H"
-#include "ReactingCloud.H"
-#include "ReactingMultiphaseCloud.H"
-
 #include "NoSurfaceReaction.H"
 #include "COxidationDiffusionLimitedRate.H"
 #include "COxidationKineticDiffusionLimitedRate.H"
@@ -41,46 +35,17 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeCoalParcelSurfaceReactionModels(ParcelType)                       \
+#define makeCoalParcelSurfaceReactionModels(CloudType)                        \
                                                                               \
-    typedef ReactingMultiphaseCloud                                           \
-    <                                                                         \
-        ReactingCloud                                                         \
-        <                                                                     \
-            ThermoCloud                                                       \
-            <                                                                 \
-                KinematicCloud                                                \
-                <                                                             \
-                    Cloud                                                     \
-                    <                                                         \
-                        ParcelType                                            \
-                    >                                                         \
-                >                                                             \
-            >                                                                 \
-        >                                                                     \
-    > RMPRTKC##ParcelType;                                                    \
-                                                                              \
-    makeSurfaceReactionModel(RMPRTKC##ParcelType);                            \
-    makeSurfaceReactionModelType                                              \
-    (                                                                         \
-        NoSurfaceReaction,                                                    \
-        RMPRTKC##ParcelType                                                   \
-    );                                                                        \
-    makeSurfaceReactionModelType                                              \
-    (                                                                         \
-        COxidationDiffusionLimitedRate,                                       \
-        RMPRTKC##ParcelType                                                   \
-    );                                                                        \
+    makeSurfaceReactionModel(CloudType);                                      \
+    makeSurfaceReactionModelType(NoSurfaceReaction, CloudType);               \
+    makeSurfaceReactionModelType(COxidationDiffusionLimitedRate, CloudType);  \
     makeSurfaceReactionModelType                                              \
     (                                                                         \
         COxidationKineticDiffusionLimitedRate,                                \
-        RMPRTKC##ParcelType                                                   \
+        CloudType                                                             \
     );                                                                        \
-    makeSurfaceReactionModelType                                              \
-    (                                                                         \
-        COxidationMurphyShaddix,                                              \
-        RMPRTKC##ParcelType                                                   \
-    );
+    makeSurfaceReactionModelType(COxidationMurphyShaddix, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //