diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt
index 0e9392e79c..8955f07a2e 100644
--- a/docs/libs/ges-sections.txt
+++ b/docs/libs/ges-sections.txt
@@ -377,19 +377,19 @@ GES_TIMELINE_TITLE_SOURCE_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>ges-timeline-overlay</FILE>
-<TITLE>GESTimelineOverlay</TITLE>
-GESTimelineOverlay
-GESTimelineOverlayClass
-ges_timeline_overlay_new
-ges_tl_overlay_get_type
+<FILE>ges-timeline-text-overlay</FILE>
+<TITLE>GESTimelineTextOverlay</TITLE>
+GESTimelineTextOverlay
+GESTimelineTextOverlayClass
+ges_timeline_text_overlay_new
+ges_tl_text_overlay_get_type
 <SUBSECTION Standard>
-GES_IS_TIMELINE_OVERLAY
-GES_IS_TIMELINE_OVERLAY_CLASS
-GES_TIMELINE_OVERLAY
-GES_TIMELINE_OVERLAY_CLASS
-GES_TIMELINE_OVERLAY_GET_CLASS
-GES_TYPE_TIMELINE_OVERLAY
+GES_IS_TIMELINE_TEXT_OVERLAY
+GES_IS_TIMELINE_TEXT_OVERLAY_CLASS
+GES_TIMELINE_TEXT_OVERLAY
+GES_TIMELINE_TEXT_OVERLAY_CLASS
+GES_TIMELINE_TEXT_OVERLAY_GET_CLASS
+GES_TYPE_TIMELINE_TEXT_OVERLAY
 </SECTION>
 
 <SECTION>
diff --git a/ges/Makefile.am b/ges/Makefile.am
index 278a4791c2..34472350b4 100644
--- a/ges/Makefile.am
+++ b/ges/Makefile.am
@@ -20,7 +20,7 @@ libges_@GST_MAJORMINOR@_la_SOURCES = 		\
 	ges-timeline-transition.c		\
 	ges-timeline-test-source.c		\
 	ges-timeline-title-source.c		\
-	ges-timeline-overlay.c		\
+	ges-timeline-text-overlay.c		\
 	ges-track.c				\
 	ges-track-object.c			\
 	ges-track-source.c			\
@@ -51,7 +51,7 @@ libges_@GST_MAJORMINOR@include_HEADERS = 	\
 	ges-timeline-transition.h		\
 	ges-timeline-test-source.h		\
 	ges-timeline-title-source.h		\
-	ges-timeline-overlay.h		\
+	ges-timeline-text-overlay.h		\
 	ges-track.h				\
 	ges-track-object.h			\
 	ges-track-source.h			\
diff --git a/ges/ges-timeline-overlay.c b/ges/ges-timeline-text-overlay.c
similarity index 71%
rename from ges/ges-timeline-overlay.c
rename to ges/ges-timeline-text-overlay.c
index ff7828e985..38fb89afb2 100644
--- a/ges/ges-timeline-overlay.c
+++ b/ges/ges-timeline-text-overlay.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * SECTION:ges-timeline-overlay
+ * SECTION:ges-timeline-text-overlay
  * @short_description: An object for manipulating media files in a GESTimeline
  * 
  * Represents all the output treams from a particular uri. It is assumed that
@@ -27,21 +27,22 @@
  */
 
 #include "ges-internal.h"
-#include "ges-timeline-overlay.h"
+#include "ges-timeline-text-overlay.h"
 #include "ges-timeline-source.h"
 #include "ges-track-object.h"
 #include "ges-track-title-source.h"
 #include "ges-track-text-overlay.h"
 #include <string.h>
 
-G_DEFINE_TYPE (GESTimelineOverlay, ges_tl_overlay, GES_TYPE_TIMELINE_OBJECT);
+G_DEFINE_TYPE (GESTimelineTextOverlay, ges_tl_text_overlay,
+    GES_TYPE_TIMELINE_OBJECT);
 
 #define DEFAULT_PROP_TEXT ""
 #define DEFAULT_PROP_FONT_DESC DEFAULT_FONT_DESC
 #define DEFAULT_PROP_VALIGNMENT DEFAULT_VALIGNMENT
 #define DEFAULT_PROP_HALIGNMENT DEFAULT_HALIGNMENT
