diff --git a/Q-and-A.md b/Q-and-A.md
index 48ff1631b..d9f25d795 100644
--- a/Q-and-A.md
+++ b/Q-and-A.md
@@ -41,7 +41,7 @@ The general case runtime editing of geometry on a building, vector data, etc., a
#### Will 3D Tiles include terrain?
-Yes, a [quantized-mesh](https://github.com/CesiumGS/quantized-mesh/blob/master/README.md)-like tile would fit well with 3D Tiles and allow engines to use the same streaming code (we say _quantized-mesh-like_ because some of the metadata, e.g., for bounding volumes and horizon culling, may be organized differently or moved to the tileset JSON).
+Yes, a [quantized-mesh](https://github.com/CesiumGS/quantized-mesh/blob/main/README.md)-like tile would fit well with 3D Tiles and allow engines to use the same streaming code (we say _quantized-mesh-like_ because some of the metadata, e.g., for bounding volumes and horizon culling, may be organized differently or moved to the tileset JSON).
However, since quantized-mesh already streams terrain well, we are not focused on this in the short-term.
diff --git a/README.md b/README.md
index f106f9775..1484186ec 100644
--- a/README.md
+++ b/README.md
@@ -40,8 +40,8 @@ Please provide spec feedback by [submitting issues](https://github.com/CesiumGS/
| :--- | :--- |
| [Cesium ion](https://cesium.com/ion/) | Sign up for an account to to upload and convert content to 3D Tiles. Supports:
- glTF (.gltf, .glb)
- CityGML (.citygml, .xml, .gml)
- KML/COLLADA (.kml, .kmz)
- LASer (.las, .laz)
- COLLADA (.dae)
- Wavefront OBJ (.obj)
|
| [CesiumJS](https://cesium.com/cesiumjs/) | Open source JavaScript runtime engine for visualizing 3D Tiles |
-| [3D Tiles Validator](https://github.com/CesiumGS/3d-tiles-validator/tree/master/validator) | Open source Node.js library and command-line tools for validating 3D Tiles |
-| [3D Tiles Samples](https://github.com/CesiumGS/3d-tiles-validator/tree/master/samples-generator) | Open source command-line tools for generating sample 3D Tiles |
+| [3D Tiles Validator](https://github.com/CesiumGS/3d-tiles-validator/tree/main/validator) | Open source Node.js library and command-line tools for validating 3D Tiles |
+| [3D Tiles Samples](https://github.com/CesiumGS/3d-tiles-validator/tree/main/samples-generator) | Open source command-line tools for generating sample 3D Tiles |
| [Safe FME](https://hub.safe.com/packages/safe/cesiumion) | Desktop application for transforming data. The `CesiumIonConnector` converts data to 3D Tiles via Cesium ion. |
| [Bentley ContextCapture](https://www.bentley.com/en/products/product-line/reality-modeling-software/contextcapture) | Desktop application for converting photographs and/or point clouds to 3D Tiles. |
diff --git a/extensions/3DTILES_draco_point_compression/README.md b/extensions/3DTILES_draco_point_compression/README.md
index 2a0e80956..5855f27db 100644
--- a/extensions/3DTILES_draco_point_compression/README.md
+++ b/extensions/3DTILES_draco_point_compression/README.md
@@ -142,7 +142,7 @@ case `POINT_CLOUD_SEQUENTIAL_ENCODING` should not be applied.
_This section is non-normative._
* [Draco Open Source Library](https://github.com/google/draco)
-* [Cesium Draco Decoder Implementation](https://github.com/CesiumGS/cesium/blob/master/Source/Workers/decodeDraco.js)
+* [Cesium Draco Decoder Implementation](https://github.com/CesiumGS/cesium/blob/main/Source/Workers/decodeDraco.js)
## Property reference
diff --git a/overview/3d-tiles-overview-page0023.svg b/overview/3d-tiles-overview-page0023.svg
index 768da2259..a99f8d804 100644
--- a/overview/3d-tiles-overview-page0023.svg
+++ b/overview/3d-tiles-overview-page0023.svg
@@ -19162,7 +19162,7 @@
x="54.617188"
y="871.35199"
style="font-size:8.75px;fill:#0000ff"
- id="tspan15519-4-8-9">https://github.com/CesiumGS/3d-tiles/blob/master/specification/TileFormats/Instanced3DModel/README.md#quantized-positionshttps://github.com/CesiumGS/3d-tiles/blob/main/specification/TileFormats/Instanced3DModel/README.md#quantized-positionshttps://github.com/CesiumGS/3d-tiles/blob/master/specification/TileFormats/PointCloud/README.md#oct-encoded-normal-vectorshttps://github.com/CesiumGS/3d-tiles/blob/main/specification/TileFormats/PointCloud/README.md#oct-encoded-normal-vectorshttps://github.com/CesiumGS/3d-tiles/tree/master/specification#transforms
+ style="font-size:10px;fill:#0000ff;fill-opacity:1">https://github.com/CesiumGS/3d-tiles/tree/main/specification#transforms
An implementation for encoding and decoding these unit vectors can be found in CesiumJS's [AttributeCompression](https://github.com/CesiumGS/cesium/blob/master/Source/Core/AttributeCompression.js)
+> An implementation for encoding and decoding these unit vectors can be found in CesiumJS's [AttributeCompression](https://github.com/CesiumGS/cesium/blob/main/Source/Core/AttributeCompression.js)
module.
#### Default orientation
diff --git a/specification/TileFormats/PointCloud/README.md b/specification/TileFormats/PointCloud/README.md
index 21ff4190a..5ab3d3654 100644
--- a/specification/TileFormats/PointCloud/README.md
+++ b/specification/TileFormats/PointCloud/README.md
@@ -153,7 +153,7 @@ The normals will be transformed using the inverse transpose of the tileset trans
Oct-encoding is described in [*A Survey of Efficient Representations of Independent Unit Vectors*](http://jcgt.org/published/0003/02/01/). Oct-encoded values are stored in unsigned, unnormalized range (`[0, 255]`) and then mapped to a signed normalized range (`[-1.0, 1.0]`) at runtime.
-> An implementation for encoding and decoding these unit vectors can be found in CesiumJS's [AttributeCompression](https://github.com/CesiumGS/cesium/blob/master/Source/Core/AttributeCompression.js)
+> An implementation for encoding and decoding these unit vectors can be found in CesiumJS's [AttributeCompression](https://github.com/CesiumGS/cesium/blob/main/Source/Core/AttributeCompression.js)
module.
### Batched points
@@ -343,7 +343,7 @@ An explicit file extension is optional. Valid implementations may ignore it and
_This section is non-normative_
-Code for reading the header can be found in [`PointCloud3DModelTileContent.js`](https://github.com/CesiumGS/cesium/blob/master/Source/Scene/PointCloud3DTileContent.js) in the CesiumJS implementation of 3D Tiles.
+Code for reading the header can be found in [`PointCloud3DModelTileContent.js`](https://github.com/CesiumGS/cesium/blob/main/Source/Scene/PointCloud3DTileContent.js) in the CesiumJS implementation of 3D Tiles.
## Property reference