diff --git a/applications/test/labelRanges/Test-labelRanges.C b/applications/test/labelRanges/Test-labelRanges.C
index fc3b7050c6..55202c1b49 100644
--- a/applications/test/labelRanges/Test-labelRanges.C
+++ b/applications/test/labelRanges/Test-labelRanges.C
@@ -37,9 +37,7 @@ using namespace Foam;
 
 void printInfo(const labelRange& range)
 {
-    Info<< "first   " << range.first() << nl
-        << "last    " << range.last() << nl
-        << "min     " << range.min() << nl
+    Info<< "min     " << range.min() << nl
         << "max     " << range.max() << nl
         << "end     " << range.end_value() << nl
         << "begin/end " << *range.cbegin() << ' ' << *range.cend() << nl;
diff --git a/applications/test/sliceRange/Test-sliceRange.C b/applications/test/sliceRange/Test-sliceRange.C
index 7a0c0abc61..b3f4f8df8b 100644
--- a/applications/test/sliceRange/Test-sliceRange.C
+++ b/applications/test/sliceRange/Test-sliceRange.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,10 +47,10 @@ void printInfo(const sliceCoeffs& coeffs)
 
     Info<< nl
         << "coeffs: " << coeffs << nl
-        << "range: " << range << nl
-        << "first: " << range.first() << nl
+        << "range:  " << range << nl
+        << "min:    " << range.min() << nl
         << "*begin  " << *range.begin() << nl
-        << "last:  " << range.last() << nl
+        << "max:    " << range.max() << nl
         << "*end    " << *range.end() << nl
         << "values: " << flatOutput(range.labels()) << nl;
 
diff --git a/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.C b/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.C
index ea82157989..dd6501ac7a 100644
--- a/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.C
+++ b/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -109,7 +109,7 @@ namespace Foam
     {
         for (const auto& entry : entries)
         {
-            if (!Foam::predicates::scalars::opNames.found(get0(entry)))
+            if (!Foam::predicates::scalars::opNames.contains(get0(entry)))
             {
                 return true;
             }
@@ -135,7 +135,7 @@ namespace Foam
 
         for (const auto& entry : entries)
         {
-            if (!Foam::predicates::scalars::opNames.found(get0(entry)))
+            if (!Foam::predicates::scalars::opNames.contains(get0(entry)))
             {
                 badIndices.insert(idx);
             }
@@ -150,7 +150,7 @@ namespace Foam
         idx = 0;
         for (const auto& entry : entries)
         {
-            const bool bad = badIndices.found(idx);
+            const bool bad = badIndices.contains(idx);
             ++idx;
 
             if (bad)
diff --git a/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.H b/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.H
index 3107efe1c4..cc6cabda09 100644
--- a/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.H
+++ b/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.H
@@ -282,31 +282,31 @@ public:
         //  \return position in list or -1 if not found.
         label rfind(const scalar value, label pos = -1) const;
 
-        //- True if the value matches in the list.
+        //- Matches \em any condition in the list after the offset position.
         //  Linear search from start pos until the end of the list.
         //  Any occurrences before the start pos are ignored.
-        //  \return true if found.
+        //
+        //  \return True if the value matches any condition in the (sub)list.
         inline bool contains(const scalar value, label pos = 0) const;
 
-        //- Match \em any condition in the list.
+        //- Matches \em any condition in the list.
         //
         //  \return True if the value matches any condition in the list.
         inline bool match(const scalar value) const;
 
-        //- Match \em any condition in the list.
+        //- Matches \em any condition in the list.
         //
         //  \return True if the value matches any condition in the list.
         inline bool matchAny(const scalar value) const;
 
-        //- Match \em all conditions in the list.
+        //- Matches \em all conditions in the list.
         //
         //  \return True if the value matches all conditions in the list.
         inline bool matchAll(const scalar value) const;
 
         //- Extract list indices for all matches.
         //
-        //  \return The locations (indices) in the input list where match()
-        //      is true
+        //  \return The locations (indices) of the predicates that match
         inline labelList matching(const scalar value) const;
 
         //- Extract list indices for all matches.
@@ -325,7 +325,7 @@ public:
     // Member Operators
 
         //- Identical to contains(), match(), for use as a predicate.
-        inline bool operator()(const scalar value) const;
+        bool operator()(const scalar value) const { return matchAny(value); }
 
 
     // Housekeeping
diff --git a/src/OpenFOAM/primitives/predicates/scalar/scalarPredicatesI.H b/src/OpenFOAM/primitives/predicates/scalar/scalarPredicatesI.H
index 3f6fcf4b9e..09b0d10443 100644
--- a/src/OpenFOAM/primitives/predicates/scalar/scalarPredicatesI.H
+++ b/src/OpenFOAM/primitives/predicates/scalar/scalarPredicatesI.H
@@ -72,15 +72,15 @@ inline bool Foam::predicates::scalars::contains
 
 inline bool Foam::predicates::scalars::match(const scalar value) const
 {
-    return this->matchAny(value);
+    return matchAny(value);
 }
 
 
 inline bool Foam::predicates::scalars::matchAny(const scalar value) const
 {
-    for (const unary& test : *this)
+    for (const unary& pred : *this)
     {
-        if (test(value))
+        if (pred(value))
         {
             return true;
         }
@@ -92,9 +92,9 @@ inline bool Foam::predicates::scalars::matchAny(const scalar value) const
 
 inline bool Foam::predicates::scalars::matchAll(const scalar value) const
 {
-    for (const unary& test : *this)
+    for (const unary& pred : *this)
     {
-        if (!test(value))
+        if (!pred(value))
         {
             return false;
         }
@@ -112,9 +112,9 @@ inline Foam::labelList Foam::predicates::scalars::matching
     labelList indices(this->size());
 
     label i = 0, count = 0;
-    for (const unary& test : *this)
+    for (const unary& pred : *this)
     {
-        if (test(value))
+        if (pred(value))
         {
             indices[count] = i;
             ++count;
@@ -140,7 +140,7 @@ inline Foam::labelList Foam::predicates::scalars::matching
     label count = 0;
     for (label i=0; i < len; ++i)
     {
-        if (match(input[i]) ? !invert : invert)
+        if (matchAny(input[i]) ? !invert : invert)
         {
             indices[count] = i;
             ++count;
@@ -152,12 +152,4 @@ inline Foam::labelList Foam::predicates::scalars::matching
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-inline bool Foam::predicates::scalars::operator()(const scalar value) const
-{
-    return this->found(value);
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ranges/IntRange/IntRange.H b/src/OpenFOAM/primitives/ranges/IntRange/IntRange.H
index 28502905b4..9f1eeddaa1 100644
--- a/src/OpenFOAM/primitives/ranges/IntRange/IntRange.H
+++ b/src/OpenFOAM/primitives/ranges/IntRange/IntRange.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -172,19 +172,13 @@ public:
         //- Non-const access to start of the range
         IntType& start() noexcept { return start_; }
 
-        //- The (inclusive) lower value of the range. Same as start()
-        IntType first() const noexcept { return start_; }
-
-        //- The (inclusive) upper value of the range
-        IntType last() const noexcept { return (start_ + (size_ - 1)); }
-
         //- The (inclusive) lower value of the range,
-        //- same as first(), start(), begin_value()
-        IntType min() const noexcept { return start(); }
+        //- same as start(), begin_value()
+        IntType min() const noexcept { return start_; }
 
         //- The (inclusive) upper value of the range,
-        //- same as last(), rbegin_value()
-        IntType max() const noexcept { return last(); }
+        //- same as rbegin_value(). Ill-defined for an empty range
+        IntType max() const noexcept { return (start_ + (size_ - 1)); }
 
 
     // Edit
@@ -252,13 +246,13 @@ public:
 
     // Iterator ranges
 
-        //- The value at the beginning of the range - same as first(), start()
+        //- The value at the beginning of the range - same as min(), start()
         inline IntType begin_value() const noexcept;
 
         //- The value 1 beyond the end of the range.
         inline IntType end_value() const noexcept;
 
-        //- The last value of the range.
+        //- The max value of the range.
         inline IntType rbegin_value() const noexcept;
 
         //- The value 1 before the begin of range
@@ -563,7 +557,7 @@ inline constexpr bool operator==
     const IntRange<IntType>& b
 ) noexcept
 {
-    return (a.first() == b.first() && a.size() == b.size());
+    return (a.start() == b.start() && a.size() == b.size());
 }
 
 
@@ -578,10 +572,10 @@ inline constexpr bool operator<
 {
     return
     (
-        a.first() < b.first()
+        a.start() < b.start()
      ||
         (
-            !(b.first() < a.first())
+            !(b.start() < a.start())
          && a.size() < b.size()
         )
     );
diff --git a/src/OpenFOAM/primitives/ranges/IntRange/IntRanges.C b/src/OpenFOAM/primitives/ranges/IntRange/IntRanges.C
index eb67f57372..0b69add7d6 100644
--- a/src/OpenFOAM/primitives/ranges/IntRange/IntRanges.C
+++ b/src/OpenFOAM/primitives/ranges/IntRange/IntRanges.C
@@ -36,42 +36,41 @@ License
 namespace Foam
 {
 
-    template<class T>
-    inline static List<label> makeIdentity(const IntRange<T>& range)
+template<class T>
+inline static List<label> makeIdentity(const IntRange<T>& range)
+{
+    if (range.size() < 1)
     {
-        if (range.size() < 0)
-        {
-            // Skip this check?
-            return List<label>();
-        }
-
-        List<label> result(range.size());
-        std::iota(result.begin(), result.end(), range.start());
-
-        return result;
+        return List<label>();
     }
 
-    template<class T>
-    inline static Istream& input(Istream& is, IntRange<T>& range)
-    {
-        is.readBegin("IntRange");
-        is >> range.start() >> range.size();
-        is.readEnd("IntRange");
+    List<label> result(range.size());
+    std::iota(result.begin(), result.end(), range.start());
 
-        is.check(FUNCTION_NAME);
-        return is;
-    }
+    return result;
+}
 
-    template<class T>
-    inline static Ostream& output(Ostream& os, const IntRange<T>& range)
-    {
-        os  << token::BEGIN_LIST
-            << range.start() << token::SPACE << range.size()
-            << token::END_LIST;
+template<class T>
+inline static Istream& input(Istream& is, IntRange<T>& range)
+{
+    is.readBegin("IntRange");
+    is >> range.start() >> range.size();
+    is.readEnd("IntRange");
 
-        os.check(FUNCTION_NAME);
-        return os;
-    }
+    is.check(FUNCTION_NAME);
+    return is;
+}
+
+template<class T>
+inline static Ostream& output(Ostream& os, const IntRange<T>& range)
+{
+    os  << token::BEGIN_LIST
+        << range.start() << token::SPACE << range.size()
+        << token::END_LIST;
+
+    os.check(FUNCTION_NAME);
+    return os;
+}
 
 } // End namespace Foam
 
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C
index 6e2ee7efc1..383acb5a53 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -103,13 +103,13 @@ bool Foam::labelRange::overlaps(const labelRange& range, bool touches) const
      &&
         (
             (
-                range.first() >= this->first()
-             && range.first() <= this->last() + extra
+                range.min() >= this->min()
+             && range.min() <= this->max() + extra
             )
          ||
             (
-                this->first() >= range.first()
-             && this->first() <= range.last() + extra
+                this->min() >= range.min()
+             && this->min() <= range.max() + extra
             )
         )
     );
@@ -128,8 +128,8 @@ Foam::labelRange Foam::labelRange::join(const labelRange& range) const
         return range;
     }
 
-    const label lower = Foam::min(this->first(), range.first());
-    const label upper = Foam::max(this->last(),  range.last());
+    const label lower = Foam::min(this->min(), range.min());
+    const label upper = Foam::max(this->max(), range.max());
     const label total = upper+1 - lower;
     // last = start+size-1
     // size = last+1-start
@@ -143,8 +143,8 @@ Foam::labelRange Foam::labelRange::join(const labelRange& range) const
 
 Foam::labelRange Foam::labelRange::subset(const labelRange& range) const
 {
-    const label lower = Foam::max(this->first(), range.first());
-    const label upper = Foam::min(this->last(),  range.last());
+    const label lower = Foam::max(this->min(), range.min());
+    const label upper = Foam::min(this->max(), range.max());
     const label total = upper+1 - lower;
     // last = start+size-1
     // size = last+1-start
@@ -164,8 +164,8 @@ Foam::labelRange Foam::labelRange::subset
     const label size
 ) const
 {
-    const label lower = Foam::max(this->start(), start);
-    const label upper = Foam::min(this->last(),  start+Foam::max(0,size-1));
+    const label lower = Foam::max(this->min(), start);
+    const label upper = Foam::min(this->max(), start+Foam::max(0,size-1));
     const label total = upper+1 - lower;
     // last = start+size-1
     // size = last+1-start
@@ -181,8 +181,8 @@ Foam::labelRange Foam::labelRange::subset
 
 Foam::labelRange Foam::labelRange::subset0(const label size) const
 {
-    const label lower = Foam::max(this->start(), 0);
-    const label upper = Foam::min(this->last(),  Foam::max(0,size-1));
+    const label lower = Foam::max(this->min(), 0);
+    const label upper = Foam::min(this->max(), Foam::max(0,size-1));
     const label total = upper+1 - lower;
     // last = start+size-1
     // size = last+1-start
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.H b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.H
index dd398d89ca..c162839034 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.H
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.H
@@ -109,14 +109,7 @@ public:
 
     // Member Functions
 
-    // Access
-
-        //- The value before the start of the range
-        label before() const noexcept { return rend_value(); }
-
-        //- The value after the last element in the range
-        //  This is identical to the value of cend()
-        label after() const noexcept { return end_value(); }
+    // Edit
 
         //- Adjust the start to avoid negative indices.
         //  The size is decreased accordingly, but will never become negative.
@@ -124,9 +117,6 @@ public:
         //  adjusting (-20, 15) becomes (0,0)
         void adjust() noexcept;
 
-
-    // Edit
-
         //- Reset start and length, no checks
         using IntRange<label>::reset;
 
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.C b/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.C
index a29c86f00e..d74800ca86 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.C
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,19 +34,19 @@ License
 namespace Foam
 {
 
-    // Print range for debugging purposes
-    static Ostream& printRange(Ostream& os, const labelRange& range)
+// Print range for debugging purposes
+static Ostream& printRange(Ostream& os, const labelRange& range)
+{
+    if (range.empty())
     {
-        if (range.empty())
-        {
-            os  << "empty";
-        }
-        else
-        {
-            os  << range << " = " << range.first() << ":" << range.last();
-        }
-        return os;
+        os  << "empty";
     }
+    else
+    {
+        os  << range << " = " << range.min() << ':' << range.max();
+    }
+    return os;
+}
 
 } // End namespace Foam
 
@@ -141,7 +141,7 @@ bool Foam::labelRanges::add(const labelRange& range)
     }
     else if (this->empty())
     {
-        this->append(range);
+        this->push_back(range);
         return true;
     }
 
@@ -187,7 +187,7 @@ bool Foam::labelRanges::add(const labelRange& range)
 
 
     // not found: simply append
-    this->append(range);
+    this->push_back(range);
 
     return true;
 }
@@ -207,9 +207,9 @@ bool Foam::labelRanges::remove(const labelRange& range)
     {
         labelRange& currRange = list[elemi];
 
-        if (range.first() > currRange.first())
+        if (range.min() > currRange.min())
         {
-            if (range.last() < currRange.last())
+            if (range.max() < currRange.max())
             {
                 // Removal of range fragments of currRange
 
@@ -221,14 +221,14 @@ bool Foam::labelRanges::remove(const labelRange& range)
                 }
 
                 // left-hand-side fragment: insert before current range
-                label lower = currRange.first();
-                label upper = range.first() - 1;
+                label lower = currRange.min();
+                label upper = range.min() - 1;
 
                 labelRange fragment(lower, upper - lower + 1);
 
                 // right-hand-side fragment
-                lower = range.last() + 1;
-                upper = currRange.last();
+                lower = range.max() + 1;
+                upper = currRange.max();
 
                 currRange.reset(lower, upper - lower + 1);
                 currRange.clampSize();
@@ -247,7 +247,7 @@ bool Foam::labelRanges::remove(const labelRange& range)
                 // thus we are done
                 break;
             }
-            else if (range.first() <= currRange.last())
+            else if (range.min() <= currRange.max())
             {
                 // keep left-hand-side, remove right-hand-side
 
@@ -258,8 +258,8 @@ bool Foam::labelRanges::remove(const labelRange& range)
                     printRange(Info, currRange) << endl;
                 }
 
-                const label lower = currRange.first();
-                const label upper = range.first() - 1;
+                const label lower = currRange.min();
+                const label upper = range.min() - 1;
 
                 currRange.reset(lower, upper - lower + 1);
                 currRange.clampSize();
@@ -272,9 +272,9 @@ bool Foam::labelRanges::remove(const labelRange& range)
                 }
             }
         }
-        else if (range.first() <= currRange.first())
+        else if (range.min() <= currRange.min())
         {
-            if (range.last() >= currRange.first())
+            if (range.max() >= currRange.min())
             {
                 // remove left-hand-side, keep right-hand-side
 
@@ -285,8 +285,8 @@ bool Foam::labelRanges::remove(const labelRange& range)
                     printRange(Info, currRange) << endl;
                 }
 
-                const label lower = range.last() + 1;
-                const label upper = currRange.last();
+                const label lower = range.max() + 1;
+                const label upper = currRange.max();
 
                 currRange.reset(lower, upper - lower + 1);
                 currRange.clampSize();
diff --git a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H
index 172b27fe0b..068ce0a224 100644
--- a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H
+++ b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H
@@ -67,7 +67,7 @@ Ostream& operator<<(Ostream& os, const scalarRange& range);
 
 class scalarRange
 {
-    //- Enumeration defining type of range test to use
+    //- The type of range test to use
     enum testType
     {
         NONE = 0,   //!< Empty or invalid (inverse) range. Never matches.
@@ -188,17 +188,15 @@ public:
         //- True if range is non-empty.
         inline bool good() const noexcept;
 
-        //- True if range is non-empty.
-        bool valid() const noexcept { return good(); }
-
         //- True if the range bounds represent a single value.
         inline bool single() const noexcept;
 
         //- The min value of the range.
-        inline scalar min() const noexcept;
+        scalar min() const noexcept { return min_; }
 
         //- The max value of the range.
-        inline scalar max() const noexcept;
+        scalar max() const noexcept { return max_; }
+
 
         //- A representative (average) value for the range.
         //  For GE, LE bounds it is the min/max value, respectively.
@@ -208,14 +206,13 @@ public:
         inline bool contains(const scalar val) const;
 
         //- True if the value is matched by the condition
-        inline bool match(const scalar val) const;
+        bool match(const scalar value) const { return contains(value); }
 
 
     // Member Operators
 
         //- For use as a predicate, same as contains(), match()
-        bool operator()(const scalar val) const { return match(val); }
-
+        bool operator()(const scalar value) const { return contains(value); }
 
         inline constexpr bool operator==(const scalarRange& rhs) const noexcept;
         inline constexpr bool operator!=(const scalarRange& rhs) const noexcept;
@@ -225,6 +222,12 @@ public:
 
         //- Print information about the range.
         friend Ostream& operator<<(Ostream& os, const scalarRange& range);
+
+
+    // Housekeeping
+
+        //- Same as good() or !empty()
+        bool valid() const noexcept { return good(); }
 };
 
 
diff --git a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRangeI.H b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRangeI.H
index 71e538d61b..071e0a83c6 100644
--- a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRangeI.H
+++ b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRangeI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -60,7 +60,7 @@ inline Foam::scalarRange::scalarRange
 :
     scalarRange(scalarRange::GE_LE, minVal, maxVal)
 {
-    if (minVal > maxVal)
+    if (maxVal < minVal)
     {
         clear();  // Inverted - explicitly mark as such
     }
@@ -147,18 +147,6 @@ inline bool Foam::scalarRange::single() const noexcept
 }
 
 
-inline Foam::scalar Foam::scalarRange::min() const noexcept
-{
-    return min_;
-}
-
-
-inline Foam::scalar Foam::scalarRange::max() const noexcept
-{
-    return max_;
-}
-
-
 inline Foam::scalar Foam::scalarRange::value() const
 {
     switch (type_)
@@ -183,12 +171,6 @@ inline Foam::scalar Foam::scalarRange::value() const
 
 
 inline bool Foam::scalarRange::contains(const scalar val) const
-{
-    return match(val);
-}
-
-
-inline bool Foam::scalarRange::match(const scalar val) const
 {
     switch (type_)
     {
@@ -207,20 +189,14 @@ inline bool Foam::scalarRange::match(const scalar val) const
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 inline constexpr bool
-Foam::scalarRange::operator==
-(
-    const scalarRange& rhs
-) const noexcept
+Foam::scalarRange::operator==(const scalarRange& rhs) const noexcept
 {
     return (type_ == rhs.type_ && min_ == rhs.min_ && max_ == rhs.max_);
 }
 
 
 inline constexpr bool
-Foam::scalarRange::operator!=
-(
-    const scalarRange& rhs
-) const noexcept
+Foam::scalarRange::operator!=(const scalarRange& rhs) const noexcept
 {
     return !(*this == rhs);
 }
diff --git a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRanges.H b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRanges.H
index 5bf25a8881..15845bd523 100644
--- a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRanges.H
+++ b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRanges.H
@@ -88,17 +88,17 @@ public:
 
     // Member Functions
 
-        //- True if the value is matched by any of the sub-ranges
+        //- True if the value is contained by any of the sub-ranges
         inline bool contains(const scalar value) const;
 
         //- True if the value is matched by any of the sub-ranges
-        inline bool match(const scalar value) const;
+        bool match(const scalar value) const { return contains(value); }
 
 
     // Member Operators
 
-        //- For use as a predicate, same as contains(), match()
-        bool operator()(const scalar value) const { return match(value); }
+        //- For use as a predicate, same as contains()
+        bool operator()(const scalar value) const { return contains(value); }
 };
 
 
diff --git a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRangesI.H b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRangesI.H
index 493bd9bc47..4375c1d7cd 100644
--- a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRangesI.H
+++ b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRangesI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,17 +35,11 @@ inline Foam::scalarRanges::scalarRanges(const std::string& str, bool report)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline bool Foam::scalarRanges::contains(const scalar value) const
-{
-    return match(value);
-}
-
-
-inline bool Foam::scalarRanges::match(const scalar value) const
+inline bool Foam::scalarRanges::contains(const scalar val) const
 {
     for (const scalarRange& range : *this)
     {
-        if (range.match(value))
+        if (range.contains(val))
         {
             return true;
         }
diff --git a/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.H b/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.H
index d6f974b42e..4be517b0e2 100644
--- a/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.H
+++ b/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -110,41 +110,24 @@ public:
 
     // Access
 
-        //- The first/start value in the range (inclusive)
-        constexpr label start() const noexcept
-        {
-            return start_;
-        }
+        //- The start value in the range
+        constexpr label start() const noexcept { return start_; }
 
         //- The size of the range
-        constexpr label size() const noexcept
-        {
-            return size_;
-        }
+        constexpr label size() const noexcept { return size_; }
 
         //- The stride for the range
-        constexpr label stride() const noexcept
-        {
-            return stride_;
-        }
+        constexpr label stride() const noexcept { return stride_; }
 
         //- True if range is empty (zero-sized)
-        bool empty() const noexcept
-        {
-            return !size_;
-        }
+        bool empty() const noexcept { return !size_; }
 
-        //- The first/start value in the range (inclusive)
-        constexpr label first() const noexcept
-        {
-            return start_;
-        }
+        //- The (inclusive) lower value of the range.
+        constexpr label min() const noexcept { return start_; }
 
-        //- The (inclusive) upper value of the range
-        label last() const noexcept
-        {
-            return start_ + (size_-1) * stride_;
-        }
+        //- The (inclusive) upper value of the range.
+        //- Ill-defined for an empty range
+        label max() const noexcept { return start_ + (size_-1) * stride_; }
 
         //- Return list of labels corresponding to the slice
         List<label> labels() const;
@@ -490,7 +473,7 @@ inline constexpr bool operator==
 {
     return
     (
-        a.first() == b.first()
+        a.start() == b.start()
      && a.size() == b.size()
      && a.stride() == b.stride()
     );
@@ -508,10 +491,10 @@ inline constexpr bool operator<
 {
     return
     (
-        a.first() < b.first()
+        a.start() < b.start()
      ||
         (
-            !(b.first() < a.first())
+            !(b.start() < a.start())
          &&
             (
                 a.size() < b.size()