diff --git a/build2cmake/src/templates/cuda/preamble.cmake b/build2cmake/src/templates/cuda/preamble.cmake
index 077ce09b..f1c16ba8 100644
--- a/build2cmake/src/templates/cuda/preamble.cmake
+++ b/build2cmake/src/templates/cuda/preamble.cmake
@@ -112,9 +112,9 @@ cmake_host_system_information(RESULT HOST_ARCH QUERY OS_PLATFORM)
 set(SYSTEM_STRING "${HOST_ARCH}-windows")
 
 if(GPU_LANG STREQUAL "CUDA")
-  generate_build_name(BUILD_VARIANT_NAME "${TORCH_VERSION}" ${CXX11_ABI_VALUE} "cuda" "${CUDA_VERSION}" "${SYSTEM_STRING}")
+  generate_build_name(BUILD_VARIANT_NAME "${TORCH_VERSION}" "${CXX11_ABI_VALUE}" "cuda" "${CUDA_VERSION}" "${SYSTEM_STRING}")
 elseif(GPU_LANG STREQUAL "HIP")
   run_python(ROCM_VERSION "import torch.version; print(torch.version.hip.split('.')[0] + '.' + torch.version.hip.split('.')[1])" "Failed to get ROCm version")
-  generate_build_name(BUILD_VARIANT_NAME "${TORCH_VERSION}" ${CXX11_ABI_VALUE} "rocm" "${ROCM_VERSION}" "${SYSTEM_STRING}")
+  generate_build_name(BUILD_VARIANT_NAME "${TORCH_VERSION}" "${CXX11_ABI_VALUE}" "rocm" "${ROCM_VERSION}" "${SYSTEM_STRING}")
 endif()
 {% endif %}
diff --git a/build2cmake/src/templates/windows.cmake b/build2cmake/src/templates/windows.cmake
index ec313622..948bd643 100644
--- a/build2cmake/src/templates/windows.cmake
+++ b/build2cmake/src/templates/windows.cmake
@@ -65,11 +65,19 @@ function(generate_build_name OUT_BUILD_NAME TORCH_VERSION CXX11_ABI COMPUTE_FRAM
         message(FATAL_ERROR "Unknown compute framework: ${COMPUTE_FRAMEWORK}")
     endif()
 
+    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
+        set(CPU_ARCH "x86_64")
+    elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
+        set(CPU_ARCH "aarch64")
+    else()
+        message(ERROR "Unsupported Windows platform ${CMAKE_SYSTEM_PROCESSOR}")
+    endif()
+
     # Assemble the final build name
-    if(ABI_STRING STREQUAL "")
-        set(BUILD_NAME "torch${FLATTENED_TORCH}-${COMPUTE_STRING}-windows")
+    if(CXX11_ABI STREQUAL "" OR CXX11_ABI STREQUAL "FALSE")
+        set(BUILD_NAME "torch${FLATTENED_TORCH}-${COMPUTE_STRING}-${CPU_ARCH}-windows")
     else()
-        set(BUILD_NAME "torch${FLATTENED_TORCH}-${ABI_STRING}-${COMPUTE_STRING}-windows")
+        set(BUILD_NAME "torch${FLATTENED_TORCH}-cxx11-${COMPUTE_STRING}-${CPU_ARCH}-windows")
     endif()
 
     set(${OUT_BUILD_NAME} "${BUILD_NAME}" PARENT_SCOPE)