diff --git a/plugins/aiurdemux/aiur.c b/plugins/aiurdemux/aiur.c
index 5eecd19..317a117 100755
--- a/plugins/aiurdemux/aiur.c
+++ b/plugins/aiurdemux/aiur.c
@@ -53,4 +53,4 @@
 
 }
 
-IMX_GST_PLUGIN_DEFINE (aiur, "aiur universal demux", plugin_init);
+IMX_GST_PLUGIN_DEFINE (aiurdemux, "aiur universal demux", plugin_init);
diff --git a/plugins/beepdec/beep.c b/plugins/beepdec/beep.c
old mode 100644
new mode 100755
index 34cccee..71d9f56
--- a/plugins/beepdec/beep.c
+++ b/plugins/beepdec/beep.c
@@ -50,5 +50,5 @@
   return TRUE;
 }
 
-IMX_GST_PLUGIN_DEFINE (beep, "universal audio decoder", plugin_init);
+IMX_GST_PLUGIN_DEFINE (beepdec, "universal audio decoder", plugin_init);
 
diff --git a/plugins/overlay_sink/Makefile.am b/plugins/overlay_sink/Makefile.am
index f2de16a..df7fbdf 100755
--- a/plugins/overlay_sink/Makefile.am
+++ b/plugins/overlay_sink/Makefile.am
@@ -1,11 +1,11 @@
-plugin_LTLIBRARIES = libgstoverlaysinkplugins.la
+plugin_LTLIBRARIES = libgstoverlaysink.la
 
-libgstoverlaysinkplugins_la_SOURCES = gstosink.c \
+libgstoverlaysink_la_SOURCES = gstosink.c \
               gstosinkallocator.c \
 				      osink_object.c \
 				      compositor.c
 
-libgstoverlaysinkplugins_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
+libgstoverlaysink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 				 $(GST_BASE_CFLAGS) \
 				 $(GST_CFLAGS) \
 				 -I$(top_srcdir)/libs \
@@ -18,20 +18,20 @@
          -I$(top_srcdir)/libs/video-overlay
 
 if USE_FB_DISPLAY
-libgstoverlaysinkplugins_la_SOURCES += displaysfb.c
+libgstoverlaysink_la_SOURCES += displaysfb.c
 else
-libgstoverlaysinkplugins_la_SOURCES += displaysv4l2.c
+libgstoverlaysink_la_SOURCES += displaysv4l2.c
 endif
 
 if PLATFORM_IS_MX8
-libgstoverlaysinkplugins_la_CFLAGS += -DUSE_FB_API
+libgstoverlaysink_la_CFLAGS += -DUSE_FB_API
 endif
 
 if USE_ION
-libgstoverlaysinkplugins_la_CFLAGS += -DUSE_ION
+libgstoverlaysink_la_CFLAGS += -DUSE_ION
 endif
 
-libgstoverlaysinkplugins_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
+libgstoverlaysink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
 				 $(GST_BASE_LIBS) \
 				 $(GST_PLUGINS_BASE_LIBS) \
 				 -lgstvideo-$(GST_API_VERSION) \
@@ -40,11 +40,11 @@
 				 ../../libs/libgstfsl-@GST_API_VERSION@.la
 
 if USE_BAD_ALLOCATOR
-libgstoverlaysinkplugins_la_LIBADD += -lgstbadallocators-$(GST_API_VERSION)
+libgstoverlaysink_la_LIBADD += -lgstbadallocators-$(GST_API_VERSION)
 endif
 
-libgstoverlaysinkplugins_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstoverlaysinkplugins_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+libgstoverlaysink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstoverlaysink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = osink_common.h gstosink.h gstosinkallocator.h osink_object.h compositor.h displays.h
 
diff --git a/plugins/v4l2/Makefile.am b/plugins/v4l2/Makefile.am
index 8d74878..b5fae56 100755
--- a/plugins/v4l2/Makefile.am
+++ b/plugins/v4l2/Makefile.am
@@ -1,11 +1,11 @@
-plugin_LTLIBRARIES = libgstimxv4l2plugins.la
+plugin_LTLIBRARIES = libgstimxv4l2.la
 
-libgstimxv4l2plugins_la_SOURCES = gstimxv4l2plugins.c \
+libgstimxv4l2_la_SOURCES = gstimxv4l2plugins.c \
 				  gstimxv4l2allocator.c \
 				  gstimxv4l2sink.c \
 				  gstimxv4l2src.c 
 				  
-libgstimxv4l2plugins_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
+libgstimxv4l2_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 				 $(GST_BASE_CFLAGS) \
 				 $(GST_CFLAGS) \
 				 -I$(top_srcdir)/libs \
@@ -15,7 +15,7 @@
 				 -I$(top_srcdir)/libs/overlaycompositionmeta \
 				 -I$(top_srcdir)/libs/video-overlay
 				 
-libgstimxv4l2plugins_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
+libgstimxv4l2_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
 				 $(GST_BASE_LIBS) \
 				 $(GST_PLUGINS_BASE_LIBS) \
 				 -lgstvideo-$(GST_API_VERSION) \
@@ -23,10 +23,10 @@
 				 ../../libs/libgstfsl-@GST_API_VERSION@.la
 
 if USE_BAD_ALLOCATOR
-libgstimxv4l2plugins_la_LIBADD += -lgstbadallocators-$(GST_API_VERSION)
+libgstimxv4l2_la_LIBADD += -lgstbadallocators-$(GST_API_VERSION)
 endif
 				 
-libgstimxv4l2plugins_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstimxv4l2plugins_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+libgstimxv4l2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstimxv4l2_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstimxv4l2allocator.h gstimxv4l2sink.h gstimxv4l2src.h