diff --git a/ext/apexsink/gstapexsink.c b/ext/apexsink/gstapexsink.c
index 25dfb08b7e..526f010640 100644
--- a/ext/apexsink/gstapexsink.c
+++ b/ext/apexsink/gstapexsink.c
@@ -305,7 +305,7 @@ gst_apexsink_class_init (GstApExSinkClass * klass)
       g_param_spec_uint ("port", "Port", "AirPort Express target port", 0,
           32000, DEFAULT_APEX_PORT,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-  /* we need to expose the volume as a double for playbin2. Internally we keep
+  /* we need to expose the volume as a double for playbin. Internally we keep
    * it as an int between 0 and 100, where 75 corresponds to 1.0.
    * FIXME we should store the volume as a double. */
   g_object_class_install_property ((GObjectClass *) klass, APEX_PROP_VOLUME,
diff --git a/gst/debugutils/fpsdisplaysink.c b/gst/debugutils/fpsdisplaysink.c
index 79c6f80eef..d3b009a301 100644
--- a/gst/debugutils/fpsdisplaysink.c
+++ b/gst/debugutils/fpsdisplaysink.c
@@ -28,7 +28,7 @@
  * gst-launch videotestsrc ! fpsdisplaysink
  * gst-launch videotestsrc ! fpsdisplaysink text-overlay=false
  * gst-launch filesrc location=video.avi ! decodebin2 name=d ! queue ! fpsdisplaysink d. ! queue ! fakesink sync=true
- * gst-launch playbin2 uri=file:///path/to/video.avi video-sink="fpsdisplaysink" audio-sink=fakesink
+ * gst-launch playbin uri=file:///path/to/video.avi video-sink="fpsdisplaysink" audio-sink=fakesink
  * ]|
  * </refsect2>
  */
diff --git a/gst/inter/gstintertest.c b/gst/inter/gstintertest.c
index 077024ea20..8b22477f90 100644
--- a/gst/inter/gstintertest.c
+++ b/gst/inter/gstintertest.c
@@ -157,7 +157,7 @@ gst_inter_test_create_pipeline_playbin (GstInterTest * intertest,
 
   pipeline = gst_pipeline_new (NULL);
   gst_bin_add (GST_BIN (pipeline),
-      gst_element_factory_make ("playbin2", "source"));
+      gst_element_factory_make ("playbin", "source"));
 
   if (error) {
     g_print ("pipeline parsing error: %s\n", error->message);
diff --git a/tests/check/elements/dataurisrc.c b/tests/check/elements/dataurisrc.c
index 49c9bdbbf4..da80599609 100644
--- a/tests/check/elements/dataurisrc.c
+++ b/tests/check/elements/dataurisrc.c
@@ -169,7 +169,7 @@ const gchar data_uri[] = "data:audio/ogg;base64,"
     "AWZeiL1v7LSgX1wHDrB3NhI3k3sSnaKJAAAAAAAAQOJJS94nzV+3/3r/2Ho5ub5tHN70XSuPfdZZ"
     "C/9eZOtqZc5Zfl8wP5ZenOT3hbWPpZeE6jzjkdY3f+GXCblaF41qKouT/N7UyQA=";
 
-GST_START_TEST (test_playbin2)
+GST_START_TEST (test_playbin)
 {
   GstElement *playbin, *sink;
   int loops = 2;
@@ -225,7 +225,7 @@ dataurisrc_suite (void)
 
   suite_add_tcase (s, tc_chain);
 
-  tcase_add_test (tc_chain, test_playbin2);
+  tcase_add_test (tc_chain, test_playbin);
 
   return s;
 }
diff --git a/tools/gst-app-maker b/tools/gst-app-maker
index f90944213b..d8f2f43b8e 100755
--- a/tools/gst-app-maker
+++ b/tools/gst-app-maker
@@ -220,7 +220,7 @@ gst_replace_create_pipeline_playbin (GstReplace *replace, const char *uri)
   
   pipeline = gst_pipeline_new (NULL);
   gst_bin_add (GST_BIN(pipeline),
-      gst_element_factory_make ("playbin2", "source"));
+      gst_element_factory_make ("playbin", "source"));
 
   if (error) {
     g_print("pipeline parsing error: %s\n", error->message);