diff --git a/src/tests/test-unittestpp_vs2005.vcproj b/src/tests/test-unittestpp_vs2005.vcproj
index e13fba8..50d9fa3 100644
--- a/src/tests/test-unittestpp_vs2005.vcproj
+++ b/src/tests/test-unittestpp_vs2005.vcproj
@@ -16,7 +16,7 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="win32_static_md_debug|Win32"
+			Name="win32_static_vc80_md_debug|Win32"
 			OutputDirectory="$(SolutionDir)bin\win32_vc80_static_md_debug"
 			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc80_static_md_debug"
 			ConfigurationType="1"
@@ -94,7 +94,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_static_md_release|Win32"
+			Name="win32_static_vc80_md_release|Win32"
 			OutputDirectory="$(SolutionDir)bin\win32_vc80_static_md_release"
 			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc80_static_md_release"
 			ConfigurationType="1"
@@ -173,7 +173,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_dll_debug|Win32"
+			Name="win32_dll_vc80_debug|Win32"
 			OutputDirectory="$(SolutionDir)bin\win32_vc80_dll_debug"
 			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc80_dll_debug"
 			ConfigurationType="1"
@@ -251,7 +251,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_dll_release|Win32"
+			Name="win32_dll_vc80_release|Win32"
 			OutputDirectory="$(SolutionDir)bin\win32_vc80_dll_release"
 			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc80_dll_release"
 			ConfigurationType="1"
@@ -330,7 +330,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_static_mt_debug|Win32"
+			Name="win32_static_vc80_mt_debug|Win32"
 			OutputDirectory="$(SolutionDir)bin\win32_vc80_static_mt_debug"
 			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc80_static_mt_debug"
 			ConfigurationType="1"
@@ -408,7 +408,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_static_mt_release|Win32"
+			Name="win32_static_vc80_mt_release|Win32"
 			OutputDirectory="$(SolutionDir)bin\win32_vc80_static_mt_release"
 			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc80_static_mt_release"
 			ConfigurationType="1"
