diff --git a/gdk/gdkclipboard.c b/gdk/gdkclipboard.c
index 87b57b0ffe..bb8735473e 100644
--- a/gdk/gdkclipboard.c
+++ b/gdk/gdkclipboard.c
@@ -378,7 +378,7 @@ gdk_clipboard_class_init (GdkClipboardClass *class)
                         G_PARAM_EXPLICIT_NOTIFY);
 
   /**
-   * GdkClipboard:local: (attributes org.gtk.Property.get=gdk_clipboard_is_local)
+   * GdkClipboard:local: (getter is_local)
    *
    * %TRUE if the contents of the clipboard are owned by this process.
    */
@@ -465,7 +465,7 @@ gdk_clipboard_get_formats (GdkClipboard *clipboard)
 }
 
 /**
- * gdk_clipboard_is_local: (attributes org.gtk.Method.get_property=local)
+ * gdk_clipboard_is_local: (get-property local)
  * @clipboard: a `GdkClipboard`
  *
  * Returns if the clipboard is local.
diff --git a/gdk/gdkcontentprovider.c b/gdk/gdkcontentprovider.c
index 846e0a09ce..99e45426ee 100644
--- a/gdk/gdkcontentprovider.c
+++ b/gdk/gdkcontentprovider.c
@@ -169,7 +169,7 @@ gdk_content_provider_class_init (GdkContentProviderClass *class)
   class->get_value = gdk_content_provider_real_get_value;
 
   /**
-   * GdkContentProvider:formats: (attributes org.gtk.Property.get=gdk_content_provider_ref_formats)
+   * GdkContentProvider:formats: (getter ref_formats)
    *
    * The possible formats that the provider can provide its data in.
    */
@@ -181,7 +181,7 @@ gdk_content_provider_class_init (GdkContentProviderClass *class)
                         G_PARAM_EXPLICIT_NOTIFY);
 
   /**
-   * GdkContentProvider:storable-formats: (attributes org.gtk.Property.get=gdk_content_provider_ref_storable_formats)
+   * GdkContentProvider:storable-formats: (getter ref_storable_formats)
    *
    * The subset of formats that clipboard managers should store this provider's data in.
    */
@@ -214,7 +214,7 @@ gdk_content_provider_init (GdkContentProvider *provider)
 }
 
 /**
- * gdk_content_provider_ref_formats: (attributes org.gtk.Method.get_property=formats)
+ * gdk_content_provider_ref_formats: (get-property formats)
  * @provider: a `GdkContentProvider`
  *
  * Gets the formats that the provider can provide its current contents in.
@@ -230,7 +230,7 @@ gdk_content_provider_ref_formats (GdkContentProvider *provider)
 }
 
 /**
- * gdk_content_provider_ref_storable_formats: (attributes org.gtk.Method.get_property=storable-formats)
+ * gdk_content_provider_ref_storable_formats: (get-property storable-formats)
  * @provider: a `GdkContentProvider`
  *
  * Gets the formats that the provider suggests other applications to store
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index 656cd1d64f..c43ad6b39b 100644
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -211,7 +211,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                          G_PARAM_STATIC_STRINGS);
 
   /**
-   * GdkDevice:tool: (attributes org.gtk.Property.get=gdk_device_get_device_tool)
+   * GdkDevice:tool: (getter get_device_tool)
    *
    * The `GdkDeviceTool` that is currently used with this device.
    */
@@ -1202,7 +1202,7 @@ gdk_device_get_num_touches (GdkDevice *device)
 }
 
 /**
- * gdk_device_get_device_tool: (attributes org.gtk.Method.get_property=tool)
+ * gdk_device_get_device_tool: (get-property tool)
  * @device: a `GdkDevice`
  *
  * Retrieves the current tool for @device.
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index dac1c77027..c681de590b 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -230,7 +230,7 @@ gdk_display_class_init (GdkDisplayClass *class)
   class->opened = gdk_display_real_opened;
 
   /**
-   * GdkDisplay:composited: (attributes org.gtk.Property.get=gdk_display_is_composited)
+   * GdkDisplay:composited: (getter is_composited)
    *
    * %TRUE if the display properly composites the alpha channel.
    */
@@ -240,7 +240,7 @@ gdk_display_class_init (GdkDisplayClass *class)
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
   /**
-   * GdkDisplay:rgba: (attributes org.gtk.Property.get=gdk_display_is_rgba)
+   * GdkDisplay:rgba: (getter is_rgba)
    *
    * %TRUE if the display supports an alpha channel.
    */
