Make GStreamer plugin/crate/library/directory names and descriptions consistent

Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/238

58 files changed, 97 insertions, 76 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 980dd8142..95f6f1225 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ members = [
     "net/raptorq",
     "net/reqwest",
     "net/rtp",
-    "net/webrtc-http",
+    "net/webrtchttp",
     "net/webrtc",
     "net/webrtc/protocol",
     "net/webrtc/signalling",
@@ -45,8 +45,8 @@ members = [
     "video/gif",
     "video/gtk4",
     "video/hsv",
+    "video/png",
     "video/rav1e",
-    "video/rspng",
     "video/videofx",
     "video/webp",
 ]
@@ -68,7 +68,7 @@ default-members = [
     "net/raptorq",
     "net/reqwest",
     "net/rtp",
-    "net/webrtc-http",
+    "net/webrtchttp",
     "net/webrtc",
     "net/webrtc/protocol",
     "net/webrtc/signalling",
@@ -88,8 +88,8 @@ default-members = [
     "video/ffv1",
     "video/gif",
     "video/hsv",
+    "video/png",
     "video/rav1e",
-    "video/rspng",
 ]
 
 [profile.release]
diff --git a/audio/audiofx/Cargo.toml b/audio/audiofx/Cargo.toml
index 6905b0a01..00e72419c 100644
--- a/audio/audiofx/Cargo.toml
+++ b/audio/audiofx/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.9.0-alpha.1"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MPL-2.0"
-description = "Rust AudioFx Plugin"
+description = "GStreamer Rust Audio Effects Plugin"
 edition = "2021"
 rust-version = "1.63"
 
diff --git a/audio/claxon/Cargo.toml b/audio/claxon/Cargo.toml
index a119033f2..5dac2061a 100644
--- a/audio/claxon/Cargo.toml
+++ b/audio/claxon/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.9.0-alpha.1"
 authors = ["Ruben Gonzalez <rgonzalez@fluendo.com>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MIT OR Apache-2.0"
-description = "Claxon FLAC Decoder Plugin"
+description = "GStreamer Claxon FLAC Decoder Plugin"
 edition = "2021"
 rust-version = "1.63"
 
diff --git a/audio/csound/Cargo.toml b/audio/csound/Cargo.toml
index 78f4a4110..f5967bb04 100644
--- a/audio/csound/Cargo.toml
+++ b/audio/csound/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MPL-2.0"
 edition = "2021"
 rust-version = "1.63"
-description = "An Audio filter plugin based on Csound"
+description = "GStreamer Audio Filter plugin based on Csound"
 
 [dependencies]
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
diff --git a/audio/lewton/Cargo.toml b/audio/lewton/Cargo.toml
index 0644fddb1..8e8dad71e 100644
--- a/audio/lewton/Cargo.toml
+++ b/audio/lewton/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.9.0-alpha.1"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MIT OR Apache-2.0"
-description = "lewton Vorbis Decoder Plugin"
+description = "GStreamer lewton Vorbis Decoder Plugin"
 edition = "2021"
 rust-version = "1.63"
 
diff --git a/audio/spotify/Cargo.toml b/audio/spotify/Cargo.toml
index fbbd72378..a0f41cfc6 100644
--- a/audio/spotify/Cargo.toml
+++ b/audio/spotify/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.9.0-alpha.1"
 authors = ["Guillaume Desmottes <guillaume@desmottes.be>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MPL-2.0"
-description = "Spotify GStreamer Plugin"
+description = "GStreamer Spotify Plugin"
 edition = "2021"
 rust-version = "1.63"
 
diff --git a/ci/utils.py b/ci/utils.py
index f3d48dd50..ce56e1da8 100644
--- a/ci/utils.py
+++ b/ci/utils.py
@@ -1,14 +1,34 @@
 import os
 
-DIRS = ['audio', 'generic', 'net', 'text', 'utils', 'video']
+DIRS = [
+    'audio',
+    'generic',
+    'mux',
+    'net',
+    'text',
+    'utils',
+    'video',
+]
+
 # Plugins whose name is prefixed by 'rs'
-RS_PREFIXED = ['audiofx', 'closedcaption',
-               'dav1d', 'file', 'json', 'onvif', 'regex', 'webp']
-OVERRIDE = {'wrap': 'rstextwrap', 'flavors': 'rsflv',
-            'ahead': 'textahead', 'tracers': 'rstracers',
-            'webrtc-http': 'webrtchttp',
-            'webrtc': 'rswebrtc'
-            }
+RS_PREFIXED = [
+    'audiofx',
+    'closedcaption',
+    'file',
+    'onvif',
+    'webp',
+    'videofx',
+    'webrtc',
+    'png',
+    'tracers',
+    'rtp',
+]
+
+OVERRIDE = {
+    'ahead': 'textahead',
+    'flavors': 'rsflv',
+    'wrap': 'textwrap',
+}
 
 
 def iterate_plugins():
diff --git a/dependencies.py b/dependencies.py
index eede7362c..e378c8424 100755
--- a/dependencies.py
+++ b/dependencies.py
@@ -26,17 +26,18 @@ RENAMES = {
     'rsaudiofx': 'audiofx',
     'rsfile': 'file',
     'rsflv': 'flavors',
-    'rstextwrap': 'wrap',
-    'rsjson': 'json',
-    'rsregex': 'regex',
+    'rsrtp': 'rtp',
     'rswebp': 'webp',
     'textahead': 'ahead',
+    'textwrap': 'wrap',
     'rsonvif': 'onvif',
     'rstracers': 'tracers',
     'rsclosedcaption': 'closedcaption',
     'rsdav1d': 'dav1d',
     'webrtchttp': 'webrtc-http',
     'rswebrtc': 'webrtc',
+    'rspng': 'png',
+    'rsvideofx': 'videofx',
 }
 
 
diff --git a/generic/file/Cargo.toml b/generic/file/Cargo.toml
index 361583f69..a453695b7 100644
--- a/generic/file/Cargo.toml
+++ b/generic/file/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.9.0-alpha.1"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MIT OR Apache-2.0"
-description = "Rust File Plugin"
+description = "GStreamer Rust File Source/Sink Plugin"
 edition = "2021"
 rust-version = "1.63"
 
diff --git a/generic/fmp4/Cargo.toml b/generic/fmp4/Cargo.toml
index 25117cbd0..f72c84a7b 100644
--- a/generic/fmp4/Cargo.toml
+++ b/generic/fmp4/Cargo.toml
@@ -3,7 +3,7 @@ name = "gst-plugin-fmp4"
 version = "0.9.0-alpha.1"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 license = "MPL-2.0"
-description = "Fragmented MP4 Plugin"
+description = "GStreamer Fragmented MP4 Plugin"
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 edition = "2021"
 rust-version = "1.63"
diff --git a/generic/sodium/Cargo.toml b/generic/sodium/Cargo.toml
index 07704ef44..c2b19eb48 100644
--- a/generic/sodium/Cargo.toml
+++ b/generic/sodium/Cargo.toml
@@ -3,7 +3,7 @@ name = "gst-plugin-sodium"
 version = "0.9.0-alpha.1"
 authors = ["Jordan Petridis <jordan@centricular.com>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
-description = "libsodium-based file encryption and decryption"
+description = "GStreamer plugin for libsodium-based file encryption and decryption"
 license = "MIT"
 edition = "2021"
 rust-version = "1.63"
diff --git a/generic/threadshare/Cargo.toml b/generic/threadshare/Cargo.toml
index 062ec85c2..905199d94 100644
--- a/generic/threadshare/Cargo.toml
+++ b/generic/threadshare/Cargo.toml
@@ -3,7 +3,7 @@ name = "gst-plugin-threadshare"
 version = "0.9.0-alpha.1"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 license = "LGPL-2.1-or-later"
-description = "Threadshare Plugin"
+description = "GStreamer Threadshare Plugin"
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 edition = "2021"
 rust-version = "1.63"
diff --git a/meson.build b/meson.build
index a0aa1289e..e8d7a14c6 100644
--- a/meson.build
+++ b/meson.build
@@ -61,9 +61,9 @@ plugins = {
   'gst-plugin-webrtc': 'libgstrswebrtc',
 
   'gst-plugin-textahead': 'libgsttextahead',
-  'gst-plugin-json': 'libgstrsjson',
-  'gst-plugin-regex': 'libgstrsregex',
-  'gst-plugin-textwrap': 'libgstrstextwrap',
+  'gst-plugin-json': 'libgstjson',
+  'gst-plugin-regex': 'libgstregex',
+  'gst-plugin-textwrap': 'libgsttextwrap',
 
   'gst-plugin-fallbackswitch': 'libgstfallbackswitch',
   'gst-plugin-togglerecord': 'libgsttogglerecord',
@@ -78,8 +78,8 @@ plugins = {
   'gst-plugin-gif': 'libgstgif',
   # gtk4 has an external dependency, see below
   'gst-plugin-hsv': 'libgsthsv',
+  'gst-plugin-png': 'libgstrspng',
   'gst-plugin-rav1e': 'libgstrav1e',
-  'gst-plugin-rspng': 'libgstrspng',
   # videofx has an external dependency, see below
 
   # FIXME: libwebp-sys2 will build its bundled version on msvc and apple platforms
@@ -90,7 +90,7 @@ plugins = {
 extra_env = {}
 
 if dependency('cairo-gobject', required : get_option('videofx')).found()
-  plugins += {'gst-plugin-videofx': 'libgstvideofx',}
+  plugins += {'gst-plugin-videofx': 'libgstrsvideofx',}
 endif
 
 if dependency('pangocairo', required : get_option('closedcaption')).found()
@@ -98,7 +98,7 @@ if dependency('pangocairo', required : get_option('closedcaption')).found()
 endif
 
 if dependency('dav1d', version : '>= 1.0.0', required : get_option('dav1d')).found()
-  plugins += {'gst-plugin-dav1d' : 'libgstrsdav1d'}
+  plugins += {'gst-plugin-dav1d' : 'libgstdav1d'}
 endif
 
 sodium = get_option ('sodium')
diff --git a/net/aws/Cargo.toml b/net/aws/Cargo.toml
index 7f349a411..08430cfec 100644
--- a/net/aws/Cargo.toml
+++ b/net/aws/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Arun Raghavan <arun@arunraghavan.net>",
            "Mathieu Duponchelle <mathieu@centricular.com>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MPL-2.0"
-description = "Amazon Web Services plugin"
+description = "GStreamer Amazon Web Services plugin"
 edition = "2021"
 rust-version = "1.63"
 
diff --git a/net/hlssink3/Cargo.toml b/net/hlssink3/Cargo.toml
index f48a3bdf3..e4fe2be75 100644
--- a/net/hlssink3/Cargo.toml
+++ b/net/hlssink3/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gst-plugin-hlssink3"
-description = "HLS (HTTP Live Streaming) Plugin"
+description = "GStreamer HLS (HTTP Live Streaming) Plugin"
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 version = "0.9.0-alpha.1"
 authors = ["Rafael Caricio <rafael@caricio.com>"]
diff --git a/net/ndi/Cargo.toml b/net/ndi/Cargo.toml
index c9a204411..808c0428b 100644
--- a/net/ndi/Cargo.toml
+++ b/net/ndi/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.9.0-alpha.1"
 authors = ["Ruben Gonzalez <rubenrua@teltek.es>", "Daniel Vilar <daniel.peiteado@teltek.es>", "Sebastian Dröge <sebastian@centricular.com>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MPL-2.0"
-description = "NewTek NDI Plugin"
+description = "GStreamer NewTek NDI Plugin"
 edition = "2021"
 rust-version = "1.63"
 
diff --git a/net/onvif/Cargo.toml b/net/onvif/Cargo.toml
index 4cb91d32e..1c1c7cd04 100644
--- a/net/onvif/Cargo.toml
+++ b/net/onvif/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.9.0-alpha.1"
 authors = ["Mathieu Duponchelle <mathieu@centricular.com>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MPL-2.0"
-description = "Rust ONVIF Plugin"
+description = "GStreamer Rust ONVIF Plugin"
 edition = "2021"
 rust-version = "1.63"
 
diff --git a/net/raptorq/Cargo.toml b/net/raptorq/Cargo.toml
index 10282614d..86a4418c2 100644
--- a/net/raptorq/Cargo.toml
+++ b/net/raptorq/Cargo.toml
@@ -3,7 +3,7 @@ name = "gst-plugin-raptorq"
 version = "0.9.0-alpha.1"
 authors = ["Tomasz Andrzejak <andreiltd@gmail.com>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
-description = "Rust Raptorq FEC Plugin"
+description = "GStreamer RaptorQ FEC Plugin"
 license = "MPL-2.0"
 edition = "2021"
 rust-version = "1.63"
diff --git a/net/reqwest/Cargo.toml b/net/reqwest/Cargo.toml
index 9fa2bed44..4dd890f1d 100644
--- a/net/reqwest/Cargo.toml
+++ b/net/reqwest/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.9.0-alpha.1"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MIT OR Apache-2.0"
-description = "Rust HTTP Plugin"
+description = "GStreamer reqwest HTTP Source Plugin"
 edition = "2021"
 rust-version = "1.63"
 
diff --git a/net/webrtc/Cargo.toml b/net/webrtc/Cargo.toml
index c6dc6e108..6acf6a0e5 100644
--- a/net/webrtc/Cargo.toml
+++ b/net/webrtc/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.9.0"
 edition = "2021"
 authors = ["Mathieu Duponchelle <mathieu@centricular.com>", "Thibault Saunier <tsaunier@igalia.com>"]
 license = "MPL-2.0"
-description = "High level GStreamer WebRTC elements and simple signaling server"
+description = "GStreamer plugin for high level WebRTC elements and a simple signaling server"
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 rust-version = "1.63"
 
diff --git a/net/webrtc-http/Cargo.toml b/net/webrtchttp/Cargo.toml
index 173961a7b..7bbbe94aa 100644
--- a/net/webrtc-http/Cargo.toml
+++ b/net/webrtchttp/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Taruntej Kanakamalla <taruntej@asymptotic.io"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MPL-2.0"
 edition = "2021"
-description = "Plugin for WebRTC HTTP protocols"
+description = "GStreamer WebRTC Plugin for WebRTC HTTP protocols (WHIP)"
 rust-version = "1.63"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/net/webrtc-http/build.rs b/net/webrtchttp/build.rs
index cda12e57e..cda12e57e 100644
--- a/net/webrtc-http/build.rs
+++ b/net/webrtchttp/build.rs
diff --git a/net/webrtc-http/src/lib.rs b/net/webrtchttp/src/lib.rs
index 6d31eb282..6d31eb282 100644
--- a/net/webrtc-http/src/lib.rs
+++ b/net/webrtchttp/src/lib.rs
diff --git a/net/webrtc-http/src/whipsink/imp.rs b/net/webrtchttp/src/whipsink/imp.rs
index 27a3fa42d..27a3fa42d 100644
--- a/net/webrtc-http/src/whipsink/imp.rs
+++ b/net/webrtchttp/src/whipsink/imp.rs
diff --git a/net/webrtc-http/src/whipsink/mod.rs b/net/webrtchttp/src/whipsink/mod.rs
index e307caf7b..e307caf7b 100644
--- a/net/webrtc-http/src/whipsink/mod.rs
+++ b/net/webrtchttp/src/whipsink/mod.rs
diff --git a/text/ahead/Cargo.toml b/text/ahead/Cargo.toml
index 0cdd5887d..fb560780d 100644
--- a/text/ahead/Cargo.toml
+++ b/text/ahead/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.9.0-alpha.1"
 authors = ["Guillaume Desmottes <guillaume@desmottes.be>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MPL-2.0"
-description = "GStreamer Plugin displaying upcoming text buffers ahead"
+description = "GStreamer Plugin for displaying upcoming text buffers ahead of time"
 edition = "2021"
 rust-version = "1.63"
 
diff --git a/text/json/Cargo.toml b/text/json/Cargo.toml
index 352c08af8..d2eaba2b1 100644
--- a/text/json/Cargo.toml
+++ b/text/json/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Mathieu Duponchelle <mathieu@centricular.com>"]
 license = "MPL-2.0"
 edition = "2021"
 rust-version = "1.63"
-description = "Rust JSON Plugin"
+description = "GStreamer JSON Plugin"
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 
 [dependencies]
@@ -19,7 +19,7 @@ package="gstreamer"
 features=["serde"]
 
 [lib]
-name = "gstrsjson"
+name = "gstjson"
 crate-type = ["cdylib", "rlib"]
 path = "src/lib.rs"
 
diff --git a/text/json/src/lib.rs b/text/json/src/lib.rs
index 28370d7c1..57d61e3b2 100644
--- a/text/json/src/lib.rs
+++ b/text/json/src/lib.rs
@@ -9,7 +9,7 @@
 #![recursion_limit = "128"]
 
 /**
- * plugin-rsjson:
+ * plugin-json:
  *
  * Since: plugins-rs-0.5.0
  */
@@ -26,7 +26,7 @@ fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
 }
 
 gst::plugin_define!(
-    rsjson,
+    json,
     env!("CARGO_PKG_DESCRIPTION"),
     plugin_init,
     concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")),
diff --git a/text/regex/Cargo.toml b/text/regex/Cargo.toml
index efff17f4e..2d0762377 100644
--- a/text/regex/Cargo.toml
+++ b/text/regex/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Mathieu Duponchelle <mathieu@centricular.com>"]
 license = "MPL-2.0"
 edition = "2021"
 rust-version = "1.63"
-description = "Rust Regular Expression Plugin"
+description = "GStreamer Regular Expression Plugin"
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 
 [dependencies]
@@ -17,7 +17,7 @@ git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 package="gstreamer"
 
 [lib]
-name = "gstrsregex"
+name = "gstregex"
 crate-type = ["cdylib", "rlib"]
 path = "src/lib.rs"
 
diff --git a/text/regex/src/lib.rs b/text/regex/src/lib.rs
index f51201b03..de3ae7e47 100644
--- a/text/regex/src/lib.rs
+++ b/text/regex/src/lib.rs
@@ -9,7 +9,7 @@
 #![recursion_limit = "128"]
 
 /**
- * plugin-rsregex:
+ * plugin-regex:
  *
  * Since: plugins-rs-0.7.0
  */
@@ -22,7 +22,7 @@ fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
 }
 
 gst::plugin_define!(
-    rsregex,
+    regex,
     env!("CARGO_PKG_DESCRIPTION"),
     plugin_init,
     concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")),
diff --git a/text/wrap/Cargo.toml b/text/wrap/Cargo.toml
index 61c631c0c..371b96255 100644
--- a/text/wrap/Cargo.toml
+++ b/text/wrap/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Mathieu Duponchelle <mathieu@centricular.com>"]
 license = "MPL-2.0"
 edition = "2021"
 rust-version = "1.63"
-description = "Rust Text Wrap Plugin"
+description = "GStreamer Text Wrap Plugin"
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 
 [dependencies]
@@ -18,7 +18,7 @@ git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 package="gstreamer"
 
 [lib]
-name = "gstrstextwrap"
+name = "gsttextwrap"
 crate-type = ["cdylib", "rlib"]
 path = "src/lib.rs"
 
diff --git a/text/wrap/src/lib.rs b/text/wrap/src/lib.rs
index f5ae94ef0..4b5190c6c 100644
--- a/text/wrap/src/lib.rs
+++ b/text/wrap/src/lib.rs
@@ -9,7 +9,7 @@
 #![recursion_limit = "128"]
 
 /**
- * plugin-rstextwrap:
+ * plugin-textwrap:
  *
  * Since: plugins-rs-0.6.0
  */
@@ -22,7 +22,7 @@ fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
 }
 
 gst::plugin_define!(
-    rstextwrap,
+    textwrap,
     env!("CARGO_PKG_DESCRIPTION"),
     plugin_init,
     concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")),
diff --git a/tutorial/Cargo.toml b/tutorial/Cargo.toml
index 364863800..449760692 100644
--- a/tutorial/Cargo.toml
+++ b/tutorial/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MIT OR Apache-2.0"
 edition = "2021"
 rust-version = "1.63"
-description = "Rust Tutorial Plugin"
+description = "GStreamer Rust Tutorial Plugin"
 
 [dependencies]
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
diff --git a/utils/fallbackswitch/Cargo.toml b/utils/fallbackswitch/Cargo.toml
index c085e655a..21367729c 100644
--- a/utils/fallbackswitch/Cargo.toml
+++ b/utils/fallbackswitch/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MPL-2.0"
 edition = "2021"
 rust-version = "1.63"
-description = "Fallback Switcher Plugin"
+description = "GStreamer Fallback Switcher and Source Plugin"
 
 [dependencies]
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
diff --git a/utils/togglerecord/Cargo.toml b/utils/togglerecord/Cargo.toml
index 23998c3be..645f587a0 100644
--- a/utils/togglerecord/Cargo.toml
+++ b/utils/togglerecord/Cargo.toml
@@ -3,7 +3,7 @@ name = "gst-plugin-togglerecord"
 version = "0.9.0-alpha.1"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 license = "MPL-2.0"
-description = "Toggle Record Plugin"
+description = "GStreamer Toggle Record Plugin"
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 edition = "2021"
 rust-version = "1.63"
diff --git a/utils/tracers/Cargo.toml b/utils/tracers/Cargo.toml
index 8e26cd840..6bc09c3b7 100644
--- a/utils/tracers/Cargo.toml
+++ b/utils/tracers/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.9.0-alpha.1"
 authors = ["Guillaume Desmottes <guillaume.desmottes@onestream.live>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MPL-2.0"
-edition = "2018"
-description = "GStreamer tracers plugin"
+edition = "2021"
+description = "GStreamer Rust tracers plugin"
 rust-version = "1.63"
 
 [dependencies]
diff --git a/utils/uriplaylistbin/Cargo.toml b/utils/uriplaylistbin/Cargo.toml
index 9843a5793..fac9e114a 100644
--- a/utils/uriplaylistbin/Cargo.toml
+++ b/utils/uriplaylistbin/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.9.0-alpha.1"
 authors = ["Guillaume Desmottes <guillaume.desmottes@onestream.live>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MPL-2.0"
-edition = "2018"
-description = "Playlist Plugin"
+edition = "2021"
+description = "GStreamer Playlist Playback Plugin"
 rust-version = "1.63"
 
 [dependencies]
diff --git a/video/cdg/Cargo.toml b/video/cdg/Cargo.toml
index 91529faa3..2c3fe7519 100644
--- a/video/cdg/Cargo.toml
+++ b/video/cdg/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.9.0-alpha.1"
 authors = ["Guillaume Desmottes <guillaume.desmottes@collabora.com>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MIT OR Apache-2.0"
-description = "CDG Plugin"
+description = "GStreamer CDG codec Plugin"
 edition = "2021"
 rust-version = "1.63"
 
diff --git a/video/closedcaption/Cargo.toml b/video/closedcaption/Cargo.toml
index af30036ef..4de680f79 100644
--- a/video/closedcaption/Cargo.toml
+++ b/video/closedcaption/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Sebastian Dröge <sebastian@centricular.com>", "Jordan Petridis <jor
 license = "MPL-2.0"
 edition = "2021"
 rust-version = "1.63"
-description = "Rust Closed Caption Plugin"
+description = "GStreamer Rust Closed Caption Plugin"
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 
 [dependencies]
diff --git a/video/dav1d/Cargo.toml b/video/dav1d/Cargo.toml
index 0c80049fa..3263ec851 100644
--- a/video/dav1d/Cargo.toml
+++ b/video/dav1d/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 rust-version = "1.63"
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MIT OR Apache-2.0"
-description = "Dav1d Plugin"
+description = "GStreamer dav1d AV1 decoder Plugin"
 
 [dependencies]
 dav1d = "0.9"
@@ -17,7 +17,7 @@ num_cpus = "1.0"
 once_cell = "1.0"
 
 [lib]
-name = "gstrsdav1d"
+name = "gstdav1d"
 crate-type = ["cdylib", "rlib"]
 path = "src/lib.rs"
 
diff --git a/video/dav1d/src/lib.rs b/video/dav1d/src/lib.rs
index efb511401..f2cd8df17 100644
--- a/video/dav1d/src/lib.rs
+++ b/video/dav1d/src/lib.rs
@@ -10,7 +10,7 @@
 #![allow(clippy::non_send_fields_in_send_ty, unused_doc_comments)]
 
 /**
- * plugin-rsdav1d:
+ * plugin-dav1d:
  *
  * Since: plugins-rs-0.6.0
  */
@@ -24,7 +24,7 @@ fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
 }
 
 gst::plugin_define!(
-    rsdav1d,
+    dav1d,
     env!("CARGO_PKG_DESCRIPTION"),
     plugin_init,
     concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")),
diff --git a/video/ffv1/Cargo.toml b/video/ffv1/Cargo.toml
index 2151277d8..9b538f931 100644
--- a/video/ffv1/Cargo.toml
+++ b/video/ffv1/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.9.0-alpha.1"
 authors = ["Arun Raghavan <arun@asymptotic.io>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MIT OR Apache-2.0"
-description = "FFV1 Decoder Plugin"
+description = "GStreamer FFV1 Decoder Plugin"
 edition = "2021"
 rust-version = "1.63"
 
diff --git a/video/flavors/Cargo.toml b/video/flavors/Cargo.toml
index ed038f21c..7f8eceeb8 100644
--- a/video/flavors/Cargo.toml
+++ b/video/flavors/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MIT OR Apache-2.0"
 edition = "2021"
 rust-version = "1.63"
-description = "Rust FLV Plugin"
+description = "GStreamer Rust FLV Plugin"
 
 [dependencies]
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
diff --git a/video/gtk4/Cargo.toml b/video/gtk4/Cargo.toml
index c1f9bf134..9a33f4812 100644
--- a/video/gtk4/Cargo.toml
+++ b/video/gtk4/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MPL-2.0"
 edition = "2021"
 rust-version = "1.63"
-description = "GTK 4 Sink element and Paintable widget"
+description = "GStreamer GTK 4 Sink element and Paintable widget"
 
 [dependencies]
 gtk = { package = "gtk4", git = "https://github.com/gtk-rs/gtk4-rs" }
diff --git a/video/hsv/Cargo.toml b/video/hsv/Cargo.toml
index 375f2ec27..bc40d2380 100644
--- a/video/hsv/Cargo.toml
+++ b/video/hsv/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MIT OR Apache-2.0"
 edition = "2021"
 rust-version = "1.63"
-description = "HSV manipulation elements, written in Rust"
+description = "GStreamer plugin with HSV manipulation elements"
 
 [dependencies]
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
diff --git a/video/rspng/Cargo.toml b/video/png/Cargo.toml
index f096e7da9..2b0460c59 100644
--- a/video/rspng/Cargo.toml
+++ b/video/png/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-name = "gst-plugin-rspng"
+name = "gst-plugin-png"
 version = "0.9.0-alpha.1"
 authors = ["Natanael Mojica <neithanmo@gmail.com>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MIT OR Apache-2.0"
 edition = "2021"
 rust-version = "1.63"
-description = "An PNG encoder/decoder written in pure Rust"
+description = "GStreamer Rust PNG encoder/decoder"
 
 [dependencies]
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
diff --git a/video/rspng/LICENSE-APACHE b/video/png/LICENSE-APACHE
index 1cd601d0a..1cd601d0a 120000
--- a/video/rspng/LICENSE-APACHE
+++ b/video/png/LICENSE-APACHE
diff --git a/video/rspng/LICENSE-MIT b/video/png/LICENSE-MIT
index b2cfbdc7b..b2cfbdc7b 120000
--- a/video/rspng/LICENSE-MIT
+++ b/video/png/LICENSE-MIT
diff --git a/video/rspng/build.rs b/video/png/build.rs
index cda12e57e..cda12e57e 100644
--- a/video/rspng/build.rs
+++ b/video/png/build.rs
diff --git a/video/rspng/examples/pngenc.rs b/video/png/examples/pngenc.rs
index 0ed819757..0ed819757 100644
--- a/video/rspng/examples/pngenc.rs
+++ b/video/png/examples/pngenc.rs
diff --git a/video/rspng/src/lib.rs b/video/png/src/lib.rs
index 030efc918..030efc918 100644
--- a/video/rspng/src/lib.rs
+++ b/video/png/src/lib.rs
diff --git a/video/rspng/src/pngenc/imp.rs b/video/png/src/pngenc/imp.rs
index 851677d86..851677d86 100644
--- a/video/rspng/src/pngenc/imp.rs
+++ b/video/png/src/pngenc/imp.rs
diff --git a/video/rspng/src/pngenc/mod.rs b/video/png/src/pngenc/mod.rs
index b58ea081e..b58ea081e 100644
--- a/video/rspng/src/pngenc/mod.rs
+++ b/video/png/src/pngenc/mod.rs
diff --git a/video/rspng/tests/pngenc.rs b/video/png/tests/pngenc.rs
index dabdb9793..dabdb9793 100644
--- a/video/rspng/tests/pngenc.rs
+++ b/video/png/tests/pngenc.rs
diff --git a/video/rav1e/Cargo.toml b/video/rav1e/Cargo.toml
index 836ff80e5..7b6adf0e2 100644
--- a/video/rav1e/Cargo.toml
+++ b/video/rav1e/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.9.0-alpha.1"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MIT OR Apache-2.0"
-description = "rav1e AV1 Encoder Plugin"
+description = "GStreamer rav1e AV1 Encoder Plugin"
 edition = "2021"
 rust-version = "1.63"
 
diff --git a/video/videofx/Cargo.toml b/video/videofx/Cargo.toml
index 4ddba4894..bfa2585f7 100644
--- a/video/videofx/Cargo.toml
+++ b/video/videofx/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.9.0-alpha.1"
 authors = ["Sanchayan Maity <sanchayan@asymptotic.io>", "Rafael Caricio <rafael@caricio.com>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MPL-2.0"
-description = "Video Effects Plugin"
+description = "GStreamer Rust Video Effects Plugin"
 edition = "2021"
 rust-version = "1.63"
 
@@ -39,7 +39,7 @@ git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 package = "gstreamer-check"
 
 [lib]
-name = "gstvideofx"
+name = "gstrsvideofx"
 crate-type = ["cdylib", "rlib"]
 path = "src/lib.rs"
 
diff --git a/video/videofx/src/lib.rs b/video/videofx/src/lib.rs
index 232c0b4f8..ce811038e 100644
--- a/video/videofx/src/lib.rs
+++ b/video/videofx/src/lib.rs
@@ -9,7 +9,7 @@
 #![allow(clippy::non_send_fields_in_send_ty, unused_doc_comments)]
 
 /**
- * plugin-videofx:
+ * plugin-rsvideofx:
  *
  * Since: plugins-rs-0.8.0
  */
@@ -32,7 +32,7 @@ fn plugin_init(plugin: &gst::Plugin) -> Result<(), gst::glib::BoolError> {
 }
 
 gst::plugin_define!(
-    videofx,
+    rsvideofx,
     env!("CARGO_PKG_DESCRIPTION"),
     plugin_init,
     concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")),
diff --git a/video/webp/Cargo.toml b/video/webp/Cargo.toml
index 8ea1a263f..11ec86677 100644
--- a/video/webp/Cargo.toml
+++ b/video/webp/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Mathieu Duponchelle <mathieu@centricular.com>"]
 license = "MPL-2.0"
 edition = "2021"
 rust-version = "1.63"
-description = "WebP Plugin"
+description = "GStreamer WebP Plugin"
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 
 [dependencies]