diff --git a/src/Avalonia.NameGenerator.Tests/Avalonia.NameGenerator.Tests.csproj b/src/Avalonia.Generators.Tests/Avalonia.Generators.Tests.csproj
similarity index 89%
rename from src/Avalonia.NameGenerator.Tests/Avalonia.NameGenerator.Tests.csproj
rename to src/Avalonia.Generators.Tests/Avalonia.Generators.Tests.csproj
index 5d2e5db0c7..09f00e9107 100644
--- a/src/Avalonia.NameGenerator.Tests/Avalonia.NameGenerator.Tests.csproj
+++ b/src/Avalonia.Generators.Tests/Avalonia.Generators.Tests.csproj
@@ -5,6 +5,7 @@
previewfalsetrue
+ Avalonia.Generators.Tests
@@ -22,6 +23,6 @@
-
+
diff --git a/src/Avalonia.NameGenerator.Tests/GlobPatternTests.cs b/src/Avalonia.Generators.Tests/GlobPatternTests.cs
similarity index 93%
rename from src/Avalonia.NameGenerator.Tests/GlobPatternTests.cs
rename to src/Avalonia.Generators.Tests/GlobPatternTests.cs
index c255bebc24..f0f3b78d74 100644
--- a/src/Avalonia.NameGenerator.Tests/GlobPatternTests.cs
+++ b/src/Avalonia.Generators.Tests/GlobPatternTests.cs
@@ -1,7 +1,7 @@
-using Avalonia.NameGenerator.Generator;
+using Avalonia.Generators.Generator;
using Xunit;
-namespace Avalonia.NameGenerator.Tests;
+namespace Avalonia.Generators.Tests;
public class GlobPatternTests
{
diff --git a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/AttachedProps.txt b/src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/AttachedProps.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/AttachedProps.txt
rename to src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/AttachedProps.txt
diff --git a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/AttachedPropsWithDevTools.txt b/src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/AttachedPropsWithDevTools.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/AttachedPropsWithDevTools.txt
rename to src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/AttachedPropsWithDevTools.txt
diff --git a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/ControlWithoutWindow.txt b/src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/ControlWithoutWindow.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/ControlWithoutWindow.txt
rename to src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/ControlWithoutWindow.txt
diff --git a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/CustomControls.txt b/src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/CustomControls.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/CustomControls.txt
rename to src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/CustomControls.txt
diff --git a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/DataTemplates.txt b/src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/DataTemplates.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/DataTemplates.txt
rename to src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/DataTemplates.txt
diff --git a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/FieldModifier.txt b/src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/FieldModifier.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/FieldModifier.txt
rename to src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/FieldModifier.txt
diff --git a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/InitializeComponentCode.cs b/src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/InitializeComponentCode.cs
similarity index 94%
rename from src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/InitializeComponentCode.cs
rename to src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/InitializeComponentCode.cs
index 309e866b54..41d2cfaaee 100644
--- a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/InitializeComponentCode.cs
+++ b/src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/InitializeComponentCode.cs
@@ -2,7 +2,7 @@ using System.IO;
using System.Linq;
using System.Threading.Tasks;
-namespace Avalonia.NameGenerator.Tests.InitializeComponent.GeneratedInitializeComponent;
+namespace Avalonia.Generators.Tests.InitializeComponent.GeneratedInitializeComponent;
public static class InitializeComponentCode
{
diff --git a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/NamedControl.txt b/src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/NamedControl.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/NamedControl.txt
rename to src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/NamedControl.txt
diff --git a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/NamedControls.txt b/src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/NamedControls.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/NamedControls.txt
rename to src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/NamedControls.txt
diff --git a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/NoNamedControls.txt b/src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/NoNamedControls.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/NoNamedControls.txt
rename to src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/NoNamedControls.txt
diff --git a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/SignUpView.txt b/src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/SignUpView.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/SignUpView.txt
rename to src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/SignUpView.txt
diff --git a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/xNamedControl.txt b/src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/xNamedControl.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/xNamedControl.txt
rename to src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/xNamedControl.txt
diff --git a/src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/xNamedControls.txt b/src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/xNamedControls.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/InitializeComponent/GeneratedInitializeComponent/xNamedControls.txt
rename to src/Avalonia.Generators.Tests/InitializeComponent/GeneratedInitializeComponent/xNamedControls.txt
diff --git a/src/Avalonia.NameGenerator.Tests/InitializeComponent/InitializeComponentTests.cs b/src/Avalonia.Generators.Tests/InitializeComponent/InitializeComponentTests.cs
similarity index 88%
rename from src/Avalonia.NameGenerator.Tests/InitializeComponent/InitializeComponentTests.cs
rename to src/Avalonia.Generators.Tests/InitializeComponent/InitializeComponentTests.cs
index d3339a2991..4de51e4f21 100644
--- a/src/Avalonia.NameGenerator.Tests/InitializeComponent/InitializeComponentTests.cs
+++ b/src/Avalonia.Generators.Tests/InitializeComponent/InitializeComponentTests.cs
@@ -1,13 +1,13 @@
using System.Threading.Tasks;
-using Avalonia.NameGenerator.Compiler;
-using Avalonia.NameGenerator.Generator;
-using Avalonia.NameGenerator.Tests.InitializeComponent.GeneratedInitializeComponent;
-using Avalonia.NameGenerator.Tests.OnlyProperties.GeneratedCode;
-using Avalonia.NameGenerator.Tests.Views;
+using Avalonia.Generators.Compiler;
+using Avalonia.Generators.Generator;
+using Avalonia.Generators.Tests.InitializeComponent.GeneratedInitializeComponent;
+using Avalonia.Generators.Tests.OnlyProperties.GeneratedCode;
+using Avalonia.Generators.Tests.Views;
using Microsoft.CodeAnalysis.CSharp;
using Xunit;
-namespace Avalonia.NameGenerator.Tests.InitializeComponent;
+namespace Avalonia.Generators.Tests.InitializeComponent;
public class InitializeComponentTests
{
diff --git a/src/Avalonia.NameGenerator.Tests/MiniCompilerTests.cs b/src/Avalonia.Generators.Tests/MiniCompilerTests.cs
similarity index 95%
rename from src/Avalonia.NameGenerator.Tests/MiniCompilerTests.cs
rename to src/Avalonia.Generators.Tests/MiniCompilerTests.cs
index 51e8149bc0..26ed20f982 100644
--- a/src/Avalonia.NameGenerator.Tests/MiniCompilerTests.cs
+++ b/src/Avalonia.Generators.Tests/MiniCompilerTests.cs
@@ -1,14 +1,14 @@
using System;
using System.ComponentModel;
-using Avalonia.NameGenerator.Compiler;
+using Avalonia.Generators.Compiler;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
-using Avalonia.NameGenerator.Tests.Views;
+using Avalonia.Generators.Tests.Views;
using XamlX;
using XamlX.Parsers;
using Xunit;
-namespace Avalonia.NameGenerator.Tests;
+namespace Avalonia.Generators.Tests;
public class MiniCompilerTests
{
diff --git a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/AttachedProps.txt b/src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/AttachedProps.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/AttachedProps.txt
rename to src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/AttachedProps.txt
diff --git a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/ControlWithoutWindow.txt b/src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/ControlWithoutWindow.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/ControlWithoutWindow.txt
rename to src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/ControlWithoutWindow.txt
diff --git a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/CustomControls.txt b/src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/CustomControls.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/CustomControls.txt
rename to src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/CustomControls.txt
diff --git a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/DataTemplates.txt b/src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/DataTemplates.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/DataTemplates.txt
rename to src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/DataTemplates.txt
diff --git a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/FieldModifier.txt b/src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/FieldModifier.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/FieldModifier.txt
rename to src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/FieldModifier.txt
diff --git a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/NamedControl.txt b/src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/NamedControl.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/NamedControl.txt
rename to src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/NamedControl.txt
diff --git a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/NamedControls.txt b/src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/NamedControls.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/NamedControls.txt
rename to src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/NamedControls.txt
diff --git a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/NoNamedControls.txt b/src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/NoNamedControls.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/NoNamedControls.txt
rename to src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/NoNamedControls.txt
diff --git a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/OnlyPropertiesCode.cs b/src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/OnlyPropertiesCode.cs
similarity index 95%
rename from src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/OnlyPropertiesCode.cs
rename to src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/OnlyPropertiesCode.cs
index b2c253bf67..3a69735bb3 100644
--- a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/OnlyPropertiesCode.cs
+++ b/src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/OnlyPropertiesCode.cs
@@ -3,7 +3,7 @@ using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
-namespace Avalonia.NameGenerator.Tests.OnlyProperties.GeneratedCode;
+namespace Avalonia.Generators.Tests.OnlyProperties.GeneratedCode;
public static class OnlyPropertiesCode
{
diff --git a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/SignUpView.txt b/src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/SignUpView.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/SignUpView.txt
rename to src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/SignUpView.txt
diff --git a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/xNamedControl.txt b/src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/xNamedControl.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/xNamedControl.txt
rename to src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/xNamedControl.txt
diff --git a/src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/xNamedControls.txt b/src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/xNamedControls.txt
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/OnlyProperties/GeneratedCode/xNamedControls.txt
rename to src/Avalonia.Generators.Tests/OnlyProperties/GeneratedCode/xNamedControls.txt
diff --git a/src/Avalonia.NameGenerator.Tests/OnlyProperties/OnlyPropertiesTests.cs b/src/Avalonia.Generators.Tests/OnlyProperties/OnlyPropertiesTests.cs
similarity index 89%
rename from src/Avalonia.NameGenerator.Tests/OnlyProperties/OnlyPropertiesTests.cs
rename to src/Avalonia.Generators.Tests/OnlyProperties/OnlyPropertiesTests.cs
index 41471c8615..8fc1d4e969 100644
--- a/src/Avalonia.NameGenerator.Tests/OnlyProperties/OnlyPropertiesTests.cs
+++ b/src/Avalonia.Generators.Tests/OnlyProperties/OnlyPropertiesTests.cs
@@ -1,12 +1,12 @@
using System.Threading.Tasks;
-using Avalonia.NameGenerator.Compiler;
-using Avalonia.NameGenerator.Generator;
-using Avalonia.NameGenerator.Tests.OnlyProperties.GeneratedCode;
-using Avalonia.NameGenerator.Tests.Views;
+using Avalonia.Generators.Compiler;
+using Avalonia.Generators.Generator;
+using Avalonia.Generators.Tests.OnlyProperties.GeneratedCode;
+using Avalonia.Generators.Tests.Views;
using Microsoft.CodeAnalysis.CSharp;
using Xunit;
-namespace Avalonia.NameGenerator.Tests.OnlyProperties;
+namespace Avalonia.Generators.Tests.OnlyProperties;
public class OnlyPropertiesTests
{
diff --git a/src/Avalonia.NameGenerator.Tests/Views/AttachedProps.xml b/src/Avalonia.Generators.Tests/Views/AttachedProps.xml
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/Views/AttachedProps.xml
rename to src/Avalonia.Generators.Tests/Views/AttachedProps.xml
diff --git a/src/Avalonia.NameGenerator.Tests/Views/ControlWithoutWindow.xml b/src/Avalonia.Generators.Tests/Views/ControlWithoutWindow.xml
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/Views/ControlWithoutWindow.xml
rename to src/Avalonia.Generators.Tests/Views/ControlWithoutWindow.xml
diff --git a/src/Avalonia.NameGenerator.Tests/Views/CustomControls.xml b/src/Avalonia.Generators.Tests/Views/CustomControls.xml
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/Views/CustomControls.xml
rename to src/Avalonia.Generators.Tests/Views/CustomControls.xml
diff --git a/src/Avalonia.NameGenerator.Tests/Views/DataTemplates.xml b/src/Avalonia.Generators.Tests/Views/DataTemplates.xml
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/Views/DataTemplates.xml
rename to src/Avalonia.Generators.Tests/Views/DataTemplates.xml
diff --git a/src/Avalonia.NameGenerator.Tests/Views/FieldModifier.xml b/src/Avalonia.Generators.Tests/Views/FieldModifier.xml
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/Views/FieldModifier.xml
rename to src/Avalonia.Generators.Tests/Views/FieldModifier.xml
diff --git a/src/Avalonia.NameGenerator.Tests/Views/NamedControl.xml b/src/Avalonia.Generators.Tests/Views/NamedControl.xml
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/Views/NamedControl.xml
rename to src/Avalonia.Generators.Tests/Views/NamedControl.xml
diff --git a/src/Avalonia.NameGenerator.Tests/Views/NamedControls.xml b/src/Avalonia.Generators.Tests/Views/NamedControls.xml
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/Views/NamedControls.xml
rename to src/Avalonia.Generators.Tests/Views/NamedControls.xml
diff --git a/src/Avalonia.NameGenerator.Tests/Views/NoNamedControls.xml b/src/Avalonia.Generators.Tests/Views/NoNamedControls.xml
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/Views/NoNamedControls.xml
rename to src/Avalonia.Generators.Tests/Views/NoNamedControls.xml
diff --git a/src/Avalonia.NameGenerator.Tests/Views/SignUpView.xml b/src/Avalonia.Generators.Tests/Views/SignUpView.xml
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/Views/SignUpView.xml
rename to src/Avalonia.Generators.Tests/Views/SignUpView.xml
diff --git a/src/Avalonia.NameGenerator.Tests/Views/View.cs b/src/Avalonia.Generators.Tests/Views/View.cs
similarity index 98%
rename from src/Avalonia.NameGenerator.Tests/Views/View.cs
rename to src/Avalonia.Generators.Tests/Views/View.cs
index 837dc76024..49b3c5e5fb 100644
--- a/src/Avalonia.NameGenerator.Tests/Views/View.cs
+++ b/src/Avalonia.Generators.Tests/Views/View.cs
@@ -7,7 +7,7 @@ using Avalonia.Controls;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
-namespace Avalonia.NameGenerator.Tests.Views;
+namespace Avalonia.Generators.Tests.Views;
public static class View
{
diff --git a/src/Avalonia.NameGenerator.Tests/Views/ViewWithGenericBaseView.xml b/src/Avalonia.Generators.Tests/Views/ViewWithGenericBaseView.xml
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/Views/ViewWithGenericBaseView.xml
rename to src/Avalonia.Generators.Tests/Views/ViewWithGenericBaseView.xml
diff --git a/src/Avalonia.NameGenerator.Tests/Views/xNamedControl.xml b/src/Avalonia.Generators.Tests/Views/xNamedControl.xml
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/Views/xNamedControl.xml
rename to src/Avalonia.Generators.Tests/Views/xNamedControl.xml
diff --git a/src/Avalonia.NameGenerator.Tests/Views/xNamedControls.xml b/src/Avalonia.Generators.Tests/Views/xNamedControls.xml
similarity index 100%
rename from src/Avalonia.NameGenerator.Tests/Views/xNamedControls.xml
rename to src/Avalonia.Generators.Tests/Views/xNamedControls.xml
diff --git a/src/Avalonia.NameGenerator.Tests/XamlXClassResolverTests.cs b/src/Avalonia.Generators.Tests/XamlXClassResolverTests.cs
similarity index 90%
rename from src/Avalonia.NameGenerator.Tests/XamlXClassResolverTests.cs
rename to src/Avalonia.Generators.Tests/XamlXClassResolverTests.cs
index ce9aaa0d49..a28da99393 100644
--- a/src/Avalonia.NameGenerator.Tests/XamlXClassResolverTests.cs
+++ b/src/Avalonia.Generators.Tests/XamlXClassResolverTests.cs
@@ -1,10 +1,10 @@
using System.Threading.Tasks;
-using Avalonia.NameGenerator.Compiler;
-using Avalonia.NameGenerator.Generator;
-using Avalonia.NameGenerator.Tests.Views;
+using Avalonia.Generators.Compiler;
+using Avalonia.Generators.Generator;
+using Avalonia.Generators.Tests.Views;
using Xunit;
-namespace Avalonia.NameGenerator.Tests;
+namespace Avalonia.Generators.Tests;
public class XamlXClassResolverTests
{
diff --git a/src/Avalonia.NameGenerator.Tests/XamlXNameResolverTests.cs b/src/Avalonia.Generators.Tests/XamlXNameResolverTests.cs
similarity index 96%
rename from src/Avalonia.NameGenerator.Tests/XamlXNameResolverTests.cs
rename to src/Avalonia.Generators.Tests/XamlXNameResolverTests.cs
index f70d519320..5e2ff0d815 100644
--- a/src/Avalonia.NameGenerator.Tests/XamlXNameResolverTests.cs
+++ b/src/Avalonia.Generators.Tests/XamlXNameResolverTests.cs
@@ -1,14 +1,14 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Avalonia.Controls;
-using Avalonia.NameGenerator.Compiler;
-using Avalonia.NameGenerator.Domain;
-using Avalonia.NameGenerator.Generator;
+using Avalonia.Generators.Compiler;
+using Avalonia.Generators.Domain;
+using Avalonia.Generators.Generator;
using Avalonia.ReactiveUI;
-using Avalonia.NameGenerator.Tests.Views;
+using Avalonia.Generators.Tests.Views;
using Xunit;
-namespace Avalonia.NameGenerator.Tests;
+namespace Avalonia.Generators.Tests;
public class XamlXNameResolverTests
{
diff --git a/src/Avalonia.NameGenerator/Avalonia.NameGenerator.csproj b/src/Avalonia.Generators/Avalonia.Generators.csproj
similarity index 86%
rename from src/Avalonia.NameGenerator/Avalonia.NameGenerator.csproj
rename to src/Avalonia.Generators/Avalonia.Generators.csproj
index bbb7f0b0c5..7fd89429ea 100644
--- a/src/Avalonia.NameGenerator/Avalonia.NameGenerator.csproj
+++ b/src/Avalonia.Generators/Avalonia.Generators.csproj
@@ -6,6 +6,8 @@
falseXamlNameReferenceGeneratortrue
+ Avalonia.Generators
+ true
@@ -16,7 +18,7 @@
-
+ truebuildTransitive\$(PackageId).props
diff --git a/src/Avalonia.NameGenerator/Generator.props b/src/Avalonia.Generators/Avalonia.Generators.props
similarity index 100%
rename from src/Avalonia.NameGenerator/Generator.props
rename to src/Avalonia.Generators/Avalonia.Generators.props
diff --git a/src/Avalonia.NameGenerator/Compiler/DataTemplateTransformer.cs b/src/Avalonia.Generators/Compiler/DataTemplateTransformer.cs
similarity index 91%
rename from src/Avalonia.NameGenerator/Compiler/DataTemplateTransformer.cs
rename to src/Avalonia.Generators/Compiler/DataTemplateTransformer.cs
index abfd48b94e..e7c60c79ad 100644
--- a/src/Avalonia.NameGenerator/Compiler/DataTemplateTransformer.cs
+++ b/src/Avalonia.Generators/Compiler/DataTemplateTransformer.cs
@@ -1,7 +1,7 @@
using XamlX.Ast;
using XamlX.Transform;
-namespace Avalonia.NameGenerator.Compiler;
+namespace Avalonia.Generators.Compiler;
internal class DataTemplateTransformer : IXamlAstTransformer
{
diff --git a/src/Avalonia.NameGenerator/Compiler/MiniCompiler.cs b/src/Avalonia.Generators/Compiler/MiniCompiler.cs
similarity index 97%
rename from src/Avalonia.NameGenerator/Compiler/MiniCompiler.cs
rename to src/Avalonia.Generators/Compiler/MiniCompiler.cs
index 5a51d6566d..71f34d173c 100644
--- a/src/Avalonia.NameGenerator/Compiler/MiniCompiler.cs
+++ b/src/Avalonia.Generators/Compiler/MiniCompiler.cs
@@ -7,7 +7,7 @@ using XamlX.Transform;
using XamlX.Transform.Transformers;
using XamlX.TypeSystem;
-namespace Avalonia.NameGenerator.Compiler;
+namespace Avalonia.Generators.Compiler;
internal sealed class MiniCompiler : XamlCompiler
-
-
-