diff --git a/src/EFCore.PG/NpgsqlNetworkAddressExtensions.cs b/src/EFCore.PG/NpgsqlNetworkAddressExtensions.cs
index d51f9ea9dc..12ae0cef23 100644
--- a/src/EFCore.PG/NpgsqlNetworkAddressExtensions.cs
+++ b/src/EFCore.PG/NpgsqlNetworkAddressExtensions.cs
@@ -25,9 +25,11 @@
 
 using System;
 using System.Net;
+using JetBrains.Annotations;
 using NpgsqlTypes;
 
-namespace Npgsql.EntityFrameworkCore.PostgreSQL
+// ReSharper disable once CheckNamespace
+namespace Microsoft.EntityFrameworkCore
 {
     /// <summary>
     /// Provides extension methods supporting PostgreSQL network address operator translation.
@@ -37,41 +39,57 @@ public static class NpgsqlNetworkAddressExtensions
         /// <summary>
         /// Determines whether an <see cref="IPAddress"/> contains another <see cref="IPAddress"/>.
         /// </summary>
+        /// <param name="_">The DbFunctions instance.</param>
         /// <param name="ipAddress">The IP address to search.</param>
         /// <param name="other">The IP address to locate.</param>
         /// <returns>
         /// <value>true</value> if the <see cref="IPAddress"/> contains the other <see cref="IPAddress"/>; otherwise, <value>false</value>.
         /// </returns>
-        public static bool Contains(this IPAddress ipAddress, IPAddress other) => throw new NotImplementedException();
+        /// <exception cref="NotSupportedException">
+        /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
+        /// </exception>
+        public static bool Contains([CanBeNull] this DbFunctions _, [CanBeNull] IPAddress ipAddress, [CanBeNull] IPAddress other) => throw new NotSupportedException();
 
         /// <summary>
         /// Determines whether an <see cref="NpgsqlInet"/> contains another <see cref="NpgsqlInet"/>.
         /// </summary>
+        /// <param name="_">The DbFunctions instance.</param>
         /// <param name="inet">The inet to search.</param>
         /// <param name="other">The inet to locate.</param>
         /// <returns>
         /// <value>true</value> if the <see cref="NpgsqlInet"/> contains the other <see cref="NpgsqlInet"/>; otherwise, <value>false</value>.
         /// </returns>
-        public static bool Contains(this NpgsqlInet inet, NpgsqlInet other) => throw new NotImplementedException();
+        /// <exception cref="NotSupportedException">
+        /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
+        /// </exception>
+        public static bool Contains([CanBeNull] this DbFunctions _, NpgsqlInet inet, NpgsqlInet other) => throw new NotSupportedException();
 
         /// <summary>
         /// Determines whether an <see cref="IPAddress"/> contains or is equal to another <see cref="IPAddress"/>.
         /// </summary>
+        /// <param name="_">The DbFunctions instance.</param>
         /// <param name="ipAddress">The IP address to search.</param>
         /// <param name="other">The IP address to locate.</param>
         /// <returns>
         /// <value>true</value> if the <see cref="IPAddress"/> contains or is equal to the other <see cref="IPAddress"/>; otherwise, <value>false</value>.
         /// </returns>
-        public static bool ContainsOrEquals(this IPAddress ipAddress, IPAddress other) => throw new NotImplementedException();
+        /// <exception cref="NotSupportedException">
+        /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
+        /// </exception>
+        public static bool ContainsOrEquals([CanBeNull] this DbFunctions _, [CanBeNull] IPAddress ipAddress, [CanBeNull] IPAddress other) => throw new NotSupportedException();
 
         /// <summary>
         /// Determines whether an <see cref="NpgsqlInet"/> contains or is equal to another <see cref="NpgsqlInet"/>.
         /// </summary>
+        /// <param name="_">The DbFunctions instance.</param>
         /// <param name="inet">The inet to search.</param>
         /// <param name="other">The inet to locate.</param>
         /// <returns>
         /// <value>true</value> if the <see cref="NpgsqlInet"/> contains or is equal to the other <see cref="NpgsqlInet"/>; otherwise, <value>false</value>.
         /// </returns>
-        public static bool ContainsOrEquals(this NpgsqlInet inet, NpgsqlInet other) => throw new NotImplementedException();
+        /// <exception cref="NotSupportedException">
+        /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
+        /// </exception>
+        public static bool ContainsOrEquals([CanBeNull] this DbFunctions _, NpgsqlInet inet, NpgsqlInet other) => throw new NotSupportedException();
     }
 }
