diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
index 34e376e64e..62ada17c55 100644
--- a/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
+++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
@@ -541,7 +541,7 @@ void Foam::BlendedInterfacialModel<ModelType>::postProcessBlendingCoefficients
     {
         // Single axis, using the first phase as the x-coordinate
         static const label nDivisions = 128;
-        const scalarField divisionis(scalarList(identity(nDivisions)));
+        const scalarField divisionis(scalarList(identityMap(nDivisions)));
         fieldNames[0] = fluid.phases()[0].volScalarField::name();
         fieldNames[1] = fluid.phases()[1].volScalarField::name();
         fields.set(0, new scalarField(divisionis/(nDivisions - 1)));
diff --git a/applications/test/Circulator/Test-Circulator.C b/applications/test/Circulator/Test-Circulator.C
index 837697508f..5773ae9010 100644
--- a/applications/test/Circulator/Test-Circulator.C
+++ b/applications/test/Circulator/Test-Circulator.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
     Info<< "Test const circulator. First go forwards, then backwards."
         << nl << endl;
 
-    face f(identity(4));
+    face f(identityMap(4));
 
     ConstCirculator<face> cStart(f);
 
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
 
 
     Info<< nl << nl << "Compare two faces: " << endl;
-    face a(identity(5));
+    face a(identityMap(5));
     Info<< "Compare " << a << " and " << a << " Match = " << face::compare(a, a)
         << endl;
 
@@ -127,11 +127,11 @@ int main(int argc, char *argv[])
     Info<< "Compare " << g << " and " << h << " Match = " << face::compare(g, h)
         << endl;
 
-    face face1(identity(1));
+    face face1(identityMap(1));
     Info<< "Compare " << face1 << " and " << face1
         << " Match = " << face::compare(face1, face1) << endl;
 
-    face face2(identity(1)+1);
+    face face2(identityMap(1)+1);
     Info<< "Compare " << face1 << " and " << face2
         << " Match = " << face::compare(face1, face2) << endl;
 
@@ -146,7 +146,7 @@ int main(int argc, char *argv[])
 
     } while (cZero.circulate(CirculatorBase::direction::clockwise));
 
-    fZero = face(identity(5));
+    fZero = face(identityMap(5));
 
     // circulator was invalidated so reset
     cZero = Circulator<face>(fZero);
diff --git a/applications/test/CompactIOList/Test-CompactIOList.C b/applications/test/CompactIOList/Test-CompactIOList.C
index 3f5395beab..3f0d4da16a 100644
--- a/applications/test/CompactIOList/Test-CompactIOList.C
+++ b/applications/test/CompactIOList/Test-CompactIOList.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
             size
         );
 
-        const face f(identity(4));
+        const face f(identityMap(4));
 
         forAll(faces2, i)
         {
@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
             size
         );
 
-        const face f(identity(4));
+        const face f(identityMap(4));
 
         forAll(faces2, i)
         {
diff --git a/applications/test/DynamicList/Test-DynamicList.C b/applications/test/DynamicList/Test-DynamicList.C
index 6f0d3cab57..da120bbff6 100644
--- a/applications/test/DynamicList/Test-DynamicList.C
+++ b/applications/test/DynamicList/Test-DynamicList.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -208,7 +208,7 @@ int main(int argc, char *argv[])
     dlE3 = dlE2;   // assign identical
     printInfo("dlE3", dlE3, true);
 
-    DynamicList<label> dlE4(reorder(identity(dlE3.size()), dlE3));
+    DynamicList<label> dlE4(reorder(identityMap(dlE3.size()), dlE3));
     printInfo("dlE4", dlE4, true);
 
     printInfo("dlE3", dlE3, true);
diff --git a/applications/test/Function1/Test-Function1.C b/applications/test/Function1/Test-Function1.C
index ce23370c72..abfcc53ff7 100644
--- a/applications/test/Function1/Test-Function1.C
+++ b/applications/test/Function1/Test-Function1.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
     const scalar dx = (x1 - x0)/(nX - 1);
     const scalarField xs
     (
-        x0 + dx*List<scalar>(identity(nX))
+        x0 + dx*List<scalar>(identityMap(nX))
     );
 
     Info<< "Calculating values\n" << endl;
diff --git a/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C b/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C
index 03b3ec967c..ededf52843 100644
--- a/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C
+++ b/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
         pDict
     );
 
-    labelList cellToCoarse(identity(mesh.nCells()));
+    labelList cellToCoarse(identityMap(mesh.nCells()));
     labelListList coarseToCell(invertOneToMany(mesh.nCells(), cellToCoarse));
 
     runTime++;
