diff --git a/ProGen/templates/vs170/Win32/executable/debug_shared-ARM64.template b/ProGen/templates/vs170/Win32/executable/debug_shared-ARM64.template
index 6e09c7f52..bf4794a16 100644
--- a/ProGen/templates/vs170/Win32/executable/debug_shared-ARM64.template
+++ b/ProGen/templates/vs170/Win32/executable/debug_shared-ARM64.template
@@ -1,6 +1,7 @@
 <Configuration
 	Name="debug_shared|ARM64"
 	OutputDirectory="binA64\"
+	TargetName="${project.name}d"
 	IntermediateDirectory="objA64\${project.name}\$(ConfigurationName)"
 	ConfigurationType="1"
 	CharacterSet="2"
@@ -55,7 +56,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalDependencies="${configuration.linker.dependencies}"
-		OutputFile="binA64\${project.target}d.exe"
+		OutputFile="$(OutDir)$(TargetName).exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\libA64;${configuration.linker.libraries}"
 		SuppressStartupBanner="true"
diff --git a/ProGen/templates/vs170/Win32/executable/release_static_md-ARM64.template b/ProGen/templates/vs170/Win32/executable/release_static_md-ARM64.template
index c28555a5b..dc58c91bf 100644
--- a/ProGen/templates/vs170/Win32/executable/release_static_md-ARM64.template
+++ b/ProGen/templates/vs170/Win32/executable/release_static_md-ARM64.template
@@ -58,7 +58,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalDependencies="iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
-		OutputFile="binA64\static_md\${project.target}.exe"
+		OutputFile="$(OutDir)$(TargetName).exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\libA64;${configuration.linker.libraries}"
 		GenerateDebugInformation="false"
diff --git a/ProGen/templates/vs170/Win32/plugin/debug_shared-ARM64.template b/ProGen/templates/vs170/Win32/plugin/debug_shared-ARM64.template
index ce397d049..0e0415a9f 100644
--- a/ProGen/templates/vs170/Win32/plugin/debug_shared-ARM64.template
+++ b/ProGen/templates/vs170/Win32/plugin/debug_shared-ARM64.template
@@ -55,7 +55,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalDependencies="${configuration.linker.dependencies}"
-		OutputFile="${project.outdir}\binA64\${project.target}d.dll"
+		OutputFile="$(OutDir)$(TargetName).dll"
 		LinkIncremental="2"
 		SuppressStartupBanner="true"
 		GenerateDebugInformation="true"
diff --git a/ProGen/templates/vs170/Win32/testsuite/debug_shared-ARM64.template b/ProGen/templates/vs170/Win32/testsuite/debug_shared-ARM64.template
index c96761832..270991c78 100644
--- a/ProGen/templates/vs170/Win32/testsuite/debug_shared-ARM64.template
+++ b/ProGen/templates/vs170/Win32/testsuite/debug_shared-ARM64.template
@@ -1,6 +1,7 @@
 <Configuration
 	Name="debug_shared|ARM64"
 	OutputDirectory="binA64\"
+	TargetName="${project.name}d"
 	IntermediateDirectory="objA64\${project.name}\$(ConfigurationName)"
 	ConfigurationType="1"
 	CharacterSet="2"
@@ -55,7 +56,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
-		OutputFile="binA64\${project.target}d.exe"
+		OutputFile="$(OutDir)$(TargetName).exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\libA64"
 		SuppressStartupBanner="true"
diff --git a/ProGen/templates/vs170/Win32/testsuite/debug_static_md-ARM64.template b/ProGen/templates/vs170/Win32/testsuite/debug_static_md-ARM64.template
index 075924d57..a9c96d799 100644
--- a/ProGen/templates/vs170/Win32/testsuite/debug_static_md-ARM64.template
+++ b/ProGen/templates/vs170/Win32/testsuite/debug_static_md-ARM64.template
@@ -1,6 +1,7 @@
 <Configuration
 	Name="debug_static_md|ARM64"
 	OutputDirectory="binA64\static_md\"
+	TargetName="${project.name}mdd"
 	IntermediateDirectory="objA64\${project.name}\$(ConfigurationName)"
 	ConfigurationType="1"
 	CharacterSet="2"