@@ -250,7 +250,7 @@ gdk_display_class_init (GdkDisplayClass *class)
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
   /**
-   * GdkDisplay:shadow-width: (attributes org.gtk.Property.get=gdk_display_supports_shadow_width)
+   * GdkDisplay:shadow-width: (getter supports_shadow_width)
    *
    * %TRUE if the display supports extensible frames.
    *
@@ -262,7 +262,7 @@ gdk_display_class_init (GdkDisplayClass *class)
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
   /**
-   * GdkDisplay:input-shapes: (attributes org.gtk.Property.get=gdk_display_supports_input_shapes)
+   * GdkDisplay:input-shapes: (getter supports_input_shapes)
    *
    * %TRUE if the display supports input shapes.
    */
@@ -1116,7 +1116,7 @@ gdk_display_get_primary_clipboard (GdkDisplay *display)
 }
 
 /**
- * gdk_display_supports_input_shapes: (attributes org.gtk.Method.get_property=input-shapes)
+ * gdk_display_supports_input_shapes: (get-property input-shapes)
  * @display: a `GdkDisplay`
  *
  * Returns %TRUE if the display supports input shapes.
@@ -2075,7 +2075,7 @@ gdk_display_set_debug_flags (GdkDisplay    *display,
 }
 
 /**
- * gdk_display_is_composited: (attributes org.gtk.Method.get_property=composited)
+ * gdk_display_is_composited: (get-property composited)
  * @display: a `GdkDisplay`
  *
  * Returns whether surfaces can reasonably be expected to have
@@ -2120,7 +2120,7 @@ gdk_display_set_composited (GdkDisplay *display,
 }
 
 /**
- * gdk_display_is_rgba: (attributes org.gtk.Method.get_property=rgba)
+ * gdk_display_is_rgba: (get-property rgba)
  * @display: a `GdkDisplay`
  *
  * Returns whether surfaces on this @display are created with an
@@ -2165,7 +2165,7 @@ gdk_display_set_rgba (GdkDisplay *display,
 }
 
 /**
- * gdk_display_supports_shadow_width: (attributes org.gtk.Method.get_property=shadow-width)
+ * gdk_display_supports_shadow_width: (get-property shadow-width)
  * @display: a `GdkDisplay`
  *
  * Returns whether it's possible for a surface to draw outside of the window area.
diff --git a/gdk/gdkmonitor.c b/gdk/gdkmonitor.c
index e4c6b97c94..89ca43480c 100644
--- a/gdk/gdkmonitor.c
+++ b/gdk/gdkmonitor.c
@@ -319,7 +319,7 @@ gdk_monitor_class_init (GdkMonitorClass *class)
                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
   /**
-   * GdkMonitor:valid: (attributes org.gtk.Property.get=gdk_monitor_is_valid)
+   * GdkMonitor:valid: (getter is_valid)
    *
    * Whether the object is still valid.
    */
@@ -696,7 +696,7 @@ gdk_monitor_invalidate (GdkMonitor *monitor)
 }
 
 /**
- * gdk_monitor_is_valid: (attributes org.gtk.Method.get_property=valid)
+ * gdk_monitor_is_valid: (get-property valid)
  * @monitor: a `GdkMonitor`
  *
  * Returns %TRUE if the @monitor object corresponds to a
diff --git a/gsk/gskrenderer.c b/gsk/gskrenderer.c
index 8535acd7dd..79c93653c3 100644
--- a/gsk/gskrenderer.c
+++ b/gsk/gskrenderer.c
@@ -189,7 +189,7 @@ gsk_renderer_class_init (GskRendererClass *klass)
   gobject_class->dispose = gsk_renderer_dispose;
 
   /**
-   * GskRenderer:realized: (attributes org.gtk.Property.get=gsk_renderer_is_realized)
+   * GskRenderer:realized: (getter is_realized)
    *
    * Whether the renderer has been associated with a surface or draw context.
    */
@@ -241,7 +241,7 @@ gsk_renderer_get_surface (GskRenderer *renderer)
 }
 
 /**
- * gsk_renderer_is_realized: (attributes org.gtk.Method.get_property=realized)
+ * gsk_renderer_is_realized: (get-property realized)
  * @renderer: a `GskRenderer`
  *
  * Checks whether the @renderer is realized or not.
diff --git a/gtk/gtkactionable.c b/gtk/gtkactionable.c
index 56ec2a9ba8..b6798382eb 100644
--- a/gtk/gtkactionable.c
+++ b/gtk/gtkactionable.c
@@ -123,7 +123,7 @@ gtk_actionable_set_action_name (GtkActionable *actionable,
 }
 
 /**
- * gtk_actionable_get_action_target_value: (attributes org.gtk.Method.get_property=action-target)
+ * gtk_actionable_get_action_target_value: (get-property action-target)
  * @actionable: a `GtkActionable` widget
  *
  * Gets the current target value of @actionable.
@@ -140,7 +140,7 @@ gtk_actionable_get_action_target_value (GtkActionable *actionable)
 }
 
 /**
- * gtk_actionable_set_action_target_value: (attributes org.gtk.Method.set_property=action-target)
+ * gtk_actionable_set_action_target_value: (set-property action-target)
  * @actionable: a `GtkActionable` widget
  * @target_value: (nullable): a [struct@GLib.Variant] to set as the target value
  *
diff --git a/gtk/gtkbookmarklist.c b/gtk/gtkbookmarklist.c
index 7d3e6ba2c5..e013e7d5d8 100644
--- a/gtk/gtkbookmarklist.c
+++ b/gtk/gtkbookmarklist.c
@@ -259,7 +259,7 @@ gtk_bookmark_list_class_init (GtkBookmarkListClass *class)
                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
   /**
-   * GtkBookmarkList:loading: (attributes org.gtk.Property.get=gtk_bookmark_list_is_loading)
+   * GtkBookmarkList:loading: (getter is_loading)
    *
    * %TRUE if files are being loaded.
    */
@@ -596,7 +596,7 @@ gtk_bookmark_list_get_io_priority (GtkBookmarkList *self)
 }
 
 /**
- * gtk_bookmark_list_is_loading: (attributes org.gtk.Method.get_property=loading)
+ * gtk_bookmark_list_is_loading: (get-property loading)
  * @self: a `GtkBookmarkList`
  *
  * Returns %TRUE if the files are currently being loaded.
diff --git a/gtk/gtkdirectorylist.c b/gtk/gtkdirectorylist.c
index 8debd2f423..518a1e6857 100644
--- a/gtk/gtkdirectorylist.c
+++ b/gtk/gtkdirectorylist.c
@@ -335,7 +335,7 @@ gtk_directory_list_class_init (GtkDirectoryListClass *class)
                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
   /**
-   * GtkDirectoryList:loading: (attributes org.gtk.Property.get=gtk_directory_list_is_loading)
+   * GtkDirectoryList:loading: (getter is_loading)
    *
    * %TRUE if files are being loaded.
    */
@@ -950,7 +950,7 @@ gtk_directory_list_get_io_priority (GtkDirectoryList *self)
 }
 
 /**
- * gtk_directory_list_is_loading: (attributes org.gtk.Method.get_property=loading)
+ * gtk_directory_list_is_loading: (get-property loading)
  * @self: a `GtkDirectoryList`
  *
  * Returns %TRUE if the children enumeration is currently in
diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c
index bf195bb5f4..2c1d7650f9 100644
--- a/gtk/gtkeditable.c
+++ b/gtk/gtkeditable.c
@@ -384,7 +384,7 @@ gtk_editable_default_init (GtkEditableInterface *iface)
                            GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
 
   /**
-   * GtkEditable:cursor-position: (attributes org.gtk.Property.get=gtk_editable_get_position org.gtk.Property.set=gtk_editable_set_position)
+   * GtkEditable:cursor-position: (getter get_position) (setter set_position)
    *
    * The current position of the insertion cursor in chars.
    */
@@ -448,7 +448,7 @@ gtk_editable_default_init (GtkEditableInterface *iface)
                         GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
 
   /**
-   * GtkEditable:xalign: (attributes org.gtk.Property.get=gtk_editable_get_alignment org.gtk.Property.set=gtk_editable_set_alignment)
+   * GtkEditable:xalign: (getter get_alignment) (setter set_alignment)
    *
    * The horizontal alignment, from 0 (left) to 1 (right).
    *
@@ -613,7 +613,7 @@ gtk_editable_set_text (GtkEditable *editable,
 }
 
 /**
- * gtk_editable_set_position: (attributes org.gtk.Method.set_property=cursor-position)
+ * gtk_editable_set_position: (set-property cursor-position)
  * @editable: a `GtkEditable`
  * @position: the position of the cursor
  *
@@ -635,7 +635,7 @@ gtk_editable_set_position (GtkEditable *editable,
 }
 
 /**
- * gtk_editable_get_position: (attributes org.gtk.Method.get_property=cursor-position)
+ * gtk_editable_get_position: (get-property cursor-position)
  * @editable: a `GtkEditable`
  *
  * Retrieves the current position of the cursor relative
@@ -776,7 +776,7 @@ gtk_editable_get_editable (GtkEditable *editable)
 
 
 /**
- * gtk_editable_get_alignment: (attributes org.gtk.Method.get_property=xalign)
+ * gtk_editable_get_alignment: (get-property xalign)
  * @editable: a `GtkEditable`
  *
  * Gets the alignment of the editable.
@@ -796,7 +796,7 @@ gtk_editable_get_alignment (GtkEditable *editable)
 }
 
 /**
- * gtk_editable_set_alignment: (attributes org.gtk.Method.set_property=xalign)
+ * gtk_editable_set_alignment: (set-property xalign)
  * @editable: a `GtkEditable`
  * @xalign: The horizontal alignment, from 0 (left) to 1 (right).
  *   Reversed for RTL layouts
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 661df4ac12..be16eb0261 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -174,7 +174,7 @@ gtk_frame_class_init (GtkFrameClass *class)
                            GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
 
   /**
-   * GtkFrame:label-xalign: (attributes org.gtk.Property.get=gtk_frame_get_label_align org.gtk.Property.set=gtk_frame_set_label_align)
+   * GtkFrame:label-xalign: (getter get_label_align) (setter set_label_align)
    *
    * The horizontal alignment of the label.
    */
@@ -456,7 +456,7 @@ gtk_frame_get_label_widget (GtkFrame *frame)
 }
 
 /**
- * gtk_frame_set_label_align: (attributes org.gtk.Method.set_property=label-xalign)
+ * gtk_frame_set_label_align: (set-property label-xalign)
  * @frame: a `GtkFrame`
  * @xalign: The position of the label along the top edge
  *   of the widget. A value of 0.0 represents left alignment;
@@ -484,7 +484,7 @@ gtk_frame_set_label_align (GtkFrame *frame,
 }
 
 /**
- * gtk_frame_get_label_align: (attributes org.gtk.Method.get_property=label-xalign)
+ * gtk_frame_get_label_align: (get-property label-xalign)
  * @frame: a `GtkFrame`
  *
  * Retrieves the X alignment of the frame’s label.
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index dc1174a38d..932ddfddf7 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3584,7 +3584,7 @@ gtk_icon_paintable_class_init (GtkIconPaintableClass *klass)
                                                         G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));
 
   /**
-   * GtkIconPaintable:is-symbolic: (attributes org.gtk.Property.get=gtk_icon_paintable_is_symbolic)
+   * GtkIconPaintable:is-symbolic: (getter is_symbolic)
    *
    * Whether the icon is symbolic or not.
    */
@@ -3659,7 +3659,7 @@ gtk_icon_paintable_get_icon_name (GtkIconPaintable *icon)
 }
 
 /**
- * gtk_icon_paintable_is_symbolic: (attributes org.gtk.Method.get_property=is-symbolic)
+ * gtk_icon_paintable_is_symbolic: (get-property is-symbolic)
  * @self: a `GtkIconPaintable`
  *
  * Checks if the icon is symbolic or not.
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index f0fc8f6fcb..0d7f663808 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -169,7 +169,7 @@ gtk_image_class_init (GtkImageClass *class)
   widget_class->system_setting_changed = gtk_image_system_setting_changed;
 
   /**
-   * GtkImage:paintable: (attributes org.gtk.Property.get=gtk_image_get_paintable org.gtk.Property.set=gtk_image_set_from_paintable)
+   * GtkImage:paintable: (getter get_paintable) (setter set_from_paintable)
    *
    * The `GdkPaintable` to display.
    */
@@ -215,7 +215,7 @@ gtk_image_class_init (GtkImageClass *class)
                         GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
 
   /**
-   * GtkImage:icon-name: (attributes org.gtk.Property.get=gtk_image_get_icon_name org.gtk.Property.set=gtk_image_set_from_icon_name)
+   * GtkImage:icon-name: (getter get_icon_name) (setter set_from_icon_name)
    *
    * The name of the icon in the icon theme.
    *
@@ -227,7 +227,7 @@ gtk_image_class_init (GtkImageClass *class)
                            GTK_PARAM_READWRITE);
 
   /**
-   * GtkImage:gicon: (attributes org.gtk.Property.get=gtk_image_get_gicon org.gtk.Property.set=gtk_image_set_from_gicon)
+   * GtkImage:gicon: (getter get_gicon) (setter set_from_gicon)
    *
    * The `GIcon` displayed in the GtkImage.
    *
@@ -569,7 +569,7 @@ gtk_image_new_from_gicon (GIcon *icon)
 }
 
 /**
- * gtk_image_set_from_file: (attributes org.gtk.Method.set_property=file)
+ * gtk_image_set_from_file: (set-property file)
  * @image: a `GtkImage`
  * @filename: (type filename) (nullable): a filename
  *
@@ -647,7 +647,7 @@ out:
 }
 
 /**
- * gtk_image_set_from_resource: (attributes org.gtk.Method.set_property=resource)
+ * gtk_image_set_from_resource: (set-property resource)
  * @image: a `GtkImage`
  * @resource_path: (nullable): a resource path
  *
@@ -740,7 +740,7 @@ gtk_image_set_from_pixbuf (GtkImage  *image,
 }
 
 /**
- * gtk_image_set_from_icon_name: (attributes org.gtk.Method.set_property=icon-name)
+ * gtk_image_set_from_icon_name: (set-property icon-name)
  * @image: a `GtkImage`
  * @icon_name: (nullable): an icon name
  *
@@ -768,7 +768,7 @@ gtk_image_set_from_icon_name  (GtkImage    *image,
 }
 
 /**
- * gtk_image_set_from_gicon: (attributes org.gtk.Method.set_property=gicon)
+ * gtk_image_set_from_gicon: (set-property gicon)
  * @image: a `GtkImage`
  * @icon: an icon
  *
@@ -816,7 +816,7 @@ gtk_image_paintable_invalidate_size (GdkPaintable *paintable,
 }
 
 /**
- * gtk_image_set_from_paintable: (attributes org.gtk.Method.set_property=paintable)
+ * gtk_image_set_from_paintable: (set-property paintable)
  * @image: a `GtkImage`
  * @paintable: (nullable): a `GdkPaintable`
  *
diff --git a/gtk/gtkmediastream.c b/gtk/gtkmediastream.c
index a2c1dc67e2..7bf5241a33 100644
--- a/gtk/gtkmediastream.c
+++ b/gtk/gtkmediastream.c
@@ -290,7 +290,7 @@ gtk_media_stream_class_init (GtkMediaStreamClass *class)
   gobject_class->dispose = gtk_media_stream_dispose;
 
   /**
-   * GtkMediaStream:prepared: (attributes org.gtk.Property.get=gtk_media_stream_is_prepared)
+   * GtkMediaStream:prepared: (getter is_prepared)
    *
    * Whether the stream has finished initializing and existence of
    * audio and video is known.
@@ -372,7 +372,7 @@ gtk_media_stream_class_init (GtkMediaStreamClass *class)
                         G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
 
   /**
-   * GtkMediaStream:seekable: (attributes org.gtk.Property.get=gtk_media_stream_is_seekable)
+   * GtkMediaStream:seekable: (getter is_seekable)
    *
    * Set unless the stream is known to not support seeking.
    */
@@ -382,7 +382,7 @@ gtk_media_stream_class_init (GtkMediaStreamClass *class)
                           G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
 
   /**
-   * GtkMediaStream:seeking: (attributes org.gtk.Property.get=gtk_media_stream_is_seeking)
+   * GtkMediaStream:seeking: (getter is_seeking)
    *
    * Set while a seek is in progress.
    */
@@ -433,7 +433,7 @@ gtk_media_stream_init (GtkMediaStream *self)
 }
 
 /**
- * gtk_media_stream_is_prepared: (attributes org.gtk.Method.get_property=prepared)
+ * gtk_media_stream_is_prepared: (get-property prepared)
  * @self: a `GtkMediaStream`
  *
  * Returns whether the stream has finished initializing.
@@ -647,7 +647,7 @@ gtk_media_stream_get_duration (GtkMediaStream *self)
 }
 
 /**
- * gtk_media_stream_is_seekable: (attributes org.gtk.Method.get_property=seekable)
+ * gtk_media_stream_is_seekable: (get-property seekable)
  * @self: a `GtkMediaStream`
  *
  * Checks if a stream may be seekable.
@@ -673,7 +673,7 @@ gtk_media_stream_is_seekable (GtkMediaStream *self)
 }
 
 /**
- * gtk_media_stream_is_seeking: (attributes org.gtk.Method.get_property=seeking)
+ * gtk_media_stream_is_seeking: (get-property seeking)
  * @self: a `GtkMediaStream`
  *
  * Checks if there is currently a seek operation going on.
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index a0f60d5004..a6805779a5 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -1122,7 +1122,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
   class->create_window = gtk_notebook_create_window;
 
   /**
-   * GtkNotebook:page: (attributes org.gtk.Property.get=gtk_notebook_get_current_page org.gtk.Property.set=gtk_notebook_set_current_page)
+   * GtkNotebook:page: (getter get_current_page) (setter set_current_page)
    *
    * The index of the current page.
    */
@@ -5976,7 +5976,7 @@ gtk_notebook_remove_page (GtkNotebook *notebook,
  */
 
 /**
- * gtk_notebook_get_current_page: (attributes org.gtk.Method.get_property=page)
+ * gtk_notebook_get_current_page: (get-property page)
  * @notebook: a `GtkNotebook`
  *
  * Returns the page number of the current page.
@@ -6083,7 +6083,7 @@ gtk_notebook_page_num (GtkNotebook      *notebook,
 }
 
 /**
- * gtk_notebook_set_current_page: (attributes org.gtk.Method.set_property=page)
+ * gtk_notebook_set_current_page: (set-property page)
  * @notebook: a `GtkNotebook`
  * @page_num: index of the page to switch to, starting from 0.
  *   If negative, the last page will be used. If greater
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 61b1ab8d89..20a876fa24 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -636,7 +636,7 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
                         GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
 
   /**
-   * GtkScrolledWindow:window-placement: (attributes org.gtk.Property.get=gtk_scrolled_window_get_placement org.gtk.Property.set=gtk_scrolled_window_set_placement)
+   * GtkScrolledWindow:window-placement: (getter get_placement) (setter set_placement)
    *
    * Where the contents are located with respect to the scrollbars.
    */
@@ -2451,7 +2451,7 @@ gtk_scrolled_window_get_policy (GtkScrolledWindow *scrolled_window,
 }
 
 /**
- * gtk_scrolled_window_set_placement: (attributes org.gtk.Method.set_property=window-placement)
+ * gtk_scrolled_window_set_placement: (set-property window-placement)
  * @scrolled_window: a `GtkScrolledWindow`
  * @window_placement: position of the child window
  *
@@ -2486,7 +2486,7 @@ gtk_scrolled_window_set_placement (GtkScrolledWindow *scrolled_window,
 }
 
 /**
- * gtk_scrolled_window_get_placement: (attributes org.gtk.Method.get_property=window-placement)
+ * gtk_scrolled_window_get_placement: (get-property window-placement)
  * @scrolled_window: a `GtkScrolledWindow`
  *
  * Gets the placement of the contents with respect to the scrollbars.
diff --git a/gtk/gtksearchbar.c b/gtk/gtksearchbar.c
index 8fda6040bf..eff537f281 100644
--- a/gtk/gtksearchbar.c
+++ b/gtk/gtksearchbar.c
@@ -308,7 +308,7 @@ gtk_search_bar_class_init (GtkSearchBarClass *klass)
   widget_class->focus = gtk_widget_focus_child;
 
   /**
-   * GtkSearchBar:search-mode-enabled: (attributes org.gtk.Property.get=gtk_search_bar_get_search_mode org.gtk.Property.set=gtk_search_bar_set_search_mode)
+   * GtkSearchBar:search-mode-enabled: (getter get_search_mode) (setter set_search_mode)
    *
    * Whether the search mode is on and the search bar shown.
    */
@@ -446,7 +446,7 @@ gtk_search_bar_connect_entry (GtkSearchBar *bar,
 }
 
 /**
- * gtk_search_bar_get_search_mode: (attributes org.gtk.Method.get_property=search-mode-enabled)
+ * gtk_search_bar_get_search_mode: (get-property search-mode-enabled)
  * @bar: a `GtkSearchBar`
  *
  * Returns whether the search mode is on or off.
@@ -462,7 +462,7 @@ gtk_search_bar_get_search_mode (GtkSearchBar *bar)
 }
 
 /**
- * gtk_search_bar_set_search_mode: (attributes org.gtk.Method.set_property=search-mode-enabled)
+ * gtk_search_bar_set_search_mode: (set-property search-mode-enabled)
  * @bar: a `GtkSearchBar`
  * @search_mode: the new state of the search mode
  *
diff --git a/gtk/gtkshortcutcontroller.c b/gtk/gtkshortcutcontroller.c
index 8f35a93a81..a879dc5662 100644
--- a/gtk/gtkshortcutcontroller.c
+++ b/gtk/gtkshortcutcontroller.c
@@ -594,7 +594,7 @@ gtk_shortcut_controller_class_init (GtkShortcutControllerClass *klass)
                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
   /**
-   * GtkShortcutController:mnemonic-modifiers: (attributes org.gtk.Property.get=gtk_shortcut_controller_get_mnemonics_modifiers org.gtk.Property.set=gtk_shortcut_controller_set_mnemonics_modifiers)
+   * GtkShortcutController:mnemonic-modifiers: (getter get_mnemonics_modifiers) (setter set_mnemonics_modifiers)
    *
    * The modifiers that need to be pressed to allow mnemonics activation.
    */
@@ -914,7 +914,7 @@ gtk_shortcut_controller_get_scope (GtkShortcutController *self)
 }
 
 /**
- * gtk_shortcut_controller_set_mnemonics_modifiers: (attributes org.gtk.Method.set_property=mnemonic-modifiers)
+ * gtk_shortcut_controller_set_mnemonics_modifiers: (set-property mnemonic-modifiers)
  * @self: a `GtkShortcutController`
  * @modifiers: the new mnemonics_modifiers to use
  *
@@ -947,7 +947,7 @@ gtk_shortcut_controller_set_mnemonics_modifiers (GtkShortcutController *self,
 }
 
 /**
- * gtk_shortcut_controller_get_mnemonics_modifiers: (attributes org.gtk.Method.get_property=mnemonic-modifiers)
+ * gtk_shortcut_controller_get_mnemonics_modifiers: (get-property mnemonic-modifiers)
  * @self: a `GtkShortcutController`
  *
  * Gets the mnemonics modifiers for when this controller activates its shortcuts.
diff --git a/gtk/gtktreelistmodel.c b/gtk/gtktreelistmodel.c
index c3b39de754..9636c21727 100644
--- a/gtk/gtktreelistmodel.c
+++ b/gtk/gtktreelistmodel.c
@@ -1068,7 +1068,7 @@ gtk_tree_list_row_class_init (GtkTreeListRowClass *class)
                          GTK_PARAM_READABLE);
 
   /**
-   * GtkTreeListRow:expandable: (attributes org.gtk.Property.get=gtk_tree_list_row_is_expandable)
+   * GtkTreeListRow:expandable: (getter is_expandable)
    *
    * If this row can ever be expanded.
    */
@@ -1238,7 +1238,7 @@ gtk_tree_list_row_get_expanded (GtkTreeListRow *self)
 }
 
 /**
- * gtk_tree_list_row_is_expandable: (attributes org.gtk.Method.get_property=expandable)
+ * gtk_tree_list_row_is_expandable: (get-property expandable)
  * @self: a `GtkTreeListRow`
  *
  * Checks if a row can be expanded.
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 5297ae5eb4..969d817103 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -957,7 +957,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                            GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_EXPLICIT_NOTIFY);
 
   /**
-   * GtkWindow:maximized: (attributes org.gtk.Property.get=gtk_window_is_maximized)
+   * GtkWindow:maximized: (getter is_maximized)
    *
    * Whether the window is maximized.
    *
@@ -973,7 +973,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                             GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_EXPLICIT_NOTIFY);
 
   /**
-   * GtkWindow:fullscreened: (attributes org.gtk.Property.get=gtk_window_is_fullscreen)
+   * GtkWindow:fullscreened: (getter is_fullscreen)
    *
    * Whether the window is fullscreen.
    *
@@ -989,7 +989,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                             GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_EXPLICIT_NOTIFY);
 
   /**
-   * GtkWindow:suspended: (attributes org.gtk.Property.get=gtk_window_is_suspended)
+   * GtkWindow:suspended: (getter is_suspended)
    *
    * Whether the window is suspended.
    *
@@ -1031,7 +1031,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                            GTK_PARAM_READWRITE|G_PARAM_STATIC_STRINGS|G_PARAM_EXPLICIT_NOTIFY);
 
   /**
-   * GtkWindow:focus-widget: (attributes org.gtk.Property.get=gtk_window_get_focus org.gtk.Property.set=gtk_window_set_focus)
+   * GtkWindow:focus-widget: (getter get_focus) (setter set_focus)
    *
    * The focus widget.
    */
@@ -1262,7 +1262,7 @@ gtk_window_class_init (GtkWindowClass *klass)
 }
 
 /**
- * gtk_window_is_maximized: (attributes org.gtk.Method.get_property=maximized)
+ * gtk_window_is_maximized: (get-property maximized)
  * @window: a `GtkWindow`
  *
  * Retrieves the current maximized state of @window.
@@ -1289,7 +1289,7 @@ gtk_window_is_maximized (GtkWindow *window)
 }
 
 /**
- * gtk_window_is_fullscreen: (attributes org.gtk.Property.get=fullscreened)
+ * gtk_window_is_fullscreen: (get-property fullscreened)
  * @window: a `GtkWindow`
  *
  * Retrieves the current fullscreen state of @window.
@@ -1316,7 +1316,7 @@ gtk_window_is_fullscreen (GtkWindow *window)
 }
 
 /**
- * gtk_window_is_suspended: (attributes org.gtk.Property.get=suspended)
+ * gtk_window_is_suspended: (get-property suspended)
  * @window: a `GtkWindow`
  *
  * Retrieves the current suspended state of @window.
@@ -2404,7 +2404,7 @@ _gtk_window_notify_keys_changed (GtkWindow *window)
 }
 
 /**
- * gtk_window_get_focus: (attributes org.gtk.Property.get=focus-widget)
+ * gtk_window_get_focus: (get-property focus-widget)
  * @window: a `GtkWindow`
  *
  * Retrieves the current focused widget within the window.
@@ -5123,7 +5123,7 @@ synthesize_focus_change_events (GtkWindow       *window,
 }
 
 /**
- * gtk_window_set_focus: (attributes org.gtk.Method.set_property=focus-widget)
+ * gtk_window_set_focus: (set-property focus-widget)
  * @window: a `GtkWindow`
  * @focus: (nullable): widget to be the new focus widget, or %NULL to unset
  *   any focus widget for the toplevel window.
diff --git a/gtk/print/gtkprinter.c b/gtk/print/gtkprinter.c
index 7bd01b0eac..91baebda33 100644
--- a/gtk/print/gtkprinter.c
+++ b/gtk/print/gtkprinter.c
@@ -138,7 +138,7 @@ gtk_printer_class_init (GtkPrinterClass *class)
 							G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
   /**
-   * GtkPrinter:is-virtual: (attributes org.gtk.Property.get=gtk_printer_is_virtual)
+   * GtkPrinter:is-virtual: (getter is_virtual)
    *
    * %FALSE if this represents a real hardware device.
    */
@@ -149,7 +149,7 @@ gtk_printer_class_init (GtkPrinterClass *class)
 							 G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
   /**
-   * GtkPrinter:accepts-pdf: (attributes org.gtk.Property.get=gtk_printer_accepts_pdf)
+   * GtkPrinter:accepts-pdf: (getter accepts_pdf)
    *
    * %TRUE if this printer can accept PDF.
    */
@@ -160,7 +160,7 @@ gtk_printer_class_init (GtkPrinterClass *class)
 							 G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
   /**
-   * GtkPrinter:accepts-ps: (attributes org.gtk.Property.get=gtk_printer_accepts_ps)
+   * GtkPrinter:accepts-ps: (getter accepts_ps)
    *
    * %TRUE if this printer can accept PostScript.
    */
@@ -217,7 +217,7 @@ gtk_printer_class_init (GtkPrinterClass *class)
  						     G_PARAM_READABLE));
 
   /**
-   * GtkPrinter:paused: (attributes org.gtk.Property.get=gtk_printer_is_paused)
+   * GtkPrinter:paused: (getter is_paused)
    *
    * %TRUE if this printer is paused.
    *
@@ -231,7 +231,7 @@ gtk_printer_class_init (GtkPrinterClass *class)
 							 G_PARAM_READABLE));
 
   /**
-   * GtkPrinter:accepting-jobs: (attributes org.gtk.Property.get=gtk_printer_is_accepting_jobs)
+   * GtkPrinter:accepting-jobs: (getter is_accepting_jobs)
    *
    * %TRUE if the printer is accepting jobs.
    */
@@ -696,7 +696,7 @@ gtk_printer_set_is_active (GtkPrinter *printer,
 }
 
 /**
- * gtk_printer_is_paused: (attributes org.gtk.Method.get_property=paused)
+ * gtk_printer_is_paused: (get-property paused)
  * @printer: a `GtkPrinter`
  *
  * Returns whether the printer is currently paused.
@@ -733,7 +733,7 @@ gtk_printer_set_is_paused (GtkPrinter *printer,
 }
 
 /**
- * gtk_printer_is_accepting_jobs: (attributes org.gtk.Method.get_property=accepting-jobs)
+ * gtk_printer_is_accepting_jobs: (get-property accepting-jobs)
  * @printer: a `GtkPrinter`
  *
  * Returns whether the printer is accepting jobs
@@ -767,7 +767,7 @@ gtk_printer_set_is_accepting_jobs (GtkPrinter *printer,
 }
 
 /**
- * gtk_printer_is_virtual: (attributes org.gtk.Method.get_property=is-virtual)
+ * gtk_printer_is_virtual: (get-property is-virtual)
  * @printer: a `GtkPrinter`
  *
  * Returns whether the printer is virtual (i.e. does not
@@ -787,7 +787,7 @@ gtk_printer_is_virtual (GtkPrinter *printer)
 }
 
 /**
- * gtk_printer_accepts_pdf: (attributes org.gtk.Method.get_property=accepts-pdf)
+ * gtk_printer_accepts_pdf: (get-property accepts-pdf)
  * @printer: a `GtkPrinter`
  *
  * Returns whether the printer accepts input in
@@ -817,7 +817,7 @@ gtk_printer_set_accepts_pdf (GtkPrinter *printer,
 }
 
 /**
- * gtk_printer_accepts_ps: (attributes org.gtk.Method.get_property=accepts-ps)
+ * gtk_printer_accepts_ps: (get-property accepts-ps)
  * @printer: a `GtkPrinter`
  *
  * Returns whether the printer accepts input in
diff --git a/gtk/print/gtkprintunixdialog.c b/gtk/print/gtkprintunixdialog.c
index f6ef5e95be..90c5fd9617 100644
--- a/gtk/print/gtkprintunixdialog.c
+++ b/gtk/print/gtkprintunixdialog.c
@@ -427,7 +427,7 @@ gtk_print_unix_dialog_class_init (GtkPrintUnixDialogClass *class)
                                                      G_PARAM_READWRITE));
 
   /**
-   * GtkPrintUnixDialog:print-settings: (attributes org.gtk.Property.get=gtk_print_unix_dialog_get_settings org.gtk.Property.set=gtk_print_unix_dialog_set_settings)
+   * GtkPrintUnixDialog:print-settings: (getter get_settings) (setter set_settings)
    *
    * The `GtkPrintSettings` object used for this dialog.
    */
@@ -3161,7 +3161,7 @@ set_active_printer (GtkPrintUnixDialog *dialog,
 }
 
 /**
- * gtk_print_unix_dialog_set_settings: (attributes org.gtk.Method.set_property=print-settings)
+ * gtk_print_unix_dialog_set_settings: (set-property print-settings)
  * @dialog: a `GtkPrintUnixDialog`
  * @settings: (nullable): a `GtkPrintSettings`
  *
@@ -3223,7 +3223,7 @@ gtk_print_unix_dialog_set_settings (GtkPrintUnixDialog *dialog,
 }
 
 /**
- * gtk_print_unix_dialog_get_settings: (attributes org.gtk.Method.get_property=print-settings)
+ * gtk_print_unix_dialog_get_settings: (get-property print-settings)
  * @dialog: a `GtkPrintUnixDialog`
  *
  * Gets a new `GtkPrintSettings` object that represents the