diff --git a/audio/audiofx/src/audioecho/imp.rs b/audio/audiofx/src/audioecho/imp.rs
index 167c61aa..ba8496b8 100644
--- a/audio/audiofx/src/audioecho/imp.rs
+++ b/audio/audiofx/src/audioecho/imp.rs
@@ -138,7 +138,7 @@ impl ObjectSubclass for AudioEcho {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {
diff --git a/audio/audiofx/src/audioecho/mod.rs b/audio/audiofx/src/audioecho/mod.rs
index de128072..2cbfd634 100644
--- a/audio/audiofx/src/audioecho/mod.rs
+++ b/audio/audiofx/src/audioecho/mod.rs
@@ -11,7 +11,7 @@ use glib::prelude::*;
 mod imp;
 mod ring_buffer;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct AudioEcho(ObjectSubclass<imp::AudioEcho>) @extends gst_base::BaseTransform, gst::Element, gst::Object;
 }
 
diff --git a/audio/audiofx/src/audioloudnorm/imp.rs b/audio/audiofx/src/audioloudnorm/imp.rs
index 63782889..76e227e4 100644
--- a/audio/audiofx/src/audioloudnorm/imp.rs
+++ b/audio/audiofx/src/audioloudnorm/imp.rs
@@ -1755,7 +1755,7 @@ impl ObjectSubclass for AudioLoudNorm {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();
diff --git a/audio/audiofx/src/audioloudnorm/mod.rs b/audio/audiofx/src/audioloudnorm/mod.rs
index d896035c..c49a3585 100644
--- a/audio/audiofx/src/audioloudnorm/mod.rs
+++ b/audio/audiofx/src/audioloudnorm/mod.rs
@@ -22,7 +22,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct AudioLoudNorm(ObjectSubclass<imp::AudioLoudNorm>) @extends gst::Element, gst::Object;
 }
 
diff --git a/audio/audiofx/src/audiornnoise/imp.rs b/audio/audiofx/src/audiornnoise/imp.rs
index 5b40c3e7..821eeb89 100644
--- a/audio/audiofx/src/audiornnoise/imp.rs
+++ b/audio/audiofx/src/audiornnoise/imp.rs
@@ -196,7 +196,7 @@ impl ObjectSubclass for AudioRNNoise {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {
diff --git a/audio/audiofx/src/audiornnoise/mod.rs b/audio/audiofx/src/audiornnoise/mod.rs
index 47ebe2cc..4cc4cf76 100644
--- a/audio/audiofx/src/audiornnoise/mod.rs
+++ b/audio/audiofx/src/audiornnoise/mod.rs
@@ -11,7 +11,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct AudioRNNoise(ObjectSubclass<imp::AudioRNNoise>) @extends gst_base::BaseTransform, gst::Element, gst::Object;
 }
 
diff --git a/audio/claxon/src/claxondec/imp.rs b/audio/claxon/src/claxondec/imp.rs
index 79ca7359..304e769d 100644
--- a/audio/claxon/src/claxondec/imp.rs
+++ b/audio/claxon/src/claxondec/imp.rs
@@ -37,7 +37,7 @@ impl ObjectSubclass for ClaxonDec {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {
diff --git a/audio/claxon/src/claxondec/mod.rs b/audio/claxon/src/claxondec/mod.rs
index 3ceca8ca..29f5d34d 100644
--- a/audio/claxon/src/claxondec/mod.rs
+++ b/audio/claxon/src/claxondec/mod.rs
@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct ClaxonDec(ObjectSubclass<imp::ClaxonDec>) @extends gst_audio::AudioDecoder, gst::Element, gst::Object;
 }
 
diff --git a/audio/csound/src/filter/imp.rs b/audio/csound/src/filter/imp.rs
index 42c25350..8740bb49 100644
--- a/audio/csound/src/filter/imp.rs
+++ b/audio/csound/src/filter/imp.rs
@@ -15,7 +15,6 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_object_subclass;
 use glib::subclass;
 use glib::subclass::prelude::*;
 use gst::prelude::*;
@@ -366,7 +365,7 @@ impl ObjectSubclass for CsoundFilter {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         let csound = Csound::new();
diff --git a/audio/csound/src/filter/mod.rs b/audio/csound/src/filter/mod.rs
index 89ef3b4c..702d7b88 100644
--- a/audio/csound/src/filter/mod.rs
+++ b/audio/csound/src/filter/mod.rs
@@ -15,12 +15,11 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 
 mod imp;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct CsoundFilter(ObjectSubclass<imp::CsoundFilter>) @extends gst_base::BaseTransform, gst::Element, gst::Object;
 }
 
diff --git a/audio/lewton/src/lewtondec/imp.rs b/audio/lewton/src/lewtondec/imp.rs
index 5d6d5d9a..aa5b9575 100644
--- a/audio/lewton/src/lewtondec/imp.rs
+++ b/audio/lewton/src/lewtondec/imp.rs
@@ -50,7 +50,7 @@ impl ObjectSubclass for LewtonDec {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {
diff --git a/audio/lewton/src/lewtondec/mod.rs b/audio/lewton/src/lewtondec/mod.rs
index 7db96f51..b7cf101a 100644
--- a/audio/lewton/src/lewtondec/mod.rs
+++ b/audio/lewton/src/lewtondec/mod.rs
@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct LewtonDec(ObjectSubclass<imp::LewtonDec>) @extends gst_audio::AudioDecoder, gst::Element, gst::Object;
 }
 
diff --git a/generic/file/src/filesink/imp.rs b/generic/file/src/filesink/imp.rs
index 2521de95..45422bd7 100644
--- a/generic/file/src/filesink/imp.rs
+++ b/generic/file/src/filesink/imp.rs
@@ -123,7 +123,7 @@ impl ObjectSubclass for FileSink {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {
diff --git a/generic/file/src/filesink/mod.rs b/generic/file/src/filesink/mod.rs
index ac80bd84..442b2fe2 100644
--- a/generic/file/src/filesink/mod.rs
+++ b/generic/file/src/filesink/mod.rs
@@ -12,7 +12,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct FileSink(ObjectSubclass<imp::FileSink>) @extends gst_base::BaseSink, gst::Element, gst::Object, @implements gst::URIHandler;
 }
 
diff --git a/generic/file/src/filesrc/imp.rs b/generic/file/src/filesrc/imp.rs
index 0eb0aa2e..7f4fedab 100644
--- a/generic/file/src/filesrc/imp.rs
+++ b/generic/file/src/filesrc/imp.rs
@@ -137,7 +137,7 @@ impl ObjectSubclass for FileSrc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {
diff --git a/generic/file/src/filesrc/mod.rs b/generic/file/src/filesrc/mod.rs
index 5fc15a28..caad10ab 100644
--- a/generic/file/src/filesrc/mod.rs
+++ b/generic/file/src/filesrc/mod.rs
@@ -11,7 +11,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct FileSrc(ObjectSubclass<imp::FileSrc>) @extends gst_base::BaseSrc, gst::Element, gst::Object, @implements gst::URIHandler;
 }
 
diff --git a/generic/sodium/src/decrypter/imp.rs b/generic/sodium/src/decrypter/imp.rs
index 1639b9ee..4821fb56 100644
--- a/generic/sodium/src/decrypter/imp.rs
+++ b/generic/sodium/src/decrypter/imp.rs
@@ -568,7 +568,7 @@ impl ObjectSubclass for Decrypter {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();
diff --git a/generic/sodium/src/decrypter/mod.rs b/generic/sodium/src/decrypter/mod.rs
index 1bf5dbe1..96f48a09 100644
--- a/generic/sodium/src/decrypter/mod.rs
+++ b/generic/sodium/src/decrypter/mod.rs
@@ -26,7 +26,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Decrypter(ObjectSubclass<imp::Decrypter>) @extends gst::Element, gst::Object;
 }
 
diff --git a/generic/sodium/src/encrypter/imp.rs b/generic/sodium/src/encrypter/imp.rs
index cc30a453..908e31b9 100644
--- a/generic/sodium/src/encrypter/imp.rs
+++ b/generic/sodium/src/encrypter/imp.rs
@@ -395,7 +395,7 @@ impl ObjectSubclass for Encrypter {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();
diff --git a/generic/sodium/src/encrypter/mod.rs b/generic/sodium/src/encrypter/mod.rs
index f9eb39ff..be74c586 100644
--- a/generic/sodium/src/encrypter/mod.rs
+++ b/generic/sodium/src/encrypter/mod.rs
@@ -26,7 +26,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Encrypter(ObjectSubclass<imp::Encrypter>) @extends gst::Element, gst::Object;
 }
 
diff --git a/generic/threadshare/src/appsrc/imp.rs b/generic/threadshare/src/appsrc/imp.rs
index 73c9276f..8e53fbe0 100644
--- a/generic/threadshare/src/appsrc/imp.rs
+++ b/generic/threadshare/src/appsrc/imp.rs
@@ -21,7 +21,6 @@ use futures::future::BoxFuture;
 use futures::lock::Mutex as FutMutex;
 use futures::prelude::*;
 
-use glib::glib_object_subclass;
 use glib::prelude::*;
 use glib::subclass;
 use glib::subclass::prelude::*;
@@ -564,7 +563,7 @@ impl ObjectSubclass for AppSrc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(
diff --git a/generic/threadshare/src/appsrc/mod.rs b/generic/threadshare/src/appsrc/mod.rs
index 6f1e1729..ab965ede 100644
--- a/generic/threadshare/src/appsrc/mod.rs
+++ b/generic/threadshare/src/appsrc/mod.rs
@@ -16,12 +16,11 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 
 mod imp;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct AppSrc(ObjectSubclass<imp::AppSrc>) @extends gst::Element, gst::Object;
 }
 
diff --git a/generic/threadshare/src/inputselector/imp.rs b/generic/threadshare/src/inputselector/imp.rs
index fe861b84..3b03add3 100644
--- a/generic/threadshare/src/inputselector/imp.rs
+++ b/generic/threadshare/src/inputselector/imp.rs
@@ -19,7 +19,6 @@ use futures::future::BoxFuture;
 use futures::future::{abortable, AbortHandle};
 use futures::prelude::*;
 
-use glib::glib_object_subclass;
 use glib::prelude::*;
 use glib::subclass;
 use glib::subclass::prelude::*;
@@ -433,7 +432,7 @@ impl ObjectSubclass for InputSelector {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(
diff --git a/generic/threadshare/src/inputselector/mod.rs b/generic/threadshare/src/inputselector/mod.rs
index 1b8d9e73..141a32a2 100644
--- a/generic/threadshare/src/inputselector/mod.rs
+++ b/generic/threadshare/src/inputselector/mod.rs
@@ -15,12 +15,11 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 
 mod imp;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct InputSelector(ObjectSubclass<imp::InputSelector>) @extends gst::Element, gst::Object;
 }
 
diff --git a/generic/threadshare/src/jitterbuffer/imp.rs b/generic/threadshare/src/jitterbuffer/imp.rs
index e9dbdd6e..1d312db0 100644
--- a/generic/threadshare/src/jitterbuffer/imp.rs
+++ b/generic/threadshare/src/jitterbuffer/imp.rs
@@ -19,7 +19,6 @@ use futures::future::BoxFuture;
 use futures::future::{abortable, AbortHandle, Aborted};
 use futures::prelude::*;
 
-use glib::glib_object_subclass;
 use glib::prelude::*;
 use glib::subclass;
 use glib::subclass::prelude::*;
@@ -1417,7 +1416,7 @@ impl ObjectSubclass for JitterBuffer {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(
diff --git a/generic/threadshare/src/jitterbuffer/jitterbuffer.rs b/generic/threadshare/src/jitterbuffer/jitterbuffer.rs
index 1a55b85f..3b59ce45 100644
--- a/generic/threadshare/src/jitterbuffer/jitterbuffer.rs
+++ b/generic/threadshare/src/jitterbuffer/jitterbuffer.rs
@@ -19,13 +19,12 @@ use super::ffi;
 
 use std::ptr;
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 use glib::translate::*;
 
 use std::mem;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct RTPJitterBuffer(Object<ffi::RTPJitterBuffer>);
 
     match fn {
diff --git a/generic/threadshare/src/jitterbuffer/mod.rs b/generic/threadshare/src/jitterbuffer/mod.rs
index 0dc7d280..693d7f4a 100644
--- a/generic/threadshare/src/jitterbuffer/mod.rs
+++ b/generic/threadshare/src/jitterbuffer/mod.rs
@@ -22,9 +22,7 @@ mod imp;
 #[allow(clippy::module_inception)]
 pub mod jitterbuffer;
 
-use glib::glib_wrapper;
-
-glib_wrapper! {
+glib::wrapper! {
     pub struct JitterBuffer(ObjectSubclass<imp::JitterBuffer>) @extends gst::Element, gst::Object;
 }
 
diff --git a/generic/threadshare/src/proxy/imp.rs b/generic/threadshare/src/proxy/imp.rs
index 84062b6c..fc8efe20 100644
--- a/generic/threadshare/src/proxy/imp.rs
+++ b/generic/threadshare/src/proxy/imp.rs
@@ -19,7 +19,6 @@ use futures::channel::oneshot;
 use futures::future::BoxFuture;
 use futures::prelude::*;
 
-use glib::glib_object_subclass;
 use glib::prelude::*;
 use glib::subclass;
 use glib::subclass::prelude::*;
@@ -655,7 +654,7 @@ impl ObjectSubclass for ProxySink {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(
@@ -1170,7 +1169,7 @@ impl ObjectSubclass for ProxySrc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(
diff --git a/generic/threadshare/src/proxy/mod.rs b/generic/threadshare/src/proxy/mod.rs
index 2bf3b2dd..417267a6 100644
--- a/generic/threadshare/src/proxy/mod.rs
+++ b/generic/threadshare/src/proxy/mod.rs
@@ -15,12 +15,11 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 
 mod imp;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct ProxySink(ObjectSubclass<imp::ProxySink>) @extends gst::Element, gst::Object;
 }
 
@@ -29,7 +28,7 @@ glib_wrapper! {
 unsafe impl Send for ProxySink {}
 unsafe impl Sync for ProxySink {}
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct ProxySrc(ObjectSubclass<imp::ProxySrc>) @extends gst::Element, gst::Object;
 }
 
diff --git a/generic/threadshare/src/queue/imp.rs b/generic/threadshare/src/queue/imp.rs
index 9d53b7a5..aba42274 100644
--- a/generic/threadshare/src/queue/imp.rs
+++ b/generic/threadshare/src/queue/imp.rs
@@ -19,7 +19,6 @@ use futures::channel::oneshot;
 use futures::future::BoxFuture;
 use futures::prelude::*;
 
-use glib::glib_object_subclass;
 use glib::prelude::*;
 use glib::subclass;
 use glib::subclass::prelude::*;
@@ -756,7 +755,7 @@ impl ObjectSubclass for Queue {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(
diff --git a/generic/threadshare/src/queue/mod.rs b/generic/threadshare/src/queue/mod.rs
index 153939f9..ccf8cb40 100644
--- a/generic/threadshare/src/queue/mod.rs
+++ b/generic/threadshare/src/queue/mod.rs
@@ -15,12 +15,11 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 
 mod imp;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct Queue(ObjectSubclass<imp::Queue>) @extends gst::Element, gst::Object;
 }
 
diff --git a/generic/threadshare/src/tcpclientsrc/imp.rs b/generic/threadshare/src/tcpclientsrc/imp.rs
index f3ef2fbf..17bdb503 100644
--- a/generic/threadshare/src/tcpclientsrc/imp.rs
+++ b/generic/threadshare/src/tcpclientsrc/imp.rs
@@ -20,7 +20,6 @@ use futures::future::BoxFuture;
 use futures::lock::Mutex as FutMutex;
 use futures::prelude::*;
 
-use glib::glib_object_subclass;
 use glib::prelude::*;
 use glib::subclass;
 use glib::subclass::prelude::*;
@@ -616,7 +615,7 @@ impl ObjectSubclass for TcpClientSrc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(
diff --git a/generic/threadshare/src/tcpclientsrc/mod.rs b/generic/threadshare/src/tcpclientsrc/mod.rs
index c78ba826..e34cd4e2 100644
--- a/generic/threadshare/src/tcpclientsrc/mod.rs
+++ b/generic/threadshare/src/tcpclientsrc/mod.rs
@@ -16,12 +16,11 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 
 mod imp;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct TcpClientSrc(ObjectSubclass<imp::TcpClientSrc>) @extends gst::Element, gst::Object;
 }
 
diff --git a/generic/threadshare/src/udpsink/imp.rs b/generic/threadshare/src/udpsink/imp.rs
index eccd1d6f..4b1e2bbb 100644
--- a/generic/threadshare/src/udpsink/imp.rs
+++ b/generic/threadshare/src/udpsink/imp.rs
@@ -20,7 +20,6 @@ use futures::future::BoxFuture;
 use futures::lock::Mutex;
 use futures::prelude::*;
 
-use glib::glib_object_subclass;
 use glib::prelude::*;
 use glib::subclass;
 use glib::subclass::prelude::*;
@@ -1132,7 +1131,7 @@ impl ObjectSubclass for UdpSink {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(
diff --git a/generic/threadshare/src/udpsink/mod.rs b/generic/threadshare/src/udpsink/mod.rs
index da0729e9..1776694a 100644
--- a/generic/threadshare/src/udpsink/mod.rs
+++ b/generic/threadshare/src/udpsink/mod.rs
@@ -15,12 +15,11 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 
 mod imp;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct UdpSink(ObjectSubclass<imp::UdpSink>) @extends gst::Element, gst::Object;
 }
 
diff --git a/generic/threadshare/src/udpsrc/imp.rs b/generic/threadshare/src/udpsrc/imp.rs
index 009ce43d..deab07de 100644
--- a/generic/threadshare/src/udpsrc/imp.rs
+++ b/generic/threadshare/src/udpsrc/imp.rs
@@ -19,7 +19,6 @@ use futures::future::BoxFuture;
 use futures::lock::Mutex as FutMutex;
 use futures::prelude::*;
 
-use glib::glib_object_subclass;
 use glib::prelude::*;
 use glib::subclass;
 use glib::subclass::prelude::*;
@@ -793,7 +792,7 @@ impl ObjectSubclass for UdpSrc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(
diff --git a/generic/threadshare/src/udpsrc/mod.rs b/generic/threadshare/src/udpsrc/mod.rs
index 19ebd2e1..37ffb0d1 100644
--- a/generic/threadshare/src/udpsrc/mod.rs
+++ b/generic/threadshare/src/udpsrc/mod.rs
@@ -15,12 +15,11 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 
 mod imp;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct UdpSrc(ObjectSubclass<imp::UdpSrc>) @extends gst::Element, gst::Object;
 }
 
diff --git a/generic/threadshare/tests/pad.rs b/generic/threadshare/tests/pad.rs
index 261a4f44..cf0ac384 100644
--- a/generic/threadshare/tests/pad.rs
+++ b/generic/threadshare/tests/pad.rs
@@ -22,7 +22,6 @@ use futures::lock::Mutex as FutMutex;
 use futures::prelude::*;
 
 use glib::GBoxed;
-use glib::{glib_object_subclass, glib_wrapper};
 
 use gst::prelude::*;
 use gst::subclass::prelude::*;
@@ -320,7 +319,7 @@ mod imp_src {
         type Instance = gst::subclass::ElementInstanceStruct<Self>;
         type Class = glib::subclass::simple::ClassStruct<Self>;
 
-        glib_object_subclass!();
+        glib::object_subclass!();
 
         fn class_init(klass: &mut Self::Class) {
             klass.set_metadata(
@@ -442,7 +441,7 @@ mod imp_src {
     }
 }
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct ElementSrcTest(ObjectSubclass<imp_src::ElementSrcTest>) @extends gst::Element, gst::Object;
 }
 unsafe impl Send for ElementSrcTest {}
@@ -638,7 +637,7 @@ mod imp_sink {
         type Instance = gst::subclass::ElementInstanceStruct<Self>;
         type Class = glib::subclass::simple::ClassStruct<Self>;
 
-        glib_object_subclass!();
+        glib::object_subclass!();
 
         fn class_init(klass: &mut Self::Class) {
             klass.set_metadata(
@@ -720,7 +719,7 @@ mod imp_sink {
     }
 }
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct ElementSinkTest(ObjectSubclass<imp_sink::ElementSinkTest>) @extends gst::Element, gst::Object;
 }
 unsafe impl Send for ElementSinkTest {}
diff --git a/net/reqwest/src/reqwesthttpsrc/imp.rs b/net/reqwest/src/reqwesthttpsrc/imp.rs
index 746a2ab2..00a78e82 100644
--- a/net/reqwest/src/reqwesthttpsrc/imp.rs
+++ b/net/reqwest/src/reqwesthttpsrc/imp.rs
@@ -1101,7 +1101,7 @@ impl ObjectSubclass for ReqwestHttpSrc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {
diff --git a/net/reqwest/src/reqwesthttpsrc/mod.rs b/net/reqwest/src/reqwesthttpsrc/mod.rs
index 8d8d07c7..9f5c35c8 100644
--- a/net/reqwest/src/reqwesthttpsrc/mod.rs
+++ b/net/reqwest/src/reqwesthttpsrc/mod.rs
@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct ReqwestHttpSrc(ObjectSubclass<imp::ReqwestHttpSrc>) @extends gst_base::PushSrc, gst_base::BaseSrc, gst::Element, gst::Object, @implements gst::URIHandler;
 }
 
diff --git a/net/rusoto/src/aws_transcriber/imp.rs b/net/rusoto/src/aws_transcriber/imp.rs
index 5378acb6..fbd930d1 100644
--- a/net/rusoto/src/aws_transcriber/imp.rs
+++ b/net/rusoto/src/aws_transcriber/imp.rs
@@ -1001,7 +1001,7 @@ impl ObjectSubclass for Transcriber {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();
diff --git a/net/rusoto/src/aws_transcriber/mod.rs b/net/rusoto/src/aws_transcriber/mod.rs
index 5e2260c0..20ddb1eb 100644
--- a/net/rusoto/src/aws_transcriber/mod.rs
+++ b/net/rusoto/src/aws_transcriber/mod.rs
@@ -20,7 +20,7 @@ use glib::prelude::*;
 mod imp;
 mod packet;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Transcriber(ObjectSubclass<imp::Transcriber>) @extends gst::Element, gst::Object;
 }
 
diff --git a/net/rusoto/src/s3sink/imp.rs b/net/rusoto/src/s3sink/imp.rs
index acc1be21..8f339b5b 100644
--- a/net/rusoto/src/s3sink/imp.rs
+++ b/net/rusoto/src/s3sink/imp.rs
@@ -389,7 +389,7 @@ impl ObjectSubclass for S3Sink {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {
diff --git a/net/rusoto/src/s3sink/mod.rs b/net/rusoto/src/s3sink/mod.rs
index 60bd3f71..a9c96bcd 100644
--- a/net/rusoto/src/s3sink/mod.rs
+++ b/net/rusoto/src/s3sink/mod.rs
@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct S3Sink(ObjectSubclass<imp::S3Sink>) @extends gst_base::BaseSink, gst::Element, gst::Object;
 }
 
diff --git a/net/rusoto/src/s3src/imp.rs b/net/rusoto/src/s3src/imp.rs
index 5cc324c0..9dd1a697 100644
--- a/net/rusoto/src/s3src/imp.rs
+++ b/net/rusoto/src/s3src/imp.rs
@@ -213,7 +213,7 @@ impl ObjectSubclass for S3Src {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {
diff --git a/net/rusoto/src/s3src/mod.rs b/net/rusoto/src/s3src/mod.rs
index d05cd54a..941738ac 100644
--- a/net/rusoto/src/s3src/mod.rs
+++ b/net/rusoto/src/s3src/mod.rs
@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct S3Src(ObjectSubclass<imp::S3Src>) @extends gst_base::BaseSrc, gst::Element, gst::Object;
 }
 
diff --git a/text/wrap/src/gsttextwrap/imp.rs b/text/wrap/src/gsttextwrap/imp.rs
index 0ba9bc26..7aa8a267 100644
--- a/text/wrap/src/gsttextwrap/imp.rs
+++ b/text/wrap/src/gsttextwrap/imp.rs
@@ -262,7 +262,7 @@ impl ObjectSubclass for TextWrap {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();
diff --git a/text/wrap/src/gsttextwrap/mod.rs b/text/wrap/src/gsttextwrap/mod.rs
index ea9804cc..6b5acef2 100644
--- a/text/wrap/src/gsttextwrap/mod.rs
+++ b/text/wrap/src/gsttextwrap/mod.rs
@@ -19,7 +19,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct TextWrap(ObjectSubclass<imp::TextWrap>) @extends gst::Element, gst::Object;
 }
 
diff --git a/tutorial/src/identity/imp.rs b/tutorial/src/identity/imp.rs
index 8bd8c65e..d94ec448 100644
--- a/tutorial/src/identity/imp.rs
+++ b/tutorial/src/identity/imp.rs
@@ -122,7 +122,7 @@ impl ObjectSubclass for Identity {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate.
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     // Called when a new instance is to be created. We need to return an instance
     // of our struct here and also get the class struct passed in case it's needed
diff --git a/tutorial/src/identity/mod.rs b/tutorial/src/identity/mod.rs
index c9b4c18d..d7d45183 100644
--- a/tutorial/src/identity/mod.rs
+++ b/tutorial/src/identity/mod.rs
@@ -11,7 +11,7 @@ use glib::prelude::*;
 mod imp;
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Identity(ObjectSubclass<imp::Identity>) @extends gst::Element, gst::Object;
 }
 
diff --git a/tutorial/src/progressbin/imp.rs b/tutorial/src/progressbin/imp.rs
index 4488458c..9a1e5c7c 100644
--- a/tutorial/src/progressbin/imp.rs
+++ b/tutorial/src/progressbin/imp.rs
@@ -64,7 +64,7 @@ impl ObjectSubclass for ProgressBin {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate.
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     // Called when a new instance is to be created. We need to return an instance
     // of our struct here and also get the class struct passed in case it's needed
diff --git a/tutorial/src/progressbin/mod.rs b/tutorial/src/progressbin/mod.rs
index 51551b64..d4f940f7 100644
--- a/tutorial/src/progressbin/mod.rs
+++ b/tutorial/src/progressbin/mod.rs
@@ -30,7 +30,7 @@ pub enum ProgressBinOutput {
 }
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct ProgressBin(ObjectSubclass<imp::ProgressBin>) @extends gst::Bin, gst::Element, gst::Object;
 }
 
diff --git a/tutorial/src/rgb2gray/imp.rs b/tutorial/src/rgb2gray/imp.rs
index 17f2a61e..03e07b3b 100644
--- a/tutorial/src/rgb2gray/imp.rs
+++ b/tutorial/src/rgb2gray/imp.rs
@@ -122,7 +122,7 @@ impl ObjectSubclass for Rgb2Gray {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     // Called when a new instance is to be created. We need to return an instance
     // of our struct here.
diff --git a/tutorial/src/rgb2gray/mod.rs b/tutorial/src/rgb2gray/mod.rs
index 0500f7d6..988904d7 100644
--- a/tutorial/src/rgb2gray/mod.rs
+++ b/tutorial/src/rgb2gray/mod.rs
@@ -11,7 +11,7 @@ use glib::prelude::*;
 mod imp;
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Rgb2Gray(ObjectSubclass<imp::Rgb2Gray>) @extends gst_base::BaseTransform, gst::Element, gst::Object;
 }
 
diff --git a/tutorial/src/sinesrc/imp.rs b/tutorial/src/sinesrc/imp.rs
index 3a6f79d7..fcfcb4b9 100644
--- a/tutorial/src/sinesrc/imp.rs
+++ b/tutorial/src/sinesrc/imp.rs
@@ -207,7 +207,7 @@ impl ObjectSubclass for SineSrc {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate.
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     // Called when a new instance is to be created. We need to return an instance
     // of our struct here.
diff --git a/tutorial/src/sinesrc/mod.rs b/tutorial/src/sinesrc/mod.rs
index 4d9af02c..8e396499 100644
--- a/tutorial/src/sinesrc/mod.rs
+++ b/tutorial/src/sinesrc/mod.rs
@@ -11,7 +11,7 @@ use glib::prelude::*;
 mod imp;
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct SineSrc(ObjectSubclass<imp::SineSrc>) @extends gst_base::BaseSrc, gst::Element, gst::Object;
 }
 
diff --git a/tutorial/tutorial-1.md b/tutorial/tutorial-1.md
index 91dd11da..efbc33e9 100644
--- a/tutorial/tutorial-1.md
+++ b/tutorial/tutorial-1.md
@@ -175,7 +175,7 @@ impl ObjectSubclass for Rgb2Gray {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {}
@@ -198,7 +198,7 @@ use glib::prelude::*;
 mod imp;
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Rgb2Gray(ObjectSubclass<imp::Rgb2Gray>) @extends gst_base::BaseTransform, gst::Element, gst::Object;
 }
 
@@ -290,7 +290,7 @@ impl ObjectSubclass for Rgb2Gray {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 }
 
 impl ObjectImpl for Rgb2Gray {}
@@ -305,7 +305,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Rgb2Gray(ObjectSubclass<imp::Rgb2Gray>) @extends gst_base::BaseTransform, gst::Element, gst::Object;
 }
 
diff --git a/tutorial/tutorial-2.md b/tutorial/tutorial-2.md
index 8bc1a548..4e8a20b8 100644
--- a/tutorial/tutorial-2.md
+++ b/tutorial/tutorial-2.md
@@ -154,7 +154,7 @@ impl ObjectSubclass for SineSrc {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate.
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     // Called when a new instance is to be created. We need to return an instance
     // of our struct here.
@@ -380,7 +380,7 @@ use glib::prelude::*;
 mod imp;
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct SineSrc(ObjectSubclass<imp::SineSrc>) @extends gst_base::BaseSrc, gst::Element, gst::Object;
 }
 
diff --git a/utils/fallbackswitch/src/base/auto/aggregator.rs b/utils/fallbackswitch/src/base/auto/aggregator.rs
index 70a924ad..f100f5fa 100644
--- a/utils/fallbackswitch/src/base/auto/aggregator.rs
+++ b/utils/fallbackswitch/src/base/auto/aggregator.rs
@@ -13,7 +13,7 @@ use glib::Value;
 use std::boxed::Box as Box_;
 use std::mem::transmute;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Aggregator(Object<ffi::GstAggregator, ffi::GstAggregatorClass>) @extends gst::Element, gst::Object;
 
     match fn {
diff --git a/utils/fallbackswitch/src/base/auto/aggregator_pad.rs b/utils/fallbackswitch/src/base/auto/aggregator_pad.rs
index 54c25bae..8f1b2f42 100644
--- a/utils/fallbackswitch/src/base/auto/aggregator_pad.rs
+++ b/utils/fallbackswitch/src/base/auto/aggregator_pad.rs
@@ -13,7 +13,7 @@ use glib::Value;
 use std::boxed::Box as Box_;
 use std::mem::transmute;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct AggregatorPad(Object<ffi::GstAggregatorPad, ffi::GstAggregatorPadClass>) @extends gst::Pad, gst::Object;
 
     match fn {
diff --git a/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs b/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs
index 9b698701..03c2e82a 100644
--- a/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs
+++ b/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs
@@ -70,7 +70,7 @@ impl ObjectSubclass for CustomSource {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {
diff --git a/utils/fallbackswitch/src/fallbacksrc/custom_source/mod.rs b/utils/fallbackswitch/src/fallbacksrc/custom_source/mod.rs
index 470c49a0..a43c263c 100644
--- a/utils/fallbackswitch/src/fallbacksrc/custom_source/mod.rs
+++ b/utils/fallbackswitch/src/fallbacksrc/custom_source/mod.rs
@@ -17,7 +17,7 @@
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct CustomSource(ObjectSubclass<imp::CustomSource>) @extends gst::Bin, gst::Element, gst::Object;
 }
 
diff --git a/utils/fallbackswitch/src/fallbacksrc/imp.rs b/utils/fallbackswitch/src/fallbacksrc/imp.rs
index f1ce0d35..b425b939 100644
--- a/utils/fallbackswitch/src/fallbacksrc/imp.rs
+++ b/utils/fallbackswitch/src/fallbacksrc/imp.rs
@@ -311,7 +311,7 @@ impl ObjectSubclass for FallbackSrc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {
diff --git a/utils/fallbackswitch/src/fallbacksrc/mod.rs b/utils/fallbackswitch/src/fallbacksrc/mod.rs
index 4c2f8afc..1d155911 100644
--- a/utils/fallbackswitch/src/fallbacksrc/mod.rs
+++ b/utils/fallbackswitch/src/fallbacksrc/mod.rs
@@ -42,7 +42,7 @@ enum Status {
     Running,
 }
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct FallbackSrc(ObjectSubclass<imp::FallbackSrc>) @extends gst::Bin, gst::Element, gst::Object;
 }
 
diff --git a/utils/fallbackswitch/src/fallbacksrc/video_fallback/imp.rs b/utils/fallbackswitch/src/fallbacksrc/video_fallback/imp.rs
index 65ae1f56..2bf79e51 100644
--- a/utils/fallbackswitch/src/fallbacksrc/video_fallback/imp.rs
+++ b/utils/fallbackswitch/src/fallbacksrc/video_fallback/imp.rs
@@ -92,7 +92,7 @@ impl ObjectSubclass for VideoFallbackSource {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("src").unwrap();
diff --git a/utils/fallbackswitch/src/fallbacksrc/video_fallback/mod.rs b/utils/fallbackswitch/src/fallbacksrc/video_fallback/mod.rs
index b6b747f8..2577d7b5 100644
--- a/utils/fallbackswitch/src/fallbacksrc/video_fallback/mod.rs
+++ b/utils/fallbackswitch/src/fallbacksrc/video_fallback/mod.rs
@@ -18,7 +18,7 @@
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct VideoFallbackSource(ObjectSubclass<imp::VideoFallbackSource>) @extends gst::Bin, gst::Element, gst::Object;
 }
 
diff --git a/utils/fallbackswitch/src/fallbackswitch/imp.rs b/utils/fallbackswitch/src/fallbackswitch/imp.rs
index 13b3910e..f6e6a227 100644
--- a/utils/fallbackswitch/src/fallbackswitch/imp.rs
+++ b/utils/fallbackswitch/src/fallbackswitch/imp.rs
@@ -698,7 +698,7 @@ impl ObjectSubclass for FallbackSwitch {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();
diff --git a/utils/fallbackswitch/src/fallbackswitch/mod.rs b/utils/fallbackswitch/src/fallbackswitch/mod.rs
index 44b07475..e44e48a3 100644
--- a/utils/fallbackswitch/src/fallbackswitch/mod.rs
+++ b/utils/fallbackswitch/src/fallbackswitch/mod.rs
@@ -22,7 +22,7 @@ use crate::gst_base_compat as gst_base;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct FallbackSwitch(ObjectSubclass<imp::FallbackSwitch>) @extends gst_base::Aggregator, gst::Element, gst::Object;
 }
 
diff --git a/utils/togglerecord/src/togglerecord/imp.rs b/utils/togglerecord/src/togglerecord/imp.rs
index da9981dd..d7aabaf7 100644
--- a/utils/togglerecord/src/togglerecord/imp.rs
+++ b/utils/togglerecord/src/togglerecord/imp.rs
@@ -1559,7 +1559,7 @@ impl ObjectSubclass for ToggleRecord {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();
diff --git a/utils/togglerecord/src/togglerecord/mod.rs b/utils/togglerecord/src/togglerecord/mod.rs
index d2894dde..382aa04e 100644
--- a/utils/togglerecord/src/togglerecord/mod.rs
+++ b/utils/togglerecord/src/togglerecord/mod.rs
@@ -19,7 +19,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct ToggleRecord(ObjectSubclass<imp::ToggleRecord>) @extends gst::Element, gst::Object;
 }
 
diff --git a/video/cdg/src/cdgdec/imp.rs b/video/cdg/src/cdgdec/imp.rs
index da43e502..9bc70e3b 100644
--- a/video/cdg/src/cdgdec/imp.rs
+++ b/video/cdg/src/cdgdec/imp.rs
@@ -35,7 +35,7 @@ impl ObjectSubclass for CdgDec {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {
diff --git a/video/cdg/src/cdgdec/mod.rs b/video/cdg/src/cdgdec/mod.rs
index 54ad3ed7..6e2e4e37 100644
--- a/video/cdg/src/cdgdec/mod.rs
+++ b/video/cdg/src/cdgdec/mod.rs
@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct CdgDec(ObjectSubclass<imp::CdgDec>) @extends gst_video::VideoDecoder, gst::Element, gst::Object;
 }
 
diff --git a/video/cdg/src/cdgparse/imp.rs b/video/cdg/src/cdgparse/imp.rs
index f4928638..d5ee0f44 100644
--- a/video/cdg/src/cdgparse/imp.rs
+++ b/video/cdg/src/cdgparse/imp.rs
@@ -42,7 +42,7 @@ impl ObjectSubclass for CdgParse {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self
diff --git a/video/cdg/src/cdgparse/mod.rs b/video/cdg/src/cdgparse/mod.rs
index b5e594d9..e1cf77f9 100644
--- a/video/cdg/src/cdgparse/mod.rs
+++ b/video/cdg/src/cdgparse/mod.rs
@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct CdgParse(ObjectSubclass<imp::CdgParse>) @extends gst_base::BaseParse, gst::Element, gst::Object;
 }
 
diff --git a/video/closedcaption/src/ccdetect/imp.rs b/video/closedcaption/src/ccdetect/imp.rs
index 5ac43309..1e95b7df 100644
--- a/video/closedcaption/src/ccdetect/imp.rs
+++ b/video/closedcaption/src/ccdetect/imp.rs
@@ -390,7 +390,7 @@ impl ObjectSubclass for CCDetect {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {
diff --git a/video/closedcaption/src/ccdetect/mod.rs b/video/closedcaption/src/ccdetect/mod.rs
index 681ec6ff..609609c0 100644
--- a/video/closedcaption/src/ccdetect/mod.rs
+++ b/video/closedcaption/src/ccdetect/mod.rs
@@ -19,7 +19,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct CCDetect(ObjectSubclass<imp::CCDetect>) @extends gst_base::BaseTransform, gst::Element, gst::Object;
 }
 
diff --git a/video/closedcaption/src/cea608overlay/imp.rs b/video/closedcaption/src/cea608overlay/imp.rs
index 98459b0b..526cc1ae 100644
--- a/video/closedcaption/src/cea608overlay/imp.rs
+++ b/video/closedcaption/src/cea608overlay/imp.rs
@@ -391,7 +391,7 @@ impl ObjectSubclass for Cea608Overlay {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();
diff --git a/video/closedcaption/src/cea608overlay/mod.rs b/video/closedcaption/src/cea608overlay/mod.rs
index ca84bdd4..21605866 100644
--- a/video/closedcaption/src/cea608overlay/mod.rs
+++ b/video/closedcaption/src/cea608overlay/mod.rs
@@ -25,7 +25,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Cea608Overlay(ObjectSubclass<imp::Cea608Overlay>) @extends gst::Element, gst::Object;
 }
 
diff --git a/video/closedcaption/src/cea608tott/imp.rs b/video/closedcaption/src/cea608tott/imp.rs
index fca410e6..b32745e4 100644
--- a/video/closedcaption/src/cea608tott/imp.rs
+++ b/video/closedcaption/src/cea608tott/imp.rs
@@ -378,7 +378,7 @@ impl ObjectSubclass for Cea608ToTt {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();
diff --git a/video/closedcaption/src/cea608tott/mod.rs b/video/closedcaption/src/cea608tott/mod.rs
index 8690033f..f825453b 100644
--- a/video/closedcaption/src/cea608tott/mod.rs
+++ b/video/closedcaption/src/cea608tott/mod.rs
@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Cea608ToTt(ObjectSubclass<imp::Cea608ToTt>) @extends gst::Element, gst::Object;
 }
 
diff --git a/video/closedcaption/src/mcc_enc/imp.rs b/video/closedcaption/src/mcc_enc/imp.rs
index 786d52c0..d38fe373 100644
--- a/video/closedcaption/src/mcc_enc/imp.rs
+++ b/video/closedcaption/src/mcc_enc/imp.rs
@@ -473,7 +473,7 @@ impl ObjectSubclass for MccEnc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();
diff --git a/video/closedcaption/src/mcc_enc/mod.rs b/video/closedcaption/src/mcc_enc/mod.rs
index 6bb606ea..8689e0ed 100644
--- a/video/closedcaption/src/mcc_enc/mod.rs
+++ b/video/closedcaption/src/mcc_enc/mod.rs
@@ -20,7 +20,7 @@ use glib::prelude::*;
 mod headers;
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct MccEnc(ObjectSubclass<imp::MccEnc>) @extends gst::Element, gst::Object;
 }
 
diff --git a/video/closedcaption/src/mcc_parse/imp.rs b/video/closedcaption/src/mcc_parse/imp.rs
index cf38e89f..4d7267e4 100644
--- a/video/closedcaption/src/mcc_parse/imp.rs
+++ b/video/closedcaption/src/mcc_parse/imp.rs
@@ -1134,7 +1134,7 @@ impl ObjectSubclass for MccParse {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();
diff --git a/video/closedcaption/src/mcc_parse/mod.rs b/video/closedcaption/src/mcc_parse/mod.rs
index 7bf4d45b..1f5a6ed0 100644
--- a/video/closedcaption/src/mcc_parse/mod.rs
+++ b/video/closedcaption/src/mcc_parse/mod.rs
@@ -20,7 +20,7 @@ use glib::prelude::*;
 mod imp;
 mod parser;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct MccParse(ObjectSubclass<imp::MccParse>) @extends gst::Element, gst::Object;
 }
 
diff --git a/video/closedcaption/src/scc_enc/imp.rs b/video/closedcaption/src/scc_enc/imp.rs
index 20c86c9b..d7c1c248 100644
--- a/video/closedcaption/src/scc_enc/imp.rs
+++ b/video/closedcaption/src/scc_enc/imp.rs
@@ -340,7 +340,7 @@ impl ObjectSubclass for SccEnc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();
diff --git a/video/closedcaption/src/scc_enc/mod.rs b/video/closedcaption/src/scc_enc/mod.rs
index ac215456..9eb34044 100644
--- a/video/closedcaption/src/scc_enc/mod.rs
+++ b/video/closedcaption/src/scc_enc/mod.rs
@@ -20,7 +20,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct SccEnc(ObjectSubclass<imp::SccEnc>) @extends gst::Element, gst::Object;
 }
 
diff --git a/video/closedcaption/src/scc_parse/imp.rs b/video/closedcaption/src/scc_parse/imp.rs
index 3c585b05..35774e86 100644
--- a/video/closedcaption/src/scc_parse/imp.rs
+++ b/video/closedcaption/src/scc_parse/imp.rs
@@ -1003,7 +1003,7 @@ impl ObjectSubclass for SccParse {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();
diff --git a/video/closedcaption/src/scc_parse/mod.rs b/video/closedcaption/src/scc_parse/mod.rs
index 05067d6e..362a93e9 100644
--- a/video/closedcaption/src/scc_parse/mod.rs
+++ b/video/closedcaption/src/scc_parse/mod.rs
@@ -21,7 +21,7 @@ use glib::prelude::*;
 mod imp;
 mod parser;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct SccParse(ObjectSubclass<imp::SccParse>) @extends gst::Element, gst::Object;
 }
 
diff --git a/video/closedcaption/src/tttocea608/imp.rs b/video/closedcaption/src/tttocea608/imp.rs
index db468e50..3c42efeb 100644
--- a/video/closedcaption/src/tttocea608/imp.rs
+++ b/video/closedcaption/src/tttocea608/imp.rs
@@ -790,7 +790,7 @@ impl ObjectSubclass for TtToCea608 {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();
diff --git a/video/closedcaption/src/tttocea608/mod.rs b/video/closedcaption/src/tttocea608/mod.rs
index e9004fea..5670ae4d 100644
--- a/video/closedcaption/src/tttocea608/mod.rs
+++ b/video/closedcaption/src/tttocea608/mod.rs
@@ -29,7 +29,7 @@ enum Mode {
     RollUp4,
 }
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct TtToCea608(ObjectSubclass<imp::TtToCea608>) @extends gst::Element, gst::Object;
 }
 
diff --git a/video/dav1d/src/dav1ddec/imp.rs b/video/dav1d/src/dav1ddec/imp.rs
index 0e43ab2f..d56d510f 100644
--- a/video/dav1d/src/dav1ddec/imp.rs
+++ b/video/dav1d/src/dav1ddec/imp.rs
@@ -352,7 +352,7 @@ impl ObjectSubclass for Dav1dDec {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {
diff --git a/video/dav1d/src/dav1ddec/mod.rs b/video/dav1d/src/dav1ddec/mod.rs
index 2576c237..efe7c32a 100644
--- a/video/dav1d/src/dav1ddec/mod.rs
+++ b/video/dav1d/src/dav1ddec/mod.rs
@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Dav1dDec(ObjectSubclass<imp::Dav1dDec>) @extends gst_video::VideoDecoder, gst::Element, gst::Object;
 }
 
diff --git a/video/flavors/src/flvdemux/imp.rs b/video/flavors/src/flvdemux/imp.rs
index 26efd05d..5a09d485 100644
--- a/video/flavors/src/flvdemux/imp.rs
+++ b/video/flavors/src/flvdemux/imp.rs
@@ -129,7 +129,7 @@ impl ObjectSubclass for FlvDemux {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();
diff --git a/video/flavors/src/flvdemux/mod.rs b/video/flavors/src/flvdemux/mod.rs
index dc1e341d..b27abffa 100644
--- a/video/flavors/src/flvdemux/mod.rs
+++ b/video/flavors/src/flvdemux/mod.rs
@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct FlvDemux(ObjectSubclass<imp::FlvDemux>) @extends gst::Element, gst::Object;
 }
 
diff --git a/video/gif/src/gifenc/imp.rs b/video/gif/src/gifenc/imp.rs
index e6b4598e..ad9cfc8d 100644
--- a/video/gif/src/gifenc/imp.rs
+++ b/video/gif/src/gifenc/imp.rs
@@ -149,7 +149,7 @@ impl ObjectSubclass for GifEnc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {
diff --git a/video/gif/src/gifenc/mod.rs b/video/gif/src/gifenc/mod.rs
index e53d2b1c..8fc9da5b 100644
--- a/video/gif/src/gifenc/mod.rs
+++ b/video/gif/src/gifenc/mod.rs
@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct GifEnc(ObjectSubclass<imp::GifEnc>) @extends gst_video::VideoEncoder, gst::Element, gst::Object;
 }
 
diff --git a/video/rav1e/src/rav1enc/imp.rs b/video/rav1e/src/rav1enc/imp.rs
index f28bd99e..105ddfd6 100644
--- a/video/rav1e/src/rav1enc/imp.rs
+++ b/video/rav1e/src/rav1enc/imp.rs
@@ -303,7 +303,7 @@ impl ObjectSubclass for Rav1Enc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {
diff --git a/video/rav1e/src/rav1enc/mod.rs b/video/rav1e/src/rav1enc/mod.rs
index a4cc4089..409c59d0 100644
--- a/video/rav1e/src/rav1enc/mod.rs
+++ b/video/rav1e/src/rav1enc/mod.rs
@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Rav1Enc(ObjectSubclass<imp::Rav1Enc>) @extends gst_video::VideoEncoder, gst::Element, gst::Object;
 }
 
diff --git a/video/rspng/src/pngenc/imp.rs b/video/rspng/src/pngenc/imp.rs
index 6a4abb8d..33adbbe6 100644
--- a/video/rspng/src/pngenc/imp.rs
+++ b/video/rspng/src/pngenc/imp.rs
@@ -8,7 +8,6 @@
 
 use std::{io, io::Write, sync::Arc};
 
-use glib::glib_object_subclass;
 use glib::subclass;
 use glib::subclass::prelude::*;
 
@@ -196,7 +195,7 @@ impl ObjectSubclass for PngEncoder {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {
diff --git a/video/rspng/src/pngenc/mod.rs b/video/rspng/src/pngenc/mod.rs
index c0004022..c5a1d878 100644
--- a/video/rspng/src/pngenc/mod.rs
+++ b/video/rspng/src/pngenc/mod.rs
@@ -7,7 +7,7 @@
 // except according to those terms.
 
 use glib::prelude::*;
-use glib::{glib_wrapper, GEnum};
+use glib::GEnum;
 
 mod imp;
 
@@ -79,7 +79,7 @@ impl From<FilterType> for png::FilterType {
     }
 }
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct PngEncoder(ObjectSubclass<imp::PngEncoder>) @extends gst_video::VideoEncoder, gst::Element, gst::Object;
 }