diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index b582d4b875..61c959aabc 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -20,7 +20,7 @@ _As a developer, please write developer-facing documentation in README or other
 
 ## Contribution process
 
-Magento maintains a public roadmap for this and other [Magento Research] repositories in each project's issue board.
+Magento maintains a public roadmap for this and other repositories in each project's issue board.
 
 Any and all community participation in this backlog is encouraged and appreciated.
 Even foundational infrastructure stories are available for a generous developer to take on.
@@ -60,8 +60,7 @@ We will un-assign you from this issue, but please feel free to contribute to ano
 
 #### Step 4: Work on the issue
 
-After you provide an estimate, the issue is now "in progress", and
-you officially become a member of the [Magento Research] organization.
+After you provide an estimate, the issue is now "in progress".
 
 If you need more time to work on the issue, please contact us as soon as possible.
 We may request an update on your progress, but we are willing to accommodate.
@@ -94,8 +93,7 @@ _Please avoid creating GitHub issues asking for help on bugs in your project tha
 
 [code of conduct]: CODE_OF_CONDUCT.md
 [support]: SUPPORT.md
-[official repository]: https://github.com/magento-research/pwa-studio
+[official repository]: https://github.com/magento/pwa-studio
 [meaningful commit messages]: https://chris.beams.io/posts/git-commit/
-[github issue]: https://github.com/magento-research/pwa-studio/issues/new/choose
-[magento research]: https://github.com/magento-research
-[help wanted]: https://github.com/magento-research/pwa-studio/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22
+[github issue]: https://github.com/magento/pwa-studio/issues/new/choose
+[help wanted]: https://github.com/magento/pwa-studio/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 6a996defc8..b42976084d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -11,7 +11,7 @@ Thank you for taking the time to report this issue!
 GitHub Issues should only be created for problems/topics related to this project's codebase.
 
 Before submitting this issue, please make sure you are complying with our Code of Conduct:
-https://github.com/magento-research/pwa-studio/blob/develop/.github/CODE_OF_CONDUCT.md
+https://github.com/magento/pwa-studio/blob/develop/.github/CODE_OF_CONDUCT.md
 
 Issues that do not comply with our Code of Conduct or do not contain enough information may be closed at the maintainers' discretion.
 
diff --git a/.github/ISSUE_TEMPLATE/doc_change.md b/.github/ISSUE_TEMPLATE/doc_change.md
index b4f409b128..0d3dd2ec55 100644
--- a/.github/ISSUE_TEMPLATE/doc_change.md
+++ b/.github/ISSUE_TEMPLATE/doc_change.md
@@ -11,7 +11,7 @@ Thank you for taking the time to report this issue!
 GitHub Issues should only be created for problems/topics related to this project's codebase.
 
 Before submitting this issue, please make sure you are complying with our Code of Conduct:
-https://github.com/magento-research/pwa-studio/blob/develop/.github/CODE_OF_CONDUCT.md
+https://github.com/magento/pwa-studio/blob/develop/.github/CODE_OF_CONDUCT.md
 
 Issues that do not comply with our Code of Conduct or do not contain enough information may be closed at the maintainers' discretion.
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 8db92cf62c..cd049d93c9 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -11,7 +11,7 @@ Thank you for taking the time to report this issue!
 GitHub Issues should only be created for problems/topics related to this project's codebase.
 
 Before submitting this issue, please make sure you are complying with our Code of Conduct:
-https://github.com/magento-research/pwa-studio/blob/develop/.github/CODE_OF_CONDUCT.md
+https://github.com/magento/pwa-studio/blob/develop/.github/CODE_OF_CONDUCT.md
 
 Issues that do not comply with our Code of Conduct or do not contain enough information may be closed at the maintainers' discretion.
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4a14a2f9e8..97d9702c4a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 <!--
 Before submitting this pull request, please make sure you have read our Contribution Guidelines and your PR meets our contribution standards:
-https://github.com/magento-research/pwa-studio/blob/master/.github/CONTRIBUTING.md
+https://github.com/magento/pwa-studio/blob/master/.github/CONTRIBUTING.md
 
 Please fill out as much information as you can about your PR to help speed up the review process.
 If your PR addresses an existing GitHub Issue, please refer to it in the title or Additional Information section to make the connection.
@@ -33,7 +33,7 @@ Closes #ISSUE_NUMBER.
 ## Proposed Labels for Change Type/Package
 <!--- What type of change level would you suggest for this PR? -->
 <!--- Major, Minor, or Patch? -->
