diff --git a/src/Avalonia.NameGenerator.Tests/FindControlNameGeneratorTests.cs b/src/Avalonia.NameGenerator.Tests/FindControlNameGeneratorTests.cs
index 461af0da72..d4d714ccb1 100644
--- a/src/Avalonia.NameGenerator.Tests/FindControlNameGeneratorTests.cs
+++ b/src/Avalonia.NameGenerator.Tests/FindControlNameGeneratorTests.cs
@@ -27,14 +27,14 @@ namespace Avalonia.NameGenerator.Tests
                 View.CreateAvaloniaCompilation()
                     .WithCustomTextBox();
 
-            var classResolver = new XamlXClassResolver(
+            var classResolver = new XamlXViewResolver(
                 new RoslynTypeSystem(compilation),
                 MiniCompiler.CreateDefault(
                     new RoslynTypeSystem(compilation),
                     MiniCompiler.AvaloniaXmlnsDefinitionAttribute));
 
             var xaml = await View.Load(markup);
-            var classInfo = classResolver.ResolveClass(xaml);
+            var classInfo = classResolver.ResolveView(xaml);
             var nameResolver = new XamlXNameResolver();
             var names = nameResolver.ResolveNames(classInfo.Xaml);
 
diff --git a/src/Avalonia.NameGenerator.Tests/XamlXClassResolverTests.cs b/src/Avalonia.NameGenerator.Tests/XamlXClassResolverTests.cs
index 1e6237acf6..510eb62a8a 100644
--- a/src/Avalonia.NameGenerator.Tests/XamlXClassResolverTests.cs
+++ b/src/Avalonia.NameGenerator.Tests/XamlXClassResolverTests.cs
@@ -27,11 +27,11 @@ namespace Avalonia.NameGenerator.Tests
                 .WithCustomTextBox();
 
             var types = new RoslynTypeSystem(compilation);
-            var resolver = new XamlXClassResolver(
+            var resolver = new XamlXViewResolver(
                 types,
                 MiniCompiler.CreateDefault(types, MiniCompiler.AvaloniaXmlnsDefinitionAttribute));
 
-            var resolvedClass = resolver.ResolveClass(xaml);
+            var resolvedClass = resolver.ResolveView(xaml);
             Assert.Equal(className, resolvedClass.ClassName);
             Assert.Equal(nameSpace, resolvedClass.NameSpace);
         }
diff --git a/src/Avalonia.NameGenerator.Tests/XamlXNameResolverTests.cs b/src/Avalonia.NameGenerator.Tests/XamlXNameResolverTests.cs
index 88b0788628..8447af4783 100644
--- a/src/Avalonia.NameGenerator.Tests/XamlXNameResolverTests.cs
+++ b/src/Avalonia.NameGenerator.Tests/XamlXNameResolverTests.cs
@@ -109,13 +109,13 @@ namespace Avalonia.NameGenerator.Tests
                 View.CreateAvaloniaCompilation()
                     .WithCustomTextBox();
 
-            var classResolver = new XamlXClassResolver(
+            var classResolver = new XamlXViewResolver(
                 new RoslynTypeSystem(compilation),
                 MiniCompiler.CreateDefault(
                     new RoslynTypeSystem(compilation),
                     MiniCompiler.AvaloniaXmlnsDefinitionAttribute));
 
-            var classInfo = classResolver.ResolveClass(xaml);
+            var classInfo = classResolver.ResolveView(xaml);
             var nameResolver = new XamlXNameResolver();
             return nameResolver.ResolveNames(classInfo.Xaml);
         }
diff --git a/src/Avalonia.NameGenerator/AvaloniaNameSourceGenerator.cs b/src/Avalonia.NameGenerator/AvaloniaNameSourceGenerator.cs
index 3cf8440f9e..adbc54985e 100644
--- a/src/Avalonia.NameGenerator/AvaloniaNameSourceGenerator.cs
+++ b/src/Avalonia.NameGenerator/AvaloniaNameSourceGenerator.cs
@@ -23,7 +23,7 @@ namespace Avalonia.NameGenerator
 
             INameGenerator avaloniaNameGenerator =
                 new AvaloniaNameGenerator(
-                    new XamlXClassResolver(types, compiler, true, type => ReportInvalidType(context, type)),
+                    new XamlXViewResolver(types, compiler, true, type => ReportInvalidType(context, type)),
                     new XamlXNameResolver(),
                     new FindControlCodeGenerator());
 
diff --git a/src/Avalonia.NameGenerator/Domain/IClassResolver.cs b/src/Avalonia.NameGenerator/Domain/IViewResolver.cs
similarity index 61%
rename from src/Avalonia.NameGenerator/Domain/IClassResolver.cs
rename to src/Avalonia.NameGenerator/Domain/IViewResolver.cs
index e8ef0e1027..11492c880f 100644
--- a/src/Avalonia.NameGenerator/Domain/IClassResolver.cs
+++ b/src/Avalonia.NameGenerator/Domain/IViewResolver.cs
@@ -2,18 +2,18 @@ using XamlX.Ast;
 
 namespace Avalonia.NameGenerator.Domain
 {
-    internal interface IClassResolver
+    internal interface IViewResolver
     {
-        ResolvedClass ResolveClass(string xaml);
+        ResolvedView ResolveView(string xaml);
     }
 
-    internal record ResolvedClass
+    internal record ResolvedView
     {
         public XamlDocument Xaml { get; }
         public string ClassName { get; }
         public string NameSpace { get; }
 
-        public ResolvedClass(string className, string nameSpace, XamlDocument xaml)
+        public ResolvedView(string className, string nameSpace, XamlDocument xaml)
         {
             ClassName = className;
             NameSpace = nameSpace;
diff --git a/src/Avalonia.NameGenerator/Generator/AvaloniaNameGenerator.cs b/src/Avalonia.NameGenerator/Generator/AvaloniaNameGenerator.cs
index 0512a8bba3..e65a3b6f38 100644
--- a/src/Avalonia.NameGenerator/Generator/AvaloniaNameGenerator.cs
+++ b/src/Avalonia.NameGenerator/Generator/AvaloniaNameGenerator.cs
@@ -7,11 +7,11 @@ namespace Avalonia.NameGenerator.Generator
 {
     internal class AvaloniaNameGenerator : INameGenerator
     {
-        private readonly IClassResolver _classes;
+        private readonly IViewResolver _classes;
         private readonly INameResolver _names;
         private readonly ICodeGenerator _code;
 
-        public AvaloniaNameGenerator(IClassResolver classes, INameResolver names, ICodeGenerator code)
+        public AvaloniaNameGenerator(IViewResolver classes, INameResolver names, ICodeGenerator code)
         {
             _classes = classes;
             _names = names;
@@ -26,7 +26,7 @@ namespace Avalonia.NameGenerator.Generator
                       file.Path.EndsWith(".paml") ||
                       file.Path.EndsWith(".axaml")
                 let xaml = file.GetText()!.ToString()
-                let type = _classes.ResolveClass(xaml)
+                let type = _classes.ResolveView(xaml)
                 where type != null
                 select type;
 
diff --git a/src/Avalonia.NameGenerator/Generator/XamlXClassResolver.cs b/src/Avalonia.NameGenerator/Generator/XamlXViewResolver.cs
similarity index 90%
rename from src/Avalonia.NameGenerator/Generator/XamlXClassResolver.cs
rename to src/Avalonia.NameGenerator/Generator/XamlXViewResolver.cs
index a879d5466e..cfb51e10a2 100644
--- a/src/Avalonia.NameGenerator/Generator/XamlXClassResolver.cs
+++ b/src/Avalonia.NameGenerator/Generator/XamlXViewResolver.cs
@@ -9,17 +9,17 @@ using XamlX.Parsers;
 
 namespace Avalonia.NameGenerator.Generator
 {
-    internal class XamlXClassResolver : IClassResolver, IXamlAstVisitor
+    internal class XamlXViewResolver : IViewResolver, IXamlAstVisitor
     {
         private readonly RoslynTypeSystem _typeSystem;
         private readonly MiniCompiler _compiler;
         private readonly bool _checkTypeValidity;
         private readonly Action<string> _onTypeInvalid;
 
-        private ResolvedClass _resolvedClass;
+        private ResolvedView _resolvedClass;
         private XamlDocument _xaml;
 
-        public XamlXClassResolver(
+        public XamlXViewResolver(
             RoslynTypeSystem typeSystem,
             MiniCompiler compiler,
             bool checkTypeValidity = false,
@@ -31,7 +31,7 @@ namespace Avalonia.NameGenerator.Generator
             _compiler = compiler;
         }
 
-        public ResolvedClass ResolveClass(string xaml)
+        public ResolvedView ResolveView(string xaml)
         {
             _resolvedClass = null;
             _xaml = XDocumentXamlParser.Parse(xaml, new Dictionary<string, string>
@@ -79,7 +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 ResolvedClass(className, nameSpace, _xaml);
+                    _resolvedClass = new ResolvedView(className, nameSpace, _xaml);
                     return node;
                 }
             }