diff --git a/docs/libs/ges-docs.sgml b/docs/libs/ges-docs.sgml
index cbac4d8599..335cfd905b 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-source-clip.xml"/>
     <xi:include href="xml/ges-operation-clip.xml"/>
     <xi:include href="xml/ges-overlay-clip.xml"/>
-    <xi:include href="xml/ges-effect-clip.xml"/>
+    <xi:include href="xml/ges-base-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 35bae4d10d..c01458d699 100644
--- a/docs/libs/ges-sections.txt
+++ b/docs/libs/ges-sections.txt
@@ -514,19 +514,19 @@ GES_BASE_TRANSITION_CLIP_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>ges-effect-clip</FILE>
-<TITLE>GESEffectClip</TITLE>
-GESEffectClip
+<FILE>ges-base-effect-clip</FILE>
+<TITLE>GESBaseEffectClip</TITLE>
+GESBaseEffectClip
 <SUBSECTION Standard>
-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
+GESBaseEffectClipClass
+GESBaseEffectClipPrivate
+GES_BASE_EFFECT_CLIP
+GES_IS_BASE_EFFECT_CLIP
+GES_TYPE_BASE_EFFECT_CLIP
+ges_base_effect_clip_get_type
+GES_BASE_EFFECT_CLIP_CLASS
+GES_IS_BASE_EFFECT_CLIP_CLASS
+GES_BASE_EFFECT_CLIP_GET_CLASS
 </SECTION>
 
 <SECTION>
diff --git a/docs/libs/ges.types b/docs/libs/ges.types
index af17d6affe..17dedd8bec 100644
--- a/docs/libs/ges.types
+++ b/docs/libs/ges.types
@@ -16,7 +16,7 @@ ges_source_clip_get_type
 ges_test_clip_get_type
 ges_base_transition_clip_get_type
 ges_transition_clip_get_type
-ges_effect_clip_get_type
+ges_base_effect_clip_get_type
 ges_standard_effect_clip_get_type
 ges_uri_clip_get_type
 ges_overlay_text_clip_get_type
diff --git a/ges/Makefile.am b/ges/Makefile.am
index 385ed8b0d6..412c40cffe 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-source-clip.c			\
-	ges-effect-clip.c		\
+	ges-base-effect-clip.c		\
 	ges-standard-effect-clip.c		\
 	ges-uri-clip.c		\
 	ges-operation-clip.c		\
@@ -74,7 +74,7 @@ libges_@GST_API_VERSION@include_HEADERS = 	\
 	ges-timeline-pipeline.h			\
 	ges-source-clip.h			\
 	ges-uri-clip.h		\
-	ges-effect-clip.h		\
+	ges-base-effect-clip.h		\
 	ges-standard-effect-clip.h		\
 	ges-operation-clip.h		\
 	ges-base-transition-clip.h		\
diff --git a/ges/ges-effect-clip.c b/ges/ges-base-effect-clip.c
similarity index 78%
rename from ges/ges-effect-clip.c
rename to ges/ges-base-effect-clip.c
index 939cfafcd9..b8a0235cc9 100644
--- a/ges/ges-effect-clip.c
+++ b/ges/ges-base-effect-clip.c
@@ -18,7 +18,7 @@
  */
 
 /**
- * SECTION: ges-effect-clip
+ * SECTION: ges-base-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 (GESEffectClip, ges_effect_clip,
+G_DEFINE_ABSTRACT_TYPE (GESBaseEffectClip, ges_base_effect_clip,
     GES_TYPE_OPERATION_CLIP);
 
-struct _GESEffectClipPrivate
+struct _GESBaseEffectClipPrivate
 {
   void *nothing;
 };
 
 
 static void
-ges_effect_clip_class_init (GESEffectClipClass * klass)
+ges_base_effect_clip_class_init (GESBaseEffectClipClass * klass)
 {
-  g_type_class_add_private (klass, sizeof (GESEffectClipPrivate));
+  g_type_class_add_private (klass, sizeof (GESBaseEffectClipPrivate));
 
 }
 
 static void
-ges_effect_clip_init (GESEffectClip * self)
+ges_base_effect_clip_init (GESBaseEffectClip * self)
 {
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      GES_TYPE_EFFECT_CLIP, GESEffectClipPrivate);
+      GES_TYPE_BASE_EFFECT_CLIP, GESBaseEffectClipPrivate);
 
 }
diff --git a/ges/ges-effect-clip.h b/ges/ges-base-effect-clip.h
similarity index 54%
rename from ges/ges-effect-clip.h
rename to ges/ges-base-effect-clip.h
index 361d0db519..20b4915592 100644
--- a/ges/ges-effect-clip.h
+++ b/ges/ges-base-effect-clip.h
@@ -17,52 +17,52 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef _GES_EFFECT_CLIP
-#define _GES_EFFECT_CLIP
+#ifndef _GES_BASE_EFFECT_CLIP
+#define _GES_BASE_EFFECT_CLIP
 
 #include <glib-object.h>
 #include <ges/ges-types.h>
 
 G_BEGIN_DECLS
 
-#define GES_TYPE_EFFECT_CLIP ges_effect_clip_get_type()
+#define GES_TYPE_BASE_EFFECT_CLIP ges_base_effect_clip_get_type()
 
-#define GES_EFFECT_CLIP(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_EFFECT_CLIP, GESEffectClip))
+#define GES_BASE_EFFECT_CLIP(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_BASE_EFFECT_CLIP, GESBaseEffectClip))
 
-#define GES_EFFECT_CLIP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_EFFECT_CLIP, GESEffectClipClass))
+#define GES_BASE_EFFECT_CLIP_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_BASE_EFFECT_CLIP, GESBaseEffectClipClass))
 
-#define GES_IS_EFFECT_CLIP(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_EFFECT_CLIP))
+#define GES_IS_BASE_EFFECT_CLIP(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_BASE_EFFECT_CLIP))
 
-#define GES_IS_EFFECT_CLIP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_EFFECT_CLIP))
+#define GES_IS_BASE_EFFECT_CLIP_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_BASE_EFFECT_CLIP))
 
-#define GES_EFFECT_CLIP_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_EFFECT_CLIP, GESEffectClipClass))
+#define GES_BASE_EFFECT_CLIP_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_BASE_EFFECT_CLIP, GESBaseEffectClipClass))
 
-typedef struct _GESEffectClipPrivate GESEffectClipPrivate;
+typedef struct _GESBaseEffectClipPrivate GESBaseEffectClipPrivate;
 
 /**
- * GESEffectClip:
+ * GESBaseEffectClip:
  */
