diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 580b02b94eda1b9586c9c67e405a6b914020576d..974d9687cc40b7e370512a3e0b381bc49702c810 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -204,8 +204,8 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
     d_(p.d_),
     U_(p.U_),
     f_(p.f_),
-    pi_(p.pi_),
-    tau_(p.tau_),
+    angularMomentum_(p.angularMomentum_),
+    torque_(p.torque_),
     rho_(p.rho_),
     tTurb_(p.tTurb_),
     UTurb_(p.UTurb_),
@@ -241,7 +241,7 @@ bool Foam::KinematicParcel<ParcelType>::move(TrackData& td)
 
             p.U() += 0.5*deltaT*p.f()/p.mass();
 
-            pi_ += 0.5*deltaT*tau_;
+            angularMomentum_ += 0.5*deltaT*torque_;
 
             break;
         }
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 018e8a22ef24bbf75fb027c3dfa6bbed0d6d617a..de39dcee3a811a4cadd400b566addf8976db0877 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -250,11 +250,11 @@ protected:
 
             //- Angular momentum of Parcel in global reference frame
             // [kg m2/s]
-            vector pi_;
+            vector angularMomentum_;
 
             //- Torque on particle due to collisions in global
             //  reference frame [Nm]
-            vector tau_;
+            vector torque_;
 
             //- Density [kg/m3]
             scalar rho_;
@@ -337,8 +337,8 @@ public:
             const scalar d0,
             const vector& U0,
             const vector& f0,
-            const vector& pi0,
-            const vector& tau0,
+            const vector& angularMomentum0,
+            const vector& torque0,
             const constantProperties& constProps
         );
 
@@ -380,10 +380,10 @@ public:
             inline const vector& f() const;
 
             //- Return const access to angular momentum
-            inline const vector& pi() const;
+            inline const vector& angularMomentum() const;
 
             //- Return const access to torque
-            inline const vector& tau() const;
+            inline const vector& torque() const;
 
             //- Return const access to density
             inline scalar rho() const;
@@ -416,10 +416,10 @@ public:
             inline vector& f();
 
             //- Return access to angular momentum
-            inline vector& pi();
+            inline vector& angularMomentum();
 
             //- Return access to torque
-            inline vector& tau();
+            inline vector& torque();
 
             //- Return access to density
             inline scalar& rho();
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index 14ce7276f64dc0bcbd5152a29ce47fc414c49844..db570939977a41c4bfe2eea01f9270215abfff8d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -26,7 +26,7 @@ License
 
 #include "mathematicalConstants.H"
 
-using namespace Foam::constant;
+using namespace Foam::constant::mathematical;
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -91,8 +91,8 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
     d_(0.0),
     U_(vector::zero),
     f_(vector::zero),
-    pi_(vector::zero),
-    tau_(vector::zero),
+    angularMomentum_(vector::zero),
+    torque_(vector::zero),
     rho_(0.0),
     tTurb_(0.0),
     UTurb_(vector::zero),
@@ -114,8 +114,8 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
     const scalar d0,
     const vector& U0,
     const vector& f0,
-    const vector& pi0,
-    const vector& tau0,
+    const vector& angularMomentum0,
+    const vector& torque0,
     const constantProperties& constProps
 )
 :
@@ -125,8 +125,8 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
     d_(d0),
     U_(U0),
     f_(f0),
-    pi_(pi0),
-    tau_(tau0),
+    angularMomentum_(angularMomentum0),
+    torque_(torque0),
     rho_(constProps.rho0()),
     tTurb_(0.0),
     UTurb_(vector::zero),
@@ -297,17 +297,17 @@ Foam::KinematicParcel<ParcelType>::f() const
 
 template <class ParcelType>
 inline const Foam::vector&
-Foam::KinematicParcel<ParcelType>::pi() const
+Foam::KinematicParcel<ParcelType>::angularMomentum() const
 {
-    return pi_;
+    return angularMomentum_;
 }
 
 
 template <class ParcelType>
 inline const Foam::vector&
-Foam::KinematicParcel<ParcelType>::tau() const
+Foam::KinematicParcel<ParcelType>::torque() const
 {
-    return tau_;
+    return torque_;
 }
 
 
@@ -376,16 +376,16 @@ inline Foam::vector& Foam::KinematicParcel<ParcelType>::f()
 
 
 template <class ParcelType>
-inline Foam::vector& Foam::KinematicParcel<ParcelType>::pi()
+inline Foam::vector& Foam::KinematicParcel<ParcelType>::angularMomentum()
 {
-    return pi_;
+    return angularMomentum_;
 }
 
 
 template <class ParcelType>
-inline Foam::vector& Foam::KinematicParcel<ParcelType>::tau()
+inline Foam::vector& Foam::KinematicParcel<ParcelType>::torque()
 {
-    return tau_;
+    return torque_;
 }
 
 
@@ -479,7 +479,7 @@ template <class ParcelType>
 inline Foam::vector
 Foam::KinematicParcel<ParcelType>::omega() const
 {
-    return pi_/momentOfInertia();
+    return angularMomentum_/momentOfInertia();
 }
 
 
@@ -494,7 +494,7 @@ template <class ParcelType>
 inline Foam::scalar
 Foam::KinematicParcel<ParcelType>::volume(const scalar d) const
 {
-    return mathematical::pi/6.0*pow3(d);
+    return pi/6.0*pow3(d);
 }
 
 
@@ -524,7 +524,7 @@ template <class ParcelType>
 inline Foam::scalar
 Foam::KinematicParcel<ParcelType>::areaS(const scalar d) const
 {
-    return mathematical::pi*d*d;
+    return pi*d*d;
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index 845d1dde8182272f404fc8174dd78421e55bbcac..4e974ac61ee45c4d06e3ecbbb51e61c4f635d97f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -39,8 +39,8 @@ Foam::string Foam::KinematicParcel<ParcelType>::propHeader =
   + " d"
   + " (Ux Uy Uz)"
   + " (fx fy fz)"
-  + " (pix piy piz)"
-  + " (taux tauy tauz)"
+  + " (angularMomentumx angularMomentumy angularMomentumz)"
+  + " (torquex torquey torquez)"
   + " rho"
   + " tTurb"
   + " (UTurbx UTurby UTurbz)";
@@ -62,8 +62,8 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
     d_(0.0),
     U_(vector::zero),
     f_(vector::zero),
-    pi_(vector::zero),
-    tau_(vector::zero),
+    angularMomentum_(vector::zero),
+    torque_(vector::zero),
     rho_(0.0),
     tTurb_(0.0),
     UTurb_(vector::zero),
@@ -81,8 +81,8 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
             d_ = readScalar(is);
             is >> U_;
             is >> f_;
-            is >> pi_;
-            is >> tau_;
+            is >> angularMomentum_;
+            is >> torque_;
             rho_ = readScalar(is);
             tTurb_ = readScalar(is);
             is >> UTurb_;
@@ -98,8 +98,8 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
               + sizeof(d_)
               + sizeof(U_)
               + sizeof(f_)
-              + sizeof(pi_)
-              + sizeof(tau_)
+              + sizeof(angularMomentum_)
+              + sizeof(torque_)
               + sizeof(rho_)
               + sizeof(tTurb_)
               + sizeof(UTurb_)
@@ -143,11 +143,11 @@ void Foam::KinematicParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
     IOField<vector> f(c.fieldIOobject("f", IOobject::MUST_READ));
     c.checkFieldIOobject(c, f);
 
-    IOField<vector> pi(c.fieldIOobject("pi", IOobject::MUST_READ));
-    c.checkFieldIOobject(c, pi);
+    IOField<vector> angularMomentum(c.fieldIOobject("angularMomentum", IOobject::MUST_READ));
+    c.checkFieldIOobject(c, angularMomentum);
 
-    IOField<vector> tau(c.fieldIOobject("tau", IOobject::MUST_READ));
-    c.checkFieldIOobject(c, tau);
+    IOField<vector> torque(c.fieldIOobject("torque", IOobject::MUST_READ));
+    c.checkFieldIOobject(c, torque);
 
     IOField<scalar> rho(c.fieldIOobject("rho", IOobject::MUST_READ));
     c.checkFieldIOobject(c, rho);
@@ -168,7 +168,7 @@ void Foam::KinematicParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
         p.d_ = d[i];
         p.U_ = U[i];
         p.f_ = f[i];
-        p.pi_ = pi[i];
+        p.angularMomentum_ = angularMomentum[i];
         p.rho_ = rho[i];
         p.tTurb_ = tTurb[i];
         p.UTurb_ = UTurb[i];
@@ -193,8 +193,8 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
     IOField<scalar> d(c.fieldIOobject("d", IOobject::NO_READ), np);
     IOField<vector> U(c.fieldIOobject("U", IOobject::NO_READ), np);
     IOField<vector> f(c.fieldIOobject("f", IOobject::NO_READ), np);
-    IOField<vector> pi(c.fieldIOobject("pi", IOobject::NO_READ), np);
-    IOField<vector> tau(c.fieldIOobject("tau", IOobject::NO_READ), np);
+    IOField<vector> angularMomentum(c.fieldIOobject("angularMomentum", IOobject::NO_READ), np);
+    IOField<vector> torque(c.fieldIOobject("torque", IOobject::NO_READ), np);
     IOField<scalar> rho(c.fieldIOobject("rho", IOobject::NO_READ), np);
     IOField<scalar> tTurb(c.fieldIOobject("tTurb", IOobject::NO_READ), np);
     IOField<vector> UTurb(c.fieldIOobject("UTurb", IOobject::NO_READ), np);
@@ -209,8 +209,8 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
         d[i] = p.d();
         U[i] = p.U();
         f[i] = p.f();
-        pi[i] = p.pi();
-        tau[i] = p.tau();
+        angularMomentum[i] = p.angularMomentum();
+        torque[i] = p.torque();
         rho[i] = p.rho();
         tTurb[i] = p.tTurb();
         UTurb[i] = p.UTurb();
@@ -222,8 +222,8 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
     d.write();
     U.write();
     f.write();
-    pi.write();
-    tau.write();
+    angularMomentum.write();
+    torque.write();
     rho.write();
     tTurb.write();
     UTurb.write();
@@ -247,8 +247,8 @@ Foam::Ostream& Foam::operator<<
             << token::SPACE << p.d()
             << token::SPACE << p.U()
             << token::SPACE << p.f()
-            << token::SPACE << p.pi()
-            << token::SPACE << p.tau()
+            << token::SPACE << p.angularMomentum()
+            << token::SPACE << p.torque()
             << token::SPACE << p.rho()
             << token::SPACE << p.tTurb()
             << token::SPACE << p.UTurb()
@@ -265,8 +265,8 @@ Foam::Ostream& Foam::operator<<
           + sizeof(p.d())
           + sizeof(p.U())
           + sizeof(p.f())
-          + sizeof(p.pi())
-          + sizeof(p.tau())
+          + sizeof(p.angularMomentum())
+          + sizeof(p.torque())
           + sizeof(p.rho())
           + sizeof(p.tTurb())
           + sizeof(p.UTurb())
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index a77b133718550a92418bdf6a70972bdafe45a438..2e08e50381ca5fb7a31eef4a7b1bae993e312e46 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -305,8 +305,8 @@ public:
             const scalar d0,
             const vector& U0,
             const vector& f0,
-            const vector& pi0,
-            const vector& tau0,
+            const vector& angularMomentum0,
+            const vector& torque0,
             const scalarField& Y0,
             const scalarField& YGas0,
             const scalarField& YLiquid0,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
index 206674fa57b1adab49bedd7c11331590e961ff7c..0dca6ec0343d332d140e35ce2eb85b80753a619a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -112,8 +112,8 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
     const scalar d0,
     const vector& U0,
     const vector& f0,
-    const vector& pi0,
-    const vector& tau0,
+    const vector& angularMomentum0,
+    const vector& torque0,
     const scalarField& Y0,
     const scalarField& YGas0,
     const scalarField& YLiquid0,
@@ -131,8 +131,8 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
         d0,
         U0,
         f0,
-        pi0,
-        tau0,
+        angularMomentum0,
+        torque0,
         Y0,
         constProps
     ),
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 440a37a6e55ab934963bc2a24962a58df6d58f17..5eeb744559884b3a1e9316cc81e42ee85bf05075 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -254,8 +254,8 @@ public:
             const scalar d0,
             const vector& U0,
             const vector& f0,
