diff --git a/bindings/python/examples/simple.py b/bindings/python/examples/simple.py
index c7b291a287..9628e1ab43 100644
--- a/bindings/python/examples/simple.py
+++ b/bindings/python/examples/simple.py
@@ -35,7 +35,7 @@ class Simple:
 
     def _create_pipeline(self, timeline):
         self.pipeline = GES.Pipeline()
-        self.pipeline.add_timeline(timeline)
+        self.pipeline.set_timeline(timeline)
         bus = self.pipeline.get_bus()
         bus.add_signal_watch()
         bus.connect("message", self.bus_message_cb)
diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt
index 2312a54831..d9af91e30f 100644
--- a/docs/libs/ges-sections.txt
+++ b/docs/libs/ges-sections.txt
@@ -503,7 +503,7 @@ ges_clip_get_type
 <TITLE>GESPipeline</TITLE>
 GESPipeline
 ges_pipeline_new
-ges_pipeline_add_timeline
+ges_pipeline_set_timeline
 ges_pipeline_set_mode
 ges_pipeline_set_render_settings
 ges_pipeline_preview_get_audio_sink
diff --git a/ges/ges-pipeline.c b/ges/ges-pipeline.c
index f163f8c9cf..1bb82cf87d 100644
--- a/ges/ges-pipeline.c
+++ b/ges/ges-pipeline.c
@@ -183,7 +183,7 @@ ges_pipeline_set_property (GObject * object, guint property_id,
           value);
       break;
     case PROP_TIMELINE:
-      ges_pipeline_add_timeline (GES_PIPELINE (object),
+      ges_pipeline_set_timeline (GES_PIPELINE (object),
           g_value_get_object (value));
       break;
     case PROP_MODE:
@@ -261,11 +261,11 @@ ges_pipeline_class_init (GESPipelineClass * klass)
    * GESPipeline:timeline:
    *
    * Timeline to use in this pipeline. See also
-   * ges_pipeline_add_timeline() for more info.
+   * ges_pipeline_set_timeline() for more info.
    */
   properties[PROP_TIMELINE] = g_param_spec_object ("timeline", "Timeline",
       "Timeline to use in this pipeline. See also "
-      "ges_pipeline_add_timeline() for more info.",
+      "ges_pipeline_set_timeline() for more info.",
       GES_TYPE_TIMELINE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_TIMELINE,
       properties[PROP_TIMELINE]);
@@ -786,7 +786,7 @@ no_more_pads_cb (GstElement * timeline, GESPipeline * self)
 }
 
 /**
- * ges_pipeline_add_timeline:
+ * ges_pipeline_set_timeline:
  * @pipeline: a #GESPipeline
  * @timeline: the #GESTimeline to set on the @pipeline.
  *
@@ -798,7 +798,7 @@ no_more_pads_cb (GstElement * timeline, GESPipeline * self)
  * else FALSE.
  */
 gboolean
