diff --git a/.github/disabled-workflows/swift-format.yml b/.github/disabled-workflows/swift-format.yml
index b828c6b7a..1f7a6d3a6 100644
--- a/.github/disabled-workflows/swift-format.yml
+++ b/.github/disabled-workflows/swift-format.yml
@@ -2,7 +2,7 @@ name: swift-format
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   swift-format:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 627b98cea..b4164733e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -57,7 +57,7 @@ make sure your changes are consistent with the guidelines.
 #### License
 
 Include a license at the top of new files.
-* [License example](https://github.com/tensorflow/swift-apis/blob/master/Sources/TensorFlow/Layer.swift)
+* [License example](https://github.com/tensorflow/swift-apis/blob/main/Sources/TensorFlow/Layer.swift)
 
 #### Swift coding style
 
diff --git a/Documentation/X10/API_GUIDE.md b/Documentation/X10/API_GUIDE.md
index 63c896316..c6cb5a09a 100644
--- a/Documentation/X10/API_GUIDE.md
+++ b/Documentation/X10/API_GUIDE.md
@@ -174,7 +174,7 @@ after the optimizer step explicitly synchronizes the CPU and the X10 device.
 The internal data representation of X10 tensors is opaque to the user. This
 allows XLA to control a tensor's memory layout for better performance.
 
-[x10_lib]: https://github.com/tensorflow/swift-apis/tree/master/Sources/x10
-[copying]: https://github.com/tensorflow/swift-apis/tree/master/Sources/TensorFlow/Core/CopyableToDevice.swift
-[training]: https://github.com/tensorflow/swift-apis/tree/master/Sources/x10/swift_bindings/training_loop.swift
-[low-level]: https://github.com/tensorflow/swift-apis/blob/master/Sources/TensorFlow/Core/MixedPrecision.swift
+[x10_lib]: https://github.com/tensorflow/swift-apis/tree/main/Sources/x10
+[copying]: https://github.com/tensorflow/swift-apis/tree/main/Sources/TensorFlow/Core/CopyableToDevice.swift
+[training]: https://github.com/tensorflow/swift-apis/tree/main/Sources/x10/swift_bindings/training_loop.swift
+[low-level]: https://github.com/tensorflow/swift-apis/blob/main/Sources/TensorFlow/Core/MixedPrecision.swift
diff --git a/README.md b/README.md
index 95dc11e79..59cfb078c 100644
--- a/README.md
+++ b/README.md
@@ -194,10 +194,10 @@ participating.
 [s4tf]: https://github.com/tensorflow/swift
 [integrated]: https://github.com/apple/swift/tree/tensorflow#customize-tensorflow-support
 [blank_colab]: https://colab.research.google.com/notebook#create=true&language=swift
-[usage]: https://github.com/tensorflow/swift/blob/master/Usage.md
+[usage]: https://github.com/tensorflow/swift/blob/main/Usage.md
 [gradient]: https://www.tensorflow.org/swift/api_docs/Functions#/s:10TensorFlow8gradient2at2in13TangentVectorQzx_AA0A0Vyq_GxXEtAA14DifferentiableRzAA0aB13FloatingPointR_r0_lF
 [swift-models]: https://github.com/tensorflow/swift-models
-[toolchain]: https://github.com/tensorflow/swift/blob/master/Installation.md
+[toolchain]: https://github.com/tensorflow/swift/blob/main/Installation.md
 [bazel]: https://docs.bazel.build/versions/master/install.html
 [bazelisk]: https://github.com/bazelbuild/bazelisk
 [configure.py]: https://github.com/tensorflow/tensorflow/blob/master/configure.py
diff --git a/Sources/x10/xla_client/mesh_service.cc b/Sources/x10/xla_client/mesh_service.cc
index 1a7fef01c..8a7a0563d 100644
--- a/Sources/x10/xla_client/mesh_service.cc
+++ b/Sources/x10/xla_client/mesh_service.cc
@@ -265,12 +265,12 @@ MeshClient* MeshClient::Get() {
 MeshClient::MeshClient(const std::string& address) : impl_(new Impl(address)) {
   int64 connect_wait_seconds =
       sys_util::GetEnvInt("XRT_MESH_CONNECT_WAIT", 300);
-  TF_LOG(INFO) << "Waiting to connect to client mesh master ("
+  TF_LOG(INFO) << "Waiting to connect to client mesh ("
                << connect_wait_seconds << " seconds) " << address;
   XLA_CHECK(impl_->channel->WaitForConnected(
       std::chrono::system_clock::now() +
       std::chrono::seconds(connect_wait_seconds)))
-      << "Failed to connect to client mesh master: " << address;
+      << "Failed to connect to client mesh: " << address;
 }
 
 MeshClient::~MeshClient() {}
diff --git a/Sources/x10/xla_client/xrt_computation_client.cc b/Sources/x10/xla_client/xrt_computation_client.cc
index 3e9f96ecd..88e3975a5 100644
--- a/Sources/x10/xla_client/xrt_computation_client.cc
+++ b/Sources/x10/xla_client/xrt_computation_client.cc
@@ -1602,7 +1602,7 @@ void XrtComputationClient::InitializeDevices(
       auto it = options_.workers_map.find(worker);
       XLA_CHECK(it != options_.workers_map.end());
 
-      TF_VLOG(1) << "Configuring TPU for master worker " << worker.name << ":"
+      TF_VLOG(1) << "Configuring TPU for worker " << worker.name << ":"
                  << worker.task_no << " at " << it->second;
       tensorflow::tpu::TopologyProto worker_topology_proto =
           InitializeAndFetchTopology(worker.name, worker.task_no, it->second,