diff --git a/msvc/msvc-2012.sln b/msvc/msvc-2012.sln
index 89303a05..4f68d0b2 100644
--- a/msvc/msvc-2012.sln
+++ b/msvc/msvc-2012.sln
@@ -8,47 +8,47 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcxproj",
{5B01D900-2359-44CA-9914-6B0C6AFB7BE7} = {5B01D900-2359-44CA-9914-6B0C6AFB7BE7}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-x86", "test-x86\test-x86.vcxproj", "{9C69243E-C7DC-42A4-AB86-0696E51697C8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_x86", "test_x86\test_x86.vcxproj", "{9C69243E-C7DC-42A4-AB86-0696E51697C8}"
ProjectSection(ProjectDependencies) = postProject
{5B01D900-2359-44CA-9914-6B0C6AFB7BE7} = {5B01D900-2359-44CA-9914-6B0C6AFB7BE7}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-arm", "test-arm\test-arm.vcxproj", "{349B99E4-2E79-44FE-96F9-02D9B4EC0584}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_arm", "test_arm\test_arm.vcxproj", "{349B99E4-2E79-44FE-96F9-02D9B4EC0584}"
ProjectSection(ProjectDependencies) = postProject
{5B01D900-2359-44CA-9914-6B0C6AFB7BE7} = {5B01D900-2359-44CA-9914-6B0C6AFB7BE7}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-arm64", "test-arm64\test-arm64.vcxproj", "{CBE31473-7D0E-41F5-AFCB-8C8422ED8908}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_arm64", "test_arm64\test_arm64.vcxproj", "{CBE31473-7D0E-41F5-AFCB-8C8422ED8908}"
ProjectSection(ProjectDependencies) = postProject
{5B01D900-2359-44CA-9914-6B0C6AFB7BE7} = {5B01D900-2359-44CA-9914-6B0C6AFB7BE7}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-mips", "test-mips\test-mips.vcxproj", "{28B2D82F-3E95-4ECE-8118-0E891BD453E0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mips", "test_mips\test_mips.vcxproj", "{28B2D82F-3E95-4ECE-8118-0E891BD453E0}"
ProjectSection(ProjectDependencies) = postProject
{5B01D900-2359-44CA-9914-6B0C6AFB7BE7} = {5B01D900-2359-44CA-9914-6B0C6AFB7BE7}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-ppc", "test-ppc\test-ppc.vcxproj", "{0B78E956-F897-4149-BFB2-BE87DA3A6F0D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_ppc", "test_ppc\test_ppc.vcxproj", "{0B78E956-F897-4149-BFB2-BE87DA3A6F0D}"
ProjectSection(ProjectDependencies) = postProject
{5B01D900-2359-44CA-9914-6B0C6AFB7BE7} = {5B01D900-2359-44CA-9914-6B0C6AFB7BE7}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-sparc", "test-sparc\test-sparc.vcxproj", "{9E735ABA-00D9-4114-A9E7-0568D8DFF94B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_sparc", "test_sparc\test_sparc.vcxproj", "{9E735ABA-00D9-4114-A9E7-0568D8DFF94B}"
ProjectSection(ProjectDependencies) = postProject
{5B01D900-2359-44CA-9914-6B0C6AFB7BE7} = {5B01D900-2359-44CA-9914-6B0C6AFB7BE7}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-systemz", "test-systemz\test-systemz.vcxproj", "{D83F2A2D-D5F1-421E-A5B7-B47F1ECABAD2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_systemz", "test_systemz\test_systemz.vcxproj", "{D83F2A2D-D5F1-421E-A5B7-B47F1ECABAD2}"
ProjectSection(ProjectDependencies) = postProject
{5B01D900-2359-44CA-9914-6B0C6AFB7BE7} = {5B01D900-2359-44CA-9914-6B0C6AFB7BE7}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-detail", "test-detail\test-detail.vcxproj", "{A510F308-3094-4FF6-9DFC-539CC5260BA4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_detail", "test_detail\test_detail.vcxproj", "{A510F308-3094-4FF6-9DFC-539CC5260BA4}"
ProjectSection(ProjectDependencies) = postProject
{5B01D900-2359-44CA-9914-6B0C6AFB7BE7} = {5B01D900-2359-44CA-9914-6B0C6AFB7BE7}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-skipdata", "test-skipdata\test-skipdata.vcxproj", "{B09819BB-7EF1-4B04-945D-58117E6940A1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_skipdata", "test_skipdata\test_skipdata.vcxproj", "{B09819BB-7EF1-4B04-945D-58117E6940A1}"
ProjectSection(ProjectDependencies) = postProject
{5B01D900-2359-44CA-9914-6B0C6AFB7BE7} = {5B01D900-2359-44CA-9914-6B0C6AFB7BE7}
EndProjectSection
diff --git a/msvc/test-arm/test-arm.vcxproj b/msvc/test_arm/test_arm.vcxproj
similarity index 99%
rename from msvc/test-arm/test-arm.vcxproj
rename to msvc/test_arm/test_arm.vcxproj
index 2232c0ac..ea2a9a70 100644
--- a/msvc/test-arm/test-arm.vcxproj
+++ b/msvc/test_arm/test_arm.vcxproj
@@ -22,7 +22,7 @@
{349B99E4-2E79-44FE-96F9-02D9B4EC0584}
Win32Proj
capstonetestarm
- test-arm
+ test_arm
diff --git a/msvc/test-arm64/test-arm64.vcxproj b/msvc/test_arm64/test_arm64.vcxproj
similarity index 99%
rename from msvc/test-arm64/test-arm64.vcxproj
rename to msvc/test_arm64/test_arm64.vcxproj
index 8c07a0c4..0d87dc61 100644
--- a/msvc/test-arm64/test-arm64.vcxproj
+++ b/msvc/test_arm64/test_arm64.vcxproj
@@ -22,7 +22,7 @@
{CBE31473-7D0E-41F5-AFCB-8C8422ED8908}
Win32Proj
capstonetestarm64
- test-arm64
+ test_arm64
diff --git a/msvc/test-detail/test-detail.vcxproj b/msvc/test_detail/test_detail.vcxproj
similarity index 99%
rename from msvc/test-detail/test-detail.vcxproj
rename to msvc/test_detail/test_detail.vcxproj
index 1d3a4dee..165ae565 100644
--- a/msvc/test-detail/test-detail.vcxproj
+++ b/msvc/test_detail/test_detail.vcxproj
@@ -22,7 +22,7 @@
{A510F308-3094-4FF6-9DFC-539CC5260BA4}
Win32Proj
capstonetestdetail
- test-detail
+ test_detail
diff --git a/msvc/test-mips/test-mips.vcxproj b/msvc/test_mips/test_mips.vcxproj
similarity index 99%
rename from msvc/test-mips/test-mips.vcxproj
rename to msvc/test_mips/test_mips.vcxproj
index 9e115765..4096a26f 100644
--- a/msvc/test-mips/test-mips.vcxproj
+++ b/msvc/test_mips/test_mips.vcxproj
@@ -22,7 +22,7 @@
{28B2D82F-3E95-4ECE-8118-0E891BD453E0}
Win32Proj
capstonetestmips
- test-mips
+ test_mips
diff --git a/msvc/test-ppc/test-ppc.vcxproj b/msvc/test_ppc/test_ppc.vcxproj
similarity index 99%
rename from msvc/test-ppc/test-ppc.vcxproj
rename to msvc/test_ppc/test_ppc.vcxproj
index 0f3f0315..b7df928d 100644
--- a/msvc/test-ppc/test-ppc.vcxproj
+++ b/msvc/test_ppc/test_ppc.vcxproj
@@ -25,7 +25,7 @@
{0B78E956-F897-4149-BFB2-BE87DA3A6F0D}
Win32Proj
capstonetestppc
- test-ppc
+ test_ppc
diff --git a/msvc/test-skipdata/test-skipdata.vcxproj b/msvc/test_skipdata/test_skipdata.vcxproj
similarity index 99%
rename from msvc/test-skipdata/test-skipdata.vcxproj
rename to msvc/test_skipdata/test_skipdata.vcxproj
index 41a2037b..3d91b2d2 100644
--- a/msvc/test-skipdata/test-skipdata.vcxproj
+++ b/msvc/test_skipdata/test_skipdata.vcxproj
@@ -22,7 +22,7 @@
{B09819BB-7EF1-4B04-945D-58117E6940A1}
Win32Proj
capstonetestskipdata
- test-skipdata
+ test_skipdata
diff --git a/msvc/test-sparc/test-sparc.vcxproj b/msvc/test_sparc/test_sparc.vcxproj
similarity index 99%
rename from msvc/test-sparc/test-sparc.vcxproj
rename to msvc/test_sparc/test_sparc.vcxproj
index 0a8efc2e..1cb86f2d 100644
--- a/msvc/test-sparc/test-sparc.vcxproj
+++ b/msvc/test_sparc/test_sparc.vcxproj
@@ -22,7 +22,7 @@
{9E735ABA-00D9-4114-A9E7-0568D8DFF94B}
Win32Proj
capstonetestsparc
- test-sparc
+ test_sparc
diff --git a/msvc/test-systemz/test-systemz.vcxproj b/msvc/test_systemz/test_systemz.vcxproj
similarity index 99%
rename from msvc/test-systemz/test-systemz.vcxproj
rename to msvc/test_systemz/test_systemz.vcxproj
index c7f6c871..2cff1502 100644
--- a/msvc/test-systemz/test-systemz.vcxproj
+++ b/msvc/test_systemz/test_systemz.vcxproj
@@ -25,7 +25,7 @@
{D83F2A2D-D5F1-421E-A5B7-B47F1ECABAD2}
Win32Proj
capstonetestsystemz
- test-systemz
+ test_systemz
diff --git a/msvc/test-x86/test-x86.vcxproj b/msvc/test_x86/test_x86.vcxproj
similarity index 99%
rename from msvc/test-x86/test-x86.vcxproj
rename to msvc/test_x86/test_x86.vcxproj
index 5f4b7b2e..24ba762e 100644
--- a/msvc/test-x86/test-x86.vcxproj
+++ b/msvc/test_x86/test_x86.vcxproj
@@ -22,7 +22,7 @@
{9C69243E-C7DC-42A4-AB86-0696E51697C8}
Win32Proj
capstonetestx86
- test-x86
+ test_x86