diff --git a/docs/libs/ges-docs.sgml b/docs/libs/ges-docs.sgml
index ccf5680b2f..3ef716b8f3 100644
--- a/docs/libs/ges-docs.sgml
+++ b/docs/libs/ges-docs.sgml
@@ -41,7 +41,7 @@ platform as well as Windows. It is released under the GNU Library General Public
     <xi:include href="xml/ges-timeline-source.xml"/>
     <xi:include href="xml/ges-timeline-operation.xml"/>
     <xi:include href="xml/ges-timeline-overlay.xml"/>
-    <xi:include href="xml/ges-timeline-effect.xml"/>
+    <xi:include href="xml/ges-effect-clip.xml"/>
     <xi:include href="xml/ges-track.xml"/>
     <xi:include href="xml/ges-track-object.xml"/>
     <xi:include href="xml/ges-track-source.xml"/>
diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt
index 3751997927..bd067f9abd 100644
--- a/docs/libs/ges-sections.txt
+++ b/docs/libs/ges-sections.txt
@@ -511,19 +511,19 @@ GES_TIMELINE_TRANSITION_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>ges-timeline-effect</FILE>
-<TITLE>GESTimelineEffect</TITLE>
-GESTimelineEffect
+<FILE>ges-effect-clip</FILE>
+<TITLE>GESEffectClip</TITLE>
+GESEffectClip
 <SUBSECTION Standard>
-GESTimelineEffectClass
-GESTimelineEffectPrivate
-GES_TIMELINE_EFFECT
-GES_IS_TIMELINE_EFFECT
-GES_TYPE_TIMELINE_EFFECT
-ges_timeline_effect_get_type
-GES_TIMELINE_EFFECT_CLASS
-GES_IS_TIMELINE_EFFECT_CLASS
-GES_TIMELINE_EFFECT_GET_CLASS
+GESEffectClipClass
+GESEffectClipPrivate
+GES_EFFECT_CLIP
+GES_IS_EFFECT_CLIP
+GES_TYPE_EFFECT_CLIP
+ges_effect_clip_get_type
+GES_EFFECT_CLIP_CLASS
+GES_IS_EFFECT_CLIP_CLASS
+GES_EFFECT_CLIP_GET_CLASS
 </SECTION>
 
 <SECTION>
diff --git a/docs/libs/ges.types b/docs/libs/ges.types
index 907487a313..f68741941d 100644
--- a/docs/libs/ges.types
+++ b/docs/libs/ges.types
@@ -16,7 +16,7 @@ ges_timeline_source_get_type
 ges_timeline_test_source_get_type
 ges_timeline_transition_get_type
 ges_timeline_standard_transition_get_type
-ges_timeline_effect_get_type
+ges_effect_clip_get_type
 ges_timeline_parse_launch_effect_get_type
 ges_uri_clip_get_type
 ges_timeline_text_overlay_get_type
diff --git a/ges/Makefile.am b/ges/Makefile.am
index 8c61be66c1..ec2f6d14d5 100644
--- a/ges/Makefile.am
+++ b/ges/Makefile.am
@@ -19,7 +19,7 @@ libges_@GST_API_VERSION@_la_SOURCES = 		\
 	ges-clip.c			\
 	ges-timeline-pipeline.c			\
 	ges-timeline-source.c			\
-	ges-timeline-effect.c		\
+	ges-effect-clip.c		\
 	ges-timeline-parse-launch-effect.c		\
 	ges-uri-clip.c		\
 	ges-timeline-operation.c		\
@@ -74,7 +74,7 @@ libges_@GST_API_VERSION@include_HEADERS = 	\
 	ges-timeline-pipeline.h			\
 	ges-timeline-source.h			\
 	ges-uri-clip.h		\
-	ges-timeline-effect.h		\
+	ges-effect-clip.h		\
 	ges-timeline-parse-launch-effect.h		\
 	ges-timeline-operation.h		\
 	ges-timeline-transition.h		\