-            const vector& pi0,
-            const vector& tau0,
+            const vector& angularMomentum0,
+            const vector& torque0,
             const scalarField& Y0,
             const constantProperties& constProps
         );
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index 9e580bfde4c60be434484393f4193dd5c4d88ada..456af10e6ae19682f730c32cf2db99c3139e0679 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -97,8 +97,8 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
     const scalar d0,
     const vector& U0,
     const vector& f0,
-    const vector& pi0,
-    const vector& tau0,
+    const vector& angularMomentum0,
+    const vector& torque0,
     const scalarField& Y0,
     const constantProperties& constProps
 )
@@ -113,8 +113,8 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
         d0,
         U0,
         f0,
-        pi0,
-        tau0,
+        angularMomentum0,
+        torque0,
         constProps
     ),
     mass0_(0.0),
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index a37e9d7de1e48b908073f1b676960db4e2584e8a..4b5d8643db98f6b7b3baae93b9c07d3b8d501609 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -267,8 +267,8 @@ public:
             const scalar d0,
             const vector& U0,
             const vector& f0,
-            const vector& pi0,
-            const vector& tau0,
+            const vector& angularMomentum0,
+            const vector& torque0,
             const constantProperties& constProps
         );
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
index 7ad292fb31766b474e9902047c49b2da17aa4283..e6383b3e5c1ebde1af56659a8a4e77cf6b5240b7 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
@@ -98,8 +98,8 @@ inline Foam::ThermoParcel<ParcelType>::ThermoParcel
     const scalar d0,
     const vector& U0,
     const vector& f0,
