diff --git a/.sai.json b/.sai.json
index dbb18f44c..fb9ba96d8 100644
--- a/.sai.json
+++ b/.sai.json
@@ -52,19 +52,19 @@
 			"build": "mkdir build;cd build;export CCACHE_DISABLE=1;cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/tmp -DCMAKE_TOOLCHAIN_FILE=../contrib/cross-linkit.cmake -DLWS_PLAT_FREERTOS=1 -DLWS_WITH_ZLIB=0 -DLWS_WITHOUT_EXTENSIONS=1 -DLWS_WITH_ZIP_FOPS=0 -DLWS_WITH_HTTP_STREAM_COMPRESSION=0 -DLWS_WITH_MBEDTLS=1 -DLWS_WITH_FILE_OPS=0 ${cmake};make -j",
 			"default": false
 		},
-		"windows-10/x86_64-amd/msvc": {
+		"w10/x86_64-amd/msvc": {
 			"build": "mkdir build && cd build && set SAI_CPACK=\"-G ZIP\" && cmake .. -DLWS_OPENSSL_LIBRARIES=\"C:\\Program Files\\OpenSSL\\lib\\libssl.lib;C:\\Program Files\\OpenSSL\\lib\\libcrypto.lib\" -DLWS_OPENSSL_INCLUDE_DIRS=\"C:\\Program Files\\OpenSSL\\include\" -DLWS_EXT_PTHREAD_INCLUDE_DIR=\"C:\\Program Files (x86)\\pthreads\\include\" -DLWS_EXT_PTHREAD_LIBRARIES=\"C:\\Program Files (x86)\\pthreads\\lib\\x64\\libpthreadGC2.a\" ${cmake} && cmake --build . --config DEBUG && set CTEST_OUTPUT_ON_FAILURE=1 && ctest . -C DEBUG -j4 --output-on-failure",
 			"default": false
 		},
-		"windows-10/x86_64-amd/noptmsvc": {
+		"w10/x86_64-amd/noptmsvc": {
 			"build": "mkdir build && cd build && set SAI_CPACK=\"-G ZIP\" && cmake .. -DLWS_OPENSSL_LIBRARIES=\"C:\\Program Files\\OpenSSL\\lib\\libssl.lib;C:\\Program Files\\OpenSSL\\lib\\libcrypto.lib\" -DLWS_OPENSSL_INCLUDE_DIRS=\"C:\\Program Files\\OpenSSL\\include\" ${cmake} && cmake --build . --config DEBUG && set CTEST_OUTPUT_ON_FAILURE=1 && ctest . -C DEBUG -j1 --output-on-failure",
 			"default": false
 		},
-		"windows-10/x86_64-amd/mingw32": {
+		"w10/x86_64-amd/mingw32": {
 			"build": "mkdir build && cd build && cmake .. -DCMAKE_TOOLCHAIN_FILE=../contrib/cross-w32.cmake ${cmake} && cmake --build . --config DEBUG",
 			"default": false
 		},
-		"windows-10/x86_64-amd/mingw64": {
+		"w10/x86_64-amd/mingw64": {
 			"build": "mkdir build && cd build && cmake .. -DCMAKE_TOOLCHAIN_FILE=../contrib/cross-w64.cmake ${cmake} && cmake --build . --config DEBUG",
 			"default": false
 		},
@@ -86,7 +86,7 @@
 	"configurations": {
 		"default": {
 			"cmake":	"",
-			"platforms":	"windows-10/x86_64-amd/msvc, windows-10/x86_64-amd/noptmsvc, freertos-linkit/arm32-m4-mt7697-usi/gcc, linux-ubuntu-2004/aarch64-a72-bcm2711-rpi4/gcc, windows-10/x86_64-amd/mingw32, windows-10/x86_64-amd/mingw64"
+			"platforms":	"w10/x86_64-amd/msvc, w10/x86_64-amd/noptmsvc, freertos-linkit/arm32-m4-mt7697-usi/gcc, linux-ubuntu-2004/aarch64-a72-bcm2711-rpi4/gcc, w10/x86_64-amd/mingw32, w10/x86_64-amd/mingw64"
 		},
 		"esp32-heltec": {
 			"cmake":	"",
@@ -118,11 +118,11 @@
 		},
 		"default-examples": {
 			"cmake":	"-DLWS_WITH_MINIMAL_EXAMPLES=1",
-			"platforms":	"windows-10/x86_64-amd/msvc, windows-10/x86_64-amd/noptmsvc, linux-ubuntu-2004/aarch64-a72-bcm2711-rpi4/gcc"
+			"platforms":	"w10/x86_64-amd/msvc, w10/x86_64-amd/noptmsvc, linux-ubuntu-2004/aarch64-a72-bcm2711-rpi4/gcc"
 		},
 		"unix-domain": {
 			"cmake":	"-DUNIX_SOCK=1",
-			"platforms":	"windows-10/x86_64-amd/msvc, windows-10/x86_64-amd/noptmsvc"
+			"platforms":	"w10/x86_64-amd/msvc, w10/x86_64-amd/noptmsvc"
 		},
 		"plugins": {
 			"cmake":	"-DLWS_WITH_PLUGINS=1",
@@ -130,19 +130,19 @@
 		},
 		"lws_system": {
 			"cmake":	"-DLWS_WITH_ACME=1 -DLWS_WITH_MINIMAL_EXAMPLES=1 -DCMAKE_BUILD_TYPE=RELEASE -DLWS_WITH_GENCRYPTO=1 -DLWS_WITH_JOSE=1 -DLWS_WITH_SYS_ASYNC_DNS=1 -DLWS_WITH_SYS_NTPCLIENT=1",
-			"platforms":	"windows-10/x86_64-amd/msvc, windows-10/x86_64-amd/noptmsvc"
+			"platforms":	"w10/x86_64-amd/msvc, w10/x86_64-amd/noptmsvc"
 		},
 		"secure-streams": {
 			"cmake":	"-DLWS_WITH_SECURE_STREAMS=1",
-			"platforms":	"windows-10/x86_64-amd/msvc, windows-10/x86_64-amd/noptmsvc"
+			"platforms":	"w10/x86_64-amd/msvc, w10/x86_64-amd/noptmsvc"
 		},
 		"secure-streams-proxy": {
 			"cmake":	"-DLWS_WITH_SECURE_STREAMS=1 -DLWS_WITH_SECURE_STREAMS_PROXY_API=1",
-			"platforms":	"not windows-10/x86_64-amd/msvc"
+			"platforms":	"not w10/x86_64-amd/msvc"
 		},
 		"distro_recommended": {
 			"cmake":	"-DLWS_WITH_DISTRO_RECOMMENDED=1",
-			"platforms":	"not freebsd-12/x86_64-amd/llvm, not linkit-cross, not windows-10/x86_64-amd/msvc, linux-ubuntu-2004/aarch64-a72-bcm2711-rpi4/gcc, linux-fedora-32/riscv64-virt/gcc",
+			"platforms":	"not freebsd-12/x86_64-amd/llvm, not linkit-cross, not w10/x86_64-amd/msvc, linux-ubuntu-2004/aarch64-a72-bcm2711-rpi4/gcc, linux-fedora-32/riscv64-virt/gcc",
 			"cpack":	"&& cpack $SAI_CPACK",
 			"artifacts":	"build/*.rpm, build/*.deb, build/*.zip"
 		},
@@ -188,7 +188,7 @@
 		},
 		"ipv6":	{
 			"cmake":	"-DLWS_IPV6=ON",
-			"platforms":	"windows-10/x86_64-amd/mingw64, windows-10/x86_64-amd/msvc"
+			"platforms":	"w10/x86_64-amd/mingw64, w10/x86_64-amd/msvc"
 		},
 		"nossl": {
 			"cmake":	"-DLWS_WITH_SSL=OFF",
@@ -211,7 +211,7 @@
 		},
 		"threadpool": {
 			"cmake":	"-DLWS_WITH_THREADPOOL=1 -DLWS_WITH_MINIMAL_EXAMPLES=1",
-			"platforms":	"windows-10/x86_64-amd/msvc"
+			"platforms":	"w10/x86_64-amd/msvc"
 		}
 	}
 }