diff --git a/applications/test/ListOps/Test-ListOps.C b/applications/test/ListOps/Test-ListOps.C
index 2d42b941b1..ba612b121f 100644
--- a/applications/test/ListOps/Test-ListOps.C
+++ b/applications/test/ListOps/Test-ListOps.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,8 +43,8 @@ int main(int argc, char *argv[])
 {
     Info<< "Test Rotations:" << nl << endl;
 
-    List<label> forwardRotate(identity(5));
-    face testFace(identity(4));
+    List<label> forwardRotate(identityMap(5));
+    face testFace(identityMap(4));
 
     for (label i = 0; i < 8; ++i)
     {
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
     inplaceRotateList(forwardRotate, -2);
     Info<< "Rotate to the left by 2  : " << forwardRotate << endl;
 
-    List<label> subRotate(identity(10));
+    List<label> subRotate(identityMap(10));
     SubList<label> subL(subRotate, 5, 3);
 
     Info<< "Test inplace rotate on sublist : " << subRotate << endl;
@@ -80,32 +80,32 @@ int main(int argc, char *argv[])
 
     Info<< nl << nl << "Test Reversing:" << nl << endl;
 
-    Info<< "List    : " << identity(5) << endl;
-    Info<< "Reverse : " << reverseList(identity(5)) << endl;
-    Info<< "List    : " << identity(6) << endl;
-    Info<< "Reverse : " << reverseList(identity(6)) << nl << endl;
+    Info<< "List    : " << identityMap(5) << endl;
+    Info<< "Reverse : " << reverseList(identityMap(5)) << endl;
+    Info<< "List    : " << identityMap(6) << endl;
+    Info<< "Reverse : " << reverseList(identityMap(6)) << nl << endl;
 
-    List<label> test1(identity(5));
+    List<label> test1(identityMap(5));
     Info<< "List            : " << test1 << endl;
     inplaceReverseList(test1);
     Info<< "Inplace Reverse : " << test1 << nl << endl;
 
-    List<label> test2(identity(6));
+    List<label> test2(identityMap(6));
     Info<< "List            : " << test2 << endl;
     inplaceReverseList(test2);
     Info<< "Inplace Reverse : " << test2 << nl << endl;
 
-    face test3(identity(6));
+    face test3(identityMap(6));
     Info<< "Face            : " << test3 << endl;
     inplaceReverseList(test3);
     Info<< "Inplace Reverse : " << test3 << nl << endl;
 
-    FixedList<label, 6> test4(identity(6));
+    FixedList<label, 6> test4(identityMap(6));
     Info<< "FixedList       : " << test4 << endl;
     inplaceReverseList(test4);
     Info<< "Inplace Reverse : " << test4 << nl << endl;
 
-    List<label> test5(identity(9));
+    List<label> test5(identityMap(9));
     SubList<label> test5SubList(test5, 4, 3);
     Info<< "List                            : " << test5 << endl;
     inplaceReverseList(test5SubList);
diff --git a/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C b/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C
index 9bd222c28d..80b2c300a3 100644
--- a/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C
+++ b/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
 
     // 2. Use a wrapper to walk from all boundary edges on selected patches
     {
-        labelHashSet otherPatchIDs(identity(mesh.boundaryMesh().size()));
+        labelHashSet otherPatchIDs(identityMap(mesh.boundaryMesh().size()));
         otherPatchIDs.erase(patch.index());
 
         Info<< "Walking on patch " << patch.index()
diff --git a/applications/test/PatchTools/Test-PatchTools.C b/applications/test/PatchTools/Test-PatchTools.C
index 8fd9186e18..36e0b13acf 100644
--- a/applications/test/PatchTools/Test-PatchTools.C
+++ b/applications/test/PatchTools/Test-PatchTools.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -259,7 +259,7 @@ int main(int argc, char *argv[])
 //            (
 //                mesh,
 //                pp,
-//                identity(pp.size())+pp.start()
+//                identityMap(pp.size())+pp.start()
 //            )
 //        );
 //        forAll(pn, pointi)
@@ -276,7 +276,7 @@ int main(int argc, char *argv[])
 //            (
 //                mesh,
 //                pp,
-//                identity(pp.size())+pp.start()
+//                identityMap(pp.size())+pp.start()
 //            )
 //        );
 //        forAll(pn, pointi)
diff --git a/applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C b/applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C
index 347221583d..9f66fbe9a3 100644
--- a/applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C
+++ b/applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
     bb.min() -= point(rootVSmall, rootVSmall, rootVSmall);
     bb.max() += point(rootVSmall, rootVSmall, rootVSmall);
 
-    labelList allEdges(identity(efem.edges().size()));
+    labelList allEdges(identityMap(efem.edges().size()));
 
     indexedOctree<treeDataEdge> edgeTree
     (
diff --git a/applications/test/momentOfInertia/Test-momentOfInertia.C b/applications/test/momentOfInertia/Test-momentOfInertia.C
index 248bdb5907..8f91091b9d 100644
--- a/applications/test/momentOfInertia/Test-momentOfInertia.C
+++ b/applications/test/momentOfInertia/Test-momentOfInertia.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
         pts[4] = point(4.294, 4.024, -4.317);
         pts[5] = point(4.409, 3.687, -4.317);
 
-        face f(identity(nPts));
+        face f(identityMap(nPts));
 
         point Cf = f.centre(pts);
 
diff --git a/applications/test/polygonTriangulate/Test-polygonTriangulate.C b/applications/test/polygonTriangulate/Test-polygonTriangulate.C
index 4f8ad2024e..abf769b5f2 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 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
     // Write the polygon
     {
         OBJstream os(args[0] + "_polygon.obj");
-        os.write(face(identity(polygon.size())), polygon, false);
+        os.write(face(identityMap(polygon.size())), polygon, false);
     }
 
     // Triangulate the polygon
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
index fb99b466d6..474d180ad9 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -711,8 +711,8 @@ int main(int argc, char *argv[])
         layerExtrude.topoChange
         (
             map(),
-            identity(extrudePatch.size()),
-            identity(extrudePatch.nPoints())
+            identityMap(extrudePatch.size()),
+            identityMap(extrudePatch.nPoints())
         );
 
         // Calculate face labels for front and back.
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
index b9400754fc..bfb0cd1a67 100644
--- a/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1208,7 +1208,7 @@ int main(int argc, char *argv[])
                 {
                     const polyPatch& pp =
                         mesh.boundaryMesh()[zoneNames[zonei]];
-                    facesDyn.append(pp.start() + identity(pp.size()));
+                    facesDyn.append(pp.start() + identityMap(pp.size()));
                     zoneIDsDyn.append(labelList(pp.size(), zonei));
                     flipsDyn.append(boolList(pp.size(), false));
 
@@ -1224,7 +1224,10 @@ int main(int argc, char *argv[])
                                 << "corresponding zone " << zoneNames[zonei]
                                 << exit(FatalIOError);
                         }
-                        sdwFacesDyn.append(spp.start() + identity(spp.size()));
+                        sdwFacesDyn.append
+                        (
+                            spp.start() + identityMap(spp.size())
+                        );
                         sdwZoneIDsDyn.append(labelList(spp.size(), zonei));
                         sdwFlipsDyn.append(boolList(spp.size(), false));
                     }
diff --git a/applications/utilities/mesh/manipulation/mergeBaffles/mergeBaffles.C b/applications/utilities/mesh/manipulation/mergeBaffles/mergeBaffles.C
index 4deee4bb0e..f112f1f9ee 100644
--- a/applications/utilities/mesh/manipulation/mergeBaffles/mergeBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeBaffles/mergeBaffles.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ void mergeDuplicateBoundaryFaces
     labelList duplicates = localPointRegion::findDuplicateFaces
     (
         mesh,
-        identity(mesh.nFaces() - mesh.nInternalFaces())
+        identityMap(mesh.nFaces() - mesh.nInternalFaces())
       + mesh.nInternalFaces()
     );
 
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
index 4e239778de..bbeca92f17 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -462,8 +462,8 @@ int main(int argc, char *argv[])
     // split.
     if (splitAllFaces)
     {
-        featureEdges = identity(mesh.nEdges());
-        featureFaces = identity(mesh.nFaces());
+        featureEdges = identityMap(mesh.nEdges());
+        featureFaces = identityMap(mesh.nFaces());
     }
 
     // Write obj files for debugging
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index 75e24a678a..a0c5fac125 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -243,7 +243,7 @@ int main(int argc, char *argv[])
         Info<< "Refining all cells" << nl << endl;
 
         // Select all cells
-        refCells = identity(mesh.nCells());
+        refCells = identityMap(mesh.nCells());
 
         if (mesh.nGeometricD() == 3)
         {
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 331d28c3a1..9c594988b8 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -441,7 +441,7 @@ autoPtr<polyTopoChangeMap> reorderMesh
         patchSizes[patchi] = patches[patchi].size();
         patchStarts[patchi] = patches[patchi].start();
         oldPatchNMeshPoints[patchi] = patches[patchi].nPoints();
-        patchPointMap[patchi] = identity(patches[patchi].nPoints());
+        patchPointMap[patchi] = identityMap(patches[patchi].nPoints());
     }
 
     mesh.resetPrimitives
@@ -511,7 +511,7 @@ autoPtr<polyTopoChangeMap> reorderMesh
             mesh.nPoints(),             // nOldPoints,
             mesh.nFaces(),              // nOldFaces,
             mesh.nCells(),              // nOldCells,
-            identity(mesh.nPoints()),   // pointMap,
+            identityMap(mesh.nPoints()),   // pointMap,
             List<objectMap>(0),         // pointsFromPoints,
             faceOrder,                  // faceMap,
             List<objectMap>(0),         // facesFromPoints,
@@ -522,7 +522,7 @@ autoPtr<polyTopoChangeMap> reorderMesh
             List<objectMap>(0),         // cellsFromEdges,
             List<objectMap>(0),         // cellsFromFaces,
             List<objectMap>(0),         // cellsFromCells,
-            identity(mesh.nPoints()),   // reversePointMap,
+            identityMap(mesh.nPoints()),   // reversePointMap,
             reverseFaceOrder,           // reverseFaceMap,
             reverseCellOrder,           // reverseCellMap,
             flipFaceFlux,               // flipFaceFlux,
@@ -1243,7 +1243,7 @@ int main(int argc, char *argv[])
         (
             mesh,
             "cellID",
-            identity(mesh.nCells())
+            identityMap(mesh.nCells())
         );
 
         Info<< nl << "Written current cellID and origCellID as volScalarField"
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 9e3cd3d08d..c43be09f5b 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -147,7 +147,7 @@ void subsetVolFields
     const labelHashSet& addedPatches
 )
 {
-    const labelList patchMap(identity(mesh.boundaryMesh().size()));
+    const labelList patchMap(identityMap(mesh.boundaryMesh().size()));
 
     HashTable<const GeoField*> fields
     (
@@ -201,7 +201,7 @@ void subsetSurfaceFields
     const labelHashSet& addedPatches
 )
 {
-    const labelList patchMap(identity(mesh.boundaryMesh().size()));
+    const labelList patchMap(identityMap(mesh.boundaryMesh().size()));
 
     HashTable<const GeoField*> fields
     (
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
index 7df73bfb3b..747edeac7a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -947,7 +947,7 @@ int main(int argc, char *argv[])
 
                 const indirectPrimitivePatch ipp
                 (
-                    IndirectList<face>(pp, identity(pp.size())),
+                    IndirectList<face>(pp, identityMap(pp.size())),
                     pp.points()
                 );
 
diff --git a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
index 60f3c9931b..34fee836bc 100644
--- a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
+++ b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
     {
         if (finalAgglom[patchid].size() == 0)
         {
-            finalAgglom[patchid] = identity(boundary[patchid].size());
+            finalAgglom[patchid] = identityMap(boundary[patchid].size());
         }
     }
 
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
         const polyPatch& pp = boundary[patchid];
         if (pp.coupled())
         {
-            finalAgglom[patchid] = identity(pp.size());
+            finalAgglom[patchid] = identityMap(pp.size());
             forAll(pp, i)
             {
                 nbrAgglom[pp.start() - mesh.nInternalFaces() + i] =
diff --git a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
index 4f394905fe..40c9039e0b 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-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -164,7 +164,7 @@ void createBoundaryEdgeTrees
         treeBoundaryEdges[surfI] =
             labelList
             (
-                identity(surf.nEdges() - surf.nInternalEdges())
+                identityMap(surf.nEdges() - surf.nInternalEdges())
               + surf.nInternalEdges()
             );
 
diff --git a/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C b/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C
index fd14aef32d..f6e11218a0 100644
--- a/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C
+++ b/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
     triSurface surf2 = triSurfaceTools::redGreenRefine
     (
         surf1,
-        identity(surf1.size())  // Hack: refine all
+        identityMap(surf1.size())  // Hack: refine all
     );
 
     Info<< "Original surface:" << endl
diff --git a/src/OpenFOAM/algorithms/boundSphere/boundSphereTemplates.C b/src/OpenFOAM/algorithms/boundSphere/boundSphereTemplates.C
index 3303543494..fffab5b578 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 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2022-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -263,7 +263,7 @@ Foam::boundSphere(const PointField& ps, Random& rndGen)
     }
     else
     {
-        labelList pis(identity(ps.size()));
+        labelList pis(identityMap(ps.size()));
         rndGen.permute(pis);
         FixedList<label, 4> boundaryPis({-1, -1, -1, -1});
         return weizlBoundSphere(ps, pis, ps.size(), boundaryPis, 0);
@@ -282,7 +282,7 @@ Foam::boundSphere(const PointField& ps)
     }
     else
     {
-        labelList pis(identity(ps.size()));
+        labelList pis(identityMap(ps.size()));
         Random(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/indexedOctree/indexedOctree.C b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
index 5fc7b2072c..25ce7f221c 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -2168,7 +2168,7 @@ Foam::indexedOctree<Type>::indexedOctree
     // Start off with one node with all shapes in it.
     DynamicList<node> nodes(label(shapes.size() / maxLeafRatio));
     DynamicList<labelList> contents(label(shapes.size() / maxLeafRatio));
-    contents.append(identity(shapes.size()));
+    contents.append(identityMap(shapes.size()));
 
     // Create topnode.
     node topNode(divide(bb, contents, 0));
diff --git a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C
index f4cf7c0b9f..329c00ff90 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ Foam::treeDataCell::treeDataCell
 )
 :
     mesh_(mesh),
-    cellLabels_(identity(mesh_.nCells())),
+    cellLabels_(identityMap(mesh_.nCells())),
     cacheBb_(cacheBb),
     decompMode_(decompMode)
 {
diff --git a/src/OpenFOAM/algorithms/polygonTriangulate/polygonTriangulate.C b/src/OpenFOAM/algorithms/polygonTriangulate/polygonTriangulate.C
index c79333ac57..ab0e264223 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 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -202,7 +202,7 @@ Foam::List<Foam::point> Foam::polygonTriangulate::randomPolygon
     }
 
     // Initialise intersected polygon
-    labelList pointis(identity(n));
+    labelList pointis(identityMap(n));
 
     // Reorder until non-intersected
     bool incomplete = true;
diff --git a/src/OpenFOAM/containers/Circulators/Circulator/Circulator.H b/src/OpenFOAM/containers/Circulators/Circulator/Circulator.H
index 356654796b..f3383d61d8 100644
--- a/src/OpenFOAM/containers/Circulators/Circulator/Circulator.H
+++ b/src/OpenFOAM/containers/Circulators/Circulator/Circulator.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ Description
     Examples
 
     \code
-        face f(identity(5));
+        face f(identityMap(5));
 
         // Construct Circulator from the face
         Circulator<face> circ(f);
diff --git a/src/OpenFOAM/containers/Circulators/ConstCirculator/ConstCirculator.H b/src/OpenFOAM/containers/Circulators/ConstCirculator/ConstCirculator.H
index 388519d3a2..4813d94e79 100644
--- a/src/OpenFOAM/containers/Circulators/ConstCirculator/ConstCirculator.H
+++ b/src/OpenFOAM/containers/Circulators/ConstCirculator/ConstCirculator.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ Description
     Examples:
 
     \code
-        face f(identity(5));
+        face f(identityMap(5));
 
         // Construct circulator from the face
         ConstCirculator<face> circ(f);
@@ -51,7 +51,7 @@ Description
     \endcode
 
     \code
-        face f(identity(5));
+        face f(identityMap(5));
 
         ConstCirculator<face> circClockwise(f);
         ConstCirculator<face> circAnticlockwise(f);
diff --git a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
index 9c1e1a7691..6649b3b6ee 100644
--- a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
+++ b/src/OpenFOAM/containers/Lists/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-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ Foam::scalar Foam::Distribution<Type>::totalWeight(direction cmpt) const
 template<class Type>
 Foam::List<Foam::label> Foam::Distribution<Type>::keys(direction cmpt) const
 {
-    List<label> keys = identity((*this)[cmpt].size());
+    List<label> keys = identityMap((*this)[cmpt].size());
 
     forAll(keys, k)
     {
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.C b/src/OpenFOAM/containers/Lists/ListOps/ListOps.C
index 042056e26f..2e40db58d1 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,7 @@ Foam::labelListList Foam::invertOneToMany
 }
 
 
-Foam::labelList Foam::identity(const label len)
+Foam::labelList Foam::identityMap(const label len)
 {
     labelList map(len);
 
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
index 6ba61e3e31..60548149f3 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -167,7 +167,7 @@ List<OutList> invertManyToMany(const label len, const UList<InList>& in)
 }
 
 //- Create identity map (map[i] == i) of given length
-labelList identity(const label len);
+labelList identityMap(const label len);
 
 //- Count the number of occurrences of a value in a list
 template<class ListType>
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index 01525447e0..83dc9f3354 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
         // Redo worldComm communicator (this has been created at static
         // initialisation time)
         freeCommunicator(UPstream::worldComm);
-        label comm = allocateCommunicator(-1, identity(nProcs), true);
+        label comm = allocateCommunicator(-1, identityMap(nProcs), true);
         if (comm != UPstream::worldComm)
         {
             FatalErrorInFunction
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C
index 6f9905d3a0..2676688a47 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -302,7 +302,7 @@ Foam::OFstreamCollator::OFstreamCollator(const off_t maxBufferSize)
         UPstream::allocateCommunicator
         (
             localComm_,
-            identity(UPstream::nProcs(localComm_))
+            identityMap(UPstream::nProcs(localComm_))
         )
     )
 {}
@@ -322,7 +322,7 @@ Foam::OFstreamCollator::OFstreamCollator
         UPstream::allocateCommunicator
         (
             localComm_,
-            identity(UPstream::nProcs(localComm_))
+            identityMap(UPstream::nProcs(localComm_))
         )
     )
 {}
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
index d2f8cd3da8..901acb0a0a 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ Foam::labelList Foam::fileOperations::masterUncollatedFileOperation::subRanks
     string ioRanksString(getEnv("FOAM_IORANKS"));
     if (ioRanksString.empty())
     {
-        return identity(n);
+        return identityMap(n);
     }
     else
     {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
index c2de473846..26d497e23b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -593,7 +593,7 @@ bool Foam::GAMGAgglomeration::checkRestriction
     }
 
     // Seed (master) for every region
-    labelList master(identity(fineAddressing.size()));
+    labelList master(identityMap(fineAddressing.size()));
 
     // Now loop and transport master through region
     const labelUList& lower = fineAddressing.lowerAddr();
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C
index f5b14b34bb..d1e1e1b2d6 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,7 @@ Foam::dummyAgglomeration::dummyAgglomeration
         restrictAddressing_.set
         (
             nCreatedLevels,
-            new labelField(identity(nCoarseCells))
+            new labelField(identityMap(nCoarseCells))
         );
 
         agglomerateLduAddressing(nCreatedLevels);
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/degenerateMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/degenerateMatcher.C
index 33483ada19..a9ddfe9f8e 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/degenerateMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/degenerateMatcher.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ Foam::cellShape Foam::degenerateMatcher::match(const faceList& faces)
         faces,
         labelList(faces.size(), 0),    // cell 0 is owner of all faces
         0,                             // cell 0
-        identity(faces.size())         // cell 0 consists of all faces
+        identityMap(faces.size())         // cell 0 consists of all faces
     );
 }
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.C
index 15c041e71a..f615e5d3a1 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -297,7 +297,7 @@ bool Foam::hexMatcher::isA(const faceList& faces)
         faces,                      // all faces in mesh
         labelList(faces.size(), 0), // cell 0 is owner of all faces
         0,                          // cell label
-        identity(faces.size())      // faces of cell 0
+        identityMap(faces.size())      // faces of cell 0
     );
 }
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.C
index c84b70293a..ed3ca145ed 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -362,7 +362,7 @@ bool Foam::prismMatcher::isA(const faceList& faces)
         faces,                      // all faces in mesh
         labelList(faces.size(), 0), // cell 0 is owner of all faces
         0,                          // cell label
-        identity(faces.size())      // faces of cell 0
+        identityMap(faces.size())      // faces of cell 0
     );
 }
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.C
index ba0765aa43..2c47768ea6 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -286,7 +286,7 @@ bool Foam::pyrMatcher::isA(const faceList& faces)
         faces,                      // all faces in mesh
         labelList(faces.size(), 0), // cell 0 is owner of all faces
         0,                          // cell label
-        identity(faces.size())      // faces of cell 0
+        identityMap(faces.size())      // faces of cell 0
     );
 }
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.C
index 3084abce90..acbbf36e9e 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -237,7 +237,7 @@ bool Foam::tetMatcher::isA(const faceList& faces)
         faces,                      // all faces in mesh
         labelList(faces.size(), 0), // cell 0 is owner of all faces
         0,                          // cell label