diff --git a/ges/ges-timeline-effect.c b/ges/ges-effect-clip.c
similarity index 79%
rename from ges/ges-timeline-effect.c
rename to ges/ges-effect-clip.c
index 245c1a9ca1..320a015299 100644
--- a/ges/ges-timeline-effect.c
+++ b/ges/ges-effect-clip.c
@@ -18,7 +18,7 @@
  */
 
 /**
- * SECTION: ges-timeline-effect
+ * SECTION: ges-effect-clip
  * @short_description: An effect in a GESTimelineLayer
  *
  * The effect will be applied on the sources that have lower priorities
@@ -33,26 +33,26 @@
 #include "ges-internal.h"
 #include "ges-types.h"
 
-G_DEFINE_ABSTRACT_TYPE (GESTimelineEffect, ges_timeline_effect,
+G_DEFINE_ABSTRACT_TYPE (GESEffectClip, ges_effect_clip,
     GES_TYPE_TIMELINE_OPERATION);
 
-struct _GESTimelineEffectPrivate
+struct _GESEffectClipPrivate
 {
   void *nothing;
 };
 
 
 static void
-ges_timeline_effect_class_init (GESTimelineEffectClass * klass)
+ges_effect_clip_class_init (GESEffectClipClass * klass)
 {
-  g_type_class_add_private (klass, sizeof (GESTimelineEffectPrivate));
+  g_type_class_add_private (klass, sizeof (GESEffectClipPrivate));
 
 }
 
 static void
-ges_timeline_effect_init (GESTimelineEffect * self)
+ges_effect_clip_init (GESEffectClip * self)
 {
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      GES_TYPE_TIMELINE_EFFECT, GESTimelineEffectPrivate);
+      GES_TYPE_EFFECT_CLIP, GESEffectClipPrivate);
 
 }
diff --git a/ges/ges-timeline-effect.h b/ges/ges-effect-clip.h
similarity index 54%
rename from ges/ges-timeline-effect.h
rename to ges/ges-effect-clip.h
index 8eaa70bb2f..0ec27b1ee9 100644
--- a/ges/ges-timeline-effect.h
+++ b/ges/ges-effect-clip.h
@@ -17,52 +17,52 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef _GES_TIMELINE_EFFECT
-#define _GES_TIMELINE_EFFECT
+#ifndef _GES_EFFECT_CLIP
+#define _GES_EFFECT_CLIP
 
 #include <glib-object.h>
 #include <ges/ges-types.h>
 
 G_BEGIN_DECLS
 
-#define GES_TYPE_TIMELINE_EFFECT ges_timeline_effect_get_type()
+#define GES_TYPE_EFFECT_CLIP ges_effect_clip_get_type()
 
-#define GES_TIMELINE_EFFECT(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TIMELINE_EFFECT, GESTimelineEffect))
+#define GES_EFFECT_CLIP(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_EFFECT_CLIP, GESEffectClip))
 
-#define GES_TIMELINE_EFFECT_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TIMELINE_EFFECT, GESTimelineEffectClass))
+#define GES_EFFECT_CLIP_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_EFFECT_CLIP, GESEffectClipClass))
 
-#define GES_IS_TIMELINE_EFFECT(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TIMELINE_EFFECT))
+#define GES_IS_EFFECT_CLIP(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_EFFECT_CLIP))
 
-#define GES_IS_TIMELINE_EFFECT_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TIMELINE_EFFECT))
+#define GES_IS_EFFECT_CLIP_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_EFFECT_CLIP))
 
-#define GES_TIMELINE_EFFECT_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_EFFECT, GESTimelineEffectClass))
+#define GES_EFFECT_CLIP_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_EFFECT_CLIP, GESEffectClipClass))
 
-typedef struct _GESTimelineEffectPrivate GESTimelineEffectPrivate;
+typedef struct _GESEffectClipPrivate GESEffectClipPrivate;
 
 /**
- * GESTimelineEffect:
+ * GESEffectClip:
  */
