diff --git a/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/cloudFilmTransfer/CloudFilmTransfer/CloudFilmTransfer.H b/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/cloudFilmTransfer/CloudFilmTransfer/CloudFilmTransfer.H
index e309916b50..85bbbe5c20 100644
--- a/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/cloudFilmTransfer/CloudFilmTransfer/CloudFilmTransfer.H
+++ b/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/cloudFilmTransfer/CloudFilmTransfer/CloudFilmTransfer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ namespace Foam
 {
 
 // Forward declaration of classes
-class Random;
+class randomGenerator;
 
 namespace fv
 {
@@ -111,7 +111,7 @@ protected:
         typedef typename CloudType::parcelType parcelType;
 
         //- Reference to the cloud random number generator
-        Random& rndGen_;
+        randomGenerator& rndGen_;
 
 
         // Film models
diff --git a/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/dripping/dripping.H b/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/dripping/dripping.H
index 8504622191..b5255364e2 100644
--- a/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/dripping/dripping.H
+++ b/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/dripping/dripping.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,7 @@ SourceFiles
 
 #include "ejectionModel.H"
 #include "distribution.H"
-#include "Random.H"
+#include "randomGenerator.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -97,7 +97,7 @@ class dripping
         scalar minParticlesPerParcel_;
 
         //- Random number generator
-        Random rndGen_;
+        randomGenerator rndGen_;
 
         //- Parcel size PDF model
         const autoPtr<distribution> parcelDistribution_;
diff --git a/applications/test/BinSum/Test-BinSum.C b/applications/test/BinSum/Test-BinSum.C
index 1e2bfa0572..01b1ff6767 100644
--- a/applications/test/BinSum/Test-BinSum.C
+++ b/applications/test/BinSum/Test-BinSum.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Description
 #include "List.H"
 #include "BinSum.H"
 #include "IOstreams.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "scalarField.H"
 
 using namespace Foam;
@@ -41,7 +41,7 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
-    Random rndGen(0);
+    randomGenerator rndGen(0);
 
     scalarField samples(10000000);
     forAll(samples, i)
diff --git a/applications/test/Polynomial/Test-Polynomial.C b/applications/test/Polynomial/Test-Polynomial.C
index c013597bcb..6ceb7187fa 100644
--- a/applications/test/Polynomial/Test-Polynomial.C
+++ b/applications/test/Polynomial/Test-Polynomial.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
 
 #include "IStringStream.H"
 #include "Polynomial.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "cpuTime.H"
 
 using namespace Foam;
@@ -136,10 +136,10 @@ int main(int argc, char *argv[])
     polyCopy = 2.5*poly;
     Info<< "2.5*poly = " << polyCopy << nl << endl;
 
-    Random rnd(123456);
+    randomGenerator rndGen(123456);
     for (int i=0; i<10; i++)
     {
-        scalar x = rnd.scalar01()*100;
+        scalar x = rndGen.scalar01()*100;
 
         scalar px = polyValue(x);
         scalar ipx = intPolyValue(x);
diff --git a/applications/test/boundSphere/Test-boundSphere.C b/applications/test/boundSphere/Test-boundSphere.C
index a5cf251b21..776800cb89 100644
--- a/applications/test/boundSphere/Test-boundSphere.C
+++ b/applications/test/boundSphere/Test-boundSphere.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
     cpuTime time;
     for (label testi = 0; testi < nTests; ++ testi)
     {
-        Random rndGen(seed + testi);
+        randomGenerator rndGen(seed + testi);
 
         // Get random points
         ps.resize(nPs);
diff --git a/applications/test/distribution/Test-distribution.C b/applications/test/distribution/Test-distribution.C
index 1a6bec68e7..f4d8a30c96 100644
--- a/applications/test/distribution/Test-distribution.C
+++ b/applications/test/distribution/Test-distribution.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
     static const label nSamples = 10000000;
 
     // Initialise the random number generator
-    Random rndGen(clock::getTime());
+    randomGenerator rndGen(clock::getTime());
 
     // Create a zero-size-exponent, zero-sampling-size-exponent distribution
     // from which to get X-coordinates
diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C
index f86b6768c2..a393d9d6fb 100644
--- a/applications/test/fieldMapping/Test-fieldMapping.C
+++ b/applications/test/fieldMapping/Test-fieldMapping.C
@@ -41,7 +41,7 @@ Description
 #include "polyTopoChange.H"
 #include "fvcDiv.H"
 #include "zeroGradientFvPatchFields.H"
-#include "Random.H"
+#include "randomGenerator.H"
 
 using namespace Foam;
 
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
     timeSelector::select0(runTime, args);
     #include "createMesh.H"
 
-    Random rndGen(0);
+    randomGenerator rndGen(0);
 
     // Test mapping
     // ------------
diff --git a/applications/test/integerPow/Test-integerPow.C b/applications/test/integerPow/Test-integerPow.C
index b6d58654d6..5561106b3b 100644
--- a/applications/test/integerPow/Test-integerPow.C
+++ b/applications/test/integerPow/Test-integerPow.C
@@ -1,6 +1,6 @@
 #include "cpuTime.H"
 #include "Pair.H"
-#include "Random.H"
+#include "randomGenerator.H"
 
 using namespace Foam;
 
@@ -17,7 +17,7 @@ static const label E = 4;
 template<class Pow>
 Pair<scalar> run(Pow pow)
 {
-    Random rndGen(0);
+    randomGenerator rndGen(0);
 
     cpuTime time;
 
diff --git a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C
index 5502de4c32..a57dd4e4ce 100644
--- a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C
+++ b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ Description
 #include "OPstream.H"
 #include "vector.H"
 #include "IOstreams.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "Tuple2.H"
 #include "PstreamBuffers.H"
 
diff --git a/applications/test/parallel/Test-parallel.C b/applications/test/parallel/Test-parallel.C
index 0155161386..f679fefc13 100644
--- a/applications/test/parallel/Test-parallel.C
+++ b/applications/test/parallel/Test-parallel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ Description
 #include "OPstream.H"
 #include "vector.H"
 #include "IOstreams.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "Tuple2.H"
 
 using namespace Foam;
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
 
     if (true)
     {
-        Random rndGen(43544*Pstream::myProcNo());
+        randomGenerator rndGen(43544*Pstream::myProcNo());
 
         // Generate random data.
         List<Tuple2<label, List<scalar>>> complexData(100);
diff --git a/applications/test/polygonTriangulate/Test-polygonTriangulate.C b/applications/test/polygonTriangulate/Test-polygonTriangulate.C
index abf769b5f2..cb11878828 100644
--- a/applications/test/polygonTriangulate/Test-polygonTriangulate.C
+++ b/applications/test/polygonTriangulate/Test-polygonTriangulate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
         Info<< "Seeding random number generator with value " << seed
             << nl << endl;
     }
-    Random rndGen(seed);
+    randomGenerator rndGen(seed);
 
     // Get controls
     const bool simple = args.optionFound("simple");
diff --git a/applications/test/speed/scalarSpeed/Test-scalarSpeed.C b/applications/test/speed/scalarSpeed/Test-scalarSpeed.C
index ed23dd6044..709065ceaa 100644
--- a/applications/test/speed/scalarSpeed/Test-scalarSpeed.C
+++ b/applications/test/speed/scalarSpeed/Test-scalarSpeed.C
@@ -1,5 +1,5 @@
 #include "primitiveFields.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "cpuTime.H"
 #include "IOstreams.H"
 #include "OFstream.H"
@@ -15,7 +15,7 @@ int main()
     const label rndAddrSkip = 40;
     const label redFac = 6;
     const label redSize = size/redFac;
-    Random genAddr(100);
+    randomGenerator rndGen(100);
 
     double* f1 = new double[size];
     double* f2 = new double[size];
@@ -38,7 +38,7 @@ int main()
 
     for (label i=0; i<size; i+=rndAddrSkip)
     {
-        addr[i] = genAddr.sampleAB<label>(0, size);
+        addr[i] = rndGen.sampleAB<label>(0, size);
     }
 
     for (label i=0; i<redSize; i++)
diff --git a/applications/test/syncTools/Test-syncTools.C b/applications/test/syncTools/Test-syncTools.C
index 569913211a..f7051cd29f 100644
--- a/applications/test/syncTools/Test-syncTools.C
+++ b/applications/test/syncTools/Test-syncTools.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,14 +33,14 @@ Description
 #include "argList.H"
 #include "polyMesh.H"
 #include "Time.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "PackedList.H"
 
 using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-void testPackedList(const polyMesh& mesh, Random& rndGen)
+void testPackedList(const polyMesh& mesh, randomGenerator& rndGen)
 {
     Info<< nl << "Testing PackedList synchronisation." << endl;
 
@@ -182,7 +182,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen)
 }
 
 
-void testSparseData(const polyMesh& mesh, Random& rndGen)
+void testSparseData(const polyMesh& mesh, randomGenerator& rndGen)
 {
     Info<< nl << "Testing Map synchronisation." << endl;
 
@@ -372,7 +372,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
 }
 
 
-void testPointSync(const polyMesh& mesh, Random& rndGen)
+void testPointSync(const polyMesh& mesh, randomGenerator& rndGen)
 {
     Info<< nl << "Testing point-wise data synchronisation." << endl;
 
@@ -440,7 +440,7 @@ void testPointSync(const polyMesh& mesh, Random& rndGen)
 }
 
 
-void testEdgeSync(const polyMesh& mesh, Random& rndGen)
+void testEdgeSync(const polyMesh& mesh, randomGenerator& rndGen)
 {
     Info<< nl << "Testing edge-wise data synchronisation." << endl;
 
@@ -517,7 +517,7 @@ void testEdgeSync(const polyMesh& mesh, Random& rndGen)
 }
 
 
-void testFaceSync(const polyMesh& mesh, Random& rndGen)
+void testFaceSync(const polyMesh& mesh, randomGenerator& rndGen)
 {
     Info<< nl << "Testing face-wise data synchronisation." << endl;
 
@@ -593,7 +593,7 @@ int main(int argc, char *argv[])
     #include "createPolyMesh.H"
 
 
-    Random rndGen(5341*(Pstream::myProcNo()+1));
+    randomGenerator rndGen(5341*(Pstream::myProcNo()+1));
 
 
     // Face sync
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
index 812b27c6f7..7126d221be 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
@@ -24,7 +24,7 @@
 
     mkDir(pdfPath);
 
-    Random rndGen(label(0));
+    randomGenerator rndGen(label(0));
 
     autoPtr<distribution> p
     (
diff --git a/applications/utilities/preProcessing/viewFactorsGen/searchingEngine.H b/applications/utilities/preProcessing/viewFactorsGen/searchingEngine.H
index 16f42983aa..198ccb21dc 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/searchingEngine.H
+++ b/applications/utilities/preProcessing/viewFactorsGen/searchingEngine.H
@@ -1,4 +1,4 @@
-Random rndGen(653213);
+randomGenerator rndGen(653213);
 
 // Determine mesh bounding boxes:
 List<treeBoundBox> meshBb
diff --git a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
index 40c9039e0b..9b68ede89b 100644
--- a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
+++ b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -168,7 +168,7 @@ void createBoundaryEdgeTrees
               + surf.nInternalEdges()
             );
 
-        Random rndGen(17301893);
+        randomGenerator rndGen(17301893);
 
         // Slightly extended bb. Slightly off-centred just so on symmetric
         // geometry there are less face/edge aligned items.
diff --git a/applications/utilities/surface/surfaceInertia/surfaceInertia.C b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
index de5f3eb19e..1af51166b5 100644
--- a/applications/utilities/surface/surfaceInertia/surfaceInertia.C
+++ b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ Description
 #include "triSurface.H"
 #include "OFstream.H"
 #include "meshTools.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "transform.H"
 #include "IOmanip.H"
 #include "Pair.H"
@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
 
     label pertI = 0;
 
-    Random rand(57373);
+    randomGenerator rndGen(57373);
 
     while ((magSqr(eVal) < vSmall) && pertI < 10)
     {
@@ -122,9 +122,9 @@ int main(int argc, char *argv[])
             << "No eigenValues found, shape may have symmetry, "
             << "perturbing inertia tensor diagonal" << endl;
 
-        J.xx() *= 1.0 + small*rand.scalar01();
-        J.yy() *= 1.0 + small*rand.scalar01();
-        J.zz() *= 1.0 + small*rand.scalar01();
+        J.xx() *= 1.0 + small*rndGen.scalar01();
+        J.yy() *= 1.0 + small*rndGen.scalar01();
+        J.zz() *= 1.0 + small*rndGen.scalar01();
 
         eVal = eigenValues(J);
 
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubset.C b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
index 825ef9b5cd..9e42fedcfd 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubset.C
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ Description
 #include "boundBox.H"
 #include "indexedOctree.H"
 #include "treeDataTriSurface.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "volumeType.H"
 #include "plane.H"
 
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 5eb755717a..6bd8cbe7f0 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -136,7 +136,7 @@ sha1 = primitives/hashes/SHA1
 $(sha1)/SHA1.C
 $(sha1)/SHA1Digest.C
 
-primitives/Random/Random.C
+primitives/randomGenerator/randomGenerator.C
 
 ranges = primitives/ranges
 $(ranges)/labelRange/labelRange.C
diff --git a/src/OpenFOAM/algorithms/boundSphere/boundSphere.H b/src/OpenFOAM/algorithms/boundSphere/boundSphere.H
index 30939b7821..3b6a2e7cef 100644
--- a/src/OpenFOAM/algorithms/boundSphere/boundSphere.H
+++ b/src/OpenFOAM/algorithms/boundSphere/boundSphere.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ SourceFiles
 #define boundSphere_H
 
 #include "point.H"
-#include "Random.H"
+#include "randomGenerator.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -78,7 +78,11 @@ Tuple2<point, scalar> weizlBoundSphere
 //- Compute a bounding sphere for an arbitrary number of points, and given an
 //  engine with which to randomise Weizl's algorithm
 template<class PointField>
-Tuple2<point, scalar> boundSphere(const PointField& ps, Random& rndGen);
+Tuple2<point, scalar> boundSphere
+(
+    const PointField& ps,
+    randomGenerator& rndGen
+);
 
 //- Compute a bounding sphere for an arbitrary number of points
 template<class PointField>
diff --git a/src/OpenFOAM/algorithms/boundSphere/boundSphereTemplates.C b/src/OpenFOAM/algorithms/boundSphere/boundSphereTemplates.C
index fffab5b578..c67f7d6b7e 100644
--- a/src/OpenFOAM/algorithms/boundSphere/boundSphereTemplates.C
+++ b/src/OpenFOAM/algorithms/boundSphere/boundSphereTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -254,7 +254,7 @@ Foam::Tuple2<Foam::point, Foam::scalar> Foam::weizlBoundSphere
 
 template<class PointField>
 Foam::Tuple2<Foam::point, Foam::scalar>
-Foam::boundSphere(const PointField& ps, Random& rndGen)
+Foam::boundSphere(const PointField& ps, randomGenerator& rndGen)
 {
     if (ps.size() <= 4)
     {
@@ -283,7 +283,7 @@ Foam::boundSphere(const PointField& ps)
     else
     {
         labelList pis(identityMap(ps.size()));
-        Random(0).permute(pis);
+        randomGenerator(0).permute(pis);
         FixedList<label, 4> boundaryPis({-1, -1, -1, -1});
         return weizlBoundSphere(ps, pis, ps.size(), boundaryPis, 0);
     }
diff --git a/src/OpenFOAM/algorithms/polygonTriangulate/polygonTriangulate.C b/src/OpenFOAM/algorithms/polygonTriangulate/polygonTriangulate.C
index ab0e264223..01639fcbcc 100644
--- a/src/OpenFOAM/algorithms/polygonTriangulate/polygonTriangulate.C
+++ b/src/OpenFOAM/algorithms/polygonTriangulate/polygonTriangulate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -186,7 +186,7 @@ bool Foam::polygonTriangulate::ear
 
 Foam::List<Foam::point> Foam::polygonTriangulate::randomPolygon
 (
-    Random& rndGen,
+    randomGenerator& rndGen,
     const label n,
     const scalar error
 )
diff --git a/src/OpenFOAM/algorithms/polygonTriangulate/polygonTriangulate.H b/src/OpenFOAM/algorithms/polygonTriangulate/polygonTriangulate.H
index 2003861672..0f3ee08847 100644
--- a/src/OpenFOAM/algorithms/polygonTriangulate/polygonTriangulate.H
+++ b/src/OpenFOAM/algorithms/polygonTriangulate/polygonTriangulate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -237,7 +237,7 @@ public:
         //- Generate a random polygon for testing purposes
         static List<point> randomPolygon
         (
-            Random& rndGen,
+            randomGenerator& rndGen,
             const label n,
             const scalar error
         );
diff --git a/src/OpenFOAM/distributions/RosinRammler/RosinRammler.C b/src/OpenFOAM/distributions/RosinRammler/RosinRammler.C
index bc8bbfd614..fdd6417a42 100644
--- a/src/OpenFOAM/distributions/RosinRammler/RosinRammler.C
+++ b/src/OpenFOAM/distributions/RosinRammler/RosinRammler.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ Foam::tmp<Foam::scalarField> Foam::distributions::RosinRammler::Phi
 Foam::distributions::RosinRammler::RosinRammler
 (
     const dictionary& dict,
-    Random& rndGen,
+    randomGenerator& rndGen,
     const label sampleQ
 )
 :
diff --git a/src/OpenFOAM/distributions/RosinRammler/RosinRammler.H b/src/OpenFOAM/distributions/RosinRammler/RosinRammler.H
index 6d5bc3e1b5..8d30e6838d 100644
--- a/src/OpenFOAM/distributions/RosinRammler/RosinRammler.H
+++ b/src/OpenFOAM/distributions/RosinRammler/RosinRammler.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,7 @@ public:
         RosinRammler
         (
             const dictionary& dict,
-            Random& rndGen,
+            randomGenerator& rndGen,
             const label sampleQ
         );
 
diff --git a/src/OpenFOAM/distributions/distribution/distribution.C b/src/OpenFOAM/distributions/distribution/distribution.C
index 086bf084d4..9f9adfbf25 100644
--- a/src/OpenFOAM/distributions/distribution/distribution.C
+++ b/src/OpenFOAM/distributions/distribution/distribution.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ Foam::distribution::distribution
 (
     const word& name,
     const dictionary& dict,
-    Random& rndGen,
+    randomGenerator& rndGen,
     const label sampleQ
 )
 :
@@ -103,7 +103,7 @@ Foam::distribution::distribution
 
 Foam::distribution::distribution
 (
-    Random& rndGen,
+    randomGenerator& rndGen,
     const label Q,
     const label sampleQ
 )
diff --git a/src/OpenFOAM/distributions/distribution/distribution.H b/src/OpenFOAM/distributions/distribution/distribution.H
index e37d41a60a..5a96bc4c0a 100644
--- a/src/OpenFOAM/distributions/distribution/distribution.H
+++ b/src/OpenFOAM/distributions/distribution/distribution.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,7 @@ SourceFiles
 #define distribution_H
 
 #include "dictionary.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "scalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -79,7 +79,7 @@ protected:
     // Protected data
 
         //- Reference to a random number generator
-        Random& rndGen_;
+        randomGenerator& rndGen_;
 
         //- Distribution size exponent
         const label Q_;
@@ -124,7 +124,7 @@ public:
         dictionary,
         (
             const dictionary& dict,
-            Random& rndGen,
+            randomGenerator& rndGen,
             const label sampleQ
         ),
         (dict, rndGen, sampleQ)
@@ -138,12 +138,17 @@ public:
         (
             const word& name,
             const dictionary& dict,
-            Random& rndGen,
+            randomGenerator& rndGen,
             const label sampleQ
         );
 
         //- Construct from components
-        distribution(Random& rndGen, const label Q, const label sampleQ);
+        distribution
+        (
+            randomGenerator& rndGen,
+            const label Q,
+            const label sampleQ
+        );
 
         //- Construct copy
         distribution(const distribution& d, const label sampleQ);
@@ -162,7 +167,7 @@ public:
     static autoPtr<distribution> New
     (
         const dictionary& dict,
-        Random& rndGen,
+        randomGenerator& rndGen,
         const label sampleQ
     );
 
diff --git a/src/OpenFOAM/distributions/distribution/distributionNew.C b/src/OpenFOAM/distributions/distribution/distributionNew.C
index 6ce6349527..c0d3fa81a4 100644
--- a/src/OpenFOAM/distributions/distribution/distributionNew.C
+++ b/src/OpenFOAM/distributions/distribution/distributionNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 Foam::autoPtr<Foam::distribution> Foam::distribution::New
 (
     const dictionary& dict,
-    Random& rndGen,
+    randomGenerator& rndGen,
     const label sampleQ
 )
 {
diff --git a/src/OpenFOAM/distributions/exponential/exponential.C b/src/OpenFOAM/distributions/exponential/exponential.C
index 6838d17c07..9cb6ca51cb 100644
--- a/src/OpenFOAM/distributions/exponential/exponential.C
+++ b/src/OpenFOAM/distributions/exponential/exponential.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ Foam::tmp<Foam::scalarField> Foam::distributions::exponential::Phi
 Foam::distributions::exponential::exponential
 (
     const dictionary& dict,
-    Random& rndGen,
+    randomGenerator& rndGen,
     const label sampleQ
 )
 :
diff --git a/src/OpenFOAM/distributions/exponential/exponential.H b/src/OpenFOAM/distributions/exponential/exponential.H
index 700dad1e36..569063a3fe 100644
--- a/src/OpenFOAM/distributions/exponential/exponential.H
+++ b/src/OpenFOAM/distributions/exponential/exponential.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,7 @@ public:
         exponential
         (
             const dictionary& dict,
-            Random& rndGen,
+            randomGenerator& rndGen,
             const label sampleQ
         );
 
diff --git a/src/OpenFOAM/distributions/fixedValue/fixedValue.C b/src/OpenFOAM/distributions/fixedValue/fixedValue.C
index 7c2e8dc791..f500427414 100644
--- a/src/OpenFOAM/distributions/fixedValue/fixedValue.C
+++ b/src/OpenFOAM/distributions/fixedValue/fixedValue.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ namespace distributions
 Foam::distributions::fixedValue::fixedValue
 (
     const dictionary& dict,
-    Random& rndGen,
+    randomGenerator& rndGen,
     const label
 )
 :
diff --git a/src/OpenFOAM/distributions/fixedValue/fixedValue.H b/src/OpenFOAM/distributions/fixedValue/fixedValue.H
index 1661216614..2deb70425f 100644
--- a/src/OpenFOAM/distributions/fixedValue/fixedValue.H
+++ b/src/OpenFOAM/distributions/fixedValue/fixedValue.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,7 @@ public:
         fixedValue
         (
             const dictionary& dict,
-            Random& rndGen,
+            randomGenerator& rndGen,
             const label sampleQ
         );
 
diff --git a/src/OpenFOAM/distributions/multiNormal/multiNormal.C b/src/OpenFOAM/distributions/multiNormal/multiNormal.C
index b4255602a3..971bf96365 100644
--- a/src/OpenFOAM/distributions/multiNormal/multiNormal.C
+++ b/src/OpenFOAM/distributions/multiNormal/multiNormal.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ Foam::tmp<Foam::scalarField> Foam::distributions::multiNormal::Phi
 Foam::distributions::multiNormal::multiNormal
 (
     const dictionary& dict,
-    Random& rndGen,
+    randomGenerator& rndGen,
     const label sampleQ
 )
 :
diff --git a/src/OpenFOAM/distributions/multiNormal/multiNormal.H b/src/OpenFOAM/distributions/multiNormal/multiNormal.H
index 06c51ccc4e..8536992d3f 100644
--- a/src/OpenFOAM/distributions/multiNormal/multiNormal.H
+++ b/src/OpenFOAM/distributions/multiNormal/multiNormal.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,7 @@ public:
         multiNormal
         (
             const dictionary& dict,
-            Random& rndGen,
+            randomGenerator& rndGen,
             const label sampleQ
         );
 
diff --git a/src/OpenFOAM/distributions/normal/normal.C b/src/OpenFOAM/distributions/normal/normal.C
index 5f4b835658..b794e38c08 100644
--- a/src/OpenFOAM/distributions/normal/normal.C
+++ b/src/OpenFOAM/distributions/normal/normal.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ Foam::scalar Foam::distributions::normal::sampleForZeroQ(const scalar s) const
 Foam::distributions::normal::normal
 (
     const dictionary& dict,
-    Random& rndGen,
+    randomGenerator& rndGen,
     const label sampleQ
 )
 :
@@ -133,7 +133,7 @@ Foam::distributions::normal::normal
 
 Foam::distributions::normal::normal
 (
-    Random& rndGen,
+    randomGenerator& rndGen,
     const label Q,
     const label sampleQ,
     const label n,
diff --git a/src/OpenFOAM/distributions/normal/normal.H b/src/OpenFOAM/distributions/normal/normal.H
index b3dc055902..2b47719340 100644
--- a/src/OpenFOAM/distributions/normal/normal.H
+++ b/src/OpenFOAM/distributions/normal/normal.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,14 +136,14 @@ public:
         normal
         (
             const dictionary& dict,
-            Random& rndGen,
+            randomGenerator& rndGen,
             const label sampleQ
         );
 
         //- Construct from components
         normal
         (
-            Random& rndGen,
+            randomGenerator& rndGen,
             const label Q,
             const label sampleQ,
             const label n,
diff --git a/src/OpenFOAM/distributions/tabulatedCumulative/tabulatedCumulative.C b/src/OpenFOAM/distributions/tabulatedCumulative/tabulatedCumulative.C
index d15e0e6300..e578088ad3 100644
--- a/src/OpenFOAM/distributions/tabulatedCumulative/tabulatedCumulative.C
+++ b/src/OpenFOAM/distributions/tabulatedCumulative/tabulatedCumulative.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ namespace distributions
 Foam::distributions::tabulatedCumulative::tabulatedCumulative
 (
     const dictionary& dict,
-    Random& rndGen,
+    randomGenerator& rndGen,
     const label sampleQ
 )
 :
diff --git a/src/OpenFOAM/distributions/tabulatedCumulative/tabulatedCumulative.H b/src/OpenFOAM/distributions/tabulatedCumulative/tabulatedCumulative.H
index b9f47623f0..2074a40954 100644
--- a/src/OpenFOAM/distributions/tabulatedCumulative/tabulatedCumulative.H
+++ b/src/OpenFOAM/distributions/tabulatedCumulative/tabulatedCumulative.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ public:
         tabulatedCumulative
         (
             const dictionary& dict,
-            Random& rndGen,
+            randomGenerator& rndGen,
             const label sampleQ
         );
 
diff --git a/src/OpenFOAM/distributions/tabulatedDensity/tabulatedDensity.C b/src/OpenFOAM/distributions/tabulatedDensity/tabulatedDensity.C
index c0100db055..688573cce9 100644
--- a/src/OpenFOAM/distributions/tabulatedDensity/tabulatedDensity.C
+++ b/src/OpenFOAM/distributions/tabulatedDensity/tabulatedDensity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ namespace distributions
 Foam::distributions::tabulatedDensity::tabulatedDensity
 (
     const dictionary& dict,
-    Random& rndGen,
+    randomGenerator& rndGen,
     const label sampleQ
 )
 :
diff --git a/src/OpenFOAM/distributions/tabulatedDensity/tabulatedDensity.H b/src/OpenFOAM/distributions/tabulatedDensity/tabulatedDensity.H
index 59c0da2af9..9513a16d8c 100644
--- a/src/OpenFOAM/distributions/tabulatedDensity/tabulatedDensity.H
+++ b/src/OpenFOAM/distributions/tabulatedDensity/tabulatedDensity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ public:
         tabulatedDensity
         (
             const dictionary& dict,
-            Random& rndGen,
+            randomGenerator& rndGen,
             const label sampleQ
         );
 
diff --git a/src/OpenFOAM/distributions/uniform/uniform.C b/src/OpenFOAM/distributions/uniform/uniform.C
index 7228687db8..fa7501c775 100644
--- a/src/OpenFOAM/distributions/uniform/uniform.C
+++ b/src/OpenFOAM/distributions/uniform/uniform.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ Foam::scalar Foam::distributions::uniform::Phi(const scalar x) const
 Foam::distributions::uniform::uniform
 (
     const dictionary& dict,
-    Random& rndGen,
+    randomGenerator& rndGen,
     const label sampleQ
 )
 :
diff --git a/src/OpenFOAM/distributions/uniform/uniform.H b/src/OpenFOAM/distributions/uniform/uniform.H
index 797f929fa3..fdc0d0e32a 100644
--- a/src/OpenFOAM/distributions/uniform/uniform.H
+++ b/src/OpenFOAM/distributions/uniform/uniform.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,12 @@ public:
     // Constructors
 
         //- Construct from a dictionary
-        uniform(const dictionary& dict, Random& rndGen, const label sampleQ);
+        uniform
+        (
+            const dictionary& dict,
+            randomGenerator& rndGen,
+            const label sampleQ
+        );
 
         //- Construct copy
         uniform(const uniform& d, const label sampleQ);
diff --git a/src/OpenFOAM/distributions/unintegrable/unintegrable.C b/src/OpenFOAM/distributions/unintegrable/unintegrable.C
index 3fa974e286..4575ab59d6 100644
--- a/src/OpenFOAM/distributions/unintegrable/unintegrable.C
+++ b/src/OpenFOAM/distributions/unintegrable/unintegrable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -306,7 +306,7 @@ Foam::distributions::unintegrable::unintegrable
 (
     const word& name,
     const dictionary& dict,
-    Random& rndGen,
+    randomGenerator& rndGen,
     const label sampleQ
 )
 :
@@ -317,7 +317,7 @@ Foam::distributions::unintegrable::unintegrable
 
 Foam::distributions::unintegrable::unintegrable
 (
-    Random& rndGen,
+    randomGenerator& rndGen,
     const label Q,
     const label sampleQ,
     const label n
diff --git a/src/OpenFOAM/distributions/unintegrable/unintegrable.H b/src/OpenFOAM/distributions/unintegrable/unintegrable.H
index 39515a1056..fc09f61e41 100644
--- a/src/OpenFOAM/distributions/unintegrable/unintegrable.H
+++ b/src/OpenFOAM/distributions/unintegrable/unintegrable.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -188,14 +188,14 @@ public:
         (
             const word& name,
             const dictionary& dict,
-            Random& rndGen,
+            randomGenerator& rndGen,
             const label sampleQ
         );
 
         //- Construct from components
         unintegrable
         (
-            Random& rndGen,
+            randomGenerator& rndGen,
             const label Q,
             const label sampleQ,
             const label n
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
index 2281127088..89af1cb0e8 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 #include "procFacesGAMGProcAgglomeration.H"
 #include "addToRunTimeSelectionTable.H"
 #include "GAMGAgglomeration.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "lduMesh.H"
 #include "processorLduInterface.H"
 #include "processorGAMGInterface.H"
@@ -253,7 +253,7 @@ bool Foam::procFacesGAMGProcAgglomeration::agglomerate()
 
     if (agglom_.size() >= 1)
     {
-        Random rndGen(0);
+        randomGenerator rndGen(0);
 
         for
         (
diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
index de6270aad1..123b90242d 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ SourceFiles
 #include "point.H"
 #include "primitiveFieldsFwd.H"
 #include "pointHit.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "FixedList.H"
 #include "UList.H"
 #include "triPointRef.H"
@@ -162,7 +162,7 @@ public:
 
             //- Return a random point in the tetrahedron from a
             //  uniform distribution
-            inline Point randomPoint(Random& rndGen) const;
+            inline Point randomPoint(randomGenerator& rndGen) const;
 
             //- Calculate the point from the given barycentric coordinates.
             inline Point barycentricToPoint(const barycentric& bary) const;
diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
index d84dd5d520..c52d842e57 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -216,7 +216,7 @@ inline Foam::scalar Foam::tetrahedron<Point, PointRef>::quality() const
 template<class Point, class PointRef>
 inline Point Foam::tetrahedron<Point, PointRef>::randomPoint
 (
-    Random& rndGen
+    randomGenerator& rndGen
 ) const
 {
     return barycentricToPoint(barycentric01(rndGen));
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H
index f902a18b11..4166202bb1 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ SourceFiles
 #include "vector.H"
 #include "tensor.H"
 #include "pointHit.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "FixedList.H"
 #include "UList.H"
 #include "linePointRef.H"
@@ -161,7 +161,7 @@ public:
 
             //- Return a random point on the triangle from a uniform
             //  distribution
-            inline Point randomPoint(Random& rndGen) const;
+            inline Point randomPoint(randomGenerator& rndGen) const;
 
             //- Calculate the point from the given barycentric coordinates.
             inline Point barycentricToPoint(const barycentric2D& bary) const;
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
index 03238f62ff..9702838126 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -213,7 +213,10 @@ inline Foam::tensor Foam::triangle<Point, PointRef>::inertia
 
 
 template<class Point, class PointRef>
-inline Point Foam::triangle<Point, PointRef>::randomPoint(Random& rndGen) const
+inline Point Foam::triangle<Point, PointRef>::randomPoint
+(
+    randomGenerator& rndGen
+) const
 {
     return barycentricToPoint(barycentric2D01(rndGen));
 }
diff --git a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
index 3fc81211c0..e41d5fed73 100644
--- a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
+++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
@@ -67,7 +67,7 @@ SourceFiles
 namespace Foam
 {
 
-class Random;
+class randomGenerator;
 
 
 // Forward declaration of friend functions and operators
diff --git a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H
index 8605c353da..4c56a1d518 100644
--- a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H
+++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "treeBoundBox.H"
-#include "Random.H"
+#include "randomGenerator.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/Barycentric/barycentric/barycentric.C b/src/OpenFOAM/primitives/Barycentric/barycentric/barycentric.C
index fd5ecadbcc..98157af388 100644
--- a/src/OpenFOAM/primitives/Barycentric/barycentric/barycentric.C
+++ b/src/OpenFOAM/primitives/Barycentric/barycentric/barycentric.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,11 +24,11 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "barycentric.H"
-#include "Random.H"
+#include "randomGenerator.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::barycentric Foam::barycentric01(Random& rndGen)
+Foam::barycentric Foam::barycentric01(randomGenerator& rndGen)
 {
     scalar s = rndGen.scalar01();
     scalar t = rndGen.scalar01();
diff --git a/src/OpenFOAM/primitives/Barycentric/barycentric/barycentric.H b/src/OpenFOAM/primitives/Barycentric/barycentric/barycentric.H
index 6fd5047a28..49523fe126 100644
--- a/src/OpenFOAM/primitives/Barycentric/barycentric/barycentric.H
+++ b/src/OpenFOAM/primitives/Barycentric/barycentric/barycentric.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ namespace Foam
 {
 
 // Forward declaration of classes
-class Random;
+class randomGenerator;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +51,7 @@ typedef Barycentric<scalar> barycentric;
 
 
 //- Generate a random barycentric coordinate within the unit tetrahedron
-barycentric barycentric01(Random& rndGen);
+barycentric barycentric01(randomGenerator& rndGen);
 
 
 template<>
diff --git a/src/OpenFOAM/primitives/Barycentric2D/barycentric2D/barycentric2D.C b/src/OpenFOAM/primitives/Barycentric2D/barycentric2D/barycentric2D.C
index 26d28551e6..ef495d5a5a 100644
--- a/src/OpenFOAM/primitives/Barycentric2D/barycentric2D/barycentric2D.C
+++ b/src/OpenFOAM/primitives/Barycentric2D/barycentric2D/barycentric2D.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,11 +24,11 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "barycentric2D.H"
-#include "Random.H"
+#include "randomGenerator.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::barycentric2D Foam::barycentric2D01(Random& rndGen)
+Foam::barycentric2D Foam::barycentric2D01(randomGenerator& rndGen)
 {
     scalar s = rndGen.scalar01();
     scalar t = rndGen.scalar01();
diff --git a/src/OpenFOAM/primitives/Barycentric2D/barycentric2D/barycentric2D.H b/src/OpenFOAM/primitives/Barycentric2D/barycentric2D/barycentric2D.H
index baf1edebf1..f427756b11 100644
--- a/src/OpenFOAM/primitives/Barycentric2D/barycentric2D/barycentric2D.H
+++ b/src/OpenFOAM/primitives/Barycentric2D/barycentric2D/barycentric2D.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ namespace Foam
 {
 
 // Forward declaration of classes
-class Random;
+class randomGenerator;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +51,7 @@ typedef Barycentric2D<scalar> barycentric2D;
 
 
 //- Generate a random barycentric coordinate within the unit triangle
-barycentric2D barycentric2D01(Random& rndGen);
+barycentric2D barycentric2D01(randomGenerator& rndGen);
 
 
 template<>
diff --git a/src/OpenFOAM/primitives/Random/Random.C b/src/OpenFOAM/primitives/randomGenerator/randomGenerator.C
similarity index 93%
rename from src/OpenFOAM/primitives/Random/Random.C
rename to src/OpenFOAM/primitives/randomGenerator/randomGenerator.C
index 3cb2b38d74..95cc1f7f7c 100644
--- a/src/OpenFOAM/primitives/Random/Random.C
+++ b/src/OpenFOAM/primitives/randomGenerator/randomGenerator.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,12 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "Random.H"
+#include "randomGenerator.H"
 #include "PstreamReduceOps.H"
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::scalar Foam::Random::scalarNormal()
+Foam::scalar Foam::randomGenerator::scalarNormal()
 {
     // Proper inversion of the distribution. Slow. Exactly maintains
     // the random behaviour of the generator.
@@ -91,7 +91,7 @@ Foam::scalar Foam::Random::scalarNormal()
 }
 
 
-Foam::scalar Foam::Random::globalScalar01()
+Foam::scalar Foam::randomGenerator::globalScalar01()
 {
     scalar value = - vGreat;
 
diff --git a/src/OpenFOAM/primitives/Random/Random.H b/src/OpenFOAM/primitives/randomGenerator/randomGenerator.H
similarity index 87%
rename from src/OpenFOAM/primitives/Random/Random.H
rename to src/OpenFOAM/primitives/randomGenerator/randomGenerator.H
index eecf25eb3a..83c21b32ed 100644
--- a/src/OpenFOAM/primitives/Random/Random.H
+++ b/src/OpenFOAM/primitives/randomGenerator/randomGenerator.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::Random
+    Foam::randomGenerator
 
 Description
     Random number generator
@@ -37,12 +37,13 @@ Description
     details of the seeding and iteration sequence.
 
 SourceFiles
-    RandomI.H
+    randomGenerator.C
+    randomGeneratorI.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Random_H
-#define Random_H
+#ifndef randomGenerator_H
+#define randomGenerator_H
 
 #include "scalar.H"
 
@@ -52,10 +53,10 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class Random Declaration
+                       Class randomGenerator Declaration
 \*---------------------------------------------------------------------------*/
 
-class Random
+class randomGenerator
 {
     // Private Typedefs
 
@@ -92,11 +93,11 @@ public:
     // Constructors
 
         //- Construct from a seed
-        inline Random(const label s);
+        inline randomGenerator(const label s);
 
 
     //- Destructor
-    inline ~Random();
+    inline ~randomGenerator();
 
 
     // Member Functions
@@ -150,19 +151,19 @@ public:
 
 
 template<>
-inline scalar Random::sample01();
+inline scalar randomGenerator::sample01();
 
 template<>
-inline label Random::sample01();
+inline label randomGenerator::sample01();
 
 template<>
-inline scalar Random::sampleAB(const scalar& a, const scalar& b);
+inline scalar randomGenerator::sampleAB(const scalar& a, const scalar& b);
 
 template<>
-inline label Random::sampleAB(const label& a, const label& b);
+inline label randomGenerator::sampleAB(const label& a, const label& b);
 
 template<>
-inline scalar Random::sampleNormal();
+inline scalar randomGenerator::sampleNormal();
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -171,7 +172,7 @@ inline scalar Random::sampleNormal();
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "RandomI.H"
+#include "randomGeneratorI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/Random/RandomI.H b/src/OpenFOAM/primitives/randomGenerator/randomGeneratorI.H
similarity index 72%
rename from src/OpenFOAM/primitives/Random/RandomI.H
rename to src/OpenFOAM/primitives/randomGenerator/randomGeneratorI.H
index b1b505c4ba..6b953726f7 100644
--- a/src/OpenFOAM/primitives/Random/RandomI.H
+++ b/src/OpenFOAM/primitives/randomGenerator/randomGeneratorI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,11 +23,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "Random.H"
+#include "randomGenerator.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-inline Foam::Random::type Foam::Random::sample()
+inline Foam::randomGenerator::type Foam::randomGenerator::sample()
 {
     x_ = (A*x_ + C) % M;
 
@@ -37,7 +37,7 @@ inline Foam::Random::type Foam::Random::sample()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-inline Foam::Random::Random(const label s)
+inline Foam::randomGenerator::randomGenerator(const label s)
 :
     x_((type(s) << 16) + 0x330E),
     scalarNormalStored_(false),
@@ -47,26 +47,30 @@ inline Foam::Random::Random(const label s)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-inline Foam::Random::~Random()
+inline Foam::randomGenerator::~randomGenerator()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline Foam::scalar Foam::Random::scalar01()
+inline Foam::scalar Foam::randomGenerator::scalar01()
 {
     return scalar(sample())/(M >> 17);
 }
 
 
-inline Foam::scalar Foam::Random::scalarAB(const scalar a, const scalar b)
+inline Foam::scalar Foam::randomGenerator::scalarAB
+(
+    const scalar a,
+    const scalar b
+)
 {
     return a + scalar01()*(b - a);
 }
 
 
 template<class Type>
-inline Type Foam::Random::sample01()
+inline Type Foam::randomGenerator::sample01()
 {
     Type value;
 
@@ -80,42 +84,50 @@ inline Type Foam::Random::sample01()
 
 
 template<>
-inline Foam::scalar Foam::Random::sample01()
+inline Foam::scalar Foam::randomGenerator::sample01()
 {
     return scalar01();
 }
 
 
 template<>
-inline Foam::label Foam::Random::sample01()
+inline Foam::label Foam::randomGenerator::sample01()
 {
     return sample() % 2;
 }
 
 
 template<class Type>
-inline Type Foam::Random::sampleAB(const Type& a, const Type& b)
+inline Type Foam::randomGenerator::sampleAB(const Type& a, const Type& b)
 {
     return a + cmptMultiply(sample01<Type>(), b - a);
 }
 
 
 template<>
-inline Foam::scalar Foam::Random::sampleAB(const scalar& a, const scalar& b)
+inline Foam::scalar Foam::randomGenerator::sampleAB
+(
+    const scalar& a,
+    const scalar& b
+)
 {
     return scalarAB(a, b);
 }
 
 
 template<>
-inline Foam::label Foam::Random::sampleAB(const label& a, const label& b)
+inline Foam::label Foam::randomGenerator::sampleAB
+(
+    const label& a,
+    const label& b
+)
 {
     return a + sample() % (b - a);
 }
 
 
 template<class Type>
-inline Type Foam::Random::sampleNormal()
+inline Type Foam::randomGenerator::sampleNormal()
 {
     Type value;
 
@@ -129,14 +141,14 @@ inline Type Foam::Random::sampleNormal()
 
 
 template<>
-inline Foam::scalar Foam::Random::sampleNormal()
+inline Foam::scalar Foam::randomGenerator::sampleNormal()
 {
     return scalarNormal();
 }
 
 
 template<class Container>
-inline void Foam::Random::permute(Container& l)
+inline void Foam::randomGenerator::permute(Container& l)
 {
     for (label i = 0; i < l.size(); ++ i)
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H
index 1594b7d7ac..c3c557fee7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ SourceFiles
 #ifndef turbulentInletFvPatchField_H
 #define turbulentInletFvPatchField_H
 
-#include "Random.H"
+#include "randomGenerator.H"
 #include "fixedValueFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -93,7 +93,7 @@ class turbulentInletFvPatchField
     // Private Data
 
         //- Random number generator
-        Random ranGen_;
+        randomGenerator ranGen_;
 
         //- Fluctuation scale
         Type fluctuationScale_;
diff --git a/src/functionObjects/field/randomise/randomiseTemplates.C b/src/functionObjects/field/randomise/randomiseTemplates.C
index eab4379618..f2773b5f4c 100644
--- a/src/functionObjects/field/randomise/randomiseTemplates.C
+++ b/src/functionObjects/field/randomise/randomiseTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "volFields.H"
-#include "Random.H"
+#include "randomGenerator.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -38,11 +38,11 @@ bool Foam::functionObjects::randomise::calcRandomised()
         tmp<VolField<Type>> rfieldt(new VolField<Type>(field));
         VolField<Type>& rfield = rfieldt.ref();
 
-        Random rand(1234567);
+        randomGenerator rndGen(1234567);
 
         forAll(field, celli)
         {
-            Type rndPert = rand.sample01<Type>();
+            Type rndPert = rndGen.sample01<Type>();
             rndPert = 2.0*rndPert - pTraits<Type>::one;
             rndPert /= mag(rndPert);
             rfield[celli] += magPerturbation_*rndPert;
diff --git a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.H b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.H
index 40681d8a9d..e8c417346a 100644
--- a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.H
+++ b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ SourceFiles
 #ifndef cellMotionFvPatchField_H
 #define cellMotionFvPatchField_H
 
-#include "Random.H"
+#include "randomGenerator.H"
 #include "fixedValueFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
index 65d58b4e2a..06240813fe 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ SourceFiles
 #include "Cloud.H"
 #include "IOdictionary.H"
 #include "autoPtr.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "fvMesh.H"
 #include "volFields.H"
 #include "scalarIOField.H"
@@ -141,7 +141,7 @@ class DSMCCloud
         List<typename ParcelType::constantProperties> constProps_;
 
         //- Random number generator
-        Random rndGen_;
+        randomGenerator rndGen_;
 
 
         // boundary value fields
@@ -268,7 +268,7 @@ public:
                     constProps(label typeId) const;
 
                 //- Return references to the random object
-                inline Random& rndGen();
+                inline randomGenerator& rndGen();
 
 
             // References to the boundary fields for surface data collection
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
index 5cf5a4a481..9a66d94106 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,7 +118,7 @@ Foam::DSMCCloud<ParcelType>::constProps
 
 
 template<class ParcelType>
-inline Foam::Random& Foam::DSMCCloud<ParcelType>::rndGen()
+inline Foam::randomGenerator& Foam::DSMCCloud<ParcelType>::rndGen()
 {
     return rndGen_;
 }
diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
index c5a3af4a33..618060d230 100644
--- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ Foam::scalar Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::energyRatio
 {
     CloudType& cloud(this->owner());
 
-    Random& rndGen(cloud.rndGen());
+    randomGenerator& rndGen(cloud.rndGen());
 
     scalar ChiAMinusOne = ChiA - 1;
     scalar ChiBMinusOne = ChiB - 1;
@@ -179,7 +179,7 @@ void Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::collide
     scalar& EiP = pP.Ei();
     scalar& EiQ = pQ.Ei();
 
-    Random& rndGen(cloud.rndGen());
+    randomGenerator& rndGen(cloud.rndGen());
 
     scalar inverseCollisionNumber = 1/relaxationCollisionNumber_;
 
diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
index 02aa136e96..c5138db879 100644
--- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,7 +114,7 @@ void Foam::VariableHardSphere<CloudType>::collide
     vector& UP = pP.U();
     vector& UQ = pQ.U();
 
-    Random& rndGen(cloud.rndGen());
+    randomGenerator& rndGen(cloud.rndGen());
 
     scalar mP = cloud.constProps(typeIdP).mass();
 
diff --git a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
index d5fcc3bbb9..e424abeef9 100644
--- a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
+++ b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -145,7 +145,7 @@ void Foam::FreeStream<CloudType>::inflow()
 
     const scalar deltaT = mesh.time().deltaTValue();
 
-    Random& rndGen(cloud.rndGen());
+    randomGenerator& rndGen(cloud.rndGen());
 
     scalar sqrtPi = sqrt(pi);
 
diff --git a/src/lagrangian/DSMC/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C b/src/lagrangian/DSMC/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
index 746e79674e..4aca443a2b 100644
--- a/src/lagrangian/DSMC/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
+++ b/src/lagrangian/DSMC/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ void Foam::MaxwellianThermal<CloudType>::correct
 
     CloudType& cloud(this->owner());
 
-    Random& rndGen(cloud.rndGen());
+    randomGenerator& rndGen(cloud.rndGen());
 
     while (mag(Ut) < small)
     {
diff --git a/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C b/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
index ec2850ac95..e8b3e55e99 100644
--- a/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
+++ b/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ void Foam::MixedDiffuseSpecular<CloudType>::correct
 
     CloudType& cloud(this->owner());
 
-    Random& rndGen(cloud.rndGen());
+    randomGenerator& rndGen(cloud.rndGen());
 
     if (diffuseFraction_ > rndGen.scalar01())
     {
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
index b65ba8d546..cdd379d34c 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ License
 
 #include "moleculeCloud.H"
 #include "molecule.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "Time.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H
index efb2895000..5df439ebef 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ SourceFiles
 #include "potential.H"
 #include "InteractionLists.H"
 #include "labelVector.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "fileName.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -70,7 +70,7 @@ class moleculeCloud
 
         List<molecule::constantProperties> constPropList_;
 
-        Random rndGen_;
+        randomGenerator rndGen_;
 
 
     // Private Member Functions
@@ -191,7 +191,7 @@ public:
             inline const molecule::constantProperties&
                 constProps(label id) const;
 
-            inline Random& rndGen();
+            inline randomGenerator& rndGen();
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
index 10d3ef814e..d5cecb7d78 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -378,7 +378,7 @@ inline const Foam::molecule::constantProperties&
 }
 
 
-inline Foam::Random& Foam::moleculeCloud::rndGen()
+inline Foam::randomGenerator& Foam::moleculeCloud::rndGen()
 {
     return rndGen_;
 }
diff --git a/src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloud.H b/src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloud.H
index 1758671f35..6aeb46b26e 100644
--- a/src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloud.H
+++ b/src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ SourceFiles
 #include "Cloud.H"
 #include "timeIOdictionary.H"
 #include "autoPtr.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "fvMesh.H"
 #include "volFields.H"
 #include "fvMatrices.H"
@@ -156,7 +156,7 @@ protected:
         const dictionary subModelProperties_;
 
         //- Random number generator - used by some injection routines
-        mutable Random rndGen_;
+        mutable randomGenerator rndGen_;
 
         //- Cell occupancy information for each parcel, (demand driven)
         autoPtr<List<DynamicList<parcelType*>>> cellOccupancyPtr_;
@@ -365,7 +365,7 @@ public:
             // Cloud data
 
                 //- Return reference to the random object
-                inline Random& rndGen() const;
+                inline randomGenerator& rndGen() const;
 
                 //- Return the cell occupancy information for each
                 //  parcel, non-const access, the caller is
diff --git a/src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloudI.H b/src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloudI.H
index f852eb2dcb..596a6a0860 100644
--- a/src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloudI.H
+++ b/src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -360,7 +360,7 @@ inline Foam::scalar Foam::MomentumCloud<CloudType>::Dmax() const
 
 
 template<class CloudType>
-inline Foam::Random& Foam::MomentumCloud<CloudType>::rndGen() const
+inline Foam::randomGenerator& Foam::MomentumCloud<CloudType>::rndGen() const
 {
     return rndGen_;
 }
diff --git a/src/lagrangian/parcel/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/parcel/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index 105ecc32d6..873450cdba 100644
--- a/src/lagrangian/parcel/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
+++ b/src/lagrangian/parcel/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,7 @@ License
 #include "Pstream.H"
 #include "surfaceWriter.H"
 #include "unitConversion.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "triangle.H"
 #include "cloud.H"
 #include "axesRotation.H"
diff --git a/src/lagrangian/parcel/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.C b/src/lagrangian/parcel/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.C
index d0ecce172f..3092e35037 100644
--- a/src/lagrangian/parcel/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.C
+++ b/src/lagrangian/parcel/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ Foam::scalar Foam::IsotropyModels::Stochastic<CloudType>::sampleGauss()
     }
     else
     {
-        Random& rndGen = this->owner().rndGen();
+        randomGenerator& rndGen = this->owner().rndGen();
 
         scalar f, m, x, y;
 
@@ -98,7 +98,7 @@ void Foam::IsotropyModels::Stochastic<CloudType>::calculate()
 {
     const fvMesh& mesh = this->owner().mesh();
     const scalar deltaT(this->owner().db().time().deltaTValue());
-    Random& rndGen = this->owner().rndGen();
+    randomGenerator& rndGen = this->owner().rndGen();
 
     const scalar oneBySqrtThree = sqrt(1.0/3.0);
 
diff --git a/src/lagrangian/parcel/submodels/Momentum/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C b/src/lagrangian/parcel/submodels/Momentum/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
index 7e4c4845cd..3ae06de325 100644
--- a/src/lagrangian/parcel/submodels/Momentum/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
+++ b/src/lagrangian/parcel/submodels/Momentum/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ Foam::vector Foam::GradientDispersionRAS<CloudType>::update
     scalar& tTurb
 )
 {
-    Random& rnd = this->owner().rndGen();
+    randomGenerator& rndGen = this->owner().rndGen();
 
     const scalar cps = 0.16432;
 
@@ -135,11 +135,11 @@ Foam::vector Foam::GradientDispersionRAS<CloudType>::update
             // prevent this we let fac be both negative/positive
             if (this->owner().mesh().nSolutionD() == 2)
             {
-                fac = rnd.scalarNormal();
+                fac = rndGen.scalarNormal();
             }
             else
             {
-                fac = mag(rnd.scalarNormal());
+                fac = mag(rndGen.scalarNormal());
             }
 
             UTurb = sigma*fac*dir;
diff --git a/src/lagrangian/parcel/submodels/Momentum/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C b/src/lagrangian/parcel/submodels/Momentum/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
index b561980bab..5a96968f32 100644
--- a/src/lagrangian/parcel/submodels/Momentum/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
+++ b/src/lagrangian/parcel/submodels/Momentum/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ Foam::vector Foam::StochasticDispersionRAS<CloudType>::update
     scalar& tTurb
 )
 {
-    Random& rnd = this->owner().rndGen();
+    randomGenerator& rndGen = this->owner().rndGen();
 
     const scalar cps = 0.16432;
 
@@ -99,13 +99,13 @@ Foam::vector Foam::StochasticDispersionRAS<CloudType>::update
             // Calculate a random direction dir distributed uniformly
             // in spherical coordinates
 
-            const scalar theta = rnd.scalar01()*twoPi;
-            const scalar u = 2*rnd.scalar01() - 1;
+            const scalar theta = rndGen.scalar01()*twoPi;
+            const scalar u = 2*rndGen.scalar01() - 1;
 
             const scalar a = sqrt(1 - sqr(u));
             const vector dir(a*cos(theta), a*sin(theta), u);
 
-            UTurb = sigma*mag(rnd.scalarNormal())*dir;
+            UTurb = sigma*mag(rndGen.scalarNormal())*dir;
         }
     }
     else
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/CellZoneInjection/CellZoneInjection.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/CellZoneInjection/CellZoneInjection.C
index 6ca49fc26a..d15df7ba46 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/CellZoneInjection/CellZoneInjection.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/CellZoneInjection/CellZoneInjection.C
@@ -39,7 +39,7 @@ void Foam::CellZoneInjection<CloudType>::setPositions
 {
     const fvMesh& mesh = this->owner().mesh();
 
-    Random& rnd = this->owner().rndGen();
+    randomGenerator& rndGen = this->owner().rndGen();
 
     const label nCells = cellZoneCells.size();
     DynamicList<barycentric> injectorCoordinates(nCells);
@@ -85,7 +85,7 @@ void Foam::CellZoneInjection<CloudType>::setPositions
         // Set new particle position and cellId
         for (label pI = 0; pI < addParticles; pI++)
         {
-            const scalar volFrac = rnd.sample01<scalar>();
+            const scalar volFrac = rndGen.sample01<scalar>();
             label tetI = 0;
             forAll(cTetVFrac, vfI)
             {
@@ -96,7 +96,7 @@ void Foam::CellZoneInjection<CloudType>::setPositions
                 }
             }
 
-            injectorCoordinates.append(barycentric01(rnd));
+            injectorCoordinates.append(barycentric01(rndGen));
             injectorCells.append(celli);
             injectorTetFaces.append(cellTetIs[tetI].face());
             injectorTetPts.append(cellTetIs[tetI].tetPt());
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ConeInjection/ConeInjection.C
index 4efaaa5be8..410c0d62f2 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/ConeInjection/ConeInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -340,7 +340,7 @@ void Foam::ConeInjection<CloudType>::setPositionAndCell
     label& facei
 )
 {
-    Random& rndGen = this->owner().rndGen();
+    randomGenerator& rndGen = this->owner().rndGen();
 
     const scalar t = time - this->SOI_;
 
@@ -411,7 +411,7 @@ void Foam::ConeInjection<CloudType>::setProperties
 {
     const polyMesh& mesh = this->owner().mesh();
 
-    Random& rndGen = this->owner().rndGen();
+    randomGenerator& rndGen = this->owner().rndGen();
 
     const scalar t = time - this->SOI_;
 
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/MomentumLookupTableInjection.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/MomentumLookupTableInjection.C
index 8d7df1c912..32c952202a 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/MomentumLookupTableInjection.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/MomentumLookupTableInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -179,8 +179,8 @@ void Foam::MomentumLookupTableInjection<CloudType>::setPositionAndCell
     label injectorI = 0;
     if (randomise_)
     {
-        Random& rnd = this->owner().rndGen();
-        injectorI = rnd.sampleAB<label>(0, injectorCells_.size());
+        randomGenerator& rndGen = this->owner().rndGen();
+        injectorI = rndGen.sampleAB<label>(0, injectorCells_.size());
     }
     else
     {
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index ac2b319cf9..f476ba1b0b 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -154,7 +154,7 @@ Foam::label Foam::PatchFlowRateInjection<CloudType>::nParcelsToInject
 
         scalar nParcels = parcelConcentration_*c*flowRate()*dt;
 
-        Random& rnd = this->owner().rndGen();
+        randomGenerator& rndGen = this->owner().rndGen();
 
         label nParcelsToInject = floor(nParcels);
 
@@ -163,7 +163,7 @@ Foam::label Foam::PatchFlowRateInjection<CloudType>::nParcelsToInject
         if
         (
             nParcelsToInject > 0
-         && nParcels - scalar(nParcelsToInject) > rnd.globalScalar01()
+         && nParcels - scalar(nParcelsToInject) > rndGen.globalScalar01()
         )
         {
             ++nParcelsToInject;
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/PatchInjection.C
index 13d5c797bc..4400a7f31c 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/PatchInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -172,7 +172,7 @@ Foam::label Foam::PatchInjection<CloudType>::nParcelsToInject
     {
         scalar nParcels = parcelsPerSecond_->integral(time0, time1);
 
-        Random& rnd = this->owner().rndGen();
+        randomGenerator& rndGen = this->owner().rndGen();
 
         label nParcelsToInject = floor(nParcels);
 
@@ -181,7 +181,7 @@ Foam::label Foam::PatchInjection<CloudType>::nParcelsToInject
         if
         (
             nParcelsToInject > 0
-         && (nParcels - scalar(nParcelsToInject) > rnd.globalScalar01())
+         && (nParcels - scalar(nParcelsToInject) > rndGen.globalScalar01())
         )
         {
             ++nParcelsToInject;
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/patchInjectionBase.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/patchInjectionBase.C
index 46b9071925..3f583b0b0e 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/patchInjectionBase.C
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/patchInjectionBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 #include "patchInjectionBase.H"
 #include "polyMesh.H"
 #include "SubField.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "triPointRef.H"
 #include "volFields.H"
 #include "polyMeshTetDecomposition.H"
@@ -132,7 +132,7 @@ void Foam::patchInjectionBase::topoChange(const polyMesh& mesh)
 void Foam::patchInjectionBase::setPositionAndCell
 (
     const fvMesh& mesh,
-    Random& rnd,
+    randomGenerator& rndGen,
     barycentric& coordinates,
     label& celli,
     label& tetFacei,
@@ -161,7 +161,7 @@ void Foam::patchInjectionBase::setPositionAndCell
 
     const polyPatch& patch = mesh.boundaryMesh()[patchId_];
 
-    scalar area = rnd.globalScalar01()*sumProcArea_.last();
+    scalar area = rndGen.globalScalar01()*sumProcArea_.last();
 
     if (patch.size() > 0)
     {
@@ -179,7 +179,7 @@ void Foam::patchInjectionBase::setPositionAndCell
                 findArea(sumFaceTriArea_[patchFacei], area);
 
             // Set the topology
-            const barycentric2D r = barycentric2D01(rnd);
+            const barycentric2D r = barycentric2D01(rndGen);
             coordinates = barycentric(0, r.a(), r.b(), r.c());
             celli = mesh.faceOwner()[patch.start() + patchFacei];
             tetFacei = patch.start() + patchFacei;
diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/patchInjectionBase.H b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/patchInjectionBase.H
index 74eb7d072d..d2e6e187a1 100644
--- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/patchInjectionBase.H
+++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/patchInjectionBase.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,7 @@ namespace Foam
 // Forward class declarations
 class polyMesh;
 class fvMesh;
-class Random;
+class randomGenerator;
 
 /*---------------------------------------------------------------------------*\
                      Class patchInjectionBase Declaration
@@ -108,7 +108,7 @@ public:
         virtual void setPositionAndCell
         (
             const fvMesh& mesh,
-            Random& rnd,
+            randomGenerator& rndGen,
             barycentric& coordinates,
             label& celli,
             label& tetFacei,
diff --git a/src/lagrangian/parcel/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C b/src/lagrangian/parcel/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
index e55679fc2c..db38234030 100644
--- a/src/lagrangian/parcel/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
+++ b/src/lagrangian/parcel/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -179,8 +179,8 @@ void Foam::ReactingLookupTableInjection<CloudType>::setPositionAndCell
     label injectorI = 0;
     if (randomise_)
     {
-        Random& rnd = this->owner().rndGen();
-        injectorI = rnd.sampleAB<label>(0, injectorCells_.size());
+        randomGenerator& rndGen = this->owner().rndGen();
+        injectorI = rndGen.sampleAB<label>(0, injectorCells_.size());
     }
     else
     {
diff --git a/src/lagrangian/parcel/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C b/src/lagrangian/parcel/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
index 7a80f55ee4..eeca4ca53a 100644
--- a/src/lagrangian/parcel/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
+++ b/src/lagrangian/parcel/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -185,8 +185,8 @@ void Foam::ReactingMultiphaseLookupTableInjection<CloudType>::setPositionAndCell
     label injectorI = 0;
     if (randomise_)
     {
-        Random& rnd = this->owner().rndGen();
-        injectorI = rnd.sampleAB<label>(0, injectorCells_.size());
+        randomGenerator& rndGen = this->owner().rndGen();
+        injectorI = rndGen.sampleAB<label>(0, injectorCells_.size());
     }
     else
     {
diff --git a/src/lagrangian/parcel/submodels/Spray/AtomisationModel/AtomisationModel/AtomisationModel.H b/src/lagrangian/parcel/submodels/Spray/AtomisationModel/AtomisationModel/AtomisationModel.H
index 29d3bb1299..0f54947677 100644
--- a/src/lagrangian/parcel/submodels/Spray/AtomisationModel/AtomisationModel/AtomisationModel.H
+++ b/src/lagrangian/parcel/submodels/Spray/AtomisationModel/AtomisationModel/AtomisationModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,7 +133,7 @@ public:
             const vector& injectionPos,
             const scalar pAmbient,
             const scalar chi,
-            Random& rndGen
+            randomGenerator& rndGen
         ) const = 0;
 };
 
diff --git a/src/lagrangian/parcel/submodels/Spray/AtomisationModel/BlobsSheetAtomisation/BlobsSheetAtomisation.C b/src/lagrangian/parcel/submodels/Spray/AtomisationModel/BlobsSheetAtomisation/BlobsSheetAtomisation.C
index 815bd9008f..df30c98f36 100644
--- a/src/lagrangian/parcel/submodels/Spray/AtomisationModel/BlobsSheetAtomisation/BlobsSheetAtomisation.C
+++ b/src/lagrangian/parcel/submodels/Spray/AtomisationModel/BlobsSheetAtomisation/BlobsSheetAtomisation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,7 +92,7 @@ void Foam::BlobsSheetAtomisation<CloudType>::update
     const vector& injectionPos,
     const scalar pAmbient,
     const scalar chi,
-    Random& rndGen
+    randomGenerator& rndGen
 ) const
 {
     scalar lBU =
diff --git a/src/lagrangian/parcel/submodels/Spray/AtomisationModel/BlobsSheetAtomisation/BlobsSheetAtomisation.H b/src/lagrangian/parcel/submodels/Spray/AtomisationModel/BlobsSheetAtomisation/BlobsSheetAtomisation.H
index 6db928f4d0..891c3f2aa7 100644
--- a/src/lagrangian/parcel/submodels/Spray/AtomisationModel/BlobsSheetAtomisation/BlobsSheetAtomisation.H
+++ b/src/lagrangian/parcel/submodels/Spray/AtomisationModel/BlobsSheetAtomisation/BlobsSheetAtomisation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ public:
             const vector& injectionPos,
             const scalar pAmbient,
             const scalar chi,
-            Random& rndGen
+            randomGenerator& rndGen
         ) const;
 };
 
diff --git a/src/lagrangian/parcel/submodels/Spray/AtomisationModel/LISAAtomisation/LISAAtomisation.C b/src/lagrangian/parcel/submodels/Spray/AtomisationModel/LISAAtomisation/LISAAtomisation.C
index ff798f9ef5..33c859b14b 100644
--- a/src/lagrangian/parcel/submodels/Spray/AtomisationModel/LISAAtomisation/LISAAtomisation.C
+++ b/src/lagrangian/parcel/submodels/Spray/AtomisationModel/LISAAtomisation/LISAAtomisation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,7 +116,7 @@ void Foam::LISAAtomisation<CloudType>::update
     const vector& injectionPos,
     const scalar pAmbient,
     const scalar chi,
-    Random& rndGen
+    randomGenerator& rndGen
 ) const
 {
     if (volFlowRate < small)
diff --git a/src/lagrangian/parcel/submodels/Spray/AtomisationModel/LISAAtomisation/LISAAtomisation.H b/src/lagrangian/parcel/submodels/Spray/AtomisationModel/LISAAtomisation/LISAAtomisation.H
index d8662fa84d..79edb77223 100644
--- a/src/lagrangian/parcel/submodels/Spray/AtomisationModel/LISAAtomisation/LISAAtomisation.H
+++ b/src/lagrangian/parcel/submodels/Spray/AtomisationModel/LISAAtomisation/LISAAtomisation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -138,7 +138,7 @@ public:
             const vector& injectionPos,
             const scalar pAmbient,
             const scalar chi,
-            Random& rndGen
+            randomGenerator& rndGen
         ) const;
 };
 
diff --git a/src/lagrangian/parcel/submodels/Spray/AtomisationModel/NoAtomisation/NoAtomisation.C b/src/lagrangian/parcel/submodels/Spray/AtomisationModel/NoAtomisation/NoAtomisation.C
index bafd0fad2d..6257fcedd1 100644
--- a/src/lagrangian/parcel/submodels/Spray/AtomisationModel/NoAtomisation/NoAtomisation.C
+++ b/src/lagrangian/parcel/submodels/Spray/AtomisationModel/NoAtomisation/NoAtomisation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ void Foam::NoAtomisation<CloudType>::update
     const vector& injectionPos,
     const scalar pAmbient,
     const scalar chi,
-    Random& rndGen
+    randomGenerator& rndGen
 ) const
 {}
 
diff --git a/src/lagrangian/parcel/submodels/Spray/AtomisationModel/NoAtomisation/NoAtomisation.H b/src/lagrangian/parcel/submodels/Spray/AtomisationModel/NoAtomisation/NoAtomisation.H
index 439862d300..ef061d43fb 100644
--- a/src/lagrangian/parcel/submodels/Spray/AtomisationModel/NoAtomisation/NoAtomisation.H
+++ b/src/lagrangian/parcel/submodels/Spray/AtomisationModel/NoAtomisation/NoAtomisation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,7 +99,7 @@ public:
             const vector& injectionPos,
             const scalar pAmbient,
             const scalar chi,
-            Random& rndGen
+            randomGenerator& rndGen
         ) const;
 };
 
diff --git a/src/lagrangian/parcel/submodels/Spray/BreakupModel/SHF/SHF.C b/src/lagrangian/parcel/submodels/Spray/BreakupModel/SHF/SHF.C
index 9110d0a1aa..2f80a39911 100644
--- a/src/lagrangian/parcel/submodels/Spray/BreakupModel/SHF/SHF.C
+++ b/src/lagrangian/parcel/submodels/Spray/BreakupModel/SHF/SHF.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,7 +139,7 @@ bool Foam::SHF<CloudType>::update
     scalar& massChild
 )
 {
-    Random& rndGen = this->owner().rndGen();
+    randomGenerator& rndGen = this->owner().rndGen();
 
     bool addChild = false;
 
diff --git a/src/lagrangian/parcel/submodels/Spray/BreakupModel/TAB/TAB.C b/src/lagrangian/parcel/submodels/Spray/BreakupModel/TAB/TAB.C
index bfe746363d..39f681ac16 100644
--- a/src/lagrangian/parcel/submodels/Spray/BreakupModel/TAB/TAB.C
+++ b/src/lagrangian/parcel/submodels/Spray/BreakupModel/TAB/TAB.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,7 +111,7 @@ bool Foam::TAB<CloudType>::update
     scalar& massChild
 )
 {
-    Random& rndGen = this->owner().rndGen();
+    randomGenerator& rndGen = this->owner().rndGen();
 
     scalar r = 0.5*d;
     scalar r2 = r*r;
diff --git a/src/lagrangian/parcel/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C b/src/lagrangian/parcel/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
index b9e19926d5..c2e0955d21 100644
--- a/src/lagrangian/parcel/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
+++ b/src/lagrangian/parcel/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -180,8 +180,8 @@ void Foam::ThermoLookupTableInjection<CloudType>::setPositionAndCell
     label injectorI = 0;
     if (randomise_)
     {
-        Random& rnd = this->owner().rndGen();
-        injectorI = rnd.sampleAB<label>(0, injectorCells_.size());
+        randomGenerator& rndGen = this->owner().rndGen();
+        injectorI = rndGen.sampleAB<label>(0, injectorCells_.size());
     }
     else
     {
diff --git a/src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
index 3a1d7f8a6e..b8dc9e443b 100644
--- a/src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
+++ b/src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -202,15 +202,15 @@ Foam::forceSuSp Foam::BrownianMotionForce<CloudType>::calcCoupled
 
     // To generate a spherical distribution:
 
-    Random& rnd = this->owner().rndGen();
+    randomGenerator& rndGen = this->owner().rndGen();
 
-    const scalar theta = rnd.scalar01()*twoPi;
-    const scalar u = 2*rnd.scalar01() - 1;
+    const scalar theta = rndGen.scalar01()*twoPi;
+    const scalar u = 2*rndGen.scalar01() - 1;
 
     const scalar a = sqrt(1 - sqr(u));
     const vector dir(a*cos(theta), a*sin(theta), u);
 
-    value.Su() = f*mag(rnd.scalarNormal())*dir;
+    value.Su() = f*mag(rndGen.scalarNormal())*dir;
 
     return value;
 }
diff --git a/src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H b/src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
index f94d6401b2..dc59e059b3 100644
--- a/src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
+++ b/src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ SourceFiles
 #define BrownianMotionForce_H
 
 #include "ParticleForce.H"
-#include "Random.H"
+#include "randomGenerator.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,7 +65,7 @@ class BrownianMotionForce
     // Private Data
 
         //- Reference to the cloud random number generator
-        Random& rndGen_;
+        randomGenerator& rndGen_;
 
         //- Molecular free path length [m]
         const scalar lambda_;
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 1fe6347b87..a9d0381b83 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -51,7 +51,7 @@ License
 #include "meshTools.H"
 #include "OFstream.H"
 #include "geomDecomp.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "searchableSurfaces.H"
 #include "treeBoundBox.H"
 #include "fvMeshTools.H"
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
index f18cc2065b..6388bbcc77 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 #include "extendedEdgeMesh.H"
 #include "surfaceFeatures.H"
 #include "triSurface.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "Time.H"
 #include "OBJstream.H"
 #include "DynamicField.H"
diff --git a/src/meshTools/patchIntersection/star/starTemplates.C b/src/meshTools/patchIntersection/star/starTemplates.C
index df938c079e..b89cacf0f8 100644
--- a/src/meshTools/patchIntersection/star/starTemplates.C
+++ b/src/meshTools/patchIntersection/star/starTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -301,7 +301,7 @@ Foam::star::context Foam::star::populate
 
     /*
     // Randomise swapping
-    static Random rndGen(12345);
+    static randomGenerator rndGen(12345);
     const label starEdgeiA = rndGen.sampleAB<label>(0, starEdgeEdges_.size());
     const label starEdgeiB = rndGen.sampleAB<label>(0, starEdgeEdges_.size());
     swapStarEdges(starEdgeiA, starEdgeiB);
diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
index 3d3d9cd768..af3f89eff6 100644
--- a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "triSurfaceMesh.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "addToRunTimeSelectionTable.H"
 #include "EdgeMap.H"
 #include "triSurfaceFields.H"
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
index 15617d8d06..fb921e6220 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ License
 #include "indexedOctree.H"
 #include "meshTools.H"
 #include "plane.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "unitConversion.H"
 #include "treeBoundBox.H"
 
@@ -229,7 +229,7 @@ bool Foam::edgeIntersections::inlinePerturb
     const triSurface& surf1,
     const scalarField& surf1PointTol,   // surf1 tolerance per point
     const label edgeI,
-    Random& rndGen,
+    randomGenerator& rndGen,
     pointField& points1,
     boolList& affectedEdges
 ) const
@@ -310,7 +310,7 @@ bool Foam::edgeIntersections::rotatePerturb
     const scalarField& surf1PointTol,   // surf1 tolerance per point
     const label edgeI,
 
-    Random& rndGen,
+    randomGenerator& rndGen,
     pointField& points1,
     boolList& affectedEdges
 ) const
@@ -383,7 +383,7 @@ bool Foam::edgeIntersections::offsetPerturb
     const triSurface& surf2,
     const label edgeI,
 
-    Random& rndGen,
+    randomGenerator& rndGen,
     pointField& points1,
     boolList& affectedEdges
 ) const
@@ -549,7 +549,7 @@ Foam::label Foam::edgeIntersections::removeDegenerates
 {
     const triSurface& surf2 = query2.surface();
 
-    Random rndGen(356574);
+    randomGenerator rndGen(356574);
 
     // Current set of edges to (re)test
     labelList edgesToTest(surf1.nEdges());
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H
index 381baa1f62..2f193f2357 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ namespace Foam
 // Forward declaration of classes
 class triSurface;
 class triSurfaceSearch;
-class Random;
+class randomGenerator;
 class edge;
 
 /*---------------------------------------------------------------------------*\
@@ -98,7 +98,7 @@ class edgeIntersections
             const triSurface& surf1,
             const scalarField& surf1PointTol,
             const label edgeI,
-            Random& rndGen,
+            randomGenerator& rndGen,
             pointField& points1,
             boolList& affectedEdges
         ) const;
@@ -110,7 +110,7 @@ class edgeIntersections
             const triSurface& surf1,
             const scalarField& surf1PointTol,
             const label edgeI,
-            Random& rndGen,
+            randomGenerator& rndGen,
             pointField& points1,
             boolList& affectedEdges
         ) const;
@@ -125,7 +125,7 @@ class edgeIntersections
             const triSurface& surf2,
             const label edgeI,
 
-            Random& rndGen,
+            randomGenerator& rndGen,
             pointField& points1,
             boolList& affectedEdges
         ) const;
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
index ce0be58edb..1c64cdac35 100644
--- a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ License
 
 #include "pointToPointPlanarInterpolation.H"
 #include "boundBox.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "vector2D.H"
 #include "triSurface.H"
 #include "triSurfaceTools.H"
@@ -211,7 +211,7 @@ void Foam::pointToPointPlanarInterpolation::calcWeights
                 << nl << endl;
         }
 
-        Random rndGen(123456);
+        randomGenerator rndGen(123456);
         forAll(localVertices, i)
         {
             localVertices[i] +=
diff --git a/src/parallel/decompose/decompositionMethods/randomDecomp/randomDecomp.C b/src/parallel/decompose/decompositionMethods/randomDecomp/randomDecomp.C
index d839c281b4..f00f592046 100644
--- a/src/parallel/decompose/decompositionMethods/randomDecomp/randomDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/randomDecomp/randomDecomp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ License
 
 #include "randomDecomp.H"
 #include "clock.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -74,7 +74,7 @@ Foam::labelList Foam::randomDecomp::decompose
     const scalarField& pointWeights
 )
 {
-    Random rndGen(seed_);
+    randomGenerator rndGen(seed_);
 
     // Simple random integer. No guarantees about balance.
     /*
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 3da7727c8f..867986c567 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ License
 
 #include "distributedTriSurfaceMesh.H"
 #include "distributionMap.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "addToRunTimeSelectionTable.H"
 #include "triangleFuncs.H"
 #include "matchPoints.H"
diff --git a/src/randomProcesses/processes/OUprocess/OUprocess.C b/src/randomProcesses/processes/OUprocess/OUprocess.C
index cabd23cd41..e2a8f05597 100644
--- a/src/randomProcesses/processes/OUprocess/OUprocess.C
+++ b/src/randomProcesses/processes/OUprocess/OUprocess.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,9 +37,9 @@ complexVector OUprocess::WeinerProcess(const scalar deltaT) const
 {
     return sqrt(deltaT)*complexVector
     (
-        complex(GaussGen_.scalarNormal(), GaussGen_.scalarNormal()),
-        complex(GaussGen_.scalarNormal(), GaussGen_.scalarNormal()),
-        complex(GaussGen_.scalarNormal(), GaussGen_.scalarNormal())
+        complex(rndGen_.scalarNormal(), rndGen_.scalarNormal()),
+        complex(rndGen_.scalarNormal(), rndGen_.scalarNormal()),
+        complex(rndGen_.scalarNormal(), rndGen_.scalarNormal())
     );
 }
 
@@ -53,7 +53,7 @@ OUprocess::OUprocess
     const dictionary& OUdict
 )
 :
-    GaussGen_(label(0)),
+    rndGen_(label(0)),
     Kmesh_(kmesh),
     OUfield_(Kmesh_.size()),
 
diff --git a/src/randomProcesses/processes/OUprocess/OUprocess.H b/src/randomProcesses/processes/OUprocess/OUprocess.H
index 590f8e06e6..ae63830535 100644
--- a/src/randomProcesses/processes/OUprocess/OUprocess.H
+++ b/src/randomProcesses/processes/OUprocess/OUprocess.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ SourceFiles
 
 #include "complexFields.H"
 #include "scalar.H"
-#include "Random.H"
+#include "randomGenerator.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -54,7 +54,7 @@ class OUprocess
 {
     // Private Data
 
-        mutable Random GaussGen_;
+        mutable randomGenerator rndGen_;
 
         const Kmesh& Kmesh_;
         mutable complexVectorField OUfield_;
diff --git a/src/randomProcesses/turbulence/turbGen.C b/src/randomProcesses/turbulence/turbGen.C
index 00da0c9955..473a1d41a1 100644
--- a/src/randomProcesses/turbulence/turbGen.C
+++ b/src/randomProcesses/turbulence/turbGen.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,10 +35,10 @@ License
 
 Foam::turbGen::turbGen(const Kmesh& k, const scalar EA, const scalar K0)
 :
-    K(k),
-    Ea(EA),
-    k0(K0),
-    RanGen(label(0))
+    K_(k),
+    Ea_(EA),
+    k0_(K0),
+    rndGen_(label(0))
 {}
 
 
@@ -46,19 +46,19 @@ Foam::turbGen::turbGen(const Kmesh& k, const scalar EA, const scalar K0)
 
 Foam::vectorField Foam::turbGen::U()
 {
-    vectorField s(K.size());
-    scalarField rndPhases(K.size());
+    vectorField s(K_.size());
+    scalarField rndPhases(K_.size());
 
-    forAll(K, i)
+    forAll(K_, i)
     {
-        s[i] = RanGen.sample01<vector>();
-        rndPhases[i] = RanGen.scalar01();
+        s[i] = rndGen_.sample01<vector>();
+        rndPhases[i] = rndGen_.scalar01();
     }
 
-    s = K ^ s;
+    s = K_ ^ s;
     s = s/(mag(s) + 1.0e-20);
 
-    s = Ek(Ea, k0, mag(K))*s;
+    s = Ek(Ea_, k0_, mag(K_))*s;
 
     complexVectorField up
     (
@@ -66,7 +66,7 @@ Foam::vectorField Foam::turbGen::U()
         (
             ComplexField(cos(constant::mathematical::twoPi*rndPhases)*s,
             sin(constant::mathematical::twoPi*rndPhases)*s),
-            K.nn()
+            K_.nn()
         )
     );
 
diff --git a/src/randomProcesses/turbulence/turbGen.H b/src/randomProcesses/turbulence/turbGen.H
index fc28451a00..4add9d003b 100644
--- a/src/randomProcesses/turbulence/turbGen.H
+++ b/src/randomProcesses/turbulence/turbGen.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ SourceFiles
 #ifndef turbGen_H
 #define turbGen_H
 
-#include "Random.H"
+#include "randomGenerator.H"
 #include "primitiveFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,10 +55,10 @@ class turbGen
 {
     // Private Data
 
-        const Kmesh& K;
-        const scalar Ea;
-        const scalar k0;
-        Random RanGen;
+        const Kmesh& K_;
+        const scalar Ea_;
+        const scalar k0_;
+        randomGenerator rndGen_;
 
 
 public:
diff --git a/src/renumber/renumberMethods/randomRenumber/randomRenumber.C b/src/renumber/renumberMethods/randomRenumber/randomRenumber.C
index 86c1bfa047..c69ec4de7e 100644
--- a/src/renumber/renumberMethods/randomRenumber/randomRenumber.C
+++ b/src/renumber/renumberMethods/randomRenumber/randomRenumber.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ License
 
 #include "randomRenumber.H"
 #include "addToRunTimeSelectionTable.H"
-#include "Random.H"
+#include "randomGenerator.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -57,7 +57,7 @@ Foam::labelList Foam::randomRenumber::renumber
     const pointField& points
 ) const
 {
-    Random rndGen(0);
+    randomGenerator rndGen(0);
 
     labelList newToOld(identityMap(points.size()));
 
diff --git a/src/sampling/sampledSet/boundaryRandom/boundaryRandom.C b/src/sampling/sampledSet/boundaryRandom/boundaryRandom.C
index 073f913370..7bb245d9d0 100644
--- a/src/sampling/sampledSet/boundaryRandom/boundaryRandom.C
+++ b/src/sampling/sampledSet/boundaryRandom/boundaryRandom.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 #include "polyMesh.H"
 #include "addToRunTimeSelectionTable.H"
 #include "word.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "SubField.H"
 #include "barycentric2D.H"
 #include "triPointRef.H"
@@ -118,7 +118,7 @@ void Foam::sampledSets::boundaryRandom::calcSamples
     }
 
     // Generate the samples
-    Random rndGen(261782);
+    randomGenerator rndGen(261782);
     const label proci = Pstream::myProcNo();
     for (label i = 0; i < nPoints_; ++ i)
     {
diff --git a/src/sampling/sampledSet/circleRandom/circleRandom.C b/src/sampling/sampledSet/circleRandom/circleRandom.C
index a19b8d275e..2824132dc8 100644
--- a/src/sampling/sampledSet/circleRandom/circleRandom.C
+++ b/src/sampling/sampledSet/circleRandom/circleRandom.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "word.H"
 #include "mathematicalConstants.H"
-#include "Random.H"
+#include "randomGenerator.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -55,7 +55,7 @@ void Foam::sampledSets::circleRandom::calcSamples
     DynamicList<label>& samplingFaces
 ) const
 {
-    Random rndGen(261782);
+    randomGenerator rndGen(261782);
 
     const vector radial1 = normalised(perpendicular(normal_));
     const vector radial2 = normalised(normal_ ^ radial1);
diff --git a/src/sampling/sampledSet/sphereRandom/sphereRandom.C b/src/sampling/sampledSet/sphereRandom/sphereRandom.C
index 74526445e2..5b831cd7ec 100644
--- a/src/sampling/sampledSet/sphereRandom/sphereRandom.C
+++ b/src/sampling/sampledSet/sphereRandom/sphereRandom.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "word.H"
 #include "mathematicalConstants.H"
-#include "Random.H"
+#include "randomGenerator.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -55,7 +55,7 @@ void Foam::sampledSets::sphereRandom::calcSamples
     DynamicList<label>& samplingFaces
 ) const
 {
-    Random rndGen(261782);
+    randomGenerator rndGen(261782);
 
     for (label i = 0; i < nPoints_; ++ i)
     {
diff --git a/src/waves/waveModels/irregular/irregular.C b/src/waves/waveModels/irregular/irregular.C
index ee0a9fe6dc..cda67a87d9 100644
--- a/src/waves/waveModels/irregular/irregular.C
+++ b/src/waves/waveModels/irregular/irregular.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 #include "irregular.H"
 #include "mathematicalConstants.H"
 #include "OSspecific.H"
-#include "Random.H"
+#include "randomGenerator.H"
 #include "rawSetWriter.H"
 #include "writeFile.H"
 #include "addToRunTimeSelectionTable.H"
@@ -135,7 +135,7 @@ Foam::waveModels::irregular::irregular
     }
 
     // Set random phases
-    Random rndGen(0);
+    randomGenerator rndGen(0);
     forAll(phases_, i)
     {
         phases_[i] = rndGen.scalarAB(0, constant::mathematical::twoPi);
diff --git a/tutorials/incompressibleFluid/flowWithOpenBoundary/distortMesh/distortMesh.C b/tutorials/incompressibleFluid/flowWithOpenBoundary/distortMesh/distortMesh.C
index 36d812e0a5..5b533e9b77 100644
--- a/tutorials/incompressibleFluid/flowWithOpenBoundary/distortMesh/distortMesh.C
+++ b/tutorials/incompressibleFluid/flowWithOpenBoundary/distortMesh/distortMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ Description
 
 #include "argList.H"
 #include "fvMesh.H"
-#include "Random.H"
+#include "randomGenerator.H"
 
 using namespace Foam;
 
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
         mesh.bounds().min() - boundExtend,
         mesh.bounds().max() + boundExtend
     );
-    Random RanGen(0);
+    randomGenerator rndGen(0);
     const scalar s(0.04);
 
     forAll(points, i)
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
 
         if (bounds.containsInside(pi))
         {
-            disp[i] += cmptMultiply(RanGen.sample01<vector>(),vector(s, s, 0));
+            disp[i] += cmptMultiply(rndGen.sample01<vector>(),vector(s, s, 0));
         }
     }