diff --git a/src/Avalonia.NameGenerator/Generator/XamlXNameResolver.cs b/src/Avalonia.NameGenerator/Generator/XamlXNameResolver.cs
index bda9c98882..885e878748 100644
--- a/src/Avalonia.NameGenerator/Generator/XamlXNameResolver.cs
+++ b/src/Avalonia.NameGenerator/Generator/XamlXNameResolver.cs
@@ -18,6 +18,7 @@ namespace Avalonia.NameGenerator.Generator
 
         public IReadOnlyList<ResolvedName> ResolveNames(XamlDocument xaml)
         {
+            _items.Clear();
             xaml.Root.Visit(this);
             xaml.Root.VisitChildren(this);
             return _items;
diff --git a/src/Avalonia.NameGenerator/Generator/XamlXViewResolver.cs b/src/Avalonia.NameGenerator/Generator/XamlXViewResolver.cs
index 06edaff3c4..cfec01ea0f 100644
--- a/src/Avalonia.NameGenerator/Generator/XamlXViewResolver.cs
+++ b/src/Avalonia.NameGenerator/Generator/XamlXViewResolver.cs
@@ -79,8 +79,7 @@ namespace Avalonia.NameGenerator.Generator
                     var split = text.Text.Split('.');
                     var nameSpace = string.Join(".", split.Take(split.Length - 1));
                     var className = split.Last();
-                    
-                    
+
                     _resolvedClass = new ResolvedView(className, clrType, nameSpace, _xaml);
                     return node;
                 }
@@ -93,4 +92,4 @@ namespace Avalonia.NameGenerator.Generator
 
         void IXamlAstVisitor.Pop() { }
     }
-}
\ No newline at end of file
+}