diff --git a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReEntrantReturnsSetupDiagnosticVerifier.cs b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReEntrantReturnsSetupDiagnosticVerifier.cs
index 822d47dc..800332d4 100644
--- a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReEntrantReturnsSetupDiagnosticVerifier.cs
+++ b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReEntrantReturnsSetupDiagnosticVerifier.cs
@@ -7,21 +7,21 @@ namespace NSubstitute.Analyzers.Tests.CSharp.DiagnosticAnalyzerTests.ReEntrantRe
 {
     public abstract class ReEntrantReturnsSetupDiagnosticVerifier : CSharpDiagnosticVerifier, IReEntrantReturnsSetupDiagnosticVerifier
     {
-        public abstract Task ReturnsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall);
+        public abstract Task ReportsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall);
 
-        public abstract Task ReturnsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall);
+        public abstract Task ReportsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall);
 
-        public abstract Task ReturnsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall);
+        public abstract Task ReportsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall);
 
-        public abstract Task ReturnsDiagnostic_ForNestedReEntrantCall();
+        public abstract Task ReportsDiagnostic_ForNestedReEntrantCall();
 
-        public abstract Task ReturnsDiagnostic_ForSpecificNestedReEntrantCall();
+        public abstract Task ReportsDiagnostic_ForSpecificNestedReEntrantCall();
 
-        public abstract Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall);
+        public abstract Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall);
 
-        public abstract Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall);
+        public abstract Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall);
 
