diff --git a/src/EFCore/Infrastructure/Internal/CoreOptions.cs b/src/EFCore/Infrastructure/Internal/CoreSingletonOptions.cs
similarity index 98%
rename from src/EFCore/Infrastructure/Internal/CoreOptions.cs
rename to src/EFCore/Infrastructure/Internal/CoreSingletonOptions.cs
index a1ee5e7f429..292e25f84c8 100644
--- a/src/EFCore/Infrastructure/Internal/CoreOptions.cs
+++ b/src/EFCore/Infrastructure/Internal/CoreSingletonOptions.cs
@@ -3,7 +3,6 @@
 
 using System;
 using Microsoft.EntityFrameworkCore.Diagnostics;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/test/EFCore.Analyzers.Tests/InternalUsageDiagnosticAnalyzerTest.cs b/test/EFCore.Analyzers.Tests/InternalUsageDiagnosticAnalyzerTest.cs
index e12143b121b..ce71742c32a 100644
--- a/test/EFCore.Analyzers.Tests/InternalUsageDiagnosticAnalyzerTest.cs
+++ b/test/EFCore.Analyzers.Tests/InternalUsageDiagnosticAnalyzerTest.cs
@@ -25,9 +25,9 @@ public Task Invocation_on_type_in_internal_namespace()
         [ConditionalFact]
         public Task Instantiation_on_type_in_internal_namespace()
             => Test(
-                "new CoreSingletonOptions();",
-                "Microsoft.EntityFrameworkCore.Internal.CoreSingletonOptions",
-                "CoreSingletonOptions");
+                "new Microsoft.EntityFrameworkCore.Infrastructure.Internal.CoreSingletonOptions();",
+                "Microsoft.EntityFrameworkCore.Infrastructure.Internal.CoreSingletonOptions",
+                "Microsoft.EntityFrameworkCore.Infrastructure.Internal.CoreSingletonOptions");
 
         [ConditionalFact]
         public async Task Base_type()