-#define GES_TIMELINE_TITLE_SRC_VALIGN_TYPE (ges_timeline_overlay_valign_get_type())
-#define GES_TIMELINE_TITLE_SRC_HALIGN_TYPE (ges_timeline_overlay_halign_get_type())
+#define GES_TIMELINE_TITLE_SRC_VALIGN_TYPE (ges_timeline_text_overlay_valign_get_type())
+#define GES_TIMELINE_TITLE_SRC_HALIGN_TYPE (ges_timeline_text_overlay_halign_get_type())
 
 enum
 {
@@ -53,34 +54,38 @@ enum
   PROP_VALIGNMENT,
 };
 
-static void ges_tl_overlay_set_mute (GESTimelineOverlay * self, gboolean mute);
+static void ges_tl_text_overlay_set_mute (GESTimelineTextOverlay * self,
+    gboolean mute);
 
 static void
-ges_tl_overlay_set_text (GESTimelineOverlay * self, const gchar * text);
+ges_tl_text_overlay_set_text (GESTimelineTextOverlay * self,
+    const gchar * text);
 
 static void
-ges_tl_overlay_set_font_desc (GESTimelineOverlay * self, const gchar *
+ges_tl_text_overlay_set_font_desc (GESTimelineTextOverlay * self, const gchar *
     font_desc);
 
 static void
-ges_tl_overlay_set_valign (GESTimelineOverlay * self, GESTrackTitleSrcVAlign);
+ges_tl_text_overlay_set_valign (GESTimelineTextOverlay * self,
+    GESTrackTitleSrcVAlign);
 
 static void
-ges_tl_overlay_set_halign (GESTimelineOverlay * self, GESTrackTitleSrcHAlign);
+ges_tl_text_overlay_set_halign (GESTimelineTextOverlay * self,
+    GESTrackTitleSrcHAlign);
 
 static GESTrackObject
-    * ges_tl_overlay_create_track_object (GESTimelineObject * obj,
+    * ges_tl_text_overlay_create_track_object (GESTimelineObject * obj,
     GESTrack * track);
 
-static GType ges_timeline_overlay_valign_get_type (void);
+static GType ges_timeline_text_overlay_valign_get_type (void);
 
-static GType ges_timeline_overlay_halign_get_type (void);
+static GType ges_timeline_text_overlay_halign_get_type (void);
 
 static void
-ges_tl_overlay_get_property (GObject * object, guint property_id,
+ges_tl_text_overlay_get_property (GObject * object, guint property_id,
     GValue * value, GParamSpec * pspec)
 {
-  GESTimelineOverlay *tfs = GES_TIMELINE_OVERLAY (object);
+  GESTimelineTextOverlay *tfs = GES_TIMELINE_TEXT_OVERLAY (object);
 
   switch (property_id) {
     case PROP_MUTE:
@@ -104,26 +109,26 @@ ges_tl_overlay_get_property (GObject * object, guint property_id,
 }
 
 static void
-ges_tl_overlay_set_property (GObject * object, guint property_id,
+ges_tl_text_overlay_set_property (GObject * object, guint property_id,
     const GValue * value, GParamSpec * pspec)
 {
-  GESTimelineOverlay *tfs = GES_TIMELINE_OVERLAY (object);
+  GESTimelineTextOverlay *tfs = GES_TIMELINE_TEXT_OVERLAY (object);
 
   switch (property_id) {
     case PROP_MUTE:
-      ges_tl_overlay_set_mute (tfs, g_value_get_boolean (value));
+      ges_tl_text_overlay_set_mute (tfs, g_value_get_boolean (value));
       break;
     case PROP_TEXT:
-      ges_tl_overlay_set_text (tfs, g_value_get_string (value));
+      ges_tl_text_overlay_set_text (tfs, g_value_get_string (value));
       break;
     case PROP_FONT_DESC:
-      ges_tl_overlay_set_font_desc (tfs, g_value_get_string (value));
+      ges_tl_text_overlay_set_font_desc (tfs, g_value_get_string (value));
       break;
     case PROP_HALIGNMENT:
-      ges_tl_overlay_set_halign (tfs, g_value_get_enum (value));
+      ges_tl_text_overlay_set_halign (tfs, g_value_get_enum (value));
       break;
     case PROP_VALIGNMENT:
-      ges_tl_overlay_set_valign (tfs, g_value_get_enum (value));
+      ges_tl_text_overlay_set_valign (tfs, g_value_get_enum (value));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -131,37 +136,37 @@ ges_tl_overlay_set_property (GObject * object, guint property_id,
 }
 
 static void
-ges_tl_overlay_dispose (GObject * object)
+ges_tl_text_overlay_dispose (GObject * object)
 {
-  GESTimelineOverlay *self = GES_TIMELINE_OVERLAY (object);
+  GESTimelineTextOverlay *self = GES_TIMELINE_TEXT_OVERLAY (object);
 
   if (self->text)
     g_free (self->text);
   if (self->font_desc)
     g_free (self->font_desc);
 
-  G_OBJECT_CLASS (ges_tl_overlay_parent_class)->dispose (object);
+  G_OBJECT_CLASS (ges_tl_text_overlay_parent_class)->dispose (object);
 }
 
 static void
-ges_tl_overlay_finalize (GObject * object)
+ges_tl_text_overlay_finalize (GObject * object)
 {
-  G_OBJECT_CLASS (ges_tl_overlay_parent_class)->finalize (object);
+  G_OBJECT_CLASS (ges_tl_text_overlay_parent_class)->finalize (object);
 }
 
 static void
-ges_tl_overlay_class_init (GESTimelineOverlayClass * klass)
+ges_tl_text_overlay_class_init (GESTimelineTextOverlayClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GESTimelineObjectClass *timobj_class = GES_TIMELINE_OBJECT_CLASS (klass);
 
-  object_class->get_property = ges_tl_overlay_get_property;
-  object_class->set_property = ges_tl_overlay_set_property;
-  object_class->dispose = ges_tl_overlay_dispose;
-  object_class->finalize = ges_tl_overlay_finalize;
+  object_class->get_property = ges_tl_text_overlay_get_property;
+  object_class->set_property = ges_tl_text_overlay_set_property;
+  object_class->dispose = ges_tl_text_overlay_dispose;
+  object_class->finalize = ges_tl_text_overlay_finalize;
 
   /**
-   * GESTimelineOverlay:text
+   * GESTimelineTextOverlay:text
    *
    * The text to diplay
    */
@@ -171,7 +176,7 @@ ges_tl_overlay_class_init (GESTimelineOverlayClass * klass)
           DEFAULT_PROP_TEXT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
   /**
-   * GESTimelineOverlay:font-dec
+   * GESTimelineTextOverlay:font-dec
    *
    * Pango font description string
    */
@@ -184,7 +189,7 @@ ges_tl_overlay_class_init (GESTimelineOverlayClass * klass)
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   /**
-   * GESTimelineOverlay:valignment
+   * GESTimelineTextOverlay:valignment
    *
    * Vertical alignent of the text
    */
@@ -193,7 +198,7 @@ ges_tl_overlay_class_init (GESTimelineOverlayClass * klass)
           "Vertical alignment of the text", GES_TIMELINE_TITLE_SRC_VALIGN_TYPE,
           DEFAULT_PROP_VALIGNMENT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * GESTimelineOverlay:halignment
+   * GESTimelineTextOverlay:halignment
    *
    * Horizontal alignment of the text
    */
@@ -203,7 +208,7 @@ ges_tl_overlay_class_init (GESTimelineOverlayClass * klass)
           GES_TIMELINE_TITLE_SRC_HALIGN_TYPE, DEFAULT_PROP_HALIGNMENT,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   /**
-   * GESTimelineOverlay:mute:
+   * GESTimelineTextOverlay:mute:
    *
    * Whether the sound will be played or not.
    */
@@ -211,12 +216,12 @@ ges_tl_overlay_class_init (GESTimelineOverlayClass * klass)
       g_param_spec_boolean ("mute", "Mute", "Mute audio track",
           FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
-  timobj_class->create_track_object = ges_tl_overlay_create_track_object;
+  timobj_class->create_track_object = ges_tl_text_overlay_create_track_object;
   timobj_class->need_fill_track = FALSE;
 }
 
 static void
-ges_tl_overlay_init (GESTimelineOverlay * self)
+ges_tl_text_overlay_init (GESTimelineTextOverlay * self)
 {
   GES_TIMELINE_OBJECT (self)->duration = 0;
   self->text = NULL;
@@ -226,7 +231,7 @@ ges_tl_overlay_init (GESTimelineOverlay * self)
 }
 
 static GType
-ges_timeline_overlay_valign_get_type (void)
+ges_timeline_text_overlay_valign_get_type (void)
 {
   static GType text_overlay_valign_type = 0;
   static gsize initialized = 0;
@@ -239,7 +244,7 @@ ges_timeline_overlay_valign_get_type (void)
 
   if (g_once_init_enter (&initialized)) {
     text_overlay_valign_type =
-        g_enum_register_static ("GESTimelineOverlayVAlign",
+        g_enum_register_static ("GESTimelineTextOverlayVAlign",
         text_overlay_valign);
     g_once_init_leave (&initialized, 1);
   }
@@ -247,7 +252,7 @@ ges_timeline_overlay_valign_get_type (void)
 }
 
 static GType
-ges_timeline_overlay_halign_get_type (void)
+ges_timeline_text_overlay_halign_get_type (void)
 {
   static GType text_overlay_halign_type = 0;
   static gsize initialized = 0;
@@ -260,7 +265,7 @@ ges_timeline_overlay_halign_get_type (void)
 
   if (g_once_init_enter (&initialized)) {
     text_overlay_halign_type =
-        g_enum_register_static ("GESTimelineOverlayHAlign",
+        g_enum_register_static ("GESTimelineTextOverlayHAlign",
         text_overlay_halign);
     g_once_init_leave (&initialized, 1);
   }
@@ -268,7 +273,7 @@ ges_timeline_overlay_halign_get_type (void)
 }
 
 static void
-ges_tl_overlay_set_text (GESTimelineOverlay * self, const gchar * text)
+ges_tl_text_overlay_set_text (GESTimelineTextOverlay * self, const gchar * text)
 {
   GList *tmp;
   GESTimelineObject *object = (GESTimelineObject *) self;
@@ -290,7 +295,7 @@ ges_tl_overlay_set_text (GESTimelineOverlay * self, const gchar * text)
 }
 
 static void
-ges_tl_overlay_set_font_desc (GESTimelineOverlay * self, const gchar *
+ges_tl_text_overlay_set_font_desc (GESTimelineTextOverlay * self, const gchar *
     font_desc)
 {
   GList *tmp;
@@ -314,7 +319,7 @@ ges_tl_overlay_set_font_desc (GESTimelineOverlay * self, const gchar *
 }
 
 static void
-ges_tl_overlay_set_halign (GESTimelineOverlay * self,
+ges_tl_text_overlay_set_halign (GESTimelineTextOverlay * self,
     GESTrackTitleSrcHAlign halign)
 {
   GList *tmp;
@@ -336,7 +341,7 @@ ges_tl_overlay_set_halign (GESTimelineOverlay * self,
 }
 
 static void
-ges_tl_overlay_set_valign (GESTimelineOverlay * self,
+ges_tl_text_overlay_set_valign (GESTimelineTextOverlay * self,
     GESTrackTitleSrcVAlign valign)
 {
   GList *tmp;
@@ -357,7 +362,7 @@ ges_tl_overlay_set_valign (GESTimelineOverlay * self,
 }
 
 static void
-ges_tl_overlay_set_mute (GESTimelineOverlay * self, gboolean mute)
+ges_tl_text_overlay_set_mute (GESTimelineTextOverlay * self, gboolean mute)
 {
   GList *tmp;
   GESTimelineObject *object = (GESTimelineObject *) self;
@@ -376,10 +381,11 @@ ges_tl_overlay_set_mute (GESTimelineOverlay * self, gboolean mute)
 }
 
 static GESTrackObject *
-ges_tl_overlay_create_track_object (GESTimelineObject * obj, GESTrack * track)
+ges_tl_text_overlay_create_track_object (GESTimelineObject * obj,
+    GESTrack * track)
 {
 
-  GESTimelineOverlay *tfs = (GESTimelineOverlay *) obj;
+  GESTimelineTextOverlay *tfs = (GESTimelineTextOverlay *) obj;
   GESTrackObject *res = NULL;
 
   GST_DEBUG ("Creating a GESTrackOverlay");
@@ -400,14 +406,14 @@ ges_tl_overlay_create_track_object (GESTimelineObject * obj, GESTrack * track)
 /**
  * ges_timeline_titlesource_new:
  *
- * Creates a new #GESTimelineOverlay
+ * Creates a new #GESTimelineTextOverlay
  *
- * Returns: The newly created #GESTimelineOverlay, or NULL if there was an
+ * Returns: The newly created #GESTimelineTextOverlay, or NULL if there was an
  * error.
  */
-GESTimelineOverlay *
-ges_timeline_overlay_new (void)
+GESTimelineTextOverlay *
+ges_timeline_text_overlay_new (void)
 {
   /* FIXME : Check for validity/existence of URI */
-  return g_object_new (GES_TYPE_TIMELINE_OVERLAY, NULL);
+  return g_object_new (GES_TYPE_TIMELINE_TEXT_OVERLAY, NULL);
 }
diff --git a/ges/ges-timeline-overlay.h b/ges/ges-timeline-text-overlay.h
similarity index 59%
rename from ges/ges-timeline-overlay.h
rename to ges/ges-timeline-text-overlay.h
index dabfa316b6..52a3475631 100644
--- a/ges/ges-timeline-overlay.h
+++ b/ges/ges-timeline-text-overlay.h
@@ -28,30 +28,30 @@
 
 G_BEGIN_DECLS
 
-#define GES_TYPE_TIMELINE_OVERLAY ges_tl_overlay_get_type()
+#define GES_TYPE_TIMELINE_TEXT_OVERLAY ges_tl_text_overlay_get_type()
 
-#define GES_TIMELINE_OVERLAY(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TIMELINE_OVERLAY, GESTimelineOverlay))
+#define GES_TIMELINE_TEXT_OVERLAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TIMELINE_TEXT_OVERLAY, GESTimelineTextOverlay))
 
-#define GES_TIMELINE_OVERLAY_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TIMELINE_OVERLAY, GESTimelineOverlayClass))
+#define GES_TIMELINE_TEXT_OVERLAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TIMELINE_TEXT_OVERLAY, GESTimelineTextOverlayClass))
 
-#define GES_IS_TIMELINE_OVERLAY(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TIMELINE_OVERLAY))
+#define GES_IS_TIMELINE_TEXT_OVERLAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TIMELINE_TEXT_OVERLAY))
 
-#define GES_IS_TIMELINE_OVERLAY_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TIMELINE_OVERLAY))
+#define GES_IS_TIMELINE_TEXT_OVERLAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TIMELINE_TEXT_OVERLAY))
 
-#define GES_TIMELINE_OVERLAY_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_OVERLAY, GESTimelineOverlayClass))
+#define GES_TIMELINE_TEXT_OVERLAY_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_TEXT_OVERLAY, GESTimelineTextOverlayClass))
 
 /**
- * GESTimelineOverlay:
+ * GESTimelineTextOverlay:
  * @parent: parent
  * 
  */
 
-struct _GESTimelineOverlay {
+struct _GESTimelineTextOverlay {
   GESTimelineObject parent;
 
   /*< private >*/
@@ -63,19 +63,19 @@ struct _GESTimelineOverlay {
 };
 
 /**
- * GESTimelineOverlayClass:
+ * GESTimelineTextOverlayClass:
  * @parent_class: parent class
  */
 
-struct _GESTimelineOverlayClass {
+struct _GESTimelineTextOverlayClass {
   GESTimelineObjectClass parent_class;
 
   /*< public >*/
 };
 
-GType ges_tl_overlay_get_type (void);
+GType ges_tl_text_overlay_get_type (void);
 
-GESTimelineOverlay* ges_timeline_overlay_new (void);
+GESTimelineTextOverlay* ges_timeline_text_overlay_new (void);
 
 G_END_DECLS
 
diff --git a/ges/ges-types.h b/ges/ges-types.h
index dcd79442c2..f24552b2e7 100644
--- a/ges/ges-types.h
+++ b/ges/ges-types.h
@@ -54,8 +54,8 @@ typedef struct _GESTimelineTestSourceClass GESTimelineTestSourceClass;
 typedef struct _GESTimelineTitleSource GESTimelineTitleSource;
 typedef struct _GESTimelineTitleSourceClass GESTimelineTitleSourceClass;
 
-typedef struct _GESTimelineOverlay GESTimelineOverlay;
-typedef struct _GESTimelineOverlayClass GESTimelineOverlayClass;
+typedef struct _GESTimelineTextOverlay GESTimelineTextOverlay;
+typedef struct _GESTimelineTextOverlayClass GESTimelineTextOverlayClass;
 
 typedef struct _GESTrack GESTrack;
 typedef struct _GESTrackClass GESTrackClass;
diff --git a/ges/ges.h b/ges/ges.h
index 806f101e14..8e7d3dc2ee 100644
--- a/ges/ges.h
+++ b/ges/ges.h
@@ -35,7 +35,7 @@
 #include <ges/ges-timeline-transition.h>
 #include <ges/ges-timeline-test-source.h>
 #include <ges/ges-timeline-title-source.h>
-#include <ges/ges-timeline-overlay.h>
+#include <ges/ges-timeline-text-overlay.h>
 #include <ges/ges-track.h>
 #include <ges/ges-track-object.h>
 #include <ges/ges-track-source.h>
diff --git a/tests/check/ges/overlays.c b/tests/check/ges/overlays.c
index 09358a2239..7e9b99a58f 100644
--- a/tests/check/ges/overlays.c
+++ b/tests/check/ges/overlays.c
@@ -22,11 +22,11 @@
 
 GST_START_TEST (test_overlay_basic)
 {
-  GESTimelineOverlay *source;
+  GESTimelineTextOverlay *source;
 
   ges_init ();
 
-  source = ges_timeline_overlay_new ();
+  source = ges_timeline_text_overlay_new ();
   fail_unless (source != NULL);
 
   g_object_unref (source);
@@ -60,7 +60,7 @@ GST_START_TEST (test_overlay_properties)
   fail_unless (track != NULL);
 
   object = (GESTimelineObject *)
-      ges_timeline_overlay_new ();
+      ges_timeline_text_overlay_new ();
   fail_unless (object != NULL);
 
   /* Set some properties */
@@ -113,7 +113,7 @@ GST_START_TEST (test_overlay_in_layer)
   GESTimelineLayer *layer;
   GESTrack *a, *v;
   GESTrackObject *trobj;
-  GESTimelineOverlay *source;
+  GESTimelineTextOverlay *source;
   gchar *text;
   gint halign, valign;
 
@@ -128,7 +128,7 @@ GST_START_TEST (test_overlay_in_layer)
   ges_timeline_add_track (timeline, v);
   ges_timeline_add_layer (timeline, layer);
 
-  source = ges_timeline_overlay_new ();
+  source = ges_timeline_text_overlay_new ();
 
   g_object_set (source, "duration", (guint64) GST_SECOND, NULL);
 
diff --git a/tests/examples/overlays.c b/tests/examples/overlays.c
index f942180f32..4f72fd1c9d 100644
--- a/tests/examples/overlays.c
+++ b/tests/examples/overlays.c
@@ -57,7 +57,8 @@ make_source (char *path, guint64 start, guint64 duration, gint priority)
 GESTimelineObject *
 make_overlay (char *text, guint64 start, guint64 duration, gint priority)
 {
-  GESTimelineObject *ret = GES_TIMELINE_OBJECT (ges_timeline_overlay_new ());
+  GESTimelineObject *ret =
+      GES_TIMELINE_OBJECT (ges_timeline_text_overlay_new ());
 
   g_object_set (ret,
       "text", (gchar *) text,