diff --git a/Tasks/PackageDownloader/Strings/resources.resjson/de-de/resources.resjson b/Tasks/DownloadPackage/Strings/resources.resjson/de-de/resources.resjson
similarity index 100%
rename from Tasks/PackageDownloader/Strings/resources.resjson/de-de/resources.resjson
rename to Tasks/DownloadPackage/Strings/resources.resjson/de-de/resources.resjson
diff --git a/Tasks/PackageDownloader/Strings/resources.resjson/en-US/resources.resjson b/Tasks/DownloadPackage/Strings/resources.resjson/en-US/resources.resjson
similarity index 100%
rename from Tasks/PackageDownloader/Strings/resources.resjson/en-US/resources.resjson
rename to Tasks/DownloadPackage/Strings/resources.resjson/en-US/resources.resjson
diff --git a/Tasks/PackageDownloader/Strings/resources.resjson/es-es/resources.resjson b/Tasks/DownloadPackage/Strings/resources.resjson/es-es/resources.resjson
similarity index 100%
rename from Tasks/PackageDownloader/Strings/resources.resjson/es-es/resources.resjson
rename to Tasks/DownloadPackage/Strings/resources.resjson/es-es/resources.resjson
diff --git a/Tasks/PackageDownloader/Strings/resources.resjson/fr-fr/resources.resjson b/Tasks/DownloadPackage/Strings/resources.resjson/fr-fr/resources.resjson
similarity index 100%
rename from Tasks/PackageDownloader/Strings/resources.resjson/fr-fr/resources.resjson
rename to Tasks/DownloadPackage/Strings/resources.resjson/fr-fr/resources.resjson
diff --git a/Tasks/PackageDownloader/Strings/resources.resjson/it-IT/resources.resjson b/Tasks/DownloadPackage/Strings/resources.resjson/it-IT/resources.resjson
similarity index 100%
rename from Tasks/PackageDownloader/Strings/resources.resjson/it-IT/resources.resjson
rename to Tasks/DownloadPackage/Strings/resources.resjson/it-IT/resources.resjson
diff --git a/Tasks/PackageDownloader/Strings/resources.resjson/ja-jp/resources.resjson b/Tasks/DownloadPackage/Strings/resources.resjson/ja-jp/resources.resjson
similarity index 100%
rename from Tasks/PackageDownloader/Strings/resources.resjson/ja-jp/resources.resjson
rename to Tasks/DownloadPackage/Strings/resources.resjson/ja-jp/resources.resjson
diff --git a/Tasks/PackageDownloader/Strings/resources.resjson/ko-KR/resources.resjson b/Tasks/DownloadPackage/Strings/resources.resjson/ko-KR/resources.resjson
similarity index 100%
rename from Tasks/PackageDownloader/Strings/resources.resjson/ko-KR/resources.resjson
rename to Tasks/DownloadPackage/Strings/resources.resjson/ko-KR/resources.resjson
diff --git a/Tasks/PackageDownloader/Strings/resources.resjson/ru-RU/resources.resjson b/Tasks/DownloadPackage/Strings/resources.resjson/ru-RU/resources.resjson
similarity index 100%
rename from Tasks/PackageDownloader/Strings/resources.resjson/ru-RU/resources.resjson
rename to Tasks/DownloadPackage/Strings/resources.resjson/ru-RU/resources.resjson
diff --git a/Tasks/PackageDownloader/Strings/resources.resjson/zh-CN/resources.resjson b/Tasks/DownloadPackage/Strings/resources.resjson/zh-CN/resources.resjson
similarity index 100%
rename from Tasks/PackageDownloader/Strings/resources.resjson/zh-CN/resources.resjson
rename to Tasks/DownloadPackage/Strings/resources.resjson/zh-CN/resources.resjson
diff --git a/Tasks/PackageDownloader/Strings/resources.resjson/zh-TW/resources.resjson b/Tasks/DownloadPackage/Strings/resources.resjson/zh-TW/resources.resjson
similarity index 100%
rename from Tasks/PackageDownloader/Strings/resources.resjson/zh-TW/resources.resjson
rename to Tasks/DownloadPackage/Strings/resources.resjson/zh-TW/resources.resjson
diff --git a/Tasks/PackageDownloader/download.ts b/Tasks/DownloadPackage/download.ts
similarity index 100%
rename from Tasks/PackageDownloader/download.ts
rename to Tasks/DownloadPackage/download.ts
diff --git a/Tasks/PackageDownloader/icon.png b/Tasks/DownloadPackage/icon.png
similarity index 100%
rename from Tasks/PackageDownloader/icon.png
rename to Tasks/DownloadPackage/icon.png
diff --git a/Tasks/PackageDownloader/package.json b/Tasks/DownloadPackage/package.json
similarity index 95%
rename from Tasks/PackageDownloader/package.json
rename to Tasks/DownloadPackage/package.json
index b2ba07fa0f4c..95aab4d24c79 100644
--- a/Tasks/PackageDownloader/package.json
+++ b/Tasks/DownloadPackage/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "packagedownloader",
+  "name": "downloadpackage",
   "version": "1.0.0",
   "description": "Package Downloader Task",
   "main": "downloadPackages.js",
