diff --git a/.github/workflows/update-master-after-main.yml b/.github/workflows/update-master-after-main.yml
index 26bba72a7c..c0d6a7d21e 100644
--- a/.github/workflows/update-master-after-main.yml
+++ b/.github/workflows/update-master-after-main.yml
@@ -1,4 +1,4 @@
-name: Updates the master branch after main
+name: Updates the main branch after main
 on:
   push:
     branches:
@@ -14,4 +14,4 @@ jobs:
           fetch-depth: 0
       - name: Push
         run: |
-          git push origin HEAD:master
+          git push origin HEAD:main
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cc016a3129..73db2cf73c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -250,10 +250,10 @@ function Test262Error(message) {
 
 ## Rules For Module `_FIXTURE.js` Files
 
-The [Module section of INTERPRETING.md](https://github.com/tc39/test262/blob/master/INTERPRETING.md#modules) states that `_FIXTURE.js` files will not have have Realm modifications applied. In practice, this means that code in `_FIXTURE.js` files must abide by the following rules: 
+The [Module section of INTERPRETING.md](https://github.com/tc39/test262/blob/HEAD/INTERPRETING.md#modules) states that `_FIXTURE.js` files will not have have Realm modifications applied. In practice, this means that code in `_FIXTURE.js` files must abide by the following rules: 
 
-- **MUST NOT** refer to, or make use of any [Test262-Defined Bindings](https://github.com/tc39/test262/blob/master/INTERPRETING.md#test262-defined-bindings) in any way. 
-- **MUST NOT** refer to, or make use of any [Host-Defined Functions](https://github.com/tc39/test262/blob/master/INTERPRETING.md#host-defined-functions) in any way. 
+- **MUST NOT** refer to, or make use of any [Test262-Defined Bindings](https://github.com/tc39/test262/blob/HEAD/INTERPRETING.md#test262-defined-bindings) in any way. 
+- **MUST NOT** refer to, or make use of any [Host-Defined Functions](https://github.com/tc39/test262/blob/HEAD/INTERPRETING.md#host-defined-functions) in any way. 
 
 ## Handling Errors and Negative Test Cases
 
diff --git a/INTERPRETING.md b/INTERPRETING.md
index ea32896ef8..e92be00691 100644
--- a/INTERPRETING.md
+++ b/INTERPRETING.md
@@ -107,7 +107,7 @@ properties of the global scope prior to test execution.
         sleeps the execution for approximately that duration.
     - **`monotonicNow`** - a function that returns a value that conforms to [`DOMHighResTimeStamp`][] and is produced in such a way that its semantics conform to **[Monotonic Clock][]**.
 
-In addition, consumers may choose to override any of the [the available test harness helper functions](https://github.com/tc39/test262/blob/master/CONTRIBUTING.md#test-environment) as they see fit. See [the documentation on handling errors and negative test cases](https://github.com/tc39/test262/blob/master/CONTRIBUTING.md#handling-errors-and-negative-test-cases) for a useful example of this.
+In addition, consumers may choose to override any of the [the available test harness helper functions](https://github.com/tc39/test262/blob/HEAD/CONTRIBUTING.md#test-environment) as they see fit. See [the documentation on handling errors and negative test cases](https://github.com/tc39/test262/blob/HEAD/CONTRIBUTING.md#handling-errors-and-negative-test-cases) for a useful example of this.
 
 
 #### Normative references
@@ -138,7 +138,7 @@ This must precede any additional text modifications described by test metadata.
 ### Modules
 
 Test262 includes tests for ECMAScript 2015 module code, denoted by the "module"
-metadata flag. Files bearing a name ending in `_FIXTURE.js` **MUST NOT** be interpreted as standalone tests; they are intended to be referenced by test files. Realm modifications, including [Test262-Defined Bindings](#test262-defined-bindings) and [Host-Defined Functions](#host-defined-functions), are not applied to code executed from `_FIXTURE.js` files. See the [**Rules For Module `_FIXTURE.js` Files** section of CONTRIBUTING.md](https://github.com/tc39/test262/blob/master/CONTRIBUTING.md#rules-for-module-fixturejs-files) for more information.
+metadata flag. Files bearing a name ending in `_FIXTURE.js` **MUST NOT** be interpreted as standalone tests; they are intended to be referenced by test files. Realm modifications, including [Test262-Defined Bindings](#test262-defined-bindings) and [Host-Defined Functions](#host-defined-functions), are not applied to code executed from `_FIXTURE.js` files. See the [**Rules For Module `_FIXTURE.js` Files** section of CONTRIBUTING.md](https://github.com/tc39/test262/blob/HEAD/CONTRIBUTING.md#rules-for-module-fixturejs-files) for more information.
 
 All module specifiers used by Test262 begin with the character sequence `./`.
 The remaining characters should be interpreted as the name of a file within the
diff --git a/harness/atomicsHelper.js b/harness/atomicsHelper.js
index e94fac68fe..1dbff5d4a8 100644
--- a/harness/atomicsHelper.js
+++ b/harness/atomicsHelper.js
@@ -82,12 +82,12 @@ defines:
  * meet its termination condition and the test will hang indefinitely.
  *
  * Because we've defined $262.agent.broadcast(SAB) in
- * https://github.com/tc39/test262/blob/master/INTERPRETING.md, there are host implementations
+ * https://github.com/tc39/test262/blob/HEAD/INTERPRETING.md, there are host implementations
  * that assume compatibility, which must be maintained.
  *
  *
  * $262.agent.safeBroadcast(TA) should not be included in
- * https://github.com/tc39/test262/blob/master/INTERPRETING.md
+ * https://github.com/tc39/test262/blob/HEAD/INTERPRETING.md
  *
  *
  * @param {(Int32Array|BigInt64Array)} typedArray An Int32Array or BigInt64Array with a SharedArrayBuffer
diff --git a/make.py b/make.py
index 9cf8733d21..55cca1672a 100755
--- a/make.py
+++ b/make.py
@@ -53,7 +53,7 @@ def clean():
 def deploy():
     shell('git', 'add', '--all', OUT_DIR)
     shell('git', 'commit', '--message', '"Re-build from source"')
-    shell('git', 'push', UPSTREAM, 'master')
+    shell('git', 'push', UPSTREAM, 'main')
     shell('git', 'checkout', '-')
 
 # Generate a deploy key for use in a continuous integration system, allowing
diff --git a/package.json b/package.json
index e9524cd3ad..aeaec0e8dd 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "scripts": {
     "ci": "./tools/scripts/ci_test.sh",
     "test": "test262-harness",
-    "diff": "git diff --diff-filter ACMR --name-only master.. -- test/ && git ls-files --exclude-standard --others -- test/",
+    "diff": "git diff --diff-filter ACMR --name-only main.. -- test/ && git ls-files --exclude-standard --others -- test/",
     "test:diff": "npm run test:diff:v8 && npm run test:diff:spidermonkey && npm run test:diff:chakra && npm run test:diff:javascriptcore",
     "test:diff:v8": "test262-harness -t 8 --hostType=d8 --hostPath=v8 $(npm run --silent diff)",
     "test:diff:spidermonkey": "test262-harness -t 8 --hostType=jsshell --hostPath=spidermonkey $(npm run --silent diff)",
diff --git a/test/built-ins/Array/prototype/concat/S15.4.4.4_A3_T2.js b/test/built-ins/Array/prototype/concat/S15.4.4.4_A3_T2.js
index 8434102963..c277c23e90 100644
--- a/test/built-ins/Array/prototype/concat/S15.4.4.4_A3_T2.js
+++ b/test/built-ins/Array/prototype/concat/S15.4.4.4_A3_T2.js
@@ -1,5 +1,5 @@
 // Copyright (c) 2014 Ecma International.  All rights reserved.
-// See LICENSE or https://github.com/tc39/test262/blob/master/LICENSE
+// See LICENSE or https://github.com/tc39/test262/blob/HEAD/LICENSE
 
 /*---
 esid: sec-array.prototype.concat
diff --git a/test/built-ins/Array/prototype/concat/S15.4.4.4_A3_T3.js b/test/built-ins/Array/prototype/concat/S15.4.4.4_A3_T3.js
index e1eacc545e..31fc057b95 100644
--- a/test/built-ins/Array/prototype/concat/S15.4.4.4_A3_T3.js
+++ b/test/built-ins/Array/prototype/concat/S15.4.4.4_A3_T3.js
@@ -1,5 +1,5 @@
 // Copyright (c) 2014 Ecma International.  All rights reserved.
-// See LICENSE or https://github.com/tc39/test262/blob/master/LICENSE
+// See LICENSE or https://github.com/tc39/test262/blob/HEAD/LICENSE
 
 /*---
 esid: sec-array.prototype.concat
diff --git a/tools/lint/lib/checks/license.py b/tools/lint/lib/checks/license.py
index 12952d1479..e0568a8596 100644
--- a/tools/lint/lib/checks/license.py
+++ b/tools/lint/lib/checks/license.py
@@ -15,7 +15,7 @@ _LICENSE_PATTERN = re.compile(
         r'// Use of this source code is governed by a BSD-style license that can be[\r\n]{1,2}' +
         r'// found in the LICENSE file\.' +
         r'|' +
-        r'// See LICENSE or https://github\.com/tc39/test262/blob/master/LICENSE' +
+        r'// See LICENSE or https://github\.com/tc39/test262/blob/main/LICENSE' +
     r')', re.IGNORECASE)
 
 class CheckLicense(Check):
diff --git a/tools/lint/test/fixtures/license_alternate_5.js b/tools/lint/test/fixtures/license_alternate_5.js
index 27605c3203..928f709e77 100644
--- a/tools/lint/test/fixtures/license_alternate_5.js
+++ b/tools/lint/test/fixtures/license_alternate_5.js
@@ -1,6 +1,6 @@
 ^ expected errors | v input
 // Copyright (C) 2017 Mike Pennisi. All rights reserved.
-// See LICENSE or https://github.com/tc39/test262/blob/master/LICENSE
+// See LICENSE or https://github.com/tc39/test262/blob/HEAD/LICENSE
 /*---
 esid: sec-assignment-operators-static-semantics-early-errors
 description: Minimal test
diff --git a/tools/packaging/parseTestRecord.py b/tools/packaging/parseTestRecord.py
index 28a171edbc..f24df0300d 100644
--- a/tools/packaging/parseTestRecord.py
+++ b/tools/packaging/parseTestRecord.py
@@ -26,7 +26,7 @@ _LICENSE_PATTERN = re.compile(
        r'// Use of this source code is governed by a BSD-style license that can be[\r\n]{1,2}' +
        r'// found in the LICENSE file\.' +
        r'|' +
-       r'// See LICENSE or https://github\.com/tc39/test262/blob/master/LICENSE' +
+       r'// See LICENSE or https://github\.com/tc39/test262/blob/main/LICENSE' +
    r')[\r\n]{1,2}' + _BLANK_LINES, re.IGNORECASE)
 
 yamlLoad = None
diff --git a/tools/scripts/ci_build.sh b/tools/scripts/ci_build.sh
index 0aed47a6e1..4273fb9efa 100755
--- a/tools/scripts/ci_build.sh
+++ b/tools/scripts/ci_build.sh
@@ -6,6 +6,6 @@ fi
 if [ -n "$(git status --porcelain)" -a "$CIRCLE_PULL_REQUEST" != "" ]; then
   echo New changes were found after re-generating the tests.
   echo Please, read the documentation on procedurally generated tests
-  echo 'https://github.com/tc39/test262/blob/master/CONTRIBUTING.md#procedurally-generated-tests'
+  echo 'https://github.com/tc39/test262/blob/HEAD/CONTRIBUTING.md#procedurally-generated-tests'
   exit 1
 fi
diff --git a/tools/scripts/ci_lint.sh b/tools/scripts/ci_lint.sh
index c7e765bf19..bb5ec54539 100755
--- a/tools/scripts/ci_lint.sh
+++ b/tools/scripts/ci_lint.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ "$CIRCLE_PULL_REQUEST" != "" ]; then
-  paths=$(git diff --diff-filter ACMR --name-only origin/master.. -- test/)
+  paths=$(git diff --diff-filter ACMR --name-only origin/main.. -- test/)
 
   if [ "$paths" == "" ]; then
     echo No test files added or modified. Exiting.
diff --git a/tools/scripts/ci_test.sh b/tools/scripts/ci_test.sh
index 43e52977e1..687280d450 100755
--- a/tools/scripts/ci_test.sh
+++ b/tools/scripts/ci_test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ "$CIRCLE_PULL_REQUEST" != "" ]; then
-  paths=$(git diff --diff-filter ACMR --name-only origin/master.. -- test/)
+  paths=$(git diff --diff-filter ACMR --name-only origin/main.. -- test/)
 
   if [ "$paths" == "" ]; then
     echo No test files added or modified. Exiting.
diff --git a/tools/scripts/deploy.sh b/tools/scripts/deploy.sh
index 20f176c443..c6ebb9f255 100755
--- a/tools/scripts/deploy.sh
+++ b/tools/scripts/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
-if [ $CIRCLE_EVENT_TYPE != "push" -o $CIRCLE_BRANCH != "master" ]; then
-  echo This job is not running against a commit that has been merged to master.
+if [ $CIRCLE_EVENT_TYPE != "push" -o $CIRCLE_BRANCH != "main" ]; then
+  echo This job is not running against a commit that has been merged to main.
   echo Skipping deployment.
   exit 0
 fi
@@ -16,9 +16,9 @@ ssh-add github-deploy-key
 rm github-deploy-key
 git config --global user.email "test262@ecma-international.org"
 git config --global user.name "Test262 Automation Script"
-# The repository on TravisCI is a shallow clone, so the `master` branch must
+# The repository on TravisCI is a shallow clone, so the `main` branch must
 # be retrieved explicitly, and a local branch created from the `FETCH_HEAD`
 # git reference
-git fetch origin master
-git branch master FETCH_HEAD
+git fetch origin main
+git branch main FETCH_HEAD
 ./make.py deploy