-        identity(faces.size())      // faces of cell 0
+        identityMap(faces.size())      // faces of cell 0
     );
 }
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.C
index 450a2968f2..ced39d28eb 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -290,7 +290,7 @@ bool Foam::tetWedgeMatcher::isA(const faceList& faces)
         faces,                      // all faces in mesh
         labelList(faces.size(), 0), // cell 0 is owner of all faces
         0,                          // cell label
-        identity(faces.size())      // faces of cell 0
+        identityMap(faces.size())      // faces of cell 0
     );
 }
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.C
index 6138ef3ca4..e6bd6deb6d 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -389,7 +389,7 @@ bool Foam::wedgeMatcher::isA(const faceList& faces)
         faces,                      // all faces in mesh
         labelList(faces.size(), 0), // cell 0 is owner of all faces
         0,                          // cell label
-        identity(faces.size())      // faces of cell 0
+        identityMap(faces.size())      // faces of cell 0
     );
 }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 338401998f..be139f8ac6 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -2659,7 +2659,7 @@ void Foam::globalMeshData::topoChange()
     label comm = UPstream::allocateCommunicator
     (
         UPstream::worldComm,
-        identity(UPstream::nProcs()),
+        identityMap(UPstream::nProcs()),
         true
     );
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/distributionMapBase.C b/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/distributionMapBase.C
index 4ddab3e7d9..2b7ccfce24 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/distributionMapBase.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyDistributionMap/distributionMapBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -426,8 +426,8 @@ void Foam::distributionMapBase::exchangeAddressing
         {
             // All my own elements are used
             label nLocal = globalNumbering.localSize();
-            wantedRemoteElements[proci] = identity(nLocal);
-            constructMap_[proci] = identity(nLocal);
+            wantedRemoteElements[proci] = identityMap(nLocal);
+            constructMap_[proci] = identityMap(nLocal);
         }
         else
         {
@@ -504,8 +504,8 @@ void Foam::distributionMapBase::exchangeAddressing
         {
             // All my own elements are used
             label nLocal = globalNumbering.localSize();
-            wantedRemoteElements[proci] = identity(nLocal);
-            constructMap_[proci] = identity(nLocal);
+            wantedRemoteElements[proci] = identityMap(nLocal);
+            constructMap_[proci] = identityMap(nLocal);
         }
         else
         {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C
index 03d26c85c6..75ecb9d51a 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -217,7 +217,7 @@ void Foam::PatchTools::gatherAndMerge
     }
     else
     {
-        pointToGlobal = identity(meshPoints.size());
+        pointToGlobal = identityMap(meshPoints.size());
         uniqueMeshPointLabels = pointToGlobal;
 
         globalPointsPtr.reset(new globalIndex(meshPoints.size()));
diff --git a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
index aaf547d538..10da142b79 100644
--- a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
+++ b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpace.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ public:
         }
 
         //- Return the identity matrix for square matrix spaces
-        inline static msType identity();
+        inline static msType identityMap();
 
 
     // Sub-Block Classes
diff --git a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
index 3741ac1dc1..7155dd90f6 100644
--- a/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.H
+++ b/src/OpenFOAM/primitives/MatrixSpace/MatrixSpaceI.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -270,7 +270,7 @@ inline Cmpt& Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::zz()
 
 template<class Form, class Cmpt, Foam::direction Mrows, Foam::direction Ncols>
 inline Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>
-Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::identity()
+Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::identityMap()
 {
     static_assert(Mrows == Ncols, "Matrix is not square");
     msType result(Zero);
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/spatialTensor/spatialTensor.C b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/spatialTensor/spatialTensor.C
index 8f624601bc..1cfe66ef4d 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/spatialTensor/spatialTensor.C
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/spatialTensor/spatialTensor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,7 +81,7 @@ const Foam::spatialTensor Foam::spatialTensor::vsType::rootMin
 template<>
 const Foam::spatialTensor Foam::spatialTensor::I
 (
-    Foam::spatialTensor::identity()
+    Foam::spatialTensor::identityMap()
 );
 
 
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 03433b3985..708ca643bf 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -615,7 +615,7 @@ void Foam::UPstream::allocatePstreamCommunicator
         int numProcs;
         MPI_Comm_size(PstreamGlobals::MPICommunicators_[index], &numProcs);
 
-        // procIDs_[index] = identity(numProcs);
+        // procIDs_[index] = identityMap(numProcs);
         procIDs_[index].setSize(numProcs);
         forAll(procIDs_[index], i)
         {
diff --git a/src/conversion/ensight/part/ensightPartFaces.C b/src/conversion/ensight/part/ensightPartFaces.C
index 7423e5dd4c..959ecbed5a 100644
--- a/src/conversion/ensight/part/ensightPartFaces.C
+++ b/src/conversion/ensight/part/ensightPartFaces.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -206,7 +206,7 @@ Foam::ensightPart::localPoints Foam::ensightPartFaces::calcLocalPoints() const
     if (contiguousPoints_)
     {
         localPoints ptList;
-        ptList.list = identity(points_.size());
+        ptList.list = identityMap(points_.size());
         ptList.nPoints = points_.size();
         return ptList;
     }
diff --git a/src/conversion/meshReader/createPolyBoundary.C b/src/conversion/meshReader/createPolyBoundary.C
index 704cfc0b8a..6884fe5bc2 100644
--- a/src/conversion/meshReader/createPolyBoundary.C
+++ b/src/conversion/meshReader/createPolyBoundary.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -376,7 +376,7 @@ Foam::meshReader::polyBoundaryPatches(const polyMesh& mesh)
     label nPatches = patchStarts_.size();
 
     // avoid empty patches - move to the end of the lists and truncate
-    labelList oldToNew = identity(nPatches);
+    labelList oldToNew = identityMap(nPatches);
     forAll(patchSizes_, patchi)
     {
         if (patchSizes_[patchi] > 0)
diff --git a/src/conversion/meshReader/starcd/STARCDMeshReader.C b/src/conversion/meshReader/starcd/STARCDMeshReader.C
index e5d6d9c3c4..47170d3107 100644
--- a/src/conversion/meshReader/starcd/STARCDMeshReader.C
+++ b/src/conversion/meshReader/starcd/STARCDMeshReader.C
@@ -798,7 +798,7 @@ void Foam::meshReaders::STARCD::readBoundary(const fileName& inputName)
         labelList sortedIndices;
         sortedOrder(SubList<label>(origRegion, nPatches-1), sortedIndices);
 
-        labelList oldToNew = identity(nPatches);
+        labelList oldToNew = identityMap(nPatches);
         forAll(sortedIndices, i)
         {
             oldToNew[sortedIndices[i]] = i;
@@ -814,7 +814,7 @@ void Foam::meshReaders::STARCD::readBoundary(const fileName& inputName)
     nBafflePatches = 1;
     if (nBafflePatches)
     {
-        labelList oldToNew = identity(nPatches);
+        labelList oldToNew = identityMap(nPatches);
         label newIndex = 0;
         label baffleIndex = (nPatches-1 - nBafflePatches);
 
diff --git a/src/conversion/meshTables/cellTable.C b/src/conversion/meshTables/cellTable.C
index 4b0f500a33..3829c2af76 100644
--- a/src/conversion/meshTables/cellTable.C
+++ b/src/conversion/meshTables/cellTable.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -512,7 +512,7 @@ void Foam::cellTable::combine(const dictionary& mapDict, labelList& tableIds)
     }
 
     Map<word> origNames(names());
-    labelList mapping(identity(max(origNames.toc()) + 1));
+    labelList mapping(identityMap(max(origNames.toc()) + 1));
 
     bool remap = false;
     forAllConstIter(dictionary, mapDict, iter)
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 223eef9068..3cb9c38c9d 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -488,7 +488,7 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::fvMeshDistribute::deleteProcPatches
 
     // Delete (now empty) processor patches.
     {
-        labelList oldToNew(identity(mesh_.boundaryMesh().size()));
+        labelList oldToNew(identityMap(mesh_.boundaryMesh().size()));
         label newI = 0;
         // Non processor patches first
         forAll(mesh_.boundaryMesh(), patchi)
@@ -1801,15 +1801,15 @@ Foam::autoPtr<Foam::polyDistributionMap> Foam::fvMeshDistribute::distribute
                 move(oldPatchStarts),
                 move(oldPatchNMeshPoints),
 
-                labelListList(1, identity(mesh_.nPoints())),
-                labelListList(1, identity(mesh_.nFaces())),
-                labelListList(1, identity(mesh_.nCells())),
-                labelListList(1, identity(patches.size())),
+                labelListList(1, identityMap(mesh_.nPoints())),
+                labelListList(1, identityMap(mesh_.nFaces())),
+                labelListList(1, identityMap(mesh_.nCells())),
+                labelListList(1, identityMap(patches.size())),
 
-                labelListList(1, identity(mesh_.nPoints())),
-                labelListList(1, identity(mesh_.nFaces())),
-                labelListList(1, identity(mesh_.nCells())),
-                labelListList(1, identity(patches.size()))
+                labelListList(1, identityMap(mesh_.nPoints())),
+                labelListList(1, identityMap(mesh_.nFaces())),
+                labelListList(1, identityMap(mesh_.nCells())),
+                labelListList(1, identityMap(patches.size()))
             )
         );
     }
@@ -2350,13 +2350,13 @@ Foam::autoPtr<Foam::polyDistributionMap> Foam::fvMeshDistribute::distribute
             faceMap[facei] = -faceMap[facei];
         }
         subPointMap[Pstream::myProcNo()] = subMap().pointMap();
-        subPatchMap[Pstream::myProcNo()] = identity(patches.size());
+        subPatchMap[Pstream::myProcNo()] = identityMap(patches.size());
 
         // Initialise all addressing into current mesh
-        constructCellMap[Pstream::myProcNo()] = identity(mesh_.nCells());
-        constructFaceMap[Pstream::myProcNo()] = identity(mesh_.nFaces()) + 1;
-        constructPointMap[Pstream::myProcNo()] = identity(mesh_.nPoints());
-        constructPatchMap[Pstream::myProcNo()] = identity(patches.size());
+        constructCellMap[Pstream::myProcNo()] = identityMap(mesh_.nCells());
+        constructFaceMap[Pstream::myProcNo()] = identityMap(mesh_.nFaces()) + 1;
+        constructPointMap[Pstream::myProcNo()] = identityMap(mesh_.nPoints());
+        constructPatchMap[Pstream::myProcNo()] = identityMap(patches.size());
 
         // Subset the mesh data: neighbourCell/neighbourProc
         // fields
@@ -2708,11 +2708,11 @@ Foam::autoPtr<Foam::polyDistributionMap> Foam::fvMeshDistribute::distribute
             const fvMesh& domainMesh = domainMeshPtr();
 
 
-            constructCellMap[sendProc] = identity(domainMesh.nCells());
-            constructFaceMap[sendProc] = identity(domainMesh.nFaces()) + 1;
-            constructPointMap[sendProc] = identity(domainMesh.nPoints());
+            constructCellMap[sendProc] = identityMap(domainMesh.nCells());
+            constructFaceMap[sendProc] = identityMap(domainMesh.nFaces()) + 1;
+            constructPointMap[sendProc] = identityMap(domainMesh.nPoints());
             constructPatchMap[sendProc] =
-                identity(domainMesh.boundaryMesh().size());
+                identityMap(domainMesh.boundaryMesh().size());
 
 
             // Print a bit.
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
index 41ca3d7491..c333737c7b 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1047,7 +1047,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
         nextPatchID = wantedPatchID + 1;
 
         // old to new patches
-        globalPatchMap = identity(oldPatches.size());
+        globalPatchMap = identityMap(oldPatches.size());
     }
 
     labelList boundaryPatchSizes(nbSize, 0);
@@ -1555,7 +1555,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
     pointMap_ = map().pointMap();
     faceMap_ = map().faceMap();
     cellMap_ = map().cellMap();
-    patchMap_ = identity(baseMesh().boundaryMesh().size());
+    patchMap_ = identityMap(baseMesh().boundaryMesh().size());
 }
 
 
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
index 5ae761d751..f004ef8686 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1355,7 +1355,7 @@ bool Foam::cellCuts::loopAnchorConsistent
 ) const
 {
     // Create identity face for ease of calculation of area etc.
-    const face f(identity(loopPts.size()));
+    const face f(identityMap(loopPts.size()));
 
     const vector a = f.area(loopPts);
     const point ctr = f.centre(loopPts);
@@ -2894,7 +2894,7 @@ Foam::cellCuts::cellCuts
         Pout<< "cellCuts : constructor from cellLoops" << endl;
     }
 
