diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/files b/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/files
new file mode 100644
index 0000000000..2cce02e105
--- /dev/null
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/files
@@ -0,0 +1,3 @@
+icoUncoupledKinematicParcelDyMFoam.C
+
+EXE = $(FOAM_APPBIN)/icoUncoupledKinematicParcelDyMFoam
diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options
similarity index 96%
rename from applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/Make/options
rename to applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options
index 34ba95f0dc..7b471b791a 100644
--- a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options
@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I../icoUncoupledKinematicParcelFoam \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/incompressibleUncoupledKinematicParcelDyMFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
similarity index 98%
rename from applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/incompressibleUncoupledKinematicParcelDyMFoam.C
rename to applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
index 40b642a284..3feff6db77 100644
--- a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/incompressibleUncoupledKinematicParcelDyMFoam.C
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
@@ -36,7 +36,7 @@ Description
 #include "dynamicFvMesh.H"
 #include "singlePhaseTransportModel.H"
 #include "turbulenceModel.H"
-#include "basicKinematicCloud.H"
+#include "basicKinematicCollidingCloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/files b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/files
new file mode 100644
index 0000000000..95c98aff1d
--- /dev/null
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/files
@@ -0,0 +1,3 @@
+icoUncoupledKinematicParcelFoam.C
+
+EXE = $(FOAM_APPBIN)/icoUncoupledKinematicParcelFoam
diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
similarity index 100%
rename from applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/Make/options
rename to applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
similarity index 98%
rename from applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H
rename to applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
index 31be0cf8ee..169bf78172 100644
--- a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
@@ -75,7 +75,7 @@
     args.optionReadIfPresent("cloudName", kinematicCloudName);
 
     Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
-    basicKinematicCloud kinematicCloud
+    basicKinematicCollidingCloud kinematicCloud
     (
         kinematicCloudName,
         rhoInf,
diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/incompressibleUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
similarity index 98%
rename from applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/incompressibleUncoupledKinematicParcelFoam.C
rename to applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
index 34d1d3adaa..748e192dd2 100644
--- a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/incompressibleUncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
@@ -35,7 +35,7 @@ Description
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "turbulenceModel.H"
-#include "basicKinematicCloud.H"
+#include "basicKinematicCollidingCloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/Make/files b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/Make/files
deleted file mode 100644
index e233a549b8..0000000000
--- a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-incompressibleUncoupledKinematicParcelDyMFoam.C
-
-EXE = $(FOAM_APPBIN)/incompressibleUncoupledKinematicParcelDyMFoam
diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/createFields.H b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/createFields.H
deleted file mode 100644
index 31be0cf8ee..0000000000
--- a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/createFields.H
+++ /dev/null
@@ -1,147 +0,0 @@
-    Info<< "\nReading transportProperties\n" << endl;
-
-    IOdictionary transportProperties
-    (
-        IOobject
-        (
-            "transportProperties",
-            runTime.constant(),
-            mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        )
-    );
-
-    dimensionedScalar rhoInfValue
-    (
-        transportProperties.lookup("rhoInf")
-    );
-
-    volScalarField rhoInf
-    (
-        IOobject
-        (
-            "rho",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh,
-        rhoInfValue
-    );
-
-    Info<< "Reading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    #include "createPhi.H"
-
-    Info<< "Creating turbulence model\n" << endl;
-
-    singlePhaseTransportModel laminarTransport(U, phi);
-
-    const volScalarField nu(laminarTransport.nu());
-
-    autoPtr<incompressible::turbulenceModel> turbulence
-    (
-        incompressible::turbulenceModel::New(U, phi, laminarTransport)
-    );
-
-    volScalarField mu
-    (
-        IOobject
-        (
-            "mu",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        nu*rhoInfValue
-    );
-
-    word kinematicCloudName("kinematicCloud");
-    args.optionReadIfPresent("cloudName", kinematicCloudName);
-
-    Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
-    basicKinematicCloud kinematicCloud
-    (
-        kinematicCloudName,
-        rhoInf,
-        U,
-        mu,
-        g
-    );
-
-    IOobject Hheader
-    (
-        "H",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ
-    );
-
-    autoPtr<volVectorField> HPtr_;
-
-    if (Hheader.headerOk())
-    {
-        Info<< "\nReading field H\n" << endl;
-
-        HPtr_.reset
-        (
-            new volVectorField
-            (
-                IOobject
-                (
-                    "H",
-                    runTime.timeName(),
-                    mesh,
-                    IOobject::MUST_READ,
-                    IOobject::AUTO_WRITE
-                ),
-                mesh
-            )
-        );
-    }
-
-    IOobject HdotGradHheader
-    (
-        "HdotGradH",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ
-    );
-
-    autoPtr<volVectorField> HdotGradHPtr_;
-
-    if (HdotGradHheader.headerOk())
-    {
-        Info<< "Reading field HdotGradH" << endl;
-
-        HdotGradHPtr_.reset
-        (
-            new volVectorField
-            (
-                IOobject
-                (
-                    "HdotGradH",
-                    runTime.timeName(),
-                    mesh,
-                    IOobject::MUST_READ,
-                    IOobject::AUTO_WRITE
-                ),
-                mesh
-            )
-        );
-    }
diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/Make/files b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/Make/files
deleted file mode 100644
index 7a27f008c8..0000000000
--- a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-incompressibleUncoupledKinematicParcelFoam.C
-
-EXE = $(FOAM_APPBIN)/incompressibleUncoupledKinematicParcelFoam