diff --git a/src/Avalonia.Base/Styling/ThemeVariant.cs b/src/Avalonia.Base/Styling/ThemeVariant.cs
index 8218533f4f..5a6a8785a5 100644
--- a/src/Avalonia.Base/Styling/ThemeVariant.cs
+++ b/src/Avalonia.Base/Styling/ThemeVariant.cs
@@ -6,7 +6,7 @@ using Avalonia.Platform;
 namespace Avalonia.Styling;
 
 /// <summary>
-/// Specifies a UI theme variant that should be used for the 
+/// Specifies a UI theme variant that should be used for the Control and Application types.
 /// </summary>
 [TypeConverter(typeof(ThemeVariantTypeConverter))]
 public sealed record ThemeVariant
diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs
index 8456a9a3a9..6d9a6bd493 100644
--- a/src/Avalonia.Controls/Application.cs
+++ b/src/Avalonia.Controls/Application.cs
@@ -95,7 +95,7 @@ namespace Avalonia
             set => SetValue(RequestedThemeVariantProperty, value);
         }
         
-        /// <inheritdoc cref="ThemeVariantScope.ActualThemeVariant"/>
+        /// <inheritdoc />
         public ThemeVariant ActualThemeVariant => GetValue(ActualThemeVariantProperty);
 
         /// <summary>
diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index 775fc8e243..c9e8f0d045 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -162,6 +162,7 @@ namespace Avalonia.Controls
             set => SetValue(TagProperty, value);
         }
         
+        /// <inheritdoc />
         public ThemeVariant ActualThemeVariant => GetValue(ThemeVariantScope.ActualThemeVariantProperty);
 
         public event EventHandler? ActualThemeVariantChanged;
diff --git a/src/Avalonia.Controls/ThemeVariantScope.cs b/src/Avalonia.Controls/ThemeVariantScope.cs
index 2aac1d3e2f..ff950d3985 100644
--- a/src/Avalonia.Controls/ThemeVariantScope.cs
+++ b/src/Avalonia.Controls/ThemeVariantScope.cs
@@ -8,11 +8,11 @@ namespace Avalonia.Controls
     public class ThemeVariantScope : Decorator
     {
         /// <summary>
-        /// Defines the <see cref="StyledElement.ActualThemeVariant"/> property.
+        /// Defines the <see cref="Control.ActualThemeVariant"/> property.
         /// </summary>
         public static readonly StyledProperty<ThemeVariant> ActualThemeVariantProperty =
             AvaloniaProperty.Register<ThemeVariantScope, ThemeVariant>(
-                nameof(ThemeVariant),
+                nameof(ActualThemeVariant),
                 inherits: true,
                 defaultValue: ThemeVariant.Light);
 
@@ -21,9 +21,9 @@ namespace Avalonia.Controls
         /// </summary>
         public static readonly StyledProperty<ThemeVariant?> RequestedThemeVariantProperty =
             AvaloniaProperty.Register<ThemeVariantScope, ThemeVariant?>(
-                nameof(ThemeVariant),
+                nameof(RequestedThemeVariant),
                 defaultValue: ThemeVariant.Default);
-        
+
         /// <summary>
         /// Gets or sets the UI theme variant that is used by the control (and its child elements) for resource determination.
         /// The UI theme you specify with ThemeVariant can override the app-level ThemeVariant.