diff --git a/clutter/cally/cally-actor.c b/clutter/cally/cally-actor.c
index cbdb70b5e..7783e5fa0 100644
--- a/clutter/cally/cally-actor.c
+++ b/clutter/cally/cally-actor.c
@@ -1099,7 +1099,7 @@ cally_actor_add_action (CallyActor      *cally_actor,
 }
 
 /**
- * cally_actor_add_action_full:
+ * cally_actor_add_action_full: (rename-to cally_actor_add_action)
  * @cally_actor: a #CallyActor
  * @action_name: the action name
  * @action_description: the action description
@@ -1112,8 +1112,6 @@ cally_actor_add_action (CallyActor      *cally_actor,
  *
  * Return value: added action id, or -1 if failure
  *
- * Rename to: cally_actor_add_action
- *
  * Since: 1.6
  */
 guint
diff --git a/clutter/clutter-container.c b/clutter/clutter-container.c
index 8c64151fc..72d40fafe 100644
--- a/clutter/clutter-container.c
+++ b/clutter/clutter-container.c
@@ -393,7 +393,7 @@ clutter_container_add (ClutterContainer *container,
 }
 
 /**
- * clutter_container_add_actor:
+ * clutter_container_add_actor: (virtual add)
  * @container: a #ClutterContainer
  * @actor: the first #ClutterActor to add
  *
@@ -406,8 +406,6 @@ clutter_container_add (ClutterContainer *container,
  * deprecated virtual function. The default implementation will
  * call clutter_actor_add_child().
  *
- * Virtual: add
- *
  * Since: 0.4
  *
  * Deprecated: 1.10: Use clutter_actor_add_child() instead.
@@ -485,7 +483,7 @@ clutter_container_remove (ClutterContainer *container,
 }
 
 /**
- * clutter_container_remove_actor:
+ * clutter_container_remove_actor: (virtual remove)
  * @container: a #ClutterContainer
  * @actor: a #ClutterActor
  *
@@ -498,8 +496,6 @@ clutter_container_remove (ClutterContainer *container,
  * deprecated virtual function. The default implementation will call
  * clutter_actor_remove_child().
  *
- * Virtual: remove
- *
  * Since: 0.4
  *
  * Deprecated: 1.10: Use clutter_actor_remove_child() instead.
@@ -672,7 +668,7 @@ clutter_container_foreach_with_internals (ClutterContainer *container,
 }
 
 /**
- * clutter_container_raise_child:
+ * clutter_container_raise_child: (virtual raise)
  * @container: a #ClutterContainer
  * @actor: the actor to raise
  * @sibling: (allow-none): the sibling to raise to, or %NULL to raise
@@ -684,8 +680,6 @@ clutter_container_foreach_with_internals (ClutterContainer *container,
  * which has been deprecated. The default implementation will call
  * clutter_actor_set_child_above_sibling().
  *
- * Virtual: raise
- *
  * Since: 0.6
  *
  * Deprecated: 1.10: Use clutter_actor_set_child_above_sibling() instead.
@@ -743,7 +737,7 @@ clutter_container_raise_child (ClutterContainer *container,
 }
 
 /**
- * clutter_container_lower_child:
+ * clutter_container_lower_child: (virtual lower)
  * @container: a #ClutterContainer
  * @actor: the actor to raise
  * @sibling: (allow-none): the sibling to lower to, or %NULL to lower
@@ -755,8 +749,6 @@ clutter_container_raise_child (ClutterContainer *container,
  * which has been deprecated. The default implementation will call
  * clutter_actor_set_child_below_sibling().
  *
- * Virtual: lower
- *
  * Since: 0.6
  *
  * Deprecated: 1.10: Use clutter_actor_set_child_below_sibling() instead.
diff --git a/clutter/clutter-interval.c b/clutter/clutter-interval.c
index ee8d413dc..782f82655 100644
--- a/clutter/clutter-interval.c
+++ b/clutter/clutter-interval.c
@@ -885,15 +885,13 @@ clutter_interval_get_value_type (ClutterInterval *interval)
 }
 
 /**
- * clutter_interval_set_initial_value:
+ * clutter_interval_set_initial_value: (rename-to clutter_interval_set_initial)
  * @interval: a #ClutterInterval
  * @value: a #GValue
  *
  * Sets the initial value of @interval to @value. The value is copied
  * inside the #ClutterInterval.
  *
- * Rename to: clutter_interval_set_initial
- *
  * Since: 1.0
  */
 void
