diff --git a/binaries/data/mods/official/audio/ambient/building/amb_farm.xml b/binaries/data/mods/official/audio/ambient/building/amb_farm.xml
index 187c0ba97f..944028a2a4 100644
--- a/binaries/data/mods/official/audio/ambient/building/amb_farm.xml
+++ b/binaries/data/mods/official/audio/ambient/building/amb_farm.xml
@@ -16,10 +16,10 @@
 	<PitchLower>0.9</PitchLower>
 	<Threshold>2</Threshold>
 	<Decay>3</Decay>
-	<Replacement>amb_farm20.ogg</Replacement>
+	<Replacement>amb_farm_20.ogg</Replacement>
 	<Path>/audio/ambient/building/</Path>
-	<Sound>amb_farm13.ogg</Sound>
-	<Sound>amb_farm10.ogg</Sound>
-	<Sound>amb_farm11.ogg</Sound>
-	<Sound>amb_farm12.ogg</Sound>
+	<Sound>amb_farm_13.ogg</Sound>
+	<Sound>amb_farm_10.ogg</Sound>
+	<Sound>amb_farm_11.ogg</Sound>
+	<Sound>amb_farm_12.ogg</Sound>
 </SoundGroup>
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_farm10.ogg b/binaries/data/mods/official/audio/ambient/building/amb_farm_10.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/ambient/building/amb_farm10.ogg
rename to binaries/data/mods/official/audio/ambient/building/amb_farm_10.ogg
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_farm11.ogg b/binaries/data/mods/official/audio/ambient/building/amb_farm_11.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/ambient/building/amb_farm11.ogg
rename to binaries/data/mods/official/audio/ambient/building/amb_farm_11.ogg
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_farm12.ogg b/binaries/data/mods/official/audio/ambient/building/amb_farm_12.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/ambient/building/amb_farm12.ogg
rename to binaries/data/mods/official/audio/ambient/building/amb_farm_12.ogg
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_farm13.ogg b/binaries/data/mods/official/audio/ambient/building/amb_farm_13.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/ambient/building/amb_farm13.ogg
rename to binaries/data/mods/official/audio/ambient/building/amb_farm_13.ogg
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_farm20.ogg b/binaries/data/mods/official/audio/ambient/building/amb_farm_20.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/ambient/building/amb_farm20.ogg
rename to binaries/data/mods/official/audio/ambient/building/amb_farm_20.ogg
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_port.xml b/binaries/data/mods/official/audio/ambient/building/amb_port.xml
index 1c3d97b0ea..40f17e11f1 100644
--- a/binaries/data/mods/official/audio/ambient/building/amb_port.xml
+++ b/binaries/data/mods/official/audio/ambient/building/amb_port.xml
@@ -16,10 +16,10 @@
 	<PitchLower>0.9</PitchLower>
 	<Threshold>2</Threshold>
 	<Decay>3</Decay>
-	<Replacement>amb_port20.ogg</Replacement>
+	<Replacement>amb_port_20.ogg</Replacement>
 	<Path>/audio/ambient/building/</Path>
-	<Sound>amb_port13.ogg</Sound>
-	<Sound>amb_port10.ogg</Sound>
-	<Sound>amb_port11.ogg</Sound>
-	<Sound>amb_port12.ogg</Sound>
+	<Sound>amb_port_21.ogg</Sound>
+	<Sound>amb_port_10.ogg</Sound>
+	<Sound>amb_port_11.ogg</Sound>
+	<Sound>amb_port_12.ogg</Sound>
 </SoundGroup>
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_port22.ogg b/binaries/data/mods/official/audio/ambient/building/amb_port22.ogg
deleted file mode 100644
index 25e6a784da..0000000000
--- a/binaries/data/mods/official/audio/ambient/building/amb_port22.ogg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fc85c8b5df60220fc854d4142190d9b82ff181469b19000c445fbe0f1fa5db75
-size 182955
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_port10.ogg b/binaries/data/mods/official/audio/ambient/building/amb_port_10.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/ambient/building/amb_port10.ogg
rename to binaries/data/mods/official/audio/ambient/building/amb_port_10.ogg
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_port11.ogg b/binaries/data/mods/official/audio/ambient/building/amb_port_11.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/ambient/building/amb_port11.ogg
rename to binaries/data/mods/official/audio/ambient/building/amb_port_11.ogg
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_port_12.ogg b/binaries/data/mods/official/audio/ambient/building/amb_port_12.ogg
new file mode 100644
index 0000000000..a333f7fce8
--- /dev/null
+++ b/binaries/data/mods/official/audio/ambient/building/amb_port_12.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9818bf80c9e8d8663fe2af12a95c665f8bed294fe8c7d25af4d3e009f562a61d
+size 167582
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_port20.ogg b/binaries/data/mods/official/audio/ambient/building/amb_port_20.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/ambient/building/amb_port20.ogg
rename to binaries/data/mods/official/audio/ambient/building/amb_port_20.ogg
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_port12.ogg b/binaries/data/mods/official/audio/ambient/building/amb_port_21.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/ambient/building/amb_port12.ogg
rename to binaries/data/mods/official/audio/ambient/building/amb_port_21.ogg
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_trade.xml b/binaries/data/mods/official/audio/ambient/building/amb_trade.xml
index 8b930921cb..4a5e4da349 100644
--- a/binaries/data/mods/official/audio/ambient/building/amb_trade.xml
+++ b/binaries/data/mods/official/audio/ambient/building/amb_trade.xml
@@ -16,10 +16,10 @@
 	<PitchLower>0.9</PitchLower>
 	<Threshold>2</Threshold>
 	<Decay>3</Decay>
-	<Replacement>amb_trade20.ogg</Replacement>
+	<Replacement>amb_trade_20.ogg</Replacement>
 	<Path>/audio/ambient/building/</Path>
-	<Sound>amb_trade13.ogg</Sound>
-	<Sound>amb_trade10.ogg</Sound>
-	<Sound>amb_trade11.ogg</Sound>
-	<Sound>amb_trade12.ogg</Sound>
+	<Sound>amb_trade_13.ogg</Sound>
+	<Sound>amb_trade_10.ogg</Sound>
+	<Sound>amb_trade_11.ogg</Sound>
+	<Sound>amb_trade_12.ogg</Sound>
 </SoundGroup>
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_trade10.ogg b/binaries/data/mods/official/audio/ambient/building/amb_trade_10.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/ambient/building/amb_trade10.ogg
rename to binaries/data/mods/official/audio/ambient/building/amb_trade_10.ogg
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_trade11.ogg b/binaries/data/mods/official/audio/ambient/building/amb_trade_11.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/ambient/building/amb_trade11.ogg
rename to binaries/data/mods/official/audio/ambient/building/amb_trade_11.ogg
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_trade12.ogg b/binaries/data/mods/official/audio/ambient/building/amb_trade_12.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/ambient/building/amb_trade12.ogg
rename to binaries/data/mods/official/audio/ambient/building/amb_trade_12.ogg
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_trade13.ogg b/binaries/data/mods/official/audio/ambient/building/amb_trade_13.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/ambient/building/amb_trade13.ogg
rename to binaries/data/mods/official/audio/ambient/building/amb_trade_13.ogg
diff --git a/binaries/data/mods/official/audio/ambient/building/amb_trade20.ogg b/binaries/data/mods/official/audio/ambient/building/amb_trade_20.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/ambient/building/amb_trade20.ogg
rename to binaries/data/mods/official/audio/ambient/building/amb_trade_20.ogg