diff --git a/applications/test/FixedList/Test-FixedList.C b/applications/test/FixedList/Test-FixedList.C
index 2324f54b4a..e7f4c4e7a8 100644
--- a/applications/test/FixedList/Test-FixedList.C
+++ b/applications/test/FixedList/Test-FixedList.C
@@ -254,8 +254,8 @@ int main(int argc, char *argv[])
         Info<< "mem: "
             << name(list1.data()) << " " << name(list2.data()) << nl;
 
-        Swap(list1, list2);
-        Info<< "The Swap() function" << nl;
+        Foam::Swap(list1, list2);
+        Info<< "Foam::Swap() function" << nl;
         Info<< "list1: " << list1 << nl
             << "list2: " << list2 << nl;
 
diff --git a/applications/test/FixedList2/Test-FixedList2.C b/applications/test/FixedList2/Test-FixedList2.C
index bb8e0ad212..a9bde5224b 100644
--- a/applications/test/FixedList2/Test-FixedList2.C
+++ b/applications/test/FixedList2/Test-FixedList2.C
@@ -68,7 +68,7 @@ void runSwapTest
 
     for (label iLoop = 0; iLoop < nLoops; ++iLoop)
     {
-        Swap(list1, list2);
+        Foam::Swap(list1, list2);
     }
 
     Info<< "output 1: " << list1.first() << nl;
diff --git a/applications/test/HashTable1/Test-HashTable1.C b/applications/test/HashTable1/Test-HashTable1.C
index 1f116d0986..811e93fd65 100644
--- a/applications/test/HashTable1/Test-HashTable1.C
+++ b/applications/test/HashTable1/Test-HashTable1.C
@@ -366,8 +366,8 @@ int main()
     Info<< nl << "input values" << nl;
     Info<<"table1 =  " << table1 << nl <<"table2 =  " << table2 << nl;
 
-    Info<<"global Swap function" << nl;
-    Swap(table1, table2);
+    Info<<"std::swap function" << nl;
+    std::swap(table1, table2);
     Info<<"table1 =  " << table1 << nl <<"table2 =  " << table2 << nl;
 
     Info<<"swap method" << nl;
diff --git a/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.C b/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.C
index c151e94964..39c0f2e7e6 100644
--- a/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.C
+++ b/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.C
@@ -143,10 +143,10 @@ void Foam::fileFormats::ensightMeshReader::setHandedness
 //        if (((x ^ y) & z) < 0)
 //        {
 //            // Flipped hex
-//            Swap(verts[0], verts[4]);
-//            Swap(verts[1], verts[5]);
-//            Swap(verts[2], verts[6]);
-//            Swap(verts[3], verts[7]);
+//            std::swap(verts[0], verts[4]);
+//            std::swap(verts[1], verts[5]);
+//            std::swap(verts[2], verts[6]);
+//            std::swap(verts[3], verts[7]);
 //        }
 //    }
 
@@ -155,27 +155,27 @@ void Foam::fileFormats::ensightMeshReader::setHandedness
         if (verts.size() == 8)
         {
             // Flipped hex
-            Swap(verts[0], verts[4]);
-            Swap(verts[1], verts[5]);
-            Swap(verts[2], verts[6]);
-            Swap(verts[3], verts[7]);
+            std::swap(verts[0], verts[4]);
+            std::swap(verts[1], verts[5]);
+            std::swap(verts[2], verts[6]);
+            std::swap(verts[3], verts[7]);
         }
         else if (verts.size() == 4)
         {
             // Flipped tet. Change orientation of base
-            Swap(verts[0], verts[1]);
+            std::swap(verts[0], verts[1]);
         }
         else if (verts.size() == 5)
         {
             // Flipped pyr. Change orientation of base
-            Swap(verts[1], verts[3]);
+            std::swap(verts[1], verts[3]);
         }
         else if (verts.size() == 6)
         {
             // Flipped prism.
-            Swap(verts[0], verts[3]);
-            Swap(verts[1], verts[4]);
-            Swap(verts[2], verts[5]);
+            std::swap(verts[0], verts[3]);
+            std::swap(verts[1], verts[4]);
+            std::swap(verts[2], verts[5]);
         }
     }
 }
