diff --git a/src/Testing/src/xunit/FlakyAttribute.cs b/src/Testing/src/xunit/FlakyAttribute.cs
index 411435b74a..daceb964fd 100644
--- a/src/Testing/src/xunit/FlakyAttribute.cs
+++ b/src/Testing/src/xunit/FlakyAttribute.cs
@@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Testing
     /// to <c>xunit.console.exe</c>. Similarly, it can run only flaky tests using <c>-trait "Flaky:AzP:OS:all=true" -trait "Flaky:AzP:OS:Darwin=true"</c>
     /// </para>
     /// </example>
-    [TraitDiscoverer("Microsoft.AspNetCore.Testing." + nameof(FlakyTestDiscoverer), "Microsoft.AspNetCore.Testing")]
+    [TraitDiscoverer("Microsoft.AspNetCore.Testing." + nameof(FlakyTraitDiscoverer), "Microsoft.AspNetCore.Testing")]
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Assembly)]
     public sealed class FlakyAttribute : Attribute, ITraitAttribute
     {
diff --git a/src/Testing/src/xunit/FlakyTestDiscoverer.cs b/src/Testing/src/xunit/FlakyTraitDiscoverer.cs
similarity index 95%
rename from src/Testing/src/xunit/FlakyTestDiscoverer.cs
rename to src/Testing/src/xunit/FlakyTraitDiscoverer.cs
index 0c481e1c41..4e6bc27b1b 100644
--- a/src/Testing/src/xunit/FlakyTestDiscoverer.cs
+++ b/src/Testing/src/xunit/FlakyTraitDiscoverer.cs
@@ -6,7 +6,7 @@ using Xunit.Sdk;
 // Do not change this namespace without changing the usage in FlakyAttribute
 namespace Microsoft.AspNetCore.Testing
 {
-    public class FlakyTestDiscoverer : ITraitDiscoverer
+    public class FlakyTraitDiscoverer : ITraitDiscoverer
     {
         public IEnumerable<KeyValuePair<string, string>> GetTraits(IAttributeInfo traitAttribute)
         {