diff --git a/src/heightmap.cpp b/src/heightmap.cpp
index 462d8d15ea..543ef17952 100644
--- a/src/heightmap.cpp
+++ b/src/heightmap.cpp
@@ -58,10 +58,10 @@ static inline bool IsValidHeightmapDimension(size_t width, size_t height)
 }
 
 /**
- * Convert RGB colours to Grayscale using 29.9% Red, 58.7% Green, 11.4% Blue
+ * Convert RGB colours to Greyscale using 29.9% Red, 58.7% Green, 11.4% Blue
  *  (average luminosity formula, NTSC Colour Space)
  */
-static inline uint8_t RGBToGrayscale(uint8_t red, uint8_t green, uint8_t blue)
+static inline uint8_t RGBToGreyscale(uint8_t red, uint8_t green, uint8_t blue)
 {
 	/* To avoid doubles and stuff, multiply it with a total of 65536 (16bits), then
 	 *  divide by it to normalize the value to a byte again. */
@@ -84,7 +84,7 @@ static void ReadHeightmapPNGImageData(std::span<uint8_t> map, png_structp png_pt
 	bool has_palette = png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE;
 	uint channels = png_get_channels(png_ptr, info_ptr);
 
-	/* Get palette and convert it to grayscale */
+	/* Get palette and convert it to greyscale */
 	if (has_palette) {
 		int i;
 		int palette_size;
@@ -94,7 +94,7 @@ static void ReadHeightmapPNGImageData(std::span<uint8_t> map, png_structp png_pt
 		png_get_PLTE(png_ptr, info_ptr, &palette, &palette_size);
 		for (i = 0; i < palette_size && (palette_size != 16 || all_gray); i++) {
 			all_gray &= palette[i].red == palette[i].green && palette[i].red == palette[i].blue;
-			gray_palette[i] = RGBToGrayscale(palette[i].red, palette[i].green, palette[i].blue);
+			gray_palette[i] = RGBToGreyscale(palette[i].red, palette[i].green, palette[i].blue);
 		}
 
 		/**
@@ -112,7 +112,7 @@ static void ReadHeightmapPNGImageData(std::span<uint8_t> map, png_structp png_pt
 
 	row_pointers = png_get_rows(png_ptr, info_ptr);
 
-	/* Read the raw image data and convert in 8-bit grayscale */
+	/* Read the raw image data and convert in 8-bit greyscale */
 	for (x = 0; x < png_get_image_width(png_ptr, info_ptr); x++) {
 		for (y = 0; y < png_get_image_height(png_ptr, info_ptr); y++) {
 			uint8_t *pixel = &map[y * png_get_image_width(png_ptr, info_ptr) + x];
@@ -121,7 +121,7 @@ static void ReadHeightmapPNGImageData(std::span<uint8_t> map, png_structp png_pt
 			if (has_palette) {
 				*pixel = gray_palette[row_pointers[y][x_offset]];
 			} else if (channels == 3) {
-				*pixel = RGBToGrayscale(row_pointers[y][x_offset + 0],
+				*pixel = RGBToGreyscale(row_pointers[y][x_offset + 0],
 						row_pointers[y][x_offset + 1], row_pointers[y][x_offset + 2]);
 			} else {
 				*pixel = row_pointers[y][x_offset];
@@ -133,7 +133,7 @@ static void ReadHeightmapPNGImageData(std::span<uint8_t> map, png_structp png_pt
 /**
  * Reads the heightmap and/or size of the heightmap from a PNG file.
  * If map == nullptr only the size of the PNG is read, otherwise a map
- * with grayscale pixels is allocated and assigned to *map.
+ * with greyscale pixels is allocated and assigned to *map.
  */
 static bool ReadHeightmapPNG(std::string_view filename, uint *x, uint *y, std::vector<uint8_t> *map)
 {
@@ -162,7 +162,7 @@ static bool ReadHeightmapPNG(std::string_view filename, uint *x, uint *y, std::v
 	png_init_io(png_ptr, *fp);
 
 	/* Allocate memory and read image, without alpha or 16-bit samples
-	 * (result is either 8-bit indexed/grayscale or 24-bit RGB) */
+	 * (result is either 8-bit indexed/greyscale or 24-bit RGB) */
 	png_set_packing(png_ptr);
 	png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_PACKING | PNG_TRANSFORM_STRIP_ALPHA | PNG_TRANSFORM_STRIP_16, nullptr);
 
@@ -211,7 +211,7 @@ static void ReadHeightmapBMPImageData(std::span<uint8_t> map, const BmpInfo &inf
 		if (info.palette_size != 2) {
 			for (uint i = 0; i < info.palette_size && (info.palette_size != 16 || all_gray); i++) {
 				all_gray &= data.palette[i].r == data.palette[i].g && data.palette[i].r == data.palette[i].b;
-				gray_palette[i] = RGBToGrayscale(data.palette[i].r, data.palette[i].g, data.palette[i].b);
+				gray_palette[i] = RGBToGreyscale(data.palette[i].r, data.palette[i].g, data.palette[i].b);
 			}
 
 			/**
@@ -235,7 +235,7 @@ static void ReadHeightmapBMPImageData(std::span<uint8_t> map, const BmpInfo &inf
 		}
 	}
 
-	/* Read the raw image data and convert in 8-bit grayscale */
+	/* Read the raw image data and convert in 8-bit greyscale */
 	for (uint y = 0; y < info.height; y++) {
 		uint8_t *pixel = &map[y * static_cast<size_t>(info.width)];
 		const uint8_t *bitmap = &data.bitmap[y * static_cast<size_t>(info.width) * (info.bpp == 24 ? 3 : 1)];
@@ -244,7 +244,7 @@ static void ReadHeightmapBMPImageData(std::span<uint8_t> map, const BmpInfo &inf
 			if (info.bpp != 24) {
 				*pixel++ = gray_palette[*bitmap++];
 			} else {
-				*pixel++ = RGBToGrayscale(*bitmap, *(bitmap + 1), *(bitmap + 2));
+				*pixel++ = RGBToGreyscale(*bitmap, *(bitmap + 1), *(bitmap + 2));
 				bitmap += 3;
 			}
 		}
@@ -254,7 +254,7 @@ static void ReadHeightmapBMPImageData(std::span<uint8_t> map, const BmpInfo &inf
 /**
  * Reads the heightmap and/or size of the heightmap from a BMP file.
  * If map == nullptr only the size of the BMP is read, otherwise a map
- * with grayscale pixels is allocated and assigned to *map.
+ * with greyscale pixels is allocated and assigned to *map.
  */
 static bool ReadHeightmapBMP(std::string_view filename, uint *x, uint *y, std::vector<uint8_t> *map)
 {
@@ -295,13 +295,13 @@ static bool ReadHeightmapBMP(std::string_view filename, uint *x, uint *y, std::v
 }
 
 /**
- * Converts a given grayscale map to something that fits in OTTD map system
+ * Converts a given greyscale map to something that fits in OTTD map system
  * and create a map of that data.
  * @param img_width  the with of the image in pixels/tiles
  * @param img_height the height of the image in pixels/tiles
  * @param map        the input map
  */
-static void GrayscaleToMapHeights(uint img_width, uint img_height, std::span<const uint8_t> map)
+static void GreyscaleToMapHeights(uint img_width, uint img_height, std::span<const uint8_t> map)
 {
 	/* Defines the detail of the aspect ratio (to avoid doubles) */
 	const uint num_div = 16384;
@@ -520,7 +520,7 @@ bool LoadHeightmap(DetailedFileType dft, std::string_view filename)
 		return false;
 	}
 
-	GrayscaleToMapHeights(x, y, map);
+	GreyscaleToMapHeights(x, y, map);
 
 	FixSlopes();
 	MarkWholeScreenDirty();
diff --git a/src/linkgraph/linkgraphschedule.cpp b/src/linkgraph/linkgraphschedule.cpp
index 8b85761d79..304b7b896d 100644
--- a/src/linkgraph/linkgraphschedule.cpp
+++ b/src/linkgraph/linkgraphschedule.cpp
@@ -75,7 +75,7 @@ void LinkGraphSchedule::JoinNext()
 	delete next; // implicitly joins the thread
 	if (LinkGraph::IsValidID(id)) {
 		LinkGraph *lg = LinkGraph::Get(id);
-		this->Unqueue(lg); // Unqueue to avoid double-queueing recycled IDs.
+		this->Dequeue(lg); // Dequeue to avoid double-queueing recycled IDs.
 		this->Queue(lg);
 	}
 }
diff --git a/src/linkgraph/linkgraphschedule.h b/src/linkgraph/linkgraphschedule.h
index 1a63fbb880..2a169b6b66 100644
--- a/src/linkgraph/linkgraphschedule.h
+++ b/src/linkgraph/linkgraphschedule.h
@@ -74,7 +74,7 @@ public:
 	 * Remove a link graph from the execution queue.
 	 * @param lg Link graph to be removed.
 	 */
-	void Unqueue(LinkGraph *lg) { this->schedule.remove(lg); }
+	void Dequeue(LinkGraph *lg) { this->schedule.remove(lg); }
 };
 
 void StateGameLoop_LinkGraphPauseControl();
diff --git a/src/station.cpp b/src/station.cpp
index fa7b545fc3..8b6b14a827 100644
--- a/src/station.cpp
+++ b/src/station.cpp
@@ -115,7 +115,7 @@ Station::~Station()
 		}
 		lg->RemoveNode(this->goods[cargo].node);
 		if (lg->Size() == 0) {
-			LinkGraphSchedule::instance.Unqueue(lg);
+			LinkGraphSchedule::instance.Dequeue(lg);
 			delete lg;
 		}
 	}
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index fc7e7df25b..0dc0158eb0 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -4246,11 +4246,11 @@ void IncreaseStats(Station *st, CargoType cargo, StationID next_station_id, uint
 		if (ge1.link_graph != ge2.link_graph) {
 			LinkGraph *lg2 = LinkGraph::Get(ge2.link_graph);
 			if (lg->Size() < lg2->Size()) {
-				LinkGraphSchedule::instance.Unqueue(lg);
+				LinkGraphSchedule::instance.Dequeue(lg);
 				lg2->Merge(lg); // Updates GoodsEntries of lg
 				lg = lg2;
 			} else {
-				LinkGraphSchedule::instance.Unqueue(lg2);
+				LinkGraphSchedule::instance.Dequeue(lg2);
 				lg->Merge(lg2); // Updates GoodsEntries of lg2
 			}
 		}
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 344911ac76..3b1896cfff 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -2939,7 +2939,7 @@ void StartStopVehicle(const Vehicle *v, bool texteffect)
 }
 
 /** Checks whether the vehicle may be refitted at the moment.*/
-static bool IsVehicleRefitable(const Vehicle *v)
+static bool IsVehicleRefittable(const Vehicle *v)
 {
 	if (!v->IsStoppedInDepot()) return false;
 
@@ -3079,11 +3079,11 @@ public:
 	{
 		const Vehicle *v = Vehicle::Get(this->window_number);
 		bool is_localcompany = v->owner == _local_company;
-		bool refitable_and_stopped_in_depot = IsVehicleRefitable(v);
+		bool refittable_and_stopped_in_depot = IsVehicleRefittable(v);
 
 		this->SetWidgetDisabledState(WID_VV_RENAME, !is_localcompany);
 		this->SetWidgetDisabledState(WID_VV_GOTO_DEPOT, !is_localcompany);
-		this->SetWidgetDisabledState(WID_VV_REFIT, !refitable_and_stopped_in_depot || !is_localcompany);
+		this->SetWidgetDisabledState(WID_VV_REFIT, !refittable_and_stopped_in_depot || !is_localcompany);
 		this->SetWidgetDisabledState(WID_VV_CLONE, !is_localcompany);
 
 		if (v->type == VEH_TRAIN) {