diff --git a/doc/input-filter.py b/doc/input-filter.py
index 9a0101fa6..0792bd1ca 100755
--- a/doc/input-filter.py
+++ b/doc/input-filter.py
@@ -70,7 +70,8 @@ def main():
         res = "\n * ".join(res)
         text = text.replace("@pulse_module_options@", res)
 
-    if os.path.basename(fn).startswith("module-") and fn.endswith(".c"):
+    basename = os.path.basename(fn)
+    if (basename.startswith("module-") or basename.startswith("pulse-module-")) and fn.endswith(".c"):
         text = re.sub(r"^ \* ##", r" * #", text, flags=re.M)
 
     print("/** \\privatesection */")
diff --git a/doc/meson.build b/doc/meson.build
index e5c2936dc..4a6f81976 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -219,7 +219,8 @@ doxygen_env.set('LIBPIPEWIRE_MODULES', '<ul><li>' + '</li><li>'.join(module_manp
 pulse_module_manpage_list = []
 foreach m : pipewire_module_protocol_pulse_sources
   name = fs.stem(fs.name(m))
-  if m.contains('/modules/') and name.startswith('module-')
+  if m.contains('/modules/') and (name.startswith('module-') or name.startswith('pulse-module-'))
+    name = name.replace('pulse-module-', 'module-')
     pagepart = name.replace('-', '_')
     pulse_module_manpage_list += f'\\ref page_pulse_@pagepart@ "pipewire-pulse-@name@(7)"'
     manpages += [[f'pipewire-pulse-@name@.7', f'page_pulse_@pagepart@']]
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 6bd108e95..985e7c223 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -332,38 +332,38 @@ pipewire_module_protocol_pulse_sources = [
   'module-protocol-pulse/stream.c',
   'module-protocol-pulse/utils.c',
   'module-protocol-pulse/volume.c',
-  'module-protocol-pulse/modules/module-alsa-sink.c',
-  'module-protocol-pulse/modules/module-alsa-source.c',
-  'module-protocol-pulse/modules/module-always-sink.c',
-  'module-protocol-pulse/modules/module-combine-sink.c',
-  'module-protocol-pulse/modules/module-device-manager.c',
-  'module-protocol-pulse/modules/module-device-restore.c',
-  'module-protocol-pulse/modules/module-echo-cancel.c',
-  'module-protocol-pulse/modules/module-jackdbus-detect.c',
-  'module-protocol-pulse/modules/module-ladspa-sink.c',
-  'module-protocol-pulse/modules/module-ladspa-source.c',
-  'module-protocol-pulse/modules/module-loopback.c',
-  'module-protocol-pulse/modules/module-native-protocol-tcp.c',
-  'module-protocol-pulse/modules/module-null-sink.c',
-  'module-protocol-pulse/modules/module-pipe-source.c',
-  'module-protocol-pulse/modules/module-pipe-sink.c',
-  'module-protocol-pulse/modules/module-raop-discover.c',
-  'module-protocol-pulse/modules/module-remap-sink.c',
-  'module-protocol-pulse/modules/module-remap-source.c',
-  'module-protocol-pulse/modules/module-roc-sink.c',
-  'module-protocol-pulse/modules/module-roc-sink-input.c',
-  'module-protocol-pulse/modules/module-roc-source.c',
-  'module-protocol-pulse/modules/module-rtp-recv.c',
-  'module-protocol-pulse/modules/module-rtp-send.c',
-  'module-protocol-pulse/modules/module-simple-protocol-tcp.c',
-  'module-protocol-pulse/modules/module-stream-restore.c',
-  'module-protocol-pulse/modules/module-switch-on-connect.c',
-  'module-protocol-pulse/modules/module-tunnel-sink.c',
-  'module-protocol-pulse/modules/module-tunnel-source.c',
-  'module-protocol-pulse/modules/module-virtual-sink.c',
-  'module-protocol-pulse/modules/module-virtual-source.c',
-  'module-protocol-pulse/modules/module-x11-bell.c',
-  'module-protocol-pulse/modules/module-zeroconf-discover.c',
+  'module-protocol-pulse/modules/pulse-module-alsa-sink.c',
+  'module-protocol-pulse/modules/pulse-module-alsa-source.c',
+  'module-protocol-pulse/modules/pulse-module-always-sink.c',
+  'module-protocol-pulse/modules/pulse-module-combine-sink.c',
+  'module-protocol-pulse/modules/pulse-module-device-manager.c',
+  'module-protocol-pulse/modules/pulse-module-device-restore.c',
+  'module-protocol-pulse/modules/pulse-module-echo-cancel.c',
+  'module-protocol-pulse/modules/pulse-module-jackdbus-detect.c',
+  'module-protocol-pulse/modules/pulse-module-ladspa-sink.c',
+  'module-protocol-pulse/modules/pulse-module-ladspa-source.c',
+  'module-protocol-pulse/modules/pulse-module-loopback.c',
+  'module-protocol-pulse/modules/pulse-module-native-protocol-tcp.c',
+  'module-protocol-pulse/modules/pulse-module-null-sink.c',
+  'module-protocol-pulse/modules/pulse-module-pipe-source.c',
+  'module-protocol-pulse/modules/pulse-module-pipe-sink.c',
+  'module-protocol-pulse/modules/pulse-module-raop-discover.c',
+  'module-protocol-pulse/modules/pulse-module-remap-sink.c',
+  'module-protocol-pulse/modules/pulse-module-remap-source.c',
+  'module-protocol-pulse/modules/pulse-module-roc-sink.c',
+  'module-protocol-pulse/modules/pulse-module-roc-sink-input.c',
+  'module-protocol-pulse/modules/pulse-module-roc-source.c',
+  'module-protocol-pulse/modules/pulse-module-rtp-recv.c',
+  'module-protocol-pulse/modules/pulse-module-rtp-send.c',
+  'module-protocol-pulse/modules/pulse-module-simple-protocol-tcp.c',
+  'module-protocol-pulse/modules/pulse-module-stream-restore.c',
+  'module-protocol-pulse/modules/pulse-module-switch-on-connect.c',
+  'module-protocol-pulse/modules/pulse-module-tunnel-sink.c',
+  'module-protocol-pulse/modules/pulse-module-tunnel-source.c',
+  'module-protocol-pulse/modules/pulse-module-virtual-sink.c',
+  'module-protocol-pulse/modules/pulse-module-virtual-source.c',
+  'module-protocol-pulse/modules/pulse-module-x11-bell.c',
+  'module-protocol-pulse/modules/pulse-module-zeroconf-discover.c',
 ]
 
 if snap_dep.found() and glib2_snap_dep.found() and gio2_snap_dep.found() and apparmor_snap_dep.found()
@@ -382,7 +382,7 @@ endif
 
 if avahi_dep.found()
   pipewire_module_protocol_pulse_sources += [
-    'module-protocol-pulse/modules/module-zeroconf-publish.c',
+    'module-protocol-pulse/modules/pulse-module-zeroconf-publish.c',
   ]
   pipewire_module_protocol_pulse_sources += zeroconf_sources
   pipewire_module_protocol_pulse_deps += zeroconf_deps
@@ -390,7 +390,7 @@ endif
 
 if gsettings_gio_dep.found()
   pipewire_module_protocol_pulse_sources += [
-    'module-protocol-pulse/modules/module-gsettings.c',
+    'module-protocol-pulse/modules/pulse-module-gsettings.c',
   ]
   pipewire_module_protocol_pulse_deps += gsettings_gio_dep
   cdata.set('HAVE_GIO', true)
diff --git a/src/modules/module-protocol-pulse/modules/module-alsa-sink.c b/src/modules/module-protocol-pulse/modules/pulse-module-alsa-sink.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-alsa-sink.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-alsa-sink.c
diff --git a/src/modules/module-protocol-pulse/modules/module-alsa-source.c b/src/modules/module-protocol-pulse/modules/pulse-module-alsa-source.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-alsa-source.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-alsa-source.c
diff --git a/src/modules/module-protocol-pulse/modules/module-always-sink.c b/src/modules/module-protocol-pulse/modules/pulse-module-always-sink.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-always-sink.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-always-sink.c
diff --git a/src/modules/module-protocol-pulse/modules/module-combine-sink.c b/src/modules/module-protocol-pulse/modules/pulse-module-combine-sink.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-combine-sink.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-combine-sink.c
diff --git a/src/modules/module-protocol-pulse/modules/module-device-manager.c b/src/modules/module-protocol-pulse/modules/pulse-module-device-manager.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-device-manager.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-device-manager.c
diff --git a/src/modules/module-protocol-pulse/modules/module-device-restore.c b/src/modules/module-protocol-pulse/modules/pulse-module-device-restore.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-device-restore.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-device-restore.c
diff --git a/src/modules/module-protocol-pulse/modules/module-echo-cancel.c b/src/modules/module-protocol-pulse/modules/pulse-module-echo-cancel.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-echo-cancel.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-echo-cancel.c
diff --git a/src/modules/module-protocol-pulse/modules/module-gsettings.c b/src/modules/module-protocol-pulse/modules/pulse-module-gsettings.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-gsettings.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-gsettings.c
diff --git a/src/modules/module-protocol-pulse/modules/module-jackdbus-detect.c b/src/modules/module-protocol-pulse/modules/pulse-module-jackdbus-detect.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-jackdbus-detect.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-jackdbus-detect.c
diff --git a/src/modules/module-protocol-pulse/modules/module-ladspa-sink.c b/src/modules/module-protocol-pulse/modules/pulse-module-ladspa-sink.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-ladspa-sink.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-ladspa-sink.c
diff --git a/src/modules/module-protocol-pulse/modules/module-ladspa-source.c b/src/modules/module-protocol-pulse/modules/pulse-module-ladspa-source.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-ladspa-source.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-ladspa-source.c
diff --git a/src/modules/module-protocol-pulse/modules/module-loopback.c b/src/modules/module-protocol-pulse/modules/pulse-module-loopback.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-loopback.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-loopback.c
diff --git a/src/modules/module-protocol-pulse/modules/module-native-protocol-tcp.c b/src/modules/module-protocol-pulse/modules/pulse-module-native-protocol-tcp.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-native-protocol-tcp.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-native-protocol-tcp.c
diff --git a/src/modules/module-protocol-pulse/modules/module-null-sink.c b/src/modules/module-protocol-pulse/modules/pulse-module-null-sink.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-null-sink.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-null-sink.c
diff --git a/src/modules/module-protocol-pulse/modules/module-pipe-sink.c b/src/modules/module-protocol-pulse/modules/pulse-module-pipe-sink.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-pipe-sink.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-pipe-sink.c
diff --git a/src/modules/module-protocol-pulse/modules/module-pipe-source.c b/src/modules/module-protocol-pulse/modules/pulse-module-pipe-source.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-pipe-source.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-pipe-source.c
diff --git a/src/modules/module-protocol-pulse/modules/module-raop-discover.c b/src/modules/module-protocol-pulse/modules/pulse-module-raop-discover.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-raop-discover.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-raop-discover.c
diff --git a/src/modules/module-protocol-pulse/modules/module-remap-sink.c b/src/modules/module-protocol-pulse/modules/pulse-module-remap-sink.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-remap-sink.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-remap-sink.c
diff --git a/src/modules/module-protocol-pulse/modules/module-remap-source.c b/src/modules/module-protocol-pulse/modules/pulse-module-remap-source.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-remap-source.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-remap-source.c
diff --git a/src/modules/module-protocol-pulse/modules/module-roc-sink-input.c b/src/modules/module-protocol-pulse/modules/pulse-module-roc-sink-input.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-roc-sink-input.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-roc-sink-input.c
diff --git a/src/modules/module-protocol-pulse/modules/module-roc-sink.c b/src/modules/module-protocol-pulse/modules/pulse-module-roc-sink.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-roc-sink.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-roc-sink.c
diff --git a/src/modules/module-protocol-pulse/modules/module-roc-source.c b/src/modules/module-protocol-pulse/modules/pulse-module-roc-source.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-roc-source.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-roc-source.c
diff --git a/src/modules/module-protocol-pulse/modules/module-rtp-recv.c b/src/modules/module-protocol-pulse/modules/pulse-module-rtp-recv.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-rtp-recv.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-rtp-recv.c
diff --git a/src/modules/module-protocol-pulse/modules/module-rtp-send.c b/src/modules/module-protocol-pulse/modules/pulse-module-rtp-send.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-rtp-send.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-rtp-send.c
diff --git a/src/modules/module-protocol-pulse/modules/module-simple-protocol-tcp.c b/src/modules/module-protocol-pulse/modules/pulse-module-simple-protocol-tcp.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-simple-protocol-tcp.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-simple-protocol-tcp.c
diff --git a/src/modules/module-protocol-pulse/modules/module-stream-restore.c b/src/modules/module-protocol-pulse/modules/pulse-module-stream-restore.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-stream-restore.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-stream-restore.c
diff --git a/src/modules/module-protocol-pulse/modules/module-switch-on-connect.c b/src/modules/module-protocol-pulse/modules/pulse-module-switch-on-connect.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-switch-on-connect.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-switch-on-connect.c
diff --git a/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c b/src/modules/module-protocol-pulse/modules/pulse-module-tunnel-sink.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-tunnel-sink.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-tunnel-sink.c
diff --git a/src/modules/module-protocol-pulse/modules/module-tunnel-source.c b/src/modules/module-protocol-pulse/modules/pulse-module-tunnel-source.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-tunnel-source.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-tunnel-source.c
diff --git a/src/modules/module-protocol-pulse/modules/module-virtual-sink.c b/src/modules/module-protocol-pulse/modules/pulse-module-virtual-sink.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-virtual-sink.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-virtual-sink.c
diff --git a/src/modules/module-protocol-pulse/modules/module-virtual-source.c b/src/modules/module-protocol-pulse/modules/pulse-module-virtual-source.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-virtual-source.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-virtual-source.c
diff --git a/src/modules/module-protocol-pulse/modules/module-x11-bell.c b/src/modules/module-protocol-pulse/modules/pulse-module-x11-bell.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-x11-bell.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-x11-bell.c
diff --git a/src/modules/module-protocol-pulse/modules/module-zeroconf-discover.c b/src/modules/module-protocol-pulse/modules/pulse-module-zeroconf-discover.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-zeroconf-discover.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-zeroconf-discover.c
diff --git a/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c b/src/modules/module-protocol-pulse/modules/pulse-module-zeroconf-publish.c
similarity index 100%
rename from src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c
rename to src/modules/module-protocol-pulse/modules/pulse-module-zeroconf-publish.c