diff --git a/src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs b/src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs
index 32091cbcd..c524e1b86 100644
--- a/src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs
+++ b/src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs
@@ -75,6 +75,14 @@ namespace NzbDrone.Core.Download.Clients.Deluge
             return actualHash.ToUpper();
         }
 
+        public override string Name
+        {
+            get
+            {
+                return "Deluge";
+            }
+        }
+
         public override IEnumerable<DownloadClientItem> GetItems()
         {
             IEnumerable<DelugeTorrent> torrents;
diff --git a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs
index bcb27ea13..0535fc8c2 100644
--- a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs
+++ b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs
@@ -187,6 +187,14 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
             return historyItems;
         }
 
+        public override string Name
+        {
+            get
+            {
+                return "nzbget";
+            }
+        }
+
         public override IEnumerable<DownloadClientItem> GetItems()
         {
             return GetQueue().Concat(GetHistory()).Where(downloadClientItem => downloadClientItem.Category == Settings.TvCategory);
diff --git a/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs b/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs
index cbbf5f26b..d9987ff0f 100644
--- a/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs
+++ b/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs
@@ -28,6 +28,14 @@ namespace NzbDrone.Core.Download.Clients.Pneumatic
             _httpClient = httpClient;
         }
 
+        public override string Name
+        {
+            get
+            {
+                return "Pneumatic";
+            }
+        }
+
         public override DownloadProtocol Protocol
         {
             get
diff --git a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
index 6135866fd..a36375def 100644
--- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
+++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
@@ -7,7 +7,6 @@ using NzbDrone.Common.Disk;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Validation;
 using NzbDrone.Core.RemotePathMappings;
@@ -174,6 +173,14 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
             return historyItems;
         }
 
+        public override string Name
+        {
+            get
+            {
+                return "SABnzb";
+            }
+        }
+
         public override IEnumerable<DownloadClientItem> GetItems()
         {
             foreach (var downloadClientItem in GetQueue().Concat(GetHistory()))
diff --git a/src/NzbDrone.Core/Download/Clients/TorrentBlackhole/TorrentBlackhole.cs b/src/NzbDrone.Core/Download/Clients/TorrentBlackhole/TorrentBlackhole.cs
index ee3ade6f7..f386addc6 100644
--- a/src/NzbDrone.Core/Download/Clients/TorrentBlackhole/TorrentBlackhole.cs
+++ b/src/NzbDrone.Core/Download/Clients/TorrentBlackhole/TorrentBlackhole.cs
@@ -55,6 +55,14 @@ namespace NzbDrone.Core.Download.Clients.TorrentBlackhole
             return hash;
         }
 
+        public override string Name
+        {
+            get
+            {
+                return "Torrent Blackhole";
+            }
+        }
+
         public override IEnumerable<DownloadClientItem> GetItems()
         {
             foreach (var folder in _diskProvider.GetDirectories(Settings.WatchFolder))
diff --git a/src/NzbDrone.Core/Download/Clients/Transmission/Transmission.cs b/src/NzbDrone.Core/Download/Clients/Transmission/Transmission.cs
index fad8ef2d4..f11cede33 100644
--- a/src/NzbDrone.Core/Download/Clients/Transmission/Transmission.cs
+++ b/src/NzbDrone.Core/Download/Clients/Transmission/Transmission.cs
@@ -5,7 +5,6 @@ using System.Text.RegularExpressions;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
-using NzbDrone.Core.Parser;
 using NzbDrone.Core.Configuration;
 using NLog;
 using FluentValidation.Results;
@@ -74,6 +73,14 @@ namespace NzbDrone.Core.Download.Clients.Transmission
             return string.Format("{0}/{1}", destDir.TrimEnd('/'), Settings.TvCategory);
         }
 
+        public override string Name
+        {
+            get
+            {
+                return "Transmission";
+            }
+        }
+
         public override IEnumerable<DownloadClientItem> GetItems()
         {
             List<TransmissionTorrent> torrents;
diff --git a/src/NzbDrone.Core/Download/Clients/UsenetBlackhole/UsenetBlackhole.cs b/src/NzbDrone.Core/Download/Clients/UsenetBlackhole/UsenetBlackhole.cs
index 9a9c049de..ed765d52a 100644
--- a/src/NzbDrone.Core/Download/Clients/UsenetBlackhole/UsenetBlackhole.cs
+++ b/src/NzbDrone.Core/Download/Clients/UsenetBlackhole/UsenetBlackhole.cs
@@ -48,6 +48,14 @@ namespace NzbDrone.Core.Download.Clients.UsenetBlackhole
             return null;
         }
 
+        public override string Name
+        {
+            get
+            {
+                return "Usenet Blackhole";
+            }
+        }
+
         public override IEnumerable<DownloadClientItem> GetItems()
         {
             foreach (var folder in _diskProvider.GetDirectories(Settings.WatchFolder))
diff --git a/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrent.cs b/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrent.cs
index 60d43295e..74769f0dc 100644
--- a/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrent.cs
+++ b/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrent.cs
@@ -63,6 +63,14 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
             return hash;
         }
 
+        public override string Name
+        {
+            get
+            {
+                return "uTorrent";
+            }
+        }
+
         public override IEnumerable<DownloadClientItem> GetItems()
         {            
             List<UTorrentTorrent> torrents;
diff --git a/src/NzbDrone.Core/Download/DownloadClientBase.cs b/src/NzbDrone.Core/Download/DownloadClientBase.cs
index ef04defa5..95eb6c895 100644
--- a/src/NzbDrone.Core/Download/DownloadClientBase.cs
+++ b/src/NzbDrone.Core/Download/DownloadClientBase.cs
@@ -20,13 +20,7 @@ namespace NzbDrone.Core.Download
         protected readonly IRemotePathMappingService _remotePathMappingService;
         protected readonly Logger _logger;
 
-        public string Name
-        {
-            get
-            {
-                return GetType().Name;
-            }
-        }
+        public abstract string Name { get; }
 
         public Type ConfigContract
         {
diff --git a/src/UI/Settings/DownloadClient/Add/DownloadClientAddItemViewTemplate.hbs b/src/UI/Settings/DownloadClient/Add/DownloadClientAddItemViewTemplate.hbs
index 0d8352625..40bcb4391 100644
--- a/src/UI/Settings/DownloadClient/Add/DownloadClientAddItemViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/Add/DownloadClientAddItemViewTemplate.hbs
@@ -1,6 +1,6 @@
 <div class="add-thingy">
     <div>
-        {{implementation}}
+        {{implementationName}}
     </div>
     <div class="pull-right">
         {{#if_gt presets.length compare=0}}