@@ -55,7 +56,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
-		OutputFile="binA64\static_md\${project.target}d.exe"
+		OutputFile="$(OutDir)$(TargetName).exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\libA64"
 		SuppressStartupBanner="true"
diff --git a/ProGen/templates/vs170/Win32/testsuite/debug_static_mt-ARM64.template b/ProGen/templates/vs170/Win32/testsuite/debug_static_mt-ARM64.template
index c54f2c6b5..1d41de8a3 100644
--- a/ProGen/templates/vs170/Win32/testsuite/debug_static_mt-ARM64.template
+++ b/ProGen/templates/vs170/Win32/testsuite/debug_static_mt-ARM64.template
@@ -1,6 +1,7 @@
 <Configuration
 	Name="debug_static_mt|ARM64"
 	OutputDirectory="binA64\static_mt\"
+	TargetName="${project.name}mtd"
 	IntermediateDirectory="objA64\${project.name}\$(ConfigurationName)"
 	ConfigurationType="1"
 	CharacterSet="2"
@@ -55,7 +56,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
-		OutputFile="binA64\static_mt\${project.target}d.exe"
+		OutputFile="$(OutDir)$(TargetName).exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\libA64"
 		SuppressStartupBanner="true"
diff --git a/ProGen/templates/vs170/Win32/testsuite/release_shared-ARM64.template b/ProGen/templates/vs170/Win32/testsuite/release_shared-ARM64.template
index 58a940bef..b92cc3a72 100644
--- a/ProGen/templates/vs170/Win32/testsuite/release_shared-ARM64.template
+++ b/ProGen/templates/vs170/Win32/testsuite/release_shared-ARM64.template
@@ -1,6 +1,7 @@
 <Configuration
 	Name="release_shared|ARM64"
 	OutputDirectory="binA64\"
+	TargetName="${project.name}"
 	IntermediateDirectory="objA64\${project.name}\$(ConfigurationName)"
 	ConfigurationType="1"
 	CharacterSet="2"
@@ -58,7 +59,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
-		OutputFile="binA64\${project.target}.exe"
+		OutputFile="$(OutDir)$(TargetName).exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\libA64"
 		GenerateDebugInformation="false"
diff --git a/ProGen/templates/vs170/Win32/testsuite/release_static_md-ARM64.template b/ProGen/templates/vs170/Win32/testsuite/release_static_md-ARM64.template
index cbd712ef5..5a6415dd6 100644
--- a/ProGen/templates/vs170/Win32/testsuite/release_static_md-ARM64.template
+++ b/ProGen/templates/vs170/Win32/testsuite/release_static_md-ARM64.template
@@ -1,6 +1,7 @@
 <Configuration
 	Name="release_static_md|ARM64"
 	OutputDirectory="binA64\static_md\"
+	TargetName="${project.name}md"
 	IntermediateDirectory="objA64\${project.name}\$(ConfigurationName)"
 	ConfigurationType="1"
 	CharacterSet="2"
@@ -58,7 +59,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
-		OutputFile="binA64\static_md\${project.target}.exe"
+		OutputFile="$(OutDir)$(TargetName).exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\libA64"
 		GenerateDebugInformation="false"
diff --git a/ProGen/templates/vs170/Win32/testsuite/release_static_mt-ARM64.template b/ProGen/templates/vs170/Win32/testsuite/release_static_mt-ARM64.template
index d1d18b5b6..e6c5cdb96 100644
--- a/ProGen/templates/vs170/Win32/testsuite/release_static_mt-ARM64.template
+++ b/ProGen/templates/vs170/Win32/testsuite/release_static_mt-ARM64.template
@@ -1,6 +1,7 @@
 <Configuration
 	Name="release_static_mt|ARM64"
 	OutputDirectory="binA64\static_mt\"
+	TargetName="${project.name}mt"
 	IntermediateDirectory="objA64\${project.name}\$(ConfigurationName)"
 	ConfigurationType="1"
 	CharacterSet="2"
@@ -58,7 +59,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
-		OutputFile="binA64\static_mt\${project.target}.exe"
+		OutputFile="$(OutDir)$(TargetName).exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\libA64"
 		GenerateDebugInformation="false"