diff --git a/.github/workflows/code_changes.yaml b/.github/workflows/code_changes.yaml
index 7b7bff328..7419d19a4 100644
--- a/.github/workflows/code_changes.yaml
+++ b/.github/workflows/code_changes.yaml
@@ -1,10 +1,10 @@
-# Workflow that runs on code changes to the master branch.
+# Workflow that runs on code changes to the main branch.
 
 name: Code changes
 on:
   push:
     branches:
-      - master
+      - main
 
     paths:
       - policyengine_uk/**
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 825c11188..8b5534e48 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -5,7 +5,7 @@ name: Deploy documentation
 on:
   push:
     # Runs on pushes targeting the default branch
-    branches: [master]
+    branches: [main]
 env:
   # `BASE_URL` determines, relative to the root of the domain, the URL that your site is served from.
   # E.g., if your site lives at `https://mydomain.org/myproject`, set `BASE_URL=/myproject`.
diff --git a/.github/workflows/pr_code_changes.yaml b/.github/workflows/pr_code_changes.yaml
index ba99f4f9e..74783c875 100644
--- a/.github/workflows/pr_code_changes.yaml
+++ b/.github/workflows/pr_code_changes.yaml
@@ -4,7 +4,7 @@ name: Code changes
 on:
   pull_request:
     branches:
-      - master
+      - main
 
     paths:
       - policyengine_uk/**
diff --git a/.github/workflows/pr_docs_changes.yaml b/.github/workflows/pr_docs_changes.yaml
index 088d9f202..e769642ac 100644
--- a/.github/workflows/pr_docs_changes.yaml
+++ b/.github/workflows/pr_docs_changes.yaml
@@ -4,7 +4,7 @@ name: Docs changes
 on:
   pull_request:
     branches:
-      - master
+      - main
 
     paths:
       - docs/**
diff --git a/.github/workflows/versioning.yaml b/.github/workflows/versioning.yaml
index f92eedacf..570140730 100644
--- a/.github/workflows/versioning.yaml
+++ b/.github/workflows/versioning.yaml
@@ -1,10 +1,10 @@
 # Workflow that runs on versioning metadata updates.
 
-name: Versioning updates 
+name: Versioning updates
 on:
   push:
     branches:
-      - master
+      - main
 
     paths:
       - changelog_entry.yaml
diff --git a/policyengine_uk/microsimulation.py b/policyengine_uk/microsimulation.py
index beab95adc..66b57f720 100644
--- a/policyengine_uk/microsimulation.py
+++ b/policyengine_uk/microsimulation.py
@@ -3,7 +3,7 @@
 
 # Third-party imports
 import numpy as np
-from microdf import MicroDataFrame, MicroSeries 
+from microdf import MicroDataFrame, MicroSeries
 
 # PolicyEngine core imports
 from policyengine_core.tracers import SimpleTracer