diff --git a/src/EFCore.PG/NpgsqlRangeExtensions.cs b/src/EFCore.PG/NpgsqlRangeExtensions.cs
index d50b555bf7..3bdf2688af 100644
--- a/src/EFCore.PG/NpgsqlRangeExtensions.cs
+++ b/src/EFCore.PG/NpgsqlRangeExtensions.cs
@@ -26,7 +26,8 @@
 using System;
 using NpgsqlTypes;
 
-namespace Npgsql.EntityFrameworkCore.PostgreSQL
+// ReSharper disable once CheckNamespace
+namespace Microsoft.EntityFrameworkCore
 {
     /// <summary>
     /// Provides extension methods for <see cref="NpgsqlRange{T}"/> supporting PostgreSQL translation.
@@ -42,6 +43,9 @@ public static class NpgsqlRangeExtensions
         /// <returns>
         /// <value>true</value> if the range contains the specified value; otherwise, <value>false</value>.
         /// </returns>
+        /// <exception cref="NotSupportedException">
+        /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
+        /// </exception>
         public static bool Contains<T>(this NpgsqlRange<T> range, T value) where T : IComparable<T> => throw new NotSupportedException();
 
         /// <summary>
@@ -53,6 +57,9 @@ public static class NpgsqlRangeExtensions
         /// <returns>
         /// <value>true</value> if the range contains the specified range; otherwise, <value>false</value>.
         /// </returns>
+        /// <exception cref="NotSupportedException">
+        /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
+        /// </exception>
         public static bool Contains<T>(this NpgsqlRange<T> a, NpgsqlRange<T> b) where T : IComparable<T> => throw new NotSupportedException();
 
         /// <summary>
@@ -64,6 +71,9 @@ public static class NpgsqlRangeExtensions
         /// <returns>
         /// <value>true</value> if the range contains the specified range; otherwise, <value>false</value>.
         /// </returns>
+        /// <exception cref="NotSupportedException">
+        /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
+        /// </exception>
         public static bool ContainedBy<T>(this NpgsqlRange<T> a, NpgsqlRange<T> b) where T : IComparable<T> => b.Contains(a);
 
         /// <summary>
@@ -75,6 +85,9 @@ public static class NpgsqlRangeExtensions
         /// <returns>
         /// <value>true</value> if the ranges overlap (share points in common); otherwise, <value>false</value>.
         /// </returns>
+        /// <exception cref="NotSupportedException">
+        /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
+        /// </exception>
         public static bool Overlaps<T>(this NpgsqlRange<T> a, NpgsqlRange<T> b) where T : IComparable<T> => throw new NotSupportedException();
 
         /// <summary>
@@ -86,6 +99,9 @@ public static class NpgsqlRangeExtensions
         /// <returns>
         /// <value>true</value> if the first range is strictly to the left of the second; otherwise, <value>false</value>.
         /// </returns>
+        /// <exception cref="NotSupportedException">
+        /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
+        /// </exception>
         public static bool IsStrictlyLeftOf<T>(this NpgsqlRange<T> a, NpgsqlRange<T> b) where T : IComparable<T> => throw new NotSupportedException();
 
         /// <summary>
@@ -97,6 +113,9 @@ public static class NpgsqlRangeExtensions
         /// <returns>
         /// <value>true</value> if the first range is strictly to the right of the second; otherwise, <value>false</value>.
         /// </returns>
+        /// <exception cref="NotSupportedException">
+        /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
+        /// </exception>
         public static bool IsStrictlyRightOf<T>(this NpgsqlRange<T> a, NpgsqlRange<T> b) where T : IComparable<T> => throw new NotSupportedException();
 
         /// <summary>
@@ -108,6 +127,9 @@ public static class NpgsqlRangeExtensions
         /// <returns>
         /// <value>true</value> if the first range does not extend to the left of the second; otherwise, <value>false</value>.
         /// </returns>
+        /// <exception cref="NotSupportedException">
+        /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
+        /// </exception>
         public static bool DoesNotExtendLeftOf<T>(this NpgsqlRange<T> a, NpgsqlRange<T> b) where T : IComparable<T> => throw new NotSupportedException();
 
         /// <summary>
@@ -119,6 +141,9 @@ public static class NpgsqlRangeExtensions
         /// <returns>
         /// <value>true</value> if the first range does not extend to the right of the second; otherwise, <value>false</value>.
         /// </returns>
+        /// <exception cref="NotSupportedException">
+        /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
+        /// </exception>
         public static bool DoesNotExtendRightOf<T>(this NpgsqlRange<T> a, NpgsqlRange<T> b) where T : IComparable<T> => throw new NotSupportedException();
 
         /// <summary>
@@ -130,6 +155,9 @@ public static class NpgsqlRangeExtensions
         /// <returns>
         /// <value>true</value> if the ranges are adjacent; otherwise, <value>false</value>.
         /// </returns>
+        /// <exception cref="NotSupportedException">
+        /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
+        /// </exception>
         public static bool IsAdjacentTo<T>(this NpgsqlRange<T> a, NpgsqlRange<T> b) where T : IComparable<T> => throw new NotSupportedException();
 
         /// <summary>
@@ -141,6 +169,9 @@ public static class NpgsqlRangeExtensions
         /// <returns>
         /// The unique elements that appear in either range.
         /// </returns>
+        /// <exception cref="NotSupportedException">
+        /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
+        /// </exception>
         public static NpgsqlRange<T> Union<T>(this NpgsqlRange<T> a, NpgsqlRange<T> b) where T : IComparable<T> => throw new NotSupportedException();
 
         /// <summary>
@@ -152,6 +183,9 @@ public static class NpgsqlRangeExtensions
         /// <returns>
         /// The elements that appear in both ranges.
         /// </returns>
+        /// <exception cref="NotSupportedException">
+        /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
+        /// </exception>
         public static NpgsqlRange<T> Intersect<T>(this NpgsqlRange<T> a, NpgsqlRange<T> b) where T : IComparable<T> => throw new NotSupportedException();
 
         /// <summary>
@@ -163,6 +197,9 @@ public static class NpgsqlRangeExtensions
         /// <returns>
         /// The elements that appear in the first range, but not the second range.
         /// </returns>
+        /// <exception cref="NotSupportedException">
+        /// This method is only intended for use via SQL translation as part of an EF Core LINQ query.
+        /// </exception>
         public static NpgsqlRange<T> Except<T>(this NpgsqlRange<T> a, NpgsqlRange<T> b) where T : IComparable<T> => throw new NotSupportedException();
     }
 }
