diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index e5548ab982..ac7c43b1d7 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -16,10 +16,10 @@ EXTRA_DIST += \
 	gtk.vcxproj.filtersin \
 	gtk3-demo.vcxproj \
 	gtk3-demo.vcxproj.filters \
-	libgail.vcxproj \
-	libgail.vcxproj.filters \
-	libgail.vcxprojin \
-	libgail.vcxproj.filtersin \
+	gtka11y.vcxproj \
+	gtka11y.vcxproj.filters \
+	gtka11y.vcxprojin \
+	gtka11y.vcxproj.filtersin \
 	gailutil.vcxproj \
 	gailutil.vcxproj.filters \
 	install.vcxproj
diff --git a/build/win32/vs10/gtk+.sln b/build/win32/vs10/gtk+.sln
index 4350f89a93..25fe37c347 100644
--- a/build/win32/vs10/gtk+.sln
+++ b/build/win32/vs10/gtk+.sln
@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcxproj", "{FC5A
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgail", "libgail.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcxproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
 EndProject
diff --git a/build/win32/vs10/gtk.vcxprojin b/build/win32/vs10/gtk.vcxprojin
index a47e12e14a..09d1b3b684 100644
--- a/build/win32/vs10/gtk.vcxprojin
+++ b/build/win32/vs10/gtk.vcxprojin
@@ -204,7 +204,7 @@
       <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="libgail.vcxproj">
+    <ProjectReference Include="gtka11y.vcxproj">
       <Project>{f756b0db-40a1-4e9f-be1f-8f02cb86ea46}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/build/win32/vs10/libgail.vcxproj.filtersin b/build/win32/vs10/gtka11y.vcxproj.filtersin
similarity index 91%
rename from build/win32/vs10/libgail.vcxproj.filtersin
rename to build/win32/vs10/gtka11y.vcxproj.filtersin
index 636f826a21..5929b8c1d8 100644
--- a/build/win32/vs10/libgail.vcxproj.filtersin
+++ b/build/win32/vs10/gtka11y.vcxproj.filtersin
@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "libgail.vs10.sourcefiles.filters"
+#include "gtka11y.vs10.sourcefiles.filters"
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/libgail.vcxprojin b/build/win32/vs10/gtka11y.vcxprojin
similarity index 96%
rename from build/win32/vs10/libgail.vcxprojin
rename to build/win32/vs10/gtka11y.vcxprojin
index 1f1ad36e67..1a309efd54 100644
--- a/build/win32/vs10/libgail.vcxprojin
+++ b/build/win32/vs10/gtka11y.vcxprojin
@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}</ProjectGuid>
-    <RootNamespace>libgail</RootNamespace>
+    <RootNamespace>gtka11y</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -120,9 +120,9 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "libgail.vs10.sourcefiles"
+#include "gtka11y.vs10.sourcefiles"
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index c0c1500bc7..10bdd326aa 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -10,8 +10,8 @@ EXTRA_DIST += \
 	gtk.vcproj \
 	gtk.vcprojin \
 	gtk3-demo.vcproj \
-	libgail.vcproj \
-	libgail.vcprojin \
+	gtka11y.vcproj \
+	gtka11y.vcprojin \
 	gailutil.vcproj \
 	install.vcproj
 
diff --git a/build/win32/vs9/gtk+.sln b/build/win32/vs9/gtk+.sln
index 2620e17888..13c22f9d87 100644
--- a/build/win32/vs9/gtk+.sln
+++ b/build/win32/vs9/gtk+.sln
@@ -19,7 +19,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcpr
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgail", "libgail.vcproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
 	ProjectSection(ProjectDependencies) = postProject
diff --git a/build/win32/vs9/libgail.vcprojin b/build/win32/vs9/gtka11y.vcprojin
similarity index 93%
rename from build/win32/vs9/libgail.vcprojin
rename to build/win32/vs9/gtka11y.vcprojin
index a9dbea6ef2..1943de1f53 100644
--- a/build/win32/vs9/libgail.vcprojin
+++ b/build/win32/vs9/gtka11y.vcprojin
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="libgail"
+	Name="gtka11y"
 	ProjectGUID="{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
