diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c
index 70d6894246..85b8513506 100644
--- a/ext/faac/gstfaac.c
+++ b/ext/faac/gstfaac.c
@@ -78,7 +78,7 @@
     "mpegversion = (int) { 4, 2 }, "   \
     "channels = (int) [ 1, 6 ], "      \
     "rate = (int) [ 8000, 96000 ], "   \
-    "stream-format = (string) { adts, none } "
+    "stream-format = (string) { adts, raw } "
 static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
@@ -499,7 +499,7 @@ gst_faac_configure_source_pad (GstFaac * faac)
       "mpegversion", G_TYPE_INT, mpegversion,
       "channels", G_TYPE_INT, faac->channels,
       "rate", G_TYPE_INT, faac->samplerate,
-      "stream-format", G_TYPE_STRING, (faac->outputformat ? "adts" : "none"),
+      "stream-format", G_TYPE_STRING, (faac->outputformat ? "adts" : "raw"),
       NULL);
 
   if (!faac->outputformat) {
diff --git a/gst/audioparsers/gstaacparse.c b/gst/audioparsers/gstaacparse.c
index 545c937240..ae302008da 100644
--- a/gst/audioparsers/gstaacparse.c
+++ b/gst/audioparsers/gstaacparse.c
@@ -223,7 +223,7 @@ gst_aacparse_set_src_caps (GstAacParse * aacparse, GstCaps * sink_caps)
 
   switch (aacparse->header_type) {
     case DSPAAC_HEADER_NONE:
-      stream_format = "none";
+      stream_format = "raw";
       break;
     case DSPAAC_HEADER_ADTS:
       stream_format = "adts";
diff --git a/gst/qtmux/gstqtmux.c b/gst/qtmux/gstqtmux.c
index ba0978ed76..2756e0da88 100644
--- a/gst/qtmux/gstqtmux.c
+++ b/gst/qtmux/gstqtmux.c
@@ -1792,14 +1792,14 @@ gst_qt_mux_audio_sink_set_caps (GstPad * pad, GstCaps * caps)
         /* check stream-format */
         stream_format = gst_structure_get_string (structure, "stream-format");
         if (stream_format) {
-          if (strcmp (stream_format, "none") != 0) {
+          if (strcmp (stream_format, "raw") != 0) {
             GST_WARNING_OBJECT (qtmux, "Unsupported AAC stream-format %s, "
-                "please use 'none'", stream_format);
+                "please use 'raw'", stream_format);
             goto refuse_caps;
           }
         } else {
           GST_WARNING_OBJECT (qtmux, "No stream-format present in caps, "
-              "assuming 'none'");
+              "assuming 'raw'");
         }
 
         if (!codec_data || GST_BUFFER_SIZE (codec_data) < 2)
diff --git a/gst/qtmux/gstqtmuxmap.c b/gst/qtmux/gstqtmuxmap.c
index c40219896a..f690faa2dd 100644
--- a/gst/qtmux/gstqtmuxmap.c
+++ b/gst/qtmux/gstqtmuxmap.c
@@ -119,7 +119,7 @@
 #define AAC_CAPS \
   "audio/mpeg, " \
   "mpegversion = (int) 4, " \
-  "stream-format = (string) none, " \
+  "stream-format = (string) raw, " \
   COMMON_AUDIO_CAPS (8, MAX)
 
 #define AMR_CAPS \
diff --git a/tests/check/elements/aacparse.c b/tests/check/elements/aacparse.c
index 62c92864d7..f14ce9d86f 100644
--- a/tests/check/elements/aacparse.c
+++ b/tests/check/elements/aacparse.c
@@ -473,7 +473,7 @@ GST_START_TEST (test_parse_handle_codec_data)
   fail_unless (gst_structure_has_field (s, "codec_data"));
   fail_unless (gst_structure_has_field (s, "stream-format"));
   stream_format = gst_structure_get_string (s, "stream-format");
-  fail_unless (strcmp (stream_format, "none") == 0);
+  fail_unless (strcmp (stream_format, "raw") == 0);
 
   gst_caps_unref (sinkcaps);