[gobject-introspection/mallard-templates] g-ir-doc-tool: Fix names of xref links
- From: Tomeu Vizoso <tomeuv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection/mallard-templates] g-ir-doc-tool: Fix names of xref links
- Date: Mon, 20 Feb 2012 12:56:34 +0000 (UTC)
commit 97484085494e8ec84f64d9b3e193c7a67d1051d2
Author: Tomeu Vizoso <tomeu vizoso collabora com>
Date: Mon Feb 20 13:55:37 2012 +0100
g-ir-doc-tool: Fix names of xref links
giscanner/mallardwriter.py | 6 +++++-
.../GIRepository.ArrayType.page | 2 +-
.../GIRepository.AttributeIter.page | 2 +-
.../GIRepository.BaseInfo.equal.page | 8 ++++----
.../GIRepository.BaseInfo.get_container.page | 4 ++--
.../GIRepository.BaseInfo.get_name.page | 2 +-
.../GIRepository.BaseInfo.iterate_attributes.page | 2 +-
.../GIRepository.BaseInfo.page | 8 ++++----
.../GIRepository.CallableInfo.page | 4 ++--
.../GIRepository.Direction.page | 2 +-
.../GIRepository.FieldInfo.page | 2 +-
.../GIRepository.FieldInfoFlags.page | 2 +-
.../GIRepository.FunctionInfoFlags.page | 2 +-
.../GIRepository.PropertyInfo.page | 2 +-
...Repository.Repository.find_by_error_domain.page | 2 +-
.../GIRepository.Repository.find_by_gtype.page | 2 +-
.../GIRepository.Repository.find_by_name.page | 2 +-
.../GIRepository.Repository.get_default.page | 6 +++---
.../GIRepository.Repository.get_info.page | 2 +-
.../GIRepository.Repository.require.page | 2 +-
.../GIRepository.Repository.require_private.page | 2 +-
.../GIRepository.ScopeType.page | 2 +-
.../GIRepository.Transfer.page | 2 +-
.../GIRepository.TypeTag.page | 2 +-
.../GIRepository.VFuncInfoFlags.page | 2 +-
.../GIRepository.ValueInfo.page | 2 +-
.../GIRepository.arg_info_get_closure.page | 2 +-
.../GIRepository.arg_info_get_destroy.page | 2 +-
.../GIRepository.arg_info_get_direction.page | 4 ++--
...Repository.arg_info_get_ownership_transfer.page | 4 ++--
.../GIRepository.arg_info_get_scope.page | 4 ++--
.../GIRepository.arg_info_get_type.page | 4 ++--
.../GIRepository.arg_info_is_caller_allocates.page | 2 +-
.../GIRepository.arg_info_is_optional.page | 2 +-
.../GIRepository.arg_info_is_return_value.page | 2 +-
.../GIRepository.arg_info_is_skip.page | 2 +-
.../GIRepository.arg_info_load_type.page | 2 +-
.../GIRepository.arg_info_may_be_null.page | 2 +-
.../GIRepository.base_info_get_type.page | 2 +-
.../GIRepository.callable_info_get_arg.page | 4 ++--
...GIRepository.callable_info_get_caller_owns.page | 4 ++--
.../GIRepository.callable_info_get_n_args.page | 2 +-
...ository.callable_info_get_return_attribute.page | 2 +-
...GIRepository.callable_info_get_return_type.page | 6 +++---
...ry.callable_info_iterate_return_attributes.page | 4 ++--
.../GIRepository.callable_info_load_arg.page | 2 +-
...IRepository.callable_info_load_return_type.page | 2 +-
...GIRepository.callable_info_may_return_null.page | 2 +-
.../GIRepository.callable_info_skip_return.page | 2 +-
.../GIRepository.constant_info_free_value.page | 2 +-
.../GIRepository.constant_info_get_type.page | 6 +++---
.../GIRepository.constant_info_get_value.page | 4 ++--
.../GIRepository.enum_info_get_method.page | 4 ++--
.../GIRepository.enum_info_get_n_methods.page | 2 +-
.../GIRepository.enum_info_get_storage_type.page | 2 +-
.../GIRepository.enum_info_get_value.page | 2 +-
.../GIRepository.field_info_get_field.page | 2 +-
.../GIRepository.field_info_get_flags.page | 4 ++--
.../GIRepository.field_info_get_offset.page | 2 +-
.../GIRepository.field_info_get_size.page | 2 +-
.../GIRepository.field_info_get_type.page | 6 +++---
.../GIRepository.field_info_set_field.page | 2 +-
.../GIRepository.function_info_get_flags.page | 4 ++--
.../GIRepository.function_info_get_property.page | 6 +++---
.../GIRepository.function_info_get_symbol.page | 2 +-
.../GIRepository.function_info_get_vfunc.page | 6 +++---
.../GIRepository.function_info_invoke.page | 2 +-
.../GIRepository.interface_info_find_method.page | 4 ++--
.../GIRepository.interface_info_find_vfunc.page | 4 ++--
.../GIRepository.interface_info_get_constant.page | 4 ++--
...Repository.interface_info_get_iface_struct.page | 4 ++--
.../GIRepository.interface_info_get_method.page | 4 ++--
...IRepository.interface_info_get_n_constants.page | 2 +-
.../GIRepository.interface_info_get_n_methods.page | 2 +-
...ository.interface_info_get_n_prerequisites.page | 2 +-
...Repository.interface_info_get_n_properties.page | 2 +-
.../GIRepository.interface_info_get_n_signals.page | 2 +-
.../GIRepository.interface_info_get_n_vfuncs.page | 2 +-
...Repository.interface_info_get_prerequisite.page | 4 ++--
.../GIRepository.interface_info_get_property.page | 4 ++--
.../GIRepository.interface_info_get_signal.page | 4 ++--
.../GIRepository.interface_info_get_vfunc.page | 4 ++--
.../GIRepository.object_info_find_method.page | 4 ++--
...y.object_info_find_method_using_interfaces.page | 4 ++--
.../GIRepository.object_info_find_signal.page | 2 +-
.../GIRepository.object_info_find_vfunc.page | 4 ++--
.../GIRepository.object_info_get_abstract.page | 2 +-
.../GIRepository.object_info_get_class_struct.page | 4 ++--
.../GIRepository.object_info_get_constant.page | 4 ++--
.../GIRepository.object_info_get_field.page | 4 ++--
.../GIRepository.object_info_get_fundamental.page | 2 +-
...ository.object_info_get_get_value_function.page | 2 +-
...object_info_get_get_value_function_pointer.page | 2 +-
.../GIRepository.object_info_get_interface.page | 4 ++--
.../GIRepository.object_info_get_method.page | 4 ++--
.../GIRepository.object_info_get_n_constants.page | 2 +-
.../GIRepository.object_info_get_n_fields.page | 2 +-
.../GIRepository.object_info_get_n_interfaces.page | 2 +-
.../GIRepository.object_info_get_n_methods.page | 2 +-
.../GIRepository.object_info_get_n_properties.page | 2 +-
.../GIRepository.object_info_get_n_signals.page | 2 +-
.../GIRepository.object_info_get_n_vfuncs.page | 2 +-
.../GIRepository.object_info_get_parent.page | 4 ++--
.../GIRepository.object_info_get_property.page | 4 ++--
.../GIRepository.object_info_get_ref_function.page | 2 +-
...itory.object_info_get_ref_function_pointer.page | 2 +-
...ository.object_info_get_set_value_function.page | 2 +-
...object_info_get_set_value_function_pointer.page | 2 +-
.../GIRepository.object_info_get_signal.page | 4 ++--
.../GIRepository.object_info_get_type_init.page | 2 +-
.../GIRepository.object_info_get_type_name.page | 2 +-
...IRepository.object_info_get_unref_function.page | 2 +-
...ory.object_info_get_unref_function_pointer.page | 2 +-
.../GIRepository.object_info_get_vfunc.page | 4 ++--
.../GIRepository.property_info_get_flags.page | 2 +-
...itory.property_info_get_ownership_transfer.page | 4 ++--
.../GIRepository.property_info_get_type.page | 4 ++--
...Repository.registered_type_info_get_g_type.page | 2 +-
...ository.registered_type_info_get_type_init.page | 2 +-
...ository.registered_type_info_get_type_name.page | 2 +-
...GIRepository.signal_info_get_class_closure.page | 2 +-
.../GIRepository.signal_info_get_flags.page | 2 +-
.../GIRepository.signal_info_true_stops_emit.page | 2 +-
.../GIRepository.struct_info_find_method.page | 4 ++--
.../GIRepository.struct_info_get_alignment.page | 2 +-
.../GIRepository.struct_info_get_field.page | 4 ++--
.../GIRepository.struct_info_get_method.page | 4 ++--
.../GIRepository.struct_info_get_n_fields.page | 2 +-
.../GIRepository.struct_info_get_n_methods.page | 2 +-
.../GIRepository.struct_info_get_size.page | 2 +-
.../GIRepository.struct_info_is_gtype_struct.page | 2 +-
...IRepository.type_info_get_array_fixed_size.page | 2 +-
.../GIRepository.type_info_get_array_length.page | 2 +-
.../GIRepository.type_info_get_array_type.page | 4 ++--
.../GIRepository.type_info_get_interface.page | 6 +++---
.../GIRepository.type_info_get_param_type.page | 2 +-
.../GIRepository.type_info_get_tag.page | 4 ++--
.../GIRepository.type_info_is_pointer.page | 2 +-
.../GIRepository.type_info_is_zero_terminated.page | 2 +-
.../GIRepository.union_info_find_method.page | 4 ++--
.../GIRepository.union_info_get_alignment.page | 2 +-
.../GIRepository.union_info_get_discriminator.page | 4 ++--
...pository.union_info_get_discriminator_type.page | 4 ++--
.../GIRepository.union_info_get_field.page | 4 ++--
.../GIRepository.union_info_get_method.page | 4 ++--
.../GIRepository.union_info_get_n_fields.page | 2 +-
.../GIRepository.union_info_get_n_methods.page | 2 +-
.../GIRepository.union_info_get_size.page | 2 +-
.../GIRepository.union_info_is_discriminated.page | 2 +-
.../GIRepository.value_info_get_value.page | 4 ++--
.../GIRepository.vfunc_info_get_address.page | 2 +-
.../GIRepository.vfunc_info_get_flags.page | 4 ++--
.../GIRepository.vfunc_info_get_invoker.page | 4 ++--
.../GIRepository.vfunc_info_get_offset.page | 2 +-
.../GIRepository.vfunc_info_get_signal.page | 2 +-
.../GIRepository.vfunc_info_invoke.page | 2 +-
.../GIRepository.ArrayType.page | 2 +-
.../GIRepository.BaseInfo.equal.page | 8 ++++----
.../GIRepository.BaseInfo.get_container.page | 4 ++--
.../GIRepository.BaseInfo.get_name.page | 2 +-
.../GIRepository.BaseInfo.iterate_attributes.page | 2 +-
.../GIRepository.CallableInfo.page | 4 ++--
.../GIRepository.Direction.page | 2 +-
.../GIRepository.FieldInfo.page | 2 +-
.../GIRepository.FieldInfoFlags.page | 2 +-
.../GIRepository.FunctionInfoFlags.page | 2 +-
.../GIRepository.PropertyInfo.page | 2 +-
...Repository.Repository.find_by_error_domain.page | 2 +-
.../GIRepository.Repository.find_by_gtype.page | 2 +-
.../GIRepository.Repository.find_by_name.page | 2 +-
.../GIRepository.Repository.get_default.page | 6 +++---
.../GIRepository.Repository.get_info.page | 2 +-
.../GIRepository.Repository.require.page | 2 +-
.../GIRepository.Repository.require_private.page | 2 +-
.../GIRepository.ScopeType.page | 2 +-
.../GIRepository.Transfer.page | 2 +-
.../GIRepository.TypeTag.page | 2 +-
.../GIRepository.VFuncInfoFlags.page | 2 +-
.../GIRepository.ValueInfo.page | 2 +-
.../GIRepository.arg_info_get_closure.page | 2 +-
.../GIRepository.arg_info_get_destroy.page | 2 +-
.../GIRepository.arg_info_get_direction.page | 4 ++--
...Repository.arg_info_get_ownership_transfer.page | 4 ++--
.../GIRepository.arg_info_get_scope.page | 4 ++--
.../GIRepository.arg_info_get_type.page | 4 ++--
.../GIRepository.arg_info_is_caller_allocates.page | 2 +-
.../GIRepository.arg_info_is_optional.page | 2 +-
.../GIRepository.arg_info_is_return_value.page | 2 +-
.../GIRepository.arg_info_is_skip.page | 2 +-
.../GIRepository.arg_info_load_type.page | 2 +-
.../GIRepository.arg_info_may_be_null.page | 2 +-
.../GIRepository.base_info_get_type.page | 2 +-
.../GIRepository.callable_info_get_arg.page | 4 ++--
...GIRepository.callable_info_get_caller_owns.page | 4 ++--
.../GIRepository.callable_info_get_n_args.page | 2 +-
...ository.callable_info_get_return_attribute.page | 2 +-
...GIRepository.callable_info_get_return_type.page | 6 +++---
...ry.callable_info_iterate_return_attributes.page | 4 ++--
.../GIRepository.callable_info_load_arg.page | 2 +-
...IRepository.callable_info_load_return_type.page | 2 +-
...GIRepository.callable_info_may_return_null.page | 2 +-
.../GIRepository.callable_info_skip_return.page | 2 +-
.../GIRepository.constant_info_free_value.page | 2 +-
.../GIRepository.constant_info_get_type.page | 6 +++---
.../GIRepository.constant_info_get_value.page | 4 ++--
.../GIRepository.enum_info_get_method.page | 4 ++--
.../GIRepository.enum_info_get_n_methods.page | 2 +-
.../GIRepository.enum_info_get_storage_type.page | 2 +-
.../GIRepository.enum_info_get_value.page | 2 +-
.../GIRepository.field_info_get_field.page | 2 +-
.../GIRepository.field_info_get_flags.page | 4 ++--
.../GIRepository.field_info_get_offset.page | 2 +-
.../GIRepository.field_info_get_size.page | 2 +-
.../GIRepository.field_info_get_type.page | 6 +++---
.../GIRepository.field_info_set_field.page | 2 +-
.../GIRepository.function_info_get_flags.page | 4 ++--
.../GIRepository.function_info_get_property.page | 6 +++---
.../GIRepository.function_info_get_symbol.page | 2 +-
.../GIRepository.function_info_get_vfunc.page | 6 +++---
.../GIRepository.function_info_invoke.page | 2 +-
.../GIRepository.interface_info_find_method.page | 4 ++--
.../GIRepository.interface_info_find_vfunc.page | 4 ++--
.../GIRepository.interface_info_get_constant.page | 4 ++--
...Repository.interface_info_get_iface_struct.page | 4 ++--
.../GIRepository.interface_info_get_method.page | 4 ++--
...IRepository.interface_info_get_n_constants.page | 2 +-
.../GIRepository.interface_info_get_n_methods.page | 2 +-
...ository.interface_info_get_n_prerequisites.page | 2 +-
...Repository.interface_info_get_n_properties.page | 2 +-
.../GIRepository.interface_info_get_n_signals.page | 2 +-
.../GIRepository.interface_info_get_n_vfuncs.page | 2 +-
...Repository.interface_info_get_prerequisite.page | 4 ++--
.../GIRepository.interface_info_get_property.page | 4 ++--
.../GIRepository.interface_info_get_signal.page | 4 ++--
.../GIRepository.interface_info_get_vfunc.page | 4 ++--
.../GIRepository.object_info_find_method.page | 4 ++--
...y.object_info_find_method_using_interfaces.page | 4 ++--
.../GIRepository.object_info_find_signal.page | 2 +-
.../GIRepository.object_info_find_vfunc.page | 4 ++--
.../GIRepository.object_info_get_abstract.page | 2 +-
.../GIRepository.object_info_get_class_struct.page | 4 ++--
.../GIRepository.object_info_get_constant.page | 4 ++--
.../GIRepository.object_info_get_field.page | 4 ++--
.../GIRepository.object_info_get_fundamental.page | 2 +-
...ository.object_info_get_get_value_function.page | 2 +-
...object_info_get_get_value_function_pointer.page | 2 +-
.../GIRepository.object_info_get_interface.page | 4 ++--
.../GIRepository.object_info_get_method.page | 4 ++--
.../GIRepository.object_info_get_n_constants.page | 2 +-
.../GIRepository.object_info_get_n_fields.page | 2 +-
.../GIRepository.object_info_get_n_interfaces.page | 2 +-
.../GIRepository.object_info_get_n_methods.page | 2 +-
.../GIRepository.object_info_get_n_properties.page | 2 +-
.../GIRepository.object_info_get_n_signals.page | 2 +-
.../GIRepository.object_info_get_n_vfuncs.page | 2 +-
.../GIRepository.object_info_get_parent.page | 4 ++--
.../GIRepository.object_info_get_property.page | 4 ++--
.../GIRepository.object_info_get_ref_function.page | 2 +-
...itory.object_info_get_ref_function_pointer.page | 2 +-
...ository.object_info_get_set_value_function.page | 2 +-
...object_info_get_set_value_function_pointer.page | 2 +-
.../GIRepository.object_info_get_signal.page | 4 ++--
.../GIRepository.object_info_get_type_init.page | 2 +-
.../GIRepository.object_info_get_type_name.page | 2 +-
...IRepository.object_info_get_unref_function.page | 2 +-
...ory.object_info_get_unref_function_pointer.page | 2 +-
.../GIRepository.object_info_get_vfunc.page | 4 ++--
.../GIRepository.property_info_get_flags.page | 2 +-
...itory.property_info_get_ownership_transfer.page | 4 ++--
.../GIRepository.property_info_get_type.page | 4 ++--
...Repository.registered_type_info_get_g_type.page | 2 +-
...ository.registered_type_info_get_type_init.page | 2 +-
...ository.registered_type_info_get_type_name.page | 2 +-
...GIRepository.signal_info_get_class_closure.page | 2 +-
.../GIRepository.signal_info_get_flags.page | 2 +-
.../GIRepository.signal_info_true_stops_emit.page | 2 +-
.../GIRepository.struct_info_find_method.page | 4 ++--
.../GIRepository.struct_info_get_alignment.page | 2 +-
.../GIRepository.struct_info_get_field.page | 4 ++--
.../GIRepository.struct_info_get_method.page | 4 ++--
.../GIRepository.struct_info_get_n_fields.page | 2 +-
.../GIRepository.struct_info_get_n_methods.page | 2 +-
.../GIRepository.struct_info_get_size.page | 2 +-
.../GIRepository.struct_info_is_gtype_struct.page | 2 +-
...IRepository.type_info_get_array_fixed_size.page | 2 +-
.../GIRepository.type_info_get_array_length.page | 2 +-
.../GIRepository.type_info_get_array_type.page | 4 ++--
.../GIRepository.type_info_get_interface.page | 6 +++---
.../GIRepository.type_info_get_param_type.page | 2 +-
.../GIRepository.type_info_get_tag.page | 4 ++--
.../GIRepository.type_info_is_pointer.page | 2 +-
.../GIRepository.type_info_is_zero_terminated.page | 2 +-
.../GIRepository.union_info_find_method.page | 4 ++--
.../GIRepository.union_info_get_alignment.page | 2 +-
.../GIRepository.union_info_get_discriminator.page | 4 ++--
...pository.union_info_get_discriminator_type.page | 4 ++--
.../GIRepository.union_info_get_field.page | 4 ++--
.../GIRepository.union_info_get_method.page | 4 ++--
.../GIRepository.union_info_get_n_fields.page | 2 +-
.../GIRepository.union_info_get_n_methods.page | 2 +-
.../GIRepository.union_info_get_size.page | 2 +-
.../GIRepository.union_info_is_discriminated.page | 2 +-
.../GIRepository.value_info_get_value.page | 4 ++--
.../GIRepository.vfunc_info_get_address.page | 2 +-
.../GIRepository.vfunc_info_get_flags.page | 4 ++--
.../GIRepository.vfunc_info_get_invoker.page | 4 ++--
.../GIRepository.vfunc_info_get_offset.page | 2 +-
.../GIRepository.vfunc_info_get_signal.page | 2 +-
.../GIRepository.vfunc_info_invoke.page | 2 +-
309 files changed, 448 insertions(+), 444 deletions(-)
---
diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py
index 59991a0..23a14a7 100644
--- a/giscanner/mallardwriter.py
+++ b/giscanner/mallardwriter.py
@@ -69,14 +69,18 @@ class MallardFormatter(object):
if type_name in self._namespace.ctypes:
type_ = self._namespace.get_by_ctype(type_name)
xref = '%s.%s-%s' % (self._namespace.name, type_.name, signal_name)
+ xref_name = '%s.%s::%s' % (self._namespace.name, type_.name, signal_name)
else:
xref = link
+ xref_name = link
elif link in self._namespace.ctypes:
type_ = self._namespace.get_by_ctype(link)
xref = '%s.%s' % (self._namespace.name, type_.name)
+ xref_name = xref
else:
xref = link
- result += '<link xref="%s">%s</link>' % (xref, link)
+ xref_name = link
+ result += '<link xref="%s">%s</link>' % (xref, xref_name)
if len(link) < len(rest):
result += self.format_inline(rest[len(link):])
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page
index da62f44..1a88368 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.ArrayType</title>
-<p>The type of array in a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</p>
+<p>The type of array in a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.AttributeIter.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.AttributeIter.page
index 8a120d4..ed85691 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.AttributeIter.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.AttributeIter.page
@@ -9,5 +9,5 @@
</info>
<title>GIRepositoryAttributeIter</title>
<p>An opaque structure used to iterate over attributes
-in a <link xref="GIRepository.BaseInfo">GIBaseInfo</link> struct.</p>
+in a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> struct.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.equal.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.equal.page
index 41866da..1194cd1 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.equal.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.equal.page
@@ -23,14 +23,14 @@
<synopsis><code mime="text/x-csrc">
gboolean g_base_info_equal (GIBaseInfo* info2);
</code></synopsis>
-<p>Compare two <link xref="GIRepository.BaseInfo">GIBaseInfo</link>.</p><p>Using pointer comparison is not practical since many functions return
-different instances of <link xref="GIRepository.BaseInfo">GIBaseInfo</link> that refers to the same part of the
-TypeLib; use this function instead to do <link xref="GIRepository.BaseInfo">GIBaseInfo</link> comparisons.</p>
+<p>Compare two <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>.</p><p>Using pointer comparison is not practical since many functions return
+different instances of <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> that refers to the same part of the
+TypeLib; use this function instead to do <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> comparisons.</p>
<table>
<tr>
<td><p>info2 :</p></td>
-<td><p>a <link xref="GIRepository.BaseInfo">GIBaseInfo</link></p></td>
+<td><p>a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_container.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_container.page
index f4f8631..89acaa6 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_container.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_container.page
@@ -20,8 +20,8 @@
GIBaseInfo* g_base_info_get_container (void);
</code></synopsis>
<p>Obtain the container of the @info. The container is the parent
-GIBaseInfo. For instance, the parent of a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> is an
-<link xref="GIRepository.ObjectInfo">GIObjectInfo</link> or <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link>.</p>
+GIBaseInfo. For instance, the parent of a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> is an
+<link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link> or <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link>.</p>
<table>
<tr>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_name.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_name.page
index 332bf11..0967589 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_name.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_name.page
@@ -20,7 +20,7 @@
gchar* g_base_info_get_name (void);
</code></synopsis>
<p>Obtain the name of the @info. What the name represents depends on
-the <link xref="GIRepository.InfoType">GIInfoType</link> of the @info. For instance for <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> it is
+the <link xref="GIRepository.InfoType">GIRepository.InfoType</link> of the @info. For instance for <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> it is
the name of the function.</p>
<table>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.iterate_attributes.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.iterate_attributes.page
index 35cfe51..76c6766 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.iterate_attributes.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.iterate_attributes.page
@@ -56,7 +56,7 @@ g_print ("attribute name: %s value: %s", name, value);
<table>
<tr>
<td><p>iterator :</p></td>
-<td><p>a <link xref="GIRepository.AttributeIter">GIAttributeIter</link> structure, must be initialized; see below</p></td>
+<td><p>a <link xref="GIRepository.AttributeIter">GIRepository.AttributeIter</link> structure, must be initialized; see below</p></td>
</tr>
<tr>
<td><p>name :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.page
index e156e6c..87dd1ae 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.page
@@ -9,16 +9,16 @@
</info>
<title>GIRepositoryBaseInfo</title>
<p>GIBaseInfo is the common base struct of all other *Info structs
-accessible through the <link xref="GIRepository.Repository">GIRepository</link> API.
-All other structs can be casted to a <link xref="GIRepository.BaseInfo">GIBaseInfo</link>, for instance:
+accessible through the <link xref="GIRepository.Repository">GIRepository.Repository</link> API.
+All other structs can be casted to a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>, for instance:
<example>
-<title>Casting a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> to <link xref="GIRepository.BaseInfo">GIBaseInfo</link></title>
+<title>Casting a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> to <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link></title>
<programlisting>
GIFunctionInfo *function_info = ...;
GIBaseInfo *info = (GIBaseInfo*)function_info;
</programlisting>
</example>
-Most <link xref="GIRepository.Repository">GIRepository</link> APIs returning a <link xref="GIRepository.BaseInfo">GIBaseInfo</link> is actually creating a new struct, in other
+Most <link xref="GIRepository.Repository">GIRepository.Repository</link> APIs returning a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> is actually creating a new struct, in other
words, g_base_info_unref() has to be called when done accessing the data.
GIBaseInfos are normally accessed by calling either
g_irepository_find_by_name(), g_irepository_find_by_gtype() or g_irepository_get_info().</p><p><example>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallableInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallableInfo.page
index d0123bd..ab20f81 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallableInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallableInfo.page
@@ -7,6 +7,6 @@
<info>
</info>
<title>GIRepository.CallableInfo</title>
-<p>Represents a callable, either <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>, <link xref="GIRepository.CallbackInfo">GICallbackInfo</link> or
-<link xref="GIRepository.VFuncInfo">GIVFuncInfo</link>.</p>
+<p>Represents a callable, either <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, <link xref="GIRepository.CallbackInfo">GIRepository.CallbackInfo</link> or
+<link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page
index d8dd647..b010ba3 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.Direction</title>
-<p>The direction of a <link xref="GIRepository.ArgInfo">GIArgInfo</link>.</p>
+<p>The direction of a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfo.page
index a1812f4..0e90eba 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfo.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.FieldInfo</title>
-<p>Represents a field of a <link xref="GIRepository.StructInfo">GIStructInfo</link> or a <link xref="GIRepository.UnionInfo">GIUnionInfo</link>.</p>
+<p>Represents a field of a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link> or a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link>.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfoFlags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfoFlags.page
index 81310c9..87df966 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfoFlags.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.FieldInfoFlags</title>
-<p>Flags for a <link xref="GIRepository.FieldInfo">GIFieldInfo</link>.</p>
+<p>Flags for a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfoFlags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfoFlags.page
index 929c4e8..962e3ff 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfoFlags.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.FunctionInfoFlags</title>
-<p>Flags for a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> struct.</p>
+<p>Flags for a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> struct.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.PropertyInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.PropertyInfo.page
index 5a5cbc9..4d38359 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.PropertyInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.PropertyInfo.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.PropertyInfo</title>
-<p>Represents a property of a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link> or a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link>.</p>
+<p>Represents a property of a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link> or a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link>.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_error_domain.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_error_domain.page
index adb9512..56f3b93 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_error_domain.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_error_domain.page
@@ -40,7 +40,7 @@ otherwise ensure the namespace has already been loaded.</p><p>enum type, or %NUL
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p><link xref="GIRepository.EnumInfo">GIEnumInfo</link> representing metadata about @domain's</p></td>
+<td><p><link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link> representing metadata about @domain's</p></td>
</tr>
</table>
<p>Since 1.29.17</p>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_gtype.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_gtype.page
index 0160552..07e562c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_gtype.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_gtype.page
@@ -42,7 +42,7 @@ when you know the GType to originate from be from a loaded namespace.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p><link xref="GIRepository.BaseInfo">GIBaseInfo</link> representing metadata about @type, or %NULL</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> representing metadata about @type, or %NULL</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_name.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_name.page
index 4aa65f4..39fe665 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_name.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_name.page
@@ -49,7 +49,7 @@ ensure the namespace has already been loaded.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p><link xref="GIRepository.BaseInfo">GIBaseInfo</link> representing metadata about @name, or %NULL</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> representing metadata about @name, or %NULL</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_default.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_default.page
index 88c6618..07cee8c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_default.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_default.page
@@ -19,20 +19,20 @@
<synopsis><code mime="text/x-csrc">
GIRepository* g_irepository_get_default (void);
</code></synopsis>
-<p>Returns the singleton process-global default <link xref="GIRepository.Repository">GIRepository</link>. It is
+<p>Returns the singleton process-global default <link xref="GIRepository.Repository">GIRepository.Repository</link>. It is
not currently supported to have multiple repositories in a
particular process, but this function is provided in the unlikely
eventuality that it would become possible, and as a convenience for
higher level language bindings to conform to the GObject method
call conventions.
-All methods on <link xref="GIRepository.Repository">GIRepository</link> also accept %NULL as an instance
+All methods on <link xref="GIRepository.Repository">GIRepository.Repository</link> also accept %NULL as an instance
parameter to mean this default repository, which is usually more
convenient for C.</p>
<table>
<tr>
<td><p>Returns :</p></td>
-<td><p>The global singleton <link xref="GIRepository.Repository">GIRepository</link></p></td>
+<td><p>The global singleton <link xref="GIRepository.Repository">GIRepository.Repository</link></p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_info.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_info.page
index 9d3fe96..05beefe 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_info.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_info.page
@@ -50,7 +50,7 @@ entries.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p><link xref="GIRepository.BaseInfo">GIBaseInfo</link> containing metadata</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> containing metadata</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require.page
index f544083..423eaf7 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require.page
@@ -59,7 +59,7 @@ not specified, the latest will be used.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>a pointer to the <link xref="GIRepository.Typelib">GITypelib</link> if successful, %NULL otherwise</p></td>
+<td><p>a pointer to the <link xref="GIRepository.Typelib">GIRepository.Typelib</link> if successful, %NULL otherwise</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require_private.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require_private.page
index 98e37db..f539b31 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require_private.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require_private.page
@@ -68,7 +68,7 @@ not specified, the latest will be used.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>a pointer to the <link xref="GIRepository.Typelib">GITypelib</link> if successful, %NULL otherwise</p></td>
+<td><p>a pointer to the <link xref="GIRepository.Typelib">GIRepository.Typelib</link> if successful, %NULL otherwise</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page
index 6a9d8de..5f12828 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page
@@ -7,7 +7,7 @@
<info>
</info>
<title>GIRepository.ScopeType</title>
-<p>Scope type of a <link xref="GIRepository.ArgInfo">GIArgInfo</link> representing callback, determines how the
+<p>Scope type of a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link> representing callback, determines how the
callback is invoked and is used to decided when the invoke structs
can be freed.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page
index b79e210..37319a5 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page
@@ -11,7 +11,7 @@
the caller. The callee is either a function/method/signal or an
object/interface where a property is defined. The caller is the side
accessing a property or calling a function.
-<link xref="GIRepository.Transfer">GITransfer</link> specifies who's responsible for freeing the resources after the
+<link xref="GIRepository.Transfer">GIRepository.Transfer</link> specifies who's responsible for freeing the resources after the
ownership transfer is complete. In case of a containing type such as a list,
an array or a hash table the container itself is specified differently from
the items within the container itself. Each container is freed differently,
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page
index ca21e54..328d5fe 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.TypeTag</title>
-<p>The type tag of a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</p>
+<p>The type tag of a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfoFlags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfoFlags.page
index c39aa56..a750dfd 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfoFlags.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.VFuncInfoFlags</title>
-<p>Flags of a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link> struct.</p>
+<p>Flags of a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link> struct.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ValueInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ValueInfo.page
index 9207bfd..39ad0fa 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ValueInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ValueInfo.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.ValueInfo</title>
-<p>Represents a enum value of a <link xref="GIRepository.EnumInfo">GIEnumInfo</link>.</p>
+<p>Represents a enum value of a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link>.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_closure.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_closure.page
index ab5c30b..090a24e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_closure.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_closure.page
@@ -29,7 +29,7 @@ for arguments which are callbacks.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_destroy.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_destroy.page
index 5f1d8d5..3c04cd1 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_destroy.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_destroy.page
@@ -29,7 +29,7 @@ for arguments which are callbacks.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_direction.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_direction.page
index 8352426..eb27640 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_direction.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_direction.page
@@ -23,13 +23,13 @@
<synopsis><code mime="text/x-csrc">
GIDirection g_arg_info_get_direction (GIArgInfo* info);
</code></synopsis>
-<p>Obtain the direction of the argument. Check <link xref="GIRepository.Direction">GIDirection</link> for possible
+<p>Obtain the direction of the argument. Check <link xref="GIRepository.Direction">GIRepository.Direction</link> for possible
direction values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_ownership_transfer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_ownership_transfer.page
index 26357fd..679e068 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_ownership_transfer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_ownership_transfer.page
@@ -24,12 +24,12 @@
GITransfer g_arg_info_get_ownership_transfer (GIArgInfo* info);
</code></synopsis>
<p>Obtain the ownership transfer for this argument.
-<link xref="GIRepository.Transfer">GITransfer</link> contains a list of possible values.</p>
+<link xref="GIRepository.Transfer">GIRepository.Transfer</link> contains a list of possible values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_scope.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_scope.page
index bf54be1..1367c1e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_scope.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_scope.page
@@ -26,12 +26,12 @@ GIScopeType g_arg_info_get_scope (GIArgInfo* info);
<p>Obtain the scope type for this argument. The scope type explains
how a callback is going to be invoked, most importantly when
the resources required to invoke it can be freed.
-<link xref="GIRepository.ScopeType">GIScopeType</link> contains a list of possible values.</p>
+<link xref="GIRepository.ScopeType">GIRepository.ScopeType</link> contains a list of possible values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_type.page
index 7de3f07..abfa566 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_type.page
@@ -28,11 +28,11 @@ GITypeInfo* g_arg_info_get_type (GIArgInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.ArgInfo">GIArgInfo</link>, free it with</p></td>
+<td><p>the <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>, free it with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_caller_allocates.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_caller_allocates.page
index 854de5b..22aa651 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_caller_allocates.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_caller_allocates.page
@@ -31,7 +31,7 @@ callee allocates; if this is %TRUE, then the caller must allocate.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_optional.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_optional.page
index 9601506..42254f2 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_optional.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_optional.page
@@ -28,7 +28,7 @@ gboolean g_arg_info_is_optional (GIArgInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_return_value.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_return_value.page
index 6e1b559..90010c2 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_return_value.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_return_value.page
@@ -29,7 +29,7 @@ parameter or a return value.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_skip.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_skip.page
index 897577b..1064732 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_skip.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_skip.page
@@ -28,7 +28,7 @@ gboolean g_arg_info_is_skip (GIArgInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_load_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_load_type.page
index 4807605..c5be302 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_load_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_load_type.page
@@ -35,7 +35,7 @@ allocation.</p><p>The initialized @type must not be referenced after @info is de
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>type :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_may_be_null.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_may_be_null.page
index e3eebed..ad3d651 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_may_be_null.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_may_be_null.page
@@ -28,7 +28,7 @@ gboolean g_arg_info_may_be_null (GIArgInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.base_info_get_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.base_info_get_type.page
index 80a7f55..ab56ef9 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.base_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.base_info_get_type.page
@@ -28,7 +28,7 @@ GIInfoType g_base_info_get_type (GIBaseInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.BaseInfo">GIBaseInfo</link></p></td>
+<td><p>a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_arg.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_arg.page
index f5f6562..aa7958d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_arg.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_arg.page
@@ -33,7 +33,7 @@ GIArgInfo* g_callable_info_get_arg (GICallableInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIArgInfo* g_callable_info_get_arg (GICallableInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.ArgInfo">GIArgInfo</link>. Free it with</p></td>
+<td><p>the <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>. Free it with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_caller_owns.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_caller_owns.page
index 17ad36a..2464f7e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_caller_owns.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_caller_owns.page
@@ -24,12 +24,12 @@
GITransfer g_callable_info_get_caller_owns (GICallableInfo* info);
</code></synopsis>
<p>See whether the caller owns the return value of this callable.
-<link xref="GIRepository.Transfer">GITransfer</link> contains a list of possible transfer values.</p>
+<link xref="GIRepository.Transfer">GIRepository.Transfer</link> contains a list of possible transfer values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_n_args.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_n_args.page
index 8dffbd7..7ab4bcd 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_n_args.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_n_args.page
@@ -28,7 +28,7 @@ gint g_callable_info_get_n_args (GICallableInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_attribute.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_attribute.page
index e7cc103..45290de 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_attribute.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_attribute.page
@@ -33,7 +33,7 @@ gchar* g_callable_info_get_return_attribute (GICallableInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_type.page
index afb4ace..b219937 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_type.page
@@ -23,16 +23,16 @@
<synopsis><code mime="text/x-csrc">
GITypeInfo* g_callable_info_get_return_type (GICallableInfo* info);
</code></synopsis>
-<p>Obtain the return type of a callable item as a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+<p>Obtain the return type of a callable item as a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_iterate_return_attributes.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_iterate_return_attributes.page
index 1bbdd38..2e38de2 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_iterate_return_attributes.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_iterate_return_attributes.page
@@ -47,11 +47,11 @@ similar API.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>iterator :</p></td>
-<td><p>a <link xref="GIRepository.AttributeIter">GIAttributeIter</link> structure, must be initialized; see below</p></td>
+<td><p>a <link xref="GIRepository.AttributeIter">GIRepository.AttributeIter</link> structure, must be initialized; see below</p></td>
</tr>
<tr>
<td><p>name :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_arg.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_arg.page
index 3c01df2..9dd576a 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_arg.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_arg.page
@@ -40,7 +40,7 @@ allocation.</p><p>The initialized @arg must not be referenced after @info is dea
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_return_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_return_type.page
index bc01a09..47fc89c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_return_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_return_type.page
@@ -35,7 +35,7 @@ allocation.</p><p>The initialized @type must not be referenced after @info is de
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>type :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_may_return_null.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_may_return_null.page
index 1c4e976..08d4639 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_may_return_null.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_may_return_null.page
@@ -28,7 +28,7 @@ gboolean g_callable_info_may_return_null (GICallableInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_skip_return.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_skip_return.page
index 2e1f372..142d2bb 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_skip_return.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_skip_return.page
@@ -28,7 +28,7 @@ gboolean g_callable_info_skip_return (GICallableInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_free_value.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_free_value.page
index d63a90b..dd13a31 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_free_value.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_free_value.page
@@ -33,7 +33,7 @@ void g_constant_info_free_value (GIConstantInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ConstantInfo">GIConstantInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link></p></td>
</tr>
<tr>
<td><p>value :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_type.page
index 27628a1..50ee4df 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_type.page
@@ -23,16 +23,16 @@
<synopsis><code mime="text/x-csrc">
GITypeInfo* g_constant_info_get_type (GIConstantInfo* info);
</code></synopsis>
-<p>Obtain the type of the constant as a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+<p>Obtain the type of the constant as a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ConstantInfo">GIConstantInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_value.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_value.page
index 813198d..c274744 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_value.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_value.page
@@ -28,7 +28,7 @@
gint g_constant_info_get_value (GIConstantInfo* info,
GIArgument* value);
</code></synopsis>
-<p>Obtain the value associated with the <link xref="GIRepository.ConstantInfo">GIConstantInfo</link> and store it in the
+<p>Obtain the value associated with the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link> and store it in the
@value parameter. @argument needs to be allocated before passing it in.
The size of the constant value stored in @argument will be returned.
Free the value with g_constant_info_free_value().</p>
@@ -36,7 +36,7 @@ Free the value with g_constant_info_free_value().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ConstantInfo">GIConstantInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link></p></td>
</tr>
<tr>
<td><p>value :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_method.page
index fdf33e9..c8c0ba6 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_method.page
@@ -33,7 +33,7 @@ GIFunctionInfo* g_enum_info_get_method (GIEnumInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.EnumInfo">GIEnumInfo</link></p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIFunctionInfo* g_enum_info_get_method (GIEnumInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
<p>Since 1.29.17</p>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_methods.page
index 24f223a..99db141 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_methods.page
@@ -28,7 +28,7 @@ gint g_enum_info_get_n_methods (GIEnumInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.EnumInfo">GIEnumInfo</link></p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_storage_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_storage_type.page
index 915303b..0a599f0 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_storage_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_storage_type.page
@@ -32,7 +32,7 @@ may not match the sign of the type used by the C compiler.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.EnumInfo">GIEnumInfo</link></p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_value.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_value.page
index 0ed4a24..648d5fd 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_value.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_value.page
@@ -33,7 +33,7 @@ GIValueInfo* g_enum_info_get_value (GIEnumInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.EnumInfo">GIEnumInfo</link></p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_field.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_field.page
index 3066b4c..c767209 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_field.page
@@ -41,7 +41,7 @@ even if that is actually readable.</p>
<table>
<tr>
<td><p>field_info :</p></td>
-<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
</tr>
<tr>
<td><p>mem :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_flags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_flags.page
index fbf2f1c..eee2a08 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_flags.page
@@ -23,13 +23,13 @@
<synopsis><code mime="text/x-csrc">
GIFieldInfoFlags g_field_info_get_flags (GIFieldInfo* info);
</code></synopsis>
-<p>Obtain the flags for this <link xref="GIRepository.FieldInfo">GIFieldInfo</link>. See <link xref="GIRepository.FieldInfoFlags">GIFieldInfoFlags</link> for possible
+<p>Obtain the flags for this <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>. See <link xref="GIRepository.FieldInfoFlags">GIRepository.FieldInfoFlags</link> for possible
flag values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_offset.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_offset.page
index 90ec787..343ae75 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_offset.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_offset.page
@@ -29,7 +29,7 @@ to the beginning of the struct or union.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_size.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_size.page
index 6e0e7c4..76719c9 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_size.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_size.page
@@ -29,7 +29,7 @@ much space you need to allocate to store the field.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_type.page
index 6aaeeb0..2870630 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_type.page
@@ -23,16 +23,16 @@
<synopsis><code mime="text/x-csrc">
GITypeInfo* g_field_info_get_type (GIFieldInfo* info);
</code></synopsis>
-<p>Obtain the type of a field as a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+<p>Obtain the type of a field as a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_set_field.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_set_field.page
index 1b7c115..624c427 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_set_field.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_set_field.page
@@ -43,7 +43,7 @@ with a type such as 'char *' must be set with a setter function.</p>
<table>
<tr>
<td><p>field_info :</p></td>
-<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
</tr>
<tr>
<td><p>mem :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_flags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_flags.page
index eb8117a..06e35cd 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_flags.page
@@ -23,12 +23,12 @@
<synopsis><code mime="text/x-csrc">
GIFunctionInfoFlags g_function_info_get_flags (GIFunctionInfo* info);
</code></synopsis>
-<p>Obtain the <link xref="GIRepository.FunctionInfoFlags">GIFunctionInfoFlags</link> for the @info.</p>
+<p>Obtain the <link xref="GIRepository.FunctionInfoFlags">GIRepository.FunctionInfoFlags</link> for the @info.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_property.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_property.page
index b682765..0a58368 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_property.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_property.page
@@ -23,15 +23,15 @@
<synopsis><code mime="text/x-csrc">
GIPropertyInfo* g_function_info_get_property (GIFunctionInfo* info);
</code></synopsis>
-<p>Obtain the property associated with this <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>.
-Only <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> with the flag %GI_FUNCTION_IS_GETTER or
+<p>Obtain the property associated with this <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>.
+Only <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> with the flag %GI_FUNCTION_IS_GETTER or
%GI_FUNCTION_IS_SETTER have a property set. For other cases,
%NULL will be returned.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_symbol.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_symbol.page
index a179c36..69a18a9 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_symbol.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_symbol.page
@@ -30,7 +30,7 @@ g_module_symbol().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_vfunc.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_vfunc.page
index 6f321d1..e36ee57 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_vfunc.page
@@ -23,14 +23,14 @@
<synopsis><code mime="text/x-csrc">
GIVFuncInfo* g_function_info_get_vfunc (GIFunctionInfo* info);
</code></synopsis>
-<p>Obtain the virtual function associated with this <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>.
-Only <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> with the flag %GI_FUNCTION_WRAPS_VFUNC has
+<p>Obtain the virtual function associated with this <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>.
+Only <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> with the flag %GI_FUNCTION_WRAPS_VFUNC has
a virtual function set. For other cases, %NULL will be returned.</p><p>Free it by calling g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_invoke.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_invoke.page
index bbb50b4..318ccc9 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_invoke.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_invoke.page
@@ -58,7 +58,7 @@ have been g_module_symbol()<!-- -->ed before calling this function.</p><p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> describing the function to invoke</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> describing the function to invoke</p></td>
</tr>
<tr>
<td><p>in_args :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_method.page
index 3fd47d7..6c4df0d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_method.page
@@ -34,7 +34,7 @@ returned if there's no method available with that name.</p><p>Free the struct by
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -42,7 +42,7 @@ returned if there's no method available with that name.</p><p>Free the struct by
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> or %NULL if none found.</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> or %NULL if none found.</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_vfunc.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_vfunc.page
index 339f08c..d78596e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_vfunc.page
@@ -34,7 +34,7 @@ for g_object_info_find_vfunc() for more information on virtuals.</p><p>g_base_in
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -42,7 +42,7 @@ for g_object_info_find_vfunc() for more information on virtuals.</p><p>g_base_in
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link>, or %NULL. Free it with</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>, or %NULL. Free it with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_constant.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_constant.page
index 64e77ea..5634b16 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_constant.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_constant.page
@@ -33,7 +33,7 @@ GIConstantInfo* g_interface_info_get_constant (GIInterfaceInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIConstantInfo* g_interface_info_get_constant (GIInterfaceInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.ConstantInfo">GIConstantInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_iface_struct.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_iface_struct.page
index a08e161..89d83a5 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_iface_struct.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_iface_struct.page
@@ -28,11 +28,11 @@ GIStructInfo* g_interface_info_get_iface_struct (GIInterfaceInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.StructInfo">GIStructInfo</link> or %NULL. Free it with</p></td>
+<td><p>the <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link> or %NULL. Free it with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_method.page
index 4007dcf..f98c84f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_method.page
@@ -33,7 +33,7 @@ GIFunctionInfo* g_interface_info_get_method (GIInterfaceInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIFunctionInfo* g_interface_info_get_method (GIInterfaceInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_constants.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_constants.page
index baecbd9..7139f14 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_constants.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_constants.page
@@ -28,7 +28,7 @@ gint g_interface_info_get_n_constants (GIInterfaceInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_methods.page
index b28b4fb..2ea816f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_methods.page
@@ -28,7 +28,7 @@ gint g_interface_info_get_n_methods (GIInterfaceInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_prerequisites.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_prerequisites.page
index d05d65a..712f2d1 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_prerequisites.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_prerequisites.page
@@ -30,7 +30,7 @@ interface, similar to an base class for GObjects.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_properties.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_properties.page
index fa3c91a..f0805f5 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_properties.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_properties.page
@@ -28,7 +28,7 @@ gint g_interface_info_get_n_properties (GIInterfaceInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_signals.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_signals.page
index 7ffb524..79bff47 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_signals.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_signals.page
@@ -28,7 +28,7 @@ gint g_interface_info_get_n_signals (GIInterfaceInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_vfuncs.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_vfuncs.page
index 2c61ec7..3e202f2 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_vfuncs.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_vfuncs.page
@@ -28,7 +28,7 @@ gint g_interface_info_get_n_vfuncs (GIInterfaceInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_prerequisite.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_prerequisite.page
index d3de034..db11a19 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_prerequisite.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_prerequisite.page
@@ -33,7 +33,7 @@ GIBaseInfo* g_interface_info_get_prerequisite (GIInterfaceInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIBaseInfo* g_interface_info_get_prerequisite (GIInterfaceInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the prerequisites as a <link xref="GIRepository.BaseInfo">GIBaseInfo</link>. Free the struct by calling</p></td>
+<td><p>the prerequisites as a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_property.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_property.page
index d36f1cf..366d742 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_property.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_property.page
@@ -33,7 +33,7 @@ GIPropertyInfo* g_interface_info_get_property (GIInterfaceInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIPropertyInfo* g_interface_info_get_property (GIInterfaceInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.PropertyInfo">GIPropertyInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_signal.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_signal.page
index a901af2..f8ef559 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_signal.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_signal.page
@@ -33,7 +33,7 @@ GISignalInfo* g_interface_info_get_signal (GIInterfaceInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GISignalInfo* g_interface_info_get_signal (GIInterfaceInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.SignalInfo">GISignalInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_vfunc.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_vfunc.page
index 1e4dabd..6e7c62d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_vfunc.page
@@ -33,7 +33,7 @@ GIVFuncInfo* g_interface_info_get_vfunc (GIInterfaceInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIVFuncInfo* g_interface_info_get_vfunc (GIInterfaceInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method.page
index d25d78c..ebf712a 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method.page
@@ -34,7 +34,7 @@ returned if there's no method available with that name.</p><p>g_base_info_unref(
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -42,7 +42,7 @@ returned if there's no method available with that name.</p><p>g_base_info_unref(
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method_using_interfaces.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method_using_interfaces.page
index f16fafa..a4a57f6 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method_using_interfaces.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method_using_interfaces.page
@@ -41,7 +41,7 @@ to chain up if that's desired.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -53,7 +53,7 @@ to chain up if that's desired.</p><p>g_base_info_unref() when done.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_signal.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_signal.page
index 0c5c023..2e451f9 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_signal.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_signal.page
@@ -33,7 +33,7 @@ GISignalInfo* g_object_info_find_signal (GIObjectInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_vfunc.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_vfunc.page
index 9f34efa..0a99d39 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_vfunc.page
@@ -39,7 +39,7 @@ information on invoking virtuals.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -47,7 +47,7 @@ information on invoking virtuals.</p><p>g_base_info_unref() when done.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link>, or %NULL. Free it with</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>, or %NULL. Free it with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_abstract.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_abstract.page
index 5a94cd1..2b5c7c5 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_abstract.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_abstract.page
@@ -29,7 +29,7 @@ instantiated</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_class_struct.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_class_struct.page
index 41ab20e..ddb0448 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_class_struct.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_class_struct.page
@@ -29,11 +29,11 @@ structure. This function returns the metadata for the class structure.</p><p>g_
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.StructInfo">GIStructInfo</link> or %NULL. Free with</p></td>
+<td><p>the <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link> or %NULL. Free with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_constant.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_constant.page
index 9e9872c..3064b45 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_constant.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_constant.page
@@ -33,7 +33,7 @@ GIConstantInfo* g_object_info_get_constant (GIObjectInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIConstantInfo* g_object_info_get_constant (GIObjectInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.ConstantInfo">GIConstantInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_field.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_field.page
index 9ccc7f2..cb46abb 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_field.page
@@ -33,7 +33,7 @@ GIFieldInfo* g_object_info_get_field (GIObjectInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIFieldInfo* g_object_info_get_field (GIObjectInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FieldInfo">GIFieldInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_fundamental.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_fundamental.page
index f31f6c6..b0f5244 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_fundamental.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_fundamental.page
@@ -29,7 +29,7 @@ G_TYPE_OBJECT. This is mostly for supporting GstMiniObject.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function.page
index 9723604..912a70f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function.page
@@ -32,7 +32,7 @@ see g_object_info_get_get_value_function().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function_pointer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function_pointer.page
index b76b841..94ade85 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function_pointer.page
@@ -31,7 +31,7 @@ the base classes of this type, starting at the top type.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_interface.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_interface.page
index bea6b86..d751b2f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_interface.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_interface.page
@@ -33,7 +33,7 @@ GIInterfaceInfo* g_object_info_get_interface (GIObjectInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIInterfaceInfo* g_object_info_get_interface (GIObjectInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_method.page
index 5a79066..b62b9ea 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_method.page
@@ -33,7 +33,7 @@ GIFunctionInfo* g_object_info_get_method (GIObjectInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIFunctionInfo* g_object_info_get_method (GIObjectInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_constants.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_constants.page
index afe462f..c52ca1d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_constants.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_constants.page
@@ -28,7 +28,7 @@ gint g_object_info_get_n_constants (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_fields.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_fields.page
index 0f6ed3c..99d7f6e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_fields.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_fields.page
@@ -28,7 +28,7 @@ gint g_object_info_get_n_fields (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_interfaces.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_interfaces.page
index 07b08f2..421d938 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_interfaces.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_interfaces.page
@@ -28,7 +28,7 @@ gint g_object_info_get_n_interfaces (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_methods.page
index c506dc2..867bb57 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_methods.page
@@ -28,7 +28,7 @@ gint g_object_info_get_n_methods (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_properties.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_properties.page
index ceedbfd..cb1b65b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_properties.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_properties.page
@@ -28,7 +28,7 @@ gint g_object_info_get_n_properties (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_signals.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_signals.page
index 768cbeb..73ae0e9 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_signals.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_signals.page
@@ -28,7 +28,7 @@ gint g_object_info_get_n_signals (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_vfuncs.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_vfuncs.page
index 1c48492..4d9bc22 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_vfuncs.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_vfuncs.page
@@ -28,7 +28,7 @@ gint g_object_info_get_n_vfuncs (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_parent.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_parent.page
index 99c2f07..158773e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_parent.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_parent.page
@@ -28,11 +28,11 @@ GIObjectInfo* g_object_info_get_parent (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.ObjectInfo">GIObjectInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_property.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_property.page
index b7fbec3..21701c6 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_property.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_property.page
@@ -33,7 +33,7 @@ GIPropertyInfo* g_object_info_get_property (GIObjectInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIPropertyInfo* g_object_info_get_property (GIObjectInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.PropertyInfo">GIPropertyInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function.page
index 95269b0..b0aba2d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function.page
@@ -31,7 +31,7 @@ see g_object_info_get_ref_function().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function_pointer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function_pointer.page
index 152c9cd..67263ae 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function_pointer.page
@@ -31,7 +31,7 @@ the base classes of this type, starting at the top type.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function.page
index c16fee6..950070a 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function.page
@@ -32,7 +32,7 @@ see g_object_info_get_set_value_function().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function_pointer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function_pointer.page
index 1b76add..442d602 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function_pointer.page
@@ -31,7 +31,7 @@ the base classes of this type, starting at the top type.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_signal.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_signal.page
index fffecb1..ed92e25 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_signal.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_signal.page
@@ -33,7 +33,7 @@ GISignalInfo* g_object_info_get_signal (GIObjectInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GISignalInfo* g_object_info_get_signal (GIObjectInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.SignalInfo">GISignalInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_init.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_init.page
index 1754b12..a21b5b3 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_init.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_init.page
@@ -29,7 +29,7 @@ function for which this object type is registered.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_name.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_name.page
index c224146..a67af92 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_name.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_name.page
@@ -28,7 +28,7 @@ gchar* g_object_info_get_type_name (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function.page
index 84040c0..9b3b2f4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function.page
@@ -31,7 +31,7 @@ see g_object_info_get_unref_function().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function_pointer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function_pointer.page
index 3f71fef..775ece3 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function_pointer.page
@@ -31,7 +31,7 @@ the base classes of this type, starting at the top type.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_vfunc.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_vfunc.page
index a5e4c64..846fc45 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_vfunc.page
@@ -33,7 +33,7 @@ GIVFuncInfo* g_object_info_get_vfunc (GIObjectInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIVFuncInfo* g_object_info_get_vfunc (GIObjectInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_flags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_flags.page
index 63979c0..5e41efe 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_flags.page
@@ -29,7 +29,7 @@ more information about possible flag values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.PropertyInfo">GIPropertyInfo</link></p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_ownership_transfer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_ownership_transfer.page
index d5eca0a..990754f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_ownership_transfer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_ownership_transfer.page
@@ -23,13 +23,13 @@
<synopsis><code mime="text/x-csrc">
GITransfer g_property_info_get_ownership_transfer (GIPropertyInfo* info);
</code></synopsis>
-<p>Obtain the ownership transfer for this property. See <link xref="GIRepository.Transfer">GITransfer</link> for more
+<p>Obtain the ownership transfer for this property. See <link xref="GIRepository.Transfer">GIRepository.Transfer</link> for more
information about transfer values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.PropertyInfo">GIPropertyInfo</link></p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_type.page
index 21a24d1..e069cda 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_type.page
@@ -28,11 +28,11 @@ GITypeInfo* g_property_info_get_type (GIPropertyInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.PropertyInfo">GIPropertyInfo</link></p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</link>, free it with</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>, free it with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_g_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_g_type.page
index 6c3ac43..419336b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_g_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_g_type.page
@@ -31,7 +31,7 @@ that the shared library which provides the type_init function for this
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRepository.RegisteredTypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_init.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_init.page
index 6e94729..b82f0a0 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_init.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_init.page
@@ -31,7 +31,7 @@ g_registered_type_info_get_g_type() directly instead.</p><p>passing into g_modul
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRepository.RegisteredTypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_name.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_name.page
index 9a91fd3..a176509 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_name.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_name.page
@@ -29,7 +29,7 @@ This type can be passed to g_type_name() to get a <link xref="GType">GType</link
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRepository.RegisteredTypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_class_closure.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_class_closure.page
index 3e49579..29534f2 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_class_closure.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_class_closure.page
@@ -30,7 +30,7 @@ If the signal lacks a closure %NULL will be returned.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.SignalInfo">GISignalInfo</link></p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_flags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_flags.page
index 5182c03..bbd3180 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_flags.page
@@ -29,7 +29,7 @@ more information about possible flag values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.SignalInfo">GISignalInfo</link></p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_true_stops_emit.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_true_stops_emit.page
index 190060a..e986f96 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_true_stops_emit.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_true_stops_emit.page
@@ -29,7 +29,7 @@ stop the emission of the signal.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.SignalInfo">GISignalInfo</link></p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_find_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_find_method.page
index 014ce45..5d7da64 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_find_method.page
@@ -33,7 +33,7 @@ GIFunctionInfo* g_struct_info_find_method (GIStructInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -41,7 +41,7 @@ GIFunctionInfo* g_struct_info_find_method (GIStructInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_alignment.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_alignment.page
index 9b160f1..412b9c2 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_alignment.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_alignment.page
@@ -28,7 +28,7 @@ gsize g_struct_info_get_alignment (GIStructInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_field.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_field.page
index abe1dec..7baf0de 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_field.page
@@ -33,7 +33,7 @@ GIFieldInfo* g_struct_info_get_field (GIStructInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIFieldInfo* g_struct_info_get_field (GIStructInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FieldInfo">GIFieldInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>, free it with g_base_info_unref()</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_method.page
index e37c363..2ef40a5 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_method.page
@@ -33,7 +33,7 @@ GIFunctionInfo* g_struct_info_get_method (GIStructInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIFunctionInfo* g_struct_info_get_method (GIStructInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_fields.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_fields.page
index 4a2c2cb..ae21e5d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_fields.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_fields.page
@@ -28,7 +28,7 @@ gint g_struct_info_get_n_fields (GIStructInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_methods.page
index 3268eda..00ab107 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_methods.page
@@ -28,7 +28,7 @@ gint g_struct_info_get_n_methods (GIStructInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_size.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_size.page
index 34d26f3..170bd82 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_size.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_size.page
@@ -28,7 +28,7 @@ gsize g_struct_info_get_size (GIStructInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_gtype_struct.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_gtype_struct.page
index fa1ef5f..7a42b85 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_gtype_struct.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_gtype_struct.page
@@ -30,7 +30,7 @@ from generated public APIs.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_fixed_size.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_fixed_size.page
index 34c38be..def200b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_fixed_size.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_fixed_size.page
@@ -29,7 +29,7 @@ gint g_type_info_get_array_fixed_size (GITypeInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_length.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_length.page
index 91d62aa..bcd94a7 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_length.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_length.page
@@ -29,7 +29,7 @@ gint g_type_info_get_array_length (GITypeInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_type.page
index 864b293..29e3311 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_type.page
@@ -23,14 +23,14 @@
<synopsis><code mime="text/x-csrc">
GIArrayType g_type_info_get_array_type (GITypeInfo* info);
</code></synopsis>
-<p>Obtain the array type for this type. See <link xref="GIRepository.ArrayType">GIArrayType</link> for a list of
+<p>Obtain the array type for this type. See <link xref="GIRepository.ArrayType">GIRepository.ArrayType</link> for a list of
possible values. If the type tag of this type is not array, -1 will be
returned.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_interface.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_interface.page
index e0385cd..69d95e3 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_interface.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_interface.page
@@ -25,17 +25,17 @@ GIBaseInfo* g_type_info_get_interface (GITypeInfo* info);
</code></synopsis>
<p>For types which have <link xref="GI_TYPE_TAG_INTERFACE">GI_TYPE_TAG_INTERFACE</link> such as GObjects and boxed values,
this function returns full information about the referenced type. You can then
-inspect the type of the returned <link xref="GIRepository.BaseInfo">GIBaseInfo</link> to further query whether it is
+inspect the type of the returned <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> to further query whether it is
a concrete GObject, a GInterface, a structure, etc. using g_base_info_get_type().</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.BaseInfo">GIBaseInfo</link>, or %NULL. Free it with</p></td>
+<td><p>the <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>, or %NULL. Free it with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_param_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_param_type.page
index 3b88d46..1e174ed 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_param_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_param_type.page
@@ -33,7 +33,7 @@ GITypeInfo* g_type_info_get_param_type (GITypeInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_tag.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_tag.page
index c6598e7..aaa367f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_tag.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_tag.page
@@ -23,13 +23,13 @@
<synopsis><code mime="text/x-csrc">
GITypeTag g_type_info_get_tag (GITypeInfo* info);
</code></synopsis>
-<p>Obtain the type tag for the type. See <link xref="GIRepository.TypeTag">GITypeTag</link> for a list
+<p>Obtain the type tag for the type. See <link xref="GIRepository.TypeTag">GIRepository.TypeTag</link> for a list
of type tags.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_pointer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_pointer.page
index 12a7e28..00129c2 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_pointer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_pointer.page
@@ -28,7 +28,7 @@ gboolean g_type_info_is_pointer (GITypeInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_zero_terminated.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_zero_terminated.page
index 7fc1f43..674f446 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_zero_terminated.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_zero_terminated.page
@@ -29,7 +29,7 @@ gboolean g_type_info_is_zero_terminated (GITypeInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_find_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_find_method.page
index 552d0b1..3d88c32 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_find_method.page
@@ -33,7 +33,7 @@ GIFunctionInfo* g_union_info_find_method (GIUnionInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -41,7 +41,7 @@ GIFunctionInfo* g_union_info_find_method (GIUnionInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_alignment.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_alignment.page
index 5e17b3a..c88852a 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_alignment.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_alignment.page
@@ -28,7 +28,7 @@ gsize g_union_info_get_alignment (GIUnionInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator.page
index 997b658..9cc0106 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator.page
@@ -35,7 +35,7 @@ constant.</p><p>when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -43,7 +43,7 @@ constant.</p><p>when done.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.ConstantInfo">GIConstantInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link>, free it with g_base_info_unref()</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_type.page
index ba6217b..f51155c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_type.page
@@ -28,11 +28,11 @@ GITypeInfo* g_union_info_get_discriminator_type (GIUnionInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>, free it with g_base_info_unref()</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_field.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_field.page
index d3a127f..a9a03d0 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_field.page
@@ -33,7 +33,7 @@ GIFieldInfo* g_union_info_get_field (GIUnionInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIFieldInfo* g_union_info_get_field (GIUnionInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FieldInfo">GIFieldInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>, free it with g_base_info_unref()</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_method.page
index de0dcd1..8c08e54 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_method.page
@@ -33,7 +33,7 @@ GIFunctionInfo* g_union_info_get_method (GIUnionInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIFunctionInfo* g_union_info_get_method (GIUnionInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_fields.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_fields.page
index 3b47ff3..e3cd6d4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_fields.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_fields.page
@@ -28,7 +28,7 @@ gint g_union_info_get_n_fields (GIUnionInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_methods.page
index 40d1492..ec10c17 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_methods.page
@@ -28,7 +28,7 @@ gint g_union_info_get_n_methods (GIUnionInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_size.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_size.page
index 6b98dac..e5aa879 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_size.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_size.page
@@ -28,7 +28,7 @@ gsize g_union_info_get_size (GIUnionInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_is_discriminated.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_is_discriminated.page
index 248b472..5c46a46 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_is_discriminated.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_is_discriminated.page
@@ -28,7 +28,7 @@ gboolean g_union_info_is_discriminated (GIUnionInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.value_info_get_value.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.value_info_get_value.page
index 3758e19..637db67 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.value_info_get_value.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.value_info_get_value.page
@@ -23,13 +23,13 @@
<synopsis><code mime="text/x-csrc">
gint64 g_value_info_get_value (GIValueInfo* info);
</code></synopsis>
-<p>Obtain the enumeration value of the <link xref="GIRepository.ValueInfo">GIValueInfo</link>.</p><p>as a 32-bit signed or unsigned value. The use of gint64 as the
+<p>Obtain the enumeration value of the <link xref="GIRepository.ValueInfo">GIRepository.ValueInfo</link>.</p><p>as a 32-bit signed or unsigned value. The use of gint64 as the
return type is to allow both.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ValueInfo">GIValueInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ValueInfo">GIRepository.ValueInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_address.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_address.page
index 391965d..750128e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_address.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_address.page
@@ -34,7 +34,7 @@ is the implementation for @info.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
</tr>
<tr>
<td><p>implementor_gtype :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_flags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_flags.page
index bc082b2..d6eafd9 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_flags.page
@@ -23,13 +23,13 @@
<synopsis><code mime="text/x-csrc">
GIVFuncInfoFlags g_vfunc_info_get_flags (GIVFuncInfo* info);
</code></synopsis>
-<p>Obtain the flags for this virtual function info. See <link xref="GIRepository.VFuncInfoFlags">GIVFuncInfoFlags</link> for
+<p>Obtain the flags for this virtual function info. See <link xref="GIRepository.VFuncInfoFlags">GIRepository.VFuncInfoFlags</link> for
more information about possible flag values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_invoker.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_invoker.page
index 90b32f9..d0550f3 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_invoker.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_invoker.page
@@ -29,11 +29,11 @@ method will return it. An invoker method is a C entry point.</p><p>Not all virt
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link> or %NULL. Free it with</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link> or %NULL. Free it with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_offset.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_offset.page
index 7855068..f6423d8 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_offset.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_offset.page
@@ -29,7 +29,7 @@ gint g_vfunc_info_get_offset (GIVFuncInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_signal.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_signal.page
index fde4f77..2ae55cd 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_signal.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_signal.page
@@ -30,7 +30,7 @@ this virtual function belongs.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_invoke.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_invoke.page
index c644e22..b12d431 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_invoke.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_invoke.page
@@ -60,7 +60,7 @@ argument lists.</p><p>error occurred.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link> describing the virtual function to invoke</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link> describing the virtual function to invoke</p></td>
</tr>
<tr>
<td><p>implementor :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArrayType.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArrayType.page
index da62f44..1a88368 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArrayType.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArrayType.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.ArrayType</title>
-<p>The type of array in a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</p>
+<p>The type of array in a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.equal.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.equal.page
index c4e2714..e7e329f 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.equal.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.equal.page
@@ -25,14 +25,14 @@
@returns(gboolean)
def equal(info2)
</code></synopsis>
-<p>Compare two <link xref="GIRepository.BaseInfo">GIBaseInfo</link>.</p><p>Using pointer comparison is not practical since many functions return
-different instances of <link xref="GIRepository.BaseInfo">GIBaseInfo</link> that refers to the same part of the
-TypeLib; use this function instead to do <link xref="GIRepository.BaseInfo">GIBaseInfo</link> comparisons.</p>
+<p>Compare two <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>.</p><p>Using pointer comparison is not practical since many functions return
+different instances of <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> that refers to the same part of the
+TypeLib; use this function instead to do <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> comparisons.</p>
<table>
<tr>
<td><p>info2 :</p></td>
-<td><p>a <link xref="GIRepository.BaseInfo">GIBaseInfo</link></p></td>
+<td><p>a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_container.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_container.page
index 507aac8..c529cb1 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_container.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_container.page
@@ -21,8 +21,8 @@
def get_container()
</code></synopsis>
<p>Obtain the container of the @info. The container is the parent
-GIBaseInfo. For instance, the parent of a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> is an
-<link xref="GIRepository.ObjectInfo">GIObjectInfo</link> or <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link>.</p>
+GIBaseInfo. For instance, the parent of a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> is an
+<link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link> or <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link>.</p>
<table>
<tr>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_name.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_name.page
index d0f3f00..5ec5580 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_name.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_name.page
@@ -21,7 +21,7 @@
def get_name()
</code></synopsis>
<p>Obtain the name of the @info. What the name represents depends on
-the <link xref="GIRepository.InfoType">GIInfoType</link> of the @info. For instance for <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> it is
+the <link xref="GIRepository.InfoType">GIRepository.InfoType</link> of the @info. For instance for <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> it is
the name of the function.</p>
<table>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.iterate_attributes.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.iterate_attributes.page
index 697a1d0..9ef317d 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.iterate_attributes.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.iterate_attributes.page
@@ -56,7 +56,7 @@ g_print ("attribute name: %s value: %s", name, value);
<table>
<tr>
<td><p>iterator :</p></td>
-<td><p>a <link xref="GIRepository.AttributeIter">GIAttributeIter</link> structure, must be initialized; see below</p></td>
+<td><p>a <link xref="GIRepository.AttributeIter">GIRepository.AttributeIter</link> structure, must be initialized; see below</p></td>
</tr>
<tr>
<td><p>name :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.CallableInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.CallableInfo.page
index d0123bd..ab20f81 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.CallableInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.CallableInfo.page
@@ -7,6 +7,6 @@
<info>
</info>
<title>GIRepository.CallableInfo</title>
-<p>Represents a callable, either <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>, <link xref="GIRepository.CallbackInfo">GICallbackInfo</link> or
-<link xref="GIRepository.VFuncInfo">GIVFuncInfo</link>.</p>
+<p>Represents a callable, either <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, <link xref="GIRepository.CallbackInfo">GIRepository.CallbackInfo</link> or
+<link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Direction.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Direction.page
index d8dd647..b010ba3 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Direction.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Direction.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.Direction</title>
-<p>The direction of a <link xref="GIRepository.ArgInfo">GIArgInfo</link>.</p>
+<p>The direction of a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfo.page
index a1812f4..0e90eba 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfo.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.FieldInfo</title>
-<p>Represents a field of a <link xref="GIRepository.StructInfo">GIStructInfo</link> or a <link xref="GIRepository.UnionInfo">GIUnionInfo</link>.</p>
+<p>Represents a field of a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link> or a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link>.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfoFlags.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfoFlags.page
index 81310c9..87df966 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfoFlags.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.FieldInfoFlags</title>
-<p>Flags for a <link xref="GIRepository.FieldInfo">GIFieldInfo</link>.</p>
+<p>Flags for a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FunctionInfoFlags.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FunctionInfoFlags.page
index 929c4e8..962e3ff 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FunctionInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FunctionInfoFlags.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.FunctionInfoFlags</title>
-<p>Flags for a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> struct.</p>
+<p>Flags for a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> struct.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.PropertyInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.PropertyInfo.page
index 5a5cbc9..4d38359 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.PropertyInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.PropertyInfo.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.PropertyInfo</title>
-<p>Represents a property of a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link> or a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link>.</p>
+<p>Represents a property of a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link> or a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link>.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_error_domain.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_error_domain.page
index d50b928..843b68b 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_error_domain.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_error_domain.page
@@ -41,7 +41,7 @@ otherwise ensure the namespace has already been loaded.</p><p>enum type, or None
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p><link xref="GIRepository.EnumInfo">GIEnumInfo</link> representing metadata about @domain's</p></td>
+<td><p><link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link> representing metadata about @domain's</p></td>
</tr>
</table>
<p>Since 1.29.17</p>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_gtype.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_gtype.page
index 8e16064..006ce3c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_gtype.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_gtype.page
@@ -43,7 +43,7 @@ when you know the GType to originate from be from a loaded namespace.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p><link xref="GIRepository.BaseInfo">GIBaseInfo</link> representing metadata about @type, or None</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> representing metadata about @type, or None</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_name.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_name.page
index 0f9a17a..5b84d4f 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_name.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_name.page
@@ -49,7 +49,7 @@ ensure the namespace has already been loaded.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p><link xref="GIRepository.BaseInfo">GIBaseInfo</link> representing metadata about @name, or None</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> representing metadata about @name, or None</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_default.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_default.page
index 3ba3243..1c8e529 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_default.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_default.page
@@ -20,20 +20,20 @@
@returns(GIRepository.Repository)
def get_default()
</code></synopsis>
-<p>Returns the singleton process-global default <link xref="GIRepository.Repository">GIRepository</link>. It is
+<p>Returns the singleton process-global default <link xref="GIRepository.Repository">GIRepository.Repository</link>. It is
not currently supported to have multiple repositories in a
particular process, but this function is provided in the unlikely
eventuality that it would become possible, and as a convenience for
higher level language bindings to conform to the GObject method
call conventions.
-All methods on <link xref="GIRepository.Repository">GIRepository</link> also accept None as an instance
+All methods on <link xref="GIRepository.Repository">GIRepository.Repository</link> also accept None as an instance
parameter to mean this default repository, which is usually more
convenient for C.</p>
<table>
<tr>
<td><p>Returns :</p></td>
-<td><p>The global singleton <link xref="GIRepository.Repository">GIRepository</link></p></td>
+<td><p>The global singleton <link xref="GIRepository.Repository">GIRepository.Repository</link></p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_info.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_info.page
index d9dfc68..62e4549 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_info.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_info.page
@@ -50,7 +50,7 @@ entries.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p><link xref="GIRepository.BaseInfo">GIBaseInfo</link> containing metadata</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> containing metadata</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require.page
index ed80f2b..4995f3c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require.page
@@ -58,7 +58,7 @@ not specified, the latest will be used.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>a pointer to the <link xref="GIRepository.Typelib">GITypelib</link> if successful, None otherwise</p></td>
+<td><p>a pointer to the <link xref="GIRepository.Typelib">GIRepository.Typelib</link> if successful, None otherwise</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require_private.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require_private.page
index 7a9e404..034914e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require_private.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require_private.page
@@ -66,7 +66,7 @@ not specified, the latest will be used.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>a pointer to the <link xref="GIRepository.Typelib">GITypelib</link> if successful, None otherwise</p></td>
+<td><p>a pointer to the <link xref="GIRepository.Typelib">GIRepository.Typelib</link> if successful, None otherwise</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ScopeType.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ScopeType.page
index 6a9d8de..5f12828 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ScopeType.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ScopeType.page
@@ -7,7 +7,7 @@
<info>
</info>
<title>GIRepository.ScopeType</title>
-<p>Scope type of a <link xref="GIRepository.ArgInfo">GIArgInfo</link> representing callback, determines how the
+<p>Scope type of a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link> representing callback, determines how the
callback is invoked and is used to decided when the invoke structs
can be freed.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Transfer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Transfer.page
index b79e210..37319a5 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Transfer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Transfer.page
@@ -11,7 +11,7 @@
the caller. The callee is either a function/method/signal or an
object/interface where a property is defined. The caller is the side
accessing a property or calling a function.
-<link xref="GIRepository.Transfer">GITransfer</link> specifies who's responsible for freeing the resources after the
+<link xref="GIRepository.Transfer">GIRepository.Transfer</link> specifies who's responsible for freeing the resources after the
ownership transfer is complete. In case of a containing type such as a list,
an array or a hash table the container itself is specified differently from
the items within the container itself. Each container is freed differently,
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeTag.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeTag.page
index ca21e54..328d5fe 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeTag.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeTag.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.TypeTag</title>
-<p>The type tag of a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</p>
+<p>The type tag of a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.VFuncInfoFlags.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.VFuncInfoFlags.page
index c39aa56..a750dfd 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.VFuncInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.VFuncInfoFlags.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.VFuncInfoFlags</title>
-<p>Flags of a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link> struct.</p>
+<p>Flags of a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link> struct.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ValueInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ValueInfo.page
index 9207bfd..39ad0fa 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ValueInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ValueInfo.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.ValueInfo</title>
-<p>Represents a enum value of a <link xref="GIRepository.EnumInfo">GIEnumInfo</link>.</p>
+<p>Represents a enum value of a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link>.</p>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_closure.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_closure.page
index 74b0afe..4cc663e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_closure.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_closure.page
@@ -31,7 +31,7 @@ for arguments which are callbacks.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_destroy.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_destroy.page
index 1a6ca59..be3a4f7 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_destroy.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_destroy.page
@@ -31,7 +31,7 @@ for arguments which are callbacks.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_direction.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_direction.page
index abc0692..c96c426 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_direction.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_direction.page
@@ -25,13 +25,13 @@
@returns(GIRepository.Direction)
def arg_info_get_direction(info)
</code></synopsis>
-<p>Obtain the direction of the argument. Check <link xref="GIRepository.Direction">GIDirection</link> for possible
+<p>Obtain the direction of the argument. Check <link xref="GIRepository.Direction">GIRepository.Direction</link> for possible
direction values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_ownership_transfer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_ownership_transfer.page
index 2d415d4..3a7c65e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_ownership_transfer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_ownership_transfer.page
@@ -26,12 +26,12 @@
def arg_info_get_ownership_transfer(info)
</code></synopsis>
<p>Obtain the ownership transfer for this argument.
-<link xref="GIRepository.Transfer">GITransfer</link> contains a list of possible values.</p>
+<link xref="GIRepository.Transfer">GIRepository.Transfer</link> contains a list of possible values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_scope.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_scope.page
index d613626..63ccc34 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_scope.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_scope.page
@@ -28,12 +28,12 @@ def arg_info_get_scope(info)
<p>Obtain the scope type for this argument. The scope type explains
how a callback is going to be invoked, most importantly when
the resources required to invoke it can be freed.
-<link xref="GIRepository.ScopeType">GIScopeType</link> contains a list of possible values.</p>
+<link xref="GIRepository.ScopeType">GIRepository.ScopeType</link> contains a list of possible values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_type.page
index 1336153..3b71b73 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_type.page
@@ -30,11 +30,11 @@ def arg_info_get_type(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.ArgInfo">GIArgInfo</link>, free it with</p></td>
+<td><p>the <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>, free it with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_caller_allocates.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_caller_allocates.page
index 9a0835c..1f297fc 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_caller_allocates.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_caller_allocates.page
@@ -33,7 +33,7 @@ callee allocates; if this is True, then the caller must allocate.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_optional.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_optional.page
index 61aefb2..91d1988 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_optional.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_optional.page
@@ -30,7 +30,7 @@ def arg_info_is_optional(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_return_value.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_return_value.page
index 40fa3aa..ccad77e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_return_value.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_return_value.page
@@ -31,7 +31,7 @@ parameter or a return value.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_skip.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_skip.page
index 8eeabcf..8d26c65 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_skip.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_skip.page
@@ -30,7 +30,7 @@ def arg_info_is_skip(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_load_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_load_type.page
index 38c84f7..27e5ac4 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_load_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_load_type.page
@@ -36,7 +36,7 @@ allocation.</p><p>The initialized @type must not be referenced after @info is de
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>type :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_may_be_null.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_may_be_null.page
index 254da25..d903427 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_may_be_null.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_may_be_null.page
@@ -30,7 +30,7 @@ def arg_info_may_be_null(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.base_info_get_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.base_info_get_type.page
index 2064d40..765af90 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.base_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.base_info_get_type.page
@@ -30,7 +30,7 @@ def base_info_get_type(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.BaseInfo">GIBaseInfo</link></p></td>
+<td><p>a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_arg.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_arg.page
index 552d4e2..eb33562 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_arg.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_arg.page
@@ -34,7 +34,7 @@ def callable_info_get_arg(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def callable_info_get_arg(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.ArgInfo">GIArgInfo</link>. Free it with</p></td>
+<td><p>the <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>. Free it with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_caller_owns.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_caller_owns.page
index 700ff5e..46f340c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_caller_owns.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_caller_owns.page
@@ -26,12 +26,12 @@
def callable_info_get_caller_owns(info)
</code></synopsis>
<p>See whether the caller owns the return value of this callable.
-<link xref="GIRepository.Transfer">GITransfer</link> contains a list of possible transfer values.</p>
+<link xref="GIRepository.Transfer">GIRepository.Transfer</link> contains a list of possible transfer values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_n_args.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_n_args.page
index ba7e31a..831e9fb 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_n_args.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_n_args.page
@@ -30,7 +30,7 @@ def callable_info_get_n_args(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_attribute.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_attribute.page
index c951308..52ddc1b 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_attribute.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_attribute.page
@@ -34,7 +34,7 @@ def callable_info_get_return_attribute(info, name)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_type.page
index a73377a..e54edfe 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_type.page
@@ -25,16 +25,16 @@
@returns(GIRepository.TypeInfo)
def callable_info_get_return_type(info)
</code></synopsis>
-<p>Obtain the return type of a callable item as a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+<p>Obtain the return type of a callable item as a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_iterate_return_attributes.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_iterate_return_attributes.page
index de2ff2d..fd04e15 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_iterate_return_attributes.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_iterate_return_attributes.page
@@ -46,11 +46,11 @@ similar API.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>iterator :</p></td>
-<td><p>a <link xref="GIRepository.AttributeIter">GIAttributeIter</link> structure, must be initialized; see below</p></td>
+<td><p>a <link xref="GIRepository.AttributeIter">GIRepository.AttributeIter</link> structure, must be initialized; see below</p></td>
</tr>
<tr>
<td><p>name :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_arg.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_arg.page
index 7f152f8..8f3cbcd 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_arg.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_arg.page
@@ -40,7 +40,7 @@ allocation.</p><p>The initialized @arg must not be referenced after @info is dea
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_return_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_return_type.page
index 423ba0d..04e7aaf 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_return_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_return_type.page
@@ -36,7 +36,7 @@ allocation.</p><p>The initialized @type must not be referenced after @info is de
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>type :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_may_return_null.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_may_return_null.page
index 9694697..8e7c10a 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_may_return_null.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_may_return_null.page
@@ -30,7 +30,7 @@ def callable_info_may_return_null(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_skip_return.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_skip_return.page
index 35d64ac..48152a3 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_skip_return.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_skip_return.page
@@ -30,7 +30,7 @@ def callable_info_skip_return(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_free_value.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_free_value.page
index ca96710..58eb946 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_free_value.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_free_value.page
@@ -34,7 +34,7 @@ def constant_info_free_value(info, value)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ConstantInfo">GIConstantInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link></p></td>
</tr>
<tr>
<td><p>value :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_type.page
index 85908bc..542313d 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_type.page
@@ -25,16 +25,16 @@
@returns(GIRepository.TypeInfo)
def constant_info_get_type(info)
</code></synopsis>
-<p>Obtain the type of the constant as a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+<p>Obtain the type of the constant as a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ConstantInfo">GIConstantInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_value.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_value.page
index ccd6bf9..6369c8a 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_value.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_value.page
@@ -29,7 +29,7 @@
@returns(gint)
def constant_info_get_value(info, value)
</code></synopsis>
-<p>Obtain the value associated with the <link xref="GIRepository.ConstantInfo">GIConstantInfo</link> and store it in the
+<p>Obtain the value associated with the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link> and store it in the
@value parameter. @argument needs to be allocated before passing it in.
The size of the constant value stored in @argument will be returned.
Free the value with g_constant_info_free_value().</p>
@@ -37,7 +37,7 @@ Free the value with g_constant_info_free_value().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ConstantInfo">GIConstantInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link></p></td>
</tr>
<tr>
<td><p>value :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_method.page
index 77cb434..994391a 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_method.page
@@ -34,7 +34,7 @@ def enum_info_get_method(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.EnumInfo">GIEnumInfo</link></p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def enum_info_get_method(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
<p>Since 1.29.17</p>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_n_methods.page
index db076a3..e498627 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_n_methods.page
@@ -30,7 +30,7 @@ def enum_info_get_n_methods(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.EnumInfo">GIEnumInfo</link></p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_storage_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_storage_type.page
index 7c8f1b9..e9076cc 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_storage_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_storage_type.page
@@ -34,7 +34,7 @@ may not match the sign of the type used by the C compiler.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.EnumInfo">GIEnumInfo</link></p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_value.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_value.page
index 0deb0e3..06fc6c9 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_value.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_value.page
@@ -34,7 +34,7 @@ def enum_info_get_value(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.EnumInfo">GIEnumInfo</link></p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_field.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_field.page
index 2c6429c..a9d26da 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_field.page
@@ -41,7 +41,7 @@ even if that is actually readable.</p>
<table>
<tr>
<td><p>field_info :</p></td>
-<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
</tr>
<tr>
<td><p>mem :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_flags.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_flags.page
index bdc59cc..d5ce386 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_flags.page
@@ -25,13 +25,13 @@
@returns(GIRepository.FieldInfoFlags)
def field_info_get_flags(info)
</code></synopsis>
-<p>Obtain the flags for this <link xref="GIRepository.FieldInfo">GIFieldInfo</link>. See <link xref="GIRepository.FieldInfoFlags">GIFieldInfoFlags</link> for possible
+<p>Obtain the flags for this <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>. See <link xref="GIRepository.FieldInfoFlags">GIRepository.FieldInfoFlags</link> for possible
flag values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_offset.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_offset.page
index 1847c48..97434eb 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_offset.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_offset.page
@@ -31,7 +31,7 @@ to the beginning of the struct or union.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_size.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_size.page
index 9b320cb..19f80ec 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_size.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_size.page
@@ -31,7 +31,7 @@ much space you need to allocate to store the field.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_type.page
index f9f2d3f..f001fca 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_type.page
@@ -25,16 +25,16 @@
@returns(GIRepository.TypeInfo)
def field_info_get_type(info)
</code></synopsis>
-<p>Obtain the type of a field as a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+<p>Obtain the type of a field as a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_set_field.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_set_field.page
index 6292ef9..e4a3ee1 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_set_field.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_set_field.page
@@ -43,7 +43,7 @@ with a type such as 'char *' must be set with a setter function.</p>
<table>
<tr>
<td><p>field_info :</p></td>
-<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
</tr>
<tr>
<td><p>mem :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_flags.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_flags.page
index 4a68c7b..fd08039 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_flags.page
@@ -25,12 +25,12 @@
@returns(GIRepository.FunctionInfoFlags)
def function_info_get_flags(info)
</code></synopsis>
-<p>Obtain the <link xref="GIRepository.FunctionInfoFlags">GIFunctionInfoFlags</link> for the @info.</p>
+<p>Obtain the <link xref="GIRepository.FunctionInfoFlags">GIRepository.FunctionInfoFlags</link> for the @info.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_property.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_property.page
index 3fad6e0..45b8a82 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_property.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_property.page
@@ -25,15 +25,15 @@
@returns(GIRepository.PropertyInfo)
def function_info_get_property(info)
</code></synopsis>
-<p>Obtain the property associated with this <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>.
-Only <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> with the flag %GI_FUNCTION_IS_GETTER or
+<p>Obtain the property associated with this <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>.
+Only <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> with the flag %GI_FUNCTION_IS_GETTER or
%GI_FUNCTION_IS_SETTER have a property set. For other cases,
None will be returned.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_symbol.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_symbol.page
index e75087a..fffd248 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_symbol.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_symbol.page
@@ -32,7 +32,7 @@ g_module_symbol().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_vfunc.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_vfunc.page
index 8b51bc7..e7ba3c8 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_vfunc.page
@@ -25,14 +25,14 @@
@returns(GIRepository.VFuncInfo)
def function_info_get_vfunc(info)
</code></synopsis>
-<p>Obtain the virtual function associated with this <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>.
-Only <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> with the flag %GI_FUNCTION_WRAPS_VFUNC has
+<p>Obtain the virtual function associated with this <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>.
+Only <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> with the flag %GI_FUNCTION_WRAPS_VFUNC has
a virtual function set. For other cases, None will be returned.</p><p>Free it by calling g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_invoke.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_invoke.page
index 4a2696d..0ad4509 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_invoke.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_invoke.page
@@ -55,7 +55,7 @@ have been g_module_symbol()<!-- -->ed before calling this function.</p><p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> describing the function to invoke</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> describing the function to invoke</p></td>
</tr>
<tr>
<td><p>in_args :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_method.page
index c531f4c..be95a51 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_method.page
@@ -35,7 +35,7 @@ returned if there's no method available with that name.</p><p>Free the struct by
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -43,7 +43,7 @@ returned if there's no method available with that name.</p><p>Free the struct by
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> or None if none found.</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> or None if none found.</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_vfunc.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_vfunc.page
index e21ffae..b23e4e4 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_vfunc.page
@@ -35,7 +35,7 @@ for g_object_info_find_vfunc() for more information on virtuals.</p><p>g_base_in
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -43,7 +43,7 @@ for g_object_info_find_vfunc() for more information on virtuals.</p><p>g_base_in
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link>, or None. Free it with</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>, or None. Free it with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_constant.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_constant.page
index 0e9a9be..5b3fbce 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_constant.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_constant.page
@@ -34,7 +34,7 @@ def interface_info_get_constant(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def interface_info_get_constant(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.ConstantInfo">GIConstantInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_iface_struct.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_iface_struct.page
index 53164c6..571bbde 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_iface_struct.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_iface_struct.page
@@ -30,11 +30,11 @@ def interface_info_get_iface_struct(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.StructInfo">GIStructInfo</link> or None. Free it with</p></td>
+<td><p>the <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link> or None. Free it with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_method.page
index 3041741..760a096 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_method.page
@@ -34,7 +34,7 @@ def interface_info_get_method(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def interface_info_get_method(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_constants.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_constants.page
index 4315c0b..a574e0c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_constants.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_constants.page
@@ -30,7 +30,7 @@ def interface_info_get_n_constants(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_methods.page
index 955c13b..ba351b3 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_methods.page
@@ -30,7 +30,7 @@ def interface_info_get_n_methods(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_prerequisites.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_prerequisites.page
index 2217096..70db146 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_prerequisites.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_prerequisites.page
@@ -32,7 +32,7 @@ interface, similar to an base class for GObjects.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_properties.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_properties.page
index fb47efc..6c9502d 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_properties.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_properties.page
@@ -30,7 +30,7 @@ def interface_info_get_n_properties(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_signals.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_signals.page
index 36ecd43..1174ec4 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_signals.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_signals.page
@@ -30,7 +30,7 @@ def interface_info_get_n_signals(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_vfuncs.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_vfuncs.page
index 15f67c9..62c0bc1 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_vfuncs.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_vfuncs.page
@@ -30,7 +30,7 @@ def interface_info_get_n_vfuncs(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_prerequisite.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_prerequisite.page
index debb73b..2dea057 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_prerequisite.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_prerequisite.page
@@ -34,7 +34,7 @@ def interface_info_get_prerequisite(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def interface_info_get_prerequisite(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the prerequisites as a <link xref="GIRepository.BaseInfo">GIBaseInfo</link>. Free the struct by calling</p></td>
+<td><p>the prerequisites as a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_property.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_property.page
index 9d681fa..6cff415 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_property.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_property.page
@@ -34,7 +34,7 @@ def interface_info_get_property(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def interface_info_get_property(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.PropertyInfo">GIPropertyInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_signal.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_signal.page
index 492a2c5..f46af59 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_signal.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_signal.page
@@ -34,7 +34,7 @@ def interface_info_get_signal(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def interface_info_get_signal(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.SignalInfo">GISignalInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_vfunc.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_vfunc.page
index 55e56f2..58b6809 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_vfunc.page
@@ -34,7 +34,7 @@ def interface_info_get_vfunc(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def interface_info_get_vfunc(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method.page
index 8bf686c..40ca69b 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method.page
@@ -35,7 +35,7 @@ returned if there's no method available with that name.</p><p>g_base_info_unref(
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -43,7 +43,7 @@ returned if there's no method available with that name.</p><p>g_base_info_unref(
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method_using_interfaces.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method_using_interfaces.page
index e43c4b4..6e4bd65 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method_using_interfaces.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method_using_interfaces.page
@@ -41,7 +41,7 @@ to chain up if that's desired.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -53,7 +53,7 @@ to chain up if that's desired.</p><p>g_base_info_unref() when done.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_signal.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_signal.page
index 8a9aaeb..fc49ce8 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_signal.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_signal.page
@@ -34,7 +34,7 @@ def object_info_find_signal(info, name)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_vfunc.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_vfunc.page
index 115bc09..5618afa 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_vfunc.page
@@ -40,7 +40,7 @@ information on invoking virtuals.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -48,7 +48,7 @@ information on invoking virtuals.</p><p>g_base_info_unref() when done.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link>, or None. Free it with</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>, or None. Free it with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_abstract.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_abstract.page
index 63f1321..b546701 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_abstract.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_abstract.page
@@ -31,7 +31,7 @@ instantiated</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_class_struct.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_class_struct.page
index 0555f57..bc529fc 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_class_struct.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_class_struct.page
@@ -31,11 +31,11 @@ structure. This function returns the metadata for the class structure.</p><p>g_
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.StructInfo">GIStructInfo</link> or None. Free with</p></td>
+<td><p>the <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link> or None. Free with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_constant.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_constant.page
index 9a0fb0e..2d6fde9 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_constant.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_constant.page
@@ -34,7 +34,7 @@ def object_info_get_constant(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def object_info_get_constant(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.ConstantInfo">GIConstantInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_field.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_field.page
index a22a332..29bea30 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_field.page
@@ -34,7 +34,7 @@ def object_info_get_field(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def object_info_get_field(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FieldInfo">GIFieldInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_fundamental.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_fundamental.page
index 8e97652..66a5549 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_fundamental.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_fundamental.page
@@ -31,7 +31,7 @@ G_TYPE_OBJECT. This is mostly for supporting GstMiniObject.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function.page
index 0fce531..d689de9 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function.page
@@ -34,7 +34,7 @@ see g_object_info_get_get_value_function().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function_pointer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function_pointer.page
index 32fa4df..2550997 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function_pointer.page
@@ -33,7 +33,7 @@ the base classes of this type, starting at the top type.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_interface.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_interface.page
index b94d395..611cf30 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_interface.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_interface.page
@@ -34,7 +34,7 @@ def object_info_get_interface(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def object_info_get_interface(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_method.page
index d421cc0..c24d3c0 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_method.page
@@ -34,7 +34,7 @@ def object_info_get_method(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def object_info_get_method(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_constants.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_constants.page
index aeb8f04..650d915 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_constants.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_constants.page
@@ -30,7 +30,7 @@ def object_info_get_n_constants(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_fields.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_fields.page
index d72d5a8..1e9074b 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_fields.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_fields.page
@@ -30,7 +30,7 @@ def object_info_get_n_fields(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_interfaces.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_interfaces.page
index 38adb8b..a56b0b4 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_interfaces.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_interfaces.page
@@ -30,7 +30,7 @@ def object_info_get_n_interfaces(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_methods.page
index 71b1819..3d996e4 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_methods.page
@@ -30,7 +30,7 @@ def object_info_get_n_methods(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_properties.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_properties.page
index 104ef39..f50535e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_properties.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_properties.page
@@ -30,7 +30,7 @@ def object_info_get_n_properties(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_signals.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_signals.page
index 67b9853..a524141 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_signals.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_signals.page
@@ -30,7 +30,7 @@ def object_info_get_n_signals(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_vfuncs.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_vfuncs.page
index 468a2ca..a4868af 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_vfuncs.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_vfuncs.page
@@ -30,7 +30,7 @@ def object_info_get_n_vfuncs(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_parent.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_parent.page
index f31bbae..963126b 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_parent.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_parent.page
@@ -30,11 +30,11 @@ def object_info_get_parent(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.ObjectInfo">GIObjectInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_property.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_property.page
index df7bb71..ce8a456 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_property.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_property.page
@@ -34,7 +34,7 @@ def object_info_get_property(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def object_info_get_property(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.PropertyInfo">GIPropertyInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function.page
index e76dc9d..ac7d6c5 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function.page
@@ -33,7 +33,7 @@ see g_object_info_get_ref_function().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function_pointer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function_pointer.page
index c9a6bdf..00fbf10 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function_pointer.page
@@ -33,7 +33,7 @@ the base classes of this type, starting at the top type.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function.page
index d91835a..9e30f51 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function.page
@@ -34,7 +34,7 @@ see g_object_info_get_set_value_function().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function_pointer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function_pointer.page
index 67544b2..9c2646d 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function_pointer.page
@@ -33,7 +33,7 @@ the base classes of this type, starting at the top type.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_signal.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_signal.page
index 4f4de59..be2b921 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_signal.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_signal.page
@@ -34,7 +34,7 @@ def object_info_get_signal(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def object_info_get_signal(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.SignalInfo">GISignalInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_init.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_init.page
index 63a168d..25e2243 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_init.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_init.page
@@ -31,7 +31,7 @@ function for which this object type is registered.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_name.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_name.page
index 9e0cb24..154bcb3 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_name.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_name.page
@@ -30,7 +30,7 @@ def object_info_get_type_name(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function.page
index c89acfa..63b00c7 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function.page
@@ -33,7 +33,7 @@ see g_object_info_get_unref_function().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function_pointer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function_pointer.page
index 1aabcb4..5584f78 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function_pointer.page
@@ -33,7 +33,7 @@ the base classes of this type, starting at the top type.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_vfunc.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_vfunc.page
index d971d95..d9200d3 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_vfunc.page
@@ -34,7 +34,7 @@ def object_info_get_vfunc(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def object_info_get_vfunc(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_flags.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_flags.page
index 9a999ea..ca54411 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_flags.page
@@ -31,7 +31,7 @@ more information about possible flag values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.PropertyInfo">GIPropertyInfo</link></p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_ownership_transfer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_ownership_transfer.page
index c67f539..e645fab 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_ownership_transfer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_ownership_transfer.page
@@ -25,13 +25,13 @@
@returns(GIRepository.Transfer)
def property_info_get_ownership_transfer(info)
</code></synopsis>
-<p>Obtain the ownership transfer for this property. See <link xref="GIRepository.Transfer">GITransfer</link> for more
+<p>Obtain the ownership transfer for this property. See <link xref="GIRepository.Transfer">GIRepository.Transfer</link> for more
information about transfer values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.PropertyInfo">GIPropertyInfo</link></p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_type.page
index 54f4e7a..f1a8e85 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_type.page
@@ -30,11 +30,11 @@ def property_info_get_type(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.PropertyInfo">GIPropertyInfo</link></p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</link>, free it with</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>, free it with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_g_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_g_type.page
index 3e82300..f0119c0 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_g_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_g_type.page
@@ -33,7 +33,7 @@ that the shared library which provides the type_init function for this
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRepository.RegisteredTypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_init.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_init.page
index 45cede0..b2d6346 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_init.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_init.page
@@ -33,7 +33,7 @@ g_registered_type_info_get_g_type() directly instead.</p><p>passing into g_modul
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRepository.RegisteredTypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_name.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_name.page
index 24ed6a8..a127f2a 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_name.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_name.page
@@ -31,7 +31,7 @@ This type can be passed to g_type_name() to get a <link xref="GType">GType</link
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRepository.RegisteredTypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_class_closure.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_class_closure.page
index 1ad8157..9a12d01 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_class_closure.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_class_closure.page
@@ -32,7 +32,7 @@ If the signal lacks a closure None will be returned.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.SignalInfo">GISignalInfo</link></p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_flags.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_flags.page
index ae40e74..01a6085 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_flags.page
@@ -31,7 +31,7 @@ more information about possible flag values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.SignalInfo">GISignalInfo</link></p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_true_stops_emit.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_true_stops_emit.page
index c8997ea..d98975b 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_true_stops_emit.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_true_stops_emit.page
@@ -31,7 +31,7 @@ stop the emission of the signal.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.SignalInfo">GISignalInfo</link></p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_find_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_find_method.page
index 601d8bf..3f0c757 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_find_method.page
@@ -34,7 +34,7 @@ def struct_info_find_method(info, name)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -42,7 +42,7 @@ def struct_info_find_method(info, name)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_alignment.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_alignment.page
index 6d80c0f..537bbfa 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_alignment.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_alignment.page
@@ -30,7 +30,7 @@ def struct_info_get_alignment(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_field.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_field.page
index 5062e25..cac0bbc 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_field.page
@@ -34,7 +34,7 @@ def struct_info_get_field(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def struct_info_get_field(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FieldInfo">GIFieldInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>, free it with g_base_info_unref()</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_method.page
index 614092b..ef731f0 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_method.page
@@ -34,7 +34,7 @@ def struct_info_get_method(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def struct_info_get_method(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_fields.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_fields.page
index f2e3d47..9648a53 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_fields.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_fields.page
@@ -30,7 +30,7 @@ def struct_info_get_n_fields(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_methods.page
index 197bef1..83eb6c1 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_methods.page
@@ -30,7 +30,7 @@ def struct_info_get_n_methods(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_size.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_size.page
index 7be4513..d46018f 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_size.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_size.page
@@ -30,7 +30,7 @@ def struct_info_get_size(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_is_gtype_struct.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_is_gtype_struct.page
index 05d6e38..546ba03 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_is_gtype_struct.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_is_gtype_struct.page
@@ -32,7 +32,7 @@ from generated public APIs.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_fixed_size.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_fixed_size.page
index 0e6d6a6..b848767 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_fixed_size.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_fixed_size.page
@@ -31,7 +31,7 @@ def type_info_get_array_fixed_size(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_length.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_length.page
index 28e3e32..7280cfb 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_length.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_length.page
@@ -31,7 +31,7 @@ def type_info_get_array_length(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_type.page
index c9fe478..e9122f3 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_type.page
@@ -25,14 +25,14 @@
@returns(GIRepository.ArrayType)
def type_info_get_array_type(info)
</code></synopsis>
-<p>Obtain the array type for this type. See <link xref="GIRepository.ArrayType">GIArrayType</link> for a list of
+<p>Obtain the array type for this type. See <link xref="GIRepository.ArrayType">GIRepository.ArrayType</link> for a list of
possible values. If the type tag of this type is not array, -1 will be
returned.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_interface.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_interface.page
index 12684fd..1433f66 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_interface.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_interface.page
@@ -27,17 +27,17 @@ def type_info_get_interface(info)
</code></synopsis>
<p>For types which have <link xref="GI_TYPE_TAG_INTERFACE">GI_TYPE_TAG_INTERFACE</link> such as GObjects and boxed values,
this function returns full information about the referenced type. You can then
-inspect the type of the returned <link xref="GIRepository.BaseInfo">GIBaseInfo</link> to further query whether it is
+inspect the type of the returned <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> to further query whether it is
a concrete GObject, a GInterface, a structure, etc. using g_base_info_get_type().</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.BaseInfo">GIBaseInfo</link>, or None. Free it with</p></td>
+<td><p>the <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>, or None. Free it with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_param_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_param_type.page
index fe47628..6c8c038 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_param_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_param_type.page
@@ -34,7 +34,7 @@ def type_info_get_param_type(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_tag.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_tag.page
index 54dc522..f4bd50a 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_tag.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_tag.page
@@ -25,13 +25,13 @@
@returns(GIRepository.TypeTag)
def type_info_get_tag(info)
</code></synopsis>
-<p>Obtain the type tag for the type. See <link xref="GIRepository.TypeTag">GITypeTag</link> for a list
+<p>Obtain the type tag for the type. See <link xref="GIRepository.TypeTag">GIRepository.TypeTag</link> for a list
of type tags.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_pointer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_pointer.page
index e02346e..f8383b6 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_pointer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_pointer.page
@@ -30,7 +30,7 @@ def type_info_is_pointer(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_zero_terminated.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_zero_terminated.page
index 737c6a7..1c78bdd 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_zero_terminated.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_zero_terminated.page
@@ -31,7 +31,7 @@ def type_info_is_zero_terminated(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_find_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_find_method.page
index df153c2..1e8ccc8 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_find_method.page
@@ -34,7 +34,7 @@ def union_info_find_method(info, name)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -42,7 +42,7 @@ def union_info_find_method(info, name)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_alignment.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_alignment.page
index e7a8f65..41a4478 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_alignment.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_alignment.page
@@ -30,7 +30,7 @@ def union_info_get_alignment(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator.page
index a1edfa7..4f2bc8c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator.page
@@ -36,7 +36,7 @@ constant.</p><p>when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -44,7 +44,7 @@ constant.</p><p>when done.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.ConstantInfo">GIConstantInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link>, free it with g_base_info_unref()</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator_type.page
index 5656869..c6d1c99 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator_type.page
@@ -30,11 +30,11 @@ def union_info_get_discriminator_type(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>, free it with g_base_info_unref()</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_field.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_field.page
index aca31df..7197133 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_field.page
@@ -34,7 +34,7 @@ def union_info_get_field(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def union_info_get_field(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FieldInfo">GIFieldInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>, free it with g_base_info_unref()</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_method.page
index 6fdceba..b0f9c60 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_method.page
@@ -34,7 +34,7 @@ def union_info_get_method(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def union_info_get_method(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_fields.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_fields.page
index dbfa9f7..8467d7e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_fields.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_fields.page
@@ -30,7 +30,7 @@ def union_info_get_n_fields(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_methods.page
index c2d7fc7..aa6a24a 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_methods.page
@@ -30,7 +30,7 @@ def union_info_get_n_methods(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_size.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_size.page
index 9d0ed2f..7fd35af 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_size.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_size.page
@@ -30,7 +30,7 @@ def union_info_get_size(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_is_discriminated.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_is_discriminated.page
index f6f0c7a..957b930 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_is_discriminated.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_is_discriminated.page
@@ -30,7 +30,7 @@ def union_info_is_discriminated(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.value_info_get_value.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.value_info_get_value.page
index ae93232..da4d0c0 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.value_info_get_value.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.value_info_get_value.page
@@ -25,13 +25,13 @@
@returns(gint64)
def value_info_get_value(info)
</code></synopsis>
-<p>Obtain the enumeration value of the <link xref="GIRepository.ValueInfo">GIValueInfo</link>.</p><p>as a 32-bit signed or unsigned value. The use of gint64 as the
+<p>Obtain the enumeration value of the <link xref="GIRepository.ValueInfo">GIRepository.ValueInfo</link>.</p><p>as a 32-bit signed or unsigned value. The use of gint64 as the
return type is to allow both.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.ValueInfo">GIValueInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ValueInfo">GIRepository.ValueInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_address.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_address.page
index c4142d6..ecccffc 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_address.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_address.page
@@ -35,7 +35,7 @@ is the implementation for @info.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
</tr>
<tr>
<td><p>implementor_gtype :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_flags.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_flags.page
index 99e3c48..c4690bf 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_flags.page
@@ -25,13 +25,13 @@
@returns(GIRepository.VFuncInfoFlags)
def vfunc_info_get_flags(info)
</code></synopsis>
-<p>Obtain the flags for this virtual function info. See <link xref="GIRepository.VFuncInfoFlags">GIVFuncInfoFlags</link> for
+<p>Obtain the flags for this virtual function info. See <link xref="GIRepository.VFuncInfoFlags">GIRepository.VFuncInfoFlags</link> for
more information about possible flag values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_invoker.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_invoker.page
index 5409a29..95819a9 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_invoker.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_invoker.page
@@ -31,11 +31,11 @@ method will return it. An invoker method is a C entry point.</p><p>Not all virt
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link> or None. Free it with</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link> or None. Free it with</p></td>
</tr>
</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_offset.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_offset.page
index 83c323c..da48236 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_offset.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_offset.page
@@ -31,7 +31,7 @@ def vfunc_info_get_offset(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_signal.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_signal.page
index 70466c6..b6bf301 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_signal.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_signal.page
@@ -32,7 +32,7 @@ this virtual function belongs.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_invoke.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_invoke.page
index a3ce4d4..197cb20 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_invoke.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_invoke.page
@@ -56,7 +56,7 @@ argument lists.</p><p>error occurred.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link> describing the virtual function to invoke</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link> describing the virtual function to invoke</p></td>
</tr>
<tr>
<td><p>implementor :</p></td>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
