diff --git a/src/Umbraco.Core/Media/IEmbedProvider.cs b/src/Umbraco.Core/Media/IEmbedProvider.cs
index f785d867b3..73232d4637 100644
--- a/src/Umbraco.Core/Media/IEmbedProvider.cs
+++ b/src/Umbraco.Core/Media/IEmbedProvider.cs
@@ -1,6 +1,6 @@
 namespace Umbraco.Core.Media
 {
-    internal interface IEmbedProvider
+    public interface IEmbedProvider
     {
         bool SupportsDimensions { get; }
 
diff --git a/src/Umbraco.Core/Media/IEmbedSettingProvider.cs b/src/Umbraco.Core/Media/IEmbedSettingProvider.cs
index 903c5479b5..ab1979184b 100644
--- a/src/Umbraco.Core/Media/IEmbedSettingProvider.cs
+++ b/src/Umbraco.Core/Media/IEmbedSettingProvider.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Media
 {
-    internal interface IEmbedSettingProvider
+    public interface IEmbedSettingProvider
     {       
         object GetSetting(XmlNode settingNode);
     }
diff --git a/src/Umbraco.Core/Media/ProviderSetting.cs b/src/Umbraco.Core/Media/ProviderSetting.cs
index c19fcadecb..bfd06203d4 100644
--- a/src/Umbraco.Core/Media/ProviderSetting.cs
+++ b/src/Umbraco.Core/Media/ProviderSetting.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Media
 {
-    internal class ProviderSetting : Attribute
+    public class ProviderSetting : Attribute
     {
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index a056a784e2..2217987e19 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -270,9 +270,9 @@
     <None Include="config\FileSystemProviders.Release.config">
       <DependentUpon>FileSystemProviders.config</DependentUpon>
     </None>
-    <Content Include="config\embed.config" />
-    <None Include="config\embed.Release.config">
-      <DependentUpon>embed.config</DependentUpon>
+    <Content Include="config\EmbeddedMedia.config" />
+    <None Include="config\EmbeddedMedia.Release.config">
+      <DependentUpon>EmbeddedMedia.config</DependentUpon>
     </None>
     <None Include="config\xsltExtensions.Release.config">
       <DependentUpon>xsltExtensions.config</DependentUpon>
diff --git a/src/Umbraco.Web.UI/config/embed.Release.config b/src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
similarity index 100%
rename from src/Umbraco.Web.UI/config/embed.Release.config
rename to src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
diff --git a/src/Umbraco.Web.UI/config/embed.config b/src/Umbraco.Web.UI/config/EmbeddedMedia.config
similarity index 100%
rename from src/Umbraco.Web.UI/config/embed.config
rename to src/Umbraco.Web.UI/config/EmbeddedMedia.config
diff --git a/src/umbraco.webservices/media/mediaService.cs b/src/umbraco.webservices/media/mediaService.cs
index 9a90d3aa59..05f1d51287 100644
--- a/src/umbraco.webservices/media/mediaService.cs
+++ b/src/umbraco.webservices/media/mediaService.cs
@@ -199,7 +199,7 @@ namespace umbraco.webservices.media
             
             //todo cache embed doc
             var xmlConfig = new XmlDocument();
-            xmlConfig.Load(GlobalSettings.FullpathToRoot + Path.DirectorySeparatorChar + "config" + Path.DirectorySeparatorChar + "Embed.config");
+            xmlConfig.Load(GlobalSettings.FullpathToRoot + Path.DirectorySeparatorChar + "config" + Path.DirectorySeparatorChar + "EmbeddedMedia.config");
 
             foreach (XmlNode node in xmlConfig.SelectNodes("//provider"))
             {