-    const vector& pi0,
-    const vector& tau0,
+    const vector& angularMomentum0,
+    const vector& torque0,
     const constantProperties& constProps
 )
 :
@@ -113,8 +113,8 @@ inline Foam::ThermoParcel<ParcelType>::ThermoParcel
         d0,
         U0,
         f0,
-        pi0,
-        tau0,
+        angularMomentum0,
+        torque0,
         constProps
     ),
     T_(constProps.T0()),
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.C
index cb8114bcca879602f16b29710104eb9cefe88dfd..d48e19647e9ab83437fb2cce3197f06ece83aaae 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.C
@@ -56,8 +56,8 @@ Foam::BasicReactingMultiphaseParcel<ThermoType>::BasicReactingMultiphaseParcel
     const scalar d0,
     const vector& U0,
     const vector& f0,
-    const vector& pi0,
-    const vector& tau0,
+    const vector& angularMomentum0,
+    const vector& torque0,
     const scalarField& YGas0,
     const scalarField& YLiquid0,
     const scalarField& YSolid0,
@@ -77,8 +77,8 @@ Foam::BasicReactingMultiphaseParcel<ThermoType>::BasicReactingMultiphaseParcel
         d0,
         U0,
         f0,
-        pi0,
-        tau0,
+        angularMomentum0,
+        torque0,
         YGas0,
         YLiquid0,
         YSolid0,
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.H
index c3922dacf9b0befac83f590a853c13b99f7cf9d3..cdab5ea6b665be4efb1719f2bedea19f92a44048 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.H
@@ -89,8 +89,8 @@ public:
              const scalar d0,
              const vector& U0,
              const vector& f0,
-             const vector& pi0,
-             const vector& tau0,
+             const vector& angularMomentum0,
+             const vector& torque0,
              const scalarField& YGas0,
              const scalarField& YLiquid0,
              const scalarField& YSolid0,
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.C
index c5831e79d9eff8cf2849e1af7c58c1498f53a1c7..97fb5ac8a73c18e898d41c5cdc28b83a0f2d09f7 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.C
@@ -51,8 +51,8 @@ Foam::BasicReactingParcel<ThermoType>::BasicReactingParcel
     const scalar d0,
     const vector& U0,
     const vector& f0,
-    const vector& pi0,
-    const vector& tau0,
+    const vector& angularMomentum0,
+    const vector& torque0,
     const scalarField& Y0,
     const typename ReactingParcel<BasicReactingParcel<ThermoType> >::
         constantProperties& constProps
