bluetooth: Rename *bluez5 modules to bluetooth

Submitted by Luiz Augusto von Dentz on April 3, 2018, 8:01 a.m.

Details

Message ID 20180403080118.29668-1-luiz.dentz@gmail.com
State New
Headers show
Series "bluetooth: Rename *bluez5 modules to bluetooth" ( rev: 1 ) in PulseAudio

Not browsing as part of any series.

Commit Message

Luiz Augusto von Dentz April 3, 2018, 8:01 a.m.
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

Since there is no longer support for BlueZ 4 it makes no sense to keep
BlueZ 5 modules separated.
---
 configure.ac                                       |  68 +++++-----
 po/POTFILES.in                                     |   2 +-
 po/be.po                                           |  42 +++---
 po/de.po                                           |  42 +++---
 po/el.po                                           |  38 +++---
 po/fr.po                                           |  42 +++---
 po/hr.po                                           |  42 +++---
 po/hu.po                                           |  43 +++---
 po/id.po                                           |  42 +++---
 po/it.po                                           |  42 +++---
 po/lt.po                                           |  42 +++---
 po/nn.po                                           |  42 +++---
 po/oc.po                                           |  42 +++---
 po/pl.po                                           |  42 +++---
 po/pt_BR.po                                        |  42 +++---
 po/ru.po                                           |  38 +++---
 po/sk.po                                           |  42 +++---
 po/sv.po                                           |  42 +++---
 po/tr.po                                           |  42 +++---
 po/uk.po                                           |  42 +++---
 po/zh_CN.po                                        |  42 +++---
 po/zh_TW.po                                        |  42 +++---
 src/Makefile.am                                    |  58 ++++----
 src/modules/bluetooth/backend-native.c             |   2 +-
 src/modules/bluetooth/backend-ofono.c              |   2 +-
 .../bluetooth/{bluez5-util.c => bluez-util.c}      |  10 +-
 .../bluetooth/{bluez5-util.h => bluez-util.h}      |   8 +-
 ...e-bluez5-device.c => module-bluetooth-device.c} |   6 +-
 src/modules/bluetooth/module-bluetooth-discover.c  | 135 ++++++++++++++++---
 src/modules/bluetooth/module-bluez5-discover.c     | 146 ++++-----------------
 30 files changed, 629 insertions(+), 641 deletions(-)
 rename src/modules/bluetooth/{bluez5-util.c => bluez-util.c} (99%)
 rename src/modules/bluetooth/{bluez5-util.h => bluez-util.h} (98%)
 rename src/modules/bluetooth/{module-bluez5-device.c => module-bluetooth-device.c} (99%)

Patch hide | download patch | download mbox

diff --git a/configure.ac b/configure.ac
index c2e883731..778efcbf5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1043,46 +1043,42 @@  AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
 
 #### BlueZ support (optional, dependent on D-Bus and SBC) ####
 
-AC_ARG_ENABLE([bluez5],
-    AS_HELP_STRING([--disable-bluez5],[Disable optional BlueZ 5 support]))
+AC_ARG_ENABLE([bluez],
+    AS_HELP_STRING([--disable-bluez],[Disable optional BlueZ support]))
 
 ## SBC ##