-struct _GESTimelineEffect {
+struct _GESEffectClip {
   /*< private >*/
   GESTimelineOperation parent;
 
-  GESTimelineEffectPrivate *priv;
+  GESEffectClipPrivate *priv;
 
   /* Padding for API extension */
   gpointer _ges_reserved[GES_PADDING];
 };
 
 /**
- * GESTimelineEffectClass:
+ * GESEffectClipClass:
  *
  */
 
-struct _GESTimelineEffectClass {
+struct _GESEffectClipClass {
   /*< private >*/
   GESTimelineOperationClass parent_class;
 
@@ -70,7 +70,7 @@ struct _GESTimelineEffectClass {
   gpointer _ges_reserved[GES_PADDING];
 };
 
-GType ges_timeline_effect_get_type (void);
+GType ges_effect_clip_get_type (void);
 
 G_END_DECLS
-#endif /* _GES_TIMELINE_EFFECT */
+#endif /* _GES_EFFECT_CLIP */
diff --git a/ges/ges-meta-container.c b/ges/ges-meta-container.c
index 1505734c85..a212916531 100644
--- a/ges/ges-meta-container.c
+++ b/ges/ges-meta-container.c
@@ -14,8 +14,7 @@ static GQuark ges_meta_key;
 
 G_DEFINE_INTERFACE_WITH_CODE (GESMetaContainer, ges_meta_container,
     G_TYPE_OBJECT, ges_meta_key =
-    g_quark_from_static_string ("ges-meta-container-data");
-    );
+    g_quark_from_static_string ("ges-meta-container-data"););
 
 enum
 {
diff --git a/ges/ges-timeline-parse-launch-effect.c b/ges/ges-timeline-parse-launch-effect.c
index 40ce96025f..17accbee08 100644
--- a/ges/ges-timeline-parse-launch-effect.c
+++ b/ges/ges-timeline-parse-launch-effect.c
@@ -37,7 +37,7 @@
 #include "ges-types.h"
 
 G_DEFINE_TYPE (GESTimelineParseLaunchEffect, ges_timeline_parse_launch_effect,
-    GES_TYPE_TIMELINE_EFFECT);
+    GES_TYPE_EFFECT_CLIP);
 
 struct _GESTimelineParseLaunchEffectPrivate
 {
diff --git a/ges/ges-timeline-parse-launch-effect.h b/ges/ges-timeline-parse-launch-effect.h
index 198a34ff8a..891624dd73 100644
--- a/ges/ges-timeline-parse-launch-effect.h
+++ b/ges/ges-timeline-parse-launch-effect.h
@@ -49,7 +49,7 @@ typedef struct _GESTimelineParseLaunchEffectPrivate GESTimelineParseLaunchEffect
  */
 struct _GESTimelineParseLaunchEffect {
   /*< private >*/
-  GESTimelineEffect parent;
+  GESEffectClip parent;
 
   GESTimelineParseLaunchEffectPrivate *priv;
 
@@ -64,7 +64,7 @@ struct _GESTimelineParseLaunchEffect {
 
 struct _GESTimelineParseLaunchEffectClass {
   /*< private >*/
-  GESTimelineEffectClass parent_class;
+  GESEffectClipClass parent_class;
 
   /* Padding for API extension */
   gpointer _ges_reserved[GES_PADDING];
diff --git a/ges/ges-timeline-pipeline.c b/ges/ges-timeline-pipeline.c
index 95fedece51..9503878f4e 100644
--- a/ges/ges-timeline-pipeline.c
+++ b/ges/ges-timeline-pipeline.c
@@ -374,8 +374,8 @@ ges_timeline_pipeline_change_state (GstElement * element,
         ret = GST_STATE_CHANGE_FAILURE;
         goto done;
       }
-      if (self->priv->
-          mode & (TIMELINE_MODE_RENDER | TIMELINE_MODE_SMART_RENDER))
+      if (self->
+          priv->mode & (TIMELINE_MODE_RENDER | TIMELINE_MODE_SMART_RENDER))
         GST_DEBUG ("rendering => Updating pipeline caps");
       if (!ges_timeline_pipeline_update_caps (self)) {
         GST_ERROR_OBJECT (element, "Error setting the caps for rendering");
diff --git a/ges/ges-types.h b/ges/ges-types.h
index fc26926cef..f3308b6585 100644
--- a/ges/ges-types.h
+++ b/ges/ges-types.h
@@ -56,8 +56,8 @@ typedef struct _GESTimelinePipelineClass GESTimelinePipelineClass;
 typedef struct _GESTimelineSource GESTimelineSource;
 typedef struct _GESTimelineSourceClass GESTimelineSourceClass;
 
-typedef struct _GESTimelineEffect GESTimelineEffect;
-typedef struct _GESTimelineEffectClass GESTimelineEffectClass;
+typedef struct _GESEffectClip GESEffectClip;
+typedef struct _GESEffectClipClass GESEffectClipClass;
 
 typedef struct _GESUriClip GESUriClip;
 typedef struct _GESUriClipClass GESUriClipClass;
diff --git a/ges/ges.h b/ges/ges.h
index 61c8340c05..841bb3d67e 100644
--- a/ges/ges.h
+++ b/ges/ges.h
@@ -36,14 +36,14 @@
 #include <ges/ges-timeline-test-source.h>
 #include <ges/ges-timeline-title-source.h>
 #include <ges/ges-timeline-operation.h>
-#include <ges/ges-timeline-effect.h>
+#include <ges/ges-effect-clip.h>
 #include <ges/ges-timeline-overlay.h>
 #include <ges/ges-timeline-text-overlay.h>
 #include <ges/ges-timeline-transition.h>
 #include <ges/ges-timeline-standard-transition.h>
 #include <ges/ges-timeline-parse-launch-effect.h>
 #include <ges/ges-custom-timeline-source.h>
-#include <ges/ges-timeline-effect.h>
+#include <ges/ges-effect-clip.h>
 #include <ges/ges-uri-clip.h>
 #include <ges/ges-screenshot.h>
 #include <ges/ges-asset.h>
diff --git a/tests/check/ges/effects.c b/tests/check/ges/effects.c
index b3a28d9419..9ae01d1321 100644
--- a/tests/check/ges/effects.c
+++ b/tests/check/ges/effects.c
@@ -220,8 +220,8 @@ GST_START_TEST (test_effect_clip)
         GES_TRACK_EFFECT (tmp->data));
     fail_unless (priority > effect_prio);
     fail_unless (GES_IS_TRACK_EFFECT (tmp->data));
-    fail_unless (ges_track_object_get_track (GES_TRACK_OBJECT (tmp->data))->
-        type == track_type[i]);
+    fail_unless (ges_track_object_get_track (GES_TRACK_OBJECT (tmp->
+                data))->type == track_type[i]);
     effect_prio = priority;
 
     g_object_unref (tmp->data);
diff --git a/tests/check/ges/project.c b/tests/check/ges/project.c
index 3736ab4b18..3d4c772876 100644
--- a/tests/check/ges/project.c
+++ b/tests/check/ges/project.c
@@ -206,10 +206,10 @@ _test_project (GESProject * project, GESTimeline * timeline)
   assert_equals_string (ges_meta_container_get_string (GES_META_CONTAINER
           (project), "name"), "Example project");
   clips =
-      ges_timeline_layer_get_objects (GES_TIMELINE_LAYER (timeline->
-          layers->data));
-  fail_unless (ges_meta_container_get_uint (GES_META_CONTAINER
-          (timeline->layers->data), "a", &a_meta));
+      ges_timeline_layer_get_objects (GES_TIMELINE_LAYER (timeline->layers->
+          data));
+  fail_unless (ges_meta_container_get_uint (GES_META_CONTAINER (timeline->
+              layers->data), "a", &a_meta));
   assert_equals_int (a_meta, 3);
   assert_equals_int (g_list_length (clips), 1);
   media_uri = ges_test_file_uri ("audio_video.ogg");