diff --git a/src/Umbraco.Core/Media/EmbedProviders/DailyMotion.cs b/src/Umbraco.Core/Media/EmbedProviders/DailyMotion.cs
index 3953fdd2b7..ab3c36031c 100644
--- a/src/Umbraco.Core/Media/EmbedProviders/DailyMotion.cs
+++ b/src/Umbraco.Core/Media/EmbedProviders/DailyMotion.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Cms.Core.Media.EmbedProviders;
 /// <summary>
 ///     Embed Provider for Dailymotion the popular online video-sharing platform.
 /// </summary>
-public class DailyMotion : OEmbedProviderBase
+public class DailyMotion : EmbedProviderBase
 {
     public DailyMotion(IJsonSerializer jsonSerializer)
         : base(jsonSerializer)
diff --git a/src/Umbraco.Core/Media/EmbedProviders/EmbedProviderBase.cs b/src/Umbraco.Core/Media/EmbedProviders/EmbedProviderBase.cs
index e51005b84b..d0a8727442 100644
--- a/src/Umbraco.Core/Media/EmbedProviders/EmbedProviderBase.cs
+++ b/src/Umbraco.Core/Media/EmbedProviders/EmbedProviderBase.cs
@@ -2,7 +2,7 @@ using Umbraco.Cms.Core.Serialization;
 
 namespace Umbraco.Cms.Core.Media.EmbedProviders;
 
-[Obsolete("Use OEmbedProviderBase instead")]
+[Obsolete("Use OEmbedProviderBase instead- This will be removed in Umbraco 12")]
 public abstract class EmbedProviderBase : OEmbedProviderBase
 {
     protected EmbedProviderBase(IJsonSerializer jsonSerializer)
diff --git a/src/Umbraco.Core/Media/EmbedProviders/Flickr.cs b/src/Umbraco.Core/Media/EmbedProviders/Flickr.cs
index 7738981fe9..e1842ed238 100644
--- a/src/Umbraco.Core/Media/EmbedProviders/Flickr.cs
+++ b/src/Umbraco.Core/Media/EmbedProviders/Flickr.cs
@@ -7,7 +7,7 @@ namespace Umbraco.Cms.Core.Media.EmbedProviders;
 /// <summary>
 ///     Embed Provider for Flickr the popular online image hosting and video hosting service.
 /// </summary>
-public class Flickr : OEmbedProviderBase
+public class Flickr : EmbedProviderBase
 {
     public Flickr(IJsonSerializer jsonSerializer)
         : base(jsonSerializer)
diff --git a/src/Umbraco.Core/Media/EmbedProviders/GettyImages.cs b/src/Umbraco.Core/Media/EmbedProviders/GettyImages.cs
index 5341580967..cd045d7df3 100644
--- a/src/Umbraco.Core/Media/EmbedProviders/GettyImages.cs
+++ b/src/Umbraco.Core/Media/EmbedProviders/GettyImages.cs
@@ -5,7 +5,7 @@ namespace Umbraco.Cms.Core.Media.EmbedProviders;
 /// <summary>
 ///     Embed Provider for Getty Images supplier of stock images, editorial photography, video and music for business and consumers.
 /// </summary>
-public class GettyImages : OEmbedProviderBase
+public class GettyImages : EmbedProviderBase
 {
     public GettyImages(IJsonSerializer jsonSerializer)
         : base(jsonSerializer)
diff --git a/src/Umbraco.Core/Media/EmbedProviders/Giphy.cs b/src/Umbraco.Core/Media/EmbedProviders/Giphy.cs
index a7fde54f18..3a6ad54204 100644
--- a/src/Umbraco.Core/Media/EmbedProviders/Giphy.cs
+++ b/src/Umbraco.Core/Media/EmbedProviders/Giphy.cs
@@ -5,7 +5,7 @@ namespace Umbraco.Cms.Core.Media.EmbedProviders;
 /// <summary>
 ///     Embed Provider for Giphy.com the popular online GIFs and animated sticker provider.
 /// </summary>
-public class Giphy : OEmbedProviderBase
+public class Giphy : EmbedProviderBase
 {
     public Giphy(IJsonSerializer jsonSerializer)
         : base(jsonSerializer)
diff --git a/src/Umbraco.Core/Media/EmbedProviders/Hulu.cs b/src/Umbraco.Core/Media/EmbedProviders/Hulu.cs
index 85c1214fd1..87bc0524e4 100644
--- a/src/Umbraco.Core/Media/EmbedProviders/Hulu.cs
+++ b/src/Umbraco.Core/Media/EmbedProviders/Hulu.cs
@@ -5,7 +5,7 @@ namespace Umbraco.Cms.Core.Media.EmbedProviders;
 /// <summary>
 ///     Embed Provider for Hulu the the popular online subscription streaming service.
 /// </summary>
-public class Hulu : OEmbedProviderBase
+public class Hulu : EmbedProviderBase
 {
     public Hulu(IJsonSerializer jsonSerializer)
         : base(jsonSerializer)
diff --git a/src/Umbraco.Core/Media/EmbedProviders/Issuu.cs b/src/Umbraco.Core/Media/EmbedProviders/Issuu.cs
index 1a53ad88d1..7da51b51ad 100644
--- a/src/Umbraco.Core/Media/EmbedProviders/Issuu.cs
+++ b/src/Umbraco.Core/Media/EmbedProviders/Issuu.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Cms.Core.Media.EmbedProviders;
 /// <summary>
 ///     Embed Provider for Issuu the popular platform to create interactive flipbooks, social media posts, GIFs, and more from a single piece of static content.
 /// </summary>
-public class Issuu : OEmbedProviderBase
+public class Issuu : EmbedProviderBase
 {
     public Issuu(IJsonSerializer jsonSerializer)
         : base(jsonSerializer)
diff --git a/src/Umbraco.Core/Media/EmbedProviders/Kickstarter.cs b/src/Umbraco.Core/Media/EmbedProviders/Kickstarter.cs
index daf1cc25f9..fecfd8606b 100644
--- a/src/Umbraco.Core/Media/EmbedProviders/Kickstarter.cs
+++ b/src/Umbraco.Core/Media/EmbedProviders/Kickstarter.cs
@@ -5,7 +5,7 @@ namespace Umbraco.Cms.Core.Media.EmbedProviders;
 /// <summary>
 ///     Embed Provider for Kickstarter the popular online crowdfunding platform focused on creativity.
 /// </summary>
-public class Kickstarter : OEmbedProviderBase
+public class Kickstarter : EmbedProviderBase
 {
     public Kickstarter(IJsonSerializer jsonSerializer)
         : base(jsonSerializer)
diff --git a/src/Umbraco.Core/Media/EmbedProviders/Slideshare.cs b/src/Umbraco.Core/Media/EmbedProviders/Slideshare.cs
index 33802fa059..1791034168 100644
--- a/src/Umbraco.Core/Media/EmbedProviders/Slideshare.cs
+++ b/src/Umbraco.Core/Media/EmbedProviders/Slideshare.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Cms.Core.Media.EmbedProviders;
 /// <summary>
 ///     Embed Provider for SlideShare for professional online content including presentations, infographics, documents, and videos.
 /// </summary>
-public class Slideshare : OEmbedProviderBase
+public class Slideshare : EmbedProviderBase
 {
     public Slideshare(IJsonSerializer jsonSerializer)
         : base(jsonSerializer)
diff --git a/src/Umbraco.Core/Media/EmbedProviders/SoundCloud.cs b/src/Umbraco.Core/Media/EmbedProviders/SoundCloud.cs
index 2d59031b63..ccb3104940 100644
--- a/src/Umbraco.Core/Media/EmbedProviders/SoundCloud.cs
+++ b/src/Umbraco.Core/Media/EmbedProviders/SoundCloud.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Cms.Core.Media.EmbedProviders;
 /// <summary>
 ///     Embed Provider for SoundCloud the popular online audio distribution platform and music sharing provider.
 /// </summary>
-public class Soundcloud : OEmbedProviderBase
+public class Soundcloud : EmbedProviderBase
 {
     public Soundcloud(IJsonSerializer jsonSerializer)
         : base(jsonSerializer)
diff --git a/src/Umbraco.Core/Media/EmbedProviders/Ted.cs b/src/Umbraco.Core/Media/EmbedProviders/Ted.cs
index 5fcc7fcb42..1e7981f7af 100644
--- a/src/Umbraco.Core/Media/EmbedProviders/Ted.cs
+++ b/src/Umbraco.Core/Media/EmbedProviders/Ted.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Cms.Core.Media.EmbedProviders;
 /// <summary>
 ///     Embed Provider for Ted that posts talks online for free distribution.
 /// </summary>
-public class Ted : OEmbedProviderBase
+public class Ted : EmbedProviderBase
 {
     public Ted(IJsonSerializer jsonSerializer)
         : base(jsonSerializer)
diff --git a/src/Umbraco.Core/Media/EmbedProviders/Twitter.cs b/src/Umbraco.Core/Media/EmbedProviders/Twitter.cs
index 81aeb36491..af2c723533 100644
--- a/src/Umbraco.Core/Media/EmbedProviders/Twitter.cs
+++ b/src/Umbraco.Core/Media/EmbedProviders/Twitter.cs
@@ -5,7 +5,7 @@ namespace Umbraco.Cms.Core.Media.EmbedProviders;
 /// <summary>
 ///     Embed Provider for Twitter the popular online service for microblogging and social networking.
 /// </summary>
-public class Twitter : OEmbedProviderBase
+public class Twitter : EmbedProviderBase
 {
     public Twitter(IJsonSerializer jsonSerializer)
         : base(jsonSerializer)
diff --git a/src/Umbraco.Core/Media/EmbedProviders/Vimeo.cs b/src/Umbraco.Core/Media/EmbedProviders/Vimeo.cs
index e4d19d463a..0159e59cbd 100644
--- a/src/Umbraco.Core/Media/EmbedProviders/Vimeo.cs
+++ b/src/Umbraco.Core/Media/EmbedProviders/Vimeo.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Cms.Core.Media.EmbedProviders;
 /// <summary>
 ///     Embed Provider for Vimeo the popular online video hosting, sharing, and services platform provider.
 /// </summary>
-public class Vimeo : OEmbedProviderBase
+public class Vimeo : EmbedProviderBase
 {
     public Vimeo(IJsonSerializer jsonSerializer)
         : base(jsonSerializer)
diff --git a/src/Umbraco.Core/Media/EmbedProviders/Youtube.cs b/src/Umbraco.Core/Media/EmbedProviders/Youtube.cs
index 30cf2e6016..ceb8af99e9 100644
--- a/src/Umbraco.Core/Media/EmbedProviders/Youtube.cs
+++ b/src/Umbraco.Core/Media/EmbedProviders/Youtube.cs
@@ -5,7 +5,7 @@ namespace Umbraco.Cms.Core.Media.EmbedProviders;
 /// <summary>
 ///     Embed Provider for YouTube the popular online video sharing and social media platform provider.
 /// </summary>
-public class YouTube : OEmbedProviderBase
+public class YouTube : EmbedProviderBase
 {
     public YouTube(IJsonSerializer jsonSerializer)
         : base(jsonSerializer)