diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 4d317bb8ce..c07a56ef6a 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -290,12 +290,12 @@ content_files =					\
 	gtk4-demo.xml				\
 	gtk4-icon-browser.xml			\
 	gtk4-widget-factory.xml			\
-	gtk-builder-tool.xml			\
-	gtk-encode-symbolic-svg.xml		\
-	gtk-launch.xml				\
+	gtk4-builder-tool.xml			\
+	gtk4-encode-symbolic-svg.xml		\
+	gtk4-launch.xml				\
 	gtk4-query-immodules.xml		\
-	gtk-query-settings.xml			\
-	gtk-update-icon-cache.xml		\
+	gtk4-query-settings.xml			\
+	gtk4-update-icon-cache.xml		\
 	input-handling.xml			\
 	migrating-2to3.xml			\
 	migrating-3xtoy.xml			\
@@ -497,16 +497,16 @@ EXTRA_DIST += version.xml.in gtk4.types.in
 
 man_MANS = 				\
 	gtk4-query-immodules.1		\
-	gtk-update-icon-cache.1		\
-	gtk-encode-symbolic-svg.1	\
-	gtk-launch.1			\
+	gtk4-update-icon-cache.1	\
+	gtk4-encode-symbolic-svg.1	\
+	gtk4-launch.1			\
 	gtk4-demo.1			\
 	gtk4-demo-application.1		\
 	gtk4-widget-factory.1		\
 	gtk4-icon-browser.1		\
 	broadwayd.1			\
-	gtk-builder-tool.1 		\
-	gtk-query-settings.1
+	gtk4-builder-tool.1 		\
+	gtk4-query-settings.1
 
 if ENABLE_MAN
 
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 626ea7d90b..38eb57eee4 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -364,11 +364,11 @@
     <xi:include href="gtk4-widget-factory.xml" />
     <xi:include href="gtk4-icon-browser.xml" />
     <xi:include href="gtk4-query-immodules.xml" />
-    <xi:include href="gtk-update-icon-cache.xml" />
-    <xi:include href="gtk-encode-symbolic-svg.xml" />
-    <xi:include href="gtk-builder-tool.xml" />
-    <xi:include href="gtk-launch.xml" />
-    <xi:include href="gtk-query-settings.xml" />
+    <xi:include href="gtk4-update-icon-cache.xml" />
+    <xi:include href="gtk4-encode-symbolic-svg.xml" />
+    <xi:include href="gtk4-builder-tool.xml" />
+    <xi:include href="gtk4-launch.xml" />
+    <xi:include href="gtk4-query-settings.xml" />
     <xi:include href="broadwayd.xml" />
   </part>
 
diff --git a/docs/reference/gtk/gtk-builder-tool.xml b/docs/reference/gtk/gtk4-builder-tool.xml
similarity index 85%
rename from docs/reference/gtk/gtk-builder-tool.xml
rename to docs/reference/gtk/gtk4-builder-tool.xml
index 375cdb967b..b7be944fe6 100644
--- a/docs/reference/gtk/gtk-builder-tool.xml
+++ b/docs/reference/gtk/gtk4-builder-tool.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<refentry id="gtk-builder-tool">
+<refentry id="gtk4-builder-tool">
 
 <refentryinfo>
-  <title>gtk-builder-tool</title>
+  <title>gtk4-builder-tool</title>
   <productname>GTK+</productname>
   <authorgroup>
     <author>
@@ -17,19 +17,19 @@
 </refentryinfo>
 
 <refmeta>
-  <refentrytitle>gtk-builder-tool</refentrytitle>
+  <refentrytitle>gtk4-builder-tool</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">User Commands</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-  <refname>gtk-builder-tool</refname>
+  <refname>gtk4-builder-tool</refname>
   <refpurpose>GtkBuilder file utility</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>gtk-builder-tool</command>
+<command>gtk4-builder-tool</command>
 <arg choice="opt"><replaceable>COMMAND</replaceable></arg>
 <arg choice="opt" rep="repeat"><replaceable>OPTION</replaceable></arg>
 <arg choice="plain"><replaceable>FILE</replaceable></arg>
