diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7e81f224..5d27825b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,4 @@
-- [ ] All [tests](https://github.com/jfrog/artifactory-azure-devops-extension#testing) passed. If this feature is not already covered by the tests, I added new tests.
+- [ ] All [tests](https://github.com/jfrog/jfrog-azure-devops-extension#testing) passed. If this feature is not already covered by the tests, I added new tests.
 - [ ] This pull request is on the dev branch.
 - [ ] I used `npm run format` for formatting the code before submitting the pull request.
 -----
diff --git a/Jenkinsfile b/Jenkinsfile
index deb20af9..23374cde 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,8 +2,8 @@ node("docker") {
     cleanWs()
 
     stage('Clone and Checkout V1') {
-        sh 'git clone https://github.com/jfrog/artifactory-azure-devops-extension.git'
-        dir("artifactory-azure-devops-extension") {
+        sh 'git clone https://github.com/jfrog/jfrog-azure-devops-extension.git'
+        dir("jfrog-azure-devops-extension") {
             sh 'git checkout v1'
         }
     }
@@ -26,7 +26,7 @@ node("docker") {
     }
 
     withEnv(["PATH+=${WORKSPACE}/node-v${NODE_VERSION}-linux-x64/bin"]) {
-        dir('artifactory-azure-devops-extension') {
+        dir('jfrog-azure-devops-extension') {
 
             // If this variable is set to true, skip all git steps and move directly to release.
             if (!params.SKIP_GIT_STEPS) {
@@ -55,12 +55,12 @@ node("docker") {
 
                 wrap([$class: 'MaskPasswordsBuildWrapper', varPasswordPairs: [[password: 'GITHUB_API_KEY', var: 'SECRET']]]) {
                     stage('Push changes') {
-                        sh("git push https://${GITHUB_USERNAME}:${GITHUB_API_KEY}@github.com/jfrog/artifactory-azure-devops-extension.git")
+                        sh("git push https://${GITHUB_USERNAME}:${GITHUB_API_KEY}@github.com/jfrog/jfrog-azure-devops-extension.git")
                     }
 
                     stage('Create tag') {
                         sh("git tag '${ADO_ARTIFACTORY_VERSION}'")
-                        sh("git push https://${GITHUB_USERNAME}:${GITHUB_API_KEY}@github.com/jfrog/artifactory-azure-devops-extension.git --tags")
+                        sh("git push https://${GITHUB_USERNAME}:${GITHUB_API_KEY}@github.com/jfrog/jfrog-azure-devops-extension.git --tags")
                     }
 
                     stage('Merge to dev-v1') {
@@ -68,7 +68,7 @@ node("docker") {
                         set -euxo pipefail
                         git checkout dev-v1
                         git merge v1
-                        git push https://${GITHUB_USERNAME}:${GITHUB_API_KEY}@github.com/jfrog/artifactory-azure-devops-extension.git
+                        git push https://${GITHUB_USERNAME}:${GITHUB_API_KEY}@github.com/jfrog/jfrog-azure-devops-extension.git
                         git checkout v1
                         '''
                     }
diff --git a/README.md b/README.md
index dddfeec2..979fd727 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-|Branch|Status|
-|:---:|---|
-|master|[![Build status](https://ci.appveyor.com/api/projects/status/ki6edykufqy9h5bl/branch/master?svg=true)](https://ci.appveyor.com/project/jfrog-ecosystem/artifactory-azure-devops-extension/branch/master)
-|dev|[![Build status](https://ci.appveyor.com/api/projects/status/ki6edykufqy9h5bl/branch/dev?svg=true)](https://ci.appveyor.com/project/jfrog-ecosystem/artifactory-azure-devops-extension/branch/dev)|
+| Branch | Status                                                                                                                                                                                             |
+|:------:|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| master | [![Build status](https://ci.appveyor.com/api/projects/status/ki6edykufqy9h5bl/branch/master?svg=true)](https://ci.appveyor.com/project/jfrog-ecosystem/jfrog-azure-devops-extension/branch/master) |
+|  dev   | [![Build status](https://ci.appveyor.com/api/projects/status/ki6edykufqy9h5bl/branch/dev?svg=true)](https://ci.appveyor.com/project/jfrog-ecosystem/jfrog-azure-devops-extension/branch/dev)       |
 
 # Overview
 JFrog Artifactory provides tight integration with Azure DevOps through the **JFrog Artifactory Extension**.
diff --git a/overview.md b/overview.md
index ed36fb08..85ea49d3 100644
--- a/overview.md
+++ b/overview.md
@@ -68,7 +68,7 @@ The **JFrog Artifactory Extension** also allows managing Release Bundles and the
 ## Documentation and source code
 The full extension documentation is available [here](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Azure+DevOps+Extension).
 <br>
-See the source code is on [GitHub](https://github.com/jfrog/artifactory-azure-devops-extension).
+See the source code is on [GitHub](https://github.com/jfrog/jfrog-azure-devops-extension).
 
 ## Downloading generic build dependencies from Artifactory
 The **Artifactory Generic Download** task supports downloading your build dependencies from Artifactory to the build agent. 
diff --git a/vss-extension.json b/vss-extension.json
index 0bc4aa0c..c889f57e 100644
--- a/vss-extension.json
+++ b/vss-extension.json
@@ -53,7 +53,7 @@
             "uri": "https://www.jfrog.com/support"
         },
         "repository": {
-            "uri": "https://github.com/jfrog/artifactory-azure-devops-extension"
+            "uri": "https://github.com/jfrog/jfrog-azure-devops-extension"
         },
         "privacypolicy": {
             "uri": "https://jfrog.com/privacy-policy"
@@ -61,7 +61,7 @@
     },
     "repository": {
         "type": "git",
-        "uri": "https://github.com/jfrog/artifactory-azure-devops-extension"
+        "uri": "https://github.com/jfrog/jfrog-azure-devops-extension"
     },
     "branding": {
         "color": "ffffff",