diff --git a/docs/plugins/inspect/plugin-oss4.xml b/docs/plugins/inspect/plugin-oss4.xml
index ed8e5f7f04..ab073b7412 100644
--- a/docs/plugins/inspect/plugin-oss4.xml
+++ b/docs/plugins/inspect/plugin-oss4.xml
@@ -1,12 +1,12 @@
 <plugin>
   <name>oss4</name>
   <description>Open Sound System (OSS) version 4 support for GStreamer</description>
-  <filename>../../sys/oss4/.libs/libgstoss4audio.so</filename>
-  <basename>libgstoss4audio.so</basename>
-  <version>1.11.2</version>
+  <filename>../../sys/oss4/.libs/libgstoss4.so</filename>
+  <basename>libgstoss4.so</basename>
+  <version>1.11.2.1</version>
   <license>LGPL</license>
   <source>gst-plugins-good</source>
-  <package>GStreamer Good Plug-ins source release</package>
+  <package>GStreamer Good Plug-ins git</package>
   <origin>Unknown package origin</origin>
   <elements>
     <element>
diff --git a/docs/plugins/inspect/plugin-pulseaudio.xml b/docs/plugins/inspect/plugin-pulseaudio.xml
index 8bc38dfe4f..e98e1f95c9 100644
--- a/docs/plugins/inspect/plugin-pulseaudio.xml
+++ b/docs/plugins/inspect/plugin-pulseaudio.xml
@@ -1,12 +1,12 @@
 <plugin>
   <name>pulseaudio</name>
   <description>PulseAudio plugin library</description>
-  <filename>../../ext/pulse/.libs/libgstpulse.so</filename>
-  <basename>libgstpulse.so</basename>
-  <version>1.11.2</version>
+  <filename>../../ext/pulse/.libs/libgstpulseaudio.so</filename>
+  <basename>libgstpulseaudio.so</basename>
+  <version>1.11.2.1</version>
   <license>LGPL</license>
   <source>gst-plugins-good</source>
-  <package>GStreamer Good Plug-ins source release</package>
+  <package>GStreamer Good Plug-ins git</package>
   <origin>Unknown package origin</origin>
   <elements>
     <element>
diff --git a/docs/plugins/inspect/plugin-shout2send.xml b/docs/plugins/inspect/plugin-shout2.xml
similarity index 87%
rename from docs/plugins/inspect/plugin-shout2send.xml
rename to docs/plugins/inspect/plugin-shout2.xml
index ad42a4579d..6bfafb8bcb 100644
--- a/docs/plugins/inspect/plugin-shout2send.xml
+++ b/docs/plugins/inspect/plugin-shout2.xml
@@ -1,9 +1,9 @@
 <plugin>
-  <name>shout2send</name>
+  <name>shout2</name>
   <description>Sends data to an icecast server using libshout2</description>
   <filename>../../ext/shout2/.libs/libgstshout2.so</filename>
   <basename>libgstshout2.so</basename>
-  <version>1.11.2</version>
+  <version>1.11.2.1</version>
   <license>LGPL</license>
   <source>gst-plugins-good</source>
   <package>libshout2</package>
@@ -20,9 +20,9 @@
           <name>sink</name>
           <direction>sink</direction>
           <presence>always</presence>
-          <details>application/ogg; audio/ogg; video/ogg; audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ]; video/webm; audio/webm</details>
+          <details>application/ogg; audio/ogg; video/ogg; audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ]</details>
         </caps>
       </pads>
     </element>
   </elements>
-</plugin>
\ No newline at end of file
+</plugin>
diff --git a/ext/pulse/Makefile.am b/ext/pulse/Makefile.am
index a813cb6cbc..5a1d52ee86 100644
--- a/ext/pulse/Makefile.am
+++ b/ext/pulse/Makefile.am
@@ -1,18 +1,18 @@
-plugin_LTLIBRARIES = libgstpulse.la
+plugin_LTLIBRARIES = libgstpulseaudio.la
 
-libgstpulse_la_SOURCES = \
+libgstpulseaudio_la_SOURCES = \
 	plugin.c \
 	pulsesink.c \
 	pulsesrc.c \
 	pulsedeviceprovider.c \
 	pulseutil.c
 
