diff --git a/src/Avalonia.Styling/Controls/ResourceProviderExtensions.cs b/src/Avalonia.Styling/Controls/ResourceNodeExtensions.cs
similarity index 98%
rename from src/Avalonia.Styling/Controls/ResourceProviderExtensions.cs
rename to src/Avalonia.Styling/Controls/ResourceNodeExtensions.cs
index 01112eaf2c..19a16f86c4 100644
--- a/src/Avalonia.Styling/Controls/ResourceProviderExtensions.cs
+++ b/src/Avalonia.Styling/Controls/ResourceNodeExtensions.cs
@@ -3,7 +3,7 @@ using Avalonia.Reactive;
 
 namespace Avalonia.Controls
 {
-    public static class ResourceProviderExtensions
+    public static class ResourceNodeExtensions
     {
         /// <summary>
         /// Finds the specified resource by searching up the logical tree and then global styles.
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
index 0a9289bec9..5bdb0cc235 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
@@ -18,7 +18,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
         {
         }
 
-        public DynamicResourceExtension(string resourceKey)
+        public DynamicResourceExtension(object resourceKey)
         {
             ResourceKey = resourceKey;
         }
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
index d6b170ae9d..6d055e033f 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
@@ -16,12 +16,12 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
         {
         }
 
-        public StaticResourceExtension(string resourceKey)
+        public StaticResourceExtension(object resourceKey)
         {
             ResourceKey = resourceKey;
         }
 
-        public string ResourceKey { get; set; }
+        public object ResourceKey { get; set; }
 
         public object ProvideValue(IServiceProvider serviceProvider)
         {