diff --git a/test/EFCore.PG.FunctionalTests/Query/NetworkAddressQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NetworkAddressQueryNpgsqlTest.cs
index 76029f399f..71543694e3 100644
--- a/test/EFCore.PG.FunctionalTests/Query/NetworkAddressQueryNpgsqlTest.cs
+++ b/test/EFCore.PG.FunctionalTests/Query/NetworkAddressQueryNpgsqlTest.cs
@@ -36,7 +36,28 @@ public NetworkAddressQueryNpgsqlTest(NetworkAddressQueryNpgsqlFixture fixture)
         #region Tests
 
         /// <summary>
-        /// Tests translation for <see cref="NpgsqlNetworkAddressExtensions.Contains(IPAddress,IPAddress)"/>.
+        /// Demonstrates parameter duplication.
+        /// </summary>
+        [Fact(Skip = nameof(NetworkAddressQueryNpgsqlTest))]
+        public void Demonstrate_ValueTypeParametersAreDuplicated()
+        {
+            using (NetContext context = Fixture.CreateContext())
+            {
+                NpgsqlInet npgsqlInet = new IPAddress(0);
+
+                bool[] _ =
+                    context.NetTestEntities
+                           .Where(x => EF.Functions.ContainsOrEquals(x.CidrMappedToNpgsqlInet, npgsqlInet))
+                           .Select(x => x.CidrMappedToNpgsqlInet.Equals(npgsqlInet))
+                           .ToArray();
+
+                AssertContainsSql("SELECT x.\"CidrMappedToNpgsqlInet\" = @__npgsqlInet_0");
+                AssertContainsSql("WHERE x.\"CidrMappedToNpgsqlInet\" >>= @__npgsqlInet_0");
+            }
+        }
+
+        /// <summary>
+        /// Tests translation for <see cref="NpgsqlNetworkAddressExtensions.Contains(DbFunctions,IPAddress,IPAddress)"/>.
         /// </summary>
         [Fact]
         public void IPAddressContainsIPAddress()
@@ -47,7 +68,7 @@ public void IPAddressContainsIPAddress()
 
                 NetTestEntity[] _ =
                     context.NetTestEntities
-                           .Where(x => x.InetMappedToIPAddress.Contains(address))
+                           .Where(x => EF.Functions.Contains(x.InetMappedToIPAddress, address))
                            .ToArray();
 
                 AssertContainsSql("WHERE x.\"InetMappedToIPAddress\" >> @__address_0");
@@ -55,7 +76,7 @@ public void IPAddressContainsIPAddress()
         }
 
         /// <summary>
-        /// Tests translation for <see cref="NpgsqlNetworkAddressExtensions.Contains(NpgsqlInet,NpgsqlInet)"/>.
+        /// Tests translation for <see cref="NpgsqlNetworkAddressExtensions.Contains(DbFunctions,NpgsqlInet,NpgsqlInet)"/>.
         /// </summary>
         [Fact]
         public void NpgsqlInetContainsNpgsqlInet()
@@ -66,7 +87,7 @@ public void NpgsqlInetContainsNpgsqlInet()
 
                 NetTestEntity[] _ =
                     context.NetTestEntities
-                           .Where(x => x.CidrMappedToNpgsqlInet.Contains(npgsqlInet))
+                           .Where(x => EF.Functions.Contains(x.CidrMappedToNpgsqlInet, npgsqlInet))
                            .ToArray();
 
                 AssertContainsSql("WHERE x.\"CidrMappedToNpgsqlInet\" >> @__npgsqlInet_0");
@@ -74,7 +95,7 @@ public void NpgsqlInetContainsNpgsqlInet()
         }
 
         /// <summary>
-        /// Tests inverse translation for <see cref="NpgsqlNetworkAddressExtensions.Contains(IPAddress,IPAddress)"/>.
+        /// Tests inverse translation for <see cref="NpgsqlNetworkAddressExtensions.Contains(DbFunctions,IPAddress,IPAddress)"/>.
         /// </summary>
         [Fact]
         public void IPAddressDoesNotContainsIPAddress()
@@ -85,7 +106,7 @@ public void IPAddressDoesNotContainsIPAddress()
 
                 NetTestEntity[] _ =
                     context.NetTestEntities
-                           .Where(x => !x.InetMappedToIPAddress.Contains(address))
+                           .Where(x => !EF.Functions.Contains(x.InetMappedToIPAddress, address))
                            .ToArray();
 
                 AssertContainsSql("WHERE NOT (x.\"InetMappedToIPAddress\" >> @__address_0 = TRUE)");
@@ -93,7 +114,7 @@ public void IPAddressDoesNotContainsIPAddress()
         }
 
         /// <summary>
-        /// Tests inverse translation for <see cref="NpgsqlNetworkAddressExtensions.Contains(NpgsqlInet,NpgsqlInet)"/>.
+        /// Tests inverse translation for <see cref="NpgsqlNetworkAddressExtensions.Contains(DbFunctions,NpgsqlInet,NpgsqlInet)"/>.
         /// </summary>
         [Fact]
         public void NpgsqlInetDoesNotContainNpgsqlInet()
@@ -104,7 +125,7 @@ public void NpgsqlInetDoesNotContainNpgsqlInet()
 
                 NetTestEntity[] _ =
                     context.NetTestEntities
-                           .Where(x => !x.CidrMappedToNpgsqlInet.Contains(npgsqlInet))
+                           .Where(x => !EF.Functions.Contains(x.CidrMappedToNpgsqlInet, npgsqlInet))
                            .ToArray();
 
                 AssertContainsSql("WHERE NOT (x.\"CidrMappedToNpgsqlInet\" >> @__npgsqlInet_0 = TRUE)");
@@ -112,7 +133,7 @@ public void NpgsqlInetDoesNotContainNpgsqlInet()
         }
 
         /// <summary>
-        /// Tests translation for <see cref="NpgsqlNetworkAddressExtensions.Contains(IPAddress,IPAddress)"/>.
+        /// Tests translation for <see cref="NpgsqlNetworkAddressExtensions.Contains(DbFunctions,IPAddress,IPAddress)"/>.
         /// </summary>
         [Fact]
         public void IPAddressContainOrEqualIPAddress()
@@ -123,7 +144,7 @@ public void IPAddressContainOrEqualIPAddress()
 
                 NetTestEntity[] _ =
                     context.NetTestEntities
-                           .Where(x => x.InetMappedToIPAddress.ContainsOrEquals(address))
+                           .Where(x => EF.Functions.ContainsOrEquals(x.InetMappedToIPAddress, address))
                            .ToArray();
 
                 AssertContainsSql("WHERE x.\"InetMappedToIPAddress\" >>= @__address_0");
@@ -131,7 +152,7 @@ public void IPAddressContainOrEqualIPAddress()
         }
 
         /// <summary>