@@ -977,15 +975,13 @@ clutter_interval_peek_initial_value (ClutterInterval *interval)
 }
 
 /**
- * clutter_interval_set_final_value:
+ * clutter_interval_set_final_value: (rename-to clutter_interval_set_final)
  * @interval: a #ClutterInterval
  * @value: a #GValue
  *
  * Sets the final value of @interval to @value. The value is
  * copied inside the #ClutterInterval.
  *
- * Rename to: clutter_interval_set_final
- *
  * Since: 1.0
  */
 void
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index 1a337c002..dcc7f7502 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -953,7 +953,7 @@ _clutter_threads_dispatch_free (gpointer data)
 }
 
 /**
- * clutter_threads_add_idle_full:
+ * clutter_threads_add_idle_full: (rename-to clutter_threads_add_idle)
  * @priority: the priority of the timeout source. Typically this will be in the
  *    range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE
  * @func: function to call
@@ -1041,8 +1041,6 @@ _clutter_threads_dispatch_free (gpointer data)
  *                                  NULL);
  * ]|
  *
- * Rename to: clutter_threads_add_idle
- *
  * Return value: the ID (greater than 0) of the event source.
  *
  * Since: 0.4
@@ -1091,7 +1089,7 @@ clutter_threads_add_idle (GSourceFunc func,
 }
 
 /**
- * clutter_threads_add_timeout_full:
+ * clutter_threads_add_timeout_full: (rename-to clutter_threads_add_timeout)
  * @priority: the priority of the timeout source. Typically this will be in the
  *            range between #G_PRIORITY_DEFAULT and #G_PRIORITY_HIGH.
  * @interval: the time between calls to the function, in milliseconds
@@ -1113,8 +1111,6 @@ clutter_threads_add_idle (GSourceFunc func,
  *
  * See also clutter_threads_add_idle_full().
  *
- * Rename to: clutter_threads_add_timeout
- *
  * Return value: the ID (greater than 0) of the event source.
  *
  * Since: 0.4
diff --git a/clutter/clutter-paint-node.c b/clutter/clutter-paint-node.c
index 705905c55..04fe0813c 100644
--- a/clutter/clutter-paint-node.c
+++ b/clutter/clutter-paint-node.c
@@ -42,16 +42,11 @@
  */
 
 /**
- * ClutterPaintNode:
+ * ClutterPaintNode: (ref-func clutter_paint_node_ref) (unref-func clutter_paint_node_unref) (set-value-func clutter_value_set_paint_node) (get-value-func clutter_value_get_paint_node)
  *
  * The <structname>ClutterPaintNode</structname> structure contains only
  * private data and it should be accessed using the provided API.
  *
- * Ref Func: clutter_paint_node_ref
- * Unref Func: clutter_paint_node_unref
- * Set Value Func: clutter_value_set_paint_node
- * Get Value Func: clutter_value_get_paint_node
- *
  * Since: 1.10
  */
 
diff --git a/clutter/clutter-transition.c b/clutter/clutter-transition.c
index 28f289e34..03f91d0af 100644
--- a/clutter/clutter-transition.c
+++ b/clutter/clutter-transition.c
@@ -509,7 +509,7 @@ clutter_transition_set_value (ClutterTransition *transition,
 }
 
 /**
- * clutter_transition_set_from_value:
+ * clutter_transition_set_from_value: (rename-to clutter_transition_set_from)
  * @transition: a #ClutterTransition
  * @value: a #GValue with the initial value of the transition
  *
@@ -528,8 +528,6 @@ clutter_transition_set_value (ClutterTransition *transition,
  *
  * This function is meant to be used by language bindings.
  *
- * Rename to: clutter_transition_set_from
- *
  * Since: 1.12
  */
 void
@@ -545,7 +543,7 @@ clutter_transition_set_from_value (ClutterTransition *transition,
 }
 
 /**
- * clutter_transition_set_to_value:
+ * clutter_transition_set_to_value: (rename-to clutter_transition_set_to)
  * @transition: a #ClutterTransition
  * @value: a #GValue with the final value of the transition
  *
@@ -564,8 +562,6 @@ clutter_transition_set_from_value (ClutterTransition *transition,
  *
  * This function is meant to be used by language bindings.
  *
- * Rename to: clutter_transition_set_to
- *
  * Since: 1.12
  */
 void
diff --git a/clutter/deprecated/clutter-alpha.c b/clutter/deprecated/clutter-alpha.c
index e8748b51d..def8ec532 100644
--- a/clutter/deprecated/clutter-alpha.c
+++ b/clutter/deprecated/clutter-alpha.c
@@ -915,7 +915,7 @@ clutter_alpha_register_func (ClutterAlphaFunc func,
 }
 
 /**
- * clutter_alpha_register_closure:
+ * clutter_alpha_register_closure: (rename-to clutter_alpha_register_func)
  * @closure: a #GClosure
  *
  * #GClosure variant of clutter_alpha_register_func().
@@ -925,8 +925,6 @@ clutter_alpha_register_func (ClutterAlphaFunc func,
  *
  * The logical id is always greater than %CLUTTER_ANIMATION_LAST.
  *
- * Rename to: clutter_alpha_register_func
- *
  * Return value: the logical id of the alpha function
  *
  * Since: 1.0
diff --git a/clutter/deprecated/clutter-frame-source.c b/clutter/deprecated/clutter-frame-source.c
index cd2fb06a1..e0a82a2b0 100644
--- a/clutter/deprecated/clutter-frame-source.c
+++ b/clutter/deprecated/clutter-frame-source.c
@@ -60,7 +60,7 @@ static GSourceFuncs clutter_frame_source_funcs =
 };
 
 /**
- * clutter_frame_source_add_full:
+ * clutter_frame_source_add_full: (rename-to clutter_frame_source_add)
  * @priority: the priority of the frame source. Typically this will be in the
  *   range between %G_PRIORITY_DEFAULT and %G_PRIORITY_HIGH.
  * @fps: the number of times per second to call the function
@@ -85,8 +85,6 @@ static GSourceFuncs clutter_frame_source_funcs =
  * multiple times to catch up missing frames if @func takes more than
  * @interval ms to execute.
  *
- * Rename to: clutter_frame_source_add
- *
  * Return value: the ID (greater than 0) of the event source.
  *
  * Since: 0.8
@@ -183,7 +181,7 @@ clutter_frame_source_dispatch (GSource     *source,
 }
 
 /**
- * clutter_threads_add_frame_source_full:
+ * clutter_threads_add_frame_source_full: (rename-to clutter_threads_add_frame_source)
  * @priority: the priority of the frame source. Typically this will be in the
  *   range between %G_PRIORITY_DEFAULT and %G_PRIORITY_HIGH.
  * @fps: the number of times per second to call the function
@@ -209,8 +207,6 @@ clutter_frame_source_dispatch (GSource     *source,
  *
  * See also clutter_threads_add_idle_full().
  *
- * Rename to: clutter_threads_add_frame_source
- *
  * Return value: the ID (greater than 0) of the event source.
  *
  * Since: 0.8