diff --git a/sys/bluez/gsta2dpsink.c b/sys/bluez/gsta2dpsink.c
index a9722b6807..a1beb7db6c 100644
--- a/sys/bluez/gsta2dpsink.c
+++ b/sys/bluez/gsta2dpsink.c
@@ -59,10 +59,10 @@ static GstStaticPadTemplate gst_a2dp_sink_factory =
     GST_STATIC_CAPS ("audio/x-sbc, "
         "rate = (int) { 16000, 32000, 44100, 48000 }, "
         "channels = (int) [ 1, 2 ], "
-        "mode = (string) { \"mono\", \"dual\", \"stereo\", \"joint\" }, "
+        "channel-mode = (string) { mono, dual, stereo, joint }, "
         "blocks = (int) { 4, 8, 12, 16 }, "
         "subbands = (int) { 4, 8 }, "
-        "allocation = (string) { \"snr\", \"loudness\" }, "
+        "allocation-method = (string) { snr, loudness }, "
         "bitpool = (int) [ 2, " TEMPLATE_MAX_BITPOOL_STR " ]; " "audio/mpeg"));
 
 static gboolean gst_a2dp_sink_handle_event (GstPad * pad,
diff --git a/sys/bluez/gstavdtpsink.c b/sys/bluez/gstavdtpsink.c
index 8a91cd28bc..a3d70e491a 100644
--- a/sys/bluez/gstavdtpsink.c
+++ b/sys/bluez/gstavdtpsink.c
@@ -267,7 +267,7 @@ gst_avdtp_sink_parse_sbc_raw (GstAvdtpSink * self)
   }
   g_value_unset (value);
   if (list) {
-    gst_structure_set_value (structure, "mode", list);
+    gst_structure_set_value (structure, "channel-mode", list);
     g_free (list);
     list = NULL;
   }
@@ -329,7 +329,7 @@ gst_avdtp_sink_parse_sbc_raw (GstAvdtpSink * self)
   }
   g_value_unset (value);
   if (list) {
-    gst_structure_set_value (structure, "allocation", list);
+    gst_structure_set_value (structure, "allocation-method", list);
     g_free (list);
     list = NULL;
   }
@@ -1121,5 +1121,5 @@ gst_avdtp_sink_set_channel_mode (GstAvdtpSink * self, const gchar * mode)
 
   self->channel_mode = new_mode;
   if (self->channel_mode == -1)
-    GST_WARNING_OBJECT (self, "Received invalid channel " "mode: %s", mode);
+    GST_WARNING_OBJECT (self, "Received invalid channel mode: %s", mode);
 }