-ges_pipeline_add_timeline (GESPipeline * pipeline, GESTimeline * timeline)
+ges_pipeline_set_timeline (GESPipeline * pipeline, GESTimeline * timeline)
 {
   g_return_val_if_fail (GES_IS_PIPELINE (pipeline), FALSE);
   g_return_val_if_fail (GES_IS_TIMELINE (timeline), FALSE);
diff --git a/ges/ges-pipeline.h b/ges/ges-pipeline.h
index f457718676..9d00447630 100644
--- a/ges/ges-pipeline.h
+++ b/ges/ges-pipeline.h
@@ -79,7 +79,7 @@ GType ges_pipeline_get_type (void);
 
 GESPipeline* ges_pipeline_new (void);
 
-gboolean ges_pipeline_add_timeline (GESPipeline * pipeline,
+gboolean ges_pipeline_set_timeline (GESPipeline * pipeline,
 					     GESTimeline * timeline);
 
 gboolean ges_pipeline_set_render_settings (GESPipeline *pipeline,
diff --git a/tests/check/ges/integration.c b/tests/check/ges/integration.c
index b1c32a35bd..daffab6bc4 100644
--- a/tests/check/ges/integration.c
+++ b/tests/check/ges/integration.c
@@ -350,7 +350,7 @@ check_timeline (GESTimeline * timeline)
   gst_bus_add_watch (bus, my_bus_callback, &ret);
   gst_object_unref (bus);
 
-  ges_pipeline_add_timeline (pipeline, timeline);
+  ges_pipeline_set_timeline (pipeline, timeline);
   gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING);
   gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, -1);
   GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS (GST_BIN (pipeline),
diff --git a/tests/check/ges/project.c b/tests/check/ges/project.c
index ea496fd3f1..35966dbc2c 100644
--- a/tests/check/ges/project.c
+++ b/tests/check/ges/project.c
@@ -633,7 +633,7 @@ project_loaded_now_play_cb (GESProject * project, GESTimeline * timeline)
 
   GESPipeline *pipeline = ges_pipeline_new ();
 
-  fail_unless (ges_pipeline_add_timeline (pipeline, timeline));
+  fail_unless (ges_pipeline_set_timeline (pipeline, timeline));
 
   bus = gst_element_get_bus (GST_ELEMENT (pipeline));
   fail_if (gst_element_set_state (GST_ELEMENT (pipeline),
diff --git a/tests/check/ges/test-utils.c b/tests/check/ges/test-utils.c
index 637a17e207..f92c9b1a7b 100644
--- a/tests/check/ges/test-utils.c
+++ b/tests/check/ges/test-utils.c
@@ -97,7 +97,7 @@ ges_test_create_pipeline (GESTimeline * timeline)
   GESPipeline *pipeline;
 
   pipeline = ges_pipeline_new ();
-  fail_unless (ges_pipeline_add_timeline (pipeline, timeline));
+  fail_unless (ges_pipeline_set_timeline (pipeline, timeline));
 
   g_object_set (pipeline, "audio-sink", gst_element_factory_make ("fakesink",
           "test-audiofakesink"), "video-sink",
@@ -264,7 +264,7 @@ play_timeline (GESTimeline * timeline)
   gst_bus_add_watch (bus, (GstBusFunc) my_bus_callback, loop);
   gst_object_unref (bus);
 
-  ges_pipeline_add_timeline (pipeline, timeline);
+  ges_pipeline_set_timeline (pipeline, timeline);
   gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING);
   gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, -1);
 
diff --git a/tests/examples/concatenate.c b/tests/examples/concatenate.c
index 307c2fa7fb..421e52355b 100644
--- a/tests/examples/concatenate.c
+++ b/tests/examples/concatenate.c
@@ -103,7 +103,7 @@ main (int argc, char **argv)
   pipeline = ges_pipeline_new ();
 
   /* Add the timeline to that pipeline */
-  if (!ges_pipeline_add_timeline (pipeline, timeline))
+  if (!ges_pipeline_set_timeline (pipeline, timeline))
     return -1;
 
   mainloop = g_main_loop_new (NULL, FALSE);
diff --git a/tests/examples/ges-ui.c b/tests/examples/ges-ui.c
index c0280dfda9..0d79e0528c 100644
--- a/tests/examples/ges-ui.c
+++ b/tests/examples/ges-ui.c
@@ -1142,7 +1142,7 @@ app_launch_project (App * app, gchar * uri)
   bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline));
   mainloop = g_main_loop_new (NULL, FALSE);
 
-  ges_pipeline_add_timeline (pipeline, timeline);
+  ges_pipeline_set_timeline (pipeline, timeline);
   ges_pipeline_set_mode (pipeline, TIMELINE_MODE_PREVIEW_VIDEO);
   gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING);
   gst_bus_add_signal_watch (bus);
@@ -1268,7 +1268,7 @@ app_init (void)
   if (!(ret->pipeline = ges_pipeline_new ()))
     goto fail;
 
-  if (!ges_pipeline_add_timeline (ret->pipeline, ret->timeline))
+  if (!ges_pipeline_set_timeline (ret->pipeline, ret->timeline))
     goto fail;
 
   if (!(create_ui (ret)))