diff --git a/Tasks/PackageDownloader/task.json b/Tasks/DownloadPackage/task.json
similarity index 99%
rename from Tasks/PackageDownloader/task.json
rename to Tasks/DownloadPackage/task.json
index efa04d4e44f9..2ea742d87999 100644
--- a/Tasks/PackageDownloader/task.json
+++ b/Tasks/DownloadPackage/task.json
@@ -1,6 +1,6 @@
 {
   "id": "8d6e8f7e-267d-442d-8c92-1f586864c62f",
-  "name": "PackageDownloader",
+  "name": "DownloadPackage",
   "friendlyName": "Package Downloader",
   "description": "Download a package from a Package Management feed in VSTS or TFS. \r\n Requires the Package Management extension.",
   "helpMarkDown": "Needs Package Management extension to be installed",
diff --git a/Tasks/PackageDownloader/task.loc.json b/Tasks/DownloadPackage/task.loc.json
similarity index 99%
rename from Tasks/PackageDownloader/task.loc.json
rename to Tasks/DownloadPackage/task.loc.json
index cefae8935ec6..36547cf20e54 100644
--- a/Tasks/PackageDownloader/task.loc.json
+++ b/Tasks/DownloadPackage/task.loc.json
@@ -1,6 +1,6 @@
 {
   "id": "8d6e8f7e-267d-442d-8c92-1f586864c62f",
-  "name": "PackageDownloader",
+  "name": "DownloadPackage",
   "friendlyName": "ms-resource:loc.friendlyName",
   "description": "ms-resource:loc.description",
   "helpMarkDown": "ms-resource:loc.helpMarkDown",
diff --git a/Tasks/PackageDownloader/tsconfig.json b/Tasks/DownloadPackage/tsconfig.json
similarity index 100%
rename from Tasks/PackageDownloader/tsconfig.json
rename to Tasks/DownloadPackage/tsconfig.json
diff --git a/Tasks/PackageDownloader/typings/globals/mocha/index.d.ts b/Tasks/DownloadPackage/typings/globals/mocha/index.d.ts
similarity index 100%
rename from Tasks/PackageDownloader/typings/globals/mocha/index.d.ts
rename to Tasks/DownloadPackage/typings/globals/mocha/index.d.ts
diff --git a/Tasks/PackageDownloader/typings/globals/mocha/typings.json b/Tasks/DownloadPackage/typings/globals/mocha/typings.json
similarity index 100%
rename from Tasks/PackageDownloader/typings/globals/mocha/typings.json
rename to Tasks/DownloadPackage/typings/globals/mocha/typings.json
diff --git a/Tasks/PackageDownloader/typings/globals/node/index.d.ts b/Tasks/DownloadPackage/typings/globals/node/index.d.ts
similarity index 100%
rename from Tasks/PackageDownloader/typings/globals/node/index.d.ts
rename to Tasks/DownloadPackage/typings/globals/node/index.d.ts
diff --git a/Tasks/PackageDownloader/typings/globals/node/typings.json b/Tasks/DownloadPackage/typings/globals/node/typings.json
similarity index 100%
rename from Tasks/PackageDownloader/typings/globals/node/typings.json
rename to Tasks/DownloadPackage/typings/globals/node/typings.json
diff --git a/Tasks/PackageDownloader/typings/globals/q/index.d.ts b/Tasks/DownloadPackage/typings/globals/q/index.d.ts
similarity index 100%
rename from Tasks/PackageDownloader/typings/globals/q/index.d.ts
rename to Tasks/DownloadPackage/typings/globals/q/index.d.ts
diff --git a/Tasks/PackageDownloader/typings/globals/q/typings.json b/Tasks/DownloadPackage/typings/globals/q/typings.json
similarity index 100%
rename from Tasks/PackageDownloader/typings/globals/q/typings.json
rename to Tasks/DownloadPackage/typings/globals/q/typings.json
diff --git a/Tasks/PackageDownloader/typings/index.d.ts b/Tasks/DownloadPackage/typings/index.d.ts
similarity index 100%
rename from Tasks/PackageDownloader/typings/index.d.ts
rename to Tasks/DownloadPackage/typings/index.d.ts
diff --git a/make-options.json b/make-options.json
index 879155ecc738..7c63d646115e 100644
--- a/make-options.json
+++ b/make-options.json
@@ -47,7 +47,7 @@
         "NuGetPublisher",
         "NuGetToolInstaller",
         "PackerBuild",
-        "PackageDownloader",
+        "DownloadPackage",
         "powerShell",
         "PowerShellOnTargetMachines",
         "PublishBuildArtifacts",