diff --git a/src/OpenFOAM/containers/CompactLists/CompactListList/CompactListList.H b/src/OpenFOAM/containers/CompactLists/CompactListList/CompactListList.H
index 633fde0100..67160465a4 100644
--- a/src/OpenFOAM/containers/CompactLists/CompactListList/CompactListList.H
+++ b/src/OpenFOAM/containers/CompactLists/CompactListList/CompactListList.H
@@ -434,8 +434,6 @@ public:
 };
 
 
-// Note: uses default Foam::Swap (move construct/assignment)
-
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class T>
@@ -451,6 +449,12 @@ Ostream& operator<<(Ostream& os, const CompactListList<T>& list)
 }
 
 
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+// Does not need std::swap or Foam::Swap() specialization
+// since CompactListList is MoveConstructible and MoveAssignable
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index 86563c5287..77abd3d1b5 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -465,27 +465,33 @@ Ostream& operator<<(Ostream& os, const DynamicList<T, SizeMin>& list)
 }
 
 
-// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
-
-// Exchange contents of lists - see DynamicList::swap().
-template<class T, int SizeMinA, int SizeMinB>
-inline void Swap(DynamicList<T, SizeMinA>& a, DynamicList<T, SizeMinB>& b)
-{
-    a.swap(b);
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- Hashing for List data
 template<class T, int SizeMin>
 struct Hash<DynamicList<T, SizeMin>> : List<T>::hasher {};
 
+} // End namespace Foam
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+//- Exchange contents of lists - see DynamicList::swap().
+//  Works for lists with dissimilar SizeMin template parameters.
+//  If the SizeMin template parameters are identical, a regular std::swap
+//  works (since DynamicList is MoveConstructible and MoveAssignable)
+template<class T, int SizeMinA, int SizeMinB>
+inline void Swap(DynamicList<T, SizeMinA>& a, DynamicList<T, SizeMinB>& b)
+{
+    a.swap(b);
+}
 
 } // End namespace Foam
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "DynamicListI.H"
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
index 4271b7b87d..ee935de25c 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
@@ -415,6 +415,7 @@ public:
         static constexpr unsigned max_size() noexcept { return N; }
 
         //- Swap lists by swapping the content of the individual list elements
+        //  Essentially std::swap_ranges
         inline void swap(FixedList<T, N>& other);
 
 
@@ -547,17 +548,6 @@ template<class T, unsigned N>
 struct Hash<FixedList<T, N>> : FixedList<T, N>::hasher {};
 
 
-// * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * * //
-
-//- Swap FixedList contents - see FixedList::swap().
-//  Internally actually swaps the individual list elements
-template<class T, unsigned N>
-inline void Swap(FixedList<T, N>& a, FixedList<T, N>& b)
-{
-    a.swap(b);
-}
-
-
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 //- Read List contents from Istream, list must have the proper size!
@@ -581,6 +571,21 @@ Ostream& operator<<(Ostream& os, const FixedList<T, N>& list)
 
 } // End namespace Foam
 
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+//- Swap FixedList contents - see FixedList::swap().
+//  Essentially std::swap_ranges
+template<class T, unsigned N>
+inline void Swap(FixedList<T, N>& a, FixedList<T, N>& b)
+{
+    a.swap(b);
+}
+
+} // End namespace Foam
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
index 657011ef2f..0cf3310a9b 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
@@ -374,6 +374,7 @@ inline void Foam::FixedList<T, N>::swap(FixedList<T, N>& other)
         return;  // Self-swap is a no-op
     }
 
