diff --git a/etc/config/c++.amazon.properties b/etc/config/c++.amazon.properties
index 456385d9e0b96efb4be17c7b7ab2ab106996ee56..58384456993f5ee60e15f51d4b0c4bc5baa2d8c1 100644
--- a/etc/config/c++.amazon.properties
+++ b/etc/config/c++.amazon.properties
@@ -565,31 +565,31 @@ group.mosclang-trunk.isSemVer=true
 group.mosclang-trunk.objdumper=/opt/compiler-explorer/llvm-mos-trunk/bin/llvm-objdump
 group.mosclang-trunk.objdumperType=llvm
 
-compiler.mos-nes-cnrom-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-nes-cnrom-clang
+compiler.mos-nes-cnrom-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-nes-cnrom-clang++
 compiler.mos-nes-cnrom-trunk.semver=nes-cnrom
 
-compiler.mos-nes-mmc1-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-nes-mmc1-clang
+compiler.mos-nes-mmc1-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-nes-mmc1-clang++
 compiler.mos-nes-mmc1-trunk.semver=nes-mmc1
 
-compiler.mos-nes-mmc3-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-nes-mmc3-clang
+compiler.mos-nes-mmc3-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-nes-mmc3-clang++
 compiler.mos-nes-mmc3-trunk.semver=nes-mmc3
 
-compiler.mos-nes-nrom-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-nes-nrom-clang
+compiler.mos-nes-nrom-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-nes-nrom-clang++
 compiler.mos-nes-nrom-trunk.semver=nes-nrom
 
-compiler.mos-atari8-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-atari8-clang
+compiler.mos-atari8-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-atari8-clang++
 compiler.mos-atari8-trunk.semver=atari 8-bit
 
-compiler.mos-cx16-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-cx16-clang
+compiler.mos-cx16-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-cx16-clang++
 compiler.mos-cx16-trunk.semver=commander X16
 
-compiler.mos-c64-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-c64-clang
+compiler.mos-c64-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-c64-clang++
 compiler.mos-c64-trunk.semver=commodore 64
 
-compiler.mos-mega65-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-mega65-clang
+compiler.mos-mega65-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-mega65-clang++
 compiler.mos-mega65-trunk.semver=mega65
 
-compiler.mos-osi-c1p-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-osi-c1p-clang
+compiler.mos-osi-c1p-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-osi-c1p-clang++
 compiler.mos-osi-c1p-trunk.semver=osi-c1p
 
 ################################
diff --git a/etc/config/c.amazon.properties b/etc/config/c.amazon.properties
index 19b53590ff4baa4ee0592feed4eccbefcec4a579..2d28e67ab9a986ef5ea3519b7f9588a84866f365 100644
--- a/etc/config/c.amazon.properties
+++ b/etc/config/c.amazon.properties
@@ -512,31 +512,31 @@ group.cmosclang-trunk.isSemVer=true
 group.cmosclang-trunk.objdumper=/opt/compiler-explorer/llvm-mos-trunk/bin/llvm-objdump
 group.cmosclang-trunk.objdumperType=llvm
 
-compiler.cmos-nes-cnrom-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-nes-cnrom-clang++
+compiler.cmos-nes-cnrom-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-nes-cnrom-clang
 compiler.cmos-nes-cnrom-trunk.semver=nes-cnrom
 
-compiler.cmos-nes-mmc1-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-nes-mmc1-clang++
+compiler.cmos-nes-mmc1-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-nes-mmc1-clang
 compiler.cmos-nes-mmc1-trunk.semver=nes-mmc1
 
-compiler.cmos-nes-mmc3-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-nes-mmc3-clang++
+compiler.cmos-nes-mmc3-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-nes-mmc3-clang
 compiler.cmos-nes-mmc3-trunk.semver=nes-mmc3
 
-compiler.cmos-nes-nrom-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-nes-nrom-clang++
+compiler.cmos-nes-nrom-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-nes-nrom-clang
 compiler.cmos-nes-nrom-trunk.semver=nes-nrom
 
-compiler.cmos-atari8-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-atari8-clang++
+compiler.cmos-atari8-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-atari8-clang
 compiler.cmos-atari8-trunk.semver=atari 8-bit
 
-compiler.cmos-cx16-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-cx16-clang++
+compiler.cmos-cx16-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-cx16-clang
 compiler.cmos-cx16-trunk.semver=commander X16
 
-compiler.cmos-c64-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-c64-clang++
+compiler.cmos-c64-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-c64-clang
 compiler.cmos-c64-trunk.semver=commodore 64
 
-compiler.cmos-mega65-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-mega65-clang++
+compiler.cmos-mega65-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-mega65-clang
 compiler.cmos-mega65-trunk.semver=mega65
 
-compiler.cmos-osi-c1p-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-osi-c1p-clang++
+compiler.cmos-osi-c1p-trunk.exe=/opt/compiler-explorer/llvm-mos-trunk/bin/mos-osi-c1p-clang
 compiler.cmos-osi-c1p-trunk.semver=osi-c1p
 
 ################################