diff --git a/Framework/Avalonia/Extensions/EventArgsExtensions.cs b/Framework/Avalonia/Extensions/EventArgsExtensions.cs
index 9299fe5..18ee73b 100644
--- a/Framework/Avalonia/Extensions/EventArgsExtensions.cs
+++ b/Framework/Avalonia/Extensions/EventArgsExtensions.cs
@@ -1,7 +1,7 @@
 using Avalonia.Data.Converters;
 using System.Globalization;
 
-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;
 
 public static class EventArgsExtensions
 {
diff --git a/Framework/Avalonia/Extensions/IHostBuilderExtensions.cs b/Framework/Avalonia/Extensions/IHostBuilderExtensions.cs
index c9a12d8..a3093ee 100644
--- a/Framework/Avalonia/Extensions/IHostBuilderExtensions.cs
+++ b/Framework/Avalonia/Extensions/IHostBuilderExtensions.cs
@@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using Toolkit.Framework.Foundation;
 
-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;
 
 public static class IHostBuilderExtensions
 {
diff --git a/Framework/Avalonia/Extensions/IServiceCollectionExtensions.cs b/Framework/Avalonia/Extensions/IServiceCollectionExtensions.cs
index 6858114..12b2b7a 100644
--- a/Framework/Avalonia/Extensions/IServiceCollectionExtensions.cs
+++ b/Framework/Avalonia/Extensions/IServiceCollectionExtensions.cs
@@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Toolkit.Framework.Foundation;
 
-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;
 
 public static class IServiceCollectionExtensions
 {
diff --git a/Framework/Avalonia/Extensions/MarkupExtensions.cs b/Framework/Avalonia/Extensions/MarkupExtensions.cs
index f119b93..83bac02 100644
--- a/Framework/Avalonia/Extensions/MarkupExtensions.cs
+++ b/Framework/Avalonia/Extensions/MarkupExtensions.cs
@@ -1,6 +1,6 @@
 using Avalonia.Data;
 
-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;
 
 public static class MarkupExtensions
 {
diff --git a/Framework/Avalonia/Extensions/PropertyPathHelper..cs b/Framework/Avalonia/Extensions/PropertyPathHelper..cs
index 819e994..929873a 100644
--- a/Framework/Avalonia/Extensions/PropertyPathHelper..cs
+++ b/Framework/Avalonia/Extensions/PropertyPathHelper..cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Data;
 
-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;
 
 public static class PropertyPathHelper
 {
diff --git a/Framework/Avalonia/Markups/EventParameterExtension.cs b/Framework/Avalonia/Markups/EventParameterExtension.cs
index de305d6..7605e2f 100644
--- a/Framework/Avalonia/Markups/EventParameterExtension.cs
+++ b/Framework/Avalonia/Markups/EventParameterExtension.cs
@@ -1,6 +1,5 @@
 using Avalonia.Data.Converters;
 using Avalonia.Markup.Xaml;
-using Toolkit.Foundation.Avalonia;
 using Toolkit.Framework.Foundation;
 
 namespace Toolkit.Framework.Avalonia;
diff --git a/Framework/Avalonia/Navigation/ContentDialogNavigationHandler.cs b/Framework/Avalonia/Navigation/ContentDialogNavigationHandler.cs
index 439d470..5fe2adc 100644
--- a/Framework/Avalonia/Navigation/ContentDialogNavigationHandler.cs
+++ b/Framework/Avalonia/Navigation/ContentDialogNavigationHandler.cs
@@ -1,5 +1,6 @@
 using FluentAvalonia.UI.Controls;
 using Mediator;
+using Toolkit.Framework.Foundation;
 
 namespace Toolkit.Framework.Avalonia;
 
diff --git a/Framework/Avalonia/Properties/Assembly.cs b/Framework/Avalonia/Properties/Assembly.cs
index b8cb131..135543a 100644
--- a/Framework/Avalonia/Properties/Assembly.cs
+++ b/Framework/Avalonia/Properties/Assembly.cs
@@ -1,3 +1,3 @@
 using Avalonia.Metadata;
 
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Toolkit.Foundation.Avalonia")]
\ No newline at end of file
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Toolkit.Framework.Avalonia")]
\ No newline at end of file
diff --git a/Framework/Avalonia/Templates/TemplateSelector.cs b/Framework/Avalonia/Templates/TemplateSelector.cs
index 1b60f4e..6f6bd9d 100644
--- a/Framework/Avalonia/Templates/TemplateSelector.cs
+++ b/Framework/Avalonia/Templates/TemplateSelector.cs
@@ -2,7 +2,7 @@
 using Avalonia.Controls.Templates;
 using Toolkit.Framework.Foundation;
 
-namespace Toolkit.Foundation.Avalonia;
+namespace Toolkit.Framework.Avalonia;
 
 public class TemplateSelector : IDataTemplate, ITemplateSelector
 {