diff --git a/src/tests/test-unittestpp_vs2008.vcproj b/src/tests/test-unittestpp_vs2008.vcproj
index 19762d1..e6cfbee 100644
--- a/src/tests/test-unittestpp_vs2008.vcproj
+++ b/src/tests/test-unittestpp_vs2008.vcproj
@@ -17,9 +17,9 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="win32_static_md_debug|Win32"
-			OutputDirectory="$(SolutionDir)bin\win32_vc90_static_md_debug"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc90_static_md_debug"
+			Name="win32_static_vc90_md_debug|Win32"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			>
@@ -93,9 +93,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_static_md_release|Win32"
-			OutputDirectory="$(SolutionDir)bin\win32_vc90_static_md_release"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc90_static_md_release"
+			Name="win32_static_vc90_md_release|Win32"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
@@ -170,9 +170,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_dll_debug|Win32"
-			OutputDirectory="$(SolutionDir)bin\win32_vc90_dll_debug"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc90_dll_debug"
+			Name="win32_dll_vc90_debug|Win32"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			>
@@ -246,9 +246,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_dll_release|Win32"
-			OutputDirectory="$(SolutionDir)bin\win32_vc90_dll_release"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc90_dll_release"
+			Name="win32_dll_vc90_release|Win32"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
@@ -323,9 +323,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_static_mt_debug|Win32"
-			OutputDirectory="$(SolutionDir)bin\win32_vc90_static_mt_debug"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc90_static_mt_debug"
+			Name="win32_static_vc90_mt_debug|Win32"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			>
@@ -399,9 +399,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_static_mt_release|Win32"
-			OutputDirectory="$(SolutionDir)bin\win32_vc90_static_mt_release"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc90_static_mt_release"
+			Name="win32_static_vc90_mt_release|Win32"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
diff --git a/src/unittestpp_vs2005.vcproj b/src/unittestpp_vs2005.vcproj
index 67aeb6a..b69882c 100644
--- a/src/unittestpp_vs2005.vcproj
+++ b/src/unittestpp_vs2005.vcproj
@@ -16,9 +16,9 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="win32_lib_md_debug|Win32"
-			OutputDirectory="$(SolutionDir)lib\win32_vc80_md_debug"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc80_lib_md_debug"
+			Name="win32_static_vc80_md_debug|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -80,9 +80,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_lib_md_release|Win32"
-			OutputDirectory="$(SolutionDir)lib\win32_vc80_md_release"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc80_lib_md_release"
+			Name="win32_static_vc80_md_release|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
@@ -143,9 +143,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_dll_debug|Win32"
-			OutputDirectory="$(SolutionDir)bin\win32_vc80_dll_debug"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc80_dll_debug"
+			Name="win32_dll_vc80_debug|Win32"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			>
@@ -217,9 +217,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_dll_release|Win32"
-			OutputDirectory="$(SolutionDir)bin\win32_vc80_dll_release"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc80_dll_release"
+			Name="win32_dll_vc80_release|Win32"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
@@ -290,9 +290,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_lib_mt_debug|Win32"
-			OutputDirectory="$(SolutionDir)lib\win32_vc80_mt_debug"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc80_lib_mt_debug"
+			Name="win32_static_vc80_mt_debug|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -354,9 +354,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_lib_mt_release|Win32"
-			OutputDirectory="$(SolutionDir)lib\win32_vc80_mt_release"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc80_lib_mt_release"
+			Name="win32_static_vc80_mt_release|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
diff --git a/src/unittestpp_vs2008.vcproj b/src/unittestpp_vs2008.vcproj
index fee20c0..b695cab 100644
--- a/src/unittestpp_vs2008.vcproj
+++ b/src/unittestpp_vs2008.vcproj
@@ -17,9 +17,9 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="win32_lib_md_debug|Win32"
-			OutputDirectory="$(SolutionDir)lib\win32_vc90_md_debug"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc90_lib_md_debug"
+			Name="win32_static_vc90_md_debug|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -80,9 +80,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_lib_md_release|Win32"
-			OutputDirectory="$(SolutionDir)lib\win32_vc90_md_release"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc90_lib_md_release"
+			Name="win32_static_vc90_md_release|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
@@ -142,9 +142,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_dll_debug|Win32"
-			OutputDirectory="$(SolutionDir)bin\win32_vc90_dll_debug"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc90_dll_debug"
+			Name="win32_dll_vc90_debug|Win32"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			>
@@ -214,9 +214,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_dll_release|Win32"
-			OutputDirectory="$(SolutionDir)bin\win32_vc90_dll_release"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc90_dll_release"
+			Name="win32_dll_vc90_release|Win32"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
@@ -285,9 +285,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_lib_mt_debug|Win32"
-			OutputDirectory="$(SolutionDir)lib\win32_vc90_mt_debug"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc90_lib_mt_debug"
+			Name="win32_static_vc90_mt_debug|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -348,9 +348,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="win32_lib_mt_release|Win32"
-			OutputDirectory="$(SolutionDir)lib\win32_vc90_mt_release"
-			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc90_lib_mt_release"
+			Name="win32_static_vc90_mt_release|Win32"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
diff --git a/unittestpp_vs2005.sln b/unittestpp_vs2005.sln
index 69074e8..3bb7617 100644
--- a/unittestpp_vs2005.sln
+++ b/unittestpp_vs2005.sln
@@ -10,38 +10,38 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-unittestpp_vs2005", "s
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		win32_dll_debug|Win32 = win32_dll_debug|Win32
-		win32_dll_release|Win32 = win32_dll_release|Win32
-		win32_lib_md_debug|Win32 = win32_lib_md_debug|Win32
-		win32_lib_md_release|Win32 = win32_lib_md_release|Win32
-		win32_lib_mt_debug|Win32 = win32_lib_mt_debug|Win32
-		win32_lib_mt_release|Win32 = win32_lib_mt_release|Win32
+		win32_dll_vc80_debug|Win32 = win32_dll_vc80_debug|Win32
+		win32_dll_vc80_release|Win32 = win32_dll_vc80_release|Win32
+		win32_static_vc80_md_debug|Win32 = win32_static_vc80_md_debug|Win32
+		win32_static_vc80_md_release|Win32 = win32_static_vc80_md_release|Win32
+		win32_static_vc80_mt_debug|Win32 = win32_static_vc80_mt_debug|Win32
+		win32_static_vc80_mt_release|Win32 = win32_static_vc80_mt_release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_dll_debug|Win32.ActiveCfg = win32_dll_debug|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_dll_debug|Win32.Build.0 = win32_dll_debug|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_dll_release|Win32.ActiveCfg = win32_dll_release|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_dll_release|Win32.Build.0 = win32_dll_release|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_lib_md_debug|Win32.ActiveCfg = win32_lib_md_debug|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_lib_md_debug|Win32.Build.0 = win32_lib_md_debug|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_lib_md_release|Win32.ActiveCfg = win32_lib_md_release|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_lib_md_release|Win32.Build.0 = win32_lib_md_release|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_lib_mt_debug|Win32.ActiveCfg = win32_lib_mt_debug|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_lib_mt_debug|Win32.Build.0 = win32_lib_mt_debug|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_lib_mt_release|Win32.ActiveCfg = win32_lib_mt_release|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_lib_mt_release|Win32.Build.0 = win32_lib_mt_release|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_dll_debug|Win32.ActiveCfg = win32_dll_debug|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_dll_debug|Win32.Build.0 = win32_dll_debug|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_dll_release|Win32.ActiveCfg = win32_dll_release|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_dll_release|Win32.Build.0 = win32_dll_release|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_lib_md_debug|Win32.ActiveCfg = win32_static_md_debug|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_lib_md_debug|Win32.Build.0 = win32_static_md_debug|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_lib_md_release|Win32.ActiveCfg = win32_static_md_release|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_lib_md_release|Win32.Build.0 = win32_static_md_release|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_lib_mt_debug|Win32.ActiveCfg = win32_static_mt_debug|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_lib_mt_debug|Win32.Build.0 = win32_static_mt_debug|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_lib_mt_release|Win32.ActiveCfg = win32_static_mt_release|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_lib_mt_release|Win32.Build.0 = win32_static_mt_release|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_dll_vc80_debug|Win32.ActiveCfg = win32_dll_vc80_debug|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_dll_vc80_debug|Win32.Build.0 = win32_dll_vc80_debug|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_dll_vc80_release|Win32.ActiveCfg = win32_dll_vc80_release|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_dll_vc80_release|Win32.Build.0 = win32_dll_vc80_release|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_static_vc80_md_debug|Win32.ActiveCfg = win32_static_vc80_md_debug|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_static_vc80_md_debug|Win32.Build.0 = win32_static_vc80_md_debug|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_static_vc80_md_release|Win32.ActiveCfg = win32_static_vc80_md_release|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_static_vc80_md_release|Win32.Build.0 = win32_static_vc80_md_release|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_static_vc80_mt_debug|Win32.ActiveCfg = win32_static_vc80_mt_debug|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_static_vc80_mt_debug|Win32.Build.0 = win32_static_vc80_mt_debug|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_static_vc80_mt_release|Win32.ActiveCfg = win32_static_vc80_mt_release|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_static_vc80_mt_release|Win32.Build.0 = win32_static_vc80_mt_release|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_dll_vc80_debug|Win32.ActiveCfg = win32_dll_vc80_debug|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_dll_vc80_debug|Win32.Build.0 = win32_dll_vc80_debug|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_dll_vc80_release|Win32.ActiveCfg = win32_dll_vc80_release|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_dll_vc80_release|Win32.Build.0 = win32_dll_vc80_release|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_static_vc80_md_debug|Win32.ActiveCfg = win32_static_vc80_md_debug|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_static_vc80_md_debug|Win32.Build.0 = win32_static_vc80_md_debug|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_static_vc80_md_release|Win32.ActiveCfg = win32_static_vc80_md_release|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_static_vc80_md_release|Win32.Build.0 = win32_static_vc80_md_release|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_static_vc80_mt_debug|Win32.ActiveCfg = win32_static_vc80_mt_debug|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_static_vc80_mt_debug|Win32.Build.0 = win32_static_vc80_mt_debug|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_static_vc80_mt_release|Win32.ActiveCfg = win32_static_vc80_mt_release|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_static_vc80_mt_release|Win32.Build.0 = win32_static_vc80_mt_release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/unittestpp_vs2008.sln b/unittestpp_vs2008.sln
index 087941c..f7004a4 100644
--- a/unittestpp_vs2008.sln
+++ b/unittestpp_vs2008.sln
@@ -10,38 +10,38 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-unittestpp_vs2008", "s
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		win32_dll_debug|Win32 = win32_dll_debug|Win32
-		win32_dll_release|Win32 = win32_dll_release|Win32
-		win32_lib_md_debug|Win32 = win32_lib_md_debug|Win32
-		win32_lib_md_release|Win32 = win32_lib_md_release|Win32
-		win32_lib_mt_debug|Win32 = win32_lib_mt_debug|Win32
-		win32_lib_mt_release|Win32 = win32_lib_mt_release|Win32
+		win32_dll_vc90_debug|Win32 = win32_dll_vc90_debug|Win32
+		win32_dll_vc90_release|Win32 = win32_dll_vc90_release|Win32
+		win32_static_vc90_md_debug|Win32 = win32_static_vc90_md_debug|Win32
+		win32_static_vc90_md_release|Win32 = win32_static_vc90_md_release|Win32
+		win32_static_vc90_mt_debug|Win32 = win32_static_vc90_mt_debug|Win32
+		win32_static_vc90_mt_release|Win32 = win32_static_vc90_mt_release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_dll_debug|Win32.ActiveCfg = win32_dll_debug|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_dll_debug|Win32.Build.0 = win32_dll_debug|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_dll_release|Win32.ActiveCfg = win32_dll_release|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_dll_release|Win32.Build.0 = win32_dll_release|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_lib_md_debug|Win32.ActiveCfg = win32_lib_md_debug|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_lib_md_debug|Win32.Build.0 = win32_lib_md_debug|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_lib_md_release|Win32.ActiveCfg = win32_lib_md_release|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_lib_md_release|Win32.Build.0 = win32_lib_md_release|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_lib_mt_debug|Win32.ActiveCfg = win32_lib_mt_debug|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_lib_mt_debug|Win32.Build.0 = win32_lib_mt_debug|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_lib_mt_release|Win32.ActiveCfg = win32_lib_mt_release|Win32
-		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_lib_mt_release|Win32.Build.0 = win32_lib_mt_release|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_dll_debug|Win32.ActiveCfg = win32_dll_debug|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_dll_debug|Win32.Build.0 = win32_dll_debug|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_dll_release|Win32.ActiveCfg = win32_dll_release|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_dll_release|Win32.Build.0 = win32_dll_release|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_lib_md_debug|Win32.ActiveCfg = win32_static_md_debug|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_lib_md_debug|Win32.Build.0 = win32_static_md_debug|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_lib_md_release|Win32.ActiveCfg = win32_static_md_release|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_lib_md_release|Win32.Build.0 = win32_static_md_release|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_lib_mt_debug|Win32.ActiveCfg = win32_static_mt_debug|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_lib_mt_debug|Win32.Build.0 = win32_static_mt_debug|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_lib_mt_release|Win32.ActiveCfg = win32_static_mt_release|Win32
-		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_lib_mt_release|Win32.Build.0 = win32_static_mt_release|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_dll_vc90_debug|Win32.ActiveCfg = win32_dll_vc90_debug|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_dll_vc90_debug|Win32.Build.0 = win32_dll_vc90_debug|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_dll_vc90_release|Win32.ActiveCfg = win32_dll_vc90_release|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_dll_vc90_release|Win32.Build.0 = win32_dll_vc90_release|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_static_vc90_md_debug|Win32.ActiveCfg = win32_static_vc90_md_debug|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_static_vc90_md_debug|Win32.Build.0 = win32_static_vc90_md_debug|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_static_vc90_md_release|Win32.ActiveCfg = win32_static_vc90_md_release|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_static_vc90_md_release|Win32.Build.0 = win32_static_vc90_md_release|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_static_vc90_mt_debug|Win32.ActiveCfg = win32_static_vc90_mt_debug|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_static_vc90_mt_debug|Win32.Build.0 = win32_static_vc90_mt_debug|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_static_vc90_mt_release|Win32.ActiveCfg = win32_static_vc90_mt_release|Win32
+		{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.win32_static_vc90_mt_release|Win32.Build.0 = win32_static_vc90_mt_release|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_dll_vc90_debug|Win32.ActiveCfg = win32_dll_vc90_debug|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_dll_vc90_debug|Win32.Build.0 = win32_dll_vc90_debug|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_dll_vc90_release|Win32.ActiveCfg = win32_dll_vc90_release|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_dll_vc90_release|Win32.Build.0 = win32_dll_vc90_release|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_static_vc90_md_debug|Win32.ActiveCfg = win32_static_vc90_md_debug|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_static_vc90_md_debug|Win32.Build.0 = win32_static_vc90_md_debug|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_static_vc90_md_release|Win32.ActiveCfg = win32_static_vc90_md_release|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_static_vc90_md_release|Win32.Build.0 = win32_static_vc90_md_release|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_static_vc90_mt_debug|Win32.ActiveCfg = win32_static_vc90_mt_debug|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_static_vc90_mt_debug|Win32.Build.0 = win32_static_vc90_mt_debug|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_static_vc90_mt_release|Win32.ActiveCfg = win32_static_vc90_mt_release|Win32
+		{9CCC3439-309E-4E85-B3B8-CE704D385D48}.win32_static_vc90_mt_release|Win32.Build.0 = win32_static_vc90_mt_release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE