diff --git a/README.md b/README.md
index dfe82289..8638b57e 100644
--- a/README.md
+++ b/README.md
@@ -259,7 +259,7 @@ Outputs files for visualisation of the tiles and as an list for [topo-imagery](h
 - `file-list.json` a list of source and target files to be used as an input for `topo-imagery`. Example: [file-list.json](docs/file-list.json)
 
 `--validate`
-Validate list of tiffs match a LINZ Mapsheet tile index and assert that there will be no duplicates. Example:
+Validate list of tiffs match a LINZ map sheet tile index and assert that there will be no duplicates. Example:
 
 ```bash
 tileindex-validate --validate --scale 5000 s3://linz-imagery/auckland/auckland_2010-2012_0.5m/rgb/2193/
diff --git a/src/commands/basemaps-mapsheet/__test__/create-mapsheet.test.ts b/src/commands/basemaps-mapsheet/__test__/create-mapsheet.test.ts
index 603a139e..72587337 100644
--- a/src/commands/basemaps-mapsheet/__test__/create-mapsheet.test.ts
+++ b/src/commands/basemaps-mapsheet/__test__/create-mapsheet.test.ts
@@ -123,7 +123,7 @@ describe('copyFiles', () => {
   mem.put(satellite);
   mem.put(southland);
 
-  it('Should create the correct mapsheets', async () => {
+  it('Should create the correct map sheets', async () => {
     const outputs = await createMapSheet(aerial, mem, rest, undefined, undefined);
 
     assert.deepEqual(outputs, [
diff --git a/src/commands/basemaps-mapsheet/create-mapsheet.ts b/src/commands/basemaps-mapsheet/create-mapsheet.ts
index 3c7793e1..928c81bf 100644
--- a/src/commands/basemaps-mapsheet/create-mapsheet.ts
+++ b/src/commands/basemaps-mapsheet/create-mapsheet.ts
@@ -51,7 +51,7 @@ export const CommandCreateMapSheetArgs = {
   output: option({
     type: string,
     long: 'output',
-    description: 'Output of the mapsheet file',
+    description: 'Output of the map sheet file',
   }),
   include: option({
     type: optional(string),
@@ -68,7 +68,7 @@ export const CommandCreateMapSheetArgs = {
 export const basemapsCreateMapSheet = command({
   name: 'bm-create-mapsheet',
   version: CliInfo.version,
-  description: 'Create a cog mapsheet from provided flatgeobuf',
+  description: 'Create a cog map sheet from provided flatgeobuf',
   args: CommandCreateMapSheetArgs,
   async handler(args) {
     registerCli(this, args);
diff --git a/src/commands/tileindex-validate/tileindex.validate.ts b/src/commands/tileindex-validate/tileindex.validate.ts
index 69db8d74..cf2690a4 100644
--- a/src/commands/tileindex-validate/tileindex.validate.ts
+++ b/src/commands/tileindex-validate/tileindex.validate.ts
@@ -58,7 +58,7 @@ export const TiffLoader = {
 };
 
 /**
- * Validate list of tiffs match a LINZ Mapsheet tile index
+ * Validate list of tiffs match a LINZ map sheet tile index
  *
  * If --validate
  * Asserts that there will be no duplicates
@@ -308,7 +308,7 @@ export async function extractTiffLocations(
         const tileName = getTileName(x, y, gridSize);
 
         // if (shouldValidate) {
-        //   // Is the tiff bounding box the same as the mapsheet bounding box!
+        //   // Is the tiff bounding box the same as the map sheet bounding box!
         //   // Also need to allow for ~1.5cm of error between bounding boxes.
         //   // assert bbox == MapSheet.getMapTileIndex(tileName).bbox
         // }
diff --git a/src/utils/mapsheet.ts b/src/utils/mapsheet.ts
index da4caf44..1295b809 100644
--- a/src/utils/mapsheet.ts
+++ b/src/utils/mapsheet.ts
@@ -1,4 +1,4 @@
-/** Parse topographic mapsheet names in the format `${mapSheet}_${gridSize}_${y}${x}` */
+/** Parse topographic map sheet names in the format `${mapSheet}_${gridSize}_${y}${x}` */
 const MapSheetRegex = /(?<sheetCode>[A-Z]{2}\d{2})(_(?<gridSize>\d+)_(?<tileId>\d+))?/;
 
 export interface MapTileIndex {
@@ -63,7 +63,7 @@ export type GridSize = (typeof gridSizes)[number];
 /**
  * Topographic 1:50k map sheet calculator
  *
- * Useful for working with LINZ's Topo 1:50k mapsheet names and any of the tile indexes
+ * Useful for working with LINZ's Topo 1:50k map sheet names and any of the tile indexes
  *
  * LINZ Topo50:
  * - https://www.linz.govt.nz/products-services/maps/new-zealand-topographic-maps/topo50-map-chooser/topo50-sheet-index
@@ -77,11 +77,11 @@ export type GridSize = (typeof gridSizes)[number];
  * - https://data.linz.govt.nz/layer/106965-nz-1500-tile-index/ 1:500
  **/
 export const MapSheet = {
-  /** Height of Topo 1:50k mapsheets (meters) */
+  /** Height of Topo 1:50k map sheets (meters) */
   height: 36_000,
-  /** Width of Topo 1:50k mapsheets (meters) */
+  /** Width of Topo 1:50k map sheets (meters) */
   width: 24_000,
-  /** Base scale Topo 1:50k mapsheets (meters) */
+  /** Base scale Topo 1:50k map sheets (meters) */
   scale: mapSheetTileGridSize,
   /** Map Sheets start at AS and end at CK */
   code: { start: 'AS', end: 'CK' },
@@ -93,7 +93,7 @@ export const MapSheet = {
   gridSizes: gridSizes,
 
   /**
-   * Get the expected origin and mapsheet information from a file name
+   * Get the expected origin and map sheet information from a file name
    *
    * @example
    * ```typescript