diff --git a/docs/plugins/inspect/plugin-gtk.xml b/docs/plugins/inspect/plugin-gtk.xml
new file mode 100644
index 0000000000..3822e8b35b
--- /dev/null
+++ b/docs/plugins/inspect/plugin-gtk.xml
@@ -0,0 +1,43 @@
+
+ gtk
+ Gtk+ sink
+ ../../ext/gtk/.libs/libgstgtk.so
+ libgstgtk.so
+ 1.11.2.1
+ LGPL
+ gst-plugins-bad
+ GStreamer Bad Plug-ins git
+ Unknown package origin
+
+
+ gtkglsink
+ Gtk GL Video Sink
+ Sink/Video
+ A video sink that renders to a GtkWidget using OpenGL
+ Matthew Waters <matthew@centricular.com>
+
+
+ sink
+ sink
+ always
+ video/x-raw(memory:GLMemory), format=(string)RGBA, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw(memory:GLMemory, meta:GstVideoOverlayComposition), format=(string)RGBA, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
+
+
+
+
+ gtksink
+ Gtk Video Sink
+ Sink/Video
+ A video sink that renders to a GtkWidget
+ Matthew Waters <matthew@centricular.com>
+
+
+ sink
+ sink
+ always
+ video/x-raw, format=(string){ BGRx, BGRA }, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
+
+
+
+
+
\ No newline at end of file
diff --git a/docs/plugins/inspect/plugin-sdp.xml b/docs/plugins/inspect/plugin-sdpelem.xml
similarity index 92%
rename from docs/plugins/inspect/plugin-sdp.xml
rename to docs/plugins/inspect/plugin-sdpelem.xml
index 0d6135c889..d9e9683057 100644
--- a/docs/plugins/inspect/plugin-sdp.xml
+++ b/docs/plugins/inspect/plugin-sdpelem.xml
@@ -1,12 +1,12 @@
- sdp
+ sdpelem
configure streaming sessions using SDP
../../gst/sdp/.libs/libgstsdpelem.so
libgstsdpelem.so
- 1.11.2
+ 1.11.2.1
LGPL
gst-plugins-bad
- GStreamer Bad Plug-ins source release
+ GStreamer Bad Plug-ins git
Unknown package origin
diff --git a/ext/fluidsynth/meson.build b/ext/fluidsynth/meson.build
index d732b93d15..610c4b8732 100644
--- a/ext/fluidsynth/meson.build
+++ b/ext/fluidsynth/meson.build
@@ -1,7 +1,7 @@
fluidsynth_dep = dependency('fluidsynth', version : '>= 1.0', required : false)
if fluidsynth_dep.found()
- gstfluidsynth = library('gstfluidsynth',
+ gstfluidsynth = library('gstfluidsynthmidi',
'gstfluiddec.c',
c_args : gst_plugins_bad_args,
include_directories : [configinc],
diff --git a/ext/gtk/Makefile.am b/ext/gtk/Makefile.am
index 84846774eb..fdf860f67b 100644
--- a/ext/gtk/Makefile.am
+++ b/ext/gtk/Makefile.am
@@ -21,29 +21,29 @@ sources = \
gstplugin.c \
$(NULL)
-libgstgtksink_la_CFLAGS = \
+libgstgtk_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \
-I$(top_builddir)/gst-libs \
$(GTK3_CFLAGS) \
$(GST_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS)
-libgstgtksink_la_LIBADD = \
+libgstgtk_la_LIBADD = \
$(GTK3_LIBS) \
$(GST_BASE_LIBS) \
$(GST_PLUGINS_BASE_LIBS) \
-lgstvideo-$(GST_API_VERSION)
-libgstgtksink_la_SOURCES = $(sources)
-libgstgtksink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstgtksink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+libgstgtk_la_SOURCES = $(sources)
+libgstgtk_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstgtk_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
if USE_GTK3_GL
if USE_GL
-libgstgtksink_la_SOURCES += gstgtkglsink.c gstgtkglsink.h gtkgstglwidget.c gtkgstglwidget.h
-libgstgtksink_la_LIBADD += \
+libgstgtk_la_SOURCES += gstgtkglsink.c gstgtkglsink.h gtkgstglwidget.c gtkgstglwidget.h
+libgstgtk_la_LIBADD += \
$(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la
endif
endif
-plugin_LTLIBRARIES = libgstgtksink.la
+plugin_LTLIBRARIES = libgstgtk.la
diff --git a/ext/gtk/gstplugin.c b/ext/gtk/gstplugin.c
index 4c5d26b54e..ed275785be 100644
--- a/ext/gtk/gstplugin.c
+++ b/ext/gtk/gstplugin.c
@@ -46,7 +46,7 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
- gstgtk,
+ gtk,
"Gtk+ sink",
plugin_init, PACKAGE_VERSION, GST_LICENSE, GST_PACKAGE_NAME,
GST_PACKAGE_ORIGIN)
diff --git a/ext/teletextdec/Makefile.am b/ext/teletextdec/Makefile.am
index 5aa8ab5dc9..50f2179abe 100644
--- a/ext/teletextdec/Makefile.am
+++ b/ext/teletextdec/Makefile.am
@@ -1,10 +1,10 @@
-plugin_LTLIBRARIES = libgstteletextdec.la
+plugin_LTLIBRARIES = libgstteletext.la
-libgstteletextdec_la_SOURCES = gstteletextdec.c
+libgstteletext_la_SOURCES = gstteletextdec.c
-libgstteletextdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(TELETEXTDEC_CFLAGS)
-libgstteletextdec_la_LIBADD = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_LIBS) $(TELETEXTDEC_LIBS)
-libgstteletextdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstteletextdec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+libgstteletext_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(TELETEXTDEC_CFLAGS)
+libgstteletext_la_LIBADD = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_LIBS) $(TELETEXTDEC_LIBS)
+libgstteletext_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstteletext_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstteletextdec.h
diff --git a/gst/camerabin2/Makefile.am b/gst/camerabin2/Makefile.am
index 9254f7c7ee..b44aba4dba 100644
--- a/gst/camerabin2/Makefile.am
+++ b/gst/camerabin2/Makefile.am
@@ -1,26 +1,26 @@
-plugin_LTLIBRARIES = libgstcamerabin2.la
+plugin_LTLIBRARIES = libgstcamerabin.la
-libgstcamerabin2_la_SOURCES = gstviewfinderbin.c \
+libgstcamerabin_la_SOURCES = gstviewfinderbin.c \
gstdigitalzoom.c \
camerabingeneral.c \
gstwrappercamerabinsrc.c \
gstcamerabin2.c \
gstplugin.c
-libgstcamerabin2_la_CFLAGS = \
+libgstcamerabin_la_CFLAGS = \
$(GST_PLUGINS_BAD_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) $(GST_CFLAGS) \
-DGST_USE_UNSTABLE_API
-libgstcamerabin2_la_LIBADD = \
+libgstcamerabin_la_LIBADD = \
$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_API_VERSION).la \
$(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-$(GST_API_VERSION).la \
$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) -lgstapp-$(GST_API_VERSION) -lgstpbutils-$(GST_API_VERSION) \
$(GST_BASE_LIBS) $(GST_LIBS)
-libgstcamerabin2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstcamerabin2_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+libgstcamerabin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstcamerabin_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstviewfinderbin.h \
camerabingeneral.h \
diff --git a/gst/camerabin2/meson.build b/gst/camerabin2/meson.build
index b9c043aff3..9cee3432f4 100644
--- a/gst/camerabin2/meson.build
+++ b/gst/camerabin2/meson.build
@@ -1,4 +1,4 @@
-camerabin2_sources = [
+camerabin_sources = [
'gstdigitalzoom.c',
'gstviewfinderbin.c',
'camerabingeneral.c',
@@ -7,8 +7,8 @@ camerabin2_sources = [
'gstplugin.c',
]
-gstcamerabin2 = library('gstcamerabin2',
- camerabin2_sources,
+gstcamerabin = library('gstcamerabin',
+ camerabin_sources,
c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'],
include_directories : [configinc, libsinc],
link_with : gstbasecamerabin,
diff --git a/gst/onvif/meson.build b/gst/onvif/meson.build
index d88528df0d..d3d4faae1e 100644
--- a/gst/onvif/meson.build
+++ b/gst/onvif/meson.build
@@ -4,7 +4,7 @@ onvif_sources = [
'gstrtponviftimestamp.c',
]
-gstonvif = library('gstonvif',
+gstrtponvif = library('gstrtponvif',
onvif_sources,
c_args : gst_plugins_bad_args,
include_directories : [configinc],
diff --git a/gst/sdp/gstsdpelem.c b/gst/sdp/gstsdpelem.c
index d0f033340a..8a945cdbf8 100644
--- a/gst/sdp/gstsdpelem.c
+++ b/gst/sdp/gstsdpelem.c
@@ -38,6 +38,6 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
- sdp,
+ sdpelem,
"configure streaming sessions using SDP",
plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/siren/gstsiren.c b/gst/siren/gstsiren.c
index 4678cdfbb6..6fde346dc0 100644
--- a/gst/siren/gstsiren.c
+++ b/gst/siren/gstsiren.c
@@ -42,6 +42,6 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
- gstsiren,
+ siren,
"Siren encoder/decoder/payloader/depayloader plugins",
plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/sys/kms/Makefile.am b/sys/kms/Makefile.am
index daf2ff7102..a97cad1e47 100644
--- a/sys/kms/Makefile.am
+++ b/sys/kms/Makefile.am
@@ -1,13 +1,13 @@
-plugin_LTLIBRARIES = libgstkmssink.la
+plugin_LTLIBRARIES = libgstkms.la
-libgstkmssink_la_SOURCES = \
+libgstkms_la_SOURCES = \
gstkmssink.c \
gstkmsutils.c \
gstkmsallocator.c \
gstkmsbufferpool.c \
$(NUL)
-libgstkmssink_la_CFLAGS = \
+libgstkms_la_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_VIDEO_CFLAGS) \
@@ -16,7 +16,7 @@ libgstkmssink_la_CFLAGS = \
$(KMS_DRM_CFLAGS) \
$(NULL)
-libgstkmssink_la_LIBADD = \
+libgstkms_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \
$(GST_BASE_LIBS) \
$(GST_VIDEO_LIBS) \
@@ -25,11 +25,11 @@ libgstkmssink_la_LIBADD = \
$(KMS_DRM_LIBS) \
$(NULL)
-libgstkmssink_la_LDFLAGS = \
+libgstkms_la_LDFLAGS = \
$(GST_PLUGIN_LDFLAGS) \
$(NULL)
-libgstkmssink_la_LIBTOOLFLAGS = \
+libgstkms_la_LIBTOOLFLAGS = \
$(GST_PLUGIN_LIBTOOLFLAGS) \
$(NULL)
diff --git a/sys/kms/meson.build b/sys/kms/meson.build
index 05d49c2ab1..e8865f05ff 100644
--- a/sys/kms/meson.build
+++ b/sys/kms/meson.build
@@ -8,7 +8,7 @@ kmssink_sources = [
libdrm_dep = dependency('libdrm', version : '>= 2.4.55', required : false)
if libdrm_dep.found()
- gstkmssink = library('gstkmssink',
+ gstkmssink = library('gstkms',
kmssink_sources,
c_args : gst_plugins_bad_args,
include_directories : [configinc],