-        public abstract Task ReturnsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn);
+        public abstract Task ReportsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn);
 
         protected override DiagnosticAnalyzer GetDiagnosticAnalyzer()
         {
diff --git a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsExtensionMethodTests.cs b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsExtensionMethodTests.cs
index 9f72b2d7..1cb2fdcb 100644
--- a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsExtensionMethodTests.cs
+++ b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsExtensionMethodTests.cs
@@ -14,7 +14,7 @@ public class ReturnsAsExtensionMethodTests : ReEntrantReturnsSetupDiagnosticVeri
         [InlineData("substitute.Foo().Returns<int>(1);")]
         [InlineData("SubstituteExtensions.Returns(substitute.Foo(), 1);")]
         [InlineData("SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -86,7 +86,7 @@ private int OtherReturn()
         [InlineData("substitute.Foo().ReturnsForAnyArgs<int>(1);")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(substitute.Foo(), 1);")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -155,7 +155,7 @@ private int OtherReturn()
         [Theory]
         [InlineData("substitute.When(x => x.Foo()).Do(callInfo => { });")]
         [InlineData("OtherReturn(); substitute.When(x => x.Foo()).Do(callInfo => { });")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -222,7 +222,7 @@ private int OtherReturn()
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForNestedReEntrantCall()
         {
             var source = @"using NSubstitute;
 
@@ -312,7 +312,7 @@ private int OtherNestedReturnThis()
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForSpecificNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForSpecificNestedReEntrantCall()
         {
             var source = @"using NSubstitute;
 
@@ -394,7 +394,7 @@ private int OtherNestedReturnThis()
         [InlineData("MyProperty", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
         [InlineData("x => ReturnThis()", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
         [InlineData("x => { return ReturnThis(); }", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
@@ -468,7 +468,7 @@ Func<CallInfo, int> MyProperty
         [InlineData("MyProperty", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
         [InlineData("x => ReturnThis()", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
         [InlineData("x => { return ReturnThis(); }", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
@@ -530,7 +530,7 @@ Func<CallInfo, int> MyProperty
         [InlineData("ReturnThis", "OtherReturn")]
         [InlineData("1", "2")]
         [InlineData("x => 1", "x => 2")]
-        public override async Task ReturnsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
+        public override async Task ReportsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
diff --git a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsExtensionMethodWithGenericTypeSpecifiedTests.cs b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsExtensionMethodWithGenericTypeSpecifiedTests.cs
index 0492fbca..01dc2540 100644
--- a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsExtensionMethodWithGenericTypeSpecifiedTests.cs
+++ b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsExtensionMethodWithGenericTypeSpecifiedTests.cs
@@ -14,7 +14,7 @@ public class ReturnsAsExtensionMethodWithGenericTypeSpecifiedTests : ReEntrantRe
         [InlineData("substitute.Foo().Returns<int>(1);")]
         [InlineData("SubstituteExtensions.Returns(substitute.Foo(), 1);")]
         [InlineData("SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -86,7 +86,7 @@ private int OtherReturn()
         [InlineData("substitute.Foo().ReturnsForAnyArgs<int>(1);")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(substitute.Foo(), 1);")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -155,7 +155,7 @@ private int OtherReturn()
         [Theory]
         [InlineData("substitute.When(x => x.Foo()).Do(callInfo => { });")]
         [InlineData("OtherReturn(); substitute.When(x => x.Foo()).Do(callInfo => { });")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -221,7 +221,7 @@ private int OtherReturn()
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForNestedReEntrantCall()
         {
             var source = @"using NSubstitute;
 
@@ -311,7 +311,7 @@ private int OtherNestedReturnThis()
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForSpecificNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForSpecificNestedReEntrantCall()
         {
             var source = @"using NSubstitute;
 
@@ -393,7 +393,7 @@ private int OtherNestedReturnThis()
         [InlineData("MyProperty", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
         [InlineData("x => ReturnThis()", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
         [InlineData("x => { return ReturnThis(); }", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
@@ -467,7 +467,7 @@ Func<CallInfo, int> MyProperty
         [InlineData("MyProperty", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
         [InlineData("x => ReturnThis()", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
         [InlineData("x => { return ReturnThis(); }", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
@@ -529,7 +529,7 @@ Func<CallInfo, int> MyProperty
         [InlineData("ReturnThis", "OtherReturn")]
         [InlineData("1", "2")]
         [InlineData("x => 1", "x => 2")]
-        public override async Task ReturnsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
+        public override async Task ReportsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
diff --git a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsOrdinaryMethodTests.cs b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsOrdinaryMethodTests.cs
index 9138f1c8..e1921316 100644
--- a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsOrdinaryMethodTests.cs
+++ b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsOrdinaryMethodTests.cs
@@ -14,7 +14,7 @@ public class ReturnsAsOrdinaryMethodTests : ReEntrantReturnsSetupDiagnosticVerif
         [InlineData("substitute.Foo().Returns<int>(1);")]
         [InlineData("SubstituteExtensions.Returns(substitute.Foo(), 1);")]
         [InlineData("SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -86,7 +86,7 @@ private int OtherReturn()
         [InlineData("substitute.Foo().ReturnsForAnyArgs<int>(1);")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(substitute.Foo(), 1);")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -155,7 +155,7 @@ private int OtherReturn()
         [Theory]
         [InlineData("substitute.When(x => x.Foo()).Do(callInfo => { });")]
         [InlineData("OtherReturn(); substitute.When(x => x.Foo()).Do(callInfo => { });")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -221,7 +221,7 @@ private int OtherReturn()
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForNestedReEntrantCall()
         {
             var source = @"using NSubstitute;
 
@@ -311,7 +311,7 @@ private int OtherNestedReturnThis()
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForSpecificNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForSpecificNestedReEntrantCall()
         {
             var source = @"using NSubstitute;
 
@@ -393,7 +393,7 @@ private int OtherNestedReturnThis()
         [InlineData("MyProperty", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
         [InlineData("x => ReturnThis()", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
         [InlineData("x => { return ReturnThis(); }", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
@@ -467,7 +467,7 @@ Func<CallInfo, int> MyProperty
         [InlineData("MyProperty", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
         [InlineData("x => ReturnThis()", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
         [InlineData("x => { return ReturnThis(); }", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
@@ -529,7 +529,7 @@ Func<CallInfo, int> MyProperty
         [InlineData("ReturnThis", "OtherReturn")]
         [InlineData("1", "2")]
         [InlineData("x => 1", "x => 2")]
-        public override async Task ReturnsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
+        public override async Task ReportsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
diff --git a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsOrdinaryMethodWithGenericTypeSpecifiedTests.cs b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsOrdinaryMethodWithGenericTypeSpecifiedTests.cs
index 7e32d874..345abf25 100644
--- a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsOrdinaryMethodWithGenericTypeSpecifiedTests.cs
+++ b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsOrdinaryMethodWithGenericTypeSpecifiedTests.cs
@@ -14,7 +14,7 @@ public class ReturnsAsOrdinaryMethodWithGenericTypeSpecifiedTests : ReEntrantRet
         [InlineData("substitute.Foo().Returns<int>(1);")]
         [InlineData("SubstituteExtensions.Returns(substitute.Foo(), 1);")]
         [InlineData("SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -86,7 +86,7 @@ private int OtherReturn()
         [InlineData("substitute.Foo().ReturnsForAnyArgs<int>(1);")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(substitute.Foo(), 1);")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -155,7 +155,7 @@ private int OtherReturn()
         [Theory]
         [InlineData("substitute.When(x => x.Foo()).Do(callInfo => { });")]
         [InlineData("OtherReturn(); substitute.When(x => x.Foo()).Do(callInfo => { });")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -222,7 +222,7 @@ private int OtherReturn()
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForNestedReEntrantCall()
         {
             var source = @"using NSubstitute;
 
@@ -312,7 +312,7 @@ private int OtherNestedReturnThis()
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForSpecificNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForSpecificNestedReEntrantCall()
         {
             var source = @"using NSubstitute;
 
@@ -394,7 +394,7 @@ private int OtherNestedReturnThis()
         [InlineData("MyProperty", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
         [InlineData("x => ReturnThis()", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
         [InlineData("x => { return ReturnThis(); }", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
@@ -468,7 +468,7 @@ Func<CallInfo, int> MyProperty
         [InlineData("MyProperty", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
         [InlineData("x => ReturnThis()", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
         [InlineData("x => { return ReturnThis(); }", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
@@ -530,7 +530,7 @@ Func<CallInfo, int> MyProperty
         [InlineData("ReturnThis", "OtherReturn")]
         [InlineData("1", "2")]
         [InlineData("x => 1", "x => 2")]
-        public override async Task ReturnsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
+        public override async Task ReportsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
diff --git a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsExtensionMethodTests.cs b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsExtensionMethodTests.cs
index 08710100..f9dad0a4 100644
--- a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsExtensionMethodTests.cs
+++ b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsExtensionMethodTests.cs
@@ -14,7 +14,7 @@ public class ReturnsForAnyArgsAsExtensionMethodTests : ReEntrantReturnsSetupDiag
         [InlineData("substitute.Foo().Returns<int>(1);")]
         [InlineData("SubstituteExtensions.Returns(substitute.Foo(), 1);")]
         [InlineData("SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -86,7 +86,7 @@ private int OtherReturn()
         [InlineData("substitute.Foo().ReturnsForAnyArgs<int>(1);")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(substitute.Foo(), 1);")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -155,7 +155,7 @@ private int OtherReturn()
         [Theory]
         [InlineData("substitute.When(x => x.Foo()).Do(callInfo => { });")]
         [InlineData("OtherReturn(); substitute.When(x => x.Foo()).Do(callInfo => { });")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -222,7 +222,7 @@ private int OtherReturn()
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForNestedReEntrantCall()
         {
             var source = @"using NSubstitute;
 
@@ -312,7 +312,7 @@ private int OtherNestedReturnThis()
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForSpecificNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForSpecificNestedReEntrantCall()
         {
             var source = @"using NSubstitute;
 
@@ -394,7 +394,7 @@ private int OtherNestedReturnThis()
         [InlineData("MyProperty", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
         [InlineData("x => ReturnThis()", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
         [InlineData("x => { return ReturnThis(); }", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
@@ -468,7 +468,7 @@ Func<CallInfo, int> MyProperty
         [InlineData("MyProperty", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
         [InlineData("x => ReturnThis()", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
         [InlineData("x => { return ReturnThis(); }", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
@@ -530,7 +530,7 @@ Func<CallInfo, int> MyProperty
         [InlineData("ReturnThis", "OtherReturn")]
         [InlineData("1", "2")]
         [InlineData("x => 1", "x => 2")]
-        public override async Task ReturnsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
+        public override async Task ReportsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
diff --git a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsExtensionMethodWithGenericTypeSpecifiedTests.cs b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsExtensionMethodWithGenericTypeSpecifiedTests.cs
index d3d63fef..d1462996 100644
--- a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsExtensionMethodWithGenericTypeSpecifiedTests.cs
+++ b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsExtensionMethodWithGenericTypeSpecifiedTests.cs
@@ -14,7 +14,7 @@ public class ReturnsForAnyArgsAsExtensionMethodWithGenericTypeSpecifiedTests : R
         [InlineData("substitute.Foo().Returns<int>(1);")]
         [InlineData("SubstituteExtensions.Returns(substitute.Foo(), 1);")]
         [InlineData("SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -86,7 +86,7 @@ private int OtherReturn()
         [InlineData("substitute.Foo().ReturnsForAnyArgs<int>(1);")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(substitute.Foo(), 1);")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -155,7 +155,7 @@ private int OtherReturn()
         [Theory]
         [InlineData("substitute.When(x => x.Foo()).Do(callInfo => { });")]
         [InlineData("OtherReturn(); substitute.When(x => x.Foo()).Do(callInfo => { });")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -221,7 +221,7 @@ private int OtherReturn()
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForNestedReEntrantCall()
         {
             var source = @"using NSubstitute;
 
@@ -311,7 +311,7 @@ private int OtherNestedReturnThis()
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForSpecificNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForSpecificNestedReEntrantCall()
         {
             var source = @"using NSubstitute;
 
@@ -393,7 +393,7 @@ private int OtherNestedReturnThis()
         [InlineData("MyProperty", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
         [InlineData("x => ReturnThis()", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
         [InlineData("x => { return ReturnThis(); }", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
@@ -467,7 +467,7 @@ Func<CallInfo, int> MyProperty
         [InlineData("MyProperty", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
         [InlineData("x => ReturnThis()", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
         [InlineData("x => { return ReturnThis(); }", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
@@ -529,7 +529,7 @@ Func<CallInfo, int> MyProperty
         [InlineData("ReturnThis", "OtherReturn")]
         [InlineData("1", "2")]
         [InlineData("x => 1", "x => 2")]
-        public override async Task ReturnsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
+        public override async Task ReportsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
diff --git a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsOrdinaryMethodTests.cs b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsOrdinaryMethodTests.cs
index f264a536..ec9cb03e 100644
--- a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsOrdinaryMethodTests.cs
+++ b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsOrdinaryMethodTests.cs
@@ -14,7 +14,7 @@ public class ReturnsForAnyArgsAsOrdinaryMethodTests : ReEntrantReturnsSetupDiagn
         [InlineData("substitute.Foo().Returns<int>(1);")]
         [InlineData("SubstituteExtensions.Returns(substitute.Foo(), 1);")]
         [InlineData("SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -86,7 +86,7 @@ private int OtherReturn()
         [InlineData("substitute.Foo().ReturnsForAnyArgs<int>(1);")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(substitute.Foo(), 1);")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -155,7 +155,7 @@ private int OtherReturn()
         [Theory]
         [InlineData("substitute.When(x => x.Foo()).Do(callInfo => { });")]
         [InlineData("OtherReturn(); substitute.When(x => x.Foo()).Do(callInfo => { });")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -221,7 +221,7 @@ private int OtherReturn()
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForNestedReEntrantCall()
         {
             var source = @"using NSubstitute;
 
@@ -311,7 +311,7 @@ private int OtherNestedReturnThis()
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForSpecificNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForSpecificNestedReEntrantCall()
         {
             var source = @"using NSubstitute;
 
@@ -393,7 +393,7 @@ private int OtherNestedReturnThis()
         [InlineData("MyProperty", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
         [InlineData("x => ReturnThis()", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
         [InlineData("x => { return ReturnThis(); }", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
@@ -467,7 +467,7 @@ Func<CallInfo, int> MyProperty
         [InlineData("MyProperty", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
         [InlineData("x => ReturnThis()", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
         [InlineData("x => { return ReturnThis(); }", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
@@ -529,7 +529,7 @@ Func<CallInfo, int> MyProperty
         [InlineData("ReturnThis", "OtherReturn")]
         [InlineData("1", "2")]
         [InlineData("x => 1", "x => 2")]
-        public override async Task ReturnsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
+        public override async Task ReportsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
diff --git a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsOrdinaryMethodWithGenericTypeSpecifiedTests.cs b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsOrdinaryMethodWithGenericTypeSpecifiedTests.cs
index 0eedf071..ce255618 100644
--- a/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsOrdinaryMethodWithGenericTypeSpecifiedTests.cs
+++ b/tests/NSubstitute.Analyzers.Tests.CSharp/DiagnosticAnalyzerTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsOrdinaryMethodWithGenericTypeSpecifiedTests.cs
@@ -14,7 +14,7 @@ public class ReturnsForAnyArgsAsOrdinaryMethodWithGenericTypeSpecifiedTests : Re
         [InlineData("substitute.Foo().Returns<int>(1);")]
         [InlineData("SubstituteExtensions.Returns(substitute.Foo(), 1);")]
         [InlineData("SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -86,7 +86,7 @@ private int OtherReturn()
         [InlineData("substitute.Foo().ReturnsForAnyArgs<int>(1);")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(substitute.Foo(), 1);")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -155,7 +155,7 @@ private int OtherReturn()
         [Theory]
         [InlineData("substitute.When(x => x.Foo()).Do(callInfo => { });")]
         [InlineData("OtherReturn(); substitute.When(x => x.Foo()).Do(callInfo => { });")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 
@@ -221,7 +221,7 @@ private int OtherReturn()
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForNestedReEntrantCall()
         {
             var source = @"using NSubstitute;
 
@@ -311,7 +311,7 @@ private int OtherNestedReturnThis()
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForSpecificNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForSpecificNestedReEntrantCall()
         {
             var source = @"using NSubstitute;
 
@@ -393,7 +393,7 @@ private int OtherNestedReturnThis()
         [InlineData("MyProperty", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
         [InlineData("x => ReturnThis()", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
         [InlineData("x => { return ReturnThis(); }", "SubstituteExtensions.Returns<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
@@ -467,7 +467,7 @@ Func<CallInfo, int> MyProperty
         [InlineData("MyProperty", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
         [InlineData("x => ReturnThis()", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
         [InlineData("x => { return ReturnThis(); }", "SubstituteExtensions.ReturnsForAnyArgs<int>(substitute.Foo(), 1);")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
@@ -529,7 +529,7 @@ Func<CallInfo, int> MyProperty
         [InlineData("ReturnThis", "OtherReturn")]
         [InlineData("1", "2")]
         [InlineData("x => 1", "x => 2")]
-        public override async Task ReturnsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
+        public override async Task ReportsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
         {
             var source = $@"using NSubstitute;
 using NSubstitute.Core;
diff --git a/tests/NSubstitute.Analyzers.Tests.Shared/DiagnosticAnalyzers/IReEntrantReturnsSetupDiagnosticVerifier.cs b/tests/NSubstitute.Analyzers.Tests.Shared/DiagnosticAnalyzers/IReEntrantReturnsSetupDiagnosticVerifier.cs
index a2059232..a82693a0 100644
--- a/tests/NSubstitute.Analyzers.Tests.Shared/DiagnosticAnalyzers/IReEntrantReturnsSetupDiagnosticVerifier.cs
+++ b/tests/NSubstitute.Analyzers.Tests.Shared/DiagnosticAnalyzers/IReEntrantReturnsSetupDiagnosticVerifier.cs
@@ -4,20 +4,20 @@ namespace NSubstitute.Analyzers.Tests.Shared.DiagnosticAnalyzers
 {
     public interface IReEntrantReturnsSetupDiagnosticVerifier
     {
-        Task ReturnsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall);
+        Task ReportsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall);
 
-        Task ReturnsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall);
+        Task ReportsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall);
 
-        Task ReturnsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall);
+        Task ReportsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall);
 
-        Task ReturnsDiagnostic_ForNestedReEntrantCall();
+        Task ReportsDiagnostic_ForNestedReEntrantCall();
 
-        Task ReturnsDiagnostic_ForSpecificNestedReEntrantCall();
+        Task ReportsDiagnostic_ForSpecificNestedReEntrantCall();
 
-        Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall);
+        Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall);
 
-        Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall);
+        Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall);
 
-        Task ReturnsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn);
+        Task ReportsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn);
     }
 }
\ No newline at end of file
diff --git a/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReEntrantReturnsSetupDiagnosticVerifier.cs b/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReEntrantReturnsSetupDiagnosticVerifier.cs
index d89d0287..b564bd57 100644
--- a/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReEntrantReturnsSetupDiagnosticVerifier.cs
+++ b/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReEntrantReturnsSetupDiagnosticVerifier.cs
@@ -7,21 +7,21 @@ namespace NSubstitute.Analyzers.Tests.VisualBasic.DiagnosticAnalyzersTests.ReEnt
 {
     public abstract class ReEntrantReturnsSetupDiagnosticVerifier : VisualBasicDiagnosticVerifier, IReEntrantReturnsSetupDiagnosticVerifier
     {
-        public abstract Task ReturnsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall);
+        public abstract Task ReportsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall);
 
-        public abstract Task ReturnsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall);
+        public abstract Task ReportsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall);
 
-        public abstract Task ReturnsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall);
+        public abstract Task ReportsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall);
 
-        public abstract Task ReturnsDiagnostic_ForNestedReEntrantCall();
+        public abstract Task ReportsDiagnostic_ForNestedReEntrantCall();
 
-        public abstract Task ReturnsDiagnostic_ForSpecificNestedReEntrantCall();
+        public abstract Task ReportsDiagnostic_ForSpecificNestedReEntrantCall();
 
-        public abstract Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall);
+        public abstract Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall);
 
-        public abstract Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall);
+        public abstract Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall);
 
-        public abstract Task ReturnsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn);
+        public abstract Task ReportsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn);
 
         protected override DiagnosticAnalyzer GetDiagnosticAnalyzer()
         {
diff --git a/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsExtensionMethodTests.cs b/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsExtensionMethodTests.cs
index dc2e4444..10ed752b 100644
--- a/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsExtensionMethodTests.cs
+++ b/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsExtensionMethodTests.cs
@@ -13,7 +13,7 @@ public class ReturnsAsExtensionMethodTests : ReEntrantReturnsSetupDiagnosticVeri
         [InlineData("substitute.Foo().Returns(1) \n\rOtherReturn()")]
         [InlineData("SubstituteExtensions.Returns(substitute.Foo(), 1)")]
         [InlineData("SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -77,7 +77,7 @@ End Namespace
         [InlineData("OtherReturn()\r\n substitute.Foo().ReturnsForAnyArgs(1)")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(substitute.Foo(), 1)")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -139,7 +139,7 @@ End Namespace
         [Theory]
         [InlineData("substitute.[When](Function(x) x.Foo()).[Do](Function(callInfo) 1)")]
         [InlineData("OtherReturn() \r\n substitute.[When](Function(x) x.Foo()).[Do](Function(callInfo) 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -198,7 +198,7 @@ End Namespace
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForNestedReEntrantCall()
         {
             var source = @"Imports NSubstitute
 
@@ -280,7 +280,7 @@ End Namespace
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForSpecificNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForSpecificNestedReEntrantCall()
         {
             var source = @"Imports NSubstitute
 
@@ -350,7 +350,7 @@ End Namespace
         [InlineData("MyProperty", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("Function(x) ReturnThis()", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("Function(x) \r\n ReturnThis() \r\n End Function", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core
@@ -413,7 +413,7 @@ End Namespace
         [InlineData("MyProperty", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("Function(x) ReturnThis()", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("Function(x) \r\n ReturnThis() \r\n End Function", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core
@@ -468,7 +468,7 @@ End Namespace
         [InlineData("ReturnThis", "OtherReturn")]
         [InlineData("1", "2")]
         [InlineData("Function(x) 1", "Function(x) 2")]
-        public override async Task ReturnsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
+        public override async Task ReportsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core
diff --git a/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsOrdinaryMethodTests.cs b/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsOrdinaryMethodTests.cs
index a7deb7bc..6535ad9c 100644
--- a/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsOrdinaryMethodTests.cs
+++ b/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsOrdinaryMethodTests.cs
@@ -13,7 +13,7 @@ public class ReturnsAsOrdinaryMethodTests : ReEntrantReturnsSetupDiagnosticVerif
         [InlineData("substitute.Foo().Returns(1) \n\rOtherReturn()")]
         [InlineData("SubstituteExtensions.Returns(substitute.Foo(), 1)")]
         [InlineData("SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -77,7 +77,7 @@ End Namespace
         [InlineData("OtherReturn()\r\n substitute.Foo().ReturnsForAnyArgs(1)")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(substitute.Foo(), 1)")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -139,7 +139,7 @@ End Namespace
         [Theory]
         [InlineData("substitute.[When](Function(x) x.Foo()).[Do](Function(callInfo) 1)")]
         [InlineData("OtherReturn() \r\n substitute.[When](Function(x) x.Foo()).[Do](Function(callInfo) 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -198,7 +198,7 @@ End Namespace
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForNestedReEntrantCall()
         {
             var source = @"Imports NSubstitute
 
@@ -280,7 +280,7 @@ End Namespace
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForSpecificNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForSpecificNestedReEntrantCall()
         {
             var source = @"Imports NSubstitute
 
@@ -347,7 +347,7 @@ End Namespace
         [InlineData("MyMethod()", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("MyProperty", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("Function(x) ReturnThis()", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core
@@ -407,7 +407,7 @@ End Namespace
         [InlineData("MyMethod()", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("MyProperty", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("Function(x) ReturnThis()", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core
@@ -462,7 +462,7 @@ End Namespace
         [InlineData("ReturnThis", "OtherReturn")]
         [InlineData("1", "2")]
         [InlineData("Function(x) 1", "Function(x) 2")]
-        public override async Task ReturnsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
+        public override async Task ReportsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core
diff --git a/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsOrdinaryMethodWithGenericTypeSpecifiedTests.cs b/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsOrdinaryMethodWithGenericTypeSpecifiedTests.cs
index f878c315..d89fdc48 100644
--- a/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsOrdinaryMethodWithGenericTypeSpecifiedTests.cs
+++ b/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsAsOrdinaryMethodWithGenericTypeSpecifiedTests.cs
@@ -13,7 +13,7 @@ public class ReturnsAsOrdinaryMethodWithGenericTypeSpecifiedTests : ReEntrantRet
         [InlineData("substitute.Foo().Returns(1) \n\rOtherReturn()")]
         [InlineData("SubstituteExtensions.Returns(substitute.Foo(), 1)")]
         [InlineData("SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -77,7 +77,7 @@ End Namespace
         [InlineData("OtherReturn()\r\n substitute.Foo().ReturnsForAnyArgs(1)")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(substitute.Foo(), 1)")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -139,7 +139,7 @@ End Namespace
         [Theory]
         [InlineData("substitute.[When](Function(x) x.Foo()).[Do](Function(callInfo) 1)")]
         [InlineData("OtherReturn() \r\n substitute.[When](Function(x) x.Foo()).[Do](Function(callInfo) 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -198,7 +198,7 @@ End Namespace
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForNestedReEntrantCall()
         {
             var source = @"Imports NSubstitute
 
@@ -280,7 +280,7 @@ End Namespace
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForSpecificNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForSpecificNestedReEntrantCall()
         {
             var source = @"Imports NSubstitute
 
@@ -347,7 +347,7 @@ End Namespace
         [InlineData("MyMethod()", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("MyProperty", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("Function(x) ReturnThis()", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core
@@ -407,7 +407,7 @@ End Namespace
         [InlineData("MyMethod()", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("MyProperty", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("Function(x) ReturnThis()", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core
@@ -462,7 +462,7 @@ End Namespace
         [InlineData("ReturnThis", "OtherReturn")]
         [InlineData("1", "2")]
         [InlineData("Function(x) 1", "Function(x) 2")]
-        public override async Task ReturnsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
+        public override async Task ReportsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core
diff --git a/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsExtensionMethodTests.cs b/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsExtensionMethodTests.cs
index e7c24dbb..29f812c2 100644
--- a/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsExtensionMethodTests.cs
+++ b/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsExtensionMethodTests.cs
@@ -13,7 +13,7 @@ public class ReturnsForAnyArgsAsExtensionMethodTests : ReEntrantReturnsSetupDiag
         [InlineData("substitute.Foo().Returns(1) \n\rOtherReturn()")]
         [InlineData("SubstituteExtensions.Returns(substitute.Foo(), 1)")]
         [InlineData("SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -77,7 +77,7 @@ End Namespace
         [InlineData("OtherReturn()\r\n substitute.Foo().ReturnsForAnyArgs(1)")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(substitute.Foo(), 1)")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -139,7 +139,7 @@ End Namespace
         [Theory]
         [InlineData("substitute.[When](Function(x) x.Foo()).[Do](Function(callInfo) 1)")]
         [InlineData("OtherReturn() \r\n substitute.[When](Function(x) x.Foo()).[Do](Function(callInfo) 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -198,7 +198,7 @@ End Namespace
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForNestedReEntrantCall()
         {
             var source = @"Imports NSubstitute
 
@@ -280,7 +280,7 @@ End Namespace
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForSpecificNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForSpecificNestedReEntrantCall()
         {
             var source = @"Imports NSubstitute
 
@@ -350,7 +350,7 @@ End Namespace
         [InlineData("MyProperty", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("Function(x) ReturnThis()", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("Function(x) \r\n ReturnThis() \r\n End Function", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core
@@ -413,7 +413,7 @@ End Namespace
         [InlineData("MyProperty", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("Function(x) ReturnThis()", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("Function(x) \r\n ReturnThis() \r\n End Function", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core
@@ -468,7 +468,7 @@ End Namespace
         [InlineData("ReturnThis", "OtherReturn")]
         [InlineData("1", "2")]
         [InlineData("Function(x) 1", "Function(x) 2")]
-        public override async Task ReturnsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
+        public override async Task ReportsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core
diff --git a/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsOrdinaryMethodTests.cs b/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsOrdinaryMethodTests.cs
index 7527b20f..33679ade 100644
--- a/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsOrdinaryMethodTests.cs
+++ b/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsOrdinaryMethodTests.cs
@@ -13,7 +13,7 @@ public class ReturnsForAnyArgsAsOrdinaryMethodTests : ReEntrantReturnsSetupDiagn
         [InlineData("substitute.Foo().Returns(1) \n\rOtherReturn()")]
         [InlineData("SubstituteExtensions.Returns(substitute.Foo(), 1)")]
         [InlineData("SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -77,7 +77,7 @@ End Namespace
         [InlineData("OtherReturn()\r\n substitute.Foo().ReturnsForAnyArgs(1)")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(substitute.Foo(), 1)")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -139,7 +139,7 @@ End Namespace
         [Theory]
         [InlineData("substitute.[When](Function(x) x.Foo()).[Do](Function(callInfo) 1)")]
         [InlineData("OtherReturn() \r\n substitute.[When](Function(x) x.Foo()).[Do](Function(callInfo) 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -198,7 +198,7 @@ End Namespace
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForNestedReEntrantCall()
         {
             var source = @"Imports NSubstitute
 
@@ -280,7 +280,7 @@ End Namespace
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForSpecificNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForSpecificNestedReEntrantCall()
         {
             var source = @"Imports NSubstitute
 
@@ -347,7 +347,7 @@ End Namespace
         [InlineData("MyMethod()", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("MyProperty", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("Function(x) ReturnThis()", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core
@@ -407,7 +407,7 @@ End Namespace
         [InlineData("MyMethod()", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("MyProperty", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("Function(x) ReturnThis()", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core
@@ -462,7 +462,7 @@ End Namespace
         [InlineData("ReturnThis", "OtherReturn")]
         [InlineData("1", "2")]
         [InlineData("Function(x) 1", "Function(x) 2")]
-        public override async Task ReturnsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
+        public override async Task ReportsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core
diff --git a/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsOrdinaryMethodWithGenericTypeSpecifiedTests.cs b/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsOrdinaryMethodWithGenericTypeSpecifiedTests.cs
index f6935520..55fcee34 100644
--- a/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsOrdinaryMethodWithGenericTypeSpecifiedTests.cs
+++ b/tests/NSubstitute.Analyzers.Tests.VisualBasic/DiagnosticAnalyzersTests/ReEntrantReturnsSetupAnalyzerTests/ReturnsForAnyArgsAsOrdinaryMethodWithGenericTypeSpecifiedTests.cs
@@ -13,7 +13,7 @@ public class ReturnsForAnyArgsAsOrdinaryMethodWithGenericTypeSpecifiedTests : Re
         [InlineData("substitute.Foo().Returns(1) \n\rOtherReturn()")]
         [InlineData("SubstituteExtensions.Returns(substitute.Foo(), 1)")]
         [InlineData("SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsViaMethodCall(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -77,7 +77,7 @@ End Namespace
         [InlineData("OtherReturn()\r\n substitute.Foo().ReturnsForAnyArgs(1)")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(substitute.Foo(), 1)")]
         [InlineData("SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantReturnsForAnyArgsViaMethodCall(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -139,7 +139,7 @@ End Namespace
         [Theory]
         [InlineData("substitute.[When](Function(x) x.Foo()).[Do](Function(callInfo) 1)")]
         [InlineData("OtherReturn() \r\n substitute.[When](Function(x) x.Foo()).[Do](Function(callInfo) 1)")]
-        public override async Task ReturnsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
+        public override async Task ReportsDiagnostic_WhenUsingReEntrantWhenDo(string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 
@@ -198,7 +198,7 @@ End Namespace
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForNestedReEntrantCall()
         {
             var source = @"Imports NSubstitute
 
@@ -280,7 +280,7 @@ End Namespace
         }
 
         [Fact]
-        public override async Task ReturnsDiagnostic_ForSpecificNestedReEntrantCall()
+        public override async Task ReportsDiagnostic_ForSpecificNestedReEntrantCall()
         {
             var source = @"Imports NSubstitute
 
@@ -347,7 +347,7 @@ End Namespace
         [InlineData("MyMethod()", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("MyProperty", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("Function(x) ReturnThis()", "SubstituteExtensions.Returns(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core
@@ -407,7 +407,7 @@ End Namespace
         [InlineData("MyMethod()", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("MyProperty", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
         [InlineData("Function(x) ReturnThis()", "SubstituteExtensions.ReturnsForAnyArgs(Of Integer)(substitute.Foo(), 1)")]
-        public override async Task ReturnsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
+        public override async Task ReportsNoDiagnostic_WhenRootCallCalledWithDelegate_AndReEntrantReturnsForAnyArgsCallExists(string rootCall, string reEntrantCall)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core
@@ -462,7 +462,7 @@ End Namespace
         [InlineData("ReturnThis", "OtherReturn")]
         [InlineData("1", "2")]
         [InlineData("Function(x) 1", "Function(x) 2")]
-        public override async Task ReturnsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
+        public override async Task ReportsNoDiagnostic_WhenReEntrantSubstituteNotUsed(string firstReturn, string secondReturn)
         {
             var source = $@"Imports NSubstitute
 Imports NSubstitute.Core