diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs
index 0d89ad65b1..1185fb5b20 100644
--- a/src/Avalonia.Controls/Application.cs
+++ b/src/Avalonia.Controls/Application.cs
@@ -29,7 +29,7 @@ namespace Avalonia
     /// method.
     /// - Tracks the lifetime of the application.
     /// </remarks>
-    public class Application : IApplicationLifecycle, IGlobalDataTemplates, IGlobalStyles, IStyleRoot, IResourceHost
+    public class Application : IApplicationLifecycle, IGlobalDataTemplates, IGlobalStyles, IStyleRoot, IResourceProvider
     {
         /// <summary>
         /// The application-global data templates.
@@ -150,7 +150,7 @@ namespace Avalonia
         }
 
         /// <inheritdoc/>
-        bool IResourceHost.TryGetResource(string key, out object value)
+        bool IResourceProvider.TryGetResource(string key, out object value)
         {
             value = null;
             return _resources?.TryGetResource(key, out value) ??
diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index ab5d9a7f06..f72208e276 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -425,7 +425,7 @@ namespace Avalonia.Controls
         protected IPseudoClasses PseudoClasses => Classes;
 
         /// <inheritdoc/>
-        bool IResourceHost.TryGetResource(string key, out object value)
+        bool IResourceProvider.TryGetResource(string key, out object value)
         {
             value = null;
             return _resources?.TryGetResource(key, out value) ?? 
diff --git a/src/Avalonia.Controls/ControlExtensions.cs b/src/Avalonia.Controls/ControlExtensions.cs
index d0b8b75e7b..8e29a5b447 100644
--- a/src/Avalonia.Controls/ControlExtensions.cs
+++ b/src/Avalonia.Controls/ControlExtensions.cs
@@ -96,7 +96,7 @@ namespace Avalonia.Controls
 
             while (current != null)
             {
-                if (current is IResourceHost host)
+                if (current is IResourceProvider host)
                 {
                     if (host.TryGetResource(key, out var value))
                     {
diff --git a/src/Avalonia.Controls/IControl.cs b/src/Avalonia.Controls/IControl.cs
index 02973bb38d..37ad12cf91 100644
--- a/src/Avalonia.Controls/IControl.cs
+++ b/src/Avalonia.Controls/IControl.cs
@@ -14,7 +14,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// Interface for Avalonia controls.
     /// </summary>
-    public interface IControl : IVisual, ILogical, ILayoutable, IInputElement, INamed, IResourceHost, IStyleable, IStyleHost
+    public interface IControl : IVisual, ILogical, ILayoutable, IInputElement, INamed, IResourceProvider, IStyleable, IStyleHost
     {
         /// <summary>
         /// Occurs when the control has finished initialization.
diff --git a/src/Avalonia.Styling/Controls/IResourceHost.cs b/src/Avalonia.Styling/Controls/IResourceProvider.cs
similarity index 94%
rename from src/Avalonia.Styling/Controls/IResourceHost.cs
rename to src/Avalonia.Styling/Controls/IResourceProvider.cs
index 6cee7083e0..3e47bf9092 100644
--- a/src/Avalonia.Styling/Controls/IResourceHost.cs
+++ b/src/Avalonia.Styling/Controls/IResourceProvider.cs
@@ -5,7 +5,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// Defines an element that can be queried for resources.
     /// </summary>
-    public interface IResourceHost
+    public interface IResourceProvider
     {
         /// <summary>
         /// Tries to find a resource within the element.
diff --git a/src/Avalonia.Styling/Styling/IStyle.cs b/src/Avalonia.Styling/Styling/IStyle.cs
index 70f6c60d14..aa8980ddde 100644
--- a/src/Avalonia.Styling/Styling/IStyle.cs
+++ b/src/Avalonia.Styling/Styling/IStyle.cs
@@ -8,7 +8,7 @@ namespace Avalonia.Styling
     /// <summary>
     /// Defines the interface for styles.
     /// </summary>
-    public interface IStyle : IResourceHost
+    public interface IStyle : IResourceProvider
     {
         /// <summary>
         /// Attaches the style to a control if the style's selector matches.
diff --git a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs b/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
index 006306a3e4..8bf6102f27 100644
--- a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
+++ b/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs
@@ -162,7 +162,7 @@ namespace Avalonia.Layout.UnitTests
         private void RegisterServices()
         {
             var globalStyles = new Mock<IGlobalStyles>();
-            var globalStylesResources = globalStyles.As<IResourceHost>();
+            var globalStylesResources = globalStyles.As<IResourceProvider>();
             var outObj = (object)10;
             globalStylesResources.Setup(x => x.TryGetResource("FontSizeNormal", out outObj)).Returns(true);