diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index 5e6d9a0b3..eb62b2f28 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -18,14 +18,14 @@ EXTRA_DIST = \
 	install.vcxproj	\
 	test-cogl-perf.vcxproj		\
 	test-cogl-perf.vcxproj.filters		\
-	test-conformance.vcxproj		\
-	test-conformance.vcxprojin	\
-	test-conformance.vcxproj.filters		\
-	test-conformance.vcxproj.filtersin	\
-	test-interactive.vcxproj		\
-	test-interactive.vcxprojin	\
-	test-interactive.vcxproj.filters		\
-	test-interactive.vcxproj.filtersin	\
+	test-conformance-clutter.vcxproj		\
+	test-conformance-clutter.vcxprojin	\
+	test-conformance-clutter.vcxproj.filters		\
+	test-conformance-clutter.vcxproj.filtersin	\
+	test-interactive-clutter.vcxproj		\
+	test-interactive-clutter.vcxprojin	\
+	test-interactive-clutter.vcxproj.filters		\
+	test-interactive-clutter.vcxproj.filtersin	\
 	test-picking.vcxproj		\
 	test-picking.vcxproj.filters		\
 	test-random-text.vcxproj	\
diff --git a/build/win32/vs10/clutter.sln b/build/win32/vs10/clutter.sln
index e5e4c23eb..78161391a 100644
--- a/build/win32/vs10/clutter.sln
+++ b/build/win32/vs10/clutter.sln
@@ -23,9 +23,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-atkevents-example", "
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-clone-example", "cally-clone-example.vcxproj", "{E77D40D0-19D4-4865-BE20-B6DA05BA234D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance", "test-conformance.vcxproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-clutter", "test-conformance-clutter.vcxproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-interactive", "test-interactive.vcxproj", "{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-interactive-clutter", "test-interactive-clutter.vcxproj", "{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{35B2A4AC-7235-4FC7-995D-469D59195041}"
 EndProject
diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj
index 4ce8a3e80..5d410458c 100644
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -118,11 +118,11 @@
       <Project>{0da94d83-b64e-40ac-8074-96c2416bbbe8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="test-conformance.vcxproj">
+    <ProjectReference Include="test-conformance-clutter.vcxproj">
       <Project>{0f08f253-de1a-40cb-a890-93ae3ca23ade}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="test-interactive.vcxproj">
+    <ProjectReference Include="test-interactive-clutter.vcxproj">
       <Project>{75f9e5af-040c-448e-96be-c282efffe2d9}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/build/win32/vs10/test-conformance.vcxproj.filtersin b/build/win32/vs10/test-conformance-clutter.vcxproj.filtersin
similarity index 100%
rename from build/win32/vs10/test-conformance.vcxproj.filtersin
rename to build/win32/vs10/test-conformance-clutter.vcxproj.filtersin
diff --git a/build/win32/vs10/test-conformance.vcxprojin b/build/win32/vs10/test-conformance-clutter.vcxprojin
similarity index 99%
rename from build/win32/vs10/test-conformance.vcxprojin
rename to build/win32/vs10/test-conformance-clutter.vcxprojin
index 0c9a20da6..be4283915 100644
--- a/build/win32/vs10/test-conformance.vcxprojin
+++ b/build/win32/vs10/test-conformance-clutter.vcxprojin
@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}</ProjectGuid>
-    <RootNamespace>testconformance</RootNamespace>
+    <RootNamespace>testconformanceclutter</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/build/win32/vs10/test-interactive.vcxproj.filtersin b/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin
similarity index 100%
rename from build/win32/vs10/test-interactive.vcxproj.filtersin
rename to build/win32/vs10/test-interactive-clutter.vcxproj.filtersin
diff --git a/build/win32/vs10/test-interactive.vcxprojin b/build/win32/vs10/test-interactive-clutter.vcxprojin
similarity index 99%
rename from build/win32/vs10/test-interactive.vcxprojin
rename to build/win32/vs10/test-interactive-clutter.vcxprojin
index cdf8fbc82..86299ab6a 100644
--- a/build/win32/vs10/test-interactive.vcxprojin
+++ b/build/win32/vs10/test-interactive-clutter.vcxprojin
@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}</ProjectGuid>
-    <RootNamespace>testinteractive</RootNamespace>
+    <RootNamespace>testinteractiveclutter</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index da1cf16c8..8192f1a1c 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -10,10 +10,10 @@ EXTRA_DIST = \
 	clutter.vsprops		\
 	install.vcproj	\
 	test-cogl-perf.vcproj		\
-	test-conformance.vcproj		\
-	test-conformance.vcprojin	\
-	test-interactive.vcproj		\
-	test-interactive.vcprojin	\
+	test-conformance-clutter.vcproj		\
+	test-conformance-clutter.vcprojin	\
+	test-interactive-clutter.vcproj		\
+	test-interactive-clutter.vcprojin	\
 	test-picking.vcproj		\
 	test-random-text.vcproj	\
 	test-text-perf.vcproj	\
diff --git a/build/win32/vs9/clutter.sln b/build/win32/vs9/clutter.sln
index 5b2d83d32..195ecb01c 100644
--- a/build/win32/vs9/clutter.sln
+++ b/build/win32/vs9/clutter.sln
@@ -53,12 +53,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-clone-example", "call
 		{EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance", "test-conformance.vcproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-clutter", "test-conformance-clutter.vcproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-interactive", "test-interactive.vcproj", "{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-interactive-clutter", "test-interactive-clutter.vcproj", "{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8}
 	EndProjectSection
diff --git a/build/win32/vs9/test-conformance.vcprojin b/build/win32/vs9/test-conformance-clutter.vcprojin
similarity index 98%
rename from build/win32/vs9/test-conformance.vcprojin
rename to build/win32/vs9/test-conformance-clutter.vcprojin
index 95171d1b5..1a8914300 100644
--- a/build/win32/vs9/test-conformance.vcprojin
+++ b/build/win32/vs9/test-conformance-clutter.vcprojin
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="test-conformance"
+	Name="test-conformance-clutter"
 	ProjectGUID="{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
-	RootNamespace="testconformance"
+	RootNamespace="testconformanceclutter"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
 	>
diff --git a/build/win32/vs9/test-interactive.vcprojin b/build/win32/vs9/test-interactive-clutter.vcprojin
similarity index 98%
rename from build/win32/vs9/test-interactive.vcprojin
rename to build/win32/vs9/test-interactive-clutter.vcprojin
index 378492da1..39b0bdd26 100644
--- a/build/win32/vs9/test-interactive.vcprojin
+++ b/build/win32/vs9/test-interactive-clutter.vcprojin
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="test-interactive"
+	Name="test-interactive-clutter"
 	ProjectGUID="{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}"
-	RootNamespace="testinteractive"
+	RootNamespace="testinteractiveclutter"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
 	>
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index e1c8161d2..8f46594cf 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -290,42 +290,42 @@ HTML_REPORTS = \
 EXTRA_DIST = ADDING_NEW_TESTS test-launcher.sh.in run-tests.sh
 DISTCLEANFILES = test-launcher.sh .gitignore
 
-dist-hook: ../../build/win32/vs9/test-conformance.vcproj ../../build/win32/vs10/test-conformance.vcxproj ../../build/win32/vs10/test-conformance.vcxproj.filters
+dist-hook: ../../build/win32/vs9/test-conformance-clutter.vcproj ../../build/win32/vs10/test-conformance-clutter.vcxproj ../../build/win32/vs10/test-conformance-clutter.vcxproj.filters
 
-../../build/win32/vs9/test-conformance.vcproj: $(top_srcdir)/build/win32/vs9/test-conformance.vcprojin
+../../build/win32/vs9/test-conformance-clutter.vcproj: $(top_srcdir)/build/win32/vs9/test-conformance-clutter.vcprojin
 	for F in $(test_conformance_SOURCES); do \
 		case $$F in \
 		*.c)	echo '   <File RelativePath="..\..\..\tests\conform\'$$F'" />' \
 			;; \
 		esac; \
 	done >testconformance.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-conformance.vcprojin >$@
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-conformance-clutter.vcprojin >$@
 	rm testconformance.sourcefiles
 	
-../../build/win32/vs10/test-conformance.vcxproj: $(top_srcdir)/build/win32/vs10/test-conformance.vcxprojin
+../../build/win32/vs10/test-conformance-clutter.vcxproj: $(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxprojin
 	for F in $(test_conformance_SOURCES); do \
 		case $$F in \
 		*.c)	echo '    <ClCompile Include="..\..\..\tests\conform\'$$F'" />' \
 			;; \
 		esac; \
 	done >testconformance.vs10.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance.vcxprojin >$@
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxprojin >$@
 	rm testconformance.vs10.sourcefiles
 	
-../../build/win32/vs10/test-conformance.vcxproj.filters: $(top_srcdir)/build/win32/vs10/test-conformance.vcxproj.filtersin
+../../build/win32/vs10/test-conformance-clutter.vcxproj.filters: $(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxproj.filtersin
 	for F in $(test_conformance_SOURCES); do \
 		case $$F in \
 		*.c)	echo '    <ClCompile Include="..\..\..\tests\conform\'$$F'"><Filter>Sources</Filter></ClCompile>' \
 			;; \
 		esac; \
 	done >testconformance.vs10.sourcefiles.filters
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance.vcxproj.filtersin >$@
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxproj.filtersin >$@
 	rm testconformance.vs10.sourcefiles.filters
 
 # Let the VS9/VS10 Project files be cleared out before they are re-expanded...
-DISTCLEANFILES += ../../build/win32/vs9/test-conformance.vcproj	\
-		  ../../build/win32/vs10/test-conformance.vcxproj	\
-		  ../../build/win32/vs10/test-conformance.vcxproj.filters
+DISTCLEANFILES += ../../build/win32/vs9/test-conformance-clutter.vcproj	\
+		  ../../build/win32/vs10/test-conformance-clutter.vcxproj	\
+		  ../../build/win32/vs10/test-conformance-clutter.vcxproj.filters
 
 # we override the clean-generic target to clean up the wrappers so
 # we cannot use CLEANFILES
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 76088592d..57a9bf5d5 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -166,9 +166,9 @@ DISTCLEANFILES = wrapper.sh .gitignore test-unit-names.h
 
 BUILT_SOURCES = wrappers test-unit-names.h
 
-dist-hook: ../../build/win32/vs9/test-interactive.vcproj ../../build/win32/vs10/test-interactive.vcxproj ../../build/win32/vs10/test-interactive.vcxproj.filters
+dist-hook: ../../build/win32/vs9/test-interactive-clutter.vcproj ../../build/win32/vs10/test-interactive-clutter.vcxproj ../../build/win32/vs10/test-interactive-clutter.vcxproj.filters
 
-../../build/win32/vs9/test-interactive.vcproj: $(top_srcdir)/build/win32/vs9/test-interactive.vcprojin
+../../build/win32/vs9/test-interactive-clutter.vcproj: $(top_srcdir)/build/win32/vs9/test-interactive-clutter.vcprojin
 	for F in $(test_interactive_SOURCES); do \
 		case $$F in \
 		test-pixmap.c|test-devices.c) ;; \
@@ -176,10 +176,10 @@ dist-hook: ../../build/win32/vs9/test-interactive.vcproj ../../build/win32/vs10/
 			;; \
 		esac; \
 	done >testinteractive.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-interactive.vcprojin >$@
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-interactive-clutter.vcprojin >$@
 	rm testinteractive.sourcefiles
 	
-../../build/win32/vs10/test-interactive.vcxproj: $(top_srcdir)/build/win32/vs10/test-interactive.vcxprojin
+../../build/win32/vs10/test-interactive-clutter.vcxproj: $(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxprojin
 	for F in $(test_interactive_SOURCES); do \
 		case $$F in \
 		test-pixmap.c|test-devices.c) ;; \
@@ -187,10 +187,10 @@ dist-hook: ../../build/win32/vs9/test-interactive.vcproj ../../build/win32/vs10/
 			;; \
 		esac; \
 	done >testinteractive.vs10.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-interactive.vcxprojin >$@
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxprojin >$@
 	rm testinteractive.vs10.sourcefiles
 	
-../../build/win32/vs10/test-interactive.vcxproj.filters: $(top_srcdir)/build/win32/vs10/test-interactive.vcxproj.filtersin
+../../build/win32/vs10/test-interactive-clutter.vcxproj.filters: $(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin
 	for F in $(test_interactive_SOURCES); do \
 		case $$F in \
 		test-pixmap.c|test-devices.c) ;; \
@@ -198,12 +198,12 @@ dist-hook: ../../build/win32/vs9/test-interactive.vcproj ../../build/win32/vs10/
 			;; \
 		esac; \
 	done >testinteractive.vs10.sourcefiles.filters
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-interactive.vcxproj.filtersin >$@
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin >$@
 	rm testinteractive.vs10.sourcefiles.filters
 
 # Let the VS9/VS10 Project files be cleared out before they are re-expanded...
-DISTCLEANFILES += ../../build/win32/vs9/test-interactive.vcproj	\
-		  ../../build/win32/vs10/test-interactive.vcxproj	\
-		  ../../build/win32/vs10/test-interactive.vcxproj.filters
+DISTCLEANFILES += ../../build/win32/vs9/test-interactive-clutter.vcproj	\
+		  ../../build/win32/vs10/test-interactive-clutter.vcxproj	\
+		  ../../build/win32/vs10/test-interactive-clutter.vcxproj.filters
 
 clean-local: clean-wrappers