diff --git a/gstreamer-base/src/aggregator.rs b/gstreamer-base/src/aggregator.rs
index f4cf2c23d..0848b7a99 100644
--- a/gstreamer-base/src/aggregator.rs
+++ b/gstreamer-base/src/aggregator.rs
@@ -33,16 +33,18 @@ pub trait AggregatorExtManual: 'static {
 
     #[cfg(any(feature = "v1_16", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))]
-    #[doc(alias = "get_property_min_upstream_latency")]
+    #[doc(alias = "min-upstream-latency")]
     fn min_upstream_latency(&self) -> gst::ClockTime;
 
     #[cfg(any(feature = "v1_16", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))]
+    #[doc(alias = "min-upstream-latency")]
     fn set_min_upstream_latency(&self, min_upstream_latency: gst::ClockTime);
 
     #[cfg(any(feature = "v1_16", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))]
-    fn connect_property_min_upstream_latency_notify<F: Fn(&Self) + Send + Sync + 'static>(
+    #[doc(alias = "min-upstream-latency")]
+    fn connect_min_upstream_latency_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId;
@@ -151,7 +153,7 @@ impl<O: IsA<Aggregator>> AggregatorExtManual for O {
 
     #[cfg(any(feature = "v1_16", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))]
-    fn connect_property_min_upstream_latency_notify<F: Fn(&Self) + Send + Sync + 'static>(
+    fn connect_min_upstream_latency_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
diff --git a/gstreamer-pbutils/src/discoverer.rs b/gstreamer-pbutils/src/discoverer.rs
index ebd3bbdc6..a8eb6bb12 100644
--- a/gstreamer-pbutils/src/discoverer.rs
+++ b/gstreamer-pbutils/src/discoverer.rs
@@ -12,7 +12,7 @@ use std::boxed::Box as Box_;
 use std::mem::transmute;
 
 impl Discoverer {
-    pub fn set_property_timeout(&self, timeout: gst::ClockTime) {
+    pub fn set_timeout(&self, timeout: gst::ClockTime) {
         unsafe {
             glib::gobject_ffi::g_object_set_property(
                 self.as_ptr() as *mut _,
@@ -22,8 +22,7 @@ impl Discoverer {
         }
     }
 
-    #[doc(alias = "get_property_timeout")]
-    pub fn property_timeout(&self) -> gst::ClockTime {
+    pub fn timeout(&self) -> gst::ClockTime {
         let mut value = Value::from(&0u64);
         unsafe {
             glib::gobject_ffi::g_object_get_property(
@@ -35,7 +34,8 @@ impl Discoverer {
         value.get().expect("Discoverer::get_property_timeout")
     }
 
-    pub fn connect_property_timeout_notify<F: Fn(&Self) + Send + Sync + 'static>(
+    #[doc(alias = "timeout")]
+    pub fn connect_timeout_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {