diff --git a/src/EFCore.PG/ValueGeneration/Internal/NpgsqlUUID7ValueGenerator.cs b/src/EFCore.PG/ValueGeneration/Internal/NpgsqlUUID7ValueGenerator.cs
index 90e80247e..f2e80dcf6 100644
--- a/src/EFCore.PG/ValueGeneration/Internal/NpgsqlUUID7ValueGenerator.cs
+++ b/src/EFCore.PG/ValueGeneration/Internal/NpgsqlUUID7ValueGenerator.cs
@@ -7,7 +7,7 @@ namespace Npgsql.EntityFrameworkCore.PostgreSQL.ValueGeneration.Internal;
 ///     Generates sequential <see cref="Guid" /> values according to the UUID version 7 specification.
 ///     Will be updated to use Guid.CreateVersion7 when available.
 /// </summary>
-public class NpgsqlUUid7ValueGenerator : ValueGenerator<Guid>
+public class NpgsqlUuid7ValueGenerator : ValueGenerator<Guid>
 {
     /// <summary>
     ///     Gets a value indicating whether the values generated are temporary or permanent. This implementation
diff --git a/src/EFCore.PG/ValueGeneration/Internal/NpgsqlValueGeneratorSelector.cs b/src/EFCore.PG/ValueGeneration/Internal/NpgsqlValueGeneratorSelector.cs
index e4a2a4874..2f5665be8 100644
--- a/src/EFCore.PG/ValueGeneration/Internal/NpgsqlValueGeneratorSelector.cs
+++ b/src/EFCore.PG/ValueGeneration/Internal/NpgsqlValueGeneratorSelector.cs
@@ -104,6 +104,6 @@ public override bool TrySelect(IProperty property, ITypeBase typeBase, out Value
         => property.ClrType.UnwrapNullableType() == typeof(Guid)
             ? property.ValueGenerated == ValueGenerated.Never || property.GetDefaultValueSql() is not null
                 ? new TemporaryGuidValueGenerator()
-                : new NpgsqlUUid7ValueGenerator()
+                : new NpgsqlUuid7ValueGenerator()
             : base.FindForType(property, typeBase, clrType);
 }
diff --git a/test/EFCore.PG.Tests/NpgsqlValueGeneratorSelectorTest.cs b/test/EFCore.PG.Tests/NpgsqlValueGeneratorSelectorTest.cs
index 540551e44..b20a119eb 100644
--- a/test/EFCore.PG.Tests/NpgsqlValueGeneratorSelectorTest.cs
+++ b/test/EFCore.PG.Tests/NpgsqlValueGeneratorSelectorTest.cs
@@ -21,7 +21,7 @@ public void Returns_built_in_generators_for_types_setup_for_value_generation()
         AssertGenerator<TemporaryByteValueGenerator>("NullableByte");
         AssertGenerator<TemporaryDecimalValueGenerator>("Decimal");
         AssertGenerator<StringValueGenerator>("String");
-        AssertGenerator<NpgsqlUUid7ValueGenerator>("Guid");
+        AssertGenerator<NpgsqlUuid7ValueGenerator>("Guid");
         AssertGenerator<BinaryValueGenerator>("Binary");
     }
 
@@ -212,11 +212,11 @@ public override bool GeneratesTemporaryValues
     }
 
     [Fact]
-    public void CustomUuid7Test()
+    public void NpgsqlUuid7ValueGenerator_creates_uuidv7()
     {
         var dtoNow = DateTimeOffset.UtcNow;
         var net9Internal = Guid.CreateVersion7(dtoNow);
-        var custom = NpgsqlUUid7ValueGenerator.BorrowedFromNet9.CreateVersion7(dtoNow);
+        var custom = NpgsqlUuid7ValueGenerator.BorrowedFromNet9.CreateVersion7(dtoNow);
         var bytenet9 = net9Internal.ToByteArray().AsSpan(0, 6);
         var bytecustom = custom.ToByteArray().AsSpan(0, 6);
         Assert.Equal(bytenet9, bytecustom);