-<!--- See https://magento-research.github.io/pwa-studio/technologies/versioning/ for help -->
+<!--- See https://pwastudio.io/technologies/versioning/ for help -->
 - [ ] major (e.g x.0.0 - a breaking change)
 - [ ] minor (e.g 0.x.0 - a backwards compatible addition)
 - [ ] patch (e.g 0.0.x - a bug fix)
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
index 37c721741d..e881f75920 100644
--- a/.github/SUPPORT.md
+++ b/.github/SUPPORT.md
@@ -6,5 +6,5 @@ Need help with something? Please use the following resources to get the help you
 -   Chat with us on **Slack** - [#pwa channel]
 -   Send us an Email: pwa@magento.com
 
-[pwa devdocs]: https://magento-research.github.io/pwa-studio/
+[pwa devdocs]: https://pwastudio.io
 [#pwa channel]: https://magentocommeng.slack.com/messages/C71HNKYS2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd4a0477df..23df773aed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -132,52 +132,52 @@ This is the easiest way to work with the released versions of PWA Studio.
 
 To upgrade to 3.0.0, update the project's `package.json` file and change the dependency version for PWA Studio.
 
-[pwa studio releases]: https://github.com/magento-research/pwa-studio/releases
-[client side caching topic]: https://magento-research.github.io/pwa-studio/technologies/basic-concepts/client-side-caching/
-[`venia-upward.yml`]: https://github.com/magento-research/pwa-studio/blob/develop/packages/venia-concept/venia-upward.yml
-[hello upward]: https://magento-research.github.io/pwa-studio/tutorials/hello-upward/simple-server/
-[magento compatibility table]: https://magento-research.github.io/pwa-studio/technologies/magento-compatibility/
+[pwa studio releases]: https://github.com/magento/pwa-studio/releases
+[client side caching topic]: https://pwastudio.io/technologies/basic-concepts/client-side-caching/
+[`venia-upward.yml`]: https://github.com/magento/pwa-studio/blob/develop/packages/venia-concept/venia-upward.yml
+[hello upward]: https://pwastudio.io/tutorials/hello-upward/simple-server/
+[magento compatibility table]: https://pwastudio.io/technologies/magento-compatibility/
 [react hooks]: https://reactjs.org/docs/hooks-intro.html
-[#1253]: https://github.com/magento-research/pwa-studio/pull/1253
-[#1177]: https://github.com/magento-research/pwa-studio/pull/1177
-[#1058]: https://github.com/magento-research/pwa-studio/pull/1058
-[#1175]: https://github.com/magento-research/pwa-studio/pull/1175
-[#1174]: https://github.com/magento-research/pwa-studio/pull/1174
-[#1171]: https://github.com/magento-research/pwa-studio/pull/1171
-[#1169]: https://github.com/magento-research/pwa-studio/pull/1169
-[#1167]: https://github.com/magento-research/pwa-studio/pull/1167
-[#1158]: https://github.com/magento-research/pwa-studio/pull/1158
-[#1155]: https://github.com/magento-research/pwa-studio/pull/1155
-[#1153]: https://github.com/magento-research/pwa-studio/pull/1153
-[#1152]: https://github.com/magento-research/pwa-studio/pull/1152
-[#1150]: https://github.com/magento-research/pwa-studio/pull/1150
-[#1140]: https://github.com/magento-research/pwa-studio/pull/1140
-[#1139]: https://github.com/magento-research/pwa-studio/pull/1139
-[#1132]: https://github.com/magento-research/pwa-studio/pull/1132
-[#1070]: https://github.com/magento-research/pwa-studio/pull/1070
-[#1125]: https://github.com/magento-research/pwa-studio/pull/1125
-[#1109]: https://github.com/magento-research/pwa-studio/pull/1109
-[#1103]: https://github.com/magento-research/pwa-studio/pull/1103
-[#1102]: https://github.com/magento-research/pwa-studio/pull/1102
-[#1097]: https://github.com/magento-research/pwa-studio/pull/1097
-[#1094]: https://github.com/magento-research/pwa-studio/pull/1094
-[#1088]: https://github.com/magento-research/pwa-studio/pull/1088
-[#1087]: https://github.com/magento-research/pwa-studio/pull/1087
-[#1085]: https://github.com/magento-research/pwa-studio/pull/1085
-[#1080]: https://github.com/magento-research/pwa-studio/pull/1080
-[#1077]: https://github.com/magento-research/pwa-studio/pull/1077
-[#1063]: https://github.com/magento-research/pwa-studio/pull/1063
-[#1059]: https://github.com/magento-research/pwa-studio/pull/1059
-[#1048]: https://github.com/magento-research/pwa-studio/pull/1048
-[#1045]: https://github.com/magento-research/pwa-studio/pull/1045
-[#1039]: https://github.com/magento-research/pwa-studio/pull/1039
-[#1027]: https://github.com/magento-research/pwa-studio/pull/1027
-[#1022]: https://github.com/magento-research/pwa-studio/pull/1022
-[#1020]: https://github.com/magento-research/pwa-studio/pull/1020
-[#1019]: https://github.com/magento-research/pwa-studio/pull/1019
-[#1000]: https://github.com/magento-research/pwa-studio/pull/1000
-[#956]: https://github.com/magento-research/pwa-studio/pull/956
-[#910]: https://github.com/magento-research/pwa-studio/pull/910
-[#882]: https://github.com/magento-research/pwa-studio/pull/882
-[#1078]: https://github.com/magento-research/pwa-studio/pull/1078
-[#1043]: https://github.com/magento-research/pwa-studio/pull/1043
+[#1253]: https://github.com/magento/pwa-studio/pull/1253
+[#1177]: https://github.com/magento/pwa-studio/pull/1177
+[#1058]: https://github.com/magento/pwa-studio/pull/1058
+[#1175]: https://github.com/magento/pwa-studio/pull/1175
+[#1174]: https://github.com/magento/pwa-studio/pull/1174
+[#1171]: https://github.com/magento/pwa-studio/pull/1171
+[#1169]: https://github.com/magento/pwa-studio/pull/1169
+[#1167]: https://github.com/magento/pwa-studio/pull/1167
+[#1158]: https://github.com/magento/pwa-studio/pull/1158
+[#1155]: https://github.com/magento/pwa-studio/pull/1155
+[#1153]: https://github.com/magento/pwa-studio/pull/1153
+[#1152]: https://github.com/magento/pwa-studio/pull/1152
+[#1150]: https://github.com/magento/pwa-studio/pull/1150
+[#1140]: https://github.com/magento/pwa-studio/pull/1140
+[#1139]: https://github.com/magento/pwa-studio/pull/1139
+[#1132]: https://github.com/magento/pwa-studio/pull/1132
+[#1070]: https://github.com/magento/pwa-studio/pull/1070
+[#1125]: https://github.com/magento/pwa-studio/pull/1125
+[#1109]: https://github.com/magento/pwa-studio/pull/1109
+[#1103]: https://github.com/magento/pwa-studio/pull/1103
+[#1102]: https://github.com/magento/pwa-studio/pull/1102
+[#1097]: https://github.com/magento/pwa-studio/pull/1097
+[#1094]: https://github.com/magento/pwa-studio/pull/1094
+[#1088]: https://github.com/magento/pwa-studio/pull/1088
+[#1087]: https://github.com/magento/pwa-studio/pull/1087
+[#1085]: https://github.com/magento/pwa-studio/pull/1085
+[#1080]: https://github.com/magento/pwa-studio/pull/1080
+[#1077]: https://github.com/magento/pwa-studio/pull/1077
+[#1063]: https://github.com/magento/pwa-studio/pull/1063
+[#1059]: https://github.com/magento/pwa-studio/pull/1059
+[#1048]: https://github.com/magento/pwa-studio/pull/1048
+[#1045]: https://github.com/magento/pwa-studio/pull/1045
+[#1039]: https://github.com/magento/pwa-studio/pull/1039
+[#1027]: https://github.com/magento/pwa-studio/pull/1027
+[#1022]: https://github.com/magento/pwa-studio/pull/1022
+[#1020]: https://github.com/magento/pwa-studio/pull/1020
+[#1019]: https://github.com/magento/pwa-studio/pull/1019
+[#1000]: https://github.com/magento/pwa-studio/pull/1000
+[#956]: https://github.com/magento/pwa-studio/pull/956
+[#910]: https://github.com/magento/pwa-studio/pull/910
+[#882]: https://github.com/magento/pwa-studio/pull/882
+[#1078]: https://github.com/magento/pwa-studio/pull/1078
+[#1043]: https://github.com/magento/pwa-studio/pull/1043
diff --git a/README.md b/README.md
index cd49f03281..1484c757f0 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # PWA Studio
-  [![Coverage Status](https://coveralls.io/repos/github/magento-research/pwa-studio/badge.svg)](https://coveralls.io/github/magento-research/pwa-studio)
+  [![Coverage Status](https://coveralls.io/repos/github/magento/pwa-studio/badge.svg)](https://coveralls.io/github/magento/pwa-studio)
 Magento PWA Studio is a collection of tools that lets developers build complex Progressive Web Applications on top of Magento 2 stores.
 
 ## Documentation
@@ -71,14 +71,13 @@ If you have an issue that cannot be resolved, please [create an issue][].
 * Before pushing a commit, `yarn run prettier` and `yarn run lint` to format and inspect the source code. (There is also a git hook that will do this automatically.)
 
 [Contribution guide]: .github/CONTRIBUTING.md
-[Coverage Status]: https://coveralls.io/repos/github/magento-research/pwa-studio/badge.svg?branch=master
-[create an issue]: https://github.com/magento-research/pwa-studio/issues/new
-[documentation site]: https://magento-research.github.io/pwa-studio/
-[Git hook]: <https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks>
-[Greenkeeper badge]: https://badges.greenkeeper.io/magento-research/pwa-studio.svg
+[Coverage Status]: https://coveralls.io/repos/github/magento/pwa-studio/badge.svg?branch=master
+[create an issue]: https://github.com/magento/pwa-studio/issues/new
+[documentation site]: https://pwastudio.io
+[Git hook]: https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks
 [NPM]: https://www.npmjs.com/org/magento
-[Troubleshooting]: https://magento-research.github.io/pwa-studio/pwa-buildpack/troubleshooting/
-[Venia storefront setup]: https://magento-research.github.io/pwa-studio/venia-pwa-concept/setup/
+[Troubleshooting]: https://pwastudio.io/pwa-buildpack/troubleshooting/
+[Venia storefront setup]: https://pwastudio.io/venia-pwa-concept/setup/
 [workspace commands]: https://yarnpkg.com/en/docs/cli/workspace
 [Yarn Workspaces]: https://yarnpkg.com/en/docs/workspaces/
 
diff --git a/package.json b/package.json
index c00858facb..ee8c8c3103 100755
--- a/package.json
+++ b/package.json
@@ -13,9 +13,9 @@
   ],
   "author": "Magento Commerce",
   "license": "SEE LICENSE IN LICENSE.txt",
-  "homepage": "https://github.com/magento-research/pwa-studio",
+  "homepage": "https://github.com/magento/pwa-studio",
   "bugs": {
-    "url": "https://github.com/magento-research/pwa-studio/issues"
+    "url": "https://github.com/magento/pwa-studio/issues"
   },
   "scripts": {
     "build": "yarn workspace @magento/venia-concept run build",
diff --git a/packages/babel-preset-peregrine/package.json b/packages/babel-preset-peregrine/package.json
index e08e13ac4a..8081c3bce9 100644
--- a/packages/babel-preset-peregrine/package.json
+++ b/packages/babel-preset-peregrine/package.json
@@ -9,13 +9,13 @@
   "scripts": {
     "clean": " "
   },
-  "repository": "github:magento-research/pwa-studio",
+  "repository": "github:magento/pwa-studio",
   "author": "Magento Commerce",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "bugs": {
-    "url": "https://github.com/magento-research/pwa-studio/issues"
+    "url": "https://github.com/magento/pwa-studio/issues"
   },
-  "homepage": "https://github.com/magento-research/pwa-studio/tree/master/packages/babel-preset-peregrine#readme",
+  "homepage": "https://github.com/magento/pwa-studio/tree/master/packages/babel-preset-peregrine#readme",
   "peerDependencies": {
     "@babel/core": "~7.3.4",
     "@babel/plugin-proposal-class-properties": "~7.3.4",
diff --git a/packages/graphql-cli-validate-magento-pwa-queries/lib/index.js b/packages/graphql-cli-validate-magento-pwa-queries/lib/index.js
index 23acf48dde..5ed6f92cd7 100644
--- a/packages/graphql-cli-validate-magento-pwa-queries/lib/index.js
+++ b/packages/graphql-cli-validate-magento-pwa-queries/lib/index.js
@@ -14,7 +14,7 @@ const exitCodes = {
     FAILURE: 1
 };
 const DOCS_COMPAT_TABLE_PATH =
-    'https://magento-research.github.io/pwa-studio/technologies/magento-compatibility/';
+    'https://pwastudio.io/technologies/magento-compatibility/';
 const plugin = {
     COMMAND: 'validate-magento-pwa-queries',
     DESCRIPTION:
diff --git a/packages/graphql-cli-validate-magento-pwa-queries/package.json b/packages/graphql-cli-validate-magento-pwa-queries/package.json
index dbea63e391..0a5a8e79b4 100644
--- a/packages/graphql-cli-validate-magento-pwa-queries/package.json
+++ b/packages/graphql-cli-validate-magento-pwa-queries/package.json
@@ -11,7 +11,7 @@
     "clean": "rimraf ./lib/magento-compatibility.js ./node_modules",
     "test": "jest"
   },
-  "repository": "https://github.com/magento-research/pwa-studio",
+  "repository": "https://github.com/magento/pwa-studio",
   "keywords": [
     "graphql",
     "graphql-cli",
diff --git a/packages/peregrine/CHANGELOG.md b/packages/peregrine/CHANGELOG.md
index 9eec12082c..8ccc621708 100644
--- a/packages/peregrine/CHANGELOG.md
+++ b/packages/peregrine/CHANGELOG.md
@@ -9,5 +9,5 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### Features
 
-* multicasting REST API client ([#164](https://github.com/magento-research/pwa-studio/issues/164)) ([2852e14](https://github.com/magento-research/pwa-studio/commit/2852e14)), closes [#140](https://github.com/magento-research/pwa-studio/issues/140)
-* Simulators for async testing ([#24](https://github.com/magento-research/pwa-studio/issues/24)) ([a380da9](https://github.com/magento-research/pwa-studio/commit/a380da9))
+* multicasting REST API client ([#164](https://github.com/magento/pwa-studio/issues/164)) ([2852e14](https://github.com/magento/pwa-studio/commit/2852e14)), closes [#140](https://github.com/magento/pwa-studio/issues/140)
+* Simulators for async testing ([#24](https://github.com/magento/pwa-studio/issues/24)) ([a380da9](https://github.com/magento/pwa-studio/commit/a380da9))
diff --git a/packages/peregrine/docs/RestApi.md b/packages/peregrine/docs/RestApi.md
index dbefa50315..596ec507a0 100644
--- a/packages/peregrine/docs/RestApi.md
+++ b/packages/peregrine/docs/RestApi.md
@@ -2,4 +2,4 @@
 
 Documentation has been moved to the [REST API client][] topic in the PWA devdocs site.
 
-[REST API client]: https://magento-research.github.io/pwa-studio/peregrine/reference/rest-api-client/
+[REST API client]: https://pwastudio.io/peregrine/reference/rest-api-client/
diff --git a/packages/peregrine/docs/Router.md b/packages/peregrine/docs/Router.md
index 3c3a7587d4..c4e880ed33 100644
--- a/packages/peregrine/docs/Router.md
+++ b/packages/peregrine/docs/Router.md
@@ -2,5 +2,5 @@
 
 Documentation content has been moved to the [Router][] topic in the PWA devdocs site.
 
-[Router]: https://magento-research.github.io/pwa-studio/peregrine/reference/router/
+[Router]: https://pwastudio.io/peregrine/reference/router/
 
diff --git a/packages/peregrine/package.json b/packages/peregrine/package.json
index 81dc20b3c8..c0659fc047 100644
--- a/packages/peregrine/package.json
+++ b/packages/peregrine/package.json
@@ -9,13 +9,13 @@
   "scripts": {
     "clean": " "
   },
-  "repository": "github:magento-research/pwa-studio",
+  "repository": "github:magento/pwa-studio",
   "author": "Magento Commerce",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "bugs": {
-    "url": "https://github.com/magento-research/pwa-studio/issues"
+    "url": "https://github.com/magento/pwa-studio/issues"
   },
-  "homepage": "https://github.com/magento-research/pwa-studio/tree/master/packages/peregrine#readme",
+  "homepage": "https://github.com/magento/pwa-studio/tree/master/packages/peregrine#readme",
   "devDependencies": {
     "intl": "~1.2.5",
     "react": "~16.8.3",
diff --git a/packages/pwa-buildpack/CHANGELOG.md b/packages/pwa-buildpack/CHANGELOG.md
index c3409869a6..07489a0488 100644
--- a/packages/pwa-buildpack/CHANGELOG.md
+++ b/packages/pwa-buildpack/CHANGELOG.md
@@ -9,65 +9,65 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### Bug Fixes
 
-* disable buggy origin sub by default ([#23](https://github.com/magento-research/pwa-studio/issues/23)) ([fde4036](https://github.com/magento-research/pwa-studio/commit/fde4036))
-* remove buggy sudo-prompt until fallback works ([#39](https://github.com/magento-research/pwa-studio/issues/39)) ([1a1da3e](https://github.com/magento-research/pwa-studio/commit/1a1da3e)), closes [#35](https://github.com/magento-research/pwa-studio/issues/35)
-* update devcert dependency ([68c7cca](https://github.com/magento-research/pwa-studio/commit/68c7cca))
-* **dev:** MagentoRootComponentsPlugin dedupe fix ([bb8b152](https://github.com/magento-research/pwa-studio/commit/bb8b152))
-* **dev:** merge 'assets' and 'output' paths ([36d8157](https://github.com/magento-research/pwa-studio/commit/36d8157))
-* **DevProxy:** put proxy after other middlewares ([#33](https://github.com/magento-research/pwa-studio/issues/33)) ([7fa577c](https://github.com/magento-research/pwa-studio/commit/7fa577c)), closes [#32](https://github.com/magento-research/pwa-studio/issues/32)
-* **util:** fix run-as-root await rm bug ([#28](https://github.com/magento-research/pwa-studio/issues/28)) ([e6f0754](https://github.com/magento-research/pwa-studio/commit/e6f0754)), closes [magento-research/venia-pwa-concept#51](https://github.com/magento-research/venia-pwa-concept/issues/51)
+* disable buggy origin sub by default ([#23](https://github.com/magento/pwa-studio/issues/23)) ([fde4036](https://github.com/magento/pwa-studio/commit/fde4036))
+* remove buggy sudo-prompt until fallback works ([#39](https://github.com/magento/pwa-studio/issues/39)) ([1a1da3e](https://github.com/magento/pwa-studio/commit/1a1da3e)), closes [#35](https://github.com/magento/pwa-studio/issues/35)
+* update devcert dependency ([68c7cca](https://github.com/magento/pwa-studio/commit/68c7cca))
+* **dev:** MagentoRootComponentsPlugin dedupe fix ([bb8b152](https://github.com/magento/pwa-studio/commit/bb8b152))
+* **dev:** merge 'assets' and 'output' paths ([36d8157](https://github.com/magento/pwa-studio/commit/36d8157))
+* **DevProxy:** put proxy after other middlewares ([#33](https://github.com/magento/pwa-studio/issues/33)) ([7fa577c](https://github.com/magento/pwa-studio/commit/7fa577c)), closes [#32](https://github.com/magento/pwa-studio/issues/32)
+* **util:** fix run-as-root await rm bug ([#28](https://github.com/magento/pwa-studio/issues/28)) ([e6f0754](https://github.com/magento/pwa-studio/commit/e6f0754)), closes [magento/venia-pwa-concept#51](https://github.com/magento/venia-pwa-concept/issues/51)
 
 
 ### Features
 
-* add protocol error detection to devproxy ([#22](https://github.com/magento-research/pwa-studio/issues/22)) ([7ff4aaa](https://github.com/magento-research/pwa-studio/commit/7ff4aaa))
-* **data:** Add live GraphQL data to product detail page ([#90](https://github.com/magento-research/pwa-studio/issues/90)) ([77b6bd6](https://github.com/magento-research/pwa-studio/commit/77b6bd6)), closes [#52](https://github.com/magento-research/pwa-studio/issues/52) [#87](https://github.com/magento-research/pwa-studio/issues/87)
-* **dev:** app shell detects env from proxy header ([ac5b0b0](https://github.com/magento-research/pwa-studio/commit/ac5b0b0))
-* **dev:** log dev URL prominently after build ([#114](https://github.com/magento-research/pwa-studio/issues/114)) ([84fadde](https://github.com/magento-research/pwa-studio/commit/84fadde)), closes [#4](https://github.com/magento-research/pwa-studio/issues/4)
+* add protocol error detection to devproxy ([#22](https://github.com/magento/pwa-studio/issues/22)) ([7ff4aaa](https://github.com/magento/pwa-studio/commit/7ff4aaa))
+* **data:** Add live GraphQL data to product detail page ([#90](https://github.com/magento/pwa-studio/issues/90)) ([77b6bd6](https://github.com/magento/pwa-studio/commit/77b6bd6)), closes [#52](https://github.com/magento/pwa-studio/issues/52) [#87](https://github.com/magento/pwa-studio/issues/87)
+* **dev:** app shell detects env from proxy header ([ac5b0b0](https://github.com/magento/pwa-studio/commit/ac5b0b0))
+* **dev:** log dev URL prominently after build ([#114](https://github.com/magento/pwa-studio/issues/114)) ([84fadde](https://github.com/magento/pwa-studio/commit/84fadde)), closes [#4](https://github.com/magento/pwa-studio/issues/4)
 
 
 
 
 
 <a name="0.8.2"></a>
-## [0.8.2](https://github.com/magento-research/pwa-buildpack/compare/v0.8.1...v0.8.2) (2018-05-26)
+## [0.8.2](https://github.com/magento/pwa-buildpack/compare/v0.8.1...v0.8.2) (2018-05-26)
 
 
 ### Bug Fixes
 
-* update devcert dependency ([ed4c1d5](https://github.com/magento-research/pwa-buildpack/commit/ed4c1d5))
+* update devcert dependency ([ed4c1d5](https://github.com/magento/pwa-buildpack/commit/ed4c1d5))
 
 
 
 <a name="0.8.1"></a>
-## [0.8.1](https://github.com/magento-research/pwa-buildpack/compare/v0.7.1...v0.8.1) (2018-05-26)
+## [0.8.1](https://github.com/magento/pwa-buildpack/compare/v0.7.1...v0.8.1) (2018-05-26)
 
 
 ### Bug Fixes
 
-* remove buggy sudo-prompt until fallback works ([#39](https://github.com/magento-research/pwa-buildpack/issues/39)) ([99828aa](https://github.com/magento-research/pwa-buildpack/commit/99828aa)), closes [#35](https://github.com/magento-research/pwa-buildpack/issues/35)
+* remove buggy sudo-prompt until fallback works ([#39](https://github.com/magento/pwa-buildpack/issues/39)) ([99828aa](https://github.com/magento/pwa-buildpack/commit/99828aa)), closes [#35](https://github.com/magento/pwa-buildpack/issues/35)
 
 
 
 <a name="0.7.1"></a>
-## [0.7.1](https://github.com/magento-research/pwa-buildpack/compare/v0.7.0...v0.7.1) (2018-05-15)
+## [0.7.1](https://github.com/magento/pwa-buildpack/compare/v0.7.0...v0.7.1) (2018-05-15)
 
 
 ### Bug Fixes
 
-* **DevProxy:** put proxy after other middlewares ([#33](https://github.com/magento-research/pwa-buildpack/issues/33)) ([6378414](https://github.com/magento-research/pwa-buildpack/commit/6378414)), closes [#32](https://github.com/magento-research/pwa-buildpack/issues/32)
+* **DevProxy:** put proxy after other middlewares ([#33](https://github.com/magento/pwa-buildpack/issues/33)) ([6378414](https://github.com/magento/pwa-buildpack/commit/6378414)), closes [#32](https://github.com/magento/pwa-buildpack/issues/32)
 
 
 
 <a name="0.7.0"></a>
-# [0.7.0](https://github.com/magento-research/pwa-buildpack/compare/v0.6.0...v0.7.0) (2018-05-03)
+# [0.7.0](https://github.com/magento/pwa-buildpack/compare/v0.6.0...v0.7.0) (2018-05-03)
 
 
 ### Bug Fixes
 
-* **util:** fix run-as-root await rm bug ([#28](https://github.com/magento-research/pwa-buildpack/issues/28)) ([8a71a9f](https://github.com/magento-research/pwa-buildpack/commit/8a71a9f)), closes [magento-research/venia-pwa-concept#51](https://github.com/magento-research/venia-pwa-concept/issues/51)
+* **util:** fix run-as-root await rm bug ([#28](https://github.com/magento/pwa-buildpack/issues/28)) ([8a71a9f](https://github.com/magento/pwa-buildpack/commit/8a71a9f)), closes [magento/venia-pwa-concept#51](https://github.com/magento/venia-pwa-concept/issues/51)
 
 
 ### Features
 
-* add protocol error detection to devproxy ([#22](https://github.com/magento-research/pwa-buildpack/issues/22)) ([aa0e53c](https://github.com/magento-research/pwa-buildpack/commit/aa0e53c))
+* add protocol error detection to devproxy ([#22](https://github.com/magento/pwa-buildpack/issues/22)) ([aa0e53c](https://github.com/magento/pwa-buildpack/commit/aa0e53c))
diff --git a/packages/pwa-buildpack/docs/MagentoResolver.md b/packages/pwa-buildpack/docs/MagentoResolver.md
index 7f0591e8d3..d227ef3e5b 100644
--- a/packages/pwa-buildpack/docs/MagentoResolver.md
+++ b/packages/pwa-buildpack/docs/MagentoResolver.md
@@ -2,4 +2,4 @@
 
 Documentation content has been moved to the [MagentoResolver][] page on the PWA devdocs site.
 
-[MagentoResolver]: https://magento-research.github.io/pwa-studio/pwa-buildpack/reference/magento-resolver/
+[MagentoResolver]: https://pwastudio.io/pwa-buildpack/reference/magento-resolver/
diff --git a/packages/pwa-buildpack/docs/MagentoRootComponentsPlugin.md b/packages/pwa-buildpack/docs/MagentoRootComponentsPlugin.md
index 6e1b4f507c..795fc80eb8 100644
--- a/packages/pwa-buildpack/docs/MagentoRootComponentsPlugin.md
+++ b/packages/pwa-buildpack/docs/MagentoRootComponentsPlugin.md
@@ -2,4 +2,4 @@
 
 Documentation content has been moved to the [MagentoRootComponentsPlugin] page in the PWA devdocs site.
 
-[MagentoRootComponentsPlugin]: https://magento-research.github.io/pwa-studio/pwa-buildpack/reference/root-components-plugin/
+[MagentoRootComponentsPlugin]: https://pwastudio.io/pwa-buildpack/reference/root-components-plugin/
diff --git a/packages/pwa-buildpack/docs/PWADevServer.md b/packages/pwa-buildpack/docs/PWADevServer.md
index c1f07803f5..4eb680fc03 100644
--- a/packages/pwa-buildpack/docs/PWADevServer.md
+++ b/packages/pwa-buildpack/docs/PWADevServer.md
@@ -2,4 +2,4 @@
 
 Documentation content has been moved to the [PWADevServer][] page in the PWA devdocs site.
 
-[PWADevServer]: https://magento-research.github.io/pwa-studio/pwa-buildpack/reference/pwa-dev-server/
+[PWADevServer]: https://pwastudio.io/pwa-buildpack/reference/pwa-dev-server/
diff --git a/packages/pwa-buildpack/docs/ServiceWorkerPlugin.md b/packages/pwa-buildpack/docs/ServiceWorkerPlugin.md
index f9c6e5a236..1d31200194 100644
--- a/packages/pwa-buildpack/docs/ServiceWorkerPlugin.md
+++ b/packages/pwa-buildpack/docs/ServiceWorkerPlugin.md
@@ -2,4 +2,4 @@
 
 Documentation content has been moved to the [ServiceWorkerPlugin][] page in the PWA devdocs site.
 
-[ServiceWorkerPlugin]: https://magento-research.github.io/pwa-studio/pwa-buildpack/reference/serviceworker-plugin/
+[ServiceWorkerPlugin]: https://pwastudio.io/pwa-buildpack/reference/serviceworker-plugin/
diff --git a/packages/pwa-buildpack/lib/Utilities/configureHost.js b/packages/pwa-buildpack/lib/Utilities/configureHost.js
index 53f734a621..a0cce5b600 100644
--- a/packages/pwa-buildpack/lib/Utilities/configureHost.js
+++ b/packages/pwa-buildpack/lib/Utilities/configureHost.js
@@ -9,7 +9,7 @@ const { username } = os.userInfo();
 
 /**
  * Monkeypatch devcert to fix
- * https://github.com/magento-research/pwa-studio/issues/679 which is blocked by
+ * https://github.com/magento/pwa-studio/issues/679 which is blocked by
  * https://github.com/davewasmer/devcert/pull/30.
  * TODO: Remove this when a release of devcert without this bug is available
  */
diff --git a/packages/pwa-buildpack/package.json b/packages/pwa-buildpack/package.json
index 4c708fcb86..163d9dee4b 100644
--- a/packages/pwa-buildpack/package.json
+++ b/packages/pwa-buildpack/package.json
@@ -12,7 +12,7 @@
   "scripts": {
     "clean": " "
   },
-  "repository": "github:magento-research/pwa-studio",
+  "repository": "github:magento/pwa-studio",
   "keywords": [
     "magento",
     "pwa",
@@ -22,9 +22,9 @@
   "author": "Magento Commerce",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "bugs": {
-    "url": "https://github.com/magento-research/pwa-studio/issues"
+    "url": "https://github.com/magento/pwa-studio/issues"
   },
-  "homepage": "https://github.com/magento-research/pwa-studio/tree/master/packages/pwa-buildpack#readme",
+  "homepage": "https://github.com/magento/pwa-studio/tree/master/packages/pwa-buildpack#readme",
   "dependencies": {
     "@magento/directive-parser": "~0.1.6",
     "@magento/express-sharp": "~2.1.1-newdeps.1",
diff --git a/packages/upward-js/README.md b/packages/upward-js/README.md
index 3c46bd4ffb..0d5d5b973b 100644
--- a/packages/upward-js/README.md
+++ b/packages/upward-js/README.md
@@ -2,4 +2,4 @@
 
 Documentation for this project has been moved to the [upward-js reference implementation][] in the PWA devdocs site.
 
-[upward-js reference implementation]: https://magento-research.github.io/pwa-studio/technologies/upward/reference-implementation/
+[upward-js reference implementation]: https://pwastudio.io/technologies/upward/reference-implementation/
diff --git a/packages/upward-js/package.json b/packages/upward-js/package.json
index 8e5025fcbe..ab841e4e01 100644
--- a/packages/upward-js/package.json
+++ b/packages/upward-js/package.json
@@ -15,7 +15,7 @@
     "test": "jest",
     "test:spec": "upward-spec ./test_spec.sh"
   },
-  "repository": "github:magento-research/pwa-studio",
+  "repository": "github:magento/pwa-studio",
   "keywords": [
     "magento",
     "pwa",
@@ -25,9 +25,9 @@
   "author": "Magento Commerce",
   "license": "SEE LICENSE IN LICENSE.txt",
   "bugs": {
-    "url": "https://github.com/magento-research/pwa-studio/issues"
+    "url": "https://github.com/magento/pwa-studio/issues"
   },
-  "homepage": "https://github.com/magento-research/pwa-studio/tree/master/packages/upward-js#readme",
+  "homepage": "https://github.com/magento/pwa-studio/tree/master/packages/upward-js#readme",
   "dependencies": {
     "apollo-link": "~1.2.8",
     "apollo-link-http": "~1.5.11",
diff --git a/packages/upward-spec/package.json b/packages/upward-spec/package.json
index e8f4677f6f..e663734f8e 100644
--- a/packages/upward-spec/package.json
+++ b/packages/upward-spec/package.json
@@ -9,7 +9,7 @@
   "scripts": {
     "clean": " "
   },
-  "repository": "github:magento-research/pwa-studio",
+  "repository": "github:magento/pwa-studio",
   "keywords": [
     "magento",
     "pwa",
@@ -19,9 +19,9 @@
   "author": "Magento Commerce",
   "license": "SEE LICENSE IN LICENSE.txt",
   "bugs": {
-    "url": "https://github.com/magento-research/pwa-studio/issues"
+    "url": "https://github.com/magento/pwa-studio/issues"
   },
-  "homepage": "https://github.com/magento-research/pwa-studio/tree/master/packages/upward-spec#readme",
+  "homepage": "https://github.com/magento/pwa-studio/tree/master/packages/upward-spec#readme",
   "dependencies": {
     "apollo-server": "~2.4.6",
     "chalk": "~2.4.2",
diff --git a/packages/venia-concept/CHANGELOG.md b/packages/venia-concept/CHANGELOG.md
index 8d1d3dc5ad..b7fa079bfd 100644
--- a/packages/venia-concept/CHANGELOG.md
+++ b/packages/venia-concept/CHANGELOG.md
@@ -9,18 +9,18 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### Bug Fixes
 
-* **dev:** MagentoRootComponentsPlugin dedupe fix ([bb8b152](https://github.com/magento-research/pwa-studio/commit/bb8b152))
-* **dev:** merge 'assets' and 'output' paths ([36d8157](https://github.com/magento-research/pwa-studio/commit/36d8157))
-* **dev:** optimize uglify output ([e7dca7e](https://github.com/magento-research/pwa-studio/commit/e7dca7e))
-* **perf:** Optimize logo.svg ([0a1fb6a](https://github.com/magento-research/pwa-studio/commit/0a1fb6a))
-* **routing:** use Link component ([d4004bc](https://github.com/magento-research/pwa-studio/commit/d4004bc))
+* **dev:** MagentoRootComponentsPlugin dedupe fix ([bb8b152](https://github.com/magento/pwa-studio/commit/bb8b152))
+* **dev:** merge 'assets' and 'output' paths ([36d8157](https://github.com/magento/pwa-studio/commit/36d8157))
+* **dev:** optimize uglify output ([e7dca7e](https://github.com/magento/pwa-studio/commit/e7dca7e))
+* **perf:** Optimize logo.svg ([0a1fb6a](https://github.com/magento/pwa-studio/commit/0a1fb6a))
+* **routing:** use Link component ([d4004bc](https://github.com/magento/pwa-studio/commit/d4004bc))
 
 
 ### Features
 
-* multicasting REST API client ([#164](https://github.com/magento-research/pwa-studio/issues/164)) ([2852e14](https://github.com/magento-research/pwa-studio/commit/2852e14)), closes [#140](https://github.com/magento-research/pwa-studio/issues/140)
-* **checkout:** Enable order submission ([#173](https://github.com/magento-research/pwa-studio/issues/173)) ([666327e](https://github.com/magento-research/pwa-studio/commit/666327e))
-* **checkout:** Integrate live product, cart, checkout ([#140](https://github.com/magento-research/pwa-studio/issues/140)) ([1f60e87](https://github.com/magento-research/pwa-studio/commit/1f60e87))
-* **data:** Add live GraphQL data to product detail page ([#90](https://github.com/magento-research/pwa-studio/issues/90)) ([77b6bd6](https://github.com/magento-research/pwa-studio/commit/77b6bd6)), closes [#52](https://github.com/magento-research/pwa-studio/issues/52) [#87](https://github.com/magento-research/pwa-studio/issues/87)
-* **dev:** app shell detects env from proxy header ([ac5b0b0](https://github.com/magento-research/pwa-studio/commit/ac5b0b0))
-* **dev:** log dev URL prominently after build ([#114](https://github.com/magento-research/pwa-studio/issues/114)) ([84fadde](https://github.com/magento-research/pwa-studio/commit/84fadde)), closes [#4](https://github.com/magento-research/pwa-studio/issues/4)
+* multicasting REST API client ([#164](https://github.com/magento/pwa-studio/issues/164)) ([2852e14](https://github.com/magento/pwa-studio/commit/2852e14)), closes [#140](https://github.com/magento/pwa-studio/issues/140)
+* **checkout:** Enable order submission ([#173](https://github.com/magento/pwa-studio/issues/173)) ([666327e](https://github.com/magento/pwa-studio/commit/666327e))
+* **checkout:** Integrate live product, cart, checkout ([#140](https://github.com/magento/pwa-studio/issues/140)) ([1f60e87](https://github.com/magento/pwa-studio/commit/1f60e87))
+* **data:** Add live GraphQL data to product detail page ([#90](https://github.com/magento/pwa-studio/issues/90)) ([77b6bd6](https://github.com/magento/pwa-studio/commit/77b6bd6)), closes [#52](https://github.com/magento/pwa-studio/issues/52) [#87](https://github.com/magento/pwa-studio/issues/87)
+* **dev:** app shell detects env from proxy header ([ac5b0b0](https://github.com/magento/pwa-studio/commit/ac5b0b0))
+* **dev:** log dev URL prominently after build ([#114](https://github.com/magento/pwa-studio/issues/114)) ([84fadde](https://github.com/magento/pwa-studio/commit/84fadde)), closes [#4](https://github.com/magento/pwa-studio/issues/4)
diff --git a/packages/venia-concept/package.json b/packages/venia-concept/package.json
index 4b3d8ab6e6..8013762158 100644
--- a/packages/venia-concept/package.json
+++ b/packages/venia-concept/package.json
@@ -26,13 +26,13 @@
     "validate-queries": "yarn run download-schema && graphql validate-magento-pwa-queries --project venia",
     "watch": "webpack-dev-server --progress --color --env.mode development"
   },
-  "repository": "github:magento-research/pwa-studio",
+  "repository": "github:magento/pwa-studio",
   "author": "Magento Commerce",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "bugs": {
-    "url": "https://github.com/magento-research/pwa-studio/issues"
+    "url": "https://github.com/magento/pwa-studio/issues"
   },
-  "homepage": "https://github.com/magento-research/pwa-studio/tree/master/packages/venia-concept#readme",
+  "homepage": "https://github.com/magento/pwa-studio/tree/master/packages/venia-concept#readme",
   "dependencies": {
     "@babel/runtime": "~7.4.2",
     "@magento/peregrine": "~3.0.0",
diff --git a/packages/venia-concept/upward.yml b/packages/venia-concept/upward.yml
index 39d5a0b50a..444081a546 100644
--- a/packages/venia-concept/upward.yml
+++ b/packages/venia-concept/upward.yml
@@ -1,7 +1,7 @@
 # This is the UPWARD specification file for the Venia storefront.
 # It is used by an UPWARD server implementation, such as upward-js and
 # upward-php, to describe how the server responds to requests.
-# See: https://magento-research.github.io/pwa-studio/technologies/upward/
+# See: https://pwastudio.io/technologies/upward/
 
 # The root properties of an UPWARD spec file are part of a global context
 # that includes request and environment data.
diff --git a/pwa-devdocs/CHANGELOG.md b/pwa-devdocs/CHANGELOG.md
index 12d1dbf1ef..8a2328626c 100644
--- a/pwa-devdocs/CHANGELOG.md
+++ b/pwa-devdocs/CHANGELOG.md
@@ -9,4 +9,4 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### Bug Fixes
 
-* **dev:** merge 'assets' and 'output' paths ([36d8157](https://github.com/magento-research/pwa-studio/commit/36d8157))
+* **dev:** merge 'assets' and 'output' paths ([36d8157](https://github.com/magento/pwa-studio/commit/36d8157))
diff --git a/pwa-devdocs/README.md b/pwa-devdocs/README.md
index fd327e1b9e..3a8afa7c29 100644
--- a/pwa-devdocs/README.md
+++ b/pwa-devdocs/README.md
@@ -79,7 +79,7 @@ This project is licensed under OSL-3.0 - see the [LICENSE.txt] file for details.
 [contribution guidelines]: ../../.github/CONTRIBUTING.md
 [code of conduct]: ../../.github/CODE_OF_CONDUCT.md
 [license.txt]: LICENSE.txt
-[documentation site]: https://magento-research.github.io/pwa-studio/
+[documentation site]: https://pwastudio.io
 [node.js]: https://nodejs.org
 [ruby]: https://www.ruby-lang.org/
 [bundler]: http://bundler.io/
diff --git a/pwa-devdocs/_drafts/configuration-management/buildpack-cli/create-env-file/index.md b/pwa-devdocs/_drafts/configuration-management/buildpack-cli/create-env-file/index.md
index f4d203cb6a..5820d5ec72 100644
--- a/pwa-devdocs/_drafts/configuration-management/buildpack-cli/create-env-file/index.md
+++ b/pwa-devdocs/_drafts/configuration-management/buildpack-cli/create-env-file/index.md
@@ -76,4 +76,4 @@ The return value is the string value of a `.env` file.
 
 Parse this value using the `dotenv` API or write it out to the filesystem.
 
-[`envvardefinitions.json`]: https://github.com/magento-research/pwa-studio/blob/develop/packages/pwa-buildpack/envVarDefinitions.json
+[`envvardefinitions.json`]: https://github.com/magento/pwa-studio/blob/develop/packages/pwa-buildpack/envVarDefinitions.json
diff --git a/pwa-devdocs/_drafts/configuration-management/buildpack-cli/load-env/index.md b/pwa-devdocs/_drafts/configuration-management/buildpack-cli/load-env/index.md
index 5cedf2f03f..d6f3335509 100644
--- a/pwa-devdocs/_drafts/configuration-management/buildpack-cli/load-env/index.md
+++ b/pwa-devdocs/_drafts/configuration-management/buildpack-cli/load-env/index.md
@@ -188,5 +188,5 @@ if (configuration.isDev) {
 
 [upward]: {{site.baseurl}}{%link technologies/upward/reference-implementation/index.md %}
 
-[`envvardefinitions.json`]: https://github.com/magento-research/pwa-studio/blob/develop/packages/pwa-buildpack/envVarDefinitions.json
+[`envvardefinitions.json`]: https://github.com/magento/pwa-studio/blob/develop/packages/pwa-buildpack/envVarDefinitions.json
 [camelcased]: https://npmjs.com/package/camelspace
diff --git a/pwa-devdocs/_drafts/configuration-management/index.md b/pwa-devdocs/_drafts/configuration-management/index.md
index 8ff934a7a3..94a3cee043 100644
--- a/pwa-devdocs/_drafts/configuration-management/index.md
+++ b/pwa-devdocs/_drafts/configuration-management/index.md
@@ -195,4 +195,4 @@ If you are contributing to the PWA Studio project and want to add new functional
 [twelve-factor app]: https://12factor.net/config 
 [envalid]: https://npmjs.com/package/envalid
 [camelspace]: https://npmjs.com/package/camelspace
-[`packages/pwa-buildpack/envvardefinitions.json`]: https://github.com/magento-research/pwa-studio/blob/develop/packages/pwa-buildpack/envVarDefinitions.json
+[`packages/pwa-buildpack/envvardefinitions.json`]: https://github.com/magento/pwa-studio/blob/develop/packages/pwa-buildpack/envVarDefinitions.json
diff --git a/pwa-devdocs/_drafts/docker-setup.md b/pwa-devdocs/_drafts/docker-setup.md
index e926abbacc..59e69b5cbb 100644
--- a/pwa-devdocs/_drafts/docker-setup.md
+++ b/pwa-devdocs/_drafts/docker-setup.md
@@ -3,7 +3,7 @@
 1. Install Docker for your system: https://docs.docker.com/install
 2. Clone the repository:
     ```
-    git clone https://github.com/magento-research/pwa-studio
+    git clone https://github.com/magento/pwa-studio
     ```
     *Note*: Windows users will want to ensure that [shared drives](https://docs.docker.com/docker-for-windows/#shared-drives) are enabled.
 3. In the root of the repository, run 
diff --git a/pwa-devdocs/package.json b/pwa-devdocs/package.json
index dd083a7a4a..3c5e3ef839 100644
--- a/pwa-devdocs/package.json
+++ b/pwa-devdocs/package.json
@@ -22,13 +22,13 @@
         "lint": "node scripts/lint",
         "start": "npm-run-all -s clean develop"
     },
-    "repository": "github:magento-research/pwa-studio",
+    "repository": "github:magento/pwa-studio",
     "author": "James Calcaben",
     "license": "OSL-3.0",
     "bugs": {
-        "url": "https://github.com/magento-research/pwa-studio/issues"
+        "url": "https://github.com/magento/pwa-studio/issues"
     },
-    "homepage": "https://github.com/magento-research/pwa-studio/tree/master/packages/pwa-devdocs#readme",
+    "homepage": "https://github.com/magento/pwa-studio/tree/master/packages/pwa-devdocs#readme",
     "devDependencies": {
         "browser-sync": "^2.26.7",
         "css-loader": "^2.1.1",
diff --git a/pwa-devdocs/scripts/create-reference-docs/config/index.js b/pwa-devdocs/scripts/create-reference-docs/config/index.js
index c8bd192378..a954dfc7d5 100644
--- a/pwa-devdocs/scripts/create-reference-docs/config/index.js
+++ b/pwa-devdocs/scripts/create-reference-docs/config/index.js
@@ -5,7 +5,7 @@ let files = [].concat(peregrineFiles, veniaConceptFiles);
 
 module.exports = {
     baseGitHubPath:
-        'github.com/magento-research/pwa-studio/blob/master/',
+        'github.com/magento/pwa-studio/blob/develop/',
     packagesPath: 'packages',
     includesPath: 'src/_includes/auto-generated',
     files: files
diff --git a/pwa-devdocs/src/_config.yml b/pwa-devdocs/src/_config.yml
index f560b82008..dcba047b15 100644
--- a/pwa-devdocs/src/_config.yml
+++ b/pwa-devdocs/src/_config.yml
@@ -9,8 +9,8 @@ logo: PWA Docs
 
 github_link: true
 feedback_link: true
-github_repo: "https://github.com/magento-research/pwa-studio/"
-github_files: "https://github.com/magento-research/pwa-studio/tree/develop/pwa-devdocs/src/"
+github_repo: "https://github.com/magento/pwa-studio/"
+github_files: "https://github.com/magento/pwa-studio/tree/develop/pwa-devdocs/src/"
 
 
 defaults:
diff --git a/pwa-devdocs/src/_data/vars.yml b/pwa-devdocs/src/_data/vars.yml
index d68b05ecdd..d6e0b2cbbc 100644
--- a/pwa-devdocs/src/_data/vars.yml
+++ b/pwa-devdocs/src/_data/vars.yml
@@ -2,4 +2,4 @@
 
 title: Magento PWA Studio Documentation
 description: Everything you need to build a Magento PWA.
-repo: https://github.com/magento-research/pwa-studio
+repo: https://github.com/magento/pwa-studio
diff --git a/pwa-devdocs/src/_includes/layout/header-scripts.html b/pwa-devdocs/src/_includes/layout/header-scripts.html
index 11b195823e..6fa942c81b 100644
--- a/pwa-devdocs/src/_includes/layout/header-scripts.html
+++ b/pwa-devdocs/src/_includes/layout/header-scripts.html
@@ -10,7 +10,7 @@
     {
       label: "PWA",
       name: "pwa-devdocs",
-      baseUrl: "https://magento-research.github.io/pwa-studio"
+      baseUrl: "https://pwastudio.io"
     },
     {
       label: "DevDocs",
diff --git a/pwa-devdocs/src/index.html b/pwa-devdocs/src/index.html
index 40bf178557..34d22dde02 100644
--- a/pwa-devdocs/src/index.html
+++ b/pwa-devdocs/src/index.html
@@ -79,7 +79,7 @@ <h2>PWA Studio in GitHub</h2>
         The Magento PWA Studio project is an open source GitHub project that welcomes community contributions and collaboration.
       </p>
       <p>
-        All the tools listed below are available as separate packages in the <a href="https://github.com/magento-research/pwa-studio">PWA Studio</a> monorepo.
+        All the tools listed below are available as separate packages in the <a href="https://github.com/magento/pwa-studio">PWA Studio</a> monorepo.
       </p>
       <p>
           If you have any questions, please join the <strong>#pwa</strong> Slack channel at <a href="https://magentocommeng.slack.com/">magentocommeng.slack.com</a>.
@@ -93,7 +93,7 @@ <h2>PWA Studio in GitHub</h2>
       <div class="column">
         <article class="repository tile">
           <h3>
-            <a href="https://github.com/magento-research/pwa-studio/tree/master/packages/venia-concept">Venia Storefront source</a>
+            <a href="https://github.com/magento/pwa-studio/tree/master/packages/venia-concept">Venia Storefront source</a>
           </h3>
           <p>
             Project source code for a conceptual and customizable PWA storefront for Magento 2.
@@ -105,7 +105,7 @@ <h3>
       <div class="column">
         <article class="repository tile">
           <h3>
-            <a href="https://github.com/magento-research/pwa-studio/tree/master/packages/peregrine">Peregrine source</a>
+            <a href="https://github.com/magento/pwa-studio/tree/master/packages/peregrine">Peregrine source</a>
           </h3>
           <p>
             Project source code for the collection of custom React hooks and components for the Magento PWA projects.
@@ -116,7 +116,7 @@ <h3>
       <div class="column">
         <article class="repository tile">
           <h3>
-            <a href="https://github.com/magento-research/pwa-studio/tree/master/packages/pwa-buildpack">Buildpack source</a>
+            <a href="https://github.com/magento/pwa-studio/tree/master/packages/pwa-buildpack">Buildpack source</a>
           </h3>
           <p>
             Project source code for the build and layout optimization tooling for Magento PWA projects.
diff --git a/pwa-devdocs/src/peregrine/index.md b/pwa-devdocs/src/peregrine/index.md
index aad004475c..5ec3693623 100644
--- a/pwa-devdocs/src/peregrine/index.md
+++ b/pwa-devdocs/src/peregrine/index.md
@@ -44,7 +44,7 @@ Visit the [`peregrine`][] package to view the source or contribute to this proje
 
 [venia]: {{site.baseurl}}{%link venia-pwa-concept/index.md %}
 
-[`peregrine`]: https://github.com/magento-research/pwa-studio/tree/master/packages/peregrine
+[`peregrine`]: https://github.com/magento/pwa-studio/tree/master/packages/peregrine
 [custom react hooks]: https://reactjs.org/docs/hooks-custom.html
 [destructure]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment
 [jsdoc]: https://devdocs.io/jsdoc/
diff --git a/pwa-devdocs/src/peregrine/routing/index.md b/pwa-devdocs/src/peregrine/routing/index.md
index 010f40122c..e4a28c9268 100644
--- a/pwa-devdocs/src/peregrine/routing/index.md
+++ b/pwa-devdocs/src/peregrine/routing/index.md
@@ -137,13 +137,13 @@ class App extends Component {
 ...
 ```
 
-[`router.js`]: https://github.com/magento-research/pwa-studio/blob/master/packages/peregrine/lib/Router/router.js
-[`magentoRouteHandler.js`]: https://github.com/magento-research/pwa-studio/blob/master/packages/peregrine/lib/Router/magentoRouteHandler.js
-[`resolveUnknownRoute.js`]: https://github.com/magento-research/pwa-studio/blob/master/packages/peregrine/lib/Router/resolveUnknownRoute.js
-[`webpackInterop.js`]: https://github.com/magento-research/pwa-studio/blob/master/packages/peregrine/lib/Router/webpackInterop.js
-[`page.js`]: https://github.com/magento-research/pwa-studio/blob/master/packages/peregrine/lib/Page/page.js
+[`router.js`]: https://github.com/magento/pwa-studio/blob/master/packages/peregrine/lib/Router/router.js
+[`magentoRouteHandler.js`]: https://github.com/magento/pwa-studio/blob/master/packages/peregrine/lib/Router/magentoRouteHandler.js
+[`resolveUnknownRoute.js`]: https://github.com/magento/pwa-studio/blob/master/packages/peregrine/lib/Router/resolveUnknownRoute.js
+[`webpackInterop.js`]: https://github.com/magento/pwa-studio/blob/master/packages/peregrine/lib/Router/webpackInterop.js
+[`page.js`]: https://github.com/magento/pwa-studio/blob/master/packages/peregrine/lib/Page/page.js
 [`react-router`]: https://github.com/ReactTraining/react-router
 [React Context]: https://reactjs.org/docs/context.html
-[ErrorView]:t://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/src/components/ErrorView/errorView.js
-[App]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/src/components/App/app.js
+[ErrorView]:t://github.com/magento/pwa-studio/blob/master/packages/venia-concept/src/components/ErrorView/errorView.js
+[App]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/src/components/App/app.js
 [Loading and error message components]: #loading-and-error-message-components
diff --git a/pwa-devdocs/src/pwa-buildpack/index.md b/pwa-devdocs/src/pwa-buildpack/index.md
index 02ef4e1559..f05a93ae71 100644
--- a/pwa-devdocs/src/pwa-buildpack/index.md
+++ b/pwa-devdocs/src/pwa-buildpack/index.md
@@ -15,6 +15,6 @@ If you are having trouble setting up your environment, see the [Troubleshooting
 
 Visit the [`pwa-buildpack`] package in the PWA Studio repository to contribute to this project.
 
-[`pwa-buildpack`]: https://github.com/magento-research/pwa-studio/tree/master/packages/pwa-buildpack
+[`pwa-buildpack`]: https://github.com/magento/pwa-studio/tree/master/packages/pwa-buildpack
 [Project setup tutorial]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/index.md %}
 [Troubleshooting page]: {{ site.baseurl }}{% link pwa-buildpack/troubleshooting/index.md %}
\ No newline at end of file
diff --git a/pwa-devdocs/src/technologies/basic-concepts/client-side-caching/index.md b/pwa-devdocs/src/technologies/basic-concepts/client-side-caching/index.md
index 17b985fee8..e6f414d709 100644
--- a/pwa-devdocs/src/technologies/basic-concepts/client-side-caching/index.md
+++ b/pwa-devdocs/src/technologies/basic-concepts/client-side-caching/index.md
@@ -78,7 +78,7 @@ This strategy is set using the `fetchPolicy` prop on the `Query` component.
 Caching for Apollo is set up in the [`src/drivers/adapter.js`][] file.
 
 [service worker]: https://developers.google.com/web/ilt/pwa/introduction-to-service-worker
-[`src/sw.js`]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/src/sw.js
+[`src/sw.js`]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/src/sw.js
 [workbox]: https://developers.google.com/web/tools/workbox/
 [caching strategies]: https://developers.google.com/web/tools/workbox/modules/workbox-strategies
 [stale-while-revalidate]: https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#stale-while-revalidate
@@ -86,4 +86,4 @@ Caching for Apollo is set up in the [`src/drivers/adapter.js`][] file.
 [cache first]: https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/#cache-falling-back-to-network
 [`inmemorycache`]: https://www.apollographql.com/docs/react/advanced/caching
 [`apollo-cache-persist`]: https://github.com/apollographql/apollo-cache-persist
-[`src/drivers/adapter.js`]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/src/drivers/adapter.js
+[`src/drivers/adapter.js`]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/src/drivers/adapter.js
diff --git a/pwa-devdocs/src/technologies/basic-concepts/index.md b/pwa-devdocs/src/technologies/basic-concepts/index.md
index 18d706f73b..7ca9231b2b 100644
--- a/pwa-devdocs/src/technologies/basic-concepts/index.md
+++ b/pwa-devdocs/src/technologies/basic-concepts/index.md
@@ -77,10 +77,10 @@ Optimizing the critical path is important to get the best performance out of a p
 [application shell]: {{site.baseurl}}{%link technologies/basic-concepts/app-shell/index.md %}
 
 [redux]: https://redux.js.org/introduction/core-concepts
-[service worker]: https://github.com/magento-research/pwa-studio
-[component data binding]: https://github.com/magento-research/pwa-studio
-[client state, reducers, and actions]: https://github.com/magento-research/pwa-studio
-[loading and offline states]: https://github.com/magento-research/pwa-studio
-[performance patterns]: https://github.com/magento-research/pwa-studio
-[root components and routing]: https://github.com/magento-research/pwa-studio
-[critical path]: https://github.com/magento-research/pwa-studio
+[service worker]: https://github.com/magento/pwa-studio
+[component data binding]: https://github.com/magento/pwa-studio
+[client state, reducers, and actions]: https://github.com/magento/pwa-studio
+[loading and offline states]: https://github.com/magento/pwa-studio
+[performance patterns]: https://github.com/magento/pwa-studio
+[root components and routing]: https://github.com/magento/pwa-studio
+[critical path]: https://github.com/magento/pwa-studio
diff --git a/pwa-devdocs/src/technologies/contribute/index.md b/pwa-devdocs/src/technologies/contribute/index.md
index 8d615ee81e..b1d67a0a4f 100644
--- a/pwa-devdocs/src/technologies/contribute/index.md
+++ b/pwa-devdocs/src/technologies/contribute/index.md
@@ -93,11 +93,11 @@ Provide as much detail as you can in each section to help us triage and process
 **Note:**
 _Please avoid creating GitHub issues asking for help on bugs in your project that are outside the scope of this project._
 
-[code of conduct]: https://github.com/magento-research/pwa-studio/blob/master/.github/CODE_OF_CONDUCT.md
-[support]: https://github.com/magento-research/pwa-studio/blob/master/.github/SUPPORT.md
-[official repository]: https://github.com/magento-research/pwa-studio
+[code of conduct]: https://github.com/magento/pwa-studio/blob/master/.github/CODE_OF_CONDUCT.md
+[support]: https://github.com/magento/pwa-studio/blob/master/.github/SUPPORT.md
+[official repository]: https://github.com/magento/pwa-studio
 [meaningful commit messages]: https://chris.beams.io/posts/git-commit/
-[github issue]: https://github.com/magento-research/pwa-studio/issues/new
-[magento research]: https://github.com/magento-research
-[help wanted]: https://github.com/magento-research/pwa-studio/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22
+[github issue]: https://github.com/magento/pwa-studio/issues/new
+[magento research]: https://github.com/magento
+[help wanted]: https://github.com/magento/pwa-studio/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22
 [Venia storefront setup]: {{site.baseurl}}{%link venia-pwa-concept/setup/index.md %}
diff --git a/pwa-devdocs/src/technologies/upward/index.md b/pwa-devdocs/src/technologies/upward/index.md
index 05c445a52c..fab45b4fca 100644
--- a/pwa-devdocs/src/technologies/upward/index.md
+++ b/pwa-devdocs/src/technologies/upward/index.md
@@ -85,9 +85,9 @@ This supports the need for content that a PWA can [cache and reuse when offline]
 [HTTPS]: https://developers.google.com/web/fundamentals/security/encrypt-in-transit/why-https
 [edge servers]: https://en.wikipedia.org/wiki/Content_delivery_network
 [idempotent]: https://developer.mozilla.org/en-US/docs/Glossary/Idempotent
-[RATIONALE.md]: https://github.com/magento-research/pwa-studio/blob/master/packages/upward-spec/RATIONALE.md
-[`upward.yml`]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/upward.yml
-[upward-js]: https://github.com/magento-research/pwa-studio/tree/master/packages/upward-js
+[RATIONALE.md]: https://github.com/magento/pwa-studio/blob/master/packages/upward-spec/RATIONALE.md
+[`upward.yml`]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/upward.yml
+[upward-js]: https://github.com/magento/pwa-studio/tree/master/packages/upward-js
 [cache and reuse when offline]: https://developers.google.com/web/fundamentals/instant-and-offline/offline-cookbook/
 
 [Reference Implementation]: {{ site.baseurl }}{% link technologies/upward/reference-implementation/index.md %}
diff --git a/pwa-devdocs/src/technologies/upward/reference-implementation/index.md b/pwa-devdocs/src/technologies/upward/reference-implementation/index.md
index a9ec66a536..d0455b687c 100644
--- a/pwa-devdocs/src/technologies/upward/reference-implementation/index.md
+++ b/pwa-devdocs/src/technologies/upward/reference-implementation/index.md
@@ -81,7 +81,7 @@ app.use(middleware('./my-upward-server.yml'));
 
 You can also pass an `IOAdapter` as a second argument to the middleware.
 
-[upward-js]: https://github.com/magento-research/pwa-studio/tree/master/packages/upward-js
+[upward-js]: https://github.com/magento/pwa-studio/tree/master/packages/upward-js
 
 [UPWARD]: {{site.baseurl}}{% link technologies/upward/index.md %}
 [Setting up Venia]: {{site.baseurl}}{% link venia-pwa-concept/setup/index.md %}
diff --git a/pwa-devdocs/src/tutorials/cloud-deploy/index.md b/pwa-devdocs/src/tutorials/cloud-deploy/index.md
index 63b359147d..28d1533cfe 100644
--- a/pwa-devdocs/src/tutorials/cloud-deploy/index.md
+++ b/pwa-devdocs/src/tutorials/cloud-deploy/index.md
@@ -51,7 +51,7 @@ To have composer install this package, add it to the `require` section of the `c
 
 ## Add Venia sample data (optional)
 
-The Venia storefront works best with the Venia sample data installed. There is an [automated script](https://magento-research.github.io/pwa-studio/venia-pwa-concept/install-sample-data/) in the `@magento/venia-concept` package, or you can follow the manual steps here.
+The Venia storefront works best with the Venia sample data installed. There is an [automated script](https://pwastudio.io/venia-pwa-concept/install-sample-data/) in the `@magento/venia-concept` package, or you can follow the manual steps here.
 
 If you are deploying your own custom storefront, you may skip this step and continue to the next section.
 
@@ -210,5 +210,5 @@ You should be able to navigate to your Cloud instance and see your storefront.
 
 [magento pwa studio]: http://pwastudio.io
 [`@magento/venia-concept`]: https://www.npmjs.com/package/@magento/venia-concept
-[venia storefront]: https://magento-research.github.io/pwa-studio/venia-pwa-concept/
+[venia storefront]: https://pwastudio.io/venia-pwa-concept/
 [create a `package.json`]: https://docs.npmjs.com/cli/init
diff --git a/pwa-devdocs/src/tutorials/hello-upward/adding-react/index.md b/pwa-devdocs/src/tutorials/hello-upward/adding-react/index.md
index c1cea29bbb..a5f336308e 100644
--- a/pwa-devdocs/src/tutorials/hello-upward/adding-react/index.md
+++ b/pwa-devdocs/src/tutorials/hello-upward/adding-react/index.md
@@ -173,4 +173,4 @@ When you navigate to the server, you will see the React application render the "
 [jsx]: https://reactjs.org/docs/introducing-jsx.html
 [babel]: https://babeljs.io/
 [webpack]: https://webpack.js.org/
-[FileResolver]: https://github.com/magento-research/pwa-studio/tree/develop/packages/upward-spec#fileresolver
+[FileResolver]: https://github.com/magento/pwa-studio/tree/develop/packages/upward-spec#fileresolver
diff --git a/pwa-devdocs/src/tutorials/hello-upward/simple-server/index.md b/pwa-devdocs/src/tutorials/hello-upward/simple-server/index.md
index f59a66b36a..ee34b5023a 100644
--- a/pwa-devdocs/src/tutorials/hello-upward/simple-server/index.md
+++ b/pwa-devdocs/src/tutorials/hello-upward/simple-server/index.md
@@ -202,7 +202,7 @@ Examples of invalid URLS:
 
 **Next:** [Rendering web pages using the TemplateResolver][]
 
-[upward specification]: https://github.com/magento-research/pwa-studio/tree/master/packages/upward-spec
+[upward specification]: https://github.com/magento/pwa-studio/tree/master/packages/upward-spec
 [node]: https://nodejs.org
 [yarn]: https://yarnpkg.com/en/
 [npm]: https://www.npmjs.com/get-npm
@@ -210,5 +210,5 @@ Examples of invalid URLS:
 
 [`upward-js`]: {{site.baseurl}}{% link technologies/upward/reference-implementation/index.md %}
 [Rendering web pages using the TemplateResolver]: {{site.baseurl}}{% link tutorials/hello-upward/using-template-resolver/index.md %}
-[InlineResolver]: https://github.com/magento-research/pwa-studio/tree/develop/packages/upward-spec#inlineresolver
-[ConditionalResolver]: https://github.com/magento-research/pwa-studio/tree/develop/packages/upward-spec#conditionalresolver
+[InlineResolver]: https://github.com/magento/pwa-studio/tree/develop/packages/upward-spec#inlineresolver
+[ConditionalResolver]: https://github.com/magento/pwa-studio/tree/develop/packages/upward-spec#conditionalresolver
diff --git a/pwa-devdocs/src/tutorials/hello-upward/using-template-resolver/index.md b/pwa-devdocs/src/tutorials/hello-upward/using-template-resolver/index.md
index cb890f6f5b..6a3ee11015 100644
--- a/pwa-devdocs/src/tutorials/hello-upward/using-template-resolver/index.md
+++ b/pwa-devdocs/src/tutorials/hello-upward/using-template-resolver/index.md
@@ -104,4 +104,4 @@ View the page source for the page to see the HTML rendered from the templates.
 [Adding React to the server]: {{site.baseurl}}{%link tutorials/hello-upward/adding-react/index.md %}
 
 [Mustache]: https://mustache.github.io/mustache.5.html
-[TemplateResolver]: https://github.com/magento-research/pwa-studio/tree/develop/packages/upward-spec#templateresolver
+[TemplateResolver]: https://github.com/magento/pwa-studio/tree/develop/packages/upward-spec#templateresolver
diff --git a/pwa-devdocs/src/venia-pwa-concept/features/braintree/index.md b/pwa-devdocs/src/venia-pwa-concept/features/braintree/index.md
index 086d5fbc35..b43ad20232 100644
--- a/pwa-devdocs/src/venia-pwa-concept/features/braintree/index.md
+++ b/pwa-devdocs/src/venia-pwa-concept/features/braintree/index.md
@@ -32,7 +32,7 @@ Use the following mock data to pass validation and ensure a successful checkout.
 {:style="table-layout:auto"}
 
 [braintree]: https://www.braintreepayments.com/
-[`braintreedropin.js`]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/src/components/Checkout/braintreeDropin.js
+[`braintreedropin.js`]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/src/components/Checkout/braintreeDropin.js
 [this list]: https://developers.braintreepayments.com/guides/credit-cards/testing-go-live/node#valid-card-numbers
 [Braintree Drop-in]: https://github.com/braintree/braintree-web-drop-in
 [Braintree Drop-in docs]: https://braintree.github.io/braintree-web-drop-in/docs/current/index.html
diff --git a/pwa-devdocs/src/venia-pwa-concept/features/checkout/index.md b/pwa-devdocs/src/venia-pwa-concept/features/checkout/index.md
index b4848f0526..f8ca818744 100644
--- a/pwa-devdocs/src/venia-pwa-concept/features/checkout/index.md
+++ b/pwa-devdocs/src/venia-pwa-concept/features/checkout/index.md
@@ -180,15 +180,15 @@ This screen shows the recently stored order ID number and buttons to **Continue
 [`guest-carts/<cartid>`]: https://devdocs.magento.com/redoc/2.3/guest-rest-api.html#tag/guest-cartscartId
 [`guest-carts/<cartid>/totals`]: https://devdocs.magento.com/redoc/2.3/guest-rest-api.html#tag/guest-cartscartIdtotals
 [`guest-carts/<cartid>/estimate-shipping-methods`]: https://devdocs.magento.com/redoc/2.3/guest-rest-api.html#tag/guest-cartscartIdestimate-shipping-methods
-[src/actions/cart/asyncactions.js]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/src/actions/cart/asyncActions.js
-[src/actions/app/asyncactions.js]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/src/actions/app/asyncActions.js
-[src/actions/checkout/asyncactions.js]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/src/actions/checkout/asyncActions.js
-[src/components/checkout/flow.js]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/src/components/Checkout/flow.js
-[src/actions/directory/asyncactions.js]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/src/actions/directory/asyncActions.js
+[src/actions/cart/asyncactions.js]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/src/actions/cart/asyncActions.js
+[src/actions/app/asyncactions.js]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/src/actions/app/asyncActions.js
+[src/actions/checkout/asyncactions.js]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/src/actions/checkout/asyncActions.js
+[src/components/checkout/flow.js]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/src/components/Checkout/flow.js
+[src/actions/directory/asyncactions.js]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/src/actions/directory/asyncActions.js
 [`guest-carts/<cartid>/estimate-shipping-methods`]: https://devdocs.magento.com/redoc/2.3/guest-rest-api.html#tag/guest-cartscartIdestimate-shipping-methods
 [`directory/countries`]: https://devdocs.magento.com/redoc/2.3/guest-rest-api.html#tag/directorycountries
-[src/components/checkout/form.js]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/src/components/Checkout/form.js
+[src/components/checkout/form.js]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/src/components/Checkout/form.js
 [`guest-carts/<cartid>/shipping-information`]: https://devdocs.magento.com/redoc/2.3/guest-rest-api.html#tag/guest-cartscartIdshipping-information
-[src/reducers/checkout.js]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/src/reducers/checkout.js
+[src/reducers/checkout.js]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/src/reducers/checkout.js
 [`guest-carts/<cartid>/payment-information`]: https://devdocs.magento.com/redoc/2.3/guest-rest-api.html#tag/guest-cartscartIdpayment-information
-[src/components/checkout/receipt/receipt.js]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/src/components/Checkout/Receipt/receipt.js
+[src/components/checkout/receipt/receipt.js]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/src/components/Checkout/Receipt/receipt.js
diff --git a/pwa-devdocs/src/venia-pwa-concept/features/modular-components/index.md b/pwa-devdocs/src/venia-pwa-concept/features/modular-components/index.md
index daafdc464d..954ef244b5 100644
--- a/pwa-devdocs/src/venia-pwa-concept/features/modular-components/index.md
+++ b/pwa-devdocs/src/venia-pwa-concept/features/modular-components/index.md
@@ -173,12 +173,12 @@ See the [venia-consumer-example][] project to see how a non-Venia application ca
 [venia-consumer-example]: https://github.com/magento-research/venia-consumer-example
 [es modules]: https://hacks.mozilla.org/2018/03/es-modules-a-cartoon-deep-dive/
 [webpack optimization]: https://webpack.js.org/guides/tree-shaking/
-[loadingindicator]: https://github.com/magento-research/pwa-studio/tree/master/packages/venia-concept/src/components/LoadingIndicator
-[richtext]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/src/components/RichText
-[venia adapter]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/src/drivers/adapter.js
-[productfulldetail]: https://github.com/magento-research/pwa-studio/tree/master/packages/venia-concept/src/components/ProductFullDetail
-[categorylist]: https://github.com/magento-research/pwa-studio/tree/master/packages/venia-concept/src/components/CategoryList
-[`src/drivers`]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/src/drivers/index.js
+[loadingindicator]: https://github.com/magento/pwa-studio/tree/master/packages/venia-concept/src/components/LoadingIndicator
+[richtext]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/src/components/RichText
+[venia adapter]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/src/drivers/adapter.js
+[productfulldetail]: https://github.com/magento/pwa-studio/tree/master/packages/venia-concept/src/components/ProductFullDetail
+[categorylist]: https://github.com/magento/pwa-studio/tree/master/packages/venia-concept/src/components/CategoryList
+[`src/drivers`]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/src/drivers/index.js
 [apollo]: https://www.apollographql.com/docs/react/
 [react redux]: https://react-redux.js.org/
 [redux store]: https://redux.js.org/api/store
@@ -186,5 +186,5 @@ See the [venia-consumer-example][] project to see how a non-Venia application ca
 [apollo client]: https://www.apollographql.com/docs/react/essentials/get-started.html#creating-client
 [webpack]: https://webpack.js.org/
 [rollup]: https://rollupjs.org/guide/en
-[`makeurl.js`]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/src/util/makeUrl.js
-[`adapter.js`]: https://github.com/magento-research/pwa-studio/blob/a40c4a7b9c5e7161e4e1534eb90e511d6559e36b/packages/venia-concept/src/drivers/adapter.js
+[`makeurl.js`]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/src/util/makeUrl.js
+[`adapter.js`]: https://github.com/magento/pwa-studio/blob/a40c4a7b9c5e7161e4e1534eb90e511d6559e36b/packages/venia-concept/src/drivers/adapter.js
diff --git a/pwa-devdocs/src/venia-pwa-concept/index.md b/pwa-devdocs/src/venia-pwa-concept/index.md
index 0c1ccbe0c0..ee9176ac3e 100644
--- a/pwa-devdocs/src/venia-pwa-concept/index.md
+++ b/pwa-devdocs/src/venia-pwa-concept/index.md
@@ -15,7 +15,7 @@ In its current state, the storefront contains examples for Product Details and C
 
 Visit the [`venia-pwa-concept`][] package in the PWA Studio repository to contribute to the development of this project.
 
-[`venia-pwa-concept`]: https://github.com/magento-research/pwa-studio/tree/master/packages/venia-concept
+[`venia-pwa-concept`]: https://github.com/magento/pwa-studio/tree/master/packages/venia-concept
 [PWA Buildpack]: {{ site.baseurl }}{% link pwa-buildpack/index.md %}
 [Peregrine]: {{ site.baseurl }}{% link peregrine/index.md %}
 
diff --git a/pwa-devdocs/src/venia-pwa-concept/install-sample-data/index.md b/pwa-devdocs/src/venia-pwa-concept/install-sample-data/index.md
index afaece1bd9..5a2a27d599 100644
--- a/pwa-devdocs/src/venia-pwa-concept/install-sample-data/index.md
+++ b/pwa-devdocs/src/venia-pwa-concept/install-sample-data/index.md
@@ -61,4 +61,4 @@ Log into the Admin section or visit the store of your Magento instance to verify
 ![Sample data installed in Magento](images/sample-data-installed.png)
 
 [remove the sample data modules]: https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-sample-data-other.html#inst-sample-remove
-[PWA Studio]: https://github.com/magento-research/pwa-studio
+[PWA Studio]: https://github.com/magento/pwa-studio
diff --git a/pwa-devdocs/src/venia-pwa-concept/project-structure/index.md b/pwa-devdocs/src/venia-pwa-concept/project-structure/index.md
index 5cbf30423c..a0faab63f4 100644
--- a/pwa-devdocs/src/venia-pwa-concept/project-structure/index.md
+++ b/pwa-devdocs/src/venia-pwa-concept/project-structure/index.md
@@ -142,7 +142,7 @@ The `src/sw.js` file contains the service worker configuration.
 
 
 [Magento theme structure]: https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/themes/theme-structure.html
-[UPWARD]: https://github.com/magento-research/pwa-studio/tree/master/packages/upward-spec
+[UPWARD]: https://github.com/magento/pwa-studio/tree/master/packages/upward-spec
 [Webpack]: https://webpack.js.org/
 [Install Venia sample data]: {{ site.baseurl }}{% link venia-pwa-concept/install-sample-data/index.md %}
 [Venia setup]: {{ site.baseurl }}{% link venia-pwa-concept/setup/index.md %}
@@ -159,11 +159,11 @@ The `src/sw.js` file contains the service worker configuration.
 [Redux middleware pattern]: https://redux.js.org/advanced/middleware
 [UPWARD server specification]: {{site.baseurl}}{%link technologies/upward/index.md %}
 [mustache]: https://mustache.github.io/
-[`deployVeniaSampleData.sh`]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/deployVeniaSampleData.sh
-[`server.js`]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/server.js
-[`venia-concept`]: https://github.com/magento-research/pwa-studio/tree/master/packages/venia-concept
-[`upward.yml`]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/upward.yml
-[`templates`]: https://github.com/magento-research/pwa-studio/tree/master/packages/venia-concept/templates
-[`static`]: https://github.com/magento-research/pwa-studio/tree/master/packages/venia-concept/static
-[`src`]: https://github.com/magento-research/pwa-studio/tree/master/packages/venia-concept/src
-[`webpack.config.js`]: https://github.com/magento-research/pwa-studio/blob/master/packages/venia-concept/webpack.config.js
+[`deployVeniaSampleData.sh`]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/deployVeniaSampleData.sh
+[`server.js`]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/server.js
+[`venia-concept`]: https://github.com/magento/pwa-studio/tree/master/packages/venia-concept
+[`upward.yml`]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/upward.yml
+[`templates`]: https://github.com/magento/pwa-studio/tree/master/packages/venia-concept/templates
+[`static`]: https://github.com/magento/pwa-studio/tree/master/packages/venia-concept/static
+[`src`]: https://github.com/magento/pwa-studio/tree/master/packages/venia-concept/src
+[`webpack.config.js`]: https://github.com/magento/pwa-studio/blob/master/packages/venia-concept/webpack.config.js
diff --git a/pwa-devdocs/src/venia-pwa-concept/setup/index.md b/pwa-devdocs/src/venia-pwa-concept/setup/index.md
index 8946069513..e7af3cb3d7 100644
--- a/pwa-devdocs/src/venia-pwa-concept/setup/index.md
+++ b/pwa-devdocs/src/venia-pwa-concept/setup/index.md
@@ -22,7 +22,7 @@ If you experience problems with the project setup, see [Troubleshooting][] in th
 Clone the [PWA Studio][] repository into your development environment.
 
 ``` sh
-git clone https://github.com/magento-research/pwa-studio.git
+git clone https://github.com/magento/pwa-studio.git
 ```
 
 ## Step 2. Install PWA Studio dependencies
@@ -140,8 +140,8 @@ Congratulations! You have set up your development environment for the Venia stor
 [venia sample data]: {{site.baseurl}}{% link venia-pwa-concept/install-sample-data/index.md %}
 [troubleshooting]: {{ site.baseurl }}{% link pwa-buildpack/troubleshooting/index.md %}
 
-[venia pwa concept storefront]: https://github.com/magento-research/pwa-studio/tree/master/packages/venia-concept
+[venia pwa concept storefront]: https://github.com/magento/pwa-studio/tree/master/packages/venia-concept
 [vagrant box for magento 2 developers]: https://github.com/paliarush/magento2-vagrant-for-developers
-[pwa studio]: https://github.com/magento-research/pwa-studio
+[pwa studio]: https://github.com/magento/pwa-studio
 [local development instance]: https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html
 [valet-plus]: https://github.com/weprovide/valet-plus