diff --git a/Assets/AppPrefabs/Support/Scripts/AttachToController.cs b/Assets/AppPrefabs/Support/Scripts/AttachToController.cs
index 03f1141..ba79381 100644
--- a/Assets/AppPrefabs/Support/Scripts/AttachToController.cs
+++ b/Assets/AppPrefabs/Support/Scripts/AttachToController.cs
@@ -7,7 +7,7 @@ using HoloToolkit.Unity.InputModule;
 using UnityEngine;
 using UnityEngine.XR.WSA.Input;
 
-namespace MRDL.Controllers
+namespace HoloToolkit.Unity.Controllers
 {
     /// <summary>
     /// Waits for a controller to be instantiated, then attaches itself to a specified element
diff --git a/Assets/AppPrefabs/Support/Scripts/Brush.cs b/Assets/AppPrefabs/Support/Scripts/Brush.cs
index 1c7a73b..7e440ea 100644
--- a/Assets/AppPrefabs/Support/Scripts/Brush.cs
+++ b/Assets/AppPrefabs/Support/Scripts/Brush.cs
@@ -4,7 +4,7 @@
 using System.Collections;
 using UnityEngine;
 
-namespace MRDL.ControllerExamples
+namespace HoloToolkit.Unity.ControllerExamples
 {
     public class Brush : MonoBehaviour
     {
diff --git a/Assets/AppPrefabs/Support/Scripts/BrushController.cs b/Assets/AppPrefabs/Support/Scripts/BrushController.cs
index 6df850c..d4448fd 100644
--- a/Assets/AppPrefabs/Support/Scripts/BrushController.cs
+++ b/Assets/AppPrefabs/Support/Scripts/BrushController.cs
@@ -5,7 +5,7 @@ using System.Collections;
 using UnityEngine;
 using UnityEngine.XR.WSA.Input;
 
-namespace MRDL.ControllerExamples
+namespace HoloToolkit.Unity.ControllerExamples
 {
     public class BrushController : MonoBehaviour
     {
diff --git a/Assets/AppPrefabs/Support/Scripts/BrushSelector.cs b/Assets/AppPrefabs/Support/Scripts/BrushSelector.cs
index 7564cd9..59e7428 100644
--- a/Assets/AppPrefabs/Support/Scripts/BrushSelector.cs
+++ b/Assets/AppPrefabs/Support/Scripts/BrushSelector.cs
@@ -2,12 +2,12 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using HoloToolkit.Unity.InputModule;
-using MRDL.Design;
+using HoloToolkit.Unity.Design;
 using System.Collections;
 using UnityEngine;
 using UnityEngine.XR.WSA.Input;
 
-namespace MRDL.ControllerExamples
+namespace HoloToolkit.Unity.ControllerExamples
 {
     public class BrushSelector : MonoBehaviour
     {
diff --git a/Assets/AppPrefabs/Support/Scripts/ColorPickerWheel.cs b/Assets/AppPrefabs/Support/Scripts/ColorPickerWheel.cs
index 0b2e0aa..24eb12e 100644
--- a/Assets/AppPrefabs/Support/Scripts/ColorPickerWheel.cs
+++ b/Assets/AppPrefabs/Support/Scripts/ColorPickerWheel.cs
@@ -2,12 +2,12 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using HoloToolkit.Unity.InputModule;
-using MRDL.Controllers;
+using HoloToolkit.Unity.Controllers;
 using System.Collections;
 using UnityEngine;
 using UnityEngine.XR.WSA.Input;
 
-namespace MRDL.ControllerExamples
+namespace HoloToolkit.Unity.ControllerExamples
 {
     public class ColorPickerWheel : MonoBehaviour, IPointerTarget
     {
diff --git a/Assets/AppPrefabs/Support/Scripts/Distorter.cs b/Assets/AppPrefabs/Support/Scripts/Distorter.cs
index 8967499..8a8d757 100644
--- a/Assets/AppPrefabs/Support/Scripts/Distorter.cs
+++ b/Assets/AppPrefabs/Support/Scripts/Distorter.cs
@@ -3,7 +3,7 @@
 
 using UnityEngine;
 
-namespace MRDL.Design
+namespace HoloToolkit.Unity.Design
 {
     public interface IDistorter
     {
diff --git a/Assets/AppPrefabs/Support/Scripts/Editor/LineBaseInspector.cs b/Assets/AppPrefabs/Support/Scripts/Editor/LineBaseInspector.cs
index 4f14b96..b173757 100644
--- a/Assets/AppPrefabs/Support/Scripts/Editor/LineBaseInspector.cs
+++ b/Assets/AppPrefabs/Support/Scripts/Editor/LineBaseInspector.cs
@@ -4,7 +4,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace MRDL.Design
+namespace HoloToolkit.Unity.Design
 {
     public class LineBaseInspector : Editor
     {
diff --git a/Assets/AppPrefabs/Support/Scripts/Ellipse.cs b/Assets/AppPrefabs/Support/Scripts/Ellipse.cs
index 9a08e5f..b2e7940 100644
--- a/Assets/AppPrefabs/Support/Scripts/Ellipse.cs
+++ b/Assets/AppPrefabs/Support/Scripts/Ellipse.cs
@@ -3,7 +3,7 @@
 
 using UnityEngine;
 
-namespace MRDL.Design
+namespace HoloToolkit.Unity.Design
 {
     public class Ellipse : LineBase
     {
diff --git a/Assets/AppPrefabs/Support/Scripts/Eraser.cs b/Assets/AppPrefabs/Support/Scripts/Eraser.cs
index 5d82805..580755e 100644
--- a/Assets/AppPrefabs/Support/Scripts/Eraser.cs
+++ b/Assets/AppPrefabs/Support/Scripts/Eraser.cs
@@ -5,7 +5,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace MRDL.ControllerExamples
+namespace HoloToolkit.Unity.ControllerExamples
 {
     public class Eraser : Brush
     {
diff --git a/Assets/AppPrefabs/Support/Scripts/Line.cs b/Assets/AppPrefabs/Support/Scripts/Line.cs
index bb1b37f..859edcb 100644
--- a/Assets/AppPrefabs/Support/Scripts/Line.cs
+++ b/Assets/AppPrefabs/Support/Scripts/Line.cs
@@ -3,7 +3,7 @@
 
 using UnityEngine;
 
-namespace MRDL.Design
+namespace HoloToolkit.Unity.Design
 {
     public class Line : LineBase
     {
diff --git a/Assets/AppPrefabs/Support/Scripts/LineBase.cs b/Assets/AppPrefabs/Support/Scripts/LineBase.cs
index 2e8bc85..dbf1222 100644
--- a/Assets/AppPrefabs/Support/Scripts/LineBase.cs
+++ b/Assets/AppPrefabs/Support/Scripts/LineBase.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace MRDL.Design
+namespace HoloToolkit.Unity.Design
 {
     public abstract class LineBase : MonoBehaviour
     {
diff --git a/Assets/AppPrefabs/Support/Scripts/LineObjectCollection.cs b/Assets/AppPrefabs/Support/Scripts/LineObjectCollection.cs
index 1483d72..413e0d3 100644
--- a/Assets/AppPrefabs/Support/Scripts/LineObjectCollection.cs
+++ b/Assets/AppPrefabs/Support/Scripts/LineObjectCollection.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace MRDL.Design
+namespace HoloToolkit.Unity.Design
 {
     public class LineObjectCollection : MonoBehaviour
     {
diff --git a/Assets/AppPrefabs/Support/Scripts/LinePointer.cs b/Assets/AppPrefabs/Support/Scripts/LinePointer.cs
index e306063..4d05856 100644
--- a/Assets/AppPrefabs/Support/Scripts/LinePointer.cs
+++ b/Assets/AppPrefabs/Support/Scripts/LinePointer.cs
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using MRDL.Design;
+using HoloToolkit.Unity.Design;
 using UnityEngine;
 
-namespace MRDL.Controllers
+namespace HoloToolkit.Unity.Controllers
 {
     [RequireComponent(typeof(Line))]
     [ExecuteInEditMode]
diff --git a/Assets/AppPrefabs/Support/Scripts/LineRenderer.cs b/Assets/AppPrefabs/Support/Scripts/LineRenderer.cs
index ba67816..db15a6b 100644
--- a/Assets/AppPrefabs/Support/Scripts/LineRenderer.cs
+++ b/Assets/AppPrefabs/Support/Scripts/LineRenderer.cs
@@ -3,7 +3,7 @@
 
 using UnityEngine;
 
-namespace MRDL.Design
+namespace HoloToolkit.Unity.Design
 {
     public abstract class LineRenderer : MonoBehaviour
     {
diff --git a/Assets/AppPrefabs/Support/Scripts/LineUnity.cs b/Assets/AppPrefabs/Support/Scripts/LineUnity.cs
index d708e07..76eeec2 100644
--- a/Assets/AppPrefabs/Support/Scripts/LineUnity.cs
+++ b/Assets/AppPrefabs/Support/Scripts/LineUnity.cs
@@ -4,7 +4,7 @@
 using System.Collections;
 using UnityEngine;
 
-namespace MRDL.Design
+namespace HoloToolkit.Unity.Design
 {
     public class LineUnity : LineRenderer
     {
diff --git a/Assets/AppPrefabs/Support/Scripts/LineUtility.cs b/Assets/AppPrefabs/Support/Scripts/LineUtility.cs
index ed70088..8415f9f 100644
--- a/Assets/AppPrefabs/Support/Scripts/LineUtility.cs
+++ b/Assets/AppPrefabs/Support/Scripts/LineUtility.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace MRDL.Design
+namespace HoloToolkit.Unity.Design
 {
     #region structs
     [Serializable]
diff --git a/Assets/AppPrefabs/Support/Scripts/NavigationHotSpot.cs b/Assets/AppPrefabs/Support/Scripts/NavigationHotSpot.cs
index 8e7091f..b975303 100644
--- a/Assets/AppPrefabs/Support/Scripts/NavigationHotSpot.cs
+++ b/Assets/AppPrefabs/Support/Scripts/NavigationHotSpot.cs
@@ -3,7 +3,7 @@
 
 using UnityEngine;
 
-namespace MRDL.Controllers
+namespace HoloToolkit.Unity.Controllers
 {
     public class NavigationHotSpot : MonoBehaviour
     {
diff --git a/Assets/AppPrefabs/Support/Scripts/ObjectSpawner.cs b/Assets/AppPrefabs/Support/Scripts/ObjectSpawner.cs
index 21236e0..8249dbb 100644
--- a/Assets/AppPrefabs/Support/Scripts/ObjectSpawner.cs
+++ b/Assets/AppPrefabs/Support/Scripts/ObjectSpawner.cs
@@ -7,7 +7,7 @@ using System.Collections;
 using UnityEngine;
 using UnityEngine.XR.WSA.Input;
 
-namespace MRDL.ControllerExamples
+namespace HoloToolkit.Unity.ControllerExamples
 {
     public class ObjectSpawner : MonoBehaviour
     {
diff --git a/Assets/AppPrefabs/Support/Scripts/PhysicsPointer.cs b/Assets/AppPrefabs/Support/Scripts/PhysicsPointer.cs
index 0d586e4..ea45652 100644
--- a/Assets/AppPrefabs/Support/Scripts/PhysicsPointer.cs
+++ b/Assets/AppPrefabs/Support/Scripts/PhysicsPointer.cs
@@ -3,7 +3,7 @@
 
 using UnityEngine;
 
-namespace MRDL.Controllers
+namespace HoloToolkit.Unity.Controllers
 {
     public interface IPointerTarget
     {
diff --git a/Assets/AppPrefabs/Support/Scripts/PointerCursor.cs b/Assets/AppPrefabs/Support/Scripts/PointerCursor.cs
index fe5df2f..3df1c80 100644
--- a/Assets/AppPrefabs/Support/Scripts/PointerCursor.cs
+++ b/Assets/AppPrefabs/Support/Scripts/PointerCursor.cs
@@ -3,7 +3,7 @@
 
 using UnityEngine;
 
-namespace MRDL.Controllers
+namespace HoloToolkit.Unity.Controllers
 {
     [ExecuteInEditMode]
     public class PointerCursor : MonoBehaviour
diff --git a/Assets/AppPrefabs/Support/Scripts/PointerInput.cs b/Assets/AppPrefabs/Support/Scripts/PointerInput.cs
index 546fadf..1d49dee 100644
--- a/Assets/AppPrefabs/Support/Scripts/PointerInput.cs
+++ b/Assets/AppPrefabs/Support/Scripts/PointerInput.cs
@@ -4,7 +4,7 @@
 using UnityEngine;
 using UnityEngine.XR.WSA.Input;
 
-namespace MRDL.Controllers
+namespace HoloToolkit.Unity.Controllers
 {
     /// <summary>
     /// Routes controller input to a physics pointer