@@ -38,11 +38,11 @@
 
 <refsect1><title>Description</title>
 <para>
-  <command>gtk-builder-tool</command> can perform various operations
+  <command>gtk4-builder-tool</command> can perform various operations
   on GtkBuilder .ui files.
 </para>
 <para>
-  You should always test the modified .ui files produced by gtk-builder-tool
+  You should always test the modified .ui files produced by gtk4-builder-tool
   before using them in production.
 </para>
 </refsect1>
@@ -77,7 +77,7 @@
     <varlistentry>
     <term><option>--id=<arg choice="plain">ID</arg></option></term>
       <listitem><para>The ID of the object to preview. If not specified,
-                gtk-builder-tool will choose a suitable object on its own.</para></listitem>
+                gtk4-builder-tool will choose a suitable object on its own.</para></listitem>
     </varlistentry>
     <varlistentry>
     <term><option>--css=<arg choice="plain">FILE</arg></option></term>
diff --git a/docs/reference/gtk/gtk-encode-symbolic-svg.xml b/docs/reference/gtk/gtk4-encode-symbolic-svg.xml
similarity index 85%
rename from docs/reference/gtk/gtk-encode-symbolic-svg.xml
rename to docs/reference/gtk/gtk4-encode-symbolic-svg.xml
index f17e95d84f..3bf22456d2 100644
--- a/docs/reference/gtk/gtk-encode-symbolic-svg.xml
+++ b/docs/reference/gtk/gtk4-encode-symbolic-svg.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<refentry id="gtk-encode-symbolic-svg">
+<refentry id="gtk4-encode-symbolic-svg">
 
 <refentryinfo>
-  <title>gtk-encode-symbolic-svg</title>
+  <title>gtk4-encode-symbolic-svg</title>
   <productname>GTK+</productname>
   <authorgroup>
     <author>
@@ -17,19 +17,19 @@
 </refentryinfo>
 
 <refmeta>
-  <refentrytitle>gtk-encode-symbolic-svg</refentrytitle>
+  <refentrytitle>gtk4-encode-symbolic-svg</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">User Commands</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-  <refname>gtk-encode-symbolic-svg</refname>
+  <refname>gtk4-encode-symbolic-svg</refname>
   <refpurpose>Symbolic icon conversion utility</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>gtk-encode-symbolic-svg</command>
+<command>gtk4-encode-symbolic-svg</command>
 <arg choice="opt">OPTION...</arg>
 <arg choice="plain"><replaceable>PATH</replaceable></arg>
 <arg choice="plain"><replaceable>WIDTH</replaceable>x<replaceable>HEIGHT</replaceable></arg>
@@ -38,7 +38,7 @@
 
 <refsect1><title>Description</title>
 <para>
-  <command>gtk-encode-symbolic-svg</command> converts symbolic svg icons into
+  <command>gtk4-encode-symbolic-svg</command> converts symbolic svg icons into
   specially prepared png files. GTK+ can load and recolor these pngs, just like
   original svgs, but loading them is much faster.
 </para>
diff --git a/docs/reference/gtk/gtk-launch.xml b/docs/reference/gtk/gtk4-launch.xml
similarity index 85%
rename from docs/reference/gtk/gtk-launch.xml
rename to docs/reference/gtk/gtk4-launch.xml
index 86ffe6dbf3..6bfc0a149d 100644
--- a/docs/reference/gtk/gtk-launch.xml
+++ b/docs/reference/gtk/gtk4-launch.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<refentry id="gtk-launch">
+<refentry id="gtk4-launch">
 
 <refentryinfo>
-  <title>gtk-launch</title>
+  <title>gtk4-launch</title>
   <productname>GTK+</productname>
   <authorgroup>
     <author>
@@ -18,19 +18,19 @@
 </refentryinfo>
 
 <refmeta>
-  <refentrytitle>gtk-launch</refentrytitle>
+  <refentrytitle>gtk4-launch</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">User Commands</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-  <refname>gtk-launch</refname>
+  <refname>gtk4-launch</refname>
   <refpurpose>Launch an application</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>gtk-launch</command>
+<command>gtk4-launch</command>
 <arg choice="opt" rep="repeat">OPTION</arg>
 <arg choice="plain">APPLICATION</arg>
 <arg choice="opt" rep="repeat">URI</arg>
@@ -39,12 +39,12 @@
 
 <refsect1><title>Description</title>
 <para>
-<command>gtk-launch</command> launches an application using the given name.
+<command>gtk4-launch</command> launches an application using the given name.
 The application is started with proper startup notification on a default
 display, unless specified otherwise.
 </para>
 <para>
-<command>gtk-launch</command> takes at least one argument, the name of
+<command>gtk4-launch</command> takes at least one argument, the name of
 the application to launch. The name should match application desktop file name,
 as residing in /usr/share/application, with or without the '.desktop' suffix.
 </para>
diff --git a/docs/reference/gtk/gtk-query-settings.xml b/docs/reference/gtk/gtk4-query-settings.xml
similarity index 76%
rename from docs/reference/gtk/gtk-query-settings.xml
rename to docs/reference/gtk/gtk4-query-settings.xml
index 52f9638e07..1702bcd3fb 100644
--- a/docs/reference/gtk/gtk-query-settings.xml
+++ b/docs/reference/gtk/gtk4-query-settings.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<refentry id="gtk-query-settings">
+<refentry id="gtk4-query-settings">
 
 <refentryinfo>
-  <title>gtk-query-settings</title>
+  <title>gtk4-query-settings</title>
   <productname>GTK+</productname>
   <authorgroup>
     <author>
@@ -17,26 +17,26 @@
 </refentryinfo>
 
 <refmeta>
-  <refentrytitle>gtk-query-settings</refentrytitle>
+  <refentrytitle>gtk4-query-settings</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">User Commands</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-  <refname>gtk-query-settings</refname>
+  <refname>gtk4-query-settings</refname>
   <refpurpose>Utility to print name and value of all GtkSettings properties</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>gtk-query-settings</command>
+<command>gtk4-query-settings</command>
 <arg choice="opt"><replaceable>PATTERN</replaceable></arg>
 </cmdsynopsis>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 <para>
-  <command>gtk-query-settings</command> prints both name and value of all properties
+  <command>gtk4-query-settings</command> prints both name and value of all properties
   available in the GtkSettings class. Optionally, you can filter which properties
   to list by specifying a PATTERN.
 </para>
diff --git a/docs/reference/gtk/gtk-update-icon-cache.xml b/docs/reference/gtk/gtk4-update-icon-cache.xml
similarity index 89%
rename from docs/reference/gtk/gtk-update-icon-cache.xml
rename to docs/reference/gtk/gtk4-update-icon-cache.xml
index 9c46b5a70d..8f6409ed46 100644
--- a/docs/reference/gtk/gtk-update-icon-cache.xml
+++ b/docs/reference/gtk/gtk4-update-icon-cache.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<refentry id="gtk-update-icon-cache">
+<refentry id="gtk4-update-icon-cache">
 
 <refentryinfo>
-  <title>gtk-update-icon-cache</title>
+  <title>gtk4-update-icon-cache</title>
   <productname>GTK+</productname>
   <authorgroup>
     <author>
@@ -17,19 +17,19 @@
 </refentryinfo>
 
 <refmeta>
-  <refentrytitle>gtk-update-icon-cache</refentrytitle>
+  <refentrytitle>gtk4-update-icon-cache</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">User Commands</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-  <refname>gtk-update-icon-cache</refname>
+  <refname>gtk4-update-icon-cache</refname>
   <refpurpose>Icon theme caching utility</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>gtk-update-icon-cache</command>
+<command>gtk4-update-icon-cache</command>
 <arg choice="opt">--force</arg>
 <arg choice="opt">--ignore-theme-index</arg>
 <group>
@@ -45,7 +45,7 @@
 
 <refsect1><title>Description</title>
 <para>
-  <command>gtk-update-icon-cache</command> creates mmapable cache
+  <command>gtk4-update-icon-cache</command> creates mmapable cache
   files for icon themes.
 </para>
 <para>
@@ -56,7 +56,7 @@
   the icons in the directory tree below the given directory.
 </para>
 <para>
-  GTK+ can use the cache files created by <command>gtk-update-icon-cache</command>
+  GTK+ can use the cache files created by <command>gtk4-update-icon-cache</command>
   to avoid a lot of system call and disk seek overhead when the application
   starts. Since the format of the cache files allows them to be mmaped
   shared between multiple applications, the overall memory consumption is
@@ -77,7 +77,7 @@
     <term>--ignore-theme-index</term>
     <term>-t</term>
     <listitem><para>Don't check for the existence of <filename>index.theme</filename>
-     in the icon theme directory. Without this option, <command>gtk-update-icon-cache</command>
+     in the icon theme directory. Without this option, <command>gtk4-update-icon-cache</command>
      refuses to create an icon cache in a directory which does not appear to
      be the toplevel directory of an icon theme.
     </para></listitem>
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 92c2af2dee..9c481dc035 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1553,11 +1553,11 @@ endif
 #
 bin_PROGRAMS = \
 	gtk4-query-immodules	\
-	gtk-update-icon-cache \
-	gtk-encode-symbolic-svg \
-	gtk-builder-tool \
-	gtk-query-settings \
-	gtk-launch
+	gtk4-update-icon-cache \
+	gtk4-encode-symbolic-svg \
+	gtk4-builder-tool \
+	gtk4-query-settings \
+	gtk4-launch
 
 gtk4_query_immodules_SOURCES = queryimmodules.c gtkutils.c
 gtk4_query_immodules_LDADD = 		\
@@ -1567,32 +1567,32 @@ gtk4_query_immodules_LDADD = 		\
 	$(GMODULE_LIBS)				\
 	$(GTK_DEP_LIBS)
 
-gtk_update_icon_cache_SOURCES = updateiconcache.c
-gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
+gtk4_update_icon_cache_SOURCES = updateiconcache.c
+gtk4_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
 
-gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
-gtk_encode_symbolic_svg_LDADD =			\
+gtk4_encode_symbolic_svg_SOURCES = encodesymbolic.c
+gtk4_encode_symbolic_svg_LDADD =			\
 	$(GDK_PIXBUF_LIBS)			\
 	$(top_builddir)/gdk/libgdk-4.la		\
 	$(top_builddir)/gsk/libgsk-4.la		\
 	$(GTK_DEP_LIBS)
 
-gtk_builder_tool_SOURCES = gtk-builder-tool.c
-gtk_builder_tool_LDADD =			\
+gtk4_builder_tool_SOURCES = gtk-builder-tool.c
+gtk4_builder_tool_LDADD =			\
 	libgtk-4.la				\
 	$(top_builddir)/gdk/libgdk-4.la		\
 	$(top_builddir)/gsk/libgsk-4.la		\
 	$(GTK_DEP_LIBS)
 
-gtk_query_settings_SOURCES = gtk-query-settings.c
-gtk_query_settings_LDADD= 			\
+gtk4_query_settings_SOURCES = gtk-query-settings.c
+gtk4_query_settings_LDADD= 			\
 	libgtk-4.la				\
 	$(top_builddir)/gdk/libgdk-4.la		\
 	$(top_builddir)/gsk/libgsk-4.la		\
 	$(GTK_DEP_LIBS)
 
-gtk_launch_SOURCES = gtk-launch.c
-gtk_launch_LDADD =				\
+gtk4_launch_SOURCES = gtk-launch.c
+gtk4_launch_LDADD =				\
 	libgtk-4.la				\
 	$(top_builddir)/gdk/libgdk-4.la		\
 	$(top_builddir)/gsk/libgsk-4.la		\