+    // Essentially std::swap_ranges
     for (unsigned i=0; i<N; ++i)
     {
         Foam::Swap(v_[i], other.v_[i]);
diff --git a/src/OpenFOAM/containers/Lists/List/UList.H b/src/OpenFOAM/containers/Lists/List/UList.H
index 45caa1bc0c..672af89b0f 100644
--- a/src/OpenFOAM/containers/Lists/List/UList.H
+++ b/src/OpenFOAM/containers/Lists/List/UList.H
@@ -692,13 +692,6 @@ inline void reverse(UList<T>& list, const label n);
 template<class T>
 inline void reverse(UList<T>& list);
 
-//- Exchange contents of lists - see UList::swap().
-template<class T>
-inline void Swap(UList<T>& a, UList<T>& b)
-{
-    a.swap(b);
-}
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -736,6 +729,13 @@ struct sizeOp
 
 } // End namespace Foam
 
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+// Does not need std::swap or Foam::Swap() specialization
+// since UList is MoveConstructible and MoveAssignable
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "UListI.H"
diff --git a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
index 3139408d26..a10c8934d8 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
+++ b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
@@ -163,7 +163,11 @@ public:
 };
 
 
-// Note: uses default Foam::Swap (move construct/assignment)
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+// Does not need std::swap or Foam::Swap() specialization
+// since SortableList is MoveConstructible and MoveAssignable
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
index 8cf4e9b482..ffbcb53ab3 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
@@ -154,7 +154,7 @@ void Foam::cyclicPointPatchField<Type>::swapAddSeparated
         {
             forAll(pairs, pairi)
             {
-                Swap(pf[pairs[pairi][0]], nbrPf[pairs[pairi][1]]);
+                Foam::Swap(pf[pairs[pairi][0]], nbrPf[pairs[pairi][1]]);
             }
         }
         this->addToInternalField(pField, pf);
diff --git a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C
index 4160fc00d7..60aee73efc 100644
--- a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C
+++ b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C
@@ -131,7 +131,7 @@ void Foam::DiagonalMatrix<Type>::applyPermutation(const List<label>& p)
         label j = p[i];
         while (i != j)
         {
-            Swap((*this)[prev], (*this)[j]);
+            Foam::Swap((*this)[prev], (*this)[j]);
             pass[j] = true;
             prev = j;
             j = p[j];
diff --git a/src/OpenFOAM/matrices/QRMatrix/QRMatrix.C b/src/OpenFOAM/matrices/QRMatrix/QRMatrix.C
index f7bf7db3eb..b9a8015019 100644
--- a/src/OpenFOAM/matrices/QRMatrix/QRMatrix.C
+++ b/src/OpenFOAM/matrices/QRMatrix/QRMatrix.C
@@ -165,8 +165,8 @@ void Foam::QRMatrix<MatrixType>::decompose
             AT.subRow(k) = R2;
             AT.subRow(maxNormi + k) = R1;
 
-            Swap(p_[k], p_[maxNormi + k]);
-            Swap(norms[k], norms[maxNormi + k]);
+            std::swap(p_[k], p_[maxNormi + k]);
+            std::swap(norms[k], norms[maxNormi + k]);
         }
 
         {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.C
index 34bb3274fe..b8906aaca0 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.C
@@ -143,7 +143,11 @@ bool Foam::manualGAMGProcAgglomeration::agglomerate()
                             // This is my cluster. Make sure master index is
                             // first
                             agglomProcIDs = cluster;
-                            Swap(agglomProcIDs[0], agglomProcIDs[masterIndex]);
+                            std::swap
+                            (
+                                agglomProcIDs[0],
+                                agglomProcIDs[masterIndex]
+                            );
                         }
                     }
 
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
index 0741ccf055..39d3cc37b5 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
@@ -122,7 +122,7 @@ void Foam::LUDecompose
 
             for (label k = 0; k < m; ++k)
             {
-                Swap(matrixj[k], matrixiMax[k]);
+                std::swap(matrixj[k], matrixiMax[k]);
             }
 
             sign *= -1;
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
index 710a3c57c5..0c3ae68228 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
@@ -59,9 +59,9 @@ void Foam::solve
         {
             for (label k = i; k < m; ++k)
             {
-                Swap(tmpMatrix(i, k), tmpMatrix(iMax, k));
+                Foam::Swap(tmpMatrix(i, k), tmpMatrix(iMax, k));
             }
-            Swap(sourceSol[i], sourceSol[iMax]);
+                Foam::Swap(sourceSol[i], sourceSol[iMax]);
         }
 
         // Check that the system of equations isn't singular