@@ -68,8 +68,8 @@ Foam::BasicReactingParcel<ThermoType>::BasicReactingParcel
         d0,
         U0,
         f0,
-        pi0,
-        tau0,
+        angularMomentum0,
+        torque0,
         Y0,
         constProps
     )
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.H b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.H
index 7a4ed3ccf43691180eecd8b236a8eef6fe9af170..a79d7fb670cab849aa90a64547fee83d8374d66c 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.H
@@ -88,8 +88,8 @@ public:
             const scalar d0,
             const vector& U0,
             const vector& f0,
-            const vector& pi0,
-            const vector& tau0,
+            const vector& angularMomentum0,
+            const vector& torque0,
             const scalarField& Y0,
             const typename ReactingParcel<BasicReactingParcel>::
                 constantProperties& constProps
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
index 9cd1958a4631ab60643fe26a017933774e73ce2d..03a04579a2fdbafb01fbf8121357d0f626501a24 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
@@ -59,8 +59,8 @@ Foam::basicKinematicParcel::basicKinematicParcel
     const scalar d0,
     const vector& U0,
     const vector& f0,
-    const vector& pi0,
-    const vector& tau0,
+    const vector& angularMomentum0,
+    const vector& torque0,
     const constantProperties& constProps
 )
 :
@@ -74,8 +74,8 @@ Foam::basicKinematicParcel::basicKinematicParcel
         d0,
         U0,
         f0,
-        pi0,
-        tau0,
+        angularMomentum0,
+        torque0,
         constProps
     )
 {}
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
index 3a6a849e6df2b1046054c6fa5ebc15cb8c38043e..9789bd341e11a128a6ca8e3b0c8ee96bf5c24613 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
@@ -80,8 +80,8 @@ public:
             const scalar d0,
             const vector& U0,
             const vector& f0,
-            const vector& pi0,
-            const vector& tau0,
+            const vector& angularMomentum0,
+            const vector& torque0,
             const constantProperties& constProps
         );
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
index 02564dcf3cc28f3c276d8dc8894e5175734031f4..e980cb132f05804540ed427deebcd06ae3719604 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
@@ -59,8 +59,8 @@ Foam::basicThermoParcel::basicThermoParcel
     const scalar d0,
     const vector U0,
     const vector& f0,
-    const vector& pi0,
-    const vector& tau0,
+    const vector& angularMomentum0,
+    const vector& torque0,
     const constantProperties& constProps
 )
 :
@@ -74,8 +74,8 @@ Foam::basicThermoParcel::basicThermoParcel
         d0,
         U0,
         f0,
-        pi0,
-        tau0,
+        angularMomentum0,
+        torque0,
         constProps
     )
 {}
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
index 5a83dbdc7b24255ecee7b3412c2ae335cd14682f..e38a8c067ad098785c2be8ebbe24461bfe3b2b44 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
@@ -79,8 +79,8 @@ public:
             const scalar d0,
             const vector U0,
             const vector& f0,
-            const vector& pi0,
-            const vector& tau0,
+            const vector& angularMomentum0,
+            const vector& torque0,
             const constantProperties& constProps
         );
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
index 3e41c946ba5e194a1b22fbb5e039c7703d5a826f..5457f0db8003e4e5918ba608be49f0b0d43a8911 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
@@ -50,7 +50,7 @@ void Foam::PairCollision<CloudType>::preInteraction()
 
         p.f() = vector::zero;
 
-        p.tau() = vector::zero;
+        p.torque() = vector::zero;
     }
 
     buildCellOccupancy();
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
index 60018d4f6f7b15daee9b648770c1fcbd04789491..cbfd200c8e734574c70db1f55e76ee8e09332a84 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
@@ -242,8 +242,8 @@ void Foam::PairSpringSliderDashpot<CloudType>::evaluatePair
             pA.f() += fT_AB;
             pB.f() += -fT_AB;
 
-            pA.tau() += (pA.d()/2*-rHat_AB) ^ fT_AB;
-            pB.tau() += (pB.d()/2*rHat_AB) ^ -fT_AB;
+            pA.torque() += (pA.d()/2*-rHat_AB) ^ fT_AB;
+            pB.torque() += (pB.d()/2*rHat_AB) ^ -fT_AB;
         }
     }
 }