diff --git a/flake.nix b/flake.nix
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
         localOverlay
       ];
 
-      # Since we build for many systems (e.g. m1 mac, x86_64-linux), we create
+      # Since we build for many systems (e.g. ARM-based Mac, x86_64-linux), we create
       # a helper function to help facilitate instantiation of the related package set
       pkgsForSystem = system: import nixpkgs {
         inherit overlays system;
diff --git a/keyserver/bash/source-nvm.sh b/keyserver/bash/source-nvm.sh
--- a/keyserver/bash/source-nvm.sh
+++ b/keyserver/bash/source-nvm.sh
@@ -5,6 +5,6 @@
 
 unset PREFIX
 [ -s "/usr/local/opt/nvm/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh" # Intel Mac
-[ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && . "/opt/homebrew/opt/nvm/nvm.sh" # M1 Mac
+[ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && . "/opt/homebrew/opt/nvm/nvm.sh" # ARM-based Mac
 [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # Ubuntu
 nvm install --no-progress
diff --git a/keyserver/docker-compose.yml b/keyserver/docker-compose.yml
--- a/keyserver/docker-compose.yml
+++ b/keyserver/docker-compose.yml
@@ -28,8 +28,8 @@
     restart: always
     expose:
       - "3306"
-    # There is no M1 build on Docker Hub, so we force x64
-    # This is what we want in production anyways. M1 devs will have it emulated
+    # There is no ARM-based Mac build on Docker Hub, so we force x64
+    # This is what we want in production anyways. ARM-based Mac devs will have it emulated
     platform: linux/amd64
     command: >
       --max-allowed-packet=64M
diff --git a/native/ios/Podfile b/native/ios/Podfile
--- a/native/ios/Podfile
+++ b/native/ios/Podfile
@@ -57,7 +57,7 @@
   react_native_post_install(installer)
   __apply_Xcode_12_5_M1_post_install_workaround(installer)
 
-  # Excluding arm64 because M1 simulator isn't supported yet
+  # Excluding arm64 because ARM-based Mac simulator isn't supported yet
   # Excluding 32-bit x86 because nobody uses it and it causes compilation issues
   installer.pods_project.build_configurations.each do |config|
     config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64 i386"