diff --git a/ges/ges-timeline-title-source.c b/ges/ges-timeline-title-source.c
index 6a1660daa9..e045b142f3 100644
--- a/ges/ges-timeline-title-source.c
+++ b/ges/ges-timeline-title-source.c
@@ -398,7 +398,7 @@ ges_tl_title_src_create_track_object (GESTimelineObject * obj, GESTrack * track)
   }
 
   else {
-    res = GES_TRACK_OBJECT (ges_track_title_source_new ());
+    res = NULL;
   }
 
   return res;
diff --git a/ges/ges-track-video-title-source.c b/ges/ges-track-video-title-source.c
index a7961a63a8..554356871e 100644
--- a/ges/ges-track-video-title-source.c
+++ b/ges/ges-track-video-title-source.c
@@ -29,7 +29,7 @@
 #include "ges-track-video-background-source.h"
 
 G_DEFINE_TYPE (GESTrackVideoTitleSource, ges_track_video_title_src,
-    GES_TYPE_TRACK_TITLE_SOURCE);
+    GES_TYPE_TRACK_SOURCE);
 
 enum
 {
@@ -46,17 +46,17 @@ static void ges_track_video_title_src_get_property (GObject * object, guint
 static void ges_track_video_title_src_set_property (GObject * object, guint
     property_id, const GValue * value, GParamSpec * pspec);
 
-static GstElement *ges_track_video_title_src_create_element (GESTrackTitleSource
+static GstElement *ges_track_video_title_src_create_element (GESTrackSource
     * self);
 
 static void
 ges_track_video_title_src_class_init (GESTrackVideoTitleSourceClass * klass)
 {
   GObjectClass *object_class;
-  GESTrackTitleSourceClass *bg_class;
+  GESTrackSourceClass *bg_class;
 
   object_class = G_OBJECT_CLASS (klass);
-  bg_class = GES_TRACK_TITLE_SOURCE_CLASS (klass);
+  bg_class = GES_TRACK_SOURCE_CLASS (klass);
 
   object_class->get_property = ges_track_video_title_src_get_property;
   object_class->set_property = ges_track_video_title_src_set_property;
@@ -129,7 +129,7 @@ ges_track_video_title_src_set_property (GObject * object,
 }
 
 static GstElement *
-ges_track_video_title_src_create_element (GESTrackTitleSource * object)
+ges_track_video_title_src_create_element (GESTrackSource * object)
 {
   GESTrackVideoTitleSource *self = GES_TRACK_VIDEO_TITLE_SOURCE (object);
   GstElement *topbin, *background, *text;
diff --git a/ges/ges-track-video-title-source.h b/ges/ges-track-video-title-source.h
index fae2a43017..9f601f5ba6 100644
--- a/ges/ges-track-video-title-source.h
+++ b/ges/ges-track-video-title-source.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 #include <ges/ges-types.h>
-#include <ges/ges-track-title-source.h>
+#include <ges/ges-track-source.h>
 
 G_BEGIN_DECLS
 
@@ -82,7 +82,7 @@ typedef enum {
  *
  */
 struct _GESTrackVideoTitleSource {
-  GESTrackTitleSource parent;
+  GESTrackSource parent;
 
   /*< private >*/
   gchar         *text;
@@ -99,7 +99,7 @@ struct _GESTrackVideoTitleSource {
  */
 
 struct _GESTrackVideoTitleSourceClass {
-  GESTrackTitleSourceClass parent_class;
+  GESTrackSourceClass parent_class;
 
   /*< private >*/
 };