diff --git a/src/Umbraco.Tests/PublishedContent/DynamicXmlTests.cs b/src/Umbraco.Tests/PublishedContent/DynamicXmlTests.cs
index a566ce5cee..53d8efd1ad 100644
--- a/src/Umbraco.Tests/PublishedContent/DynamicXmlTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/DynamicXmlTests.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Tests.PublishedContent
         ///         http://issues.umbraco.org/issue/U4-1636
         /// </summary>
         [Test]
-        public void Deals_With_Hyphenated_values()
+        public void Deals_With_Hyphenated_Values()
         {
             var xml = @"<banner1Link>
   <url-picker some-attribute='Content'>
diff --git a/src/Umbraco.Web/UI/Controls/UmbracoControl.cs b/src/Umbraco.Web/UI/Controls/UmbracoControl.cs
index 0bb461a1ad..66f896312e 100644
--- a/src/Umbraco.Web/UI/Controls/UmbracoControl.cs
+++ b/src/Umbraco.Web/UI/Controls/UmbracoControl.cs
@@ -1,4 +1,8 @@
-using System.Web.UI;
+using System;
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Routing;
+using System.Web.UI;
 using Umbraco.Core;
 using Umbraco.Core.Services;
 using umbraco.BusinessLogic;
@@ -6,26 +10,37 @@ using umbraco.DataLayer;
 
 namespace Umbraco.Web.UI.Controls
 {
-	/// <summary>
+    /// <summary>
 	/// A control that exposes the helpful Umbraco context objects
 	/// </summary>
-	internal class UmbracoControl : Control
+	public abstract class UmbracoControl : Control
 	{
-		public UmbracoControl(UmbracoContext umbracoContext)
-		{
-			_umbracoContext = umbracoContext;
-		}
+		/// <summary>
+        /// Default constructor
+        /// </summary>
+        /// <param name="umbracoContext"></param>
+        protected UmbracoControl(UmbracoContext umbracoContext)
+        {
+            if (umbracoContext == null) throw new ArgumentNullException("umbracoContext");
+            UmbracoContext = umbracoContext;
+            Umbraco = new UmbracoHelper(umbracoContext);
+        }
 
-		public UmbracoControl()
-		{
-			
-		}
+        /// <summary>
+        /// Empty constructor, uses Singleton to resolve the UmbracoContext
+        /// </summary>
+        protected UmbracoControl()
+            : this(UmbracoContext.Current)
+        {
+        }
+
+        /// <summary>
+        /// Returns an UmbracoHelper object
+        /// </summary>
+        public UmbracoHelper Umbraco { get; private set; }
+
+        public UmbracoContext UmbracoContext { get; private set; }
 
-		private UmbracoContext _umbracoContext;
-		protected UmbracoContext UmbracoContext
-		{
-			get { return _umbracoContext ?? (_umbracoContext = UmbracoContext.Current); }
-		}
 		protected ApplicationContext ApplicationContext
 		{
 			get { return UmbracoContext.Application; }
@@ -39,6 +54,18 @@ namespace Umbraco.Web.UI.Controls
 			get { return ApplicationContext.Services; }
 		}
 
+        private UrlHelper _url;
+        /// <summary>
+        /// Returns a UrlHelper
+        /// </summary>
+        /// <remarks>
+        /// This URL helper is created without any route data and an empty request context
+        /// </remarks>
+        public UrlHelper Url
+        {
+            get { return _url ?? (_url = new UrlHelper(new RequestContext(new HttpContextWrapper(Context), new RouteData()))); }
+        }
+
 		/// <summary>
 		/// Returns the legacy SqlHelper
 		/// </summary>
diff --git a/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs b/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs
new file mode 100644
index 0000000000..35e6cba498
--- /dev/null
+++ b/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Routing;
+using System.Web.UI;
+using Umbraco.Core;
+using Umbraco.Core.Services;
+using umbraco.DataLayer;
+
+namespace Umbraco.Web.UI.Controls
+{
+    /// <summary>
+    /// A base class for all Presentation UserControls to inherit from
+    /// </summary>
+    public abstract class UmbracoUserControl : UserControl
+    {
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        /// <param name="umbracoContext"></param>
+        protected UmbracoUserControl(UmbracoContext umbracoContext)
+        {
+            if (umbracoContext == null) throw new ArgumentNullException("umbracoContext");
+            UmbracoContext = umbracoContext;
+            InstanceId = Guid.NewGuid();
+            Umbraco = new UmbracoHelper(umbracoContext);
+        }
+
+        /// <summary>
+        /// Empty constructor, uses Singleton to resolve the UmbracoContext
+        /// </summary>
+        protected UmbracoUserControl()
+            : this(UmbracoContext.Current)
+        {
+        }
+
+        /// <summary>
+        /// Useful for debugging
+        /// </summary>
+        internal Guid InstanceId { get; private set; }
+
+        /// <summary>
+        /// Returns an UmbracoHelper object
+        /// </summary>
+        public UmbracoHelper Umbraco { get; private set; }
+
+        /// <summary>
+        /// Returns the current UmbracoContext
+        /// </summary>
+        public UmbracoContext UmbracoContext { get; private set; }
+
+        /// <summary>
+        /// Returns the current ApplicationContext
+        /// </summary>
+        public ApplicationContext ApplicationContext
+        {
+            get { return UmbracoContext.Application; }
+        }
+
+        /// <summary>
+        /// Returns a ServiceContext
+        /// </summary>
+        public ServiceContext Services
+        {
+            get { return ApplicationContext.Services; }
+        }
+
+        /// <summary>
+        /// Returns a DatabaseContext
+        /// </summary>
+        public DatabaseContext DatabaseContext
+        {
+            get { return ApplicationContext.DatabaseContext; }
+        }
+
+        private UrlHelper _url;
+        /// <summary>
+        /// Returns a UrlHelper
+        /// </summary>
+        /// <remarks>
+        /// This URL helper is created without any route data and an empty request context
+        /// </remarks>
+        public UrlHelper Url
+        {
+            get { return _url ?? (_url = new UrlHelper(new RequestContext(new HttpContextWrapper(Context), new RouteData()))); }
+        }
+
+        /// <summary>
+        /// Returns the legacy SqlHelper
+        /// </summary>
+        protected ISqlHelper SqlHelper
+        {
+            get { return global::umbraco.BusinessLogic.Application.SqlHelper; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 6bd92e1940..8c9b6c282a 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -356,6 +356,7 @@
     <Compile Include="Trees\PartialViewsTree.cs" />
     <Compile Include="UI\Controls\InsertMacroSplitButton.cs" />
     <Compile Include="UI\Controls\UmbracoControl.cs" />
+    <Compile Include="UI\Controls\UmbracoUserControl.cs" />
     <Compile Include="UI\Pages\BasePage.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
diff --git a/src/Umbraco.Web/UmbracoUserControl.cs b/src/Umbraco.Web/UmbracoUserControl.cs
index ac0a0dd60f..7b698139f4 100644
--- a/src/Umbraco.Web/UmbracoUserControl.cs
+++ b/src/Umbraco.Web/UmbracoUserControl.cs
@@ -11,77 +11,26 @@ namespace Umbraco.Web
     /// <summary>
     /// A base class for all Presentation UserControls to inherit from
     /// </summary>
-    public abstract class UmbracoUserControl : UserControl
+    [Obsolete("Use the Umbraco.Web.UI.Controls.UmbracoUserControl instead")]
+    public abstract class UmbracoUserControl : Umbraco.Web.UI.Controls.UmbracoUserControl
     {
          /// <summary>
 		/// Default constructor
 		/// </summary>
 		/// <param name="umbracoContext"></param>
 		protected UmbracoUserControl(UmbracoContext umbracoContext)
+            : base(umbracoContext)
 		{
-            if (umbracoContext == null) throw new ArgumentNullException("umbracoContext");
-            UmbracoContext = umbracoContext;
-            InstanceId = Guid.NewGuid();
-            Umbraco = new UmbracoHelper(umbracoContext);
+            
 		}
 
 		/// <summary>
 		/// Empty constructor, uses Singleton to resolve the UmbracoContext
 		/// </summary>
         protected UmbracoUserControl()
-			: this(UmbracoContext.Current)
+			: base()
 		{			
 		}
 
-        /// <summary>
-        /// Useful for debugging
-        /// </summary>
-        internal Guid InstanceId { get; private set; }
-
-        /// <summary>
-        /// Returns an UmbracoHelper object
-        /// </summary>
-        public UmbracoHelper Umbraco { get; private set; }
-
-        /// <summary>
-        /// Returns the current UmbracoContext
-        /// </summary>
-        public UmbracoContext UmbracoContext { get; private set; }
-
-        /// <summary>
-        /// Returns the current ApplicationContext
-        /// </summary>
-        public ApplicationContext ApplicationContext
-        {
-            get { return UmbracoContext.Application; }
-        }
-
-        /// <summary>
-        /// Returns a ServiceContext
-        /// </summary>
-        public ServiceContext Services
-        {
-            get { return ApplicationContext.Services; }
-        }
-
-        /// <summary>
-        /// Returns a DatabaseContext
-        /// </summary>
-        public DatabaseContext DatabaseContext
-        {
-            get { return ApplicationContext.DatabaseContext; }
-        }
-
-        private UrlHelper _url;
-        /// <summary>
-        /// Returns a UrlHelper
-        /// </summary>
-        /// <remarks>
-        /// This URL helper is created without any route data and an empty request context
-        /// </remarks>
-        public UrlHelper Url
-        {
-            get { return _url ?? (_url = new UrlHelper(new RequestContext(new HttpContextWrapper(Context), new RouteData()))); }
-        }
     }
 }
\ No newline at end of file