diff --git a/src/NzbDrone.Core.Test/IndexerTests/TestIndexer.cs b/src/NzbDrone.Core.Test/IndexerTests/TestIndexer.cs
index 887b1a388..0f9e334ea 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/TestIndexer.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/TestIndexer.cs
@@ -9,6 +9,14 @@ namespace NzbDrone.Core.Test.IndexerTests
 {
     public class TestIndexer : HttpIndexerBase<TestIndexerSettings>
     {
+        public override string Name
+        {
+            get
+            {
+                return "Test Indexer";
+            }
+        }
+
         public override DownloadProtocol Protocol { get { return DownloadProtocol.Usenet; } }
 
         public Int32 _supportedPageSize;
diff --git a/src/NzbDrone.Core/Indexers/BitMeTv/BitMeTv.cs b/src/NzbDrone.Core/Indexers/BitMeTv/BitMeTv.cs
index c87b6895b..283915ac9 100644
--- a/src/NzbDrone.Core/Indexers/BitMeTv/BitMeTv.cs
+++ b/src/NzbDrone.Core/Indexers/BitMeTv/BitMeTv.cs
@@ -8,6 +8,14 @@ namespace NzbDrone.Core.Indexers.BitMeTv
 {
     public class BitMeTv : HttpIndexerBase<BitMeTvSettings>
     {
+        public override string Name
+        {
+            get
+            {
+                return "BitMeTV";
+            }
+        }
+
         public override DownloadProtocol Protocol { get { return DownloadProtocol.Torrent; } }
         public override Boolean SupportsSearch { get { return false; } }
         public override Int32 PageSize { get { return 0; } }
diff --git a/src/NzbDrone.Core/Indexers/BroadcastheNet/BroadcastheNet.cs b/src/NzbDrone.Core/Indexers/BroadcastheNet/BroadcastheNet.cs
index eedc9b298..c1cb086af 100644
--- a/src/NzbDrone.Core/Indexers/BroadcastheNet/BroadcastheNet.cs
+++ b/src/NzbDrone.Core/Indexers/BroadcastheNet/BroadcastheNet.cs
@@ -7,6 +7,14 @@ namespace NzbDrone.Core.Indexers.BroadcastheNet
 {
     public class BroadcastheNet : HttpIndexerBase<BroadcastheNetSettings>
     {
+        public override string Name
+        {
+            get
+            {
+                return "BroadcasttheNet";
+            }
+        }
+
         public override DownloadProtocol Protocol { get { return DownloadProtocol.Torrent; } }
         public override bool SupportsRss { get { return true; } }
         public override bool SupportsSearch { get { return true; } }
diff --git a/src/NzbDrone.Core/Indexers/Eztv/Eztv.cs b/src/NzbDrone.Core/Indexers/Eztv/Eztv.cs
index f919a7dc0..efb41b385 100644
--- a/src/NzbDrone.Core/Indexers/Eztv/Eztv.cs
+++ b/src/NzbDrone.Core/Indexers/Eztv/Eztv.cs
@@ -7,6 +7,14 @@ namespace NzbDrone.Core.Indexers.Eztv
 {
     public class Eztv : HttpIndexerBase<EztvSettings>
     {
+        public override string Name
+        {
+            get
+            {
+                return "EZTV";
+            }
+        }
+
         public override DownloadProtocol Protocol { get { return DownloadProtocol.Torrent; } }
 
         public Eztv(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger)
diff --git a/src/NzbDrone.Core/Indexers/Fanzub/Fanzub.cs b/src/NzbDrone.Core/Indexers/Fanzub/Fanzub.cs
index 8c98d4f3f..7c06b8d50 100644
--- a/src/NzbDrone.Core/Indexers/Fanzub/Fanzub.cs
+++ b/src/NzbDrone.Core/Indexers/Fanzub/Fanzub.cs
@@ -2,12 +2,19 @@
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Parser;
-using NzbDrone.Core.ThingiProvider;
 
 namespace NzbDrone.Core.Indexers.Fanzub
 {
     public class Fanzub : HttpIndexerBase<FanzubSettings>
     {
+        public override string Name
+        {
+            get
+            {
+                return "Fanzub";
+            }
+        }
+
         public override DownloadProtocol Protocol { get { return DownloadProtocol.Usenet; } }
 
         public Fanzub(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger)
diff --git a/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrents.cs b/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrents.cs
index 2abb711b9..f0ba7d4f6 100644
--- a/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrents.cs
+++ b/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrents.cs
@@ -8,6 +8,14 @@ namespace NzbDrone.Core.Indexers.IPTorrents
 {
     public class IPTorrents : HttpIndexerBase<IPTorrentsSettings>
     {
+        public override string Name
+        {
+            get
+            {
+                return "IP Torrents";
+            }
+        }
+
         public override DownloadProtocol Protocol { get { return DownloadProtocol.Torrent; } }
         public override Boolean SupportsSearch { get { return false; } }
         public override Int32 PageSize { get { return 0; } }
diff --git a/src/NzbDrone.Core/Indexers/IndexerBase.cs b/src/NzbDrone.Core/Indexers/IndexerBase.cs
index 79125d8a8..036036510 100644
--- a/src/NzbDrone.Core/Indexers/IndexerBase.cs
+++ b/src/NzbDrone.Core/Indexers/IndexerBase.cs
@@ -19,14 +19,7 @@ namespace NzbDrone.Core.Indexers
         protected readonly IParsingService _parsingService;
         protected readonly Logger _logger;
 
-        public string Name
-        {
-            get
-            {
-                return GetType().Name;
-            }
-        }
-
+        public abstract string Name { get; }
         public abstract DownloadProtocol Protocol { get; }
 
         public abstract Boolean SupportsRss { get; }
diff --git a/src/NzbDrone.Core/Indexers/KickassTorrents/KickassTorrents.cs b/src/NzbDrone.Core/Indexers/KickassTorrents/KickassTorrents.cs
index 4696e0344..edf33570f 100644
--- a/src/NzbDrone.Core/Indexers/KickassTorrents/KickassTorrents.cs
+++ b/src/NzbDrone.Core/Indexers/KickassTorrents/KickassTorrents.cs
@@ -8,6 +8,14 @@ namespace NzbDrone.Core.Indexers.KickassTorrents
 {
     public class KickassTorrents : HttpIndexerBase<KickassTorrentsSettings>
     {
+        public override string Name
+        {
+            get
+            {
+                return "Kickass Torrents";
+            }
+        }
+
         public override DownloadProtocol Protocol { get { return DownloadProtocol.Torrent; } }
         public override Int32 PageSize { get { return 25; } }
 
diff --git a/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs b/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
index 94d5b648e..fbc5af2f8 100644
--- a/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
+++ b/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
@@ -11,6 +11,14 @@ namespace NzbDrone.Core.Indexers.Newznab
 {
     public class Newznab : HttpIndexerBase<NewznabSettings>
     {
+        public override string Name
+        {
+            get
+            {
+                return "Newznab";
+            }
+        }
+
         public override DownloadProtocol Protocol { get { return DownloadProtocol.Usenet; } }
         public override Int32 PageSize { get { return 100; } }
 
diff --git a/src/NzbDrone.Core/Indexers/Nyaa/Nyaa.cs b/src/NzbDrone.Core/Indexers/Nyaa/Nyaa.cs
index 6a20ff856..e869682c1 100644
--- a/src/NzbDrone.Core/Indexers/Nyaa/Nyaa.cs
+++ b/src/NzbDrone.Core/Indexers/Nyaa/Nyaa.cs
@@ -8,6 +8,14 @@ namespace NzbDrone.Core.Indexers.Nyaa
 {
     public class Nyaa : HttpIndexerBase<NyaaSettings>
     {
+        public override string Name
+        {
+            get
+            {
+                return "Nyaa";
+            }
+        }
+
         public override DownloadProtocol Protocol { get { return DownloadProtocol.Torrent; } }
         public override Int32 PageSize { get { return 100; } }
 
diff --git a/src/NzbDrone.Core/Indexers/Omgwtfnzbs/Omgwtfnzbs.cs b/src/NzbDrone.Core/Indexers/Omgwtfnzbs/Omgwtfnzbs.cs
index d2fe5bb4b..2cccb026f 100644
--- a/src/NzbDrone.Core/Indexers/Omgwtfnzbs/Omgwtfnzbs.cs
+++ b/src/NzbDrone.Core/Indexers/Omgwtfnzbs/Omgwtfnzbs.cs
@@ -7,6 +7,14 @@ namespace NzbDrone.Core.Indexers.Omgwtfnzbs
 {
     public class Omgwtfnzbs : HttpIndexerBase<OmgwtfnzbsSettings>
     {
+        public override string Name
+        {
+            get
+            {
+                return "omgwtfnzbs";
+            }
+        }
+
         public override DownloadProtocol Protocol { get { return DownloadProtocol.Usenet; } }
 
         public Omgwtfnzbs(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger)
diff --git a/src/NzbDrone.Core/Indexers/Torrentleech/Torrentleech.cs b/src/NzbDrone.Core/Indexers/Torrentleech/Torrentleech.cs
index b1aff3611..59e5da6b2 100644
--- a/src/NzbDrone.Core/Indexers/Torrentleech/Torrentleech.cs
+++ b/src/NzbDrone.Core/Indexers/Torrentleech/Torrentleech.cs
@@ -8,6 +8,14 @@ namespace NzbDrone.Core.Indexers.Torrentleech
 {
     public class Torrentleech : HttpIndexerBase<TorrentleechSettings>
     {
+        public override string Name
+        {
+            get
+            {
+                return "TorrentLeech";
+            }
+        }
+
         public override DownloadProtocol Protocol { get { return DownloadProtocol.Torrent; } }
         public override Boolean SupportsSearch { get { return false; } }
         public override Int32 PageSize { get { return 0; } }
diff --git a/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs b/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs
index 20533f05d..a61af85ca 100644
--- a/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs
+++ b/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs
@@ -11,6 +11,14 @@ namespace NzbDrone.Core.Indexers.Torznab
 {
     public class Torznab : HttpIndexerBase<TorznabSettings>
     {
+        public override string Name
+        {
+            get
+            {
+                return "Torznab";
+            }
+        }
+
         public override DownloadProtocol Protocol { get { return DownloadProtocol.Torrent; } }
         public override Int32 PageSize { get { return 100; } }
 
diff --git a/src/NzbDrone.Core/Indexers/Wombles/Wombles.cs b/src/NzbDrone.Core/Indexers/Wombles/Wombles.cs
index 201ce89f2..3fd1564df 100644
--- a/src/NzbDrone.Core/Indexers/Wombles/Wombles.cs
+++ b/src/NzbDrone.Core/Indexers/Wombles/Wombles.cs
@@ -8,6 +8,14 @@ namespace NzbDrone.Core.Indexers.Wombles
 {
     public class Wombles : HttpIndexerBase<NullConfig>
     {
+        public override string Name
+        {
+            get
+            {
+                return "Womble's";
+            }
+        }
+
         public override DownloadProtocol Protocol { get { return DownloadProtocol.Usenet; } }
         public override bool SupportsSearch { get { return false; } }
 
diff --git a/src/UI/Settings/Indexers/Add/IndexerAddItemViewTemplate.hbs b/src/UI/Settings/Indexers/Add/IndexerAddItemViewTemplate.hbs
index 0d8352625..40bcb4391 100644
--- a/src/UI/Settings/Indexers/Add/IndexerAddItemViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Add/IndexerAddItemViewTemplate.hbs
@@ -1,6 +1,6 @@
 <div class="add-thingy">
     <div>
-        {{implementation}}
+        {{implementationName}}
     </div>
     <div class="pull-right">
         {{#if_gt presets.length compare=0}}