-    calcLoopsAndAddressing(identity(mesh.nCells()));
+    calcLoopsAndAddressing(identityMap(mesh.nCells()));
 
     // Adds cuts on other side of coupled boundaries
     syncProc();
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C
index b8386e5112..3892da2148 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -369,7 +369,7 @@ bool Foam::motionSmootherAlgo::checkMesh
         report,
         mesh,
         dict,
-        identity(mesh.nFaces()),
+        identityMap(mesh.nFaces()),
         wrongFaces
     );
 }
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.C b/src/dynamicMesh/perfectInterface/perfectInterface.C
index ecb4c529ae..8ad3fcf531 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.C
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -457,14 +457,14 @@ void Foam::perfectInterface::setRefinement(polyTopoChange& ref) const
         const polyPatch& patch1 = patches[slavePatchID_.index()];
 
 
-        labelList pp0Labels(identity(patch0.size())+patch0.start());
+        labelList pp0Labels(identityMap(patch0.size())+patch0.start());
         indirectPrimitivePatch pp0
         (
             IndirectList<face>(mesh.faces(), pp0Labels),
             mesh.points()
         );
 
-        labelList pp1Labels(identity(patch1.size())+patch1.start());
+        labelList pp1Labels(identityMap(patch1.size())+patch1.start());
         indirectPrimitivePatch pp1
         (
             IndirectList<face>(mesh.faces(), pp1Labels),
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index 1d0838b472..cdbd0969fc 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1411,7 +1411,7 @@ Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::polyMeshAdder::add
 
             from0ToAllPoints,
             from0ToAllFaces,
-            identity(mesh0.nCells()),
+            identityMap(mesh0.nCells()),
 
             from1ToAllPoints,
             from1ToAllFaces,
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
index ee4ea2f64d..bf899e8a7d 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -146,7 +146,7 @@ Foam::label Foam::polyMeshFilter::filterFacesLoop(const label nOriginalBadFaces)
         scalarField newMeshFaceFilterFactor = faceFilterFactor_;
         pointPriority_.reset(new labelList(originalPointPriority_));
 
-        labelList origToCurrentPointMap(identity(newMesh.nPoints()));
+        labelList origToCurrentPointMap(identityMap(newMesh.nPoints()));
 
         {
             label nInnerIterations = 0;
@@ -1040,7 +1040,7 @@ Foam::label Foam::polyMeshFilter::filterEdges
         scalarField newMeshMinEdgeLen = minEdgeLen_;
         pointPriority_.reset(new labelList(originalPointPriority_));
 
-        labelList origToCurrentPointMap(identity(newMesh.nPoints()));
+        labelList origToCurrentPointMap(identityMap(newMesh.nPoints()));
 
         Info<< incrIndent;
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
index 2f5ea9bea1..b6a113ac8b 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -422,7 +422,7 @@ Foam::labelListList Foam::combineFaces::getMergeSets
     const scalar minConcaveCos
 ) const
 {
-    const labelHashSet patchIDs(identity(mesh_.boundaryMesh().size()));
+    const labelHashSet patchIDs(identityMap(mesh_.boundaryMesh().size()));
 
     return getMergeSets(featureCos, minConcaveCos, patchIDs);
 }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index d5a1e5fa61..3d6b586a76 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -815,7 +815,7 @@ void Foam::hexRef8::checkInternalOrientation
     const face& newFace
 )
 {
-    const face compactFace(identity(newFace.size()));
+    const face compactFace(identityMap(newFace.size()));
     const pointField compactPoints(meshMod.points(), newFace);
 
     const vector a(compactFace.area(compactPoints));
@@ -861,7 +861,7 @@ void Foam::hexRef8::checkBoundaryOrientation
     const face& newFace
 )
 {
-    const face compactFace(identity(newFace.size()));
+    const face compactFace(identityMap(newFace.size()));
     const pointField compactPoints(meshMod.points(), newFace);
 
     const vector a(compactFace.area(compactPoints));
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index 51a92fa3a0..143c4b10b1 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1928,7 +1928,7 @@ void Foam::polyTopoChange::reorderCoupledFaces
 {
     // Mapping for faces (old to new). Extends over all mesh faces for
     // convenience (could be just the external faces)
-    labelList oldToNew(identity(faces_.size()));
+    labelList oldToNew(identityMap(faces_.size()));
 
     // Rotation on new faces.
     labelList rotation(faces_.size(), 0);
@@ -2236,10 +2236,10 @@ Foam::polyTopoChange::polyTopoChange
     addMesh
     (
         mesh,
-        identity(mesh.boundaryMesh().size()),
-        identity(mesh.pointZones().size()),
-        identity(mesh.faceZones().size()),
-        identity(mesh.cellZones().size())
+        identityMap(mesh.boundaryMesh().size()),
+        identityMap(mesh.pointZones().size()),
+        identityMap(mesh.faceZones().size()),
+        identityMap(mesh.cellZones().size())
     );
 }
 
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 75cf4c9b8b..460fff896a 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -934,7 +934,7 @@ const Foam::surfaceLabelField::Boundary& Foam::fvMesh::polyFacesBf() const
         {
             const polyPatch& pp = boundaryMesh()[patchi];
             (*polyFacesBfPtr_)[patchi] =
-                labelList(identity(pp.size()) + pp.start());
+                labelList(identityMap(pp.size()) + pp.start());
         }
     }
 
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
index d625033fa3..d8ba0f1f94 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -475,7 +475,7 @@ Foam::singleCellFvMesh::singleCellFvMesh
 
     forAll(oldPatches, patchi)
     {
-        agglom[patchi] = identity(oldPatches[patchi].size());
+        agglom[patchi] = identityMap(oldPatches[patchi].size());
     }
 
     agglomerateMesh(mesh, agglom);
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
index 96a5e3e990..e167634a02 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,7 @@ tmp<VolField<Type>> singleCellFvMesh::interpolate
     {
         forAll(vf.boundaryField(), patchi)
         {
-            labelList map(identity(vf.boundaryField()[patchi].size()));
+            labelList map(identityMap(vf.boundaryField()[patchi].size()));
 
             bf.set
             (
diff --git a/src/finiteVolume/fvMeshToFvMesh/fvMeshToFvMeshTemplates.C b/src/finiteVolume/fvMeshToFvMesh/fvMeshToFvMeshTemplates.C
index 88029f84b5..eddcbd43ca 100644
--- a/src/finiteVolume/fvMeshToFvMesh/fvMeshToFvMeshTemplates.C
+++ b/src/finiteVolume/fvMeshToFvMesh/fvMeshToFvMeshTemplates.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ void Foam::fvMeshToFvMesh::mapSrcToTgt
 
         // Transfer all mapped quantities (value and e.g. gradient) onto
         // tgtField. Value will get overwritten below.
-        tgtField.rmap(tnewTgt(), identity(tgtField.size()));
+        tgtField.rmap(tnewTgt(), identityMap(tgtField.size()));
     }
 
     forAll(tgtCuttingPatchIDs(), i)
diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
index ea952a3506..e5f26048a2 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
@@ -192,7 +192,7 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::setPatchFaces()
 
     const fvPatch& fvp = mesh_.boundary()[patchId];
 
-    faceId_ = identity(fvp.size());
+    faceId_ = identityMap(fvp.size());
     facePatchId_ = labelList(fvp.size(), patchId);
     faceSign_ = labelList(fvp.size(), 1);
 
@@ -208,7 +208,7 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::setPatchFaces()
          && refCast<const processorCyclicFvPatch>(fvp).referPatchID() == patchId
         )
         {
-            faceId_.append(identity(fvp.size()));
+            faceId_.append(identityMap(fvp.size()));
             facePatchId_.append(labelList(fvp.size(), patchi));
             faceSign_.append(labelList(fvp.size(), 1));
         }
diff --git a/src/functionObjects/field/layerAverage/layerAverage.C b/src/functionObjects/field/layerAverage/layerAverage.C
index b907373ec6..6b5144e295 100644
--- a/src/functionObjects/field/layerAverage/layerAverage.C
+++ b/src/functionObjects/field/layerAverage/layerAverage.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -336,7 +336,7 @@ bool Foam::functionObjects::layerAverage::write()
             typeName,
             coordSet
             (
-                identity(layerCentre_.size()),
+                identityMap(layerCentre_.size()),
                 word::null,
                 layerCentre_,
                 coordSet::axisTypeNames_[coordSet::axisType::DISTANCE],
diff --git a/src/functionObjects/field/patchCutLayerAverage/patchCutLayerAverage.C b/src/functionObjects/field/patchCutLayerAverage/patchCutLayerAverage.C
index 10e6f897d1..60b7feb958 100644
--- a/src/functionObjects/field/patchCutLayerAverage/patchCutLayerAverage.C
+++ b/src/functionObjects/field/patchCutLayerAverage/patchCutLayerAverage.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -455,7 +455,7 @@ void Foam::functionObjects::patchCutLayerAverage::initialise()
     const scalar xMin = gMin(pointXs), xMax = gMax(pointXs);
     scalarField plotXs
     (
-        (xMin + scalarList(identity(nPlot))/(nPlot - 1)*(xMax - xMin))
+        (xMin + scalarList(identityMap(nPlot))/(nPlot - 1)*(xMax - xMin))
     );
 
     // Names and fields for debug output of the counts, to observe the effect
@@ -754,7 +754,7 @@ bool Foam::functionObjects::patchCutLayerAverage::write()
             typeName,
             coordSet
             (
-                identity(layerPositions_.size()),
+                identityMap(layerPositions_.size()),
                 word::null,
                 layerPositions_,
                 coordSet::axisTypeNames_[coordSet::axisType::DISTANCE],
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
index b9b5844dc8..91a4900674 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -208,7 +208,7 @@ Foam::pairPatchAgglomeration::pairPatchAgglomeration
     ),
     nFaces_(maxLevels_),
     restrictAddressing_(maxLevels_),
-    restrictTopBottomAddressing_(identity(patch.size())),
+    restrictTopBottomAddressing_(identityMap(patch.size())),
     patchLevels_(maxLevels_),
     facePairWeight_(patch.size())
 {
diff --git a/src/fvMeshStitchers/moving/fvMeshStitchersMoving.C b/src/fvMeshStitchers/moving/fvMeshStitchersMoving.C
index 51590dd200..e1b7d12fa5 100644
--- a/src/fvMeshStitchers/moving/fvMeshStitchersMoving.C
+++ b/src/fvMeshStitchers/moving/fvMeshStitchersMoving.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -184,7 +184,7 @@ void Foam::fvMeshStitchers::moving::createNonConformalCorrectMeshPhiGeometry
         const label errorPatchi = errorPatchIDs[i];
 
         polyFacesBf[errorPatchi] =
-            repeat((identity(origPp.size()) + origPp.start())());
+            repeat((identityMap(origPp.size()) + origPp.start())());
 
         SfSf.boundaryFieldRef()[errorPatchi] =
             repeat
diff --git a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C b/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C
index 4dd1a656fb..caad76129d 100644
--- a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C
@@ -181,7 +181,7 @@ void Foam::fv::rotorDiskSource::setFaceArea(vector& axis, const bool correct)
     // Calculate cell addressing for selected cells
     labelList cellAddr(mesh().nCells(), -1);
     UIndirectList<label>(cellAddr, set_.cells()) =
-        identity(set_.cells().size());
+        identityMap(set_.cells().size());
     labelList nbrFaceCellAddr(mesh().nFaces() - nInternalFaces, -1);
     forAll(pbm, patchi)
     {
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.C b/src/lagrangian/basic/InteractionLists/InteractionLists.C
index 3b4f1062cf..8f28779162 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.C
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -322,7 +322,7 @@ void Foam::InteractionLists<ParticleType>::buildInteractionLists()
 
         if (isA<wallPolyPatch>(patch))
         {
-            localWallFaces.append(identity(patch.size()) + patch.start());
+            localWallFaces.append(identityMap(patch.size()) + patch.start());
         }
     }
 
@@ -550,7 +550,7 @@ void Foam::InteractionLists<ParticleType>::buildInteractionLists()
 
         referredWallFaces_[rWFI] = referredWallFace
         (
-            face(identity(f.size())),
+            face(identityMap(f.size())),
             transform.invTransformPosition(f.points(mesh_.points())),
             patchi
         );
@@ -874,7 +874,7 @@ void Foam::InteractionLists<ParticleType>::buildMap
     labelListList constructMap(Pstream::nProcs());
 
     // Local transfers first
-    constructMap[Pstream::myProcNo()] = identity
+    constructMap[Pstream::myProcNo()] = identityMap
     (
         sendMap[Pstream::myProcNo()].size()
     );
diff --git a/src/lagrangian/parcel/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/parcel/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index e0f22e7a47..668d8e251c 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-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,7 +136,7 @@ void Foam::ParticleCollector<CloudType>::initPolygons
     forAll(faces_, facei)
     {
         const Field<point>& polyPoints = polygons[facei];
-        face f(identity(polyPoints.size()) + pointOffset);
+        face f(identityMap(polyPoints.size()) + pointOffset);
         UIndirectList<point>(points_, f) = polyPoints;
         area_[facei] = f.mag(points_);
         faces_[facei].transfer(f);
@@ -199,7 +199,7 @@ void Foam::ParticleCollector<CloudType>::initConcentricCircles()
         false
     );
 
-    List<label> ptIDs(identity(nPointPerRadius));
+    List<label> ptIDs(identityMap(nPointPerRadius));
 
     points_[0] = origin;
 
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
index f4c6326f86..91a1707670 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ void Foam::displacementMeshMoverMotionSolver::solve()
     pointDisplacement().boundaryFieldRef().updateCoeffs();
 
     label nAllowableErrors = 0;
-    labelList checkFaces(identity(mesh().nFaces()));
+    labelList checkFaces(identityMap(mesh().nFaces()));
     meshMover().move
     (
         coeffDict().optionalSubDict(meshMover().type() + "Coeffs"),
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
index 0dd66d904f..e7830fca6f 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -225,7 +225,7 @@ void Foam::medialAxisMeshMover::smoothNormals
 
 
     // Correspondence between local edges/points and mesh edges/points
-    const labelList meshPoints(identity(mesh().nPoints()));
+    const labelList meshPoints(identityMap(mesh().nPoints()));
 
     // Calculate inverse sum of weights
 
@@ -1435,7 +1435,7 @@ void Foam::medialAxisMeshMover::smoothLambdaMuDisplacement
     const edgeList& edges = mesh().edges();
 
     // Correspondence between local edges/points and mesh edges/points
-    const labelList meshPoints(identity(mesh().nPoints()));
+    const labelList meshPoints(identityMap(mesh().nPoints()));
 
     // Calculate inverse sum of weights
     scalarField edgeWeights(mesh().nEdges());
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index ae464fbed6..eadeef0bb8 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -576,7 +576,7 @@ void Foam::meshRefinement::checkData()
         localPointRegion::findDuplicateFaces
         (
             mesh_,
-            identity(mesh_.nFaces() - mesh_.nInternalFaces())
+            identityMap(mesh_.nFaces() - mesh_.nInternalFaces())
           + mesh_.nInternalFaces()
         )
     );
@@ -1204,7 +1204,7 @@ Foam::meshRefinement::meshRefinement
     );
 
     // recalculate intersections for all faces
-    updateIntersections(identity(mesh_.nFaces()));
+    updateIntersections(identityMap(mesh_.nFaces()));
 }
 
 
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index a403f697e7..2ba8728322 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -761,7 +761,7 @@ Foam::List<Foam::labelPair> Foam::meshRefinement::freeStandingBaffles
 
         surfaces_.findNearestIntersection
         (
-            identity(surfaces_.surfaces().size()),
+            identityMap(surfaces_.surfaces().size()),
             start,
             end,
 
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
index 452d94d36e..e942f3490b 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
@@ -86,7 +86,7 @@ void Foam::meshRefinement::findNearest
         fc[i] = mesh_.faceCentres()[meshFaces[i]];
     }
 
-    const labelList allSurfaces(identity(surfaces_.surfaces().size()));
+    const labelList allSurfaces(identityMap(surfaces_.surfaces().size()));
 
     surfaces_.findNearest
     (
@@ -1172,7 +1172,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
             // Just check the errors from squashing
             // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-            const labelList allFaces(identity(mesh_.nFaces()));
+            const labelList allFaces(identityMap(mesh_.nFaces()));
             label nWrongFaces = 0;
 
             // const scalar minV(motionDict.lookup<scalar>("minVol", true));
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
index 4e4946c8b9..5c0ec2d8f7 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -165,7 +165,7 @@ void Foam::meshRefinement::collectAndPrint
     globalPoints.gather
     (
         Pstream::worldComm,
-        identity(Pstream::nProcs()),
+        identityMap(Pstream::nProcs()),
         points,
         allPoints,
         UPstream::msgType(),
@@ -176,7 +176,7 @@ void Foam::meshRefinement::collectAndPrint
     globalPoints.gather
     (
         Pstream::worldComm,
-        identity(Pstream::nProcs()),
+        identityMap(Pstream::nProcs()),
         data,
         allData,
         UPstream::msgType(),
diff --git a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
index 60289d992b..08f5d08f5f 100644
--- a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
+++ b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -172,7 +172,7 @@ void Foam::refinementFeatures::read
                 labelListList(0),   // edgeNormals
                 labelListList(0),   // featurePointNormals
                 labelListList(0),   // featurePointEdges
-                identity(newEdges.size())   // regionEdges
+                identityMap(newEdges.size())   // regionEdges
             );
 
             // Info<< "Constructed extendedFeatureEdgeMesh " << featObj.name()
@@ -268,7 +268,7 @@ void Foam::refinementFeatures::buildTrees(const label feati)
                 false,                  // do not cache bb
                 edges,
                 points,
-                identity(edges.size())
+                identityMap(edges.size())
             ),
             bb,     // overall search domain
             8,      // maxLevel
@@ -278,7 +278,7 @@ void Foam::refinementFeatures::buildTrees(const label feati)
     );
 
 
-    labelList featurePoints(identity(eMesh.nonFeatureStart()));
+    labelList featurePoints(identityMap(eMesh.nonFeatureStart()));
 
     pointTrees_.set
     (
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
index d4f8c68380..5e4cc83b5e 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -482,7 +482,7 @@ void Foam::refinementSurfaces::findHigherIntersection
     // Work arrays
     pointField p0(start);
     pointField p1(end);
-    labelList intersectionToPoint(identity(start.size()));
+    labelList intersectionToPoint(identityMap(start.size()));
     List<pointIndexHit> intersectionInfo(start.size());
 
     forAll(surfaces_, surfi)
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index 77eff3e7db..38858868b7 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -2261,7 +2261,7 @@ Foam::label Foam::snappyLayerDriver::checkAndUnmark
         false,
         newMesh,
         meshQualityDict,
-        identity(newMesh.nFaces()),
+        identityMap(newMesh.nFaces()),
         baffles,
         wrongFaces
     );
@@ -3209,7 +3209,7 @@ void Foam::snappyLayerDriver::addLayers
                 // Where to get minThickness from
                 combinedDict.add("minThicknessName", minThickness.name());
 
-                labelList checkFaces(identity(mesh.nFaces()));
+                labelList checkFaces(identityMap(mesh.nFaces()));
                 medialAxisMoverPtr().move
                 (
                     combinedDict,
@@ -3368,8 +3368,8 @@ void Foam::snappyLayerDriver::addLayers
             addLayer.topoChange
             (
                 map,
-                identity(pp().size()),
-                identity(pp().nPoints())
+                identityMap(pp().size()),
+                identityMap(pp().nPoints())
             );
 
             // Update numbering of baffles
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
index 953219070e..2e71a918ea 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -368,8 +368,8 @@ void Foam::snappyLayerDriver::smoothNormals
 
 
     // Correspondence between local edges/points and mesh edges/points
-    const labelList meshEdges(identity(mesh.nEdges()));
-    const labelList meshPoints(identity(mesh.nPoints()));
+    const labelList meshEdges(identityMap(mesh.nEdges()));
+    const labelList meshPoints(identityMap(mesh.nPoints()));
 
     // Calculate inverse sum of weights
 
@@ -1633,8 +1633,8 @@ void Foam::snappyLayerDriver::shrinkMeshMedialDistance
         sumWeights
         (
             isMasterEdge,
-            identity(mesh.nEdges()),
-            identity(mesh.nPoints()),
+            identityMap(mesh.nEdges()),
+            identityMap(mesh.nPoints()),
             mesh.edges(),
             invSumWeight
         );
@@ -1654,8 +1654,8 @@ void Foam::snappyLayerDriver::shrinkMeshMedialDistance
             (
                 mesh,
                 isMasterEdge,
-                identity(mesh.nEdges()),    // meshEdges,
-                identity(mesh.nPoints()),   // meshPoints,
+                identityMap(mesh.nEdges()),    // meshEdges,
+                identityMap(mesh.nPoints()),   // meshPoints,
                 mesh.edges(),               // edges,
                 invSumWeight,
                 displacement,
@@ -1678,8 +1678,8 @@ void Foam::snappyLayerDriver::shrinkMeshMedialDistance
             (
                 mesh,
                 isMasterEdge,
-                identity(mesh.nEdges()),    // meshEdges,
-                identity(mesh.nPoints()),   // meshPoints,
+                identityMap(mesh.nEdges()),    // meshEdges,
+                identityMap(mesh.nPoints()),   // meshPoints,
                 mesh.edges(),               // edges,
                 invSumWeight,
                 displacement,
@@ -1791,7 +1791,7 @@ void Foam::snappyLayerDriver::shrinkMeshMedialDistance
 
 
     // Current faces to check. Gets modified in meshMover.scaleMesh
-    labelList checkFaces(identity(mesh.nFaces()));
+    labelList checkFaces(identityMap(mesh.nFaces()));
 
     Info<< "shrinkMeshMedialDistance : Moving mesh ..." << endl;
     scalar oldErrorReduction = -1;
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
index bf7e26368b..76ba8bed37 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1781,7 +1781,7 @@ bool Foam::snappySnapDriver::scaleMesh
 
     // Relax displacement until correct mesh
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    labelList checkFaces(identity(mesh.nFaces()));
+    labelList checkFaces(identityMap(mesh.nFaces()));
 
     scalar oldErrorReduction = -1;
 
diff --git a/src/meshTools/cutPoly/cutPoly.C b/src/meshTools/cutPoly/cutPoly.C
index 60d2a7d254..d1397bcec0 100644
--- a/src/meshTools/cutPoly/cutPoly.C
+++ b/src/meshTools/cutPoly/cutPoly.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -306,7 +306,7 @@ void Foam::cutPoly::writeCellCuts
             cutPs[i] = edgeCutValue(e, pAlphas, isoAlpha, ps);
         }
 
-        obj.write(face(identity(cCuts[cuti].size())), cutPs, false);
+        obj.write(face(identityMap(cCuts[cuti].size())), cutPs, false);
     }
 }
 
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
index faee3cf244..f18cc2065b 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-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -401,7 +401,7 @@ Foam::extendedEdgeMesh::extendedEdgeMesh
     const labelList& featurePoints = sFeat.featurePoints();
 
     // Get a labelList of all the featureEdges that are region edges
-    const labelList regionFeatureEdges(identity(sFeat.nRegionEdges()));
+    const labelList regionFeatureEdges(identityMap(sFeat.nRegionEdges()));
 
     sortPointsAndEdges
     (
@@ -854,7 +854,7 @@ Foam::extendedEdgeMesh::pointTree() const
         // geometry there are less face/edge aligned items.
         treeBoundBox bb(treeBoundBox(points()).extend(1e-4));
 
-        const labelList featurePointLabels = identity(nonFeatureStart_);
+        const labelList featurePointLabels = identityMap(nonFeatureStart_);
 
         pointTree_.reset
         (
@@ -886,7 +886,7 @@ Foam::extendedEdgeMesh::edgeTree() const
         // geometry there are less face/edge aligned items.
         treeBoundBox bb(treeBoundBox(points()).extend(1e-4));
 
-        labelList allEdges(identity(edges().size()));
+        labelList allEdges(identityMap(edges().size()));
 
         edgeTree_.reset
         (
@@ -926,20 +926,21 @@ Foam::extendedEdgeMesh::edgeTreesByType() const
 
         // External edges
         sliceEdges[0] =
-            identity(internalStart_ - externalStart_) + externalStart_;
+            identityMap(internalStart_ - externalStart_) + externalStart_;
 
         // Internal edges
-        sliceEdges[1] = identity(flatStart_ - internalStart_) + internalStart_;
+        sliceEdges[1] =
+            identityMap(flatStart_ - internalStart_) + internalStart_;
 
         // Flat edges
-        sliceEdges[2] = identity(openStart_ - flatStart_) + flatStart_;
+        sliceEdges[2] = identityMap(openStart_ - flatStart_) + flatStart_;
 
         // Open edges
-        sliceEdges[3] = identity(multipleStart_ - openStart_) + openStart_;
+        sliceEdges[3] = identityMap(multipleStart_ - openStart_) + openStart_;
 
         // Multiple edges
         sliceEdges[4] =
-            identity(edges().size() - multipleStart_) + multipleStart_;
+            identityMap(edges().size() - multipleStart_) + multipleStart_;
 
         forAll(edgeTreesByType_, i)
         {
@@ -1271,7 +1272,7 @@ void Foam::extendedEdgeMesh::flipNormals()
     // ~~~~~~
 
     // From current points into new points
-    labelList reversePointMap(identity(points().size()));
+    labelList reversePointMap(identityMap(points().size()));
 
     // Flip convex and concave points
 
@@ -1293,7 +1294,7 @@ void Foam::extendedEdgeMesh::flipNormals()
     // ~~~~~~
 
     // From current edges into new edges
-    labelList reverseEdgeMap(identity(edges().size()));
+    labelList reverseEdgeMap(identityMap(edges().size()));
 
     // Flip external and internal edges
 
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
index 4475f37f58..b5a2dcac2b 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -344,7 +344,7 @@ void Foam::extendedEdgeMesh::sortPointsAndEdges
     // Creating the ptMap from the ftPtMap with identity values up to the size
     // of pts to create an oldToNew map for inplaceReorder
 
-    labelList ptMap(identity(pts.size()));
+    labelList ptMap(identityMap(pts.size()));
 
     forAll(ftPtMap, i)
     {
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
index b9781e7bd0..dd1a374afd 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -344,7 +344,7 @@ void Foam::extendedFeatureEdgeMesh::sortPointsAndEdges
     // Creating the ptMap from the ftPtMap with identity values up to the size
     // of pts to create an oldToNew map for inplaceReorder
 
-    labelList ptMap(identity(pts.size()));
+    labelList ptMap(identityMap(pts.size()));
 
     forAll(ftPtMap, i)
     {
diff --git a/src/meshTools/indexedOctree/treeDataFace.C b/src/meshTools/indexedOctree/treeDataFace.C
index 55bea54261..d3be7921a0 100644
--- a/src/meshTools/indexedOctree/treeDataFace.C
+++ b/src/meshTools/indexedOctree/treeDataFace.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,7 +118,7 @@ Foam::treeDataFace::treeDataFace
 )
 :
     mesh_(mesh),
-    faceLabels_(identity(mesh_.nFaces())),
+    faceLabels_(identityMap(mesh_.nFaces())),
     isTreeFace_(mesh.nFaces(), 0),
     cacheBb_(cacheBb)
 {
@@ -135,7 +135,7 @@ Foam::treeDataFace::treeDataFace
     mesh_(patch.boundaryMesh().mesh()),
     faceLabels_
     (
-        identity(patch.size())
+        identityMap(patch.size())
       + patch.start()
     ),
     isTreeFace_(mesh_.nFaces(), 0),
diff --git a/src/meshTools/mappedPatches/mappedPatchBase/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPatchBase/mappedPatchBase.C
index a0f2177e99..b3755e570d 100644
--- a/src/meshTools/mappedPatches/mappedPatchBase/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPatchBase/mappedPatchBase.C
@@ -154,7 +154,7 @@ void Foam::mappedPatchBase::calcMapping() const
             {
                 const polyPatch& pp = nbrPolyPatch();
 
-                const labelList patchFaces(identity(pp.size()) + pp.start());
+                const labelList patchFaces(identityMap(pp.size()) + pp.start());
 
                 const treeBoundBox patchBb
                 (
diff --git a/src/meshTools/meshToMesh/meshToMeshParallelOps.C b/src/meshTools/meshToMesh/meshToMeshParallelOps.C
index b40514be81..c08eac53b0 100644
--- a/src/meshTools/meshToMesh/meshToMeshParallelOps.C
+++ b/src/meshTools/meshToMesh/meshToMeshParallelOps.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -673,7 +673,7 @@ void Foam::meshToMesh::trimLocalTgt()
         oldLocalTgtMesh.faceNeighbour();
 
     // ...
-    labelList newToOldLocalTgtFace(identity(oldLocalTgtMesh.nFaces()));
+    labelList newToOldLocalTgtFace(identityMap(oldLocalTgtMesh.nFaces()));
     labelList oldToNewLocalTgtFace;
     {
         label i0 = 0;
diff --git a/src/meshTools/nonConformalBoundary/nonConformalBoundary.C b/src/meshTools/nonConformalBoundary/nonConformalBoundary.C
index bccc9bc9f7..f5768ba3a9 100644
--- a/src/meshTools/nonConformalBoundary/nonConformalBoundary.C
+++ b/src/meshTools/nonConformalBoundary/nonConformalBoundary.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ Foam::nonConformalBoundary::boundary(const labelList& patches) const
     {
         const polyPatch& pp = mesh().boundaryMesh()[patches[i]];
 
-        faces.append(identity(pp.size()) + pp.start());
+        faces.append(identityMap(pp.size()) + pp.start());
     }
 
     return
diff --git a/src/meshTools/patchDist/wallFace/wallFaceI.H b/src/meshTools/patchDist/wallFace/wallFaceI.H
index ba4b9834a7..08428b114a 100644
--- a/src/meshTools/patchDist/wallFace/wallFaceI.H
+++ b/src/meshTools/patchDist/wallFace/wallFaceI.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ inline bool Foam::WallFaceBase<Derived>::update
     const scalar dist2 =
         sqr
         (
-            face(identity(w2.points().size()))
+            face(identityMap(w2.points().size()))
            .nearestPoint(pt, w2.points())
            .distance()
         );
diff --git a/src/meshTools/patchToPatch/intersection/intersectionPatchToPatch.C b/src/meshTools/patchToPatch/intersection/intersectionPatchToPatch.C
index 922f3acaaf..5812d9ca72 100644
--- a/src/meshTools/patchToPatch/intersection/intersectionPatchToPatch.C
+++ b/src/meshTools/patchToPatch/intersection/intersectionPatchToPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -297,14 +297,14 @@ bool Foam::patchToPatches::intersection::intersectFaces
                 debugPoints_.append(ictTgtPoints_);
                 debugFaces_.append
                 (
-                    debugSrcPoint0 + identity(ictSrcPoints_.size())
+                    debugSrcPoint0 + identityMap(ictSrcPoints_.size())
                 );
                 debugFaceSrcFaces_.append(srcFacei);
                 debugFaceTgtFaces_.append(tgtFacei);
                 debugFaceSides_.append(1);
                 debugFaces_.append
                 (
-                    debugTgtPoint0 + identity(ictTgtPoints_.size())
+                    debugTgtPoint0 + identityMap(ictTgtPoints_.size())
                 );
                 debugFaceSrcFaces_.append(srcFacei);
                 debugFaceTgtFaces_.append(tgtFacei);
diff --git a/src/meshTools/patchToPatch/rays/raysPatchToPatch.C b/src/meshTools/patchToPatch/rays/raysPatchToPatch.C
index 70a6c9cc7c..6fe7b3e9e5 100644
--- a/src/meshTools/patchToPatch/rays/raysPatchToPatch.C
+++ b/src/meshTools/patchToPatch/rays/raysPatchToPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -213,7 +213,7 @@ Foam::remote Foam::patchToPatches::rays::ray
         );
 
         const pointHit ray =
-            face(identity(outPoly.size()))
+            face(identityMap(outPoly.size()))
            .ray(inP, inN, outPoly, Foam::intersection::algorithm::visible);
 
         if (ray.hit())
diff --git a/src/meshTools/regionSplit/localPointRegion.C b/src/meshTools/regionSplit/localPointRegion.C
index 888bf9962a..c84cf7b962 100644
--- a/src/meshTools/regionSplit/localPointRegion.C
+++ b/src/meshTools/regionSplit/localPointRegion.C
@@ -587,7 +587,7 @@ Foam::List<Foam::labelPair> Foam::localPointRegion::findDuplicateFacePairs
     // Faces to test: all boundary faces
     labelList testFaces
     (
-        identity(mesh.nFaces()-mesh.nInternalFaces())
+        identityMap(mesh.nFaces()-mesh.nInternalFaces())
       + mesh.nInternalFaces()
     );
 
diff --git a/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C b/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C
index cd47d4dc3a..22b10fd5ed 100644
--- a/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C
+++ b/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ Foam::searchableExtrudedCircle::searchableExtrudedCircle
                 false,                  // do not cache bb
                 edges,
                 points,
-                identity(edges.size())
+                identityMap(edges.size())
             ),
             bb,     // overall search domain
             8,      // maxLevel
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.C b/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.C
index e3981aa167..7a289bced1 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.C
+++ b/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ Foam::searchableSurfaces::searchableSurfaces(const label size)
 :
     PtrList<searchableSurface>(size),
     regionNames_(size),
-    allSurfaces_(identity(size))
+    allSurfaces_(identityMap(size))
 {}
 
 
@@ -83,7 +83,7 @@ Foam::searchableSurfaces::searchableSurfaces(const label size)
 //:
 //    PtrList<searchableSurface>(dicts.size()),
 //    regionNames_(dicts.size()),
-//    allSurfaces_(identity(dicts.size()))
+//    allSurfaces_(identityMap(dicts.size()))
 //{
 //    forAll(dicts, surfI)
 //    {
@@ -177,7 +177,7 @@ Foam::searchableSurfaces::searchableSurfaces
     PtrList<searchableSurface>(topDict.size()),
     names_(topDict.size()),
     regionNames_(topDict.size()),
-    allSurfaces_(identity(topDict.size()))
+    allSurfaces_(identityMap(topDict.size()))
 {
     label surfI = 0;
     forAllConstIter(dictionary, topDict, iter)
@@ -681,7 +681,7 @@ bool Foam::searchableSurfaces::checkIntersection
                             names()[i] + '_' + names()[j],
                             false,
                             intersections,
-                            identity(intersections.size()),
+                            identityMap(intersections.size()),
                             edgeList(),
                             faceList(),
                             "edgeIndex",
diff --git a/src/meshTools/searchableSurfaces/searchableSurfacesQueries/searchableSurfacesQueries.C b/src/meshTools/searchableSurfaces/searchableSurfacesQueries/searchableSurfacesQueries.C
index aeebd41cd0..5aab6f9f94 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfacesQueries/searchableSurfacesQueries.C
+++ b/src/meshTools/searchableSurfaces/searchableSurfacesQueries/searchableSurfacesQueries.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,7 +130,7 @@ void Foam::searchableSurfacesQueries::findAnyIntersection
     hitInfo.setSize(start.size());
 
     // Work arrays
-    labelList hitMap(identity(start.size()));
+    labelList hitMap(identityMap(start.size()));
     pointField p0(start);
     pointField p1(end);
     List<pointIndexHit> intersectInfo(start.size());
diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
index 83cb1d3f63..2017469529 100644
--- a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -536,7 +536,7 @@ Foam::triSurfaceMesh::edgeTree() const
         // Boundary edges
         labelList bEdges
         (
-            identity
+            identityMap
             (
                 nEdges()
                -nInternalEdges()
diff --git a/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.C b/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.C
index c26b6d1c62..0d9db686b5 100644
--- a/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.C
+++ b/src/meshTools/sets/faceZoneSources/planeToFaceZone/planeToFaceZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -141,7 +141,7 @@ void Foam::planeToFaceZone::combine(faceZoneSet& fzSet, const bool add) const
 
         // Step 2: Create a region map which combines regions which are
         // connected across coupled interfaces
-        labelList regionMap(identity(nRegions));
+        labelList regionMap(identityMap(nRegions));
         {
             // Put region labels on connected boundary edges and synchronise to
             // create a list of all regions connected to a given edge
diff --git a/src/meshTools/sets/polyCellSet/polyCellSet.C b/src/meshTools/sets/polyCellSet/polyCellSet.C
index 5488f3020a..21f0ee26ca 100644
--- a/src/meshTools/sets/polyCellSet/polyCellSet.C
+++ b/src/meshTools/sets/polyCellSet/polyCellSet.C
@@ -112,7 +112,7 @@ void Foam::polyCellSet::setCells()
         case selectionTypes::all:
         {
             Info<< indent << "- selecting all cells" << endl;
-            cells_ = identity(mesh_.nCells());
+            cells_ = identityMap(mesh_.nCells());
 
             break;
         }
diff --git a/src/meshTools/triIntersect/triIntersectTemplates.C b/src/meshTools/triIntersect/triIntersectTemplates.C
index c3cf70fa7f..f89716b157 100644
--- a/src/meshTools/triIntersect/triIntersectTemplates.C
+++ b/src/meshTools/triIntersect/triIntersectTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ void Foam::triIntersect::writePolygon
         ps,
         labelList(),
         labelListList(),
-        labelListList(1, identity(ps.size()))
+        labelListList(1, identityMap(ps.size()))
     );
 }
 
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index 93243b7707..6dcf4043d4 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1432,7 +1432,7 @@ void Foam::surfaceFeatures::nearestFeatEdge
             false,
             edges,
             points,
-            identity(edges.size())
+            identityMap(edges.size())
         ),          // all information needed to do geometric checks
         searchDomain,  // overall search domain
         8,      // maxLevel
diff --git a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
index 0235e556d3..fa4e440f39 100644
--- a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -379,10 +379,10 @@ Foam::labelList Foam::multiLevelDecomp::decompose
 )
 {
     CompactListList<label> cellCells;
-    calcCellCells(mesh, identity(cc.size()), cc.size(), true, cellCells);
+    calcCellCells(mesh, identityMap(cc.size()), cc.size(), true, cellCells);
 
     labelField finalDecomp(cc.size(), 0);
-    labelList cellMap(identity(cc.size()));
+    labelList cellMap(identityMap(cc.size()));
 
     decompose
     (
@@ -407,7 +407,7 @@ Foam::labelList Foam::multiLevelDecomp::decompose
 )
 {
     labelField finalDecomp(points.size(), 0);
-    labelList pointMap(identity(points.size()));
+    labelList pointMap(identityMap(points.size()));
 
     decompose
     (
diff --git a/src/parallel/decompose/metisDecomp/metisDecomp.C b/src/parallel/decompose/metisDecomp/metisDecomp.C
index 91cd29b338..748968c04b 100644
--- a/src/parallel/decompose/metisDecomp/metisDecomp.C
+++ b/src/parallel/decompose/metisDecomp/metisDecomp.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -241,7 +241,7 @@ Foam::labelList Foam::metisDecomp::decompose
     calcCellCells
     (
         mesh,
-        identity(mesh.nCells()),
+        identityMap(mesh.nCells()),
         mesh.nCells(),
         false,
         cellCells
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
index e4c0c80cf8..87ff04a668 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -677,7 +677,7 @@ Foam::labelList Foam::ptscotchDecomp::decompose
     calcCellCells
     (
         mesh,
-        identity(mesh.nCells()),
+        identityMap(mesh.nCells()),
         mesh.nCells(),
         true,
         cellCells
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.C b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
index f9a30390cd..cb8145d5c3 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.C
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -478,7 +478,7 @@ Foam::labelList Foam::scotchDecomp::decompose
     calcCellCells
     (
         mesh,
-        identity(mesh.nCells()),
+        identityMap(mesh.nCells()),
         mesh.nCells(),
         true,
         cellCells
diff --git a/src/parallel/decompose/zoltanDecomp/zoltanDecomp.C b/src/parallel/decompose/zoltanDecomp/zoltanDecomp.C
index d5979c3ed2..e4ca15288e 100644
--- a/src/parallel/decompose/zoltanDecomp/zoltanDecomp.C
+++ b/src/parallel/decompose/zoltanDecomp/zoltanDecomp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -445,7 +445,7 @@ Foam::labelList Foam::zoltanDecomp::decompose
     calcCellCells
     (
         mesh,
-        identity(mesh.nCells()),
+        identityMap(mesh.nCells()),
         mesh.nCells(),
         true,
         cellCells
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 3c12b5516b..3da7727c8f 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-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -321,7 +321,7 @@ Foam::distributedTriSurfaceMesh::distributeSegments
     labelListList constructMap(Pstream::nProcs());
 
     // My local segments first
-    constructMap[Pstream::myProcNo()] = identity
+    constructMap[Pstream::myProcNo()] = identityMap
     (
         sendMap[Pstream::myProcNo()].size()
     );
@@ -610,7 +610,7 @@ Foam::distributedTriSurfaceMesh::calcLocalQueries
     labelListList constructMap(Pstream::nProcs());
 
     // My local segments first
-    constructMap[Pstream::myProcNo()] = identity
+    constructMap[Pstream::myProcNo()] = identityMap
     (
         sendMap[Pstream::myProcNo()].size()
     );
@@ -767,7 +767,7 @@ Foam::distributedTriSurfaceMesh::calcLocalQueries
     labelListList constructMap(Pstream::nProcs());
 
     // My local segments first
-    constructMap[Pstream::myProcNo()] = identity
+    constructMap[Pstream::myProcNo()] = identityMap
     (
         sendMap[Pstream::myProcNo()].size()
     );
@@ -2203,11 +2203,11 @@ void Foam::distributedTriSurfaceMesh::distribute
         allTris = subSurface;
         allPoints = subSurface.points();
 
-        faceConstructMap[Pstream::myProcNo()] = identity
+        faceConstructMap[Pstream::myProcNo()] = identityMap
         (
             faceSendMap[Pstream::myProcNo()].size()
         );
-        pointConstructMap[Pstream::myProcNo()] = identity
+        pointConstructMap[Pstream::myProcNo()] = identityMap
         (
             pointSendMap[Pstream::myProcNo()].size()
         );
diff --git a/src/parallel/parallel/domainDecompositionReconstruct.C b/src/parallel/parallel/domainDecompositionReconstruct.C
index 1febcd068b..2a478e9a01 100644
--- a/src/parallel/parallel/domainDecompositionReconstruct.C
+++ b/src/parallel/parallel/domainDecompositionReconstruct.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -170,9 +170,10 @@ void Foam::domainDecomposition::reconstruct()
         masterMesh.setPointsInstance(procMeshes()[0].pointsInstance());
 
         // Initialise the addressing
-        procPointAddressing_[proci] = identity(procMeshes()[proci].nPoints());
-        procFaceAddressing_[proci] = identity(procMeshes()[proci].nFaces());
-        procCellAddressing_[proci] = identity(procMeshes()[proci].nCells());
+        procPointAddressing_[proci] =
+            identityMap(procMeshes()[proci].nPoints());
+        procFaceAddressing_[proci] = identityMap(procMeshes()[proci].nFaces());
+        procCellAddressing_[proci] = identityMap(procMeshes()[proci].nCells());
 
         // Find shared points and faces
         autoPtr<faceCoupleInfo> couples = determineCoupledFaces
@@ -362,7 +363,7 @@ void Foam::domainDecomposition::reconstruct()
         labelList newPatchStarts(patches.size());
         labelList newToOldFace(masterMeshes[0].nFaces());
         SubList<label>(newToOldFace, masterMeshes[0].nInternalFaces()) =
-            identity(masterMeshes[0].nInternalFaces());
+            identityMap(masterMeshes[0].nInternalFaces());
         forAll(patches, patchi)
         {
             newPatchSizes[patchi] = 0;
@@ -380,7 +381,7 @@ void Foam::domainDecomposition::reconstruct()
                     newToOldFace,
                     pp.size(),
                     newPatchStarts[patchi] + newPatchSizes[patchi]
-                ) = pp.start() + identity(pp.size());
+                ) = pp.start() + identityMap(pp.size());
 
                 newPatchSizes[patchi] += pp.size();
             }
diff --git a/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.C b/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.C
index 903ff7c39a..350598a443 100644
--- a/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.C
+++ b/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,7 @@ Foam::labelList Foam::CuthillMcKeeRenumber::renumber
     decompositionMethod::calcCellCells
     (
         mesh,
-        identity(mesh.nCells()),
+        identityMap(mesh.nCells()),
         mesh.nCells(),
         false,                      // local only
         cellCells
diff --git a/src/renumber/renumberMethods/randomRenumber/randomRenumber.C b/src/renumber/renumberMethods/randomRenumber/randomRenumber.C
index e66af4b718..86c1bfa047 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-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ Foam::labelList Foam::randomRenumber::renumber
 {
     Random rndGen(0);
 
-    labelList newToOld(identity(points.size()));
+    labelList newToOld(identityMap(points.size()));
 
     for (label iter = 0; iter < 10; iter++)
     {
diff --git a/src/renumber/renumberMethods/renumberMethod/renumberMethod.C b/src/renumber/renumberMethods/renumberMethod/renumberMethod.C
index e7cd74e42d..373e19708c 100644
--- a/src/renumber/renumberMethods/renumberMethod/renumberMethod.C
+++ b/src/renumber/renumberMethods/renumberMethod/renumberMethod.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ Foam::labelList Foam::renumberMethod::renumber
     decompositionMethod::calcCellCells
     (
         mesh,
-        identity(mesh.nCells()),
+        identityMap(mesh.nCells()),
         mesh.nCells(),
         false,                      // local only
         cellCells
diff --git a/src/renumber/renumberMethods/springRenumber/springRenumber.C b/src/renumber/renumberMethods/springRenumber/springRenumber.C
index cc6972bb5f..a35664c495 100644
--- a/src/renumber/renumberMethods/springRenumber/springRenumber.C
+++ b/src/renumber/renumberMethods/springRenumber/springRenumber.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ Foam::labelList Foam::springRenumber::renumber
     decompositionMethod::calcCellCells
     (
         mesh,
-        identity(mesh.nCells()),
+        identityMap(mesh.nCells()),
         mesh.nCells(),
         false,                      // local only
         cellCells
@@ -91,7 +91,7 @@ Foam::labelList Foam::springRenumber::renumber
         position[celli] = celli;
     }
 
-    labelList oldToNew(identity(cellCells.size()));
+    labelList oldToNew(identityMap(cellCells.size()));
 
     scalar maxCo = maxCo_ * cellCells.size();
 
diff --git a/src/sampling/coordSet/coordSet.C b/src/sampling/coordSet/coordSet.C
index 60bca36ec6..ce3e432909 100644
--- a/src/sampling/coordSet/coordSet.C
+++ b/src/sampling/coordSet/coordSet.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,7 @@ Foam::coordSet::coordSet
     (
         contiguous
       ? labelList(positions.size(), 0)
-      : identity(positions.size()),
+      : identityMap(positions.size()),
         positionName,
         positions,
         word::null,
@@ -123,7 +123,7 @@ Foam::coordSet::coordSet
     (
         contiguous
       ? labelList(distances.size(), 0)
-      : identity(distances.size()),
+      : identityMap(distances.size()),
         word::null,
         pointField::null(),
         distanceName,
@@ -465,7 +465,7 @@ Foam::Tuple2<Foam::coordSet, Foam::labelList> Foam::coordSet::gather() const
     Tuple2<coordSet, labelList> result
     (
         coordSet(),
-        identity(allSegments.size())
+        identityMap(allSegments.size())
     );
     coordSet& set = result.first();
     labelList& order = result.second();
diff --git a/src/sampling/sampledSet/arcUniform/arcUniform.C b/src/sampling/sampledSet/arcUniform/arcUniform.C
index 9fe673c725..7a0460007e 100644
--- a/src/sampling/sampledSet/arcUniform/arcUniform.C
+++ b/src/sampling/sampledSet/arcUniform/arcUniform.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ void Foam::sampledSets::arcUniform::calcSamples
     const scalar radius = mag(axis1);
 
     // Compute all point locations
-    const scalarField ts(scalarList(identity(nPoints_))/(nPoints_ - 1));
+    const scalarField ts(scalarList(identityMap(nPoints_))/(nPoints_ - 1));
     const scalarField theta((1 - ts)*startAngle_ + ts*endAngle_);
     const scalarField c(cos(theta)), s(sin(theta));
     const pointField points(centre_ + c*axis1 + s*axis2);
diff --git a/src/sampling/sampledSet/cellSetSampledSet/cellSetSampledSet.C b/src/sampling/sampledSet/cellSetSampledSet/cellSetSampledSet.C
index b3dde4e986..c7e75cdd75 100644
--- a/src/sampling/sampledSet/cellSetSampledSet/cellSetSampledSet.C
+++ b/src/sampling/sampledSet/cellSetSampledSet/cellSetSampledSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ void Foam::sampledSets::cellSetSampledSet::genSamples()
     setSamples
     (
         List<point>(IndirectList<point>(mesh().cellCentres(), cells)),
-        identity(cells.size()),
+        identityMap(cells.size()),
         cells,
         labelList(cells.size(), -1)
     );
diff --git a/src/sampling/sampledSet/faceSetSampledSet/faceSetSampledSet.C b/src/sampling/sampledSet/faceSetSampledSet/faceSetSampledSet.C
index 25022827c7..e05d438420 100644
--- a/src/sampling/sampledSet/faceSetSampledSet/faceSetSampledSet.C
+++ b/src/sampling/sampledSet/faceSetSampledSet/faceSetSampledSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ void Foam::sampledSets::faceSetSampledSet::genSamples()
     setSamples
     (
         List<point>(IndirectList<point>(mesh().faceCentres(), faces)),
-        identity(faces.size()),
+        identityMap(faces.size()),
         labelList(UIndirectList<label>(mesh().faceOwner(), faces)),
         faces
     );
diff --git a/src/sampling/sampledSet/lineUniform/lineUniform.C b/src/sampling/sampledSet/lineUniform/lineUniform.C
index 9fa9a58752..5ab15c5461 100644
--- a/src/sampling/sampledSet/lineUniform/lineUniform.C
+++ b/src/sampling/sampledSet/lineUniform/lineUniform.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ void Foam::sampledSets::lineUniform::calcSamples
 ) const
 {
     // Calculate all sampling points
-    const scalarField ts(scalarList(identity(nPoints_))/(nPoints_ - 1));
+    const scalarField ts(scalarList(identityMap(nPoints_))/(nPoints_ - 1));
     const pointField points((1 - ts)*start_ + ts*end_);
 
     // Calculate the sampling topology
diff --git a/src/sampling/sampledSet/writers/raw/rawSetWriter.C b/src/sampling/sampledSet/writers/raw/rawSetWriter.C
index fcb00ca78b..104f4e5dc3 100644
--- a/src/sampling/sampledSet/writers/raw/rawSetWriter.C
+++ b/src/sampling/sampledSet/writers/raw/rawSetWriter.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-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ void Foam::rawSetWriter::write
         writeCompression_
     );
 
-    separateSegments_ = set.segments() != identity(set.size());
+    separateSegments_ = set.segments() != identityMap(set.size());
 
     os << '#';