-libgstpulse_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(PULSE_CFLAGS)
-libgstpulse_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
+libgstpulseaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(PULSE_CFLAGS)
+libgstpulseaudio_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
 	-lgstpbutils-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(PULSE_LIBS)
-libgstpulse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstpulse_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+libgstpulseaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstpulseaudio_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	pulsesink.h \
diff --git a/ext/pulse/meson.build b/ext/pulse/meson.build
index afc95dd603..d685f915e6 100644
--- a/ext/pulse/meson.build
+++ b/ext/pulse/meson.build
@@ -9,7 +9,7 @@ pulse_sources = [
 libpulse_dep = dependency('libpulse', version : '>=2.0', required : false)
 
 if libpulse_dep.found()
-  gstpulse = library('gstpulse',
+  gstpulse = library('gstpulseaudio',
     pulse_sources,
     c_args : gst_plugins_good_args,
     include_directories : [configinc, libsinc],
diff --git a/ext/shout2/gstshout2.c b/ext/shout2/gstshout2.c
index d99e77d45b..867a134b1f 100644
--- a/ext/shout2/gstshout2.c
+++ b/ext/shout2/gstshout2.c
@@ -823,7 +823,7 @@ plugin_init (GstPlugin * plugin)
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    shout2send,
+    shout2,
     "Sends data to an icecast server using libshout2",
     plugin_init,
     VERSION, "LGPL", "libshout2", "http://www.icecast.org/download/")
diff --git a/ext/soup/Makefile.am b/ext/soup/Makefile.am
index 63e5fec9e4..8b5de4a232 100644
--- a/ext/soup/Makefile.am
+++ b/ext/soup/Makefile.am
@@ -1,13 +1,13 @@
-plugin_LTLIBRARIES = libgstsouphttpsrc.la
+plugin_LTLIBRARIES = libgstsoup.la
 
-libgstsouphttpsrc_la_SOURCES = gstsouphttpsrc.c gstsouphttpclientsink.c gstsouputils.c gstsoup.c
+libgstsoup_la_SOURCES = gstsouphttpsrc.c gstsouphttpclientsink.c gstsouputils.c gstsoup.c
 
-libgstsouphttpsrc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
+libgstsoup_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS) $(SOUP_CFLAGS) \
 	-DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_48 \
 	-DSOUP_VERSION_MAX_ALLOWED=SOUP_DEPRECATED_IN_2_48
-libgstsouphttpsrc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_API_VERSION@ $(GST_BASE_LIBS) $(SOUP_LIBS)
-libgstsouphttpsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstsouphttpsrc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+libgstsoup_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_API_VERSION@ $(GST_BASE_LIBS) $(SOUP_LIBS)
+libgstsoup_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstsoup_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstsouphttpsrc.h gstsouphttpclientsink.h gstsouputils.h
diff --git a/ext/soup/meson.build b/ext/soup/meson.build
index ebd7100437..3fd7129b87 100644
--- a/ext/soup/meson.build
+++ b/ext/soup/meson.build
@@ -13,7 +13,7 @@ soup_args = [
 libsoup_dep = dependency('libsoup-2.4', version : '>=2.48', required : false)
 
 if libsoup_dep.found()
-  gstsouphttpsrc = library('gstsouphttpsrc',
+  gstsouphttpsrc = library('gstsoup',
     soup_sources,
     c_args : gst_plugins_good_args + soup_args,
     link_args : noseh_link_args,
diff --git a/sys/oss4/Makefile.am b/sys/oss4/Makefile.am
index a22475a852..36a05625c5 100644
--- a/sys/oss4/Makefile.am
+++ b/sys/oss4/Makefile.am
@@ -1,18 +1,18 @@
-plugin_LTLIBRARIES = libgstoss4audio.la
+plugin_LTLIBRARIES = libgstoss4.la
 
-libgstoss4audio_la_SOURCES = \
+libgstoss4_la_SOURCES = \
 	oss4-audio.c          \
 	oss4-property-probe.c \
 	oss4-sink.c           \
 	oss4-source.c
 
-libgstoss4audio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstoss4audio_la_LIBADD = \
+libgstoss4_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstoss4_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) \
 	-lgstaudio-$(GST_API_VERSION) \
 	$(GST_LIBS)
-libgstoss4audio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
-libgstoss4audio_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+libgstoss4_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
+libgstoss4_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	oss4-audio.h          \