-AS_IF([test "x$enable_bluez5" != "xno"],
+AS_IF([test "x$enable_bluez" != "xno"],
     [PKG_CHECK_MODULES(SBC, [ sbc >= 1.0 ], HAVE_SBC=1, HAVE_SBC=0)],
     HAVE_SBC=0)
 
-## BlueZ 5 ##
-AS_IF([test "x$enable_bluez5" != "xno" && test "x$HAVE_DBUS" = "x1" && test "x$HAVE_SBC" = "x1"], HAVE_BLUEZ_5=1,
-      HAVE_BLUEZ_5=0)
-AS_IF([test "x$enable_bluez5" = "xyes" && test "x$HAVE_BLUEZ_5" != "x1"],
-    [AC_MSG_ERROR([*** BLUEZ 5 support not found (requires sbc and D-Bus)])])
-AC_SUBST(HAVE_BLUEZ_5)
-AM_CONDITIONAL([HAVE_BLUEZ_5], [test "x$HAVE_BLUEZ_5" = x1])
-
-AS_IF([test "x$HAVE_BLUEZ_5" = "x1"], HAVE_BLUEZ=1, HAVE_BLUEZ=0)
+## BlueZ ##
+AS_IF([test "x$enable_bluez" != "xno" && test "x$HAVE_DBUS" = "x1" && test "x$HAVE_SBC" = "x1"], HAVE_BLUEZ=1,
+      HAVE_BLUEZ=0)
+AS_IF([test "x$enable_bluez" = "xyes" && test "x$HAVE_BLUEZ" != "x1"],
+    [AC_MSG_ERROR([*** BLUEZ support not found (requires sbc and D-Bus)])])
 AC_SUBST(HAVE_BLUEZ)
 AM_CONDITIONAL([HAVE_BLUEZ], [test "x$HAVE_BLUEZ" = x1])
 
 ## Bluetooth Headset profiles backend ##
 
-AC_ARG_ENABLE([bluez5-ofono-headset],
-    AS_HELP_STRING([--disable-bluez5-ofono-headset],[Disable optional ofono headset backend support (Bluez 5)]))
-AS_IF([test "x$HAVE_BLUEZ_5" = "x1" && test "x$enable_bluez5_ofono_headset" != "xno"], HAVE_BLUEZ_5_OFONO_HEADSET=1,
-      HAVE_BLUEZ_5_OFONO_HEADSET=0)
-AC_SUBST(HAVE_BLUEZ_5_OFONO_HEADSET)
-AM_CONDITIONAL([HAVE_BLUEZ_5_OFONO_HEADSET], [test "x$HAVE_BLUEZ_5_OFONO_HEADSET" = x1])
-AS_IF([test "x$HAVE_BLUEZ_5_OFONO_HEADSET" = "x1"], AC_DEFINE([HAVE_BLUEZ_5_OFONO_HEADSET], 1, [Bluez 5 ofono headset backend enabled]))
-
-AC_ARG_ENABLE([bluez5-native-headset],
-    AS_HELP_STRING([--disable-bluez5-native-headset],[Disable optional native headset backend support (Bluez 5)]))
-AS_IF([test "x$HAVE_BLUEZ_5" = "x1" && test "x$enable_bluez5_native_headset" != "xno"],
-      [PKG_CHECK_MODULES(BLUEZ, [ bluez >= 4.101 ], HAVE_BLUEZ_5_NATIVE_HEADSET=1, HAVE_BLUEZ_5_NATIVE_HEADSET=0)],
-      HAVE_BLUEZ_5_NATIVE_HEADSET=0)
-AS_IF([test "x$enable_bluez5_native_headset" = "xyes" && test "x$HAVE_BLUEZ_5_NATIVE_HEADSET" = "x0"],
-      [AC_MSG_ERROR([*** BlueZ 5 native headset backend support not available (requires the libbluetooth headers)])])
-AC_SUBST(HAVE_BLUEZ_5_NATIVE_HEADSET)
-AM_CONDITIONAL([HAVE_BLUEZ_5_NATIVE_HEADSET], [test "x$HAVE_BLUEZ_5_NATIVE_HEADSET" = x1])
-AS_IF([test "x$HAVE_BLUEZ_5_NATIVE_HEADSET" = "x1"], AC_DEFINE([HAVE_BLUEZ_5_NATIVE_HEADSET], 1, [Bluez 5 native headset backend enabled]))
+AC_ARG_ENABLE([bluez-ofono-headset],
+    AS_HELP_STRING([--disable-bluez-ofono-headset],[Disable optional ofono headset backend support (Bluez)]))
+AS_IF([test "x$HAVE_BLUEZ" = "x1" && test "x$enable_bluez_ofono_headset" != "xno"], HAVE_BLUEZ_OFONO_HEADSET=1,
+      HAVE_BLUEZ_OFONO_HEADSET=0)
+AC_SUBST(HAVE_BLUEZ_OFONO_HEADSET)
+AM_CONDITIONAL([HAVE_BLUEZ_OFONO_HEADSET], [test "x$HAVE_BLUEZ_OFONO_HEADSET" = x1])
+AS_IF([test "x$HAVE_BLUEZ_OFONO_HEADSET" = "x1"], AC_DEFINE([HAVE_BLUEZ_OFONO_HEADSET], 1, [Bluez ofono headset backend enabled]))
+
+AC_ARG_ENABLE([bluez-native-headset],
+    AS_HELP_STRING([--disable-bluez-native-headset],[Disable optional native headset backend support (Bluez)]))
+AS_IF([test "x$HAVE_BLUEZ" = "x1" && test "x$enable_bluez_native_headset" != "xno"],
+      [PKG_CHECK_MODULES(BLUEZ, [ bluez >= 5.0 ], HAVE_BLUEZ_NATIVE_HEADSET=1, HAVE_BLUEZ_NATIVE_HEADSET=0)],
+      HAVE_BLUEZ_NATIVE_HEADSET=0)
+AS_IF([test "x$enable_bluez_native_headset" = "xyes" && test "x$HAVE_BLUEZ_NATIVE_HEADSET" = "x0"],
+      [AC_MSG_ERROR([*** BlueZ native headset backend support not available (requires the libbluetooth headers)])])
+AC_SUBST(HAVE_BLUEZ_NATIVE_HEADSET)
+AM_CONDITIONAL([HAVE_BLUEZ_NATIVE_HEADSET], [test "x$HAVE_BLUEZ_NATIVE_HEADSET" = x1])
+AS_IF([test "x$HAVE_BLUEZ_NATIVE_HEADSET" = "x1"], AC_DEFINE([HAVE_BLUEZ_NATIVE_HEADSET], 1, [Bluez native headset backend enabled]))
 
 #### UDEV support (optional) ####
 
@@ -1565,9 +1561,9 @@  AS_IF([test "x$HAVE_UDEV" = "x1"], ENABLE_UDEV=yes, ENABLE_UDEV=no)
 AS_IF([test "x$HAVE_SYSTEMD_DAEMON" = "x1"], ENABLE_SYSTEMD_DAEMON=yes, ENABLE_SYSTEMD_DAEMON=no)
 AS_IF([test "x$HAVE_SYSTEMD_LOGIN" = "x1"], ENABLE_SYSTEMD_LOGIN=yes, ENABLE_SYSTEMD_LOGIN=no)
 AS_IF([test "x$HAVE_SYSTEMD_JOURNAL" = "x1"], ENABLE_SYSTEMD_JOURNAL=yes, ENABLE_SYSTEMD_JOURNAL=no)
-AS_IF([test "x$HAVE_BLUEZ_5" = "x1"], ENABLE_BLUEZ_5=yes, ENABLE_BLUEZ_5=no)
-AS_IF([test "x$HAVE_BLUEZ_5_OFONO_HEADSET" = "x1"], ENABLE_BLUEZ_5_OFONO_HEADSET=yes, ENABLE_BLUEZ_5_OFONO_HEADSET=no)
-AS_IF([test "x$HAVE_BLUEZ_5_NATIVE_HEADSET" = "x1"], ENABLE_BLUEZ_5_NATIVE_HEADSET=yes, ENABLE_BLUEZ_5_NATIVE_HEADSET=no)
+AS_IF([test "x$HAVE_BLUEZ" = "x1"], ENABLE_BLUEZ=yes, ENABLE_BLUEZ=no)
+AS_IF([test "x$HAVE_BLUEZ_OFONO_HEADSET" = "x1"], ENABLE_BLUEZ_OFONO_HEADSET=yes, ENABLE_BLUEZ_OFONO_HEADSET=no)
+AS_IF([test "x$HAVE_BLUEZ_NATIVE_HEADSET" = "x1"], ENABLE_BLUEZ_NATIVE_HEADSET=yes, ENABLE_BLUEZ_NATIVE_HEADSET=no)
 AS_IF([test "x$HAVE_HAL_COMPAT" = "x1"], ENABLE_HAL_COMPAT=yes, ENABLE_HAL_COMPAT=no)
 AS_IF([test "x$HAVE_TCPWRAP" = "x1"], ENABLE_TCPWRAP=yes, ENABLE_TCPWRAP=no)
 AS_IF([test "x$HAVE_LIBSAMPLERATE" = "x1"], ENABLE_LIBSAMPLERATE="yes (DEPRECATED)", ENABLE_LIBSAMPLERATE=no)
@@ -1622,9 +1618,9 @@  echo "
     Enable Async DNS:              ${ENABLE_LIBASYNCNS}
     Enable LIRC:                   ${ENABLE_LIRC}
     Enable D-Bus:                  ${ENABLE_DBUS}
-      Enable BlueZ 5:              ${ENABLE_BLUEZ_5}
-        Enable ofono headsets:     ${ENABLE_BLUEZ_5_OFONO_HEADSET}
-        Enable native headsets:    ${ENABLE_BLUEZ_5_NATIVE_HEADSET}
+      Enable BlueZ:                ${ENABLE_BLUEZ}
+        Enable ofono headsets:     ${ENABLE_BLUEZ_OFONO_HEADSET}
+        Enable native headsets:    ${ENABLE_BLUEZ_NATIVE_HEADSET}
     Enable udev:                   ${ENABLE_UDEV}
       Enable HAL->udev compat:     ${ENABLE_HAL_COMPAT}
     Enable systemd
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0b519464a..06c9ece57 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,7 +14,7 @@  src/modules/alsa/alsa-util.c
 src/modules/alsa/module-alsa-card.c
 src/modules/alsa/module-alsa-sink.c
 src/modules/alsa/module-alsa-source.c
-src/modules/bluetooth/module-bluez5-device.c
+src/modules/bluetooth/module-bluetooth-device.c
 src/modules/echo-cancel/module-echo-cancel.c
 src/modules/gconf/gconf-helper.c
 src/modules/gconf/module-gconf.c
diff --git a/po/be.po b/po/be.po
index 8c3baba2c..cdd2380cf 100644
--- a/po/be.po
+++ b/po/be.po
@@ -591,7 +591,7 @@  msgid "Line In"
 msgstr "Лінейны ўваход"
 
 #: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
-#: ../src/modules/bluetooth/module-bluez5-device.c:1710
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1710
 msgid "Microphone"
 msgstr "Мікрафон"
 
@@ -652,7 +652,7 @@  msgid "No Bass Boost"
 msgstr "Без ўзмацнення басоў"
 
 #: ../src/modules/alsa/alsa-mixer.c:2398
-#: ../src/modules/bluetooth/module-bluez5-device.c:1717
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1717
 msgid "Speaker"
 msgstr "Дынамік"
 
@@ -824,7 +824,7 @@  msgstr "Шматканальны дуплекс"
 
 #: ../src/modules/alsa/alsa-mixer.c:4155
 #: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez5-device.c:1941
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1941
 msgid "Off"
 msgstr "Адключаны"
 
@@ -958,60 +958,60 @@  msgstr ""
 "Хутчэй за ўсё, гэта памылка ў ALSA-драйверы «%s». Калі ласка, паведаміце аб"
 " гэтым распрацоўнікам ALSA."
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1700
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1700
 msgid "Headset"
 msgstr "Гарнітура"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1705
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1705
 msgid "Handsfree"
 msgstr "Хэндс-фры"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1723
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1723
 msgid "Headphone"
 msgstr "Навушнік"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1728
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1728
 msgid "Portable"
 msgstr "Партатыўная сістэма"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1733
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1733
 msgid "Car"
 msgstr "Аўтамабільная сістэма"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1738
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1738
 msgid "HiFi"
 msgstr "Hi-Fi"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1743
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1743
 msgid "Phone"
 msgstr "Тэлефон"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1695
-#: ../src/modules/bluetooth/module-bluez5-device.c:1711
-#: ../src/modules/bluetooth/module-bluez5-device.c:1749
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1695
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1711
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1749
 msgid "Bluetooth Output"
 msgstr "Bluetooth-выхад"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1694
-#: ../src/modules/bluetooth/module-bluez5-device.c:1716
-#: ../src/modules/bluetooth/module-bluez5-device.c:1722
-#: ../src/modules/bluetooth/module-bluez5-device.c:1748
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1694
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1716
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1722
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1748
 msgid "Bluetooth Input"
 msgstr "Bluetooth-уваход"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1786
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1786
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Прайграванне высокай якасці (A2DP-прыёмнік)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1797
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1797
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Захоп высокай якасці (A2DP-крыніца)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1808
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1808
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr "Навушнікі гарнітуры (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1820
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1820
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr "Аўдыяшлюз гарнітуры (HSP/HFP)"
 
diff --git a/po/de.po b/po/de.po
index 77aa79efc..aabf1b469 100644
--- a/po/de.po
+++ b/po/de.po
@@ -602,7 +602,7 @@  msgid "Line In"
 msgstr "Line-Eingang"
 
 #: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
-#: ../src/modules/bluetooth/module-bluez5-device.c:1710
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1710
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -663,7 +663,7 @@  msgid "No Bass Boost"
 msgstr "Keine Bassverstärkung"
 
 #: ../src/modules/alsa/alsa-mixer.c:2398
-#: ../src/modules/bluetooth/module-bluez5-device.c:1717
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1717
 msgid "Speaker"
 msgstr "Lautsprecher"
 
@@ -835,7 +835,7 @@  msgstr "Mehrkanal-Duplex"
 
 #: ../src/modules/alsa/alsa-mixer.c:4155
 #: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez5-device.c:1965
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1965
 msgid "Off"
 msgstr "Aus"
 
@@ -973,60 +973,60 @@  msgstr ""
 "Dies ist wahrscheinlich ein Fehler im ALSA-Treiber »%s«. Bitte melden Sie "
 "dieses Problem den ALSA-Entwicklern."
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1700
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1700
 msgid "Headset"
 msgstr "Headset"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1705
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1705
 msgid "Handsfree"
 msgstr "Freisprecheinrichtung"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1723
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1723
 msgid "Headphone"
 msgstr "Kopfhörer"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1728
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1728
 msgid "Portable"
 msgstr ""
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1733
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1733
 msgid "Car"
 msgstr "Auto"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1738
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1738
 msgid "HiFi"
 msgstr "HiFi"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1743
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1743
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1695
-#: ../src/modules/bluetooth/module-bluez5-device.c:1711
-#: ../src/modules/bluetooth/module-bluez5-device.c:1749
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1695
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1711
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1749
 msgid "Bluetooth Output"
 msgstr "Bluetooth-Ausgabe"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1694
-#: ../src/modules/bluetooth/module-bluez5-device.c:1716
-#: ../src/modules/bluetooth/module-bluez5-device.c:1722
-#: ../src/modules/bluetooth/module-bluez5-device.c:1748
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1694
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1716
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1722
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1748
 msgid "Bluetooth Input"
 msgstr "Bluetooth-Eingabe"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1790
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1790
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "High Fidelity Playback (A2DP-Ziel)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1802
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1802
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "High Fidelity Capture (A2DP-Quelle)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1814
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1814
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr ""
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1827
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1827
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index c877b0969..500523bc2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -840,7 +840,7 @@  msgid "Line In"
 msgstr "Γραμμή εισόδου"
 
 #: ../src/modules/alsa/alsa-mixer.c:2256 ../src/modules/alsa/alsa-mixer.c:2334
-#: ../src/modules/bluetooth/module-bluez5-device.c:1451
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1451
 msgid "Microphone"
 msgstr "Μικρόφωνο"
 
@@ -901,7 +901,7 @@  msgid "No Bass Boost"
 msgstr "Χωρίς ενίσχυση μπάσων"
 
 #: ../src/modules/alsa/alsa-mixer.c:2271
-#: ../src/modules/bluetooth/module-bluez5-device.c:1458
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1458
 msgid "Speaker"
 msgstr "Ηχείο"
 
@@ -1055,7 +1055,7 @@  msgstr "Ψηφιακός στερεοφωνικός αμφίδρομος (IEC958
 
 #: ../src/modules/alsa/alsa-mixer.c:3959
 #: ../src/modules/alsa/module-alsa-card.c:193
-#: ../src/modules/bluetooth/module-bluez5-device.c:1656
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1656
 msgid "Off"
 msgstr "Ανενεργό"
 
@@ -1155,55 +1155,55 @@  msgstr ""
 "Το πιθανότερο αυτό είναι ένα σφάλμα στον οδηγό ALSA '%s'. Παρακαλούμε, "
 "αναφέρτε αυτό το θέμα στους προγραμματιστές ALSA."
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1441
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1441
 msgid "Headset"
 msgstr "Ακουστικά"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1446
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1446
 msgid "Handsfree"
 msgstr "Ανοιχτής ακρόασης"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1464
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1464
 msgid "Headphone"
 msgstr "Ακουστικό"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1469
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1469
 msgid "Portable"
 msgstr "Φορητό"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1474
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1474
 msgid "Car"
 msgstr "Αυτοκίνητο"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1479
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1479
 msgid "HiFi"
 msgstr "Υψηλή πιστότητα"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1484
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1484
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1436
-#: ../src/modules/bluetooth/module-bluez5-device.c:1452
-#: ../src/modules/bluetooth/module-bluez5-device.c:1490
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1436
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1452
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1490
 msgid "Bluetooth Output"
 msgstr "Έξοδος μπλουτούθ"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1435
-#: ../src/modules/bluetooth/module-bluez5-device.c:1457
-#: ../src/modules/bluetooth/module-bluez5-device.c:1463
-#: ../src/modules/bluetooth/module-bluez5-device.c:1489
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1435
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1457
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1463
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1489
 msgid "Bluetooth Input"
 msgstr "Είσοδος μπλουτούθ"
 
 #. TODO: Change this profile's name to a2dp_sink, to reflect the remote
 #. * device's role and be consistent with the a2dp source profile
-#: ../src/modules/bluetooth/module-bluez5-device.c:1529
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1529
 #| msgid "High Fidelity Playback (A2DP)"
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Αναπαραγωγή υψηλής ποιότητας (δέκτης A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1540
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1540
 #| msgid "High Fidelity Capture (A2DP)"
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Λήψη υψηλής ποιότητας (πηγή A2DP)"
diff --git a/po/fr.po b/po/fr.po
index 2abbfb729..f11831e7f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -606,7 +606,7 @@  msgid "Line In"
 msgstr "Entrée ligne"
 
 #: ../src/modules/alsa/alsa-mixer.c:2296 ../src/modules/alsa/alsa-mixer.c:2374
-#: ../src/modules/bluetooth/module-bluez5-device.c:1710
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1710
 msgid "Microphone"
 msgstr "Microphone"
 
@@ -667,7 +667,7 @@  msgid "No Bass Boost"
 msgstr "Pas de booster de basses"
 
 #: ../src/modules/alsa/alsa-mixer.c:2311
-#: ../src/modules/bluetooth/module-bluez5-device.c:1717
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1717
 msgid "Speaker"
 msgstr "Haut-parleur"
 
@@ -821,7 +821,7 @@  msgstr "Duplex stéréo numérique (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:4052
 #: ../src/modules/alsa/module-alsa-card.c:190
-#: ../src/modules/bluetooth/module-bluez5-device.c:1941
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1941
 msgid "Off"
 msgstr "Éteint"
 
@@ -921,60 +921,60 @@  msgstr ""
 "Il s'agit très probablement d'un bogue dans le pilote ALSA « %s ». Veuillez "
 "rapporter ce problème aux développeurs d'ALSA."
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1700
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1700
 msgid "Headset"
 msgstr "Casque"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1705
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1705
 msgid "Handsfree"
 msgstr "Mains-libres"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1723
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1723
 msgid "Headphone"
 msgstr "Écouteurs"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1728
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1728
 msgid "Portable"
 msgstr "Portable"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1733
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1733
 msgid "Car"
 msgstr "Voiture"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1738
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1738
 msgid "HiFi"
 msgstr "HiFi"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1743
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1743
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1695
-#: ../src/modules/bluetooth/module-bluez5-device.c:1711
-#: ../src/modules/bluetooth/module-bluez5-device.c:1749
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1695
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1711
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1749
 msgid "Bluetooth Output"
 msgstr "Sortie Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1694
-#: ../src/modules/bluetooth/module-bluez5-device.c:1716
-#: ../src/modules/bluetooth/module-bluez5-device.c:1722
-#: ../src/modules/bluetooth/module-bluez5-device.c:1748
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1694
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1716
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1722
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1748
 msgid "Bluetooth Input"
 msgstr "Entrée Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1786
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1786
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Lecture haute fidélité (A2DP Sink)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1797
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1797
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Capture haute fidélité (A2DP Source)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1808
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1808
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr "Unité centrale du casque (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1820
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1820
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr "Passerelle Audio du casque (HSP/HFP)"
 
diff --git a/po/hr.po b/po/hr.po
index fd9322d94..648b489b6 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -597,7 +597,7 @@  msgid "Line In"
 msgstr "Ulaz"
 
 #: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
-#: ../src/modules/bluetooth/module-bluez5-device.c:1696
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1696
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -658,7 +658,7 @@  msgid "No Bass Boost"
 msgstr "Bez pojačanja basa"
 
 #: ../src/modules/alsa/alsa-mixer.c:2398
-#: ../src/modules/bluetooth/module-bluez5-device.c:1703
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1703
 msgid "Speaker"
 msgstr "Zvučnik"
 
@@ -830,7 +830,7 @@  msgstr "Višekanalni obostrani"
 
 #: ../src/modules/alsa/alsa-mixer.c:4155
 #: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez5-device.c:1951
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1951
 msgid "Off"
 msgstr "Isključeno"
 
@@ -964,60 +964,60 @@  msgstr ""
 "Najvjerojatnije je ovo greška ALSA upravljačkog programa '%s'. Prijavite "
 "problem ALSA razvijateljima."
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1686
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1686
 msgid "Headset"
 msgstr "Slušalice s mikrofonom"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1691
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1691
 msgid "Handsfree"
 msgstr "Bez-ruku"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1709
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1709
 msgid "Headphone"
 msgstr "Slušalice"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1714
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1714
 msgid "Portable"
 msgstr "Prijenosnik"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1719
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1719
 msgid "Car"
 msgstr "Automobil"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1724
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1724
 msgid "HiFi"
 msgstr "HiFi"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1729
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1729
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1681
-#: ../src/modules/bluetooth/module-bluez5-device.c:1697
-#: ../src/modules/bluetooth/module-bluez5-device.c:1735
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1681
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1697
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1735
 msgid "Bluetooth Output"
 msgstr "Bluetooth izlaz"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1680
-#: ../src/modules/bluetooth/module-bluez5-device.c:1702
-#: ../src/modules/bluetooth/module-bluez5-device.c:1708
-#: ../src/modules/bluetooth/module-bluez5-device.c:1734
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1680
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1702
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1708
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1734
 msgid "Bluetooth Input"
 msgstr "Bluetooth ulaz"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1776
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1776
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Reprodukcija visoke autentičnosti (A2DP slivnik)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1788
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1788
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Snimanje visoke autentičnosti (A2DP izvor)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1800
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1800
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr "Jedinica slušalice s mikrofonom (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1813
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1813
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr "Zvučni pristupnik slušalice s mikrofonom (HSP/HFP)"
 
diff --git a/po/hu.po b/po/hu.po
index 64b57b7cd..72926232d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -609,7 +609,7 @@  msgid "Line In"
 msgstr "Vonalbemenet"
 
 #: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
-#: ../src/modules/bluetooth/module-bluez5-device.c:1710
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1710
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -670,7 +670,7 @@  msgid "No Bass Boost"
 msgstr "Nincs basszuskiemelés"
 
 #: ../src/modules/alsa/alsa-mixer.c:2398
-#: ../src/modules/bluetooth/module-bluez5-device.c:1717
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1717
 msgid "Speaker"
 msgstr "Hangszóró"
 
@@ -842,7 +842,7 @@  msgstr "Többcsatornás duplex"
 
 #: ../src/modules/alsa/alsa-mixer.c:4155
 #: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez5-device.c:1965
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1965
 msgid "Off"
 msgstr "Kikapcsolva"
 
@@ -980,61 +980,62 @@  msgstr ""
 "Ez valószínűleg egy hiba eredménye az ALSA „%s” illesztőprogramban. Jelentse "
 "ezt a problémát az ALSA fejlesztői felé."
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1700
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1700
 msgid "Headset"
 msgstr "Fejhallgató"
 
 # FIXME: utánanézni
-#: ../src/modules/bluetooth/module-bluez5-device.c:1705
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1705
 msgid "Handsfree"
 msgstr "Kihangosító"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1723
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1723
 msgid "Headphone"
 msgstr "Fülhallgató"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1728
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1728
 msgid "Portable"
 msgstr "Hordozható"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1733
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1733
 msgid "Car"
 msgstr "Autó"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1738
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1738
 msgid "HiFi"
 msgstr "Hi-Fi"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1743
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1743
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1695
-#: ../src/modules/bluetooth/module-bluez5-device.c:1711
-#: ../src/modules/bluetooth/module-bluez5-device.c:1749
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1695
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1711
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1749
 msgid "Bluetooth Output"
 msgstr "Bluetooth kimenet"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1694
-#: ../src/modules/bluetooth/module-bluez5-device.c:1716
-#: ../src/modules/bluetooth/module-bluez5-device.c:1722
-#: ../src/modules/bluetooth/module-bluez5-device.c:1748
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1694
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1716
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1722
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1748
 msgid "Bluetooth Input"
 msgstr "Bluetooth bemenet"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1790
+
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1790
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Hi-Fi lejátszás (A2DP bemenet)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1802
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1802
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Hi-Fi felvétel (A2DP forrás)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1814
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1814
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr "Fejhallgató fejegység (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1827
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1827
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr "Fejhallgató hangátjáró (HSP/HFP)"
 
diff --git a/po/id.po b/po/id.po
index 4509d548b..7f12310e4 100644
--- a/po/id.po
+++ b/po/id.po
@@ -590,7 +590,7 @@  msgid "Line In"
 msgstr "Jalur Masuk"
 
 #: ../src/modules/alsa/alsa-mixer.c:2448 ../src/modules/alsa/alsa-mixer.c:2526
-#: ../src/modules/bluetooth/module-bluez5-device.c:1781
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1781
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -651,7 +651,7 @@  msgid "No Bass Boost"
 msgstr "Tanpa Boost Bass"
 
 #: ../src/modules/alsa/alsa-mixer.c:2463
-#: ../src/modules/bluetooth/module-bluez5-device.c:1788
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1788
 msgid "Speaker"
 msgstr "Speaker"
 
@@ -837,7 +837,7 @@  msgstr "Dupleks Stereo"
 
 #: ../src/modules/alsa/alsa-mixer.c:4226
 #: ../src/modules/alsa/module-alsa-card.c:185
-#: ../src/modules/bluetooth/module-bluez5-device.c:2036
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2036
 msgid "Off"
 msgstr "Mati"
 
@@ -971,63 +971,63 @@  msgstr ""
 "Sangat mungkin ini adalah kutu pada driver ALSA '%s'. Silakan laporkan hal "
 "ini ke para pengembang ALSA."
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1771
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1771
 msgid "Headset"
 msgstr "Headset"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1776
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1776
 msgid "Handsfree"
 msgstr "Handsfree"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1794
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1794
 msgid "Headphone"
 msgstr "Headphone"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1799
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1799
 msgid "Portable"
 msgstr "Portabel"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1804
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1804
 msgid "Car"
 msgstr "Mobil"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1809
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1809
 msgid "HiFi"
 msgstr "HiFi"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1814
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1814
 msgid "Phone"
 msgstr "Telepon"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1766
-#: ../src/modules/bluetooth/module-bluez5-device.c:1782
-#: ../src/modules/bluetooth/module-bluez5-device.c:1820
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1766
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1782
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1820
 msgid "Bluetooth Output"
 msgstr "Keluaran Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1765
-#: ../src/modules/bluetooth/module-bluez5-device.c:1787
-#: ../src/modules/bluetooth/module-bluez5-device.c:1793
-#: ../src/modules/bluetooth/module-bluez5-device.c:1819
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1765
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1787
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1793
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1819
 msgid "Bluetooth Input"
 msgstr "Masukan Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1861
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1861
 #, fuzzy
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "High Fidelity Playback (Muara A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1873
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1873
 #, fuzzy
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "High Fidelity Capture (Sumber A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1885
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1885
 #, fuzzy
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr "Headset Head Unit (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1898
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1898
 #, fuzzy
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr "Headset Audio Gateway (HSP/HFP)"
diff --git a/po/it.po b/po/it.po
index 151ff3187..7f9f8d884 100644
--- a/po/it.po
+++ b/po/it.po
@@ -619,7 +619,7 @@  msgid "Line In"
 msgstr "Line-In"
 
 #: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
-#: ../src/modules/bluetooth/module-bluez5-device.c:1750
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1750
 msgid "Microphone"
 msgstr "Microfono"
 
@@ -680,7 +680,7 @@  msgid "No Bass Boost"
 msgstr "Nessun incremento bassi"
 
 #: ../src/modules/alsa/alsa-mixer.c:2398
-#: ../src/modules/bluetooth/module-bluez5-device.c:1757
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1757
 msgid "Speaker"
 msgstr "Altoparlante"
 
@@ -860,7 +860,7 @@  msgstr "Duplex stereo"
 
 #: ../src/modules/alsa/alsa-mixer.c:4157
 #: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez5-device.c:2005
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2005
 msgid "Off"
 msgstr "Spento"
 
@@ -992,60 +992,60 @@  msgstr ""
 "Molto probabilmente si tratta di un bug nel driver ALSA \"%s\". Segnalare "
 "questo problema agli sviluppatori ALSA."
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1740
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1740
 msgid "Headset"
 msgstr "Cuffie con microfono"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1745
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1745
 msgid "Handsfree"
 msgstr "Sistema mani-libere"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1763
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1763
 msgid "Headphone"
 msgstr "Cuffie"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1768
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1768
 msgid "Portable"
 msgstr "Portabile"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1773
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1773
 msgid "Car"
 msgstr "Automobile"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1778
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1778
 msgid "HiFi"
 msgstr "HiFi"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1783
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1783
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1735
-#: ../src/modules/bluetooth/module-bluez5-device.c:1751
-#: ../src/modules/bluetooth/module-bluez5-device.c:1789
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1735
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1751
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1789
 msgid "Bluetooth Output"
 msgstr "Uscita Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1734
-#: ../src/modules/bluetooth/module-bluez5-device.c:1756
-#: ../src/modules/bluetooth/module-bluez5-device.c:1762
-#: ../src/modules/bluetooth/module-bluez5-device.c:1788
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1734
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1756
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1762
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1788
 msgid "Bluetooth Input"
 msgstr "Ingresso Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1830
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1830
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Riproduzione ad alta fedeltà (sink A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1842
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1842
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Registrazione ad alta fedeltà (sorgente A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1854
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1854
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr "Unità headset head (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1867
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1867
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr "Gateway headset audio (HSP/HFP)"
 
diff --git a/po/lt.po b/po/lt.po
index a704bec7b..d6b246834 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -602,7 +602,7 @@  msgid "Line In"
 msgstr "Įvadinė linija"
 
 #: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
-#: ../src/modules/bluetooth/module-bluez5-device.c:1783
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1783
 msgid "Microphone"
 msgstr "Mikrofonas"
 
@@ -663,7 +663,7 @@  msgid "No Bass Boost"
 msgstr "Be žemų tonų pastiprinimo"
 
 #: ../src/modules/alsa/alsa-mixer.c:2398
-#: ../src/modules/bluetooth/module-bluez5-device.c:1790
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1790
 msgid "Speaker"
 msgstr "Garsiakalbis"
 
@@ -847,7 +847,7 @@  msgstr "Dvipusė stereo"
 
 #: ../src/modules/alsa/alsa-mixer.c:4158
 #: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez5-device.c:2038
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2038
 msgid "Off"
 msgstr "Išjungta"
 
@@ -981,60 +981,60 @@  msgstr ""
 "Greičiausiai, tai yra klaida ALSA \"'%s\" tvarkyklėje. Prašome apie šią "
 "klaidą pranešti ALSA kūrėjams."
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1773
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1773
 msgid "Headset"
 msgstr "Ausinės su mikrofonu"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1778
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1778
 msgid "Handsfree"
 msgstr "Laisvų rankų įranga"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1796
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1796
 msgid "Headphone"
 msgstr "Ausinė"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1801
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1801
 msgid "Portable"
 msgstr "Portatyvi sistema"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1806
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1806
 msgid "Car"
 msgstr "Automobilis"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1811
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1811
 msgid "HiFi"
 msgstr "HiFi"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1816
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1816
 msgid "Phone"
 msgstr "Telefonas"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1768
-#: ../src/modules/bluetooth/module-bluez5-device.c:1784
-#: ../src/modules/bluetooth/module-bluez5-device.c:1822
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1784
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1822
 msgid "Bluetooth Output"
 msgstr "Bluetooth išvestis"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1767
-#: ../src/modules/bluetooth/module-bluez5-device.c:1789
-#: ../src/modules/bluetooth/module-bluez5-device.c:1795
-#: ../src/modules/bluetooth/module-bluez5-device.c:1821
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1767
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1789
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1795
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1821
+
 msgid "Bluetooth Input"
 msgstr "Bluetooth įvestis"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1863
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1863
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Aukštos kokybės atkūrimas (A2DP rinktuvas)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1875
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1875
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Aukštos kokybės paėmimas (A2DP šaltinis)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1887
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1887
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr "Ausinių su mikrofonu pagrindinis įtaisas (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1900
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1900
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr "Ausinių su mikrofonu garso tinklų sietuvas (HSP/HFP)"
 
diff --git a/po/nn.po b/po/nn.po
index 7bce73860..80120d4d4 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -568,7 +568,7 @@  msgid "Line In"
 msgstr "Linje inn"
 
 #: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
-#: ../src/modules/bluetooth/module-bluez5-device.c:1750
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1750
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -642,7 +642,7 @@  msgid "No Bass Boost"
 msgstr "Inga bassforsterking"
 
 #: ../src/modules/alsa/alsa-mixer.c:2398
-#: ../src/modules/bluetooth/module-bluez5-device.c:1757
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1757
 msgid "Speaker"
 msgstr "Høgtalar"
 
@@ -843,7 +843,7 @@  msgstr "Stereo dupleks"
 
 #: ../src/modules/alsa/alsa-mixer.c:4157
 #: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez5-device.c:2005
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2005
 msgid "Off"
 msgstr "Av"
 
@@ -940,72 +940,72 @@  msgstr ""
 "snd_pcm_mmap_begin() gav ein verdi som er uvanleg stor: %lu byte (%lu ms).\n"
 "Dette kjem truleg av ein feil i ALSA-drivaren «%s». Meld frå om problemet til ALSA-utviklarane."
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1740
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1740
 #| msgctxt "This device is a Headset"
 #| msgid "Headset"
 msgid "Headset"
 msgstr "Hovudsett"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1745
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1745
 #| msgctxt "For holding pieces"
 #| msgid "Hand"
 msgid "Handsfree"
 msgstr "Handfri"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1763
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1763
 msgid "Headphone"
 msgstr "Hovudtelefonar"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1768
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1768
 #| msgctxt "portugal_districts.kgm"
 #| msgid "Portalegre"
 msgid "Portable"
 msgstr "Portabel"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1773
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1773
 msgid "Car"
 msgstr "Bil"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1778
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1778
 msgid "HiFi"
 msgstr "Hi-fi"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1783
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1783
 #| msgctxt "Name"
 #| msgid "Phone"
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1735
-#: ../src/modules/bluetooth/module-bluez5-device.c:1751
-#: ../src/modules/bluetooth/module-bluez5-device.c:1789
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1735
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1751
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1789
 #| msgctxt "Bluetooth was enabled, keep short"
 #| msgid "Bluetooth On"
 msgid "Bluetooth Output"
 msgstr "Bluetooth-utlyd"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1734
-#: ../src/modules/bluetooth/module-bluez5-device.c:1756
-#: ../src/modules/bluetooth/module-bluez5-device.c:1762
-#: ../src/modules/bluetooth/module-bluez5-device.c:1788
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1734
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1756
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1762
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1788
 #| msgctxt "Bluetooth was enabled, keep short"
 #| msgid "Bluetooth On"
 msgid "Bluetooth Input"
 msgstr "Bluetooth-innlyd"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1830
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1830
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Hi-fi-avspeling (A2DP-sluk)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1842
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1842
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Hi-fi-opptak (A2DP-kjelde)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1854
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1854
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr "Hovudsett-hovudeining (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1867
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1867
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr "Hovudsett-lydportnar (HSP/HFP)"
 
diff --git a/po/oc.po b/po/oc.po
index 3fe1f655b..1ed4d4706 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -521,7 +521,7 @@  msgid "Line In"
 msgstr "Entrada linha"
 
 #: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
-#: ../src/modules/bluetooth/module-bluez5-device.c:1937
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1937
 msgid "Microphone"
 msgstr "Micrò"
 
@@ -582,7 +582,7 @@  msgid "No Bass Boost"
 msgstr "Pas d'amplificacion de las bassas"
 
 #: ../src/modules/alsa/alsa-mixer.c:2398
-#: ../src/modules/bluetooth/module-bluez5-device.c:1944
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1944
 msgid "Speaker"
 msgstr "Nautparlaire"
 
@@ -754,7 +754,7 @@  msgstr ""
 
 #: ../src/modules/alsa/alsa-mixer.c:4155
 #: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez5-device.c:2173
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2173
 #: ../src/modules/droid/module-droid-card.c:221
 msgid "Off"
 msgstr "Atudat"
@@ -877,60 +877,60 @@  msgstr ""
 "S'agís fòrt probablament d'un bug dins lo pilòt ALSA « %s ». Raportatz "
 "aqueste problèma als desvolopaires d'ALSA."
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1927
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1927
 msgid "Headset"
 msgstr "Casc àudio"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1932
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1932
 msgid "Handsfree"
 msgstr "Mans liuras"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1950
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1950
 msgid "Headphone"
 msgstr "Escotadors"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1955
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1955
 msgid "Portable"
 msgstr "Portable"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1960
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1960
 msgid "Car"
 msgstr "Telefòn de veitura"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1965
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1965
 msgid "HiFi"
 msgstr "HiFi"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1970
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1970
 msgid "Phone"
 msgstr "Telefòn"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1922
-#: ../src/modules/bluetooth/module-bluez5-device.c:1938
-#: ../src/modules/bluetooth/module-bluez5-device.c:1976
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1922
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1938
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1976
 msgid "Bluetooth Output"
 msgstr "Sortida Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1921
-#: ../src/modules/bluetooth/module-bluez5-device.c:1943
-#: ../src/modules/bluetooth/module-bluez5-device.c:1949
-#: ../src/modules/bluetooth/module-bluez5-device.c:1975
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1921
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1943
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1949
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1975
 msgid "Bluetooth Input"
 msgstr "Entrada Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:2013
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2013
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr ""
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:2024
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2024
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr ""
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:2035
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2035
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr ""
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:2047
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2047
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 9bd2020bf..a8dbcc3ef 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -594,7 +594,7 @@  msgid "Line In"
 msgstr "Wejście liniowe"
 
 #: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
-#: ../src/modules/bluetooth/module-bluez5-device.c:1750
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1750
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -655,7 +655,7 @@  msgid "No Bass Boost"
 msgstr "Brak podbicia basów"
 
 #: ../src/modules/alsa/alsa-mixer.c:2398
-#: ../src/modules/bluetooth/module-bluez5-device.c:1757
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1757
 msgid "Speaker"
 msgstr "Głośnik"
 
@@ -835,7 +835,7 @@  msgstr "Dupleks stereo"
 
 #: ../src/modules/alsa/alsa-mixer.c:4157
 #: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez5-device.c:2005
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2005
 msgid "Off"
 msgstr "Wyłączone"
 
@@ -966,60 +966,60 @@  msgstr ""
 "Prawdopodobnie jest to błąd sterownika ALSA „%s”. Proszę zgłosić ten problem "
 "programistom usługi ALSA."
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1740
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1740
 msgid "Headset"
 msgstr "Słuchawki z mikrofonem"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1745
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1745
 msgid "Handsfree"
 msgstr "Zestaw głośnomówiący"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1763
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1763
 msgid "Headphone"
 msgstr "Słuchawki"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1768
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1768
 msgid "Portable"
 msgstr "Przenośne"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1773
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1773
 msgid "Car"
 msgstr "Samochód"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1778
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1778
 msgid "HiFi"
 msgstr "HiFi"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1783
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1783
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1735
-#: ../src/modules/bluetooth/module-bluez5-device.c:1751
-#: ../src/modules/bluetooth/module-bluez5-device.c:1789
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1735
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1751
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1789
 msgid "Bluetooth Output"
 msgstr "Wyjście Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1734
-#: ../src/modules/bluetooth/module-bluez5-device.c:1756
-#: ../src/modules/bluetooth/module-bluez5-device.c:1762
-#: ../src/modules/bluetooth/module-bluez5-device.c:1788
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1734
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1756
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1762
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1788
 msgid "Bluetooth Input"
 msgstr "Wejście Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1830
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1830
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Odtwarzanie o wysokiej dokładności (odpływ A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1842
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1842
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Przechwytywanie o wysokiej dokładności (źródło A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1854
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1854
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr "Jednostka główna słuchawek z mikrofonem (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1867
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1867
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr "Zestaw słuchawek z mikrofonem (HSP/HFP)"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e918c0425..2a22e45f0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -605,7 +605,7 @@  msgid "Line In"
 msgstr "Entrada de linha"
 
 #: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
-#: ../src/modules/bluetooth/module-bluez5-device.c:1716
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1716
 msgid "Microphone"
 msgstr "Microfone"
 
@@ -672,7 +672,7 @@  msgid "No Bass Boost"
 msgstr "Sem reforço de graves"
 
 #: ../src/modules/alsa/alsa-mixer.c:2398
-#: ../src/modules/bluetooth/module-bluez5-device.c:1723
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1723
 msgid "Speaker"
 msgstr "Auto-falante"
 
@@ -844,7 +844,7 @@  msgstr "Duplex multicanal"
 
 #: ../src/modules/alsa/alsa-mixer.c:4155
 #: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez5-device.c:1971
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1971
 msgid "Off"
 msgstr "Desligado"
 
@@ -979,61 +979,61 @@  msgstr ""
 "relate esse problema aos desenvolvedores do ALSA."
 
 # Fone de ouvido não se encaixa como tradução aqui, pois há ou pode haver microfone junto.
-#: ../src/modules/bluetooth/module-bluez5-device.c:1706
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1706
 msgid "Headset"
 msgstr "Headset"
 
 # Desconheço tradução comum para esta palavra.
-#: ../src/modules/bluetooth/module-bluez5-device.c:1711
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1711
 msgid "Handsfree"
 msgstr "Handsfree"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1729
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1729
 msgid "Headphone"
 msgstr "Fones de ouvido"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1734
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1734
 msgid "Portable"
 msgstr "Portátil"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1739
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1739
 msgid "Car"
 msgstr "Carro"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1744
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1744
 msgid "HiFi"
 msgstr "HiFi"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1749
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1749
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1701
-#: ../src/modules/bluetooth/module-bluez5-device.c:1717
-#: ../src/modules/bluetooth/module-bluez5-device.c:1755
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1701
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1717
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1755
 msgid "Bluetooth Output"
 msgstr "Saída Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1700
-#: ../src/modules/bluetooth/module-bluez5-device.c:1722
-#: ../src/modules/bluetooth/module-bluez5-device.c:1728
-#: ../src/modules/bluetooth/module-bluez5-device.c:1754
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1700
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1722
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1728
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1754
 msgid "Bluetooth Input"
 msgstr "Entrada Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1796
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1796
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Reprodução de alta fidelidade (Destino A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1808
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1808
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Captura de alta fidelidade (Fonte A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1820
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1820
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr "Unidade de headset (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1833
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1833
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr "Gateway de Áudio do Headset (HSP/HFP)"
 
diff --git a/po/ru.po b/po/ru.po
index 1888c4cf3..d045933be 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -779,7 +779,7 @@  msgid "Line In"
 msgstr "Линейный вход"
 
 #: ../src/modules/alsa/alsa-mixer.c:2256 ../src/modules/alsa/alsa-mixer.c:2334
-#: ../src/modules/bluetooth/module-bluez5-device.c:1451
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1451
 msgid "Microphone"
 msgstr "Микрофон"
 
@@ -842,7 +842,7 @@  msgid "No Bass Boost"
 msgstr "Нет усиления басов"
 
 #: ../src/modules/alsa/alsa-mixer.c:2271
-#: ../src/modules/bluetooth/module-bluez5-device.c:1458
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1458
 msgid "Speaker"
 msgstr "Динамик"
 
@@ -996,7 +996,7 @@  msgstr "Цифровой стерео дуплекс (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:3959
 #: ../src/modules/alsa/module-alsa-card.c:193
-#: ../src/modules/bluetooth/module-bluez5-device.c:1656
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1656
 msgid "Off"
 msgstr "Выключено"
 
@@ -1098,55 +1098,55 @@  msgstr ""
 "Вероятно, это ошибка в драйвере ALSA «%s». Пожалуйста, сообщите об этой "
 "проблеме разработчикам ALSA."
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1441
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1441
 msgid "Headset"
 msgstr "Гарнитура"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1446
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1446
 msgid "Handsfree"
 msgstr "Хендс-фри"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1464
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1464
 msgid "Headphone"
 msgstr "Наушник"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1469
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1469
 msgid "Portable"
 msgstr "Портативный динамик"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1474
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1474
 msgid "Car"
 msgstr "Автомобильный динамик"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1479
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1479
 msgid "HiFi"
 msgstr "Hi-Fi"
 
 # BUGME: please clarify, does this mean a cell phone? --aspotashev
-#: ../src/modules/bluetooth/module-bluez5-device.c:1484
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1484
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1436
-#: ../src/modules/bluetooth/module-bluez5-device.c:1452
-#: ../src/modules/bluetooth/module-bluez5-device.c:1490
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1436
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1452
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1490
 msgid "Bluetooth Output"
 msgstr "Выход Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1435
-#: ../src/modules/bluetooth/module-bluez5-device.c:1457
-#: ../src/modules/bluetooth/module-bluez5-device.c:1463
-#: ../src/modules/bluetooth/module-bluez5-device.c:1489
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1435
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1457
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1463
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1489
 msgid "Bluetooth Input"
 msgstr "Вход Bluetooth"
 
 #. TODO: Change this profile's name to a2dp_sink, to reflect the remote
 #. * device's role and be consistent with the a2dp source profile
-#: ../src/modules/bluetooth/module-bluez5-device.c:1529
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1529
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Воспроизведение высокого качества (приёмник A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1540
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1540
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Запись высокого качества (передатчик A2DP)"
 
diff --git a/po/sk.po b/po/sk.po
index 322de4f5e..145fa4bc4 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -495,7 +495,7 @@  msgid "Line In"
 msgstr "Vstupná linka"
 
 #: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
-#: ../src/modules/bluetooth/module-bluez5-device.c:1710
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1710
 msgid "Microphone"
 msgstr "Mikrofón"
 
@@ -556,7 +556,7 @@  msgid "No Bass Boost"
 msgstr "Bez zosilnenia basov"
 
 #: ../src/modules/alsa/alsa-mixer.c:2398
-#: ../src/modules/bluetooth/module-bluez5-device.c:1717
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1717
 msgid "Speaker"
 msgstr "Reproduktor"
 
@@ -728,7 +728,7 @@  msgstr "Obojsmerný viackanálový"
 
 #: ../src/modules/alsa/alsa-mixer.c:4155
 #: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez5-device.c:1941
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1941
 msgid "Off"
 msgstr "Vypnuté"
 
@@ -822,60 +822,60 @@  msgid ""
 "to the ALSA developers."
 msgstr ""
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1700
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1700
 msgid "Headset"
 msgstr "Headset"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1705
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1705
 msgid "Handsfree"
 msgstr "Handsfree"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1723
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1723
 msgid "Headphone"
 msgstr "Slúchadlo"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1728
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1728
 msgid "Portable"
 msgstr "Prenosné"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1733
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1733
 msgid "Car"
 msgstr "Automobil"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1738
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1738
 msgid "HiFi"
 msgstr "HiFi"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1743
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1743
 msgid "Phone"
 msgstr "Telefón"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1695
-#: ../src/modules/bluetooth/module-bluez5-device.c:1711
-#: ../src/modules/bluetooth/module-bluez5-device.c:1749
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1695
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1711
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1749
 msgid "Bluetooth Output"
 msgstr "Výstup cez Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1694
-#: ../src/modules/bluetooth/module-bluez5-device.c:1716
-#: ../src/modules/bluetooth/module-bluez5-device.c:1722
-#: ../src/modules/bluetooth/module-bluez5-device.c:1748
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1694
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1716
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1722
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1748
 msgid "Bluetooth Input"
 msgstr "Vstup cez Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1786
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1786
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr ""
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1797
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1797
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr ""
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1808
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1808
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr ""
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1820
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1820
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr "Brána zvuku pre handsfree (HSP/HFP)"
 
diff --git a/po/sv.po b/po/sv.po
index a86895950..29905aceb 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -594,7 +594,7 @@  msgid "Line In"
 msgstr "Linje in"
 
 #: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
-#: ../src/modules/bluetooth/module-bluez5-device.c:1783
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1783
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -655,7 +655,7 @@  msgid "No Bass Boost"
 msgstr "Ingen basökning"
 
 #: ../src/modules/alsa/alsa-mixer.c:2398
-#: ../src/modules/bluetooth/module-bluez5-device.c:1790
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1790
 msgid "Speaker"
 msgstr "Högtalare"
 
@@ -839,7 +839,7 @@  msgstr "Stereo duplex"
 
 #: ../src/modules/alsa/alsa-mixer.c:4158
 #: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez5-device.c:2038
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2038
 msgid "Off"
 msgstr "Av"
 
@@ -973,60 +973,60 @@  msgstr ""
 "Förmodligen är detta ett fel i ALSA-drivrutinen ”%s”. Vänligen rapportera "
 "problemet till ALSA-utvecklarna."
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1773
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1773
 msgid "Headset"
 msgstr "Headset"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1778
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1778
 msgid "Handsfree"
 msgstr "Handsfree"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1796
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1796
 msgid "Headphone"
 msgstr "Hörlurar"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1801
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1801
 msgid "Portable"
 msgstr "Bärbar"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1806
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1806
 msgid "Car"
 msgstr "Bil"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1811
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1811
 msgid "HiFi"
 msgstr "HiFi"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1816
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1816
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1768
-#: ../src/modules/bluetooth/module-bluez5-device.c:1784
-#: ../src/modules/bluetooth/module-bluez5-device.c:1822
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1768
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1784
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1822
 msgid "Bluetooth Output"
 msgstr "Bluetooth-utgång"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1767
-#: ../src/modules/bluetooth/module-bluez5-device.c:1789
-#: ../src/modules/bluetooth/module-bluez5-device.c:1795
-#: ../src/modules/bluetooth/module-bluez5-device.c:1821
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1767
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1789
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1795
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1821
 msgid "Bluetooth Input"
 msgstr "Bluetooth-ingång"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1863
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1863
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "High fidelity playback (A2DP Sink)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1875
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1875
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "High fidelity capture (A2DP Source)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1887
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1887
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr "Headset head unit (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1900
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1900
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr "Headset audio gateway (HSP/HFP)"
 
diff --git a/po/tr.po b/po/tr.po
index 2600f8aa8..c599d09c8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -678,7 +678,7 @@  msgid "Line In"
 msgstr "Hat girişi"
 
 #: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
-#: ../src/modules/bluetooth/module-bluez5-device.c:1696
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1696
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -739,7 +739,7 @@  msgid "No Bass Boost"
 msgstr "Bas Artırma"
 
 #: ../src/modules/alsa/alsa-mixer.c:2398
-#: ../src/modules/bluetooth/module-bluez5-device.c:1703
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1703
 msgid "Speaker"
 msgstr "Hoparlör"
 
@@ -920,7 +920,7 @@  msgstr "İkili Stereo"
 
 #: ../src/modules/alsa/alsa-mixer.c:4157
 #: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez5-device.c:1951
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1951
 msgid "Off"
 msgstr "Kapalı"
 
@@ -1051,60 +1051,60 @@  msgstr ""
 "Büyük ihtimalle bu bir ALSA sürücüsü '%s' hatasıdır. Lütfen bu sorunu ALSA "
 "geliştiricilerine bildirin."
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1686
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1686
 msgid "Headset"
 msgstr "Kulaklık"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1691
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1691
 msgid "Handsfree"
 msgstr "Ahizesiz"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1709
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1709
 msgid "Headphone"
 msgstr "Kulaklık"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1714
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1714
 msgid "Portable"
 msgstr "Taşınabilir"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1719
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1719
 msgid "Car"
 msgstr "Araba"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1724
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1724
 msgid "HiFi"
 msgstr "Yüksek duyarlılık"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1729
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1729
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1681
-#: ../src/modules/bluetooth/module-bluez5-device.c:1697
-#: ../src/modules/bluetooth/module-bluez5-device.c:1735
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1681
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1697
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1735
 msgid "Bluetooth Output"
 msgstr "Bluetooth Çıkışı"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1680
-#: ../src/modules/bluetooth/module-bluez5-device.c:1702
-#: ../src/modules/bluetooth/module-bluez5-device.c:1708
-#: ../src/modules/bluetooth/module-bluez5-device.c:1734
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1680
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1702
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1708
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1734
 msgid "Bluetooth Input"
 msgstr "Bluetooth Girişi"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1776
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1776
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Yüksek Kaliteli Çalma (A2DP Alıcı)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1788
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1788
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Yüksek Kaliteli Yakalama (A2DP Kaynak)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1800
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1800
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr "Kulaklık Ana Birimi (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1813
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1813
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr "Kulanlık Ses Geçidi (HSP/HFP)"
 
diff --git a/po/uk.po b/po/uk.po
index 1dcd6c10c..aa4cf1088 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -609,7 +609,7 @@  msgid "Line In"
 msgstr "Лінійний вхід"
 
 #: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
-#: ../src/modules/bluetooth/module-bluez5-device.c:1783
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1783
 msgid "Microphone"
 msgstr "Мікрофон"
 
@@ -670,7 +670,7 @@  msgid "No Bass Boost"
 msgstr "Без підсилення"
 
 #: ../src/modules/alsa/alsa-mixer.c:2398
-#: ../src/modules/bluetooth/module-bluez5-device.c:1790
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1790
 msgid "Speaker"
 msgstr "Гучномовець"
 
@@ -855,7 +855,7 @@  msgstr "Двобічне стерео"
 
 #: ../src/modules/alsa/alsa-mixer.c:4158
 #: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez5-device.c:2038
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2038
 msgid "Off"
 msgstr "Вимкнено"
 
@@ -989,60 +989,60 @@  msgstr ""
 "Ймовірно, ви натрапили на ваду у драйвері ALSA «%s». Будь ласка, повідомте "
 "про цю ваду розробникам ALSA."
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1773
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1773
 msgid "Headset"
 msgstr "Гарнітура"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1778
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1778
 msgid "Handsfree"
 msgstr "Пристрій гучного зв’язку"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1796
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1796
 msgid "Headphone"
 msgstr "Навушники"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1801
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1801
 msgid "Portable"
 msgstr "Портативна система"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1806
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1806
 msgid "Car"
 msgstr "Автомобільна система"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1811
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1811
 msgid "HiFi"
 msgstr "HiFi"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1816
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1816
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1768
-#: ../src/modules/bluetooth/module-bluez5-device.c:1784
-#: ../src/modules/bluetooth/module-bluez5-device.c:1822
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1768
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1784
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1822
 msgid "Bluetooth Output"
 msgstr "Bluetooth (відтворення)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1767
-#: ../src/modules/bluetooth/module-bluez5-device.c:1789
-#: ../src/modules/bluetooth/module-bluez5-device.c:1795
-#: ../src/modules/bluetooth/module-bluez5-device.c:1821
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1767
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1789
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1795
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1821
 msgid "Bluetooth Input"
 msgstr "Bluetooth (вхід)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1863
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1863
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Високоточне відтворення (приймач A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1875
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1875
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Високоточне захоплення (джерело A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1887
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1887
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr "Головний модуль гарнітури (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1900
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1900
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr "Звуковий шлюз гарнітури (HSP/HFP)"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index daa8b5d8d..494ad6d5b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -555,7 +555,7 @@  msgid "Line In"
 msgstr "输入插孔"
 
 #: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
-#: ../src/modules/bluetooth/module-bluez5-device.c:1710
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1710
 msgid "Microphone"
 msgstr "话筒"
 
@@ -616,7 +616,7 @@  msgid "No Bass Boost"
 msgstr "无重低音增强"
 
 #: ../src/modules/alsa/alsa-mixer.c:2398
-#: ../src/modules/bluetooth/module-bluez5-device.c:1717
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1717
 msgid "Speaker"
 msgstr "扬声器"
 
@@ -788,7 +788,7 @@  msgstr "多声道双工"
 
 #: ../src/modules/alsa/alsa-mixer.c:4155
 #: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez5-device.c:1941
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1941
 msgid "Off"
 msgstr "关"
 
@@ -908,60 +908,60 @@  msgstr ""
 "snd_pcm_mmap_begin() 返回的值非常大:%lu 字节(%lu ms)。\n"
 "这很可能是由 ALSA 驱动程序 %s 中的 bug。请向 ALSA 开发者举报这个问题。"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1700
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1700
 msgid "Headset"
 msgstr "耳机"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1705
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1705
 msgid "Handsfree"
 msgstr "免手操作"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1723
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1723
 msgid "Headphone"
 msgstr "头戴耳机"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1728
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1728
 msgid "Portable"
 msgstr "便携式"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1733
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1733
 msgid "Car"
 msgstr "车内"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1738
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1738
 msgid "HiFi"
 msgstr "高保真"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1743
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1743
 msgid "Phone"
 msgstr "电话"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1695
-#: ../src/modules/bluetooth/module-bluez5-device.c:1711
-#: ../src/modules/bluetooth/module-bluez5-device.c:1749
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1695
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1711
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1749
 msgid "Bluetooth Output"
 msgstr "蓝牙输出"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1694
-#: ../src/modules/bluetooth/module-bluez5-device.c:1716
-#: ../src/modules/bluetooth/module-bluez5-device.c:1722
-#: ../src/modules/bluetooth/module-bluez5-device.c:1748
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1694
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1716
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1722
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1748
 msgid "Bluetooth Input"
 msgstr "蓝牙输入"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1786
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1786
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "高保真回放 (A2DP 信宿)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1797
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1797
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "高保真采集(A2DP 信源)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1808
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1808
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr "头戴式耳机单元 (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1820
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1820
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr "头戴式音频网关 (HSP/HFP)"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5233a9ecc..e63e0b45e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -558,7 +558,7 @@  msgid "Line In"
 msgstr "線路輸入"
 
 #: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
-#: ../src/modules/bluetooth/module-bluez5-device.c:1773
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1773
 msgid "Microphone"
 msgstr "麥克風"
 
@@ -619,7 +619,7 @@  msgid "No Bass Boost"
 msgstr "無低音增強"
 
 #: ../src/modules/alsa/alsa-mixer.c:2398
-#: ../src/modules/bluetooth/module-bluez5-device.c:1780
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1780
 msgid "Speaker"
 msgstr "喇叭"
 
@@ -803,7 +803,7 @@  msgstr "立體聲雙工"
 
 #: ../src/modules/alsa/alsa-mixer.c:4158
 #: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez5-device.c:2028
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2028
 msgid "Off"
 msgstr "關閉"
 
@@ -921,60 +921,60 @@  msgstr ""
 "snd_pcm_mmap_begin() 傳回超出預期的大值:%lu bytes (%lu ms)。\n"
 "這很能是 ALSA 驅動程式「%s」的臭蟲。請回報這個問題給 ALSA 開發者。"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1763
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1763
 msgid "Headset"
 msgstr "耳麥"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1768
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1768
 msgid "Handsfree"
 msgstr "免持裝置"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1786
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1786
 msgid "Headphone"
 msgstr "頭戴式耳機"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1791
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1791
 msgid "Portable"
 msgstr "可攜裝置"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1796
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1796
 msgid "Car"
 msgstr "汽車"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1801
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1801
 msgid "HiFi"
 msgstr "HiFi"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1806
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1806
 msgid "Phone"
 msgstr "手機"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1758
-#: ../src/modules/bluetooth/module-bluez5-device.c:1774
-#: ../src/modules/bluetooth/module-bluez5-device.c:1812
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1758
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1774
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1812
 msgid "Bluetooth Output"
 msgstr "藍牙輸出"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1757
-#: ../src/modules/bluetooth/module-bluez5-device.c:1779
-#: ../src/modules/bluetooth/module-bluez5-device.c:1785
-#: ../src/modules/bluetooth/module-bluez5-device.c:1811
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1757
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1779
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1785
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1811
 msgid "Bluetooth Input"
 msgstr "藍牙輸入"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1853
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1853
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "高傳真播放裝置 (A2DP Sink)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1865
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1865
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "高傳真擷取裝置 (A2DP Source)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1877
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1877
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr "耳機麥克風頭部 (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1890
+#: ../src/modules/bluetooth/module-bluetooth-device.c:1890
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr "耳機麥克風音訊閘道 (HSP/HFP)"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 964a0b517..a28bbff00 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1443,15 +1443,11 @@  endif
 
 if HAVE_BLUEZ
 modlibexec_LTLIBRARIES += \
-		module-bluetooth-discover.la \
-		module-bluetooth-policy.la
-endif
-
-if HAVE_BLUEZ_5
-modlibexec_LTLIBRARIES += \
-		libbluez5-util.la \
+		libbluez-util.la \
 		module-bluez5-discover.la \
-		module-bluez5-device.la
+		module-bluetooth-discover.la \
+		module-bluetooth-policy.la \
+		module-bluetooth-device.la
 endif
 
 # RAOP depends on RTP, and we don't support RTP on Windows, see comment at
@@ -2069,39 +2065,39 @@  module_bluetooth_policy_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_bluetooth_policy_la_LIBADD = $(MODULE_LIBADD)
 module_bluetooth_policy_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DPA_MODULE_NAME=module_bluetooth_policy
 
-# Bluetooth discover
-module_bluetooth_discover_la_SOURCES = modules/bluetooth/module-bluetooth-discover.c
-module_bluetooth_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_bluetooth_discover_la_LIBADD = $(MODULE_LIBADD)
-module_bluetooth_discover_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_bluetooth_discover
-
-# Bluetooth BlueZ 5 sink / source
-libbluez5_util_la_SOURCES = \
-		modules/bluetooth/bluez5-util.c \
-		modules/bluetooth/bluez5-util.h \
+# Bluetooth BlueZ sink / source
+libbluez_util_la_SOURCES = \
+		modules/bluetooth/bluez-util.c \
+		modules/bluetooth/bluez-util.h \
 		modules/bluetooth/a2dp-codecs.h
-if HAVE_BLUEZ_5_OFONO_HEADSET
-libbluez5_util_la_SOURCES += \
+if HAVE_BLUEZ_OFONO_HEADSET
+libbluez_util_la_SOURCES += \
 		modules/bluetooth/backend-ofono.c
 endif
-if HAVE_BLUEZ_5_NATIVE_HEADSET
-libbluez5_util_la_SOURCES += \
+if HAVE_BLUEZ_NATIVE_HEADSET
+libbluez_util_la_SOURCES += \
 		modules/bluetooth/backend-native.c
 endif
 
-libbluez5_util_la_LDFLAGS = -avoid-version
-libbluez5_util_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS)
-libbluez5_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+libbluez_util_la_LDFLAGS = -avoid-version
+libbluez_util_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS)
+libbluez_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 
+# Bluetooth discover
 module_bluez5_discover_la_SOURCES = modules/bluetooth/module-bluez5-discover.c
 module_bluez5_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_bluez5_discover_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libbluez5-util.la
-module_bluez5_discover_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DPA_MODULE_NAME=module_bluez5_discover
+module_bluez5_discover_la_LIBADD = $(MODULE_LIBADD)
+module_bluez5_discover_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_bluez5_discover
+
+module_bluetooth_discover_la_SOURCES = modules/bluetooth/module-bluetooth-discover.c
+module_bluetooth_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
+module_bluetooth_discover_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libbluez-util.la
+module_bluetooth_discover_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DPA_MODULE_NAME=module_bluetooth_discover
 
-module_bluez5_device_la_SOURCES = modules/bluetooth/module-bluez5-device.c
-module_bluez5_device_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_bluez5_device_la_LIBADD = $(MODULE_LIBADD) $(SBC_LIBS) libbluez5-util.la
-module_bluez5_device_la_CFLAGS = $(AM_CFLAGS) $(SBC_CFLAGS) -DPA_MODULE_NAME=module_bluez5_device
+module_bluetooth_device_la_SOURCES = modules/bluetooth/module-bluetooth-device.c
+module_bluetooth_device_la_LDFLAGS = $(MODULE_LDFLAGS)
+module_bluetooth_device_la_LIBADD = $(MODULE_LIBADD) $(SBC_LIBS) libbluez-util.la
+module_bluetooth_device_la_CFLAGS = $(AM_CFLAGS) $(SBC_CFLAGS) -DPA_MODULE_NAME=module_bluetooth_device
 
 # Apple Airtunes/RAOP
 module_raop_sink_la_SOURCES = modules/raop/module-raop-sink.c
diff --git a/src/modules/bluetooth/backend-native.c b/src/modules/bluetooth/backend-native.c
index 5ba743966..b7940ba35 100644
--- a/src/modules/bluetooth/backend-native.c
+++ b/src/modules/bluetooth/backend-native.c
@@ -34,7 +34,7 @@ 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sco.h>
 
-#include "bluez5-util.h"
+#include "bluez-util.h"
 
 struct pa_bluetooth_backend {
   pa_core *core;
diff --git a/src/modules/bluetooth/backend-ofono.c b/src/modules/bluetooth/backend-ofono.c
index 5f427043e..ab12e1dc0 100644
--- a/src/modules/bluetooth/backend-ofono.c
+++ b/src/modules/bluetooth/backend-ofono.c
@@ -29,7 +29,7 @@ 
 #include <pulsecore/shared.h>
 #include <pulsecore/core-error.h>
 
-#include "bluez5-util.h"
+#include "bluez-util.h"
 
 #define HFP_AUDIO_CODEC_CVSD    0x01
 #define HFP_AUDIO_CODEC_MSBC    0x02
diff --git a/src/modules/bluetooth/bluez5-util.c b/src/modules/bluetooth/bluez-util.c
similarity index 99%
rename from src/modules/bluetooth/bluez5-util.c
rename to src/modules/bluetooth/bluez-util.c
index 2d8337317..360111916 100644
--- a/src/modules/bluetooth/bluez5-util.c
+++ b/src/modules/bluetooth/bluez-util.c
@@ -35,7 +35,7 @@ 
 
 #include "a2dp-codecs.h"
 
-#include "bluez5-util.h"
+#include "bluez-util.h"
 
 #define WAIT_FOR_PROFILES_TIMEOUT_USEC (3 * PA_USEC_PER_SEC)
 
@@ -348,7 +348,7 @@  void pa_bluetooth_transport_free(pa_bluetooth_transport *t) {
     pa_xfree(t);
 }
 
-static int bluez5_transport_acquire_cb(pa_bluetooth_transport *t, bool optional, size_t *imtu, size_t *omtu) {
+static int bluez_transport_acquire_cb(pa_bluetooth_transport *t, bool optional, size_t *imtu, size_t *omtu) {
     DBusMessage *m, *r;
     DBusError err;
     int ret;
@@ -395,7 +395,7 @@  finish:
     return ret;
 }
 
-static void bluez5_transport_release_cb(pa_bluetooth_transport *t) {
+static void bluez_transport_release_cb(pa_bluetooth_transport *t) {
     DBusMessage *m, *r;
     DBusError err;
 
@@ -1466,8 +1466,8 @@  static DBusMessage *endpoint_set_configuration(DBusConnection *conn, DBusMessage
     dbus_message_unref(r);
 
     t = pa_bluetooth_transport_new(d, sender, path, p, config, size);
-    t->acquire = bluez5_transport_acquire_cb;
-    t->release = bluez5_transport_release_cb;
+    t->acquire = bluez_transport_acquire_cb;
+    t->release = bluez_transport_release_cb;
     pa_bluetooth_transport_put(t);
 
     pa_log_debug("Transport %s available for profile %s", t->path, pa_bluetooth_profile_to_string(t->profile));
diff --git a/src/modules/bluetooth/bluez5-util.h b/src/modules/bluetooth/bluez-util.h
similarity index 98%
rename from src/modules/bluetooth/bluez5-util.h
rename to src/modules/bluetooth/bluez-util.h
index ad30708f0..6228e5013 100644
--- a/src/modules/bluetooth/bluez5-util.h
+++ b/src/modules/bluetooth/bluez-util.h
@@ -1,5 +1,5 @@ 
-#ifndef foobluez5utilhfoo
-#define foobluez5utilhfoo
+#ifndef foobluezutilhfoo
+#define foobluezutilhfoo
 
 /***
   This file is part of PulseAudio.
@@ -125,7 +125,7 @@  struct pa_bluetooth_adapter {
     bool valid;
 };
 
-#ifdef HAVE_BLUEZ_5_OFONO_HEADSET
+#ifdef HAVE_BLUEZ_OFONO_HEADSET
 pa_bluetooth_backend *pa_bluetooth_ofono_backend_new(pa_core *c, pa_bluetooth_discovery *y);
 void pa_bluetooth_ofono_backend_free(pa_bluetooth_backend *b);
 #else
@@ -135,7 +135,7 @@  static inline pa_bluetooth_backend *pa_bluetooth_ofono_backend_new(pa_core *c, p
 static inline void pa_bluetooth_ofono_backend_free(pa_bluetooth_backend *b) {}
 #endif
 
-#ifdef HAVE_BLUEZ_5_NATIVE_HEADSET
+#ifdef HAVE_BLUEZ_NATIVE_HEADSET
 pa_bluetooth_backend *pa_bluetooth_native_backend_new(pa_core *c, pa_bluetooth_discovery *y, bool enable_hs_role);
 void pa_bluetooth_native_backend_free(pa_bluetooth_backend *b);
 void pa_bluetooth_native_backend_enable_hs_role(pa_bluetooth_backend *b, bool enable_hs_role);
diff --git a/src/modules/bluetooth/module-bluez5-device.c b/src/modules/bluetooth/module-bluetooth-device.c
similarity index 99%
rename from src/modules/bluetooth/module-bluez5-device.c
rename to src/modules/bluetooth/module-bluetooth-device.c
index dfae682d9..ad9e9f36b 100644
--- a/src/modules/bluetooth/module-bluez5-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -46,11 +46,11 @@ 
 #include <pulsecore/time-smoother.h>
 
 #include "a2dp-codecs.h"
-#include "bluez5-util.h"
+#include "bluez-util.h"
 #include "rtp.h"
 
 PA_MODULE_AUTHOR("João Paulo Rechi Vita");
-PA_MODULE_DESCRIPTION("BlueZ 5 Bluetooth audio sink and source");
+PA_MODULE_DESCRIPTION("Bluetooth audio sink and source");
 PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_LOAD_ONCE(false);
 PA_MODULE_USAGE("path=<device object path>"
@@ -2283,7 +2283,7 @@  int pa__init(pa_module* m) {
     if ((u->discovery = pa_shared_get(u->core, "bluetooth-discovery")))
         pa_bluetooth_discovery_ref(u->discovery);
     else {
-        pa_log_error("module-bluez5-discover doesn't seem to be loaded, refusing to load module-bluez5-device");
+        pa_log_error("module-bluetooth-discover doesn't seem to be loaded, refusing to load module-bluez-device");
         goto fail_free_modargs;
     }
 
diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index 63195d3e1..d266c3bd1 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -1,7 +1,7 @@ 
 /***
   This file is part of PulseAudio.
 
-  Copyright 2013 João Paulo Rechi Vita
+  Copyright 2008-2013 João Paulo Rechi Vita
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
@@ -21,47 +21,138 @@ 
 #include <config.h>
 #endif
 
+#include <pulsecore/core.h>
 #include <pulsecore/core-util.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/module.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/shared.h>
+
+#include "bluez-util.h"
 
 PA_MODULE_AUTHOR("João Paulo Rechi Vita");
-PA_MODULE_DESCRIPTION("Detect available Bluetooth daemon and load the corresponding discovery module");
+PA_MODULE_DESCRIPTION("Detect available Bluetooth audio devices and Bluetooth audio drivers");
 PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_LOAD_ONCE(true);
 PA_MODULE_USAGE(
-    "headset=ofono|native|auto (bluez 5 only)"
-    "autodetect_mtu=<boolean> (bluez 5 only)"
+    "autodetect_mtu=<boolean>"
+    "headset=ofono|native|auto"
 );
 
+static const char* const valid_modargs[] = {
+    "headset",
+    "autodetect_mtu",
+    NULL
+};
+
 struct userdata {
-    uint32_t bluez5_module_idx;
+    pa_module *module;
+    pa_core *core;
+    pa_hashmap *loaded_device_paths;
+    pa_hook_slot *device_connection_changed_slot;
+    pa_bluetooth_discovery *discovery;
+    bool autodetect_mtu;
 };
 
-int pa__init(pa_module* m) {
+static pa_hook_result_t device_connection_changed_cb(pa_bluetooth_discovery *y, const pa_bluetooth_device *d, struct userdata *u) {
+    bool module_loaded;
+
+    pa_assert(d);
+    pa_assert(u);
+
+    module_loaded = pa_hashmap_get(u->loaded_device_paths, d->path) ? true : false;
+
+    if (module_loaded && !pa_bluetooth_device_any_transport_connected(d)) {
+        /* disconnection, the module unloads itself */
+        pa_log_debug("Unregistering module for %s", d->path);
+        pa_hashmap_remove(u->loaded_device_paths, d->path);
+        return PA_HOOK_OK;
+    }
+
+    if (!module_loaded && pa_bluetooth_device_any_transport_connected(d)) {
+        /* a new device has been connected */
+        pa_module *m;
+        char *args = pa_sprintf_malloc("path=%s autodetect_mtu=%i", d->path, (int)u->autodetect_mtu);
+
+        pa_log_debug("Loading module-bluetooth-device %s", args);
+        pa_module_load(&m, u->module->core, "module-bluetooth-device", args);
+        pa_xfree(args);
+
+        if (m)
+            /* No need to duplicate the path here since the device object will
+             * exist for the whole hashmap entry lifespan */
+            pa_hashmap_put(u->loaded_device_paths, d->path, d->path);
+        else
+            pa_log_warn("Failed to load module for device %s", d->path);
+
+        return PA_HOOK_OK;
+    }
+
+    return PA_HOOK_OK;
+}
+
+#ifdef HAVE_BLUEZ_NATIVE_HEADSET
+const char *default_headset_backend = "auto";
+#else
+const char *default_headset_backend = "ofono";
+#endif
+
+int pa__init(pa_module *m) {
     struct userdata *u;
-    pa_module *mm;
+    pa_modargs *ma;
+    const char *headset_str;
+    int headset_backend;
+    bool autodetect_mtu;
 
     pa_assert(m);
 
-    m->userdata = u = pa_xnew0(struct userdata, 1);
-    u->bluez5_module_idx = PA_INVALID_INDEX;
+    if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
+        pa_log("failed to parse module arguments.");
+        goto fail;
+    }
 
-    if (pa_module_exists("module-bluez5-discover")) {
-        pa_module_load(&mm, m->core, "module-bluez5-discover", m->argument);
-        if (mm)
-            u->bluez5_module_idx = mm->index;
+    pa_assert_se(headset_str = pa_modargs_get_value(ma, "headset", default_headset_backend));
+    if (pa_streq(headset_str, "ofono"))
+        headset_backend = HEADSET_BACKEND_OFONO;
+    else if (pa_streq(headset_str, "native"))
+        headset_backend = HEADSET_BACKEND_NATIVE;
+    else if (pa_streq(headset_str, "auto"))
+        headset_backend = HEADSET_BACKEND_AUTO;
+    else {
+        pa_log("headset parameter must be either ofono, native or auto (found %s)", headset_str);
+        goto fail;
     }
 
-    if (u->bluez5_module_idx == PA_INVALID_INDEX) {
-        pa_xfree(u);
-        return -1;
+    autodetect_mtu = false;
+    if (pa_modargs_get_value_boolean(ma, "autodetect_mtu", &autodetect_mtu) < 0) {
+        pa_log("Invalid boolean value for autodetect_mtu parameter");
+        goto fail;
     }
 
+    m->userdata = u = pa_xnew0(struct userdata, 1);
+    u->module = m;
+    u->core = m->core;
+    u->autodetect_mtu = autodetect_mtu;
+    u->loaded_device_paths = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
+
+    if (!(u->discovery = pa_bluetooth_discovery_get(u->core, headset_backend)))
+        goto fail;
+
+    u->device_connection_changed_slot =
+        pa_hook_connect(pa_bluetooth_discovery_hook(u->discovery, PA_BLUETOOTH_HOOK_DEVICE_CONNECTION_CHANGED),
+                        PA_HOOK_NORMAL, (pa_hook_cb_t) device_connection_changed_cb, u);
+
+    pa_modargs_free(ma);
     return 0;
+
+fail:
+    if (ma)
+        pa_modargs_free(ma);
+    pa__done(m);
+    return -1;
 }
 
-void pa__done(pa_module* m) {
+void pa__done(pa_module *m) {
     struct userdata *u;
 
     pa_assert(m);
@@ -69,8 +160,14 @@  void pa__done(pa_module* m) {
     if (!(u = m->userdata))
         return;
 
-    if (u->bluez5_module_idx != PA_INVALID_INDEX)
-        pa_module_unload_by_index(m->core, u->bluez5_module_idx, true);
+    if (u->device_connection_changed_slot)
+        pa_hook_slot_free(u->device_connection_changed_slot);
+
+    if (u->discovery)
+        pa_bluetooth_discovery_unref(u->discovery);
+
+    if (u->loaded_device_paths)
+        pa_hashmap_free(u->loaded_device_paths);
 
     pa_xfree(u);
 }
diff --git a/src/modules/bluetooth/module-bluez5-discover.c b/src/modules/bluetooth/module-bluez5-discover.c
index 44578214c..010036a3d 100644
--- a/src/modules/bluetooth/module-bluez5-discover.c
+++ b/src/modules/bluetooth/module-bluez5-discover.c
@@ -4,169 +4,67 @@ 
   Copyright 2008-2013 João Paulo Rechi Vita
 
   PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2.1 of the
-  License, or (at your option) any later version.
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2.1 of the License,
+  or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
 
-  You should have received a copy of the GNU Lesser General Public
-  License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+  You should have received a copy of the GNU Lesser General Public License
+  along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#include <pulsecore/core.h>
-#include <pulsecore/core-util.h>
-#include <pulsecore/macro.h>
-#include <pulsecore/module.h>
-#include <pulsecore/modargs.h>
-#include <pulsecore/shared.h>
+#include <pulse/xmalloc.h>
 
-#include "bluez5-util.h"
+#include <pulsecore/module.h>
+#include <pulsecore/log.h>
 
 PA_MODULE_AUTHOR("João Paulo Rechi Vita");
-PA_MODULE_DESCRIPTION("Detect available BlueZ 5 Bluetooth audio devices and load BlueZ 5 Bluetooth audio drivers");
+PA_MODULE_DESCRIPTION("Compatibility module (module-bluez5-discover rename)");
 PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_LOAD_ONCE(true);
-PA_MODULE_USAGE(
-    "headset=ofono|native|auto"
-);
-
-static const char* const valid_modargs[] = {
-    "headset",
-    "autodetect_mtu",
-    NULL
-};
+PA_MODULE_DEPRECATED("Please use module-bluetooth-discover instead of module-bluez5-discover!");
 
 struct userdata {
-    pa_module *module;
-    pa_core *core;
-    pa_hashmap *loaded_device_paths;
-    pa_hook_slot *device_connection_changed_slot;
-    pa_bluetooth_discovery *discovery;
-    bool autodetect_mtu;
+    uint32_t module_index;
 };
 
-static pa_hook_result_t device_connection_changed_cb(pa_bluetooth_discovery *y, const pa_bluetooth_device *d, struct userdata *u) {
-    bool module_loaded;
-
-    pa_assert(d);
-    pa_assert(u);
-
-    module_loaded = pa_hashmap_get(u->loaded_device_paths, d->path) ? true : false;
-
-    if (module_loaded && !pa_bluetooth_device_any_transport_connected(d)) {
-        /* disconnection, the module unloads itself */
-        pa_log_debug("Unregistering module for %s", d->path);
-        pa_hashmap_remove(u->loaded_device_paths, d->path);
-        return PA_HOOK_OK;
-    }
-
-    if (!module_loaded && pa_bluetooth_device_any_transport_connected(d)) {
-        /* a new device has been connected */
-        pa_module *m;
-        char *args = pa_sprintf_malloc("path=%s autodetect_mtu=%i", d->path, (int)u->autodetect_mtu);
-
-        pa_log_debug("Loading module-bluez5-device %s", args);
-        pa_module_load(&m, u->module->core, "module-bluez5-device", args);
-        pa_xfree(args);
-
-        if (m)
-            /* No need to duplicate the path here since the device object will
-             * exist for the whole hashmap entry lifespan */
-            pa_hashmap_put(u->loaded_device_paths, d->path, d->path);
-        else
-            pa_log_warn("Failed to load module for device %s", d->path);
-
-        return PA_HOOK_OK;
-    }
-
-    return PA_HOOK_OK;
-}
-
-#ifdef HAVE_BLUEZ_5_NATIVE_HEADSET
-const char *default_headset_backend = "auto";
-#else
-const char *default_headset_backend = "ofono";
-#endif
-
 int pa__init(pa_module *m) {
     struct userdata *u;
-    pa_modargs *ma;
-    const char *headset_str;
-    int headset_backend;
-    bool autodetect_mtu;
+    pa_module *module;
 
     pa_assert(m);
+    pa_assert_se(m->userdata = u = pa_xnew0(struct userdata, 1));
 
-    if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
-        pa_log("failed to parse module arguments.");
-        goto fail;
-    }
+    pa_log_warn("We will now load module-bluetooth-discover. Please make sure to remove module-bluez5-discover from your configuration.");
 
-    pa_assert_se(headset_str = pa_modargs_get_value(ma, "headset", default_headset_backend));
-    if (pa_streq(headset_str, "ofono"))
-        headset_backend = HEADSET_BACKEND_OFONO;
-    else if (pa_streq(headset_str, "native"))
-        headset_backend = HEADSET_BACKEND_NATIVE;
-    else if (pa_streq(headset_str, "auto"))
-        headset_backend = HEADSET_BACKEND_AUTO;
-    else {
-        pa_log("headset parameter must be either ofono, native or auto (found %s)", headset_str);
-        goto fail;
+    pa_module_load(&module, m->core, "module-bluetooth-discover", m->argument);
+    if (!module) {
+        pa_xfree(u);
+        return -1;
     }
 
-    autodetect_mtu = false;
-    if (pa_modargs_get_value_boolean(ma, "autodetect_mtu", &autodetect_mtu) < 0) {
-        pa_log("Invalid boolean value for autodetect_mtu parameter");
-        goto fail;
-    }
+    u->module_index = module->index;
 
-    m->userdata = u = pa_xnew0(struct userdata, 1);
-    u->module = m;
-    u->core = m->core;
-    u->autodetect_mtu = autodetect_mtu;
-    u->loaded_device_paths = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-
-    if (!(u->discovery = pa_bluetooth_discovery_get(u->core, headset_backend)))
-        goto fail;
-
-    u->device_connection_changed_slot =
-        pa_hook_connect(pa_bluetooth_discovery_hook(u->discovery, PA_BLUETOOTH_HOOK_DEVICE_CONNECTION_CHANGED),
-                        PA_HOOK_NORMAL, (pa_hook_cb_t) device_connection_changed_cb, u);
-
-    pa_modargs_free(ma);
     return 0;
-
-fail:
-    if (ma)
-        pa_modargs_free(ma);
-    pa__done(m);
-    return -1;
 }
 
 void pa__done(pa_module *m) {
     struct userdata *u;
 
     pa_assert(m);
+    pa_assert(m->userdata);
 
-    if (!(u = m->userdata))
-        return;
-
-    if (u->device_connection_changed_slot)
-        pa_hook_slot_free(u->device_connection_changed_slot);
-
-    if (u->discovery)
-        pa_bluetooth_discovery_unref(u->discovery);
+    u = m->userdata;
 
-    if (u->loaded_device_paths)
-        pa_hashmap_free(u->loaded_device_paths);
+    pa_module_unload_by_index(m->core, u->module_index, true);
 
     pa_xfree(u);
 }