-struct _GESEffectClip {
+struct _GESBaseEffectClip {
   /*< private >*/
   GESOperationClip parent;
 
-  GESEffectClipPrivate *priv;
+  GESBaseEffectClipPrivate *priv;
 
   /* Padding for API extension */
   gpointer _ges_reserved[GES_PADDING];
 };
 
 /**
- * GESEffectClipClass:
+ * GESBaseEffectClipClass:
  *
  */
 
-struct _GESEffectClipClass {
+struct _GESBaseEffectClipClass {
   /*< private >*/
   GESOperationClipClass parent_class;
 
@@ -70,7 +70,7 @@ struct _GESEffectClipClass {
   gpointer _ges_reserved[GES_PADDING];
 };
 
-GType ges_effect_clip_get_type (void);
+GType ges_base_effect_clip_get_type (void);
 
 G_END_DECLS
-#endif /* _GES_EFFECT_CLIP */
+#endif /* _GES_BASE_EFFECT_CLIP */
diff --git a/ges/ges-standard-effect-clip.c b/ges/ges-standard-effect-clip.c
index d48012856d..fab7c4d0f1 100644
--- a/ges/ges-standard-effect-clip.c
+++ b/ges/ges-standard-effect-clip.c
@@ -37,7 +37,7 @@
 #include "ges-types.h"
 
 G_DEFINE_TYPE (GESStandardEffectClip, ges_standard_effect_clip,
-    GES_TYPE_EFFECT_CLIP);
+    GES_TYPE_BASE_EFFECT_CLIP);
 
 struct _GESStandardEffectClipPrivate
 {
diff --git a/ges/ges-standard-effect-clip.h b/ges/ges-standard-effect-clip.h
index e7e0db274c..b5db2aeded 100644
--- a/ges/ges-standard-effect-clip.h
+++ b/ges/ges-standard-effect-clip.h
@@ -49,7 +49,7 @@ typedef struct _GESStandardEffectClipPrivate GESStandardEffectClipPrivate;
  */
 struct _GESStandardEffectClip {
   /*< private >*/
-  GESEffectClip parent;
+  GESBaseEffectClip parent;
 
   GESStandardEffectClipPrivate *priv;
 
@@ -64,7 +64,7 @@ struct _GESStandardEffectClip {
 
 struct _GESStandardEffectClipClass {
   /*< private >*/
-  GESEffectClipClass parent_class;
+  GESBaseEffectClipClass parent_class;
 
   /* Padding for API extension */
   gpointer _ges_reserved[GES_PADDING];
diff --git a/ges/ges-types.h b/ges/ges-types.h
index 9345378171..cc747e73fc 100644
--- a/ges/ges-types.h
+++ b/ges/ges-types.h
@@ -56,8 +56,8 @@ typedef struct _GESTimelinePipelineClass GESTimelinePipelineClass;
 typedef struct _GESSourceClip GESSourceClip;
 typedef struct _GESSourceClipClass GESSourceClipClass;
 
-typedef struct _GESEffectClip GESEffectClip;
-typedef struct _GESEffectClipClass GESEffectClipClass;
+typedef struct _GESBaseEffectClip GESBaseEffectClip;
+typedef struct _GESBaseEffectClipClass GESBaseEffectClipClass;
 
 typedef struct _GESUriClip GESUriClip;
 typedef struct _GESUriClipClass GESUriClipClass;
diff --git a/ges/ges.h b/ges/ges.h
index 551056bee6..f6595e1001 100644
--- a/ges/ges.h
+++ b/ges/ges.h
@@ -36,14 +36,14 @@
 #include <ges/ges-test-clip.h>
 #include <ges/ges-title-clip.h>
 #include <ges/ges-operation-clip.h>
-#include <ges/ges-effect-clip.h>
+#include <ges/ges-base-effect-clip.h>
 #include <ges/ges-overlay-clip.h>
 #include <ges/ges-text-overlay-clip.h>
 #include <ges/ges-base-transition-clip.h>
 #include <ges/ges-transition-clip.h>
 #include <ges/ges-standard-effect-clip.h>
 #include <ges/ges-custom-source-clip.h>
-#include <ges/ges-effect-clip.h>
+#include <ges/ges-base-effect-clip.h>
 #include <ges/ges-uri-clip.h>
 #include <ges/ges-screenshot.h>
 #include <ges/ges-asset.h>