-        /// Tests translation for <see cref="NpgsqlNetworkAddressExtensions.Contains(NpgsqlInet,NpgsqlInet)"/>.
+        /// Tests translation for <see cref="NpgsqlNetworkAddressExtensions.Contains(DbFunctions,NpgsqlInet,NpgsqlInet)"/>.
         /// </summary>
         [Fact]
         public void NpgsqlInetContainsOrEqualsNpgsqlInet()
@@ -142,7 +163,7 @@ public void NpgsqlInetContainsOrEqualsNpgsqlInet()
 
                 NetTestEntity[] _ =
                     context.NetTestEntities
-                           .Where(x => x.CidrMappedToNpgsqlInet.ContainsOrEquals(npgsqlInet))
+                           .Where(x => EF.Functions.ContainsOrEquals(x.CidrMappedToNpgsqlInet, npgsqlInet))
                            .ToArray();
 
                 AssertContainsSql("WHERE x.\"CidrMappedToNpgsqlInet\" >>= @__npgsqlInet_0");
@@ -150,7 +171,7 @@ public void NpgsqlInetContainsOrEqualsNpgsqlInet()
         }
 
         /// <summary>
-        /// Tests inverse translation for <see cref="NpgsqlNetworkAddressExtensions.Contains(IPAddress,IPAddress)"/>.
+        /// Tests inverse translation for <see cref="NpgsqlNetworkAddressExtensions.Contains(DbFunctions,IPAddress,IPAddress)"/>.
         /// </summary>
         [Fact]
         public void IPAddressDoesNotContainOrEqualIPAddress()
@@ -161,7 +182,7 @@ public void IPAddressDoesNotContainOrEqualIPAddress()
 
                 NetTestEntity[] _ =
                     context.NetTestEntities
-                           .Where(x => !x.InetMappedToIPAddress.ContainsOrEquals(address))
+                           .Where(x => !EF.Functions.ContainsOrEquals(x.InetMappedToIPAddress, address))
                            .ToArray();
 
                 AssertContainsSql("WHERE NOT (x.\"InetMappedToIPAddress\" >>= @__address_0 = TRUE)");
@@ -169,7 +190,7 @@ public void IPAddressDoesNotContainOrEqualIPAddress()
         }
 
         /// <summary>
-        /// Tests inverse translation for <see cref="NpgsqlNetworkAddressExtensions.Contains(NpgsqlInet,NpgsqlInet)"/>.
+        /// Tests inverse translation for <see cref="NpgsqlNetworkAddressExtensions.Contains(DbFunctions,NpgsqlInet,NpgsqlInet)"/>.
         /// </summary>
         [Fact]
         public void NpgsqlInetDoesNotContainOrEqualNpgsqlInet()
@@ -180,34 +201,13 @@ public void NpgsqlInetDoesNotContainOrEqualNpgsqlInet()
 
                 NetTestEntity[] _ =
                     context.NetTestEntities
-                           .Where(x => !x.CidrMappedToNpgsqlInet.ContainsOrEquals(npgsqlInet))
+                           .Where(x => !EF.Functions.ContainsOrEquals(x.CidrMappedToNpgsqlInet, npgsqlInet))
                            .ToArray();
 
                 AssertContainsSql("WHERE NOT (x.\"CidrMappedToNpgsqlInet\" >>= @__npgsqlInet_0 = TRUE)");
             }
         }
 
-        /// <summary>
-        /// Tests inverse translation for <see cref="NpgsqlNetworkAddressExtensions.Contains(NpgsqlInet,NpgsqlInet)"/>.
-        /// </summary>
-        [Fact]
-        public void Demonstrate_ValueTypeParametersAreDuplicated()
-        {
-            using (NetContext context = Fixture.CreateContext())
-            {
-                NpgsqlInet npgsqlInet = new IPAddress(0);
-
-                bool[] _ =
-                    context.NetTestEntities
-                           .Where(x => x.CidrMappedToNpgsqlInet.ContainsOrEquals(npgsqlInet))
-                           .Select(x => x.CidrMappedToNpgsqlInet.Equals(npgsqlInet))
-                           .ToArray();
-
-                AssertContainsSql("SELECT x.\"CidrMappedToNpgsqlInet\" = @__npgsqlInet_0");
-                AssertContainsSql("WHERE x.\"CidrMappedToNpgsqlInet\" >>= @__npgsqlInet_0");
-            }
-        }
-
         #endregion
 
         #region Fixtures