diff --git a/src/Avalonia.Controls/DragDrop/DragDevice.cs b/src/Avalonia.Controls/DragDrop/DragDropDevice.cs
similarity index 96%
rename from src/Avalonia.Controls/DragDrop/DragDevice.cs
rename to src/Avalonia.Controls/DragDrop/DragDropDevice.cs
index 25f82ca3bc..0aadda79f4 100644
--- a/src/Avalonia.Controls/DragDrop/DragDevice.cs
+++ b/src/Avalonia.Controls/DragDrop/DragDropDevice.cs
@@ -7,9 +7,9 @@ using Avalonia.Input.Raw;
 
 namespace Avalonia.Controls.DragDrop
 {
-    class DragDevice : IDragDevice
+    class DragDropDevice : IDragDropDevice
     {
-        public static readonly DragDevice Instance = new DragDevice();
+        public static readonly DragDropDevice Instance = new DragDropDevice();
         
         private Interactive _lastTarget = null;
         
diff --git a/src/Avalonia.Controls/DragDrop/Raw/IDragDevice.cs b/src/Avalonia.Controls/DragDrop/Raw/IDragDropDevice.cs
similarity index 60%
rename from src/Avalonia.Controls/DragDrop/Raw/IDragDevice.cs
rename to src/Avalonia.Controls/DragDrop/Raw/IDragDropDevice.cs
index d1c20fae55..6e2db67ac3 100644
--- a/src/Avalonia.Controls/DragDrop/Raw/IDragDevice.cs
+++ b/src/Avalonia.Controls/DragDrop/Raw/IDragDropDevice.cs
@@ -2,7 +2,7 @@
 
 namespace Avalonia.Controls.DragDrop.Raw
 {
-    public interface IDragDevice : IInputDevice
+    public interface IDragDropDevice : IInputDevice
     {
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs b/src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs
index 76a2c16b3b..e9c1119e44 100644
--- a/src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs
+++ b/src/Avalonia.Controls/DragDrop/Raw/RawDragEvent.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Controls.DragDrop.Raw
         public DragDropEffects Effects { get; set; }
         public RawDragEventType Type { get; }
 
-        public RawDragEvent(IDragDevice inputDevice, RawDragEventType type, 
+        public RawDragEvent(IDragDropDevice inputDevice, RawDragEventType type, 
             IInputElement inputRoot, Point location, IDataObject data, DragDropEffects effects)
             :base(inputDevice, GetTimeStamp())
         {
diff --git a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
index b767a86490..20d255a608 100644
--- a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
+++ b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs
@@ -20,7 +20,7 @@ namespace Avalonia.MonoMac
     {
         public TopLevelView View { get; }
         private readonly IMouseDevice _mouse = AvaloniaLocator.Current.GetService<IMouseDevice>();
-        private readonly IDragDevice _dragDevice = AvaloniaLocator.Current.GetService<IDragDevice>();
+        private readonly IDragDropDevice _dragDevice = AvaloniaLocator.Current.GetService<IDragDropDevice>();
         protected TopLevelImpl()
         {
             View = new TopLevelView(this);
@@ -154,7 +154,7 @@ namespace Avalonia.MonoMac
             private NSDragOperation SendRawDragEvent(NSDraggingInfo sender, RawDragEventType type)
             {
                 Action<RawInputEventArgs> input = _tl.Input;
-                IDragDevice dragDevice = _tl._dragDevice;
+                IDragDropDevice dragDevice = _tl._dragDevice;
                 IInputRoot root = _tl?.InputRoot;
                 if (root == null || dragDevice == null || input == null)
                     return NSDragOperation.None;
diff --git a/src/Windows/Avalonia.Win32/OleDropTarget.cs b/src/Windows/Avalonia.Win32/OleDropTarget.cs
index 6bc298951e..31db5f88a9 100644
--- a/src/Windows/Avalonia.Win32/OleDropTarget.cs
+++ b/src/Windows/Avalonia.Win32/OleDropTarget.cs
@@ -12,13 +12,13 @@ namespace Avalonia.Win32
     {
         private readonly IInputElement _target;
         private readonly ITopLevelImpl _tl;
-        private readonly IDragDevice _dragDevice;
+        private readonly IDragDropDevice _dragDevice;
         
         private IDataObject _currentDrag = null;
 
         public OleDropTarget(ITopLevelImpl tl, IInputElement target)
         {
-            _dragDevice = AvaloniaLocator.Current.GetService<IDragDevice>();
+            _dragDevice = AvaloniaLocator.Current.GetService<IDragDropDevice>();
             _tl = tl;
             _target = target;
         }