diff --git a/README.md b/README.md
index 640717fde0d8..05050242ff81 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ This provides open examples on how we write tasks which will help you write othe
 
 Before writing a task, consider simply customizing your build using the script running tasks such as PowerShell or shell scripts.  That is often the most appropriate path.
 
-Tasks are simply tool runners.  They know how to run MSBuild, VSTest, etc... in a first class way and handle return codes, how to treat std/err out, and how to write timeline records based on expected output.  They also get access to credentials to write back to VSO/TFS. 
+Tasks are simply tool runners.  They know how to run MSBuild, VSTest, etc... in a first class way and handle return codes, how to treat std/err out, and how to write timeline records based on expected output.  They also get access to credentials to write back to TFS/Team Services. 
 
 For uploading custom tasks to VSTS use the [TFS Cross Platform Command Line utility](https://github.com/Microsoft/tfs-cli).
 
diff --git a/Tasks/ANT/icon.svg b/Tasks/ANT/icon.svg
index d36e625eaef9..dce91b3810da 100644
--- a/Tasks/ANT/icon.svg
+++ b/Tasks/ANT/icon.svg
@@ -20,7 +20,7 @@
    inkscape:version="0.91 r13725"
    sodipodi:docname="ant.svg"
    style="font-size:12px;overflow:visible;color-interpolation-filters:sRGB;fill:none;fill-rule:evenodd;stroke-linecap:square;stroke-miterlimit:3"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\ANT\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\ANT\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999"><metadata
      id="metadata19"><rdf:RDF><cc:Work
diff --git a/Tasks/AndroidBuild/icon.svg b/Tasks/AndroidBuild/icon.svg
index e6e267074319..a3c36c652328 100644
--- a/Tasks/AndroidBuild/icon.svg
+++ b/Tasks/AndroidBuild/icon.svg
@@ -15,7 +15,7 @@
    id="svg2"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\AndroidBuild\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\AndroidBuild\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <sodipodi:namedview
diff --git a/Tasks/AndroidSigning/icon.svg b/Tasks/AndroidSigning/icon.svg
index b543fb5f9bed..1eb2234c29b7 100644
--- a/Tasks/AndroidSigning/icon.svg
+++ b/Tasks/AndroidSigning/icon.svg
@@ -15,7 +15,7 @@
    id="svg2"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\AndroidSigning\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\AndroidSigning\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <sodipodi:namedview
diff --git a/Tasks/AzureCloudPowerShellDeployment/icon.svg b/Tasks/AzureCloudPowerShellDeployment/icon.svg
index f85904d7f045..22262ce49963 100644
--- a/Tasks/AzureCloudPowerShellDeployment/icon.svg
+++ b/Tasks/AzureCloudPowerShellDeployment/icon.svg
@@ -20,7 +20,7 @@
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
    style="font-size:12px;overflow:visible;color-interpolation-filters:sRGB;fill:none;fill-rule:evenodd;stroke-linecap:square;stroke-miterlimit:3"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\AzurePowerShell\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\AzurePowerShell\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999"><metadata
      id="metadata40"><rdf:RDF><cc:Work
diff --git a/Tasks/AzureFileCopy/README.md b/Tasks/AzureFileCopy/README.md
index 59accf00ab40..029f048f8457 100644
--- a/Tasks/AzureFileCopy/README.md
+++ b/Tasks/AzureFileCopy/README.md
@@ -14,7 +14,7 @@ Please contact the alias RM\_Customer\_Queries at microsoft dot com, if you are
 
 To deploy to Azure, an Azure subscription has to be linked to Team Foundation Server or to Visual Studio Team Services using the Services tab in the Account Administration section. Add the Azure subscription to use in the Build or Release Management definition by opening the Account Administration screen (gear icon on the top-right of the screen) and then click on the Services Tab. 
 
- - For Azure Classic resources use 'Azure' endpoint type with Certificate or Credentials based authentication. If you are using credentials based auth, ensure that the credentials are for a [**work account**](https://azure.microsoft.com/en-in/pricing/member-offers/msdn-benefits-details/work-accounts-faq/) because Microsoft accounts like [**joe@live.com**](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup) or [**joe@hotmail.com**](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup) are not supported. 
+ - For Azure Classic resources use 'Azure' endpoint type with Certificate or Credentials based authentication. If you are using credentials based auth, ensure that the credentials are for a [**work account**](https://azure.microsoft.com/en-in/pricing/member-offers/msdn-benefits-details/work-accounts-faq/) because Microsoft accounts like [**joe@live.com**](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup) or [**joe@hotmail.com**](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup) are not supported. 
 
  - For [ARM](https://azure.microsoft.com/en-in/documentation/articles/resource-group-overview/), use 'Azure Resource Manager' endpoint type, for more details follow the steps listed in the link [here](http://go.microsoft.com/fwlink/?LinkID=623000&clcid=0x409).
 
@@ -24,17 +24,17 @@ To deploy to Azure, an Azure subscription has to be linked to Team Foundation Se
 
 The following table lists the storage accounts and the service connections that with them. To identify whether a storage account is based on the classic APIs or the resource manager APIs, log into [https://portal.azure.com/](https://portal.azure.com/) and browse for storage accounts (classic) or storage accounts.
 
-| **Storage Account Type** | **Azure Service Connections in VSO/TFS** |
+| **Storage Account Type** | **Azure Service Connections in TFS/Team Services** |
 | --- | --- |
 | [Resource manager](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-windows-tutorial/) |      Azure Resource Manager EndPoint  |
 | [Classic](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-windows-tutorial-classic-portal/) |      Azure EndPoint type with Certificate or credentials based authentication on work accounts |
 
 For Azure MSDN accounts, in addition to the certificates and the Service Principal, a work account can be easily created as shown below:
 
-1. Create an user in the Azure Active Directory from the [portal](https://msdn.microsoft.com/en-us/library/azure/hh967632.aspx) (this is the old Azure portal). After adding the account, the following two things need to be done to use the account in VSO:
+1. Create an user in the Azure Active Directory from the [portal](https://msdn.microsoft.com/en-us/library/azure/hh967632.aspx) (this is the old Azure portal). After adding the account, the following two things need to be done to use the account in Team Services:
   - Add the Active Directory account to the co-administrators in the subscription. Go to the Settings and then click on administrators and add the account as a co-admin like, [testuser@joehotmail.onmicrosoft.com](mailto:testuser@joehotmail.onmicrosoft.com)
   - Login to the portal with this Active Directory account wiz. [testuser@joehotmail.onmicrosoft.com](mailto:testuser@joehotmail.onmicrosoft.com), and change the password. Initially a temporary password is created and that needs to be changed at the first login.
-2. Add that user and password in the service connections in the VSO and deployments will work with that account.
+2. Add that user and password in the service connections in the Team Services and deployments will work with that account.
 
 **Azure PowerShell**
 
@@ -44,13 +44,13 @@ The task needs the Azure PowerShell version to be installed on the automation ag
 
 The task can copy files to the Azure Virtual Machines that are created either using the [new azure portal](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-windows-tutorial/) or through the [azure classic portal](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-windows-tutorial-classic-portal/). For copying the files to VMs, they are first copied to an automatically generated container in the  Azure storage account, and then from there to the VMs. The container is deleted after the files are copied successfully to the VMs. The valid combination of Azure service connections and storage accounts for copying to a Azure is as given below:
 
-| **Storage Account Type** | **Azure Service Connections in VSO/TFS** | **Azure Virtual Machines** |
+| **Storage Account Type** | **Azure Service Connections in TFS/Team Services** | **Azure Virtual Machines** |
 | --- | --- | --- |
 | [Resource manager](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-windows-tutorial/) | Azure Resource Manager Endpoint | [Resource manager](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-windows-tutorial/) Azure Virtual machines |
 | [Classic](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-windows-tutorial-classic-portal/) | Azure Endpoint type with Certificate or credentials based authentication on work accounts | [Classic](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-windows-tutorial-classic-portal/) Azure Virtual machines |
 When copying the files from the blob container to the Azure VMs, Windows Remote Management (WinRM) HTTPS protocol is used. This requires that the WinRM HTTPS service is properly setup on the VMs and a certificate is also installed on the VMs.
 
-To dynamically deploy Azure resource groups with virtual machines in them use the [Azure Resource Group Deployment](https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/DeployAzureResourceGroup) task. The task has a sample template that can setup the WinRM HTTPS protocol on the virtual machines, open the 5986 port in the Firewall, and install the test certificate. After this the virtual machines are ready for use in the deployment task.
+To dynamically deploy Azure resource groups with virtual machines in them use the [Azure Resource Group Deployment](https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/DeployAzureResourceGroup) task. The task has a sample template that can setup the WinRM HTTPS protocol on the virtual machines, open the 5986 port in the Firewall, and install the test certificate. After this the virtual machines are ready for use in the deployment task.
 
 If the VMs have been created without opening the WinRM HTTPS ports then follow the steps below to setup the machine for WinRM HTTPS:
 
@@ -115,7 +115,7 @@ The parameters of the task are described in details, including examples, to show
 
 ### Earlier Versions
 
-If you want to work with earlier version of this task, please refer README.cmd present at https://github.com/Microsoft/vso-agent-tasks/tree/releases/m94/Tasks/AzureFileCopy/. 
+If you want to work with earlier version of this task, please refer README.cmd present at https://github.com/Microsoft/vsts-tasks/tree/releases/m94/Tasks/AzureFileCopy/. 
 
 ### Supported Azure and AzureRM module versions:
 Recommended: 
diff --git a/Tasks/AzureFileCopy/icon.svg b/Tasks/AzureFileCopy/icon.svg
index 2cf597d8b2e3..0562fcb1e775 100644
--- a/Tasks/AzureFileCopy/icon.svg
+++ b/Tasks/AzureFileCopy/icon.svg
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\AzureFileCopy\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\AzureFileCopy\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/AzurePowerShell/icon.svg b/Tasks/AzurePowerShell/icon.svg
index f85904d7f045..22262ce49963 100644
--- a/Tasks/AzurePowerShell/icon.svg
+++ b/Tasks/AzurePowerShell/icon.svg
@@ -20,7 +20,7 @@
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
    style="font-size:12px;overflow:visible;color-interpolation-filters:sRGB;fill:none;fill-rule:evenodd;stroke-linecap:square;stroke-miterlimit:3"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\AzurePowerShell\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\AzurePowerShell\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999"><metadata
      id="metadata40"><rdf:RDF><cc:Work
diff --git a/Tasks/AzureRmWebAppDeployment/icon.svg b/Tasks/AzureRmWebAppDeployment/icon.svg
index 0221bf192667..dc1c04af05ad 100644
--- a/Tasks/AzureRmWebAppDeployment/icon.svg
+++ b/Tasks/AzureRmWebAppDeployment/icon.svg
@@ -20,7 +20,7 @@
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
    style="font-size:12px;overflow:visible;color-interpolation-filters:sRGB;fill:none;fill-rule:evenodd;stroke-linecap:square;stroke-miterlimit:3"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\AzureWebPowerShellDeployment\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\AzureWebPowerShellDeployment\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999"><metadata
      id="metadata40"><rdf:RDF><cc:Work
diff --git a/Tasks/AzureWebPowerShellDeployment/icon.svg b/Tasks/AzureWebPowerShellDeployment/icon.svg
index 0221bf192667..dc1c04af05ad 100644
--- a/Tasks/AzureWebPowerShellDeployment/icon.svg
+++ b/Tasks/AzureWebPowerShellDeployment/icon.svg
@@ -20,7 +20,7 @@
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
    style="font-size:12px;overflow:visible;color-interpolation-filters:sRGB;fill:none;fill-rule:evenodd;stroke-linecap:square;stroke-miterlimit:3"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\AzureWebPowerShellDeployment\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\AzureWebPowerShellDeployment\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999"><metadata
      id="metadata40"><rdf:RDF><cc:Work
diff --git a/Tasks/BatchScript/icon.svg b/Tasks/BatchScript/icon.svg
index 8001b9e238ab..74390f112045 100644
--- a/Tasks/BatchScript/icon.svg
+++ b/Tasks/BatchScript/icon.svg
@@ -16,7 +16,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\BatchScript\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\BatchScript\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/CMake/icon.svg b/Tasks/CMake/icon.svg
index 593c90193c00..001cfac649dd 100644
--- a/Tasks/CMake/icon.svg
+++ b/Tasks/CMake/icon.svg
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\Docker\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\Docker\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/Chef/Strings/resources.resjson/de-de/resources.resjson b/Tasks/Chef/Strings/resources.resjson/de-de/resources.resjson
index 8aed0e04e631..3ee9cab5c604 100644
--- a/Tasks/Chef/Strings/resources.resjson/de-de/resources.resjson
+++ b/Tasks/Chef/Strings/resources.resjson/de-de/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Chef",
-  "loc.helpMarkDown": "[Weitere Informationen](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Chef/README.md)",
+  "loc.helpMarkDown": "[Weitere Informationen](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Chef/README.md)",
   "loc.description": "Durch Bearbeiten der Umgebungsattribute in Chef-Umgebungen bereitstellen",
   "loc.instanceNameFormat": "Durch Bearbeiten von Umgebungsattributen von Chef-Abonnement $(ChefServer) an Chef bereitstellen",
   "loc.input.label.connectedServiceName": "Chef-Verbindung",
diff --git a/Tasks/Chef/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Chef/Strings/resources.resjson/en-US/resources.resjson
index 74b07f6a3ea8..d1e5af7cfce6 100644
--- a/Tasks/Chef/Strings/resources.resjson/en-US/resources.resjson
+++ b/Tasks/Chef/Strings/resources.resjson/en-US/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Chef",
-  "loc.helpMarkDown": "[More Information](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Chef/README.md)",
+  "loc.helpMarkDown": "[More Information](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Chef/README.md)",
   "loc.description": "Deploy to Chef environments by editing environment attributes",
   "loc.instanceNameFormat": "Deploy to chef by editing environment attributes of Chef subscription $(ChefServer)",
   "loc.input.label.connectedServiceName": "Chef Connection",
diff --git a/Tasks/Chef/Strings/resources.resjson/es-es/resources.resjson b/Tasks/Chef/Strings/resources.resjson/es-es/resources.resjson
index 2d94a8f61412..d0d13920be64 100644
--- a/Tasks/Chef/Strings/resources.resjson/es-es/resources.resjson
+++ b/Tasks/Chef/Strings/resources.resjson/es-es/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Chef",
-  "loc.helpMarkDown": "[Más información](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Chef/README.md)",
+  "loc.helpMarkDown": "[Más información](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Chef/README.md)",
   "loc.description": "Realice implementaciones en entornos Chef mediante la edición de los atributos del entorno",
   "loc.instanceNameFormat": "Implementar en Chef editando los atributos de entorno de la suscripción de Chef $(ChefServer)",
   "loc.input.label.connectedServiceName": "Conexión Chef",
diff --git a/Tasks/Chef/Strings/resources.resjson/fr-fr/resources.resjson b/Tasks/Chef/Strings/resources.resjson/fr-fr/resources.resjson
index fe8744d2c1c9..420fcac55322 100644
--- a/Tasks/Chef/Strings/resources.resjson/fr-fr/resources.resjson
+++ b/Tasks/Chef/Strings/resources.resjson/fr-fr/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Chef",
-  "loc.helpMarkDown": "[Plus d'informations](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Chef/README.md)",
+  "loc.helpMarkDown": "[Plus d'informations](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Chef/README.md)",
   "loc.description": "Déployer dans des environnements Chef en modifiant les attributs d'environnement",
   "loc.instanceNameFormat": "Déployer dans un environnement chef en modifiant les attributs d'environnement de l'abonnement Chef $(ChefServer)",
   "loc.input.label.connectedServiceName": "Connexion Chef",
diff --git a/Tasks/Chef/Strings/resources.resjson/it-IT/resources.resjson b/Tasks/Chef/Strings/resources.resjson/it-IT/resources.resjson
index ce436efcdbe1..928340bcd132 100644
--- a/Tasks/Chef/Strings/resources.resjson/it-IT/resources.resjson
+++ b/Tasks/Chef/Strings/resources.resjson/it-IT/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Chef",
-  "loc.helpMarkDown": "[Altre informazioni](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Chef/README.md)",
+  "loc.helpMarkDown": "[Altre informazioni](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Chef/README.md)",
   "loc.description": "Consente di distribuire in ambienti Chef modificando gli attributi dell'ambiente",
   "loc.instanceNameFormat": "Consente di distribuire in Chef modificando gli attributi di ambiente della sottoscrizione di Chef $(ChefServer)",
   "loc.input.label.connectedServiceName": "Connessione a Chef",
diff --git a/Tasks/Chef/Strings/resources.resjson/ja-jp/resources.resjson b/Tasks/Chef/Strings/resources.resjson/ja-jp/resources.resjson
index 366abdefe710..6cce1efee276 100644
--- a/Tasks/Chef/Strings/resources.resjson/ja-jp/resources.resjson
+++ b/Tasks/Chef/Strings/resources.resjson/ja-jp/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Chef",
-  "loc.helpMarkDown": "[詳細](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Chef/README.md)",
+  "loc.helpMarkDown": "[詳細](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Chef/README.md)",
   "loc.description": "環境属性を編集して Chef 環境を展開します",
   "loc.instanceNameFormat": "Chef のサブスクリプション $(ChefServer) の環境属性を編集して Chef に展開します",
   "loc.input.label.connectedServiceName": "Chef 接続",
diff --git a/Tasks/Chef/Strings/resources.resjson/ko-KR/resources.resjson b/Tasks/Chef/Strings/resources.resjson/ko-KR/resources.resjson
index 62e89b107f1b..1aa21e1af8ae 100644
--- a/Tasks/Chef/Strings/resources.resjson/ko-KR/resources.resjson
+++ b/Tasks/Chef/Strings/resources.resjson/ko-KR/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Chef",
-  "loc.helpMarkDown": "[자세한 정보](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Chef/README.md)",
+  "loc.helpMarkDown": "[자세한 정보](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Chef/README.md)",
   "loc.description": "환경 특성을 편집하여 Chef 환경에 배포",
   "loc.instanceNameFormat": "Chef 구독 $(ChefServer)의 환경 특성을 편집하여 chef에 배포",
   "loc.input.label.connectedServiceName": "Chef 연결",
diff --git a/Tasks/Chef/Strings/resources.resjson/ru-RU/resources.resjson b/Tasks/Chef/Strings/resources.resjson/ru-RU/resources.resjson
index d59304239e08..e0030cf4a9f3 100644
--- a/Tasks/Chef/Strings/resources.resjson/ru-RU/resources.resjson
+++ b/Tasks/Chef/Strings/resources.resjson/ru-RU/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Chef",
-  "loc.helpMarkDown": "[Подробнее...](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Chef/README.md)",
+  "loc.helpMarkDown": "[Подробнее...](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Chef/README.md)",
   "loc.description": "Развертывание в средах Chef путем изменения атрибутов среды",
   "loc.instanceNameFormat": "Выполните развертывание в Сhef, изменив атрибуты среды для подписки Chef $(ChefServer)",
   "loc.input.label.connectedServiceName": "Подключение Chef",
diff --git a/Tasks/Chef/Strings/resources.resjson/zh-CN/resources.resjson b/Tasks/Chef/Strings/resources.resjson/zh-CN/resources.resjson
index 94628393e6dc..14f840c29431 100644
--- a/Tasks/Chef/Strings/resources.resjson/zh-CN/resources.resjson
+++ b/Tasks/Chef/Strings/resources.resjson/zh-CN/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Chef",
-  "loc.helpMarkDown": "[详细信息](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Chef/README.md)",
+  "loc.helpMarkDown": "[详细信息](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Chef/README.md)",
   "loc.description": "通过编辑环境属性部署到 Chef 环境",
   "loc.instanceNameFormat": "通过编辑 Chef 订阅 $(ChefServer) 的环境属性来部署到 chef",
   "loc.input.label.connectedServiceName": "Chef 连接",
diff --git a/Tasks/Chef/Strings/resources.resjson/zh-TW/resources.resjson b/Tasks/Chef/Strings/resources.resjson/zh-TW/resources.resjson
index 6ec3c406a0ce..facc89637d49 100644
--- a/Tasks/Chef/Strings/resources.resjson/zh-TW/resources.resjson
+++ b/Tasks/Chef/Strings/resources.resjson/zh-TW/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Chef",
-  "loc.helpMarkDown": "[詳細資訊](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Chef/README.md)",
+  "loc.helpMarkDown": "[詳細資訊](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Chef/README.md)",
   "loc.description": "編輯環境屬性，以部署至 Chef 環境",
   "loc.instanceNameFormat": "編輯 Chef 訂用帳戶的環境屬性以部署至 Chef $(ChefServer)",
   "loc.input.label.connectedServiceName": "Chef 連接",
diff --git a/Tasks/Chef/task.json b/Tasks/Chef/task.json
index 497cba5d6162..64ecbe4a96f2 100644
--- a/Tasks/Chef/task.json
+++ b/Tasks/Chef/task.json
@@ -3,7 +3,7 @@
     "name": "Chef",
     "friendlyName": "Chef",
     "description": "Deploy to Chef environments by editing environment attributes",
-    "helpMarkDown": "[More Information](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Chef/README.md)",
+    "helpMarkDown": "[More Information](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Chef/README.md)",
     "category": "Deploy",
     "visibility": [
                 "Preview",
diff --git a/Tasks/ChefKnife/Strings/resources.resjson/de-de/resources.resjson b/Tasks/ChefKnife/Strings/resources.resjson/de-de/resources.resjson
index 9bfb7c9dd2fc..5944f700cd6f 100644
--- a/Tasks/ChefKnife/Strings/resources.resjson/de-de/resources.resjson
+++ b/Tasks/ChefKnife/Strings/resources.resjson/de-de/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Chef Knife",
-  "loc.helpMarkDown": "[Weitere Informationen](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/ChefKnife/README.md)",
+  "loc.helpMarkDown": "[Weitere Informationen](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/ChefKnife/README.md)",
   "loc.description": "Skripte mit Knife-Befehlen auf Ihrer Chef-Arbeitsstation ausführen",
   "loc.instanceNameFormat": "Chef Knife-Skript: $(ScriptPath)",
   "loc.input.label.ConnectedServiceName": "Chef-Abonnements",
diff --git a/Tasks/ChefKnife/Strings/resources.resjson/en-US/resources.resjson b/Tasks/ChefKnife/Strings/resources.resjson/en-US/resources.resjson
index 48b7d8621ff4..3c60779980b5 100644
--- a/Tasks/ChefKnife/Strings/resources.resjson/en-US/resources.resjson
+++ b/Tasks/ChefKnife/Strings/resources.resjson/en-US/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Chef Knife",
-  "loc.helpMarkDown": "[More Information](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/ChefKnife/README.md)",
+  "loc.helpMarkDown": "[More Information](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/ChefKnife/README.md)",
   "loc.description": "Run Scripts with knife commands on your chef workstation",
   "loc.instanceNameFormat": "Chef Knife script: $(ScriptPath)",
   "loc.input.label.ConnectedServiceName": "Chef Subscription",
diff --git a/Tasks/ChefKnife/Strings/resources.resjson/es-es/resources.resjson b/Tasks/ChefKnife/Strings/resources.resjson/es-es/resources.resjson
index 85e8d7ff7ff6..0c2bc97311a8 100644
--- a/Tasks/ChefKnife/Strings/resources.resjson/es-es/resources.resjson
+++ b/Tasks/ChefKnife/Strings/resources.resjson/es-es/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Knife de Chef",
-  "loc.helpMarkDown": "[Más información](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/ChefKnife/README.md)",
+  "loc.helpMarkDown": "[Más información](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/ChefKnife/README.md)",
   "loc.description": "Ejecute scripts con comandos Knife en la estación de trabajo Chef",
   "loc.instanceNameFormat": "Script knife de Chef: $(ScriptPath)",
   "loc.input.label.ConnectedServiceName": "Suscripción a Chef",
diff --git a/Tasks/ChefKnife/Strings/resources.resjson/fr-fr/resources.resjson b/Tasks/ChefKnife/Strings/resources.resjson/fr-fr/resources.resjson
index 16adab82350e..0cc83a4de028 100644
--- a/Tasks/ChefKnife/Strings/resources.resjson/fr-fr/resources.resjson
+++ b/Tasks/ChefKnife/Strings/resources.resjson/fr-fr/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Knife pour Chef",
-  "loc.helpMarkDown": "[Plus d'informations](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/ChefKnife/README.md)",
+  "loc.helpMarkDown": "[Plus d'informations](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/ChefKnife/README.md)",
   "loc.description": "Exécuter des scripts avec des commandes knife sur votre station de travail chef",
   "loc.instanceNameFormat": "Script Chef Knife : $(ScriptPath)",
   "loc.input.label.ConnectedServiceName": "Abonnement Chef",
diff --git a/Tasks/ChefKnife/Strings/resources.resjson/it-IT/resources.resjson b/Tasks/ChefKnife/Strings/resources.resjson/it-IT/resources.resjson
index 1cc1f7a10421..bb80e38352ef 100644
--- a/Tasks/ChefKnife/Strings/resources.resjson/it-IT/resources.resjson
+++ b/Tasks/ChefKnife/Strings/resources.resjson/it-IT/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Knife Chef",
-  "loc.helpMarkDown": "[Altre informazioni](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/ChefKnife/README.md)",
+  "loc.helpMarkDown": "[Altre informazioni](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/ChefKnife/README.md)",
   "loc.description": "Consente di eseguire script con comandi knife sulla workstation Chef",
   "loc.instanceNameFormat": "Script knife Chef: $(ScriptPath)",
   "loc.input.label.ConnectedServiceName": "Sottoscrizione di Chef",
diff --git a/Tasks/ChefKnife/Strings/resources.resjson/ja-jp/resources.resjson b/Tasks/ChefKnife/Strings/resources.resjson/ja-jp/resources.resjson
index 55aec8919118..c0111f0d7179 100644
--- a/Tasks/ChefKnife/Strings/resources.resjson/ja-jp/resources.resjson
+++ b/Tasks/ChefKnife/Strings/resources.resjson/ja-jp/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Chef Knife",
-  "loc.helpMarkDown": "[詳細](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/ChefKnife/README.md)",
+  "loc.helpMarkDown": "[詳細](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/ChefKnife/README.md)",
   "loc.description": "Chef ワークステーションで knife コマンドを使ってスクリプトを実行します",
   "loc.instanceNameFormat": "Chef の knife スクリプト: $(ScriptPath)",
   "loc.input.label.ConnectedServiceName": "Chef サブスクリプション",
diff --git a/Tasks/ChefKnife/Strings/resources.resjson/ko-KR/resources.resjson b/Tasks/ChefKnife/Strings/resources.resjson/ko-KR/resources.resjson
index a7c363b53065..a213a96f62ec 100644
--- a/Tasks/ChefKnife/Strings/resources.resjson/ko-KR/resources.resjson
+++ b/Tasks/ChefKnife/Strings/resources.resjson/ko-KR/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Chef Knife",
-  "loc.helpMarkDown": "[자세한 정보](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/ChefKnife/README.md)",
+  "loc.helpMarkDown": "[자세한 정보](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/ChefKnife/README.md)",
   "loc.description": "chef 워크스테이션에서 knife 명령을 사용하여 스크립트 실행",
   "loc.instanceNameFormat": "Chef Knife 스크립트: $(ScriptPath)",
   "loc.input.label.ConnectedServiceName": "Chef 구독",
diff --git a/Tasks/ChefKnife/Strings/resources.resjson/ru-RU/resources.resjson b/Tasks/ChefKnife/Strings/resources.resjson/ru-RU/resources.resjson
index ff5452b396dd..1437d5986d72 100644
--- a/Tasks/ChefKnife/Strings/resources.resjson/ru-RU/resources.resjson
+++ b/Tasks/ChefKnife/Strings/resources.resjson/ru-RU/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Chef Knife",
-  "loc.helpMarkDown": "[Подробнее...](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/ChefKnife/README.md)",
+  "loc.helpMarkDown": "[Подробнее...](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/ChefKnife/README.md)",
   "loc.description": "Выполнение скриптов с помощью команд Knife на рабочей станции Chef",
   "loc.instanceNameFormat": "Сценарий Knife Chef: $(ScriptPath)",
   "loc.input.label.ConnectedServiceName": "Подписка Chef",
diff --git a/Tasks/ChefKnife/Strings/resources.resjson/zh-CN/resources.resjson b/Tasks/ChefKnife/Strings/resources.resjson/zh-CN/resources.resjson
index ff770a91aaf4..7bd0a6c199d0 100644
--- a/Tasks/ChefKnife/Strings/resources.resjson/zh-CN/resources.resjson
+++ b/Tasks/ChefKnife/Strings/resources.resjson/zh-CN/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Chef Knife",
-  "loc.helpMarkDown": "[详细信息](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/ChefKnife/README.md)",
+  "loc.helpMarkDown": "[详细信息](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/ChefKnife/README.md)",
   "loc.description": "在 chef 工作站上使用 knife 命令运行脚本",
   "loc.instanceNameFormat": "Chef Knife 脚本: $(ScriptPath)",
   "loc.input.label.ConnectedServiceName": "Chef 订阅",
diff --git a/Tasks/ChefKnife/Strings/resources.resjson/zh-TW/resources.resjson b/Tasks/ChefKnife/Strings/resources.resjson/zh-TW/resources.resjson
index 96c6c9d55d88..983c5a7cb093 100644
--- a/Tasks/ChefKnife/Strings/resources.resjson/zh-TW/resources.resjson
+++ b/Tasks/ChefKnife/Strings/resources.resjson/zh-TW/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Chef Knife",
-  "loc.helpMarkDown": "[詳細資訊](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/ChefKnife/README.md)",
+  "loc.helpMarkDown": "[詳細資訊](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/ChefKnife/README.md)",
   "loc.description": "在您 Chef 工作站上使用 knife 命令執行指令碼。",
   "loc.instanceNameFormat": "Chef Knife 指令碼: $(ScriptPath)",
   "loc.input.label.ConnectedServiceName": "Chef 訂用帳戶",
diff --git a/Tasks/ChefKnife/task.json b/Tasks/ChefKnife/task.json
index 35a7da060a71..5e2ec1fa192d 100644
--- a/Tasks/ChefKnife/task.json
+++ b/Tasks/ChefKnife/task.json
@@ -3,7 +3,7 @@
     "name": "ChefKnife",
     "friendlyName": "Chef Knife",
     "description": "Run Scripts with knife commands on your chef workstation",
-    "helpMarkDown": "[More Information](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/ChefKnife/README.md)",
+    "helpMarkDown": "[More Information](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/ChefKnife/README.md)",
     "category": "Deploy",
     "visibility": [
                 "Preview",
diff --git a/Tasks/CmdLine/icon.svg b/Tasks/CmdLine/icon.svg
index 5441d3cc1771..634956067d2e 100644
--- a/Tasks/CmdLine/icon.svg
+++ b/Tasks/CmdLine/icon.svg
@@ -14,7 +14,7 @@
    id="svg2"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\NpmInstall\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\NpmInstall\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <metadata
diff --git a/Tasks/CopyPublishBuildArtifacts/icon.svg b/Tasks/CopyPublishBuildArtifacts/icon.svg
index 2fc7af9f3d7b..9318ee9729c5 100644
--- a/Tasks/CopyPublishBuildArtifacts/icon.svg
+++ b/Tasks/CopyPublishBuildArtifacts/icon.svg
@@ -19,7 +19,7 @@
    xml:space="preserve"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\PublishBuildArtifacts\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\PublishBuildArtifacts\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999"><metadata
      id="metadata44"><rdf:RDF><cc:Work
diff --git a/Tasks/DeployAzureResourceGroup/README.md b/Tasks/DeployAzureResourceGroup/README.md
index 624652537e36..c0076ffbda13 100644
--- a/Tasks/DeployAzureResourceGroup/README.md
+++ b/Tasks/DeployAzureResourceGroup/README.md
@@ -14,7 +14,7 @@ Please contact the alias RM\_Customer\_Queries at microsoft dot com, if you are
 
 To deploy to Azure, an Azure subscription has to be linked to Team Foundation Server or to Visual Studio Team Services using the Services tab in the Account Administration section. Add the Azure subscription to use in the Build or Release Management definition by opening the Account Administration screen (gear icon on the top-right of the screen) and then click on the Services Tab. 
 
- - For Azure Classic resources use 'Azure' endpoint type with Certificate or Credentials based authentication. If you are using credentials based auth, ensure that the credentials are for a [**work account**](https://azure.microsoft.com/en-in/pricing/member-offers/msdn-benefits-details/work-accounts-faq/) because Microsoft accounts like [**joe@live.com**](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup) or [**joe@hotmail.com**](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup) are not supported. 
+ - For Azure Classic resources use 'Azure' endpoint type with Certificate or Credentials based authentication. If you are using credentials based auth, ensure that the credentials are for a [**work account**](https://azure.microsoft.com/en-in/pricing/member-offers/msdn-benefits-details/work-accounts-faq/) because Microsoft accounts like [**joe@live.com**](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup) or [**joe@hotmail.com**](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup) are not supported. 
 
  - For [ARM](https://azure.microsoft.com/en-in/documentation/articles/resource-group-overview/), use 'Azure Resource Manager' endpoint type, for more details follow the steps listed in the link [here](http://go.microsoft.com/fwlink/?LinkID=623000&clcid=0x409).
 
@@ -24,10 +24,10 @@ To deploy to Azure, an Azure subscription has to be linked to Team Foundation Se
 
 For Azure MSDN accounts, one can either use a [Service Principal](http://go.microsoft.com/fwlink/?LinkID=623000&clcid=0x409) or a work account. It's easy to create a work account as shown below:
 
-1. Create an user in the Azure Active Directory from the [portal](https://msdn.microsoft.com/en-us/library/azure/hh967632.aspx) (this is the old Azure portal). After adding the account, the following two things need to be done to use the account in VSO:
+1. Create an user in the Azure Active Directory from the [portal](https://msdn.microsoft.com/en-us/library/azure/hh967632.aspx) (this is the old Azure portal). After adding the account, the following two things need to be done to use the account in Team Services:
   - Add the Active Directory account to the co-administrators in the subscription. Go to the Settings and then click on administrators and add the account as a co-admin like, [testuser@joehotmail.onmicrosoft.com](mailto:testuser@joehotmail.onmicrosoft.com)
   - Login to the portal with this Active Directory account wiz. [testuser@joehotmail.onmicrosoft.com](mailto:testuser@joehotmail.onmicrosoft.com), and change the password. Initially a temporary password is created and that needs to be changed at the first login.
-2. Add that user and password in the service connections in the VSO and deployments will work with that account.
+2. Add that user and password in the service connections in Team Services and deployments will work with that account.
 
 ##### Azure PowerShell
 
diff --git a/Tasks/DeployAzureResourceGroup/SPNCreation.ps1 b/Tasks/DeployAzureResourceGroup/SPNCreation.ps1
index 8961e6960f30..7e95788e7f19 100644
--- a/Tasks/DeployAzureResourceGroup/SPNCreation.ps1
+++ b/Tasks/DeployAzureResourceGroup/SPNCreation.ps1
@@ -24,7 +24,7 @@ $identifierUri = $homePage
 $isAzureModulePresent = Get-Module -Name AzureRM* -ListAvailable
 if ([String]::IsNullOrEmpty($isAzureModulePresent) -eq $true)
 {
-    Write-Output "Script requires AzureRM modules to be present. Obtain AzureRM from https://github.com/Azure/azure-powershell/releases. Please refer https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md for recommended AzureRM versions." -Verbose
+    Write-Output "Script requires AzureRM modules to be present. Obtain AzureRM from https://github.com/Azure/azure-powershell/releases. Please refer https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md for recommended AzureRM versions." -Verbose
     return
 }
 
diff --git a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/de-de/resources.resjson b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/de-de/resources.resjson
index 74d13d6c5065..5c65f871455f 100644
--- a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/de-de/resources.resjson
+++ b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/de-de/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Bereitstellung einer Azure-Ressourcengruppe",
-  "loc.helpMarkDown": "[Weitere Informationen](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
+  "loc.helpMarkDown": "[Weitere Informationen](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
   "loc.description": "Bereitstellen, Starten, Beenden und Löschen von Azure-Ressourcengruppen.",
   "loc.instanceNameFormat": "Azure-Bereitstellung: $(action) Aktion für $(resourceGroupName)",
   "loc.group.displayName.output": "Ausgabe",
diff --git a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/en-US/resources.resjson b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/en-US/resources.resjson
index 2c95491dde10..3dcd69c554bf 100644
--- a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/en-US/resources.resjson
+++ b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/en-US/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Azure Resource Group Deployment",
-  "loc.helpMarkDown": "[More Information](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
+  "loc.helpMarkDown": "[More Information](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
   "loc.description": "Deploy, start, stop, delete Azure Resource Groups",
   "loc.instanceNameFormat": "Azure Deployment:$(action) action on $(resourceGroupName)",
   "loc.group.displayName.output": "Output",
diff --git a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/es-es/resources.resjson b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/es-es/resources.resjson
index 682b6079b397..6ca27d9fc776 100644
--- a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/es-es/resources.resjson
+++ b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/es-es/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Implementación de un grupo de recursos de Azure",
-  "loc.helpMarkDown": "[Más información](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
+  "loc.helpMarkDown": "[Más información](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
   "loc.description": "Implementar, iniciar, detener, eliminar grupos de recursos de Azure",
   "loc.instanceNameFormat": "Implementación en Azure: acción $(action) en $(resourceGroupName)",
   "loc.group.displayName.output": "Salida",
diff --git a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/fr-fr/resources.resjson b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/fr-fr/resources.resjson
index c66660b142a9..d7b50fa31815 100644
--- a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/fr-fr/resources.resjson
+++ b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/fr-fr/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Déploiement de groupe de ressources Azure",
-  "loc.helpMarkDown": "[Plus d'informations](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
+  "loc.helpMarkDown": "[Plus d'informations](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
   "loc.description": "Déployer, démarrer, arrêter et supprimer les groupes de ressources Azure",
   "loc.instanceNameFormat": "Déploiement Azure : action $(action) sur $(resourceGroupName)",
   "loc.group.displayName.output": "Sortie",
diff --git a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/it-IT/resources.resjson b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/it-IT/resources.resjson
index 4bd2500cb499..49a11e1aefb4 100644
--- a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/it-IT/resources.resjson
+++ b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/it-IT/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Distribuzione gruppo di risorse di Azure",
-  "loc.helpMarkDown": "[Altre informazioni](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
+  "loc.helpMarkDown": "[Altre informazioni](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
   "loc.description": "Consente di distribuire, avviare, arrestare ed eliminare gruppi di risorse di Azure",
   "loc.instanceNameFormat": "Distribuzione Azure: azione $(action) su $(resourceGroupName)",
   "loc.group.displayName.output": "Output",
diff --git a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/ja-jp/resources.resjson b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/ja-jp/resources.resjson
index df6a39d7dff0..292346080807 100644
--- a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/ja-jp/resources.resjson
+++ b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/ja-jp/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Azure リソース グループの配置",
-  "loc.helpMarkDown": "[詳細](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
+  "loc.helpMarkDown": "[詳細](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
   "loc.description": "Azure リソース グループを展開、開始、停止、削除します",
   "loc.instanceNameFormat": "Azure の配置: $(resourceGroupName) 上の $(action) アクション",
   "loc.group.displayName.output": "出力",
diff --git a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/ko-KR/resources.resjson b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/ko-KR/resources.resjson
index 5ebcf2b2ef22..9d9705b1da5c 100644
--- a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/ko-KR/resources.resjson
+++ b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/ko-KR/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Azure 리소스 그룹 배포",
-  "loc.helpMarkDown": "[자세한 정보](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
+  "loc.helpMarkDown": "[자세한 정보](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
   "loc.description": "Azure 리소스 그룹 배포, 시작, 중지, 삭제",
   "loc.instanceNameFormat": "Azure 배포:$(resourceGroupName)에 대한 $(action) 작업",
   "loc.group.displayName.output": "출력",
diff --git a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/ru-RU/resources.resjson b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/ru-RU/resources.resjson
index 74427a4bd2ff..c44ef48d7e67 100644
--- a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/ru-RU/resources.resjson
+++ b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/ru-RU/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Развертывание группы ресурсов Azure",
-  "loc.helpMarkDown": "[Подробнее...](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
+  "loc.helpMarkDown": "[Подробнее...](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
   "loc.description": "Развертывание, запуск, остановка и удаление групп ресурсов Azure",
   "loc.instanceNameFormat": "Развертывание Azure: действие $(action) с $(resourceGroupName)",
   "loc.group.displayName.output": "Выход",
diff --git a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/zh-CN/resources.resjson b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/zh-CN/resources.resjson
index bb527f149d6f..4e27a67f4fc3 100644
--- a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/zh-CN/resources.resjson
+++ b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/zh-CN/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Azure 资源组部署",
-  "loc.helpMarkDown": "[详细信息](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
+  "loc.helpMarkDown": "[详细信息](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
   "loc.description": "部署、启动、停止和删除 Azure 资源组",
   "loc.instanceNameFormat": "对 $(resourceGroupName) 的 Azure Deployment:$(action) 操作",
   "loc.group.displayName.output": "输出",
diff --git a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/zh-TW/resources.resjson b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/zh-TW/resources.resjson
index 735256f5ae6e..eba1bc0dcf59 100644
--- a/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/zh-TW/resources.resjson
+++ b/Tasks/DeployAzureResourceGroup/Strings/resources.resjson/zh-TW/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Azure 資源群組部署",
-  "loc.helpMarkDown": "[詳細資訊](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
+  "loc.helpMarkDown": "[詳細資訊](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
   "loc.description": "部署、啟動、停止與刪除 Azure 資源群組",
   "loc.instanceNameFormat": "在 $(resourceGroupName) 上的 Azure 部署:$(action) 動作",
   "loc.group.displayName.output": "輸出",
diff --git a/Tasks/DeployAzureResourceGroup/icon.svg b/Tasks/DeployAzureResourceGroup/icon.svg
index 11811b47b544..49ca3d5a236a 100644
--- a/Tasks/DeployAzureResourceGroup/icon.svg
+++ b/Tasks/DeployAzureResourceGroup/icon.svg
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\DeployAzureResourceGroup\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\DeployAzureResourceGroup\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/DeployAzureResourceGroup/task.json b/Tasks/DeployAzureResourceGroup/task.json
index 19a187c29205..52f8030649d5 100644
--- a/Tasks/DeployAzureResourceGroup/task.json
+++ b/Tasks/DeployAzureResourceGroup/task.json
@@ -3,7 +3,7 @@
     "name": "AzureResourceGroupDeployment",
     "friendlyName": "Azure Resource Group Deployment",
     "description": "Deploy, start, stop, delete Azure Resource Groups",
-    "helpMarkDown": "[More Information](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
+    "helpMarkDown": "[More Information](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup/README.md)",
     "category": "Deploy",
     "visibility": [
         "Build",
diff --git a/Tasks/DeployVisualStudioTestAgent/README.md b/Tasks/DeployVisualStudioTestAgent/README.md
index 36450f4dd21e..ae341e0a7a32 100644
--- a/Tasks/DeployVisualStudioTestAgent/README.md
+++ b/Tasks/DeployVisualStudioTestAgent/README.md
@@ -42,7 +42,7 @@ The task requires:
   For example, in a client-server application model, you would use this option to deploy Test Agent on the server machines and use another deploy task to deploy Agent to test machines. This will enable you to collect data from both Server and client machines while not triggering tests on Server machines 
   
 ###Scenarios Supported
-For a list of scenarios supported, please see https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/RunDistributedTests/README.md 
+For a list of scenarios supported, please see https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/RunDistributedTests/README.md 
 
 ###Configuring Test Machine Group / Azure Resource Group
-Prerequisites for configuring Test machine group or Azure resource group to work with this task and other BDT tasks can be found at https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/PowerShellOnTargetMachines/README.md#machine-pre-requisites-for-the-task-
+Prerequisites for configuring Test machine group or Azure resource group to work with this task and other BDT tasks can be found at https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/PowerShellOnTargetMachines/README.md#machine-pre-requisites-for-the-task-
diff --git a/Tasks/DeployVisualStudioTestAgent/icon.svg b/Tasks/DeployVisualStudioTestAgent/icon.svg
index 92de3f7c5ec1..1cb017426838 100644
--- a/Tasks/DeployVisualStudioTestAgent/icon.svg
+++ b/Tasks/DeployVisualStudioTestAgent/icon.svg
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\DeployVisualStudioTestAgent\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\DeployVisualStudioTestAgent\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/Docker/Strings/resources.resjson/de-de/resources.resjson b/Tasks/Docker/Strings/resources.resjson/de-de/resources.resjson
index a06d2660dee6..1ba6fde29be8 100644
--- a/Tasks/Docker/Strings/resources.resjson/de-de/resources.resjson
+++ b/Tasks/Docker/Strings/resources.resjson/de-de/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Docker",
-  "loc.helpMarkDown": "[Weitere Informationen](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Docker/README.md)",
+  "loc.helpMarkDown": "[Weitere Informationen](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Docker/README.md)",
   "loc.description": "Docker-Image auf einem Remotecomputer bereitstellen",
   "loc.instanceNameFormat": "Docker-Bereitstellung: $(Repository)",
   "loc.input.label.DockerEndpoint": "Docker-Endpunkt",
diff --git a/Tasks/Docker/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Docker/Strings/resources.resjson/en-US/resources.resjson
index f93364488681..ddd2a290b265 100644
--- a/Tasks/Docker/Strings/resources.resjson/en-US/resources.resjson
+++ b/Tasks/Docker/Strings/resources.resjson/en-US/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Docker",
-  "loc.helpMarkDown": "[More Information](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Docker/README.md)",
+  "loc.helpMarkDown": "[More Information](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Docker/README.md)",
   "loc.description": "Deploy a docker image to a remote machine",
   "loc.instanceNameFormat": "Docker Deployment: $(Repository)",
   "loc.input.label.DockerEndpoint": "Docker Endpoint",
diff --git a/Tasks/Docker/Strings/resources.resjson/es-es/resources.resjson b/Tasks/Docker/Strings/resources.resjson/es-es/resources.resjson
index d9c63a94128f..bd8dfd325db0 100644
--- a/Tasks/Docker/Strings/resources.resjson/es-es/resources.resjson
+++ b/Tasks/Docker/Strings/resources.resjson/es-es/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Docker",
-  "loc.helpMarkDown": "[Más información](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Docker/README.md)",
+  "loc.helpMarkDown": "[Más información](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Docker/README.md)",
   "loc.description": "Implementar una imagen de Docker en una máquina remota",
   "loc.instanceNameFormat": "Implementación de Docker: $(Repository)",
   "loc.input.label.DockerEndpoint": "Extremo de Docker",
diff --git a/Tasks/Docker/Strings/resources.resjson/fr-fr/resources.resjson b/Tasks/Docker/Strings/resources.resjson/fr-fr/resources.resjson
index 44713c1e0310..0a8997839017 100644
--- a/Tasks/Docker/Strings/resources.resjson/fr-fr/resources.resjson
+++ b/Tasks/Docker/Strings/resources.resjson/fr-fr/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Docker",
-  "loc.helpMarkDown": "[Plus d'informations](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Docker/README.md)",
+  "loc.helpMarkDown": "[Plus d'informations](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Docker/README.md)",
   "loc.description": "Déployer une image Docker sur un ordinateur distant",
   "loc.instanceNameFormat": "Déploiement de Docker : $(Repository)",
   "loc.input.label.DockerEndpoint": "Point de terminaison Docker",
diff --git a/Tasks/Docker/Strings/resources.resjson/it-IT/resources.resjson b/Tasks/Docker/Strings/resources.resjson/it-IT/resources.resjson
index 4573c2d26d94..9e35bebbe396 100644
--- a/Tasks/Docker/Strings/resources.resjson/it-IT/resources.resjson
+++ b/Tasks/Docker/Strings/resources.resjson/it-IT/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Docker",
-  "loc.helpMarkDown": "[Altre informazioni](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Docker/README.md)",
+  "loc.helpMarkDown": "[Altre informazioni](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Docker/README.md)",
   "loc.description": "Consente di distribuire un'immagine di Docker in un computer remoto",
   "loc.instanceNameFormat": "Distribuzione di Docker: $(Repository)",
   "loc.input.label.DockerEndpoint": "Endpoint di Docker",
diff --git a/Tasks/Docker/Strings/resources.resjson/ja-jp/resources.resjson b/Tasks/Docker/Strings/resources.resjson/ja-jp/resources.resjson
index a8ddc2495ac7..1c473354d36a 100644
--- a/Tasks/Docker/Strings/resources.resjson/ja-jp/resources.resjson
+++ b/Tasks/Docker/Strings/resources.resjson/ja-jp/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Docker",
-  "loc.helpMarkDown": "[詳細](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Docker/README.md)",
+  "loc.helpMarkDown": "[詳細](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Docker/README.md)",
   "loc.description": "Docker イメージをリモート コンピューターに展開します",
   "loc.instanceNameFormat": "Docker の配置: $(Repository)",
   "loc.input.label.DockerEndpoint": "Docker エンドポイント",
diff --git a/Tasks/Docker/Strings/resources.resjson/ko-KR/resources.resjson b/Tasks/Docker/Strings/resources.resjson/ko-KR/resources.resjson
index 408b4d2fdfb0..faeefd0a4089 100644
--- a/Tasks/Docker/Strings/resources.resjson/ko-KR/resources.resjson
+++ b/Tasks/Docker/Strings/resources.resjson/ko-KR/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Docker",
-  "loc.helpMarkDown": "[자세한 정보](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Docker/README.md)",
+  "loc.helpMarkDown": "[자세한 정보](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Docker/README.md)",
   "loc.description": "원격 컴퓨터에 Docker 이미지 배포",
   "loc.instanceNameFormat": "Docker 배포: $(Repository)",
   "loc.input.label.DockerEndpoint": "Docker 끝점",
diff --git a/Tasks/Docker/Strings/resources.resjson/ru-RU/resources.resjson b/Tasks/Docker/Strings/resources.resjson/ru-RU/resources.resjson
index 4ae725074223..5c6deb46c811 100644
--- a/Tasks/Docker/Strings/resources.resjson/ru-RU/resources.resjson
+++ b/Tasks/Docker/Strings/resources.resjson/ru-RU/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Docker",
-  "loc.helpMarkDown": "[Подробнее...](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Docker/README.md)",
+  "loc.helpMarkDown": "[Подробнее...](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Docker/README.md)",
   "loc.description": "Развертывание образа Docker на удаленном компьютере",
   "loc.instanceNameFormat": "Развертывание Docker: $(Repository)",
   "loc.input.label.DockerEndpoint": "Конечная точка Docker",
diff --git a/Tasks/Docker/Strings/resources.resjson/zh-CN/resources.resjson b/Tasks/Docker/Strings/resources.resjson/zh-CN/resources.resjson
index b29c1f964c32..0b0ff322cfde 100644
--- a/Tasks/Docker/Strings/resources.resjson/zh-CN/resources.resjson
+++ b/Tasks/Docker/Strings/resources.resjson/zh-CN/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Docker",
-  "loc.helpMarkDown": "[详细信息](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Docker/README.md)",
+  "loc.helpMarkDown": "[详细信息](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Docker/README.md)",
   "loc.description": "将 Docker 图像部署到远程计算机",
   "loc.instanceNameFormat": "Docker 部署: $(Repository)",
   "loc.input.label.DockerEndpoint": "Docker 终结点",
diff --git a/Tasks/Docker/Strings/resources.resjson/zh-TW/resources.resjson b/Tasks/Docker/Strings/resources.resjson/zh-TW/resources.resjson
index c0419a74901a..7bcd3bd96494 100644
--- a/Tasks/Docker/Strings/resources.resjson/zh-TW/resources.resjson
+++ b/Tasks/Docker/Strings/resources.resjson/zh-TW/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Docker",
-  "loc.helpMarkDown": "[詳細資訊](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Docker/README.md)",
+  "loc.helpMarkDown": "[詳細資訊](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Docker/README.md)",
   "loc.description": "將 Docker 映像部署到遠端電腦",
   "loc.instanceNameFormat": "Docker 部署: $(Repository)",
   "loc.input.label.DockerEndpoint": "Docker 端點",
diff --git a/Tasks/Docker/icon.svg b/Tasks/Docker/icon.svg
index 80642f0f23bf..6d2f2e9b7d30 100644
--- a/Tasks/Docker/icon.svg
+++ b/Tasks/Docker/icon.svg
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\VsTest\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\VsTest\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/Docker/task.json b/Tasks/Docker/task.json
index fb00806c1e6f..9fae286ff423 100644
--- a/Tasks/Docker/task.json
+++ b/Tasks/Docker/task.json
@@ -3,7 +3,7 @@
   "name": "Docker",
   "friendlyName": "Docker",
   "description": "Deploy a docker image to a remote machine",
-  "helpMarkDown": "[More Information](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/Docker/README.md)",
+  "helpMarkDown": "[More Information](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/Docker/README.md)",
   "category": "Deploy",
   "visibility": [
     "Preview",
diff --git a/Tasks/Gradle/icon.svg b/Tasks/Gradle/icon.svg
index 22a874b5fd4e..464ed6732263 100644
--- a/Tasks/Gradle/icon.svg
+++ b/Tasks/Gradle/icon.svg
@@ -16,7 +16,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\PowerShellOnTargetMachines\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\PowerShellOnTargetMachines\icon.png"
    inkscape:export-xdpi="2.8125"
    inkscape:export-ydpi="2.8125">
   <defs
diff --git a/Tasks/IISWebAppDeployment/README.md b/Tasks/IISWebAppDeployment/README.md
index 2e8f6945c6d6..6751051fa228 100644
--- a/Tasks/IISWebAppDeployment/README.md
+++ b/Tasks/IISWebAppDeployment/README.md
@@ -22,7 +22,7 @@ The following pre-requisites need to be setup for the task to work properly.
 
 ### Web Deploy
 
-Web Deploy (msdeploy.exe) is used to deploy the web application on the IIS server, and needs to be installed on the target machines, and can be easily done so using [Microsoft Web Platform Installer](http://www.microsoft.com/web/gallery/install.aspx?appid=wdeploynosmo). Note that the link will open Web PI with the Web Deploy showing-up ready to install. The WebDeploy 3.5 needs to be installed without the bundled SQL support and using the default settings. There is no need to choose any custom settings while installing web deploy. After installation the Web Deploy is available at C:\Program Files (x86)\IIS\Microsoft Web Deploy V3. The task [PowerShell on Target Machines](https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/PowerShellOnTargetMachines) can be used to deploy Web Deploy to Azure virtual machines or domain-joined/workgroup machines.
+Web Deploy (msdeploy.exe) is used to deploy the web application on the IIS server, and needs to be installed on the target machines, and can be easily done so using [Microsoft Web Platform Installer](http://www.microsoft.com/web/gallery/install.aspx?appid=wdeploynosmo). Note that the link will open Web PI with the Web Deploy showing-up ready to install. The WebDeploy 3.5 needs to be installed without the bundled SQL support and using the default settings. There is no need to choose any custom settings while installing web deploy. After installation the Web Deploy is available at C:\Program Files (x86)\IIS\Microsoft Web Deploy V3. The task [PowerShell on Target Machines](https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/PowerShellOnTargetMachines) can be used to deploy Web Deploy to Azure virtual machines or domain-joined/workgroup machines.
 
 AppCmd.exe is an in-built command line tool of IIS and does not need to be separately installed. It is used to create or update websites and application pools.
 
@@ -32,11 +32,11 @@ There should be a IIS web server already installed and configured on the pre-exi
 
 ### Pre-existing Machine Groups
 
-If the web application is being deployed on pre-existing machines (physical or virtual machines) then a machine group has to be created in the Machines Hub. There is a manage link next to the Machine Group parameter of the task. Click on the link to navigate to the Machines Hub and create a machine group. Note that the IP Address or the FDQN of Azure virtual machines can be also added in the machine group. The difference between using the domain-joined/workgroup machines and the Azure virtual machines is that copying files to them uses separate tasks wiz. [Windows Machine File Copy](https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/WindowsMachineFileCopy) for the domain-joined/workgroup machines and [Azure File Copy](https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/AzureFileCopy) for the Azure virtual machines. Note that the IIS Web Application Deployment task expects the web application's package zip files to be available on the machines or on a UNC path that is accessible by the machine administrator's login. Prior to using the IIS Web Application Deployment task ensure that the zip files are available for the deployment by copying them to the machines using the Windows Machine File Copy or the Azure File Copy tasks.
+If the web application is being deployed on pre-existing machines (physical or virtual machines) then a machine group has to be created in the Machines Hub. There is a manage link next to the Machine Group parameter of the task. Click on the link to navigate to the Machines Hub and create a machine group. Note that the IP Address or the FDQN of Azure virtual machines can be also added in the machine group. The difference between using the domain-joined/workgroup machines and the Azure virtual machines is that copying files to them uses separate tasks wiz. [Windows Machine File Copy](https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/WindowsMachineFileCopy) for the domain-joined/workgroup machines and [Azure File Copy](https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/AzureFileCopy) for the Azure virtual machines. Note that the IIS Web Application Deployment task expects the web application's package zip files to be available on the machines or on a UNC path that is accessible by the machine administrator's login. Prior to using the IIS Web Application Deployment task ensure that the zip files are available for the deployment by copying them to the machines using the Windows Machine File Copy or the Azure File Copy tasks.
 
 ### Azure Resource Groups
 
-To use dynamically deployed Azure virtual machines, use the [Azure Resource Group Deployment](https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/DeployAzureResourceGroup) task to deploy the virtual machines in a Resource Group and then the name of the Resource Group can be typed in the Machine Group parameter of the IIS Web Application Deployment task. As described above, copy the web application's package zip files to the virtual machines in the Azure Resource Group using the [Azure File Copy](https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/AzureFileCopy) task.
+To use dynamically deployed Azure virtual machines, use the [Azure Resource Group Deployment](https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/DeployAzureResourceGroup) task to deploy the virtual machines in a Resource Group and then the name of the Resource Group can be typed in the Machine Group parameter of the IIS Web Application Deployment task. As described above, copy the web application's package zip files to the virtual machines in the Azure Resource Group using the [Azure File Copy](https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/AzureFileCopy) task.
 
 _NOTE: Currently existing Azure Resource Groups, classic (v1) or Azure Resource Manager (v2), cannot be used in the Build or Release Management definitions. Ability to select existing Resource Groups and to use the virtual machine resources in them to deploy applications to is coming soon._
 
@@ -45,7 +45,7 @@ _NOTE: Currently existing Azure Resource Groups, classic (v1) or Azure Resource
 The IIS Web Application Deployment task uses the [Windows Remote Management](https://msdn.microsoft.com/en-us/library/aa384426(v=vs.85).aspx) (WinRM) to access domain-joined/workgroup machines or Azure virtual machines. WinRM is Microsoft's implementation of  [WS-Management Protocol](https://msdn.microsoft.com/en-us/library/aa384470(v=vs.85).aspx) that is firewall-friendly and provides a common way for systems to access and exchange management information across on-premises or Cloud IT infrastructure. The automation agent that runs the IIS Web Application Deployment task uses WinRM to communicate with the target machines. It is important to setup WinRM properly on the target machines else the deployment tasks will fail. The configuration of WinRM is described in detail on the MSDN [site](https://msdn.microsoft.com/en-us/library/aa384372(v=vs.85).aspx). For the target machines the following will ensure that the WinRM has been setup properly on them:
 
 1. Azure virtual machines only work with the WinRM HTTPS protocol. When creating [classic](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-windows-tutorial-classic-portal/) or [resource manager](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-windows-tutorial/) virtual machine from the Azure preview portal or Azure portal, the virtual machine is already setup for WinRM HTTPS, with the default port 5986 already open in Firewall, and a test certificate installed on the machine. These virtual machines can be directly added to a machine group, with the WinRM protocol selected as HTTPS, and the Skip CA Check option selected. The Skip CA Check means that the certificate is a test certificate and the client should skip the validation of the certificate by a trusted certification authority. 
-2. To dynamically deploy Azure resource groups with virtual machines in them use the [Azure Resource Group Deployment](https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/DeployAzureResourceGroup) task. The task has a sample template that can setup the WinRM HTTPS protocol on the virtual machines, open the 5986 port in the Firewall, and install the test certificate. After this the virtual machines are ready for use in the deployment task.
+2. To dynamically deploy Azure resource groups with virtual machines in them use the [Azure Resource Group Deployment](https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/DeployAzureResourceGroup) task. The task has a sample template that can setup the WinRM HTTPS protocol on the virtual machines, open the 5986 port in the Firewall, and install the test certificate. After this the virtual machines are ready for use in the deployment task.
 3. For pre-existing on-premises machines, domain-joined or workgroup, and whether they are physical machines or virtual machines, set them up as per the table below to ensure that the deployment tasks work fine with them:
 
 <table border="1" style="width:100%">
diff --git a/Tasks/MSBuild/icon.svg b/Tasks/MSBuild/icon.svg
index 37d63cd1784b..0954da03fd21 100644
--- a/Tasks/MSBuild/icon.svg
+++ b/Tasks/MSBuild/icon.svg
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\MSBuild\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\MSBuild\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/Npm/icon.svg b/Tasks/Npm/icon.svg
index a4c296f70bba..f5b6f0a246b0 100644
--- a/Tasks/Npm/icon.svg
+++ b/Tasks/Npm/icon.svg
@@ -14,7 +14,7 @@
    id="svg2"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\NpmInstall\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\NpmInstall\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <metadata
diff --git a/Tasks/NuGetInstaller/icon.svg b/Tasks/NuGetInstaller/icon.svg
index a83b75b69231..908cf382c835 100644
--- a/Tasks/NuGetInstaller/icon.svg
+++ b/Tasks/NuGetInstaller/icon.svg
@@ -14,7 +14,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\NuGetInstaller\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\NuGetInstaller\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/NuGetInstaller/package.json b/Tasks/NuGetInstaller/package.json
index be98a23010f7..19e45a8cf81a 100644
--- a/Tasks/NuGetInstaller/package.json
+++ b/Tasks/NuGetInstaller/package.json
@@ -8,14 +8,14 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Microsoft/vso-agent-tasks.git"
+    "url": "git+https://github.com/Microsoft/vsts-tasks.git"
   },
   "author": "Microsoft Corporation",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/Microsoft/vso-agent-tasks/issues"
+    "url": "https://github.com/Microsoft/vsts-tasks/issues"
   },
-  "homepage": "https://github.com/Microsoft/vso-agent-tasks#readme",
+  "homepage": "https://github.com/Microsoft/vsts-tasks#readme",
   "dependencies": {
     "xmlreader": "^0.2.3"
   }
diff --git a/Tasks/NugetPackager/icon.svg b/Tasks/NugetPackager/icon.svg
index bb72f4771151..99523590db9d 100644
--- a/Tasks/NugetPackager/icon.svg
+++ b/Tasks/NugetPackager/icon.svg
@@ -14,7 +14,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\NuGetInstaller\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\NuGetInstaller\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/NugetPublisher/icon.svg b/Tasks/NugetPublisher/icon.svg
index e400d3c8aa41..fc0b3a1d77bd 100644
--- a/Tasks/NugetPublisher/icon.svg
+++ b/Tasks/NugetPublisher/icon.svg
@@ -14,7 +14,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\PublishSymbols\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\PublishSymbols\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/PowerShellOnTargetMachines/icon.svg b/Tasks/PowerShellOnTargetMachines/icon.svg
index 0596ecf7939e..0616374e1f25 100644
--- a/Tasks/PowerShellOnTargetMachines/icon.svg
+++ b/Tasks/PowerShellOnTargetMachines/icon.svg
@@ -16,7 +16,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\PowerShellOnTargetMachines\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\PowerShellOnTargetMachines\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/PublishBuildArtifacts/icon.svg b/Tasks/PublishBuildArtifacts/icon.svg
index 2fc7af9f3d7b..9318ee9729c5 100644
--- a/Tasks/PublishBuildArtifacts/icon.svg
+++ b/Tasks/PublishBuildArtifacts/icon.svg
@@ -19,7 +19,7 @@
    xml:space="preserve"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\PublishBuildArtifacts\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\PublishBuildArtifacts\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999"><metadata
      id="metadata44"><rdf:RDF><cc:Work
diff --git a/Tasks/PublishCodeCoverageResults/README.md b/Tasks/PublishCodeCoverageResults/README.md
index 55a28f9556f4..d639091eadf8 100644
--- a/Tasks/PublishCodeCoverageResults/README.md
+++ b/Tasks/PublishCodeCoverageResults/README.md
@@ -1,7 +1,7 @@
 # Publish Code Coverage Results
 
 ###Overview
-The Publish Code Coverage Results task is used to publish the code coverage results to VSO/TFS. 
+The Publish Code Coverage Results task is used to publish the code coverage results to TFS/Team Services. 
 
 ###The different parameters of the task are explained below:
 
diff --git a/Tasks/PublishCodeCoverageResults/icon.svg b/Tasks/PublishCodeCoverageResults/icon.svg
index 8ee3dea90f53..9de68988bbc5 100644
--- a/Tasks/PublishCodeCoverageResults/icon.svg
+++ b/Tasks/PublishCodeCoverageResults/icon.svg
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\PublishCodeCoverageResults\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\PublishCodeCoverageResults\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/PublishSymbols/icon.svg b/Tasks/PublishSymbols/icon.svg
index de06ada992fd..8333b5b4e445 100644
--- a/Tasks/PublishSymbols/icon.svg
+++ b/Tasks/PublishSymbols/icon.svg
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\PublishSymbols\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\PublishSymbols\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/PublishTestResults/icon.svg b/Tasks/PublishTestResults/icon.svg
index 53e15b18e77e..69b3f162c9b4 100644
--- a/Tasks/PublishTestResults/icon.svg
+++ b/Tasks/PublishTestResults/icon.svg
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\PublishTestResults\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\PublishTestResults\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/QuickPerfTest/icon.svg b/Tasks/QuickPerfTest/icon.svg
index 16d1357ade0b..dc46c04c5852 100644
--- a/Tasks/QuickPerfTest/icon.svg
+++ b/Tasks/QuickPerfTest/icon.svg
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\QuickPerfTest\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\QuickPerfTest\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/RunDistributedTests/README.md b/Tasks/RunDistributedTests/README.md
index b7d102b0b6b1..a1fc26eb3b06 100644
--- a/Tasks/RunDistributedTests/README.md
+++ b/Tasks/RunDistributedTests/README.md
@@ -99,10 +99,10 @@ If this is not the case, testagent should be manually downloaded from official m
 
 ### Here is a list of other tasks that can be used with this task in the Build-Deploy-Test (BDT) workflow:
 
-1.	*Deploy Azure Resource Group*: https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/DeployAzureResourceGroup
-2.	*Azure File Copy*: https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/AzureFileCopy
-3.	*Windows Machine File Copy*: https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/WindowsMachineFileCopy
-4.	*PowerShell on Target Machines*: https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/PowerShellOnTargetMachines
-5.	*Deploy Visual Studio Test Agent*: https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/DeployVisualStudioTestAgent
+1.	*Deploy Azure Resource Group*: https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/DeployAzureResourceGroup
+2.	*Azure File Copy*: https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/AzureFileCopy
+3.	*Windows Machine File Copy*: https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/WindowsMachineFileCopy
+4.	*PowerShell on Target Machines*: https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/PowerShellOnTargetMachines
+5.	*Deploy Visual Studio Test Agent*: https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/DeployVisualStudioTestAgent
 
 <br/>
diff --git a/Tasks/RunDistributedTests/icon.svg b/Tasks/RunDistributedTests/icon.svg
index 5777d03426f8..13deac651233 100644
--- a/Tasks/RunDistributedTests/icon.svg
+++ b/Tasks/RunDistributedTests/icon.svg
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\RunDistributedTests\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\RunDistributedTests\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/RunLoadTest/icon.svg b/Tasks/RunLoadTest/icon.svg
index d6358c350fbf..f208f75cb8ea 100644
--- a/Tasks/RunLoadTest/icon.svg
+++ b/Tasks/RunLoadTest/icon.svg
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\RunLoadTest\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\RunLoadTest\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/ShellScript/icon.svg b/Tasks/ShellScript/icon.svg
index 1aa600ecee75..7c6002c63a00 100644
--- a/Tasks/ShellScript/icon.svg
+++ b/Tasks/ShellScript/icon.svg
@@ -14,7 +14,7 @@
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
    style="fill:#000000"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\ShellScript\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\ShellScript\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <metadata
diff --git a/Tasks/SonarQubePostTest/PRCA/ReportProcessor-Module.psm1 b/Tasks/SonarQubePostTest/PRCA/ReportProcessor-Module.psm1
index 45e219f8d591..e22b8ee473f5 100644
--- a/Tasks/SonarQubePostTest/PRCA/ReportProcessor-Module.psm1
+++ b/Tasks/SonarQubePostTest/PRCA/ReportProcessor-Module.psm1
@@ -204,7 +204,7 @@ function GetRelativePath
     
     $result = $path1.SubString($path2.Length);
 
-    #Replace '\' with '/'. VSO expects file path like /Mail2Bug/Main.cs (\Mail2Bug\Main.cs does not work)
+    #Replace '\' with '/'. Team Services expects file path like /Mail2Bug/Main.cs (\Mail2Bug\Main.cs does not work)
     $result = $result.Replace([System.IO.Path]::DirectorySeparatorChar, [System.IO.Path]::AltDirectorySeparatorChar)
     
     return $result
diff --git a/Tasks/SqlAzureDacpacDeployment/README.md b/Tasks/SqlAzureDacpacDeployment/README.md
index 752030339a14..8e0688c3ff1f 100644
--- a/Tasks/SqlAzureDacpacDeployment/README.md
+++ b/Tasks/SqlAzureDacpacDeployment/README.md
@@ -22,16 +22,16 @@ The following pre-requisites need to be setup for the task to work properly.
 
 To deploy to Azure SQL Database, an Azure subscription has to be linked to Team Foundation Server or to Visual Studio Team Services using the Services tab in the Account Administration section. Add the Azure subscription to use in the Build or Release Management definition by opening the Account Administration screen (gear icon on the top-right of the screen) and then click on the Services Tab.
 
-- For Azure Classic resources use 'Azure' endpoint type with Certificate or Credentials based authentication. If you are using credentials based auth, ensure that the credentials are for a [**work account**](https://azure.microsoft.com/en-in/pricing/member-offers/msdn-benefits-details/work-accounts-faq/) because Microsoft accounts like [**joe@live.com**](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup) or [**joe@hotmail.com**](https://github.com/Microsoft/vso-agent-tasks/blob/master/Tasks/DeployAzureResourceGroup) are not supported. 
+- For Azure Classic resources use 'Azure' endpoint type with Certificate or Credentials based authentication. If you are using credentials based auth, ensure that the credentials are for a [**work account**](https://azure.microsoft.com/en-in/pricing/member-offers/msdn-benefits-details/work-accounts-faq/) because Microsoft accounts like [**joe@live.com**](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup) or [**joe@hotmail.com**](https://github.com/Microsoft/vsts-tasks/blob/master/Tasks/DeployAzureResourceGroup) are not supported. 
 
 - For [ARM](https://azure.microsoft.com/en-in/documentation/articles/resource-group-overview/), use 'Azure Resource Manager' endpoint type, for more details follow the steps listed in the link [here](http://go.microsoft.com/fwlink/?LinkID=623000&clcid=0x409).
 
 For Azure MSDN accounts, one can either use a [Service Principal](http://go.microsoft.com/fwlink/?LinkID=623000&clcid=0x409) or a work account. It's easy to create a work account as shown below:
 
-1. Create an user in the Azure Active Directory from the [portal](https://msdn.microsoft.com/en-us/library/azure/hh967632.aspx) (this is the old Azure portal). After adding the account, the following two things need to be done to use the account in VSO:
+1. Create an user in the Azure Active Directory from the [portal](https://msdn.microsoft.com/en-us/library/azure/hh967632.aspx) (this is the old Azure portal). After adding the account, the following two things need to be done to use the account in Team Services:
   - Add the Active Directory account to the co-administrators in the subscription. Go to the Settings and then click on administrators and add the account as a co-admin like, [testuser@joehotmail.onmicrosoft.com](mailto:testuser@joehotmail.onmicrosoft.com)
   - Login to the portal with this Active Directory account wiz. [testuser@joehotmail.onmicrosoft.com](mailto:testuser@joehotmail.onmicrosoft.com), and change the password. Initially a temporary password is created and that needs to be changed at the first login.
-2. Add that user and password in the service connections in the VSO and deployments will work with that account.
+2. Add that user and password in the service connections in the Team Services and deployments will work with that account.
 
 ##### Azure SQL Server
 
diff --git a/Tasks/SqlAzureDacpacDeployment/icon.svg b/Tasks/SqlAzureDacpacDeployment/icon.svg
index 7aa902b069ec..0fe62ad5870e 100644
--- a/Tasks/SqlAzureDacpacDeployment/icon.svg
+++ b/Tasks/SqlAzureDacpacDeployment/icon.svg
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\SqlAzureDacpacDeployment\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\SqlAzureDacpacDeployment\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/SqlServerDacpacDeployment/README.md b/Tasks/SqlServerDacpacDeployment/README.md
index cf6a54c6f08b..646320d49a51 100644
--- a/Tasks/SqlServerDacpacDeployment/README.md
+++ b/Tasks/SqlServerDacpacDeployment/README.md
@@ -28,7 +28,7 @@ SqlPackage.exe is used to create or upgrade the database and it is installed dur
 * [SQL Server Management Studio](https://www.microsoft.com/en-in/download/details.aspx?id=42299) for SQL Server 2014 or SQL Server Express or SQL Server 2012 and SQL Server 2014 and [DAC Framework](http://www.microsoft.com/en-us/download/details.aspx?id=42293) MSIs install SqlPackage.exe at C:\Program Files (x86)\Microsoft SQL Server\120\DAC\bin.
 * Visual Studio 2015 installs the SqlPackage.exe at - C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\Extensions\Microsoft\SQLDB\DAC\120. Here the install location of Visual Studio is - C:\Program Files (x86)\Microsoft Visual Studio 14.0.
 
-The task [PowerShell on Target Machines](https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/PowerShellOnTargetMachines) can be used to deploy SqlPackage.exe to Azure virtual machines or domain-joined/workgroup machines.
+The task [PowerShell on Target Machines](https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/PowerShellOnTargetMachines) can be used to deploy SqlPackage.exe to Azure virtual machines or domain-joined/workgroup machines.
 
 ### SQL Server
 
@@ -36,11 +36,11 @@ There should be a SQL Server instance that is already installed and configured o
 
 ### Pre-existing Machine Groups
 
-If the deployment of the database is on pre-existing machines (physical or virtual machines) then a machine group has to be created in the Machines Hub. There is a manage link next to the Machine Group parameter of the task. Click on the link to navigate to the Machines Hub and create a machine group. Note that the IP Address or the FDQN of Azure virtual machines can be also added in the machine group. The difference between using the domain-joined/workgroup machines and the Azure virtual machines is that copying files to them uses separate tasks wiz. [Windows Machine File Copy](https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/WindowsMachineFileCopy) for the domain-joined/workgroup machines and [Azure File Copy](https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/AzureFileCopy) for the Azure virtual machines. Note that the SQL Server Database Deployment task expects the DACPACs to be available on the machines or on a UNC path that is accessible by the machine administrator's login. Prior to using the SQL Server Database Deployment task, ensure that the DACPACs are available for the deployment by copying them to the machines using the Windows Machine File Copy or the Azure File Copy tasks.
+If the deployment of the database is on pre-existing machines (physical or virtual machines) then a machine group has to be created in the Machines Hub. There is a manage link next to the Machine Group parameter of the task. Click on the link to navigate to the Machines Hub and create a machine group. Note that the IP Address or the FDQN of Azure virtual machines can be also added in the machine group. The difference between using the domain-joined/workgroup machines and the Azure virtual machines is that copying files to them uses separate tasks wiz. [Windows Machine File Copy](https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/WindowsMachineFileCopy) for the domain-joined/workgroup machines and [Azure File Copy](https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/AzureFileCopy) for the Azure virtual machines. Note that the SQL Server Database Deployment task expects the DACPACs to be available on the machines or on a UNC path that is accessible by the machine administrator's login. Prior to using the SQL Server Database Deployment task, ensure that the DACPACs are available for the deployment by copying them to the machines using the Windows Machine File Copy or the Azure File Copy tasks.
 
 ### Azure Resource Groups
 
-To use dynamically deployed Azure virtual machines, use the [Azure Resource Group Deployment](https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/DeployAzureResourceGroup) task to deploy the virtual machines in a Resource Group and then the name of the Resource Group can be typed in the Machine Group parameter of the SQL Server Database Deployment task. As described above, copy the DACPACs to the virtual machines in the Azure Resource Group using the [Azure File Copy](https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/AzureFileCopy) task.
+To use dynamically deployed Azure virtual machines, use the [Azure Resource Group Deployment](https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/DeployAzureResourceGroup) task to deploy the virtual machines in a Resource Group and then the name of the Resource Group can be typed in the Machine Group parameter of the SQL Server Database Deployment task. As described above, copy the DACPACs to the virtual machines in the Azure Resource Group using the [Azure File Copy](https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/AzureFileCopy) task.
 
 _NOTE: Currently existing Azure Resource Groups, classic (v1) or Azure Resource Manager (v2), cannot be used in the Build or Release Management definitions. Ability to select existing Resource Groups and to use the virtual machine resources in them to deploy applications to is coming soon._
 
@@ -49,7 +49,7 @@ _NOTE: Currently existing Azure Resource Groups, classic (v1) or Azure Resource
 The SQL Server Database Deployment task uses the [Windows Remote Management](https://msdn.microsoft.com/en-us/library/aa384426(v=vs.85).aspx) (WinRM) to access domain-joined/workgroup machines or Azure virtual machines. WinRM is Microsoft's implementation of  [WS-Management Protocol](https://msdn.microsoft.com/en-us/library/aa384470(v=vs.85).aspx) that is firewall-friendly and provides a common way for systems to access and exchange management information across on-premises or Cloud IT infrastructure. The automation agent that runs the SQL Server Database Deployment task uses WinRM to communicate with the target machines. It is important to setup WinRM properly on the target machines else the deployment tasks will fail. The configuration of WinRM is described in detail on the MSDN [site](https://msdn.microsoft.com/en-us/library/aa384372(v=vs.85).aspx). For the target machines the following will ensure that the WinRM has been setup properly on them:
 
 1. Azure virtual machines only work with the WinRM HTTPS protocol. When creating [classic](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-windows-tutorial-classic-portal/) or [resource manager](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-windows-tutorial/) virtual machine from the Azure preview portal or Azure portal, the virtual machine is already setup for WinRM HTTPS, with the default port 5986 already open in Firewall, and a test certificate installed on the machine. These virtual machines can be directly added to a machine group, with the WinRM protocol selected as HTTPS, and the Skip CA Check option selected. The Skip CA Check means that the certificate is a test certificate and the client should skip the validation of the certificate by a trusted certification authority.                  
-2. To dynamically deploy Azure resource groups with virtual machines in them use the [Azure Resource Group Deployment](https://github.com/Microsoft/vso-agent-tasks/tree/master/Tasks/DeployAzureResourceGroup) task. The task has a sample template that can setup the WinRM HTTPS protocol on the virtual machines, open the 5986 port in the Firewall, and install the test certificate. After this the virtual machines are ready for use in the SQL Server Database Deployment task.
+2. To dynamically deploy Azure resource groups with virtual machines in them use the [Azure Resource Group Deployment](https://github.com/Microsoft/vsts-tasks/tree/master/Tasks/DeployAzureResourceGroup) task. The task has a sample template that can setup the WinRM HTTPS protocol on the virtual machines, open the 5986 port in the Firewall, and install the test certificate. After this the virtual machines are ready for use in the SQL Server Database Deployment task.
 3. For pre-existing on-premises machines, domain-joined or workgroup, and whether they are physical machines or virtual machines, set them up as per the table below to ensure that the deployment tasks work fine with them:
 
 <table border="1" style="width:100%">
diff --git a/Tasks/SqlServerDacpacDeployment/icon.svg b/Tasks/SqlServerDacpacDeployment/icon.svg
index d0b09be3158e..5efd4d7dc676 100644
--- a/Tasks/SqlServerDacpacDeployment/icon.svg
+++ b/Tasks/SqlServerDacpacDeployment/icon.svg
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\SqlServerDacpacDeployment\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\SqlServerDacpacDeployment\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/VSBuild/icon.svg b/Tasks/VSBuild/icon.svg
index 9931e0e9ce5a..a1dfe28158dc 100644
--- a/Tasks/VSBuild/icon.svg
+++ b/Tasks/VSBuild/icon.svg
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\VSBuild\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\VSBuild\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/VsTest/icon.svg b/Tasks/VsTest/icon.svg
index 40f610f52bda..8c9c6f543c8a 100644
--- a/Tasks/VsTest/icon.svg
+++ b/Tasks/VsTest/icon.svg
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\VsTest\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\VsTest\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/WindowsMachineFileCopy/icon.svg b/Tasks/WindowsMachineFileCopy/icon.svg
index 75ae4dcb5e53..bd1a3d5522e3 100644
--- a/Tasks/WindowsMachineFileCopy/icon.svg
+++ b/Tasks/WindowsMachineFileCopy/icon.svg
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\WindowsMachineFileCopy\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\WindowsMachineFileCopy\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tasks/XamarinAndroid/icon.svg b/Tasks/XamarinAndroid/icon.svg
index 05642d1d7c49..3d49d492f3d2 100644
--- a/Tasks/XamarinAndroid/icon.svg
+++ b/Tasks/XamarinAndroid/icon.svg
@@ -16,7 +16,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\XamarinAndroid\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\XamarinAndroid\icon.png"
    inkscape:export-xdpi="2.8125"
    inkscape:export-ydpi="2.8125">
   <defs
diff --git a/Tasks/XamarinComponentRestore/icon.svg b/Tasks/XamarinComponentRestore/icon.svg
index b8af0d05666c..e098bfca4c45 100644
--- a/Tasks/XamarinComponentRestore/icon.svg
+++ b/Tasks/XamarinComponentRestore/icon.svg
@@ -16,7 +16,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\XamarinTestCloud\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\XamarinTestCloud\icon.png"
    inkscape:export-xdpi="2.8125"
    inkscape:export-ydpi="2.8125">
   <defs
diff --git a/Tasks/XamarinLicense/icon.svg b/Tasks/XamarinLicense/icon.svg
index b8af0d05666c..e098bfca4c45 100644
--- a/Tasks/XamarinLicense/icon.svg
+++ b/Tasks/XamarinLicense/icon.svg
@@ -16,7 +16,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\XamarinTestCloud\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\XamarinTestCloud\icon.png"
    inkscape:export-xdpi="2.8125"
    inkscape:export-ydpi="2.8125">
   <defs
diff --git a/Tasks/XamarinTestCloud/Strings/resources.resjson/de-de/resources.resjson b/Tasks/XamarinTestCloud/Strings/resources.resjson/de-de/resources.resjson
index 61b8b04996fd..0be5221c65e8 100644
--- a/Tasks/XamarinTestCloud/Strings/resources.resjson/de-de/resources.resjson
+++ b/Tasks/XamarinTestCloud/Strings/resources.resjson/de-de/resources.resjson
@@ -26,6 +26,6 @@
   "loc.input.label.testCloudLocation": "Speicherort von test-cloud.exe",
   "loc.input.label.optionalArgs": "Optionale Argumente",
   "loc.input.help.optionalArgs": "Zusätzliche Argumente, die an test-cloud.exe übergeben werden.",
-  "loc.input.label.publishNUnitResults": "Ergebnisse in VSO/TFS veröffentlichen",
-  "loc.input.help.publishNUnitResults": "Wenn ausgewählt, wird die Option \"-nunit-xml\" an test-cloud.exe übergeben. Ergebnisse aus der NUnit-XML-Datei werden in VSO/TFS veröffentlicht."
+  "loc.input.label.publishNUnitResults": "Ergebnisse in TFS/Team Services veröffentlichen",
+  "loc.input.help.publishNUnitResults": "Wenn ausgewählt, wird die Option \"-nunit-xml\" an test-cloud.exe übergeben. Ergebnisse aus der NUnit-XML-Datei werden in TFS/Team Services veröffentlicht."
 }
\ No newline at end of file
diff --git a/Tasks/XamarinTestCloud/Strings/resources.resjson/en-US/resources.resjson b/Tasks/XamarinTestCloud/Strings/resources.resjson/en-US/resources.resjson
index 95ea6d094d17..a2fcd5df9f8c 100644
--- a/Tasks/XamarinTestCloud/Strings/resources.resjson/en-US/resources.resjson
+++ b/Tasks/XamarinTestCloud/Strings/resources.resjson/en-US/resources.resjson
@@ -26,6 +26,6 @@
   "loc.input.label.testCloudLocation": "test-cloud.exe Location",
   "loc.input.label.optionalArgs": "Optional Arguments",
   "loc.input.help.optionalArgs": "Additional arguments passed to test-cloud.exe.",
-  "loc.input.label.publishNUnitResults": "Publish results to VSO/TFS",
-  "loc.input.help.publishNUnitResults": "When selected, --nunit-xml option will be passed to test-cloud.exe. Results from the NUnit xml file will be published to VSO/TFS."
+  "loc.input.label.publishNUnitResults": "Publish results to TFS/Team Services",
+  "loc.input.help.publishNUnitResults": "When selected, --nunit-xml option will be passed to test-cloud.exe. Results from the NUnit xml file will be published to TFS/Team Services."
 }
\ No newline at end of file
diff --git a/Tasks/XamarinTestCloud/Strings/resources.resjson/es-es/resources.resjson b/Tasks/XamarinTestCloud/Strings/resources.resjson/es-es/resources.resjson
index df4b9fed9481..22215a175267 100644
--- a/Tasks/XamarinTestCloud/Strings/resources.resjson/es-es/resources.resjson
+++ b/Tasks/XamarinTestCloud/Strings/resources.resjson/es-es/resources.resjson
@@ -26,6 +26,6 @@
   "loc.input.label.testCloudLocation": "Ubicación de test-cloud.exe",
   "loc.input.label.optionalArgs": "Argumentos opcionales",
   "loc.input.help.optionalArgs": "Argumentos adicionales pasados a test-cloud.exe.",
-  "loc.input.label.publishNUnitResults": "Publicar resultados en VSO o TFS",
-  "loc.input.help.publishNUnitResults": "Si se selecciona la opción --nunit-xml, se pasará a test-cloud.exe. Los resultados del archivo XML NUnit se publicarán en VSO o TFS."
+  "loc.input.label.publishNUnitResults": "Publicar resultados en TFS o Team Services",
+  "loc.input.help.publishNUnitResults": "Si se selecciona la opción --nunit-xml, se pasará a test-cloud.exe. Los resultados del archivo XML NUnit se publicarán en TFS o Team Services."
 }
\ No newline at end of file
diff --git a/Tasks/XamarinTestCloud/Strings/resources.resjson/fr-fr/resources.resjson b/Tasks/XamarinTestCloud/Strings/resources.resjson/fr-fr/resources.resjson
index 04bc142676db..4f64f98707f6 100644
--- a/Tasks/XamarinTestCloud/Strings/resources.resjson/fr-fr/resources.resjson
+++ b/Tasks/XamarinTestCloud/Strings/resources.resjson/fr-fr/resources.resjson
@@ -26,6 +26,6 @@
   "loc.input.label.testCloudLocation": "Emplacement de test-cloud.exe",
   "loc.input.label.optionalArgs": "Arguments facultatifs",
   "loc.input.help.optionalArgs": "Arguments supplémentaires passés à test-cloud.exe.",
-  "loc.input.label.publishNUnitResults": "Publier les résultats dans VSO/TFS",
-  "loc.input.help.publishNUnitResults": "Quand elle est sélectionnée, l'option --nunit-xml est passée à test-cloud.exe. Les résultats du fichier xml NUnit sont publiés dans VSO/TFS."
+  "loc.input.label.publishNUnitResults": "Publier les résultats dans TFS/Team Services",
+  "loc.input.help.publishNUnitResults": "Quand elle est sélectionnée, l'option --nunit-xml est passée à test-cloud.exe. Les résultats du fichier xml NUnit sont publiés dans TFS/Team Services."
 }
\ No newline at end of file
diff --git a/Tasks/XamarinTestCloud/Strings/resources.resjson/it-IT/resources.resjson b/Tasks/XamarinTestCloud/Strings/resources.resjson/it-IT/resources.resjson
index b41116de029e..a736018c983a 100644
--- a/Tasks/XamarinTestCloud/Strings/resources.resjson/it-IT/resources.resjson
+++ b/Tasks/XamarinTestCloud/Strings/resources.resjson/it-IT/resources.resjson
@@ -26,6 +26,6 @@
   "loc.input.label.testCloudLocation": "Percorso di test-cloud.exe",
   "loc.input.label.optionalArgs": "Argomenti facoltativi",
   "loc.input.help.optionalArgs": "Argomenti aggiuntivi passati a test-cloud.exe.",
-  "loc.input.label.publishNUnitResults": "Pubblica i risultati in VSO/TFS",
-  "loc.input.help.publishNUnitResults": "Quando è selezionato, l'opzione --nunit-xml verrà passata a test-cloud.exe. I risultati del file XML NUnit verranno pubblicati in VSO/TFS."
+  "loc.input.label.publishNUnitResults": "Pubblica i risultati in TFS/Team Services",
+  "loc.input.help.publishNUnitResults": "Quando è selezionato, l'opzione --nunit-xml verrà passata a test-cloud.exe. I risultati del file XML NUnit verranno pubblicati in TFS/Team Services."
 }
\ No newline at end of file
diff --git a/Tasks/XamarinTestCloud/Strings/resources.resjson/ja-jp/resources.resjson b/Tasks/XamarinTestCloud/Strings/resources.resjson/ja-jp/resources.resjson
index 0322c27363c5..6e4a7bd5549d 100644
--- a/Tasks/XamarinTestCloud/Strings/resources.resjson/ja-jp/resources.resjson
+++ b/Tasks/XamarinTestCloud/Strings/resources.resjson/ja-jp/resources.resjson
@@ -26,6 +26,6 @@
   "loc.input.label.testCloudLocation": "test-cloud.exe の場所",
   "loc.input.label.optionalArgs": "オプションの引数",
   "loc.input.help.optionalArgs": "test-cloud.exe に渡す追加の引数。",
-  "loc.input.label.publishNUnitResults": "結果を VSO/TFS に発行する",
-  "loc.input.help.publishNUnitResults": "選択された場合、--nunit-xml オプションが test-cloud.exe に渡されます。NUnit xml ファイルからの結果は、VSO/TFS に発行されます。"
+  "loc.input.label.publishNUnitResults": "結果を TFS/Team Services に発行する",
+  "loc.input.help.publishNUnitResults": "選択された場合、--nunit-xml オプションが test-cloud.exe に渡されます。NUnit xml ファイルからの結果は、TFS/Team Services に発行されます。"
 }
\ No newline at end of file
diff --git a/Tasks/XamarinTestCloud/Strings/resources.resjson/ko-KR/resources.resjson b/Tasks/XamarinTestCloud/Strings/resources.resjson/ko-KR/resources.resjson
index 93aa9af73c78..9a008baf8980 100644
--- a/Tasks/XamarinTestCloud/Strings/resources.resjson/ko-KR/resources.resjson
+++ b/Tasks/XamarinTestCloud/Strings/resources.resjson/ko-KR/resources.resjson
@@ -26,6 +26,6 @@
   "loc.input.label.testCloudLocation": "test-cloud.exe 위치",
   "loc.input.label.optionalArgs": "선택적 인수",
   "loc.input.help.optionalArgs": "추가 인수를 test-cloud.exe에 전달했습니다.",
-  "loc.input.label.publishNUnitResults": "결과를 VSO/TFS에 게시",
-  "loc.input.help.publishNUnitResults": "선택하면, --nunit-xml 옵션이 test-cloud.exe에 전달됩니다. NUnit xml 파일의 결과는 VSO/TFS에 게시됩니다."
+  "loc.input.label.publishNUnitResults": "결과를 TFS/Team Services에 게시",
+  "loc.input.help.publishNUnitResults": "선택하면, --nunit-xml 옵션이 test-cloud.exe에 전달됩니다. NUnit xml 파일의 결과는 TFS/Team Services에 게시됩니다."
 }
\ No newline at end of file
diff --git a/Tasks/XamarinTestCloud/Strings/resources.resjson/ru-RU/resources.resjson b/Tasks/XamarinTestCloud/Strings/resources.resjson/ru-RU/resources.resjson
index 7356db646b2d..a81a27339c43 100644
--- a/Tasks/XamarinTestCloud/Strings/resources.resjson/ru-RU/resources.resjson
+++ b/Tasks/XamarinTestCloud/Strings/resources.resjson/ru-RU/resources.resjson
@@ -26,6 +26,6 @@
   "loc.input.label.testCloudLocation": "Расположение test-cloud.exe",
   "loc.input.label.optionalArgs": "Дополнительные аргументы",
   "loc.input.help.optionalArgs": "Дополнительные аргументы, передаваемые в test-cloud.exe.",
-  "loc.input.label.publishNUnitResults": "Опубликовать результаты в VSO/Team Foundation Server",
-  "loc.input.help.publishNUnitResults": "Если этот параметр выбран, параметр --nunit-xml будет передан в test-cloud.exe. Результаты из XML-файла NUnit будут опубликованы в VSO/Team Foundation Server."
+  "loc.input.label.publishNUnitResults": "Опубликовать результаты в Team Foundation Server/Team Services",
+  "loc.input.help.publishNUnitResults": "Если этот параметр выбран, параметр --nunit-xml будет передан в test-cloud.exe. Результаты из XML-файла NUnit будут опубликованы в Team Foundation Server/Team Services."
 }
\ No newline at end of file
diff --git a/Tasks/XamarinTestCloud/Strings/resources.resjson/zh-CN/resources.resjson b/Tasks/XamarinTestCloud/Strings/resources.resjson/zh-CN/resources.resjson
index 948ffc2a6859..178bb016bccd 100644
--- a/Tasks/XamarinTestCloud/Strings/resources.resjson/zh-CN/resources.resjson
+++ b/Tasks/XamarinTestCloud/Strings/resources.resjson/zh-CN/resources.resjson
@@ -26,6 +26,6 @@
   "loc.input.label.testCloudLocation": "test-cloud.exe 位置",
   "loc.input.label.optionalArgs": "可选参数",
   "loc.input.help.optionalArgs": "传递给 test-cloud.exe 还原的其他参数。",
-  "loc.input.label.publishNUnitResults": "将结果发布到 VSO/TFS",
-  "loc.input.help.publishNUnitResults": "选择时，--nunit-xml 选项会传递给 test-cloud.exe。来自 NUnit xml 文件的结果会发布到 VSO/TFS。"
+  "loc.input.label.publishNUnitResults": "将结果发布到 TFS/Team Services",
+  "loc.input.help.publishNUnitResults": "选择时，--nunit-xml 选项会传递给 test-cloud.exe。来自 NUnit xml 文件的结果会发布到 TFS/Team Services。"
 }
\ No newline at end of file
diff --git a/Tasks/XamarinTestCloud/Strings/resources.resjson/zh-TW/resources.resjson b/Tasks/XamarinTestCloud/Strings/resources.resjson/zh-TW/resources.resjson
index 4e8a437b9ac9..0c1aa40ea1bb 100644
--- a/Tasks/XamarinTestCloud/Strings/resources.resjson/zh-TW/resources.resjson
+++ b/Tasks/XamarinTestCloud/Strings/resources.resjson/zh-TW/resources.resjson
@@ -26,6 +26,6 @@
   "loc.input.label.testCloudLocation": "test-cloud.exe 位置",
   "loc.input.label.optionalArgs": "選擇性引數",
   "loc.input.help.optionalArgs": "傳遞至 test-cloud.exe 的其他引數。",
-  "loc.input.label.publishNUnitResults": "將結果發行至 VSO/TFS",
-  "loc.input.help.publishNUnitResults": "選取的情況下，--nunit-xml 選項將傳遞到 test-cloud.exe。NUnit xml 檔案的結果將發行到 VSO/TFS。"
+  "loc.input.label.publishNUnitResults": "將結果發行至 TFS/Team Services",
+  "loc.input.help.publishNUnitResults": "選取的情況下，--nunit-xml 選項將傳遞到 test-cloud.exe。NUnit xml 檔案的結果將發行到 TFS/Team Services。"
 }
\ No newline at end of file
diff --git a/Tasks/XamarinTestCloud/XamarinTestCloud.ps1 b/Tasks/XamarinTestCloud/XamarinTestCloud.ps1
index e7e969528c72..d4a5a42aac4c 100644
--- a/Tasks/XamarinTestCloud/XamarinTestCloud.ps1
+++ b/Tasks/XamarinTestCloud/XamarinTestCloud.ps1
@@ -169,7 +169,7 @@ foreach ($ap in $appFiles)
     }
 }
 
-# Publish nunit test results to VSO
+# Publish NUnit test results to Team Services
 if($publishResults) 
 {    
     $searchPattern = Join-Path $testDir "xamarintest_$buildId*.xml"
diff --git a/Tasks/XamarinTestCloud/icon.svg b/Tasks/XamarinTestCloud/icon.svg
index 64950023f566..d3110bac5596 100644
--- a/Tasks/XamarinTestCloud/icon.svg
+++ b/Tasks/XamarinTestCloud/icon.svg
@@ -16,7 +16,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\XamarinLicense\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\XamarinLicense\icon.png"
    inkscape:export-xdpi="2.8125"
    inkscape:export-ydpi="2.8125">
   <defs
diff --git a/Tasks/XamarinTestCloud/task.json b/Tasks/XamarinTestCloud/task.json
index ee9a663955ed..e1d647afcc4f 100644
--- a/Tasks/XamarinTestCloud/task.json
+++ b/Tasks/XamarinTestCloud/task.json
@@ -146,10 +146,10 @@
         {
             "name": "publishNUnitResults",
             "type": "boolean",
-            "label": "Publish results to VSO/TFS",
+            "label": "Publish results to TFS/Team Services",
             "groupName": "advanced",
             "defaultValue": "true",
-            "helpMarkDown": "When selected, --nunit-xml option will be passed to test-cloud.exe. Results from the NUnit xml file will be published to VSO/TFS."
+            "helpMarkDown": "When selected, --nunit-xml option will be passed to test-cloud.exe. Results from the NUnit xml file will be published to TFS/Team Services."
         }
     ],
     "instanceNameFormat": "Test $(app) with Xamarin.UITest in Xamarin Test Cloud",
diff --git a/Tasks/XamariniOS/icon.svg b/Tasks/XamariniOS/icon.svg
index 5d708fdae636..b94917d06fc2 100644
--- a/Tasks/XamariniOS/icon.svg
+++ b/Tasks/XamariniOS/icon.svg
@@ -16,7 +16,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\XamariniOS\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\XamariniOS\icon.png"
    inkscape:export-xdpi="2.8125"
    inkscape:export-ydpi="2.8125">
   <defs
diff --git a/Tasks/cURLUploader/icon.svg b/Tasks/cURLUploader/icon.svg
index 0ab49db88acb..f3949c6d51c3 100644
--- a/Tasks/cURLUploader/icon.svg
+++ b/Tasks/cURLUploader/icon.svg
@@ -15,7 +15,7 @@
    width="1024"
    height="1024"
    sodipodi:docname="curl.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\cURLUploader\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\cURLUploader\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <metadata
diff --git a/Tasks/powerShell/icon.svg b/Tasks/powerShell/icon.svg
index 899120c60a24..fcda91de55b3 100644
--- a/Tasks/powerShell/icon.svg
+++ b/Tasks/powerShell/icon.svg
@@ -16,7 +16,7 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="C:\Users\Jamie\Sources\vso-agent-tasks\Tasks\powerShell\icon.png"
+   inkscape:export-filename="C:\Users\Jamie\Sources\vsts-tasks\Tasks\powerShell\icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
   <defs
diff --git a/Tests/lib/vsts-task-lib/package.json b/Tests/lib/vsts-task-lib/package.json
index 66b1e0373d87..bd8f7540c369 100644
--- a/Tests/lib/vsts-task-lib/package.json
+++ b/Tests/lib/vsts-task-lib/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vsts-task-lib",
   "version": "0.4.5",
-  "description": "VSO Agent Task Library",
+  "description": "Team Services Agent Task Library",
   "main": "./task.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -36,7 +36,7 @@
     "minimatch": "^2.0.8",
     "mocha": "^2.2.5"
   },
-  "readme": "# VSO DevOps Task SDK\n\nLibraries for writing VSO and TFS build and deployment tasks\n\n## Node Task Lib\nLibrary for writing tasks with the node handler\n\n## Contributing\n\n### Node\n\nOnce:\n```bash\n$ cd node\n$ npm install\n$ sudo npm install gulp -g\n```\n\nBuild and test:\n```bash\n$ cd node\n$ gulp\n```\n\n### Powershell\n\nComing soon\n",
+  "readme": "# Team Services DevOps Task SDK\n\nLibraries for writing Team Services and TFS build and deployment tasks\n\n## Node Task Lib\nLibrary for writing tasks with the node handler\n\n## Contributing\n\n### Node\n\nOnce:\n```bash\n$ cd node\n$ npm install\n$ sudo npm install gulp -g\n```\n\nBuild and test:\n```bash\n$ cd node\n$ gulp\n```\n\n### Powershell\n\nComing soon\n",
   "readmeFilename": "README.md",
   "_id": "vsts-task-lib@0.4.5",
   "_shasum": "ae49a8e425a52c4e63611cc17b7a077501d386ac",
diff --git a/docs/contribute.md b/docs/contribute.md
index 14972659426f..feb127de60a8 100644
--- a/docs/contribute.md
+++ b/docs/contribute.md
@@ -1,6 +1,6 @@
 # Contributing
 
-This repo contains the in-the-box tasks for VSO build.  Tasks in this repo get deployed every three weeks to VSO and appear in TFS quarterly updates.
+This repo contains the in-the-box tasks for Team Services build.  Tasks in this repo get deployed every three weeks to Team Services and appear in TFS quarterly updates.
 
 If you are creating tasks that you believe the community can benefit from consider creating an extension.
 [create an extension](https://www.visualstudio.com/integrate/extensions/develop/add-build-task)
diff --git a/docs/runningtests.md b/docs/runningtests.md
index f50bc7c358a7..cef97978a18f 100644
--- a/docs/runningtests.md
+++ b/docs/runningtests.md
@@ -5,7 +5,7 @@ After running gulp to build, run gulp test to run the L0 task test suites.
 
 ```bash
 $ gulp test
-[15:02:47] Using gulpfile ~/Projects/vso-agent-tasks/gulpfile.js
+[15:02:47] Using gulpfile ~/Projects/vsts-tasks/gulpfile.js
 [15:02:47] Starting 'compileTests'...
 [15:02:48] Compiling TypeScript files using tsc version 1.6.2
 [15:02:49] Finished 'compileTests' after 2.08 s
diff --git a/gulpfile.js b/gulpfile.js
index dacbed22c0af..23713e1e8624 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -51,7 +51,7 @@ Package (only on windows):
 - zip the tasks.
 - if nuget found (windows):
   - create nuget package
-  - if server url, publish package - this is for our VSO build 
+  - if server url, publish package - this is for our Team Services build 
 ----------------------------------------------------------------------------------------*/
 
 //
@@ -183,9 +183,9 @@ gulp.task('test', ['testResources'], function () {
 //-----------------------------------------------------------------------------------------------------------------
 // INTERNAL BELOW
 //
-// This particular task is for internal microsoft publishing as a nuget package for the VSO build to pick-up
-// Contributors should not need to run this task
-// This task requires windows and direct access to the internal nuget drop
+// This particular task is for internal Microsoft publishing as a nuget package for the Team Services build to pick-up.
+// Contributors should not need to run this task.
+// This task requires windows and direct access to the internal nuget drop.
 //-----------------------------------------------------------------------------------------------------------------
 
 gulp.task('bumpjs', function () {
diff --git a/package.json b/package.json
index 36ce6d210017..52c1bf710eb7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "Agent.Tasks",
   "version": "0.5.0",
-  "description": "Tasks for VSO Build.vNext build system",
+  "description": "Tasks for the Team Services build system",
   "main": "gulpfile.js",
   "directories": {
     "doc": "docs"
@@ -11,19 +11,19 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/Microsoft/vso-agent-tasks"
+    "url": "https://github.com/Microsoft/vsts-tasks"
   },
   "keywords": [
-    "VSO",
+    "VSTS",
     "build",
     "tasks"
   ],
   "author": "Microsoft Corporation",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/Microsoft/vso-agent-tasks/issues"
+    "url": "https://github.com/Microsoft/vsts-tasks/issues"
   },
-  "homepage": "https://github.com/Microsoft/vso-agent-tasks",
+  "homepage": "https://github.com/Microsoft/vsts-tasks",
   "devDependencies": {
     "del": "1.1.1",
     "gulp": "3.9.0",