diff --git a/samples/TestApplication/Program.cs b/samples/TestApplication/Program.cs
index 7f1de7cbcd..54f7686e8c 100644
--- a/samples/TestApplication/Program.cs
+++ b/samples/TestApplication/Program.cs
@@ -8,6 +8,7 @@ using Perspex;
 using Perspex.Animation;
 using Perspex.Collections;
 using Perspex.Controls;
+using Perspex.Controls.Html;
 using Perspex.Controls.Primitives;
 using Perspex.Controls.Shapes;
 using Perspex.Controls.Templates;
diff --git a/src/Perspex.HtmlRenderer/Adapters/ControlAdapter.cs b/src/Perspex.HtmlRenderer/Adapters/ControlAdapter.cs
index 3f76af92e1..f0f84cb64f 100644
--- a/src/Perspex.HtmlRenderer/Adapters/ControlAdapter.cs
+++ b/src/Perspex.HtmlRenderer/Adapters/ControlAdapter.cs
@@ -11,6 +11,7 @@
 // "The Art of War"
 
 using Perspex.Controls;
+using Perspex.Controls.Html;
 using Perspex.Input;
 using TheArtOfDev.HtmlRenderer.Adapters;
 using TheArtOfDev.HtmlRenderer.Adapters.Entities;
diff --git a/src/Perspex.HtmlRenderer/HtmlContainer.cs b/src/Perspex.HtmlRenderer/HtmlContainer.cs
index a97987e90d..ead879b116 100644
--- a/src/Perspex.HtmlRenderer/HtmlContainer.cs
+++ b/src/Perspex.HtmlRenderer/HtmlContainer.cs
@@ -12,6 +12,9 @@
 
 using System;
 using System.Collections.Generic;
+using Perspex;
+using Perspex.Controls;
+using Perspex.Controls.Html;
 using Perspex.Input;
 using Perspex.Media;
 using TheArtOfDev.HtmlRenderer.Adapters.Entities;
@@ -22,7 +25,7 @@ using TheArtOfDev.HtmlRenderer.Core.Utils;
 using TheArtOfDev.HtmlRenderer.Perspex.Adapters;
 using TheArtOfDev.HtmlRenderer.Perspex.Utilities;
 
-namespace Perspex.Controls
+namespace TheArtOfDev.HtmlRenderer.Perspex
 {
     /// <summary>
     /// Low level handling of Html Renderer logic, this class is used by <see cref="HtmlParser"/>, 
diff --git a/src/Perspex.HtmlRenderer/HtmlControl.cs b/src/Perspex.HtmlRenderer/HtmlControl.cs
index 66c2289ebb..2b42e6960c 100644
--- a/src/Perspex.HtmlRenderer/HtmlControl.cs
+++ b/src/Perspex.HtmlRenderer/HtmlControl.cs
@@ -19,9 +19,10 @@ using Perspex.Media;
 using Perspex.Threading;
 using TheArtOfDev.HtmlRenderer.Core;
 using TheArtOfDev.HtmlRenderer.Core.Entities;
+using TheArtOfDev.HtmlRenderer.Perspex;
 using TheArtOfDev.HtmlRenderer.Perspex.Adapters;
 
-namespace Perspex.Controls
+namespace Perspex.Controls.Html
 {
     /// <summary>
     /// Provides HTML rendering using the text property.<br/>
diff --git a/src/Perspex.HtmlRenderer/HtmlLabel.cs b/src/Perspex.HtmlRenderer/HtmlLabel.cs
index 1ea40f3684..8d96576937 100644
--- a/src/Perspex.HtmlRenderer/HtmlLabel.cs
+++ b/src/Perspex.HtmlRenderer/HtmlLabel.cs
@@ -17,7 +17,7 @@ using TheArtOfDev.HtmlRenderer.Adapters.Entities;
 using TheArtOfDev.HtmlRenderer.Core;
 using TheArtOfDev.HtmlRenderer.Perspex.Adapters;
 
-namespace Perspex.Controls
+namespace Perspex.Controls.Html
 {
     /// <summary>
     /// Provides HTML rendering using the text property.<br/>
diff --git a/src/Perspex.HtmlRenderer/HtmlRendererRoutedEventArgs.cs b/src/Perspex.HtmlRenderer/HtmlRendererRoutedEventArgs.cs
index 61f2ccb1fa..34db5ff548 100644
--- a/src/Perspex.HtmlRenderer/HtmlRendererRoutedEventArgs.cs
+++ b/src/Perspex.HtmlRenderer/HtmlRendererRoutedEventArgs.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Perspex.Interactivity;
 
-namespace Perspex.HtmlRenderer
+namespace Perspex.Controls.Html
 {
     public class HtmlRendererRoutedEventArgs<T> : RoutedEventArgs
     {