diff --git a/src/OpenFOAM/memory/autoPtr/autoPtr.H b/src/OpenFOAM/memory/autoPtr/autoPtr.H
index 682f1d2976..7b33704cdb 100644
--- a/src/OpenFOAM/memory/autoPtr/autoPtr.H
+++ b/src/OpenFOAM/memory/autoPtr/autoPtr.H
@@ -333,16 +333,10 @@ public:
 };
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-// Global Functions
-
-//- Specializes the Swap algorithm for autoPtr (swaps pointers).
-template<class T>
-void Swap(autoPtr<T>& lhs, autoPtr<T>& rhs)
-{
-    lhs.swap(rhs);
-}
+// Does not need std::swap or Foam::Swap() specialization
+// since autoPtr is MoveConstructible and MoveAssignable
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/memory/refPtr/refPtr.H b/src/OpenFOAM/memory/refPtr/refPtr.H
index 67b1ae72a2..18ff98f8d9 100644
--- a/src/OpenFOAM/memory/refPtr/refPtr.H
+++ b/src/OpenFOAM/memory/refPtr/refPtr.H
@@ -366,16 +366,10 @@ public:
 };
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-// Global Functions
-
-//- Specializes the Swap algorithm for refPtr (swaps pointers and types).
-template<class T>
-void Swap(refPtr<T>& lhs, refPtr<T>& rhs)
-{
-    lhs.swap(rhs);
-}
+// Does not need std::swap or Foam::Swap() specialization
+// since refPtr is MoveConstructible and MoveAssignable
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index 743688aa5e..6e562ee161 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.H
@@ -372,16 +372,10 @@ public:
 };
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-// Global Functions
-
-//- Specializes the Swap algorithm for tmp (swaps pointers and types).
-template<class T>
-void Swap(tmp<T>& lhs, tmp<T>& rhs)
-{
-    lhs.swap(rhs);
-}
+// Does not need std::swap or Foam::Swap() specialization
+// since tmp is MoveConstructible and MoveAssignable
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/primitiveShapes/cut/cutI.H b/src/OpenFOAM/meshes/primitiveShapes/cut/cutI.H
index 21f7415dde..3dcef1cd36 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/cut/cutI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/cut/cutI.H
@@ -269,7 +269,7 @@ inline FixedList<Type, 6> tetCutPrism23
     FixedList<Type, 6> result = tetCutPrism01(x, f);
     result[0] = x[2];
     result[3] = x[3];
-    Swap(result[2], result[4]);
+    std::swap(result[2], result[4]);
     return result;
 }
 
diff --git a/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C b/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
index 93911913f1..f09f7e9465 100644
--- a/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
+++ b/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
@@ -134,7 +134,7 @@ Foam::Vector2D<Foam::complex> Foam::eigenValues(const tensor2D& T)
         // Sort the eigenvalues into ascending order
         if (eVals.x().real() > eVals.y().real())
         {
-            Swap(eVals.x(), eVals.y());
+            std::swap(eVals.x(), eVals.y());
         }
 
         return eVals;
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index 503475c616..0589fb2339 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
@@ -2894,7 +2894,7 @@ void Foam::polyMeshAdder::add
                 bool flip = zoneFlip[facei];
                 if (newNei < newOwn)
                 {
-                    Swap(newOwn, newNei);
+                    std::swap(newOwn, newNei);
                     newFace = newFace.reverseFace();
                     flipFaceFlux = !flipFaceFlux;
                     flip = !flip;