diff --git a/src/Jackett/Controllers/APIController.cs b/src/Jackett/Controllers/APIController.cs
index 8b28ef0bc..6435cff45 100644
--- a/src/Jackett/Controllers/APIController.cs
+++ b/src/Jackett/Controllers/APIController.cs
@@ -29,9 +29,9 @@ namespace Jackett.Controllers
         }
 
         [HttpGet]
-        public async Task<HttpResponseMessage> Call(string indexerName)
+        public async Task<HttpResponseMessage> Call(string indexerID)
         {
-            var indexer = indexerService.GetIndexer(indexerName);
+            var indexer = indexerService.GetIndexer(indexerID);
             var torznabQuery = TorznabQuery.FromHttpQuery(HttpUtility.ParseQueryString(Request.RequestUri.Query));
 
             if (string.Equals(torznabQuery.QueryType, "caps", StringComparison.InvariantCultureIgnoreCase))
@@ -70,7 +70,7 @@ namespace Jackett.Controllers
                     continue;
                 var originalLink = release.Link;
                 var encodedLink = HttpServerUtility.UrlTokenEncode(Encoding.UTF8.GetBytes(originalLink.ToString())) + "/download.torrent";
-                var proxyLink = string.Format("{0}api/{1}/download/{2}", severUrl, indexer.DisplayName, encodedLink);
+                var proxyLink = string.Format("{0}api/{1}/download/{2}", severUrl, indexer.ID, encodedLink);
                 release.Link = new Uri(proxyLink);
             }
 
diff --git a/src/Jackett/Controllers/DownloadController.cs b/src/Jackett/Controllers/DownloadController.cs
index a43fcb6ff..1b7496b0c 100644
--- a/src/Jackett/Controllers/DownloadController.cs
+++ b/src/Jackett/Controllers/DownloadController.cs
@@ -26,11 +26,11 @@ namespace Jackett.Controllers
         }
 
         [HttpGet]
-        public async Task<HttpResponseMessage> Download(string indexerName, string path)
+        public async Task<HttpResponseMessage> Download(string indexerID, string path)
         {
             try
             {
-                var indexer = indexerService.GetIndexer(indexerName);
+                var indexer = indexerService.GetIndexer(indexerID);
                 var remoteFile = Encoding.UTF8.GetString(HttpServerUtility.UrlTokenDecode(path));
                 var downloadBytes = await indexer.Download(new Uri(remoteFile));
 
@@ -41,7 +41,7 @@ namespace Jackett.Controllers
             }
             catch (Exception e)
             {
-                logger.Error(e, "Error downloading " + indexerName + " " + path);
+                logger.Error(e, "Error downloading " + indexerID + " " + path);
                 return new HttpResponseMessage(HttpStatusCode.NotFound);
             }
         }
diff --git a/src/Jackett/Startup.cs b/src/Jackett/Startup.cs
index a69a022b5..01c1cf70a 100644
--- a/src/Jackett/Startup.cs
+++ b/src/Jackett/Startup.cs
@@ -51,19 +51,19 @@ namespace Jackett
 
             config.Routes.MapHttpRoute(
                 name: "apiDefault",
-                routeTemplate: "api/{indexerName}",
+                routeTemplate: "api/{indexerID}",
                 defaults: new { controller = "API", action = "Call" }
             );
 
             config.Routes.MapHttpRoute(
                name: "api",
-               routeTemplate: "api/{indexerName}/api",
+               routeTemplate: "api/{indexerID}/api",
                defaults: new { controller = "API", action = "Call" }
            );
 
             config.Routes.MapHttpRoute(
                 name: "download",
-                routeTemplate: "api/{indexerName}/download/{path}/download.torrent",
+                routeTemplate: "api/{indexerID}/download/{path}/download.torrent",
                 defaults: new { controller = "Download", action = "Download" }
             );