diff --git a/man/meson.build b/man/meson.build
index ffa332172..c9955a693 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -2,7 +2,7 @@ manpage_conf = configuration_data()
 manpage_conf.set('PACKAGE_NAME', meson.project_name())
 manpage_conf.set('PACKAGE_VERSION', meson.project_version())
 manpage_conf.set('PACKAGE_URL', 'http://pipewire.org')
-manpage_conf.set('PACKAGE_BUGREPORT', 'https://github.com/PipeWire/pipewire/issues')
+manpage_conf.set('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/pipewire/pipewire/issues')
 manpage_conf.set('PIPEWIRE_CONFIG_DIR', pipewire_configdir)
 manpage_conf.set('top_srcdir', meson.source_root())
 manpage_conf.set('top_builddir', meson.build_root())
@@ -10,8 +10,8 @@ manpage_conf.set('top_builddir', meson.build_root())
 manpages = [
   [ 'pipewire', '1' ],
   [ 'pipewire.conf', '5' ],
-  [ 'pipewire-cli', '1' ],
-  [ 'pipewire-monitor', '1' ]
+  [ 'pw-cli', '1' ],
+  [ 'pw-mon', '1' ]
 ]
 
 foreach m : manpages
diff --git a/man/pipewire.1.xml.in b/man/pipewire.1.xml.in
index 39e09b2c6..d582c8a70 100644
--- a/man/pipewire.1.xml.in
+++ b/man/pipewire.1.xml.in
@@ -34,7 +34,7 @@ This file is part of PipeWire.
     <option>
       <p><opt>-n | --name</opt></p>
 
-      <optdesc><p>Set the daemon name (Default pipewire-1).</p></optdesc>
+      <optdesc><p>Set the daemon name (Default pipewire-0).</p></optdesc>
     </option>
 
   </options>
@@ -45,7 +45,8 @@ This file is part of PipeWire.
 
   <section name="See also">
     <p>
-      <manref name="pipewire-monitor" section="1"/>,
+      <manref name="pw-mon" section="1"/>,
+      <manref name="pw-cli" section="1"/>,
     </p>
   </section>
 
diff --git a/man/pipewire.conf.5.xml.in b/man/pipewire.conf.5.xml.in
index e7a1fbfc4..d6d45259e 100644
--- a/man/pipewire.conf.5.xml.in
+++ b/man/pipewire.conf.5.xml.in
@@ -48,7 +48,7 @@ This file is part of PipeWire.
   <section name="See also">
     <p>
       <manref name="pipewire" section="1"/>,
-      <manref name="pipewire-monitor" section="1"/>,
+      <manref name="pw-mon" section="1"/>,
     </p>
   </section>
 
diff --git a/man/pipewire-cli.1.xml.in b/man/pw-cli.1.xml.in
similarity index 93%
rename from man/pipewire-cli.1.xml.in
rename to man/pw-cli.1.xml.in
index e3acf7a37..fe70b2075 100644
--- a/man/pipewire-cli.1.xml.in
+++ b/man/pw-cli.1.xml.in
@@ -6,18 +6,18 @@
 This file is part of PipeWire.
 -->
 
-<manpage name="pipewire-cli" section="1" desc="The PipeWire Command Line Interface">
+<manpage name="pw-cli" section="1" desc="The PipeWire Command Line Interface">
 
   <synopsis>
-    <cmd>pipewire-cli</cmd>
+    <cmd>pw-cli</cmd>
   </synopsis>
 
   <description>
     <p>Interact with a PipeWire instance.</p>
 
-    <p><manref name="pipewire-cli" section="1"/> starts an interactive session
+    <p><manref name="pw-cli" section="1"/> starts an interactive session
     with a pipewire instance. By default, a connection is made with the local
-    PipeWire instance, that of the pipewire-cli command itself.</p>
+    PipeWire instance, that of the pw-cli command itself.</p>
 
     <p>Connections to other, remote instances can be made. The current instance
       name is displayed at the prompt. Some commands operate on the current
@@ -145,7 +145,7 @@ This file is part of PipeWire.
   <section name="See also">
     <p>
       <manref name="pipewire" section="1"/>,
-      <manref name="pipewire-monitor" section="1"/>,
+      <manref name="pw-mon" section="1"/>,
     </p>
   </section>
 
diff --git a/man/pipewire-monitor.1.xml.in b/man/pw-mon.1.xml.in
similarity index 88%
rename from man/pipewire-monitor.1.xml.in
rename to man/pw-mon.1.xml.in
index fd84fceac..6bc5067ed 100644
--- a/man/pipewire-monitor.1.xml.in
+++ b/man/pw-mon.1.xml.in
@@ -6,10 +6,10 @@
 This file is part of PipeWire.
 -->
 
-<manpage name="pipewire-monitor" section="1" desc="The PipeWire monitor">
+<manpage name="pw-mon" section="1" desc="The PipeWire monitor">
 
   <synopsis>
-    <cmd>pipewire-monitor [<arg>remote-name</arg>]</cmd>
+    <cmd>pw-mon [<arg>remote-name</arg>]</cmd>
   </synopsis>
 
   <description>