diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am
index f05cc59c43..90166a4715 100644
--- a/build/win32/vs12/Makefile.am
+++ b/build/win32/vs12/Makefile.am
@@ -46,14 +46,14 @@ EXTRA_DIST += \
 	gsk-4.vcxproj.filtersin			\
 	gtk-4.vcxprojin				\
 	gtk-4.vcxproj.filtersin			\
-	gtk-builder-tool.vcxproj		\
-	gtk-builder-tool.vcxproj.filters	\
-	gtk-encode-symbolic-svg.vcxproj		\
-	gtk-encode-symbolic-svg.vcxproj.filters	\
-	gtk-query-settings.vcxproj		\
-	gtk-query-settings.vcxproj.filters	\
-	gtk-update-icon-cache.vcxproj		\
-	gtk-update-icon-cache.vcxproj.filters	\
+	gtk4-builder-tool.vcxproj		\
+	gtk4-builder-tool.vcxproj.filters	\
+	gtk4-encode-symbolic-svg.vcxproj	\
+	gtk4-encode-symbolic-svg.vcxproj.filters	\
+	gtk4-query-settings.vcxproj		\
+	gtk4-query-settings.vcxproj.filters	\
+	gtk4-update-icon-cache.vcxproj		\
+	gtk4-update-icon-cache.vcxproj.filters	\
 	gtk4-demo.vcxprojin			\
 	gtk4-demo.vcxproj.filtersin		\
 	gtk4-demo-application.vcxprojin		\
