diff --git a/po/conf.pot b/po/conf.pot
index 1575ca2f..5bb1d7cf 100644
--- a/po/conf.pot
+++ b/po/conf.pot
@@ -8,103 +8,208 @@ msgstr ""
 msgid "Always show microphone for Bluetooth headsets, and switch to headset mode when recording"
 msgstr ""
 
+#. /wireplumber.settings.schema/bluetooth.autoswitch-to-headset-profile/name
+#: wireplumber.conf
+msgid "Auto-switch to headset profile"
+msgstr ""
+
 #. /wireplumber.settings.schema/bluetooth.use-persistent-storage/description
 #: wireplumber.conf
 msgid "Remember and restore Bluetooth headset mode status"
 msgstr ""
 
+#. /wireplumber.settings.schema/bluetooth.use-persistent-storage/name
+#: wireplumber.conf
+msgid "Persistent storage"
+msgstr ""
+
 #. /wireplumber.settings.schema/device.restore-profile/description
 #: wireplumber.conf
 msgid "Remember and restore device profiles"
 msgstr ""
 
+#. /wireplumber.settings.schema/device.restore-profile/name
+#: wireplumber.conf
+msgid "Restore profile"
+msgstr ""
+
 #. /wireplumber.settings.schema/device.restore-routes/description
 #: wireplumber.conf
 msgid "Remember and restore device routes"
 msgstr ""
 
+#. /wireplumber.settings.schema/device.restore-routes/name
+#: wireplumber.conf
+msgid "Restore routes"
+msgstr ""
+
 #. /wireplumber.settings.schema/device.routes.default-sink-volume/description
 #: wireplumber.conf
 msgid "The default volume for audio sinks"
 msgstr ""
 
+#. /wireplumber.settings.schema/device.routes.default-sink-volume/name
+#: wireplumber.conf
+msgid "Default sink volume"
+msgstr ""
+
 #. /wireplumber.settings.schema/device.routes.default-source-volume/description
 #: wireplumber.conf
 msgid "The default volume for audio sources"
 msgstr ""
 
+#. /wireplumber.settings.schema/device.routes.default-source-volume/name
+#: wireplumber.conf
+msgid "Default source volume"
+msgstr ""
+
 #. /wireplumber.settings.schema/linking.allow-moving-streams/description
 #: wireplumber.conf
 msgid "Streams may be moved by adding PipeWire metadata at runtime"
 msgstr ""
 
+#. /wireplumber.settings.schema/linking.allow-moving-streams/name
+#: wireplumber.conf
+msgid "Allow moving streams"
+msgstr ""
+
 #. /wireplumber.settings.schema/linking.follow-default-target/description
 #: wireplumber.conf
 msgid "Streams connected to the default device follow when default changes"
 msgstr ""
 
+#. /wireplumber.settings.schema/linking.follow-default-target/name
+#: wireplumber.conf
+msgid "Follow default target"
+msgstr ""
+
 #. /wireplumber.settings.schema/linking.pause-playback/description
 #: wireplumber.conf
 msgid "Pause media players if their target sink is removed"
 msgstr ""
 
+#. /wireplumber.settings.schema/linking.pause-playback/name
+#: wireplumber.conf
+msgid "Pause playback if output removed"
+msgstr ""
+
 #. /wireplumber.settings.schema/linking.role-based.duck-level/description
 #: wireplumber.conf
 msgid "The volume level to apply when ducking (= reducing volume for a higher priority stream to be audible) in the role-based linking policy"
 msgstr ""
 
+#. /wireplumber.settings.schema/linking.role-based.duck-level/name
+#: wireplumber.conf
+msgid "Ducking level"
+msgstr ""
+
 #. /wireplumber.settings.schema/monitor.camera-discovery-timeout/description
 #: wireplumber.conf
 msgid "The camera discovery timeout in milliseconds"
 msgstr ""
 
+#. /wireplumber.settings.schema/monitor.camera-discovery-timeout/name
+#: wireplumber.conf
+msgid "Discovery timeout"
+msgstr ""
+
 #. /wireplumber.settings.schema/node.features.audio.control-port/description
 #: wireplumber.conf
 msgid "Enable control ports on audio nodes"
 msgstr ""
 
+#. /wireplumber.settings.schema/node.features.audio.control-port/name
+#: wireplumber.conf
+msgid "Control ports"
+msgstr ""
+
 #. /wireplumber.settings.schema/node.features.audio.monitor-ports/description
 #: wireplumber.conf
 msgid "Enable monitor ports on audio nodes"
 msgstr ""
 
+#. /wireplumber.settings.schema/node.features.audio.monitor-ports/name
+#: wireplumber.conf
+msgid "Monitor ports"
+msgstr ""
+
 #. /wireplumber.settings.schema/node.features.audio.no-dsp/description
 #: wireplumber.conf
 msgid "Do not convert audio to F32 format"
 msgstr ""
 
+#. /wireplumber.settings.schema/node.features.audio.no-dsp/name
+#: wireplumber.conf
+msgid "No DSP"
+msgstr ""
+
 #. /wireplumber.settings.schema/node.filter.forward-format/description
 #: wireplumber.conf
 msgid "Forward format on filter nodes or not"
 msgstr ""
 
+#. /wireplumber.settings.schema/node.filter.forward-format/name
+#: wireplumber.conf
+msgid "Forward format"
+msgstr ""
+
 #. /wireplumber.settings.schema/node.restore-default-targets/description
 #: wireplumber.conf
 msgid "Remember and restore default audio/video input/output devices"
 msgstr ""
 
+#. /wireplumber.settings.schema/node.restore-default-targets/name
+#: wireplumber.conf
+msgid "Restore default target"
+msgstr ""
+
 #. /wireplumber.settings.schema/node.stream.default-capture-volume/description
 #: wireplumber.conf
 msgid "The default volume for capture nodes"
 msgstr ""
 
+#. /wireplumber.settings.schema/node.stream.default-capture-volume/name
+#: wireplumber.conf
+msgid "Default capture volume"
+msgstr ""
+
 #. /wireplumber.settings.schema/node.stream.default-media-role/description
 #: wireplumber.conf
 msgid "Default media.role to assign on streams that do not specify it"
 msgstr ""
 
+#. /wireplumber.settings.schema/node.stream.default-media-role/name
+#: wireplumber.conf
+msgid "Default media role"
+msgstr ""
+
 #. /wireplumber.settings.schema/node.stream.default-playback-volume/description
 #: wireplumber.conf
 msgid "The default volume for playback nodes"
 msgstr ""
 
+#. /wireplumber.settings.schema/node.stream.default-playback-volume/name
+#: wireplumber.conf
+msgid "Default playback volume"
+msgstr ""
+
 #. /wireplumber.settings.schema/node.stream.restore-props/description
 #: wireplumber.conf
 msgid "Remember and restore properties of streams"
 msgstr ""
 
+#. /wireplumber.settings.schema/node.stream.restore-props/name
+#: wireplumber.conf
+msgid "Restore properties"
+msgstr ""
+
 #. /wireplumber.settings.schema/node.stream.restore-target/description
 #: wireplumber.conf
 msgid "Remember and restore stream targets"
 msgstr ""
 
+#. /wireplumber.settings.schema/node.stream.restore-target/name
+#: wireplumber.conf
+msgid "Restore target"
+msgstr ""
+
diff --git a/po/meson.build b/po/meson.build
index 4e088ea6..fd6bf5f6 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -11,7 +11,7 @@ if python_po.found() and spa_json_dump_po.found()
     build_by_default : true,
     command : [
       python_po, spa_json_po, '--spa-json-dump=' + spa_json_dump_po.full_path(),
-      '-k', '/wireplumber.settings.schema/[^/]*/description$',
+      '-k', '/wireplumber.settings.schema/[^/]*/(description|name)$',
       '-o', '@CURRENT_SOURCE_DIR@/conf.pot',
       '@INPUT@',
     ],