-	RootNamespace="libgail"
+	RootNamespace="gtka11y"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
 	>
@@ -115,7 +115,7 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-#include "libgail.sourcefiles"
+#include "gtka11y.sourcefiles"
 		</Filter>
 		<Filter
 			Name="Headers"
diff --git a/gtk/a11y/Makefile.am b/gtk/a11y/Makefile.am
index 5eec7d42fd..ee9b0ce01c 100644
--- a/gtk/a11y/Makefile.am
+++ b/gtk/a11y/Makefile.am
@@ -137,37 +137,37 @@ libgtka11y_la_LIBADD =  		\
 libgtka11y_la_LDFLAGS =    		\
         $(LDFLAGS)
 
-dist-hook: ../../build/win32/vs9/libgail.vcproj ../../build/win32/vs10/libgail.vcxproj ../../build/win32/vs10/libgail.vcxproj.filters
+dist-hook: $(top_builddir)/build/win32/vs9/gtka11y.vcproj $(top_builddir)/build/win32/vs10/gtka11y.vcxproj $(top_builddir)/build/win32/vs10/gtka11y.vcxproj.filters
 
-../../build/win32/vs9/libgail.vcproj: ../../build/win32/vs9/libgail.vcprojin
-	for F in $(libgail_la_SOURCES); do \
+$(top_builddir)/build/win32/vs9/gtka11y.vcproj: $(top_srcdir)/build/win32/vs9/gtka11y.vcprojin
+	for F in $(gtka11y_c_sources); do \
 		case $$F in \
 		*.c) echo '   <File RelativePath="..\..\..\gtk\a11y\'$$F'" />' \
 		     ;; \
 		esac; \
-	done >libgail.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/libgail.vcprojin >$@
-	rm libgail.sourcefiles
+	done >gtka11y.sourcefiles
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtka11y.vcprojin >$@
+	rm gtka11y.sourcefiles
 
-../../build/win32/vs10/libgail.vcxproj: ../../build/win32/vs10/libgail.vcxprojin
-	for F in $(libgail_la_SOURCES); do \
+$(top_builddir)/build/win32/vs10/gtka11y.vcxproj: $(top_srcdir)/build/win32/vs10/gtka11y.vcxprojin
+	for F in $(gtka11y_c_sources); do \
 		case $$F in \
 		*.c) echo '   <ClCompile Include="..\..\..\gtk\a11y\'$$F'" />' \
 		     ;; \
 		esac; \
-	done >libgail.vs10.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/libgail.vcxprojin >$@
-	rm libgail.vs10.sourcefiles
+	done >gtka11y.vs10.sourcefiles
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtka11y.vcxprojin >$@
+	rm gtka11y.vs10.sourcefiles
 
-../../build/win32/vs10/libgail.vcxproj.filters: ../../build/win32/vs10/libgail.vcxproj.filtersin
-	for F in $(libgail_la_SOURCES); do \
+$(top_builddir)/build/win32/vs10/gtka11y.vcxproj.filters: $(top_srcdir)/build/win32/vs10/gtka11y.vcxproj.filtersin
+	for F in $(gtka11y_c_sources); do \
 		case $$F in \
 		*.c) echo '   <ClCompile Include="..\..\..\gtk\a11y\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
 		     ;; \
 		esac; \
-	done >libgail.vs10.sourcefiles.filters
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/libgail.vcxproj.filtersin >$@
-	rm libgail.vs10.sourcefiles.filters
+	done >gtka11y.vs10.sourcefiles.filters
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtka11y.vcxproj.filtersin >$@
+	rm gtka11y.vs10.sourcefiles.filters
 
 
 -include $(top_srcdir)/git.mk