diff --git a/build/win32/vs12/gtk+-4.sln b/build/win32/vs12/gtk+-4.sln
index b0684fffca..e497181d68 100644
--- a/build/win32/vs12/gtk+-4.sln
+++ b/build/win32/vs12/gtk+-4.sln
@@ -20,13 +20,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-demo-application", "gt
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-icon-browser", "gtk4-icon-browser.vcxproj", "{343333C4-D46C-4C97-A986-959CCA6F1DE0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-encode-symbolic-svg", "gtk-encode-symbolic-svg.vcxproj", "{F280BF1A-777A-4FB5-8005-DFBE04621EDB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-encode-symbolic-svg", "gtk-encode-symbolic-svg.vcxproj", "{F280BF1A-777A-4FB5-8005-DFBE04621EDB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-update-icon-cache", "gtk-update-icon-cache.vcxproj", "{FC98AF16-4C68-42DF-906B-93A6804C198A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-update-icon-cache", "gtk-update-icon-cache.vcxproj", "{FC98AF16-4C68-42DF-906B-93A6804C198A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-builder-tool", "gtk-builder-tool.vcxproj", "{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-builder-tool", "gtk-builder-tool.vcxproj", "{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-query-settings", "gtk-query-settings.vcxproj", "{9F22107A-3EF7-4B52-B269-747B65307F36}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-query-settings", "gtk-query-settings.vcxproj", "{9F22107A-3EF7-4B52-B269-747B65307F36}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-install", "gtk4-install.vcxproj", "{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}"
 EndProject
diff --git a/build/win32/vs12/gtk-builder-tool.vcxproj b/build/win32/vs12/gtk4-builder-tool.vcxproj
similarity index 99%
rename from build/win32/vs12/gtk-builder-tool.vcxproj
rename to build/win32/vs12/gtk4-builder-tool.vcxproj
index 0c2ce14bb3..0404e866b5 100644
--- a/build/win32/vs12/gtk-builder-tool.vcxproj
+++ b/build/win32/vs12/gtk4-builder-tool.vcxproj
@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}</ProjectGuid>
-    <RootNamespace>gtkencodesymbolicsvg</RootNamespace>
+    <RootNamespace>gtk4buildertool</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/build/win32/vs12/gtk-builder-tool.vcxproj.filters b/build/win32/vs12/gtk4-builder-tool.vcxproj.filters
similarity index 100%
rename from build/win32/vs12/gtk-builder-tool.vcxproj.filters
rename to build/win32/vs12/gtk4-builder-tool.vcxproj.filters
diff --git a/build/win32/vs12/gtk-encode-symbolic-svg.vcxproj b/build/win32/vs12/gtk4-encode-symbolic-svg.vcxproj
similarity index 99%
rename from build/win32/vs12/gtk-encode-symbolic-svg.vcxproj
rename to build/win32/vs12/gtk4-encode-symbolic-svg.vcxproj
index a424f8be4f..e6587f99e0 100644
--- a/build/win32/vs12/gtk-encode-symbolic-svg.vcxproj
+++ b/build/win32/vs12/gtk4-encode-symbolic-svg.vcxproj
@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{F280BF1A-777A-4FB5-8005-DFBE04621EDB}</ProjectGuid>
-    <RootNamespace>gtkencodesymbolicsvg</RootNamespace>
+    <RootNamespace>gtk4encodesymbolicsvg</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/build/win32/vs12/gtk-encode-symbolic-svg.vcxproj.filters b/build/win32/vs12/gtk4-encode-symbolic-svg.vcxproj.filters
similarity index 100%
rename from build/win32/vs12/gtk-encode-symbolic-svg.vcxproj.filters
rename to build/win32/vs12/gtk4-encode-symbolic-svg.vcxproj.filters
diff --git a/build/win32/vs12/gtk4-install.propsin b/build/win32/vs12/gtk4-install.propsin
index ce9adb6453..33cc3fb42e 100644
--- a/build/win32/vs12/gtk4-install.propsin
+++ b/build/win32/vs12/gtk4-install.propsin
@@ -27,14 +27,14 @@ copy "$(BinDir)\gtk4-demo-application.exe" $(CopyDir)\bin
 copy "$(BinDir)\gtk4-demo-application.pdb" $(CopyDir)\bin
 copy "$(BinDir)\gtk4-icon-browser.exe" $(CopyDir)\bin
 copy "$(BinDir)\gtk4-icon-browser.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk-encode-symbolic-svg.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk-encode-symbolic-svg.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk-update-icon-cache.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk-update-icon-cache.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk-query-settings.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk-query-settings.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk-builder-tool.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk-builder-tool.pdb" $(CopyDir)\bin
+copy "$(BinDir)\gtk4-encode-symbolic-svg.exe" $(CopyDir)\bin
+copy "$(BinDir)\gtk4-encode-symbolic-svg.pdb" $(CopyDir)\bin
+copy "$(BinDir)\gtk4-update-icon-cache.exe" $(CopyDir)\bin
+copy "$(BinDir)\gtk4-update-icon-cache.pdb" $(CopyDir)\bin
+copy "$(BinDir)\gtk4-query-settings.exe" $(CopyDir)\bin
+copy "$(BinDir)\gtk4-query-settings.pdb" $(CopyDir)\bin
+copy "$(BinDir)\gtk4-builder-tool.exe" $(CopyDir)\bin
+copy "$(BinDir)\gtk4-builder-tool.pdb" $(CopyDir)\bin
 goto DONE_BIN
 
 :DO_BROADWAY_BIN
@@ -56,14 +56,14 @@ copy .\Release\$(Platform)\bin\gtk4-demo-application.exe $(CopyDir)\bin
 copy .\Release\$(Platform)\bin\gtk4-demo-application.pdb $(CopyDir)\bin
 copy .\Release\$(Platform)\bin\gtk4-icon-browser.exe $(CopyDir)\bin
 copy .\Release\$(Platform)\bin\gtk4-icon-browser.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk4-encode-symbolic-svg.exe $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk4-encode-symbolic-svg.pdb $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk4-update-icon-cache.exe $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk4-update-icon-cache.pdb $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk4-query-settings.exe $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk4-query-settings.pdb $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk4-builder-tool.exe $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk4-builder-tool.pdb $(CopyDir)\bin
 
 goto DONE_BIN
 
@@ -80,14 +80,14 @@ copy .\Debug\$(Platform)\bin\gtk4-demo-application.exe $(CopyDir)\bin
 copy .\Debug\$(Platform)\bin\gtk4-demo-application.pdb $(CopyDir)\bin
 copy .\Debug\$(Platform)\bin\gtk4-icon-browser.exe $(CopyDir)\bin
 copy .\Debug\$(Platform)\bin\gtk4-icon-browser.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk4-encode-symbolic-svg.exe $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk4-encode-symbolic-svg.pdb $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk4-update-icon-cache.exe $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk4-update-icon-cache.pdb $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk4-query-settings.exe $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk4-query-settings.pdb $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk4-builder-tool.exe $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk4-builder-tool.pdb $(CopyDir)\bin
 
 :DONE_BIN
 
@@ -138,7 +138,7 @@ echo "Compiling gsettings XML Files..."
 $(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
 
 echo "Generating icon cache......"
-$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
+$(CopyDir)\bin\gtk4-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
     </GtkPostInstall>
     <GenerateGtkPC>$(PythonPath)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer)</GenerateGtkPC>
     <GenerateGtkPCX64>$(PythonPathX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)</GenerateGtkPCX64>
diff --git a/build/win32/vs12/gtk4-install.vcxproj b/build/win32/vs12/gtk4-install.vcxproj
index 8676d38e9b..b213d2bbd2 100644
--- a/build/win32/vs12/gtk4-install.vcxproj
+++ b/build/win32/vs12/gtk4-install.vcxproj
@@ -245,19 +245,19 @@
       <Project>{e9687d21-e214-4a0c-9eb4-8b38ebb783e5}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="gtk-encode-symbolic-svg.vcxproj">
+    <ProjectReference Include="gtk4-encode-symbolic-svg.vcxproj">
       <Project>{f280bf1a-777a-4fb5-8005-dfbe04621edb}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="gtk-udpate-icon-cache.vcxproj">
+    <ProjectReference Include="gtk4-update-icon-cache.vcxproj">
       <Project>{fc98af16-4c68-42df-906b-93a6804c198a}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="gtk-builder-tool.vcxproj">
+    <ProjectReference Include="gtk4-builder-tool.vcxproj">
       <Project>{7d2397cf-4c25-45bc-a1bb-cb4b6e154bbd}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="gtk-query-settings.vcxproj">
+    <ProjectReference Include="gtk4-query-settings.vcxproj">
       <Project>{9f22107a-4ef7-4b52-b269-747b65307f36}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/build/win32/vs12/gtk-query-settings.vcxproj b/build/win32/vs12/gtk4-query-settings.vcxproj
similarity index 99%
rename from build/win32/vs12/gtk-query-settings.vcxproj
rename to build/win32/vs12/gtk4-query-settings.vcxproj
index 9514793102..450063abc2 100644
--- a/build/win32/vs12/gtk-query-settings.vcxproj
+++ b/build/win32/vs12/gtk4-query-settings.vcxproj
@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9F22107A-3EF7-4B52-B269-747B65307F36}</ProjectGuid>
-    <RootNamespace>gtkencodesymbolicsvg</RootNamespace>
+    <RootNamespace>gtk4querysettings</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/build/win32/vs12/gtk-query-settings.vcxproj.filters b/build/win32/vs12/gtk4-query-settings.vcxproj.filters
similarity index 100%
rename from build/win32/vs12/gtk-query-settings.vcxproj.filters
rename to build/win32/vs12/gtk4-query-settings.vcxproj.filters
diff --git a/build/win32/vs12/gtk-update-icon-cache.vcxproj b/build/win32/vs12/gtk4-update-icon-cache.vcxproj
similarity index 99%
rename from build/win32/vs12/gtk-update-icon-cache.vcxproj
rename to build/win32/vs12/gtk4-update-icon-cache.vcxproj
index 509f5a7181..f07386cf05 100644
--- a/build/win32/vs12/gtk-update-icon-cache.vcxproj
+++ b/build/win32/vs12/gtk4-update-icon-cache.vcxproj
@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{FC98AF16-4C68-42DF-906B-93A6804C198A}</ProjectGuid>
-    <RootNamespace>gtkencodesymbolicsvg</RootNamespace>
+    <RootNamespace>gtk4updateiconcache</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/build/win32/vs12/gtk-update-icon-cache.vcxproj.filters b/build/win32/vs12/gtk4-update-icon-cache.vcxproj.filters
similarity index 100%
rename from build/win32/vs12/gtk-update-icon-cache.vcxproj.filters
rename to build/win32/vs12/gtk4-update-icon-cache.vcxproj.filters
diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am
index 15dd64de7c..d5c565414b 100644
--- a/build/win32/vs14/Makefile.am
+++ b/build/win32/vs14/Makefile.am
@@ -13,14 +13,14 @@ EXTRA_DIST +=	\
 	gsk-4.vcxproj.filters	\
 	gtk-4.vcxproj	\
 	gtk-4.vcxproj.filters	\
-	gtk-builder-tool.vcxproj		\
-	gtk-builder-tool.vcxproj.filters	\
-	gtk-encode-symbolic-svg.vcxproj	\
-	gtk-encode-symbolic-svg.vcxproj.filters	\
-	gtk-query-settings.vcxproj		\
-	gtk-query-settings.vcxproj.filters	\
-	gtk-update-icon-cache.vcxproj		\
-	gtk-update-icon-cache.vcxproj.filters	\
+	gtk4-builder-tool.vcxproj		\
+	gtk4-builder-tool.vcxproj.filters	\
+	gtk4-encode-symbolic-svg.vcxproj	\
+	gtk4-encode-symbolic-svg.vcxproj.filters	\
+	gtk4-query-settings.vcxproj		\
+	gtk4-query-settings.vcxproj.filters	\
+	gtk4-update-icon-cache.vcxproj		\
+	gtk4-update-icon-cache.vcxproj.filters	\
 	gtk4-demo.vcxproj	\
 	gtk4-demo.vcxproj.filters	\
 	gtk4-demo-application.vcxproj	\