diff --git a/src/config/wireplumber.conf b/src/config/wireplumber.conf
index 2e805ad9..337e1950 100644
--- a/src/config/wireplumber.conf
+++ b/src/config/wireplumber.conf
@@ -784,11 +784,13 @@ wireplumber.components.rules = [
 wireplumber.settings.schema = {
   ## Bluetooth
   bluetooth.use-persistent-storage = {
+    name = "Persistent storage"
     description = "Remember and restore Bluetooth headset mode status"
     type = "bool"
     default = true
   }
   bluetooth.autoswitch-to-headset-profile = {
+    name = "Auto-switch to headset profile"
     description = "Always show microphone for Bluetooth headsets, and switch to headset mode when recording"
     type = "bool"
     default = true
@@ -796,16 +798,19 @@ wireplumber.settings.schema = {
 
   ## Device
   device.restore-profile = {
+    name = "Restore profile"
     description = "Remember and restore device profiles"
     type = "bool"
     default = true
   }
   device.restore-routes = {
+    name = "Restore routes"
     description = "Remember and restore device routes"
     type = "bool"
     default = true
   }
   device.routes.default-sink-volume = {
+    name = "Default sink volume"
     description = "The default volume for audio sinks"
     type = "float"
     default = 0.064
@@ -813,6 +818,7 @@ wireplumber.settings.schema = {
     max = 1.0
   }
   device.routes.default-source-volume = {
+    name = "Default source volume"
     description = "The default volume for audio sources"
     type = "float"
     default = 1.0
@@ -822,6 +828,7 @@ wireplumber.settings.schema = {
 
   ## Linking
   linking.role-based.duck-level = {
+    name = "Ducking level"
     description = "The volume level to apply when ducking (= reducing volume for a higher priority stream to be audible) in the role-based linking policy"
     type = "float"
     default = 0.3
@@ -829,16 +836,19 @@ wireplumber.settings.schema = {
     max = 1.0
   }
   linking.allow-moving-streams = {
+    name = "Allow moving streams"
     description = "Streams may be moved by adding PipeWire metadata at runtime"
     type = "bool"
     default = true
   }
   linking.follow-default-target = {
+    name = "Follow default target"
     description = "Streams connected to the default device follow when default changes"
     type = "bool"
     default = true
   }
   linking.pause-playback = {
+    name = "Pause playback if output removed"
     description = "Pause media players if their target sink is removed"
     type = "bool"
     default = true
@@ -846,6 +856,7 @@ wireplumber.settings.schema = {
 
   ## Monitor
   monitor.camera-discovery-timeout = {
+    name = "Discovery timeout"
     description = "The camera discovery timeout in milliseconds"
     type = "int"
     default = 1000
@@ -855,31 +866,37 @@ wireplumber.settings.schema = {
 
   ## Node
   node.features.audio.no-dsp = {
+    name = "No DSP"
     description = "Do not convert audio to F32 format"
     type = "bool"
     default = false
   }
   node.features.audio.monitor-ports = {
+    name = "Monitor ports"
     description = "Enable monitor ports on audio nodes"
     type = "bool"
     default = true
   }
   node.features.audio.control-port = {
+    name = "Control ports"
     description = "Enable control ports on audio nodes"
     type = "bool"
     default = false
   }
   node.stream.restore-props = {
+    name = "Restore properties"
     description = "Remember and restore properties of streams"
     type = "bool"
     default = true
   }
   node.stream.restore-target = {
+    name = "Restore target"
     description = "Remember and restore stream targets"
     type = "bool"
     default = true
   }
   node.stream.default-playback-volume = {
+    name = "Default playback volume"
     description = "The default volume for playback nodes"
     type = "float"
     default = 1.0
@@ -887,6 +904,7 @@ wireplumber.settings.schema = {
     max = 1.0
   }
   node.stream.default-capture-volume = {
+    name = "Default capture volume"
     description = "The default volume for capture nodes"
     type = "float"
     default = 1.0
@@ -894,16 +912,19 @@ wireplumber.settings.schema = {
     max = 1.0
   }
   node.stream.default-media-role = {
+    name = "Default media role"
     description = "Default media.role to assign on streams that do not specify it"
     type = "string"
     default = null
   }
   node.filter.forward-format = {
+    name = "Forward format"
     description = "Forward format on filter nodes or not"
     type = "bool"
     default = false
   }
   node.restore-default-targets = {
+    name = "Restore default target"
     description = "Remember and restore default audio/video input/output devices"
     type = "bool"
     default = true