diff --git a/.github/workflows/darkerbot.yaml b/.github/workflows/darkerbot.yaml
index 3f7d7169a0e..29a85c8cf1e 100644
--- a/.github/workflows/darkerbot.yaml
+++ b/.github/workflows/darkerbot.yaml
@@ -9,7 +9,7 @@ on:
 
 concurrency:
   # Probably overly cautious group naming.
-  # Commits to develop/master will cancel each other, but PRs will only cancel
+  # Commits to develop will cancel each other, but PRs will only cancel
   # commits within the same PR
   group: "${{ github.ref }}-${{ github.head_ref }}-${{ github.workflow }}"
   cancel-in-progress: true
diff --git a/.github/workflows/gh-ci-cron.yaml b/.github/workflows/gh-ci-cron.yaml
index 635c9ec6bf7..12b409f012d 100644
--- a/.github/workflows/gh-ci-cron.yaml
+++ b/.github/workflows/gh-ci-cron.yaml
@@ -6,7 +6,7 @@ on:
 
 concurrency:
   # Probably overly cautious group naming.
-  # Commits to develop/master will cancel each other, but PRs will only cancel
+  # Commits to develop will cancel each other, but PRs will only cancel
   # commits within the same PR
   group: "${{ github.ref }}-${{ github.head_ref }}-${{ github.workflow }}"
   cancel-in-progress: true
diff --git a/.github/workflows/gh-ci.yaml b/.github/workflows/gh-ci.yaml
index e00ae7fa9f1..0154eda65a2 100644
--- a/.github/workflows/gh-ci.yaml
+++ b/.github/workflows/gh-ci.yaml
@@ -9,7 +9,7 @@ on:
 
 concurrency:
   # Probably overly cautious group naming.
-  # Commits to develop/master will cancel each other, but PRs will only cancel
+  # Commits to develop will cancel each other, but PRs will only cancel
   # commits within the same PR
   group: "${{ github.ref }}-${{ github.head_ref }}-${{ github.workflow }}"
   cancel-in-progress: true
diff --git a/.github/workflows/linters.yaml b/.github/workflows/linters.yaml
index dbd16b1d099..1cf11feefcd 100644
--- a/.github/workflows/linters.yaml
+++ b/.github/workflows/linters.yaml
@@ -6,7 +6,7 @@ on:
 
 concurrency:
   # Probably overly cautious group naming.
-  # Commits to develop/master will cancel each other, but PRs will only cancel
+  # Commits to develop will cancel each other, but PRs will only cancel
   # commits within the same PR
   group: "${{ github.ref }}-${{ github.head_ref }}-${{ github.workflow }}"
   cancel-in-progress: true
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index e4b48cc8558..d80e9f485b9 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -157,7 +157,7 @@ the
 [*Django*](https://www.djangoproject.com/conduct),
 [*Contributor Covenant*](http://contributor-covenant.org/),
 and
-[*Jupyter*](https://github.com/jupyter/governance/blob/master/conduct/code_of_conduct.md) projects,
+[*Jupyter*](https://github.com/jupyter/governance/blob/main/conduct/code_of_conduct.md) projects,
 modified by MDAnalysis. We are grateful to those projects for contributing these
 materials under open licensing terms for us to easily reuse.
 
diff --git a/README.rst b/README.rst
index faf36d1c463..3255cdecbcb 100644
--- a/README.rst
+++ b/README.rst
@@ -123,7 +123,7 @@ For citations of included algorithms and sub-modules please see the references_.
 .. _topology formats: https://docs.mdanalysis.org/documentation_pages/topology/init.html#supported-topology-formats
 .. _MDAnalysis: https://www.mdanalysis.org
 .. _LICENSE:
-   https://github.com/MDAnalysis/mdanalysis/blob/master/LICENSE
+   https://github.com/MDAnalysis/mdanalysis/blob/develop/LICENSE
 .. _`Installation Quick Start`:
    https://www.mdanalysis.org/pages/installation_quick_start/
 .. _`MDAnalysis.analysis`: https://docs.mdanalysis.org/documentation_pages/analysis_modules.html
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 3931206ad43..2dfecbcf107 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,7 +16,7 @@ pr:
 
 jobs:
 - job: Azure_Tests
-  condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/master'))  # skip for PR merges
+  condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/develop'))  # skip for PR merges
   variables:
     MPLBACKEND: agg
   strategy:
diff --git a/benchmarks/README.rst b/benchmarks/README.rst
index e54914e7977..75a51ffe7c3 100644
--- a/benchmarks/README.rst
+++ b/benchmarks/README.rst
@@ -13,7 +13,7 @@ time points in its history (for different git commit
 hashes).
 
 To build / install Airspeed Velocity it should
-suffice to clone the `git repo`_, building the master
+suffice to clone the `git repo`_, building the develop
 branch with::
 
     python setup.py install --user