diff --git a/PCbuild/_asyncio.vcxproj b/PCbuild/_asyncio.vcxproj
index 3cca000409..c4e8a9a585 100644
--- a/PCbuild/_asyncio.vcxproj
+++ b/PCbuild/_asyncio.vcxproj
@@ -47,7 +47,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj
index b3ab378c6e..f0b6c86b6b 100644
--- a/PCbuild/_bz2.vcxproj
+++ b/PCbuild/_bz2.vcxproj
@@ -48,7 +48,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_ctypes.vcxproj b/PCbuild/_ctypes.vcxproj
index 43d51f8296..e7af0a7da8 100644
--- a/PCbuild/_ctypes.vcxproj
+++ b/PCbuild/_ctypes.vcxproj
@@ -47,7 +47,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_ctypes_test.vcxproj b/PCbuild/_ctypes_test.vcxproj
index b62407fadf..a3bee69e49 100644
--- a/PCbuild/_ctypes_test.vcxproj
+++ b/PCbuild/_ctypes_test.vcxproj
@@ -48,7 +48,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj
index 9c9c19abbe..9e88035ee8 100644
--- a/PCbuild/_decimal.vcxproj
+++ b/PCbuild/_decimal.vcxproj
@@ -47,7 +47,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj
index 0db61f2081..130eb32058 100644
--- a/PCbuild/_elementtree.vcxproj
+++ b/PCbuild/_elementtree.vcxproj
@@ -47,7 +47,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_hashlib.vcxproj b/PCbuild/_hashlib.vcxproj
index d6d88029d7..2d66c25c59 100644
--- a/PCbuild/_hashlib.vcxproj
+++ b/PCbuild/_hashlib.vcxproj
@@ -47,7 +47,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj
index d8b159e6a1..f03251842d 100644
--- a/PCbuild/_lzma.vcxproj
+++ b/PCbuild/_lzma.vcxproj
@@ -47,7 +47,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_msi.vcxproj b/PCbuild/_msi.vcxproj
index 3895d450f3..d0c9e8d6f4 100644
--- a/PCbuild/_msi.vcxproj
+++ b/PCbuild/_msi.vcxproj
@@ -47,7 +47,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_multiprocessing.vcxproj b/PCbuild/_multiprocessing.vcxproj
index bb2bb4114c..9363620796 100644
--- a/PCbuild/_multiprocessing.vcxproj
+++ b/PCbuild/_multiprocessing.vcxproj
@@ -47,7 +47,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_overlapped.vcxproj b/PCbuild/_overlapped.vcxproj
index 26b2d214c3..cd6da788ac 100644
--- a/PCbuild/_overlapped.vcxproj
+++ b/PCbuild/_overlapped.vcxproj
@@ -47,7 +47,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_socket.vcxproj b/PCbuild/_socket.vcxproj
index d5c4d1b5b6..0d672f21bb 100644
--- a/PCbuild/_socket.vcxproj
+++ b/PCbuild/_socket.vcxproj
@@ -47,7 +47,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj
index 5456bb5b23..3c85bc41f7 100644
--- a/PCbuild/_sqlite3.vcxproj
+++ b/PCbuild/_sqlite3.vcxproj
@@ -47,7 +47,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj
index aaf95a361c..5b602d84b0 100644
--- a/PCbuild/_ssl.vcxproj
+++ b/PCbuild/_ssl.vcxproj
@@ -47,7 +47,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_testbuffer.vcxproj b/PCbuild/_testbuffer.vcxproj
index 1f45b29810..a3addb397b 100644
--- a/PCbuild/_testbuffer.vcxproj
+++ b/PCbuild/_testbuffer.vcxproj
@@ -48,7 +48,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj
index 365b07c5c5..588e48dac0 100644
--- a/PCbuild/_testcapi.vcxproj
+++ b/PCbuild/_testcapi.vcxproj
@@ -48,7 +48,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_testimportmultiple.vcxproj b/PCbuild/_testimportmultiple.vcxproj
index 37c1a64ac8..17ecf61614 100644
--- a/PCbuild/_testimportmultiple.vcxproj
+++ b/PCbuild/_testimportmultiple.vcxproj
@@ -48,7 +48,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_testmultiphase.vcxproj b/PCbuild/_testmultiphase.vcxproj
index 106927c67b..0452940607 100644
--- a/PCbuild/_testmultiphase.vcxproj
+++ b/PCbuild/_testmultiphase.vcxproj
@@ -48,7 +48,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj
index 95e3cd50ec..c6836506c9 100644
--- a/PCbuild/_tkinter.vcxproj
+++ b/PCbuild/_tkinter.vcxproj
@@ -47,7 +47,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj
index 1a36d08ec0..420b8b6e92 100644
--- a/PCbuild/openssl.vcxproj
+++ b/PCbuild/openssl.vcxproj
@@ -73,7 +73,7 @@ nmake
$(opensslDir)\ms\uplink.c
((h = GetModuleHandle(NULL)) == NULL)
- ((h = GetModuleHandleA("_ssl.pyd")) == NULL) if ((h = GetModuleHandleA("_ssl_d.pyd")) == NULL) if ((h = GetModuleHandle(NULL)) == NULL /*patched*/)
+ ((h = GetModuleHandleA("_ssl.$(PydTag).pyd")) == NULL) if ((h = GetModuleHandleA("_ssl_d.$(PydTag).pyd")) == NULL) if ((h = GetModuleHandle(NULL)) == NULL /*patched*/)
diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
index 51ca69e95d..2fd4410bec 100644
--- a/PCbuild/pyexpat.vcxproj
+++ b/PCbuild/pyexpat.vcxproj
@@ -47,7 +47,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/select.vcxproj b/PCbuild/select.vcxproj
index d6112ab6fe..ec1df60198 100644
--- a/PCbuild/select.vcxproj
+++ b/PCbuild/select.vcxproj
@@ -46,7 +46,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj
index 4f5b1965d9..25321f3d7a 100644
--- a/PCbuild/sqlite3.vcxproj
+++ b/PCbuild/sqlite3.vcxproj
@@ -37,7 +37,7 @@
{A1A295E5-463C-437F-81CA-1F32367685DA}
sqlite3
- .pyd
+ .$(PydTag).pyd
false
diff --git a/PCbuild/unicodedata.vcxproj b/PCbuild/unicodedata.vcxproj
index 317c1a8a56..56b7848a10 100644
--- a/PCbuild/unicodedata.vcxproj
+++ b/PCbuild/unicodedata.vcxproj
@@ -47,7 +47,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/winsound.vcxproj b/PCbuild/winsound.vcxproj
index 12913efdef..faadb0f151 100644
--- a/PCbuild/winsound.vcxproj
+++ b/PCbuild/winsound.vcxproj
@@ -47,7 +47,7 @@
- .pyd
+ .$(PydTag).pyd
diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj
index 9dbdc77335..ef373b84c4 100644
--- a/PCbuild/xxlimited.vcxproj
+++ b/PCbuild/xxlimited.vcxproj
@@ -48,7 +48,7 @@
- .pyd
+ .$(PydTag).pyd