diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index 56a497803a..167e0937f8 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -226,7 +226,7 @@ Foam::scalar Foam::ConeInjection<CloudType>::d0
 
 
 template<class CloudType>
-bool Foam::ConeInjection<CloudType>::validInjection(const label iParcel)
+bool Foam::ConeInjection<CloudType>::validInjection(const label parcelI)
 {
     return true;
 }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index 22faf297eb..0c07e4622a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -160,7 +160,7 @@ public:
             //- Set the injection position and owner cell
             void setPositionAndCell
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time,
                 vector& position,
                 label& cellOwner
@@ -169,20 +169,20 @@ public:
             //- Return the velocity of the parcel to introduce at a time
             vector velocity
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time
             );
 
             //- Return the diameter of the parcel to introduce at a time
             scalar d0
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time
             ) const;
 
             //- Return flag to identify whether or not injection in cellI is
             //  permitted
-            bool validInjection(const label iParcel);
+            bool validInjection(const label parcelI);
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 98c762f0ec..a8fdec60c0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -415,22 +415,22 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
     const scalar padTime = max(0.0, SOI_ - time0_);
 
     // Introduce new parcels linearly with time
-    for (label iParcel=0; iParcel<newParcels; iParcel++)
+    for (label parcelI=0; parcelI<newParcels; parcelI++)
     {
-        // Calculate the pseudo time of injection for parcel 'iParcel'
-        scalar timeInj = time0_ + padTime + deltaT*iParcel/newParcels;
+        // Calculate the pseudo time of injection for parcel 'parcelI'
+        scalar timeInj = time0_ + padTime + deltaT*parcelI/newParcels;
 
         // Determine the injection position and owner cell
         label cellI = -1;
         vector pos = vector::zero;
-        setPositionAndCell(iParcel, timeInj, pos, cellI);
+        setPositionAndCell(parcelI, timeInj, pos, cellI);
 
         if (cellI >= 0)
         {
-            if (validInjection(iParcel))
+            if (validInjection(parcelI))
             {
                 // Diameter of parcels
-                scalar d = d0(iParcel, timeInj);
+                scalar d = d0(parcelI, timeInj);
 
                 // Number of particles per parcel
                 scalar nP = setNumberOfParticles
@@ -443,7 +443,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
                 );
 
                 // Velocity of parcels
-                vector U = velocity(iParcel, timeInj);
+                vector U = velocity(parcelI, timeInj);
 
                 // Lagrangian timestep
                 scalar dt = time - timeInj;
@@ -462,7 +462,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
         {
             WarningIn("Foam::InjectionModel<CloudType>::inject(TrackData& td)")
                 << "Failed to inject new parcel:" << nl
-                << "    id = " << iParcel << ", position = " << pos
+                << "    id = " << parcelI << ", position = " << pos
                 << nl << endl;
         }
     }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index 4c4d546c17..5c2a00a4d5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -157,7 +157,7 @@ protected:
 
         //- Additional flag to identify whether or not injection in cellI is
         //  permitted
-        virtual bool validInjection(const label iParcel) = 0;
+        virtual bool validInjection(const label parcelI) = 0;
 
         //- Determine properties for next time step/injection interval
         virtual void prepareForNextTimeStep
@@ -294,7 +294,7 @@ public:
             //- Set the injection position and owner cell
             virtual void setPositionAndCell
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time,
                 vector& position,
                 label& cellOwner
@@ -303,14 +303,14 @@ public:
             //- Return the velocity of the parcel to introduce at a time
             virtual vector velocity
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time
             ) = 0;
 
             //- Return the diameter of the parcel to introduce at a time
             virtual scalar d0
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time
             ) const = 0;
 };
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
index a059b81b7c..6d71828c23 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
@@ -137,13 +137,13 @@ Foam::scalar Foam::ManualInjection<CloudType>::timeEnd() const
 template<class CloudType>
 void Foam::ManualInjection<CloudType>::setPositionAndCell
 (
-    const label iParcel,
+    const label parcelI,
     const scalar time,
     vector& position,
     label& cellOwner
 )
 {
-    position = positions_[iParcel];
+    position = positions_[parcelI];
     this->findCellAtPosition(cellOwner, position);
 }
 
@@ -162,11 +162,11 @@ Foam::vector Foam::ManualInjection<CloudType>::velocity
 template<class CloudType>
 Foam::scalar Foam::ManualInjection<CloudType>::d0
 (
-    const label iParcel,
+    const label parcelI,
     const scalar
 ) const
 {
-    return diameters_[iParcel];
+    return diameters_[parcelI];
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
index d97ac34524..6dde70c746 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
@@ -137,7 +137,7 @@ public:
             //- Set the injection position and owner cell
             void setPositionAndCell
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time,
                 vector& position,
                 label& cellOwner
@@ -146,20 +146,20 @@ public:
             //- Return the velocity of the parcel to introduce at a time
             vector velocity
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time
             );
 
             //- Return the diameter of the parcel to introduce at a time
             scalar d0
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar
             ) const;
 
             //- Return flag to identify whether or not injection in cellI is
             //  permitted
-            bool validInjection(const label iParcel);
+            bool validInjection(const label parcelI);
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
index ab6a2ec54a..e05790a64e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
@@ -105,7 +105,7 @@ public:
             //- Set the injection position and owner cell
             void setPositionAndCell
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time,
                 vector& position,
                 label& cellOwner
@@ -114,14 +114,14 @@ public:
             //- Return the velocity of the parcel to introduce at a time
             vector velocity
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time
             );
 
             //- Return the diameter of the parcel to introduce at a time
             scalar d0
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time
             ) const;