diff --git a/src/Avalonia.NameGenerator.Tests/InitializeComponent/InitializeComponentCodeGeneratorTests.cs b/src/Avalonia.NameGenerator.Tests/InitializeComponent/InitializeComponentTests.cs
similarity index 97%
rename from src/Avalonia.NameGenerator.Tests/InitializeComponent/InitializeComponentCodeGeneratorTests.cs
rename to src/Avalonia.NameGenerator.Tests/InitializeComponent/InitializeComponentTests.cs
index 85a5bc5d07..61afb6a2af 100644
--- a/src/Avalonia.NameGenerator.Tests/InitializeComponent/InitializeComponentCodeGeneratorTests.cs
+++ b/src/Avalonia.NameGenerator.Tests/InitializeComponent/InitializeComponentTests.cs
@@ -9,7 +9,7 @@ using Xunit;
 
 namespace Avalonia.NameGenerator.Tests.InitializeComponent
 {
-    public class InitializeComponentCodeGeneratorTests
+    public class InitializeComponentTests
     {
         [Theory]
         [InlineData(InitializeComponentCode.NamedControl, View.NamedControl)]
diff --git a/src/Avalonia.NameGenerator.Tests/OnlyProperties/OnlyPropertiesCodeGeneratorTests.cs b/src/Avalonia.NameGenerator.Tests/OnlyProperties/OnlyPropertiesTests.cs
similarity index 97%
rename from src/Avalonia.NameGenerator.Tests/OnlyProperties/OnlyPropertiesCodeGeneratorTests.cs
rename to src/Avalonia.NameGenerator.Tests/OnlyProperties/OnlyPropertiesTests.cs
index 556cdab903..71e201b7fc 100644
--- a/src/Avalonia.NameGenerator.Tests/OnlyProperties/OnlyPropertiesCodeGeneratorTests.cs
+++ b/src/Avalonia.NameGenerator.Tests/OnlyProperties/OnlyPropertiesTests.cs
@@ -8,7 +8,7 @@ using Xunit;
 
 namespace Avalonia.NameGenerator.Tests.OnlyProperties
 {
-    public class FindControlNameGeneratorTests
+    public class OnlyPropertiesTests
     {
         [Theory]
         [InlineData(OnlyPropertiesCode.NamedControl, View.NamedControl)]
diff --git a/src/Avalonia.NameGenerator/AvaloniaNameSourceGenerator.cs b/src/Avalonia.NameGenerator/AvaloniaNameSourceGenerator.cs
index e9decf6c71..b174691cf7 100644
--- a/src/Avalonia.NameGenerator/AvaloniaNameSourceGenerator.cs
+++ b/src/Avalonia.NameGenerator/AvaloniaNameSourceGenerator.cs
@@ -17,9 +17,9 @@ namespace Avalonia.NameGenerator
 
         public void Execute(GeneratorExecutionContext context)
         {
-            var generator = CreateNameGenerator(context);
             try
             {
+                var generator = CreateNameGenerator(context);
                 var partials = generator.GenerateNameReferences(context.AdditionalFiles);
                 foreach (var partial in partials) context.AddSource(partial.FileName, partial.Content);
             }
@@ -61,7 +61,7 @@ namespace Avalonia.NameGenerator
                         message,
                         error.ToString(),
                         "Usage",
-                        DiagnosticSeverity.Warning,
+                        DiagnosticSeverity.Error,
                         true),
                     Location.None));
         }