diff --git a/src/GongSolutions.WPF.DragDrop/DefaultDropHandler.cs b/src/GongSolutions.WPF.DragDrop/DefaultDropHandler.cs
index c9da19a7..c14841d1 100644
--- a/src/GongSolutions.WPF.DragDrop/DefaultDropHandler.cs
+++ b/src/GongSolutions.WPF.DragDrop/DefaultDropHandler.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
 using GongSolutions.Wpf.DragDrop.Utilities;
diff --git a/src/GongSolutions.WPF.DragDrop/DragDrop.Properties.cs b/src/GongSolutions.WPF.DragDrop/DragDrop.Properties.cs
index d6eadb85..f583097e 100644
--- a/src/GongSolutions.WPF.DragDrop/DragDrop.Properties.cs
+++ b/src/GongSolutions.WPF.DragDrop/DragDrop.Properties.cs
@@ -1,9 +1,9 @@
-using GongSolutions.WPF.DragDrop.Utilities;
-using System;
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
+using GongSolutions.Wpf.DragDrop.Utilities;
 
 namespace GongSolutions.Wpf.DragDrop
 {
diff --git a/src/GongSolutions.WPF.DragDrop/DragDrop.cs b/src/GongSolutions.WPF.DragDrop/DragDrop.cs
index 8b563fb4..1284d295 100644
--- a/src/GongSolutions.WPF.DragDrop/DragDrop.cs
+++ b/src/GongSolutions.WPF.DragDrop/DragDrop.cs
@@ -9,7 +9,6 @@
 using System.Windows.Media.Imaging;
 using GongSolutions.Wpf.DragDrop.Icons;
 using GongSolutions.Wpf.DragDrop.Utilities;
-using GongSolutions.WPF.DragDrop.Utilities;
 
 namespace GongSolutions.Wpf.DragDrop
 {
diff --git a/src/GongSolutions.WPF.DragDrop/DropTargetHighlightAdorner.cs b/src/GongSolutions.WPF.DragDrop/DropTargetHighlightAdorner.cs
index c7b7828f..ae5f3159 100644
--- a/src/GongSolutions.WPF.DragDrop/DropTargetHighlightAdorner.cs
+++ b/src/GongSolutions.WPF.DragDrop/DropTargetHighlightAdorner.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
diff --git a/src/GongSolutions.WPF.DragDrop/GongSolutions.WPF.DragDrop.csproj b/src/GongSolutions.WPF.DragDrop/GongSolutions.WPF.DragDrop.csproj
index 44e6fbcc..f11d732d 100644
--- a/src/GongSolutions.WPF.DragDrop/GongSolutions.WPF.DragDrop.csproj
+++ b/src/GongSolutions.WPF.DragDrop/GongSolutions.WPF.DragDrop.csproj
@@ -4,7 +4,7 @@
     <PropertyGroup>
         <AssemblyName>GongSolutions.WPF.DragDrop</AssemblyName>
         <Title>gong-wpf-dragdrop</Title>
-        <RootNamespace>GongSolutions.WPF.DragDrop</RootNamespace>
+        <RootNamespace>GongSolutions.Wpf.DragDrop</RootNamespace>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
     <!-- reference includes -->
diff --git a/src/GongSolutions.WPF.DragDrop/Utilities/IRootElementFinder.cs b/src/GongSolutions.WPF.DragDrop/Utilities/IRootElementFinder.cs
index 7c65b1bf..805a0f47 100644
--- a/src/GongSolutions.WPF.DragDrop/Utilities/IRootElementFinder.cs
+++ b/src/GongSolutions.WPF.DragDrop/Utilities/IRootElementFinder.cs
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace GongSolutions.WPF.DragDrop.Utilities
+namespace GongSolutions.Wpf.DragDrop.Utilities
 {
     /// <summary>
     /// Interface implemented by the root element finder.
diff --git a/src/GongSolutions.WPF.DragDrop/Utilities/RootElementFinder.cs b/src/GongSolutions.WPF.DragDrop/Utilities/RootElementFinder.cs
index baad278d..cadf4d17 100644
--- a/src/GongSolutions.WPF.DragDrop/Utilities/RootElementFinder.cs
+++ b/src/GongSolutions.WPF.DragDrop/Utilities/RootElementFinder.cs
@@ -1,5 +1,4 @@
-using GongSolutions.WPF.DragDrop.Utilities;
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
 
 namespace GongSolutions.Wpf.DragDrop.Utilities