diff --git a/tests/examples/overlays.c b/tests/examples/overlays.c
index 39dcec5a42..0be0edecad 100644
--- a/tests/examples/overlays.c
+++ b/tests/examples/overlays.c
@@ -92,7 +92,7 @@ make_timeline (char *path, float duration, char *text, guint32 color,
   ges_pipeline_set_mode (pipeline, TIMELINE_MODE_PREVIEW_VIDEO);
 
   timeline = ges_timeline_new ();
-  ges_pipeline_add_timeline (pipeline, timeline);
+  ges_pipeline_set_timeline (pipeline, timeline);
 
   trackv = GES_TRACK (ges_video_track_new ());
   ges_timeline_add_track (timeline, trackv);
diff --git a/tests/examples/simple1.c b/tests/examples/simple1.c
index b1790b0fac..c7c6be864b 100644
--- a/tests/examples/simple1.c
+++ b/tests/examples/simple1.c
@@ -84,7 +84,7 @@ main (int argc, gchar ** argv)
       !ges_timeline_add_layer (timeline, layer2) ||
       !ges_timeline_add_track (timeline, tracka) ||
       !ges_timeline_add_track (timeline, trackv) ||
-      !ges_pipeline_add_timeline (pipeline, timeline))
+      !ges_pipeline_set_timeline (pipeline, timeline))
     return -1;
 
   if (1) {
diff --git a/tests/examples/test1.c b/tests/examples/test1.c
index f2aeb317ca..72d382a917 100644
--- a/tests/examples/test1.c
+++ b/tests/examples/test1.c
@@ -67,7 +67,7 @@ main (int argc, gchar ** argv)
   pipeline = ges_pipeline_new ();
 
   /* Add the timeline to that pipeline */
-  if (!ges_pipeline_add_timeline (pipeline, timeline))
+  if (!ges_pipeline_set_timeline (pipeline, timeline))
     return -1;
 
   /* The following is standard usage of a GStreamer pipeline (note how you haven't
diff --git a/tests/examples/test2.c b/tests/examples/test2.c
index 2bf4a53f78..c0bf994c21 100644
--- a/tests/examples/test2.c
+++ b/tests/examples/test2.c
@@ -78,7 +78,7 @@ main (int argc, gchar ** argv)
   pipeline = ges_pipeline_new ();
 
   /* Add the timeline to that pipeline */
-  if (!ges_pipeline_add_timeline (pipeline, timeline))
+  if (!ges_pipeline_set_timeline (pipeline, timeline))
     return -1;
 
   /* The following is standard usage of a GStreamer pipeline (note how you
diff --git a/tests/examples/test3.c b/tests/examples/test3.c
index fecd27b2be..d458c977b5 100644
--- a/tests/examples/test3.c
+++ b/tests/examples/test3.c
@@ -77,7 +77,7 @@ main (int argc, gchar ** argv)
   pipeline = ges_pipeline_new ();
 
   /* Add the timeline to that pipeline */
-  if (!ges_pipeline_add_timeline (pipeline, timeline))
+  if (!ges_pipeline_set_timeline (pipeline, timeline))
     return -1;
 
   /* The following is standard usage of a GStreamer pipeline (note how you haven't
diff --git a/tests/examples/test4.c b/tests/examples/test4.c
index 595545dfa7..d38dab6107 100644
--- a/tests/examples/test4.c
+++ b/tests/examples/test4.c
@@ -134,7 +134,7 @@ main (int argc, gchar ** argv)
   pipeline = ges_pipeline_new ();
 
   /* Add the timeline to that pipeline */
-  if (!ges_pipeline_add_timeline (pipeline, timeline))
+  if (!ges_pipeline_set_timeline (pipeline, timeline))
     return -1;
 
 
diff --git a/tests/examples/text_properties.c b/tests/examples/text_properties.c
index e5b84a98b7..a319f541e2 100644
--- a/tests/examples/text_properties.c
+++ b/tests/examples/text_properties.c
@@ -65,7 +65,7 @@ make_timeline (char *path, float duration, char *text)
   ges_pipeline_set_mode (pipeline, TIMELINE_MODE_PREVIEW_VIDEO);
 
   timeline = ges_timeline_new ();
-  ges_pipeline_add_timeline (pipeline, timeline);
+  ges_pipeline_set_timeline (pipeline, timeline);
 
   trackv = GES_TRACK (ges_video_track_new ());
   ges_timeline_add_track (timeline, trackv);
diff --git a/tests/examples/thumbnails.c b/tests/examples/thumbnails.c
index ba454fb420..61ee21aa8e 100644
--- a/tests/examples/thumbnails.c
+++ b/tests/examples/thumbnails.c
@@ -101,7 +101,7 @@ create_timeline (void)
 
   pipeline = ges_pipeline_new ();
 
-  if (!ges_pipeline_add_timeline (pipeline, timeline))
+  if (!ges_pipeline_set_timeline (pipeline, timeline))
     return NULL;
 
   return pipeline;
diff --git a/tests/examples/transition.c b/tests/examples/transition.c
index 6eb1fa9cdb..e6227736bf 100644
--- a/tests/examples/transition.c
+++ b/tests/examples/transition.c
@@ -100,7 +100,7 @@ make_timeline (gchar * nick, gdouble tdur, gchar * patha, gfloat adur,
   ges_pipeline_set_mode (pipeline, TIMELINE_MODE_PREVIEW_VIDEO);
 
   timeline = ges_timeline_new ();
-  ges_pipeline_add_timeline (pipeline, timeline);
+  ges_pipeline_set_timeline (pipeline, timeline);
 
   trackv = GES_TRACK (ges_video_track_new ());
   ges_timeline_add_track (timeline, trackv);
diff --git a/tools/ges-launch.c b/tools/ges-launch.c
index 9810a978ea..d61fb0a06a 100644
--- a/tools/ges-launch.c
+++ b/tools/ges-launch.c
@@ -343,7 +343,7 @@ create_pipeline (GESTimeline ** ret_timeline, gchar * load_path,
   pipeline = ges_pipeline_new ();
 
   /* Add the timeline to that pipeline */
-  if (!ges_pipeline_add_timeline (pipeline, timeline))
+  if (!ges_pipeline_set_timeline (pipeline, timeline))
     goto failure;
 
   *ret_timeline = timeline;