summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu.vizoso@collabora.com>2012-02-20 13:55:37 +0100
committerTomeu Vizoso <tomeu.vizoso@collabora.com>2012-02-20 13:55:37 +0100
commit97484085494e8ec84f64d9b3e193c7a67d1051d2 (patch)
tree6f74de7f7de7140b00f57a3e8d0827c0d9effcda
parent8c7e27b90ceb176d463399735220df806ee7f35f (diff)
downloadgobject-introspection-97484085494e8ec84f64d9b3e193c7a67d1051d2.tar.gz
g-ir-doc-tool: Fix names of xref links
-rw-r--r--giscanner/mallardwriter.py6
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.AttributeIter.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.equal.page8
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_container.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_name.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.iterate_attributes.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.page8
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallableInfo.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfo.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfoFlags.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfoFlags.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.PropertyInfo.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_error_domain.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_gtype.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_name.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_default.page6
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_info.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require_private.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfoFlags.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.ValueInfo.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_closure.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_destroy.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_direction.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_ownership_transfer.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_scope.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_type.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_caller_allocates.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_optional.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_return_value.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_skip.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_load_type.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_may_be_null.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.base_info_get_type.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_arg.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_caller_owns.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_n_args.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_attribute.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_type.page6
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_iterate_return_attributes.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_arg.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_return_type.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_may_return_null.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_skip_return.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_free_value.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_type.page6
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_value.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_methods.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_storage_type.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_value.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_field.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_flags.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_offset.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_size.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_type.page6
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_set_field.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_flags.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_property.page6
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_symbol.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_vfunc.page6
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_invoke.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_vfunc.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_constant.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_iface_struct.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_constants.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_methods.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_prerequisites.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_properties.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_signals.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_vfuncs.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_prerequisite.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_property.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_signal.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_vfunc.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method_using_interfaces.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_signal.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_vfunc.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_abstract.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_class_struct.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_constant.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_field.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_fundamental.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function_pointer.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_interface.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_constants.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_fields.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_interfaces.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_methods.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_properties.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_signals.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_vfuncs.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_parent.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_property.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function_pointer.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function_pointer.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_signal.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_init.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_name.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function_pointer.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_vfunc.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_flags.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_ownership_transfer.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_type.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_g_type.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_init.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_name.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_class_closure.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_flags.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_true_stops_emit.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_find_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_alignment.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_field.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_fields.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_methods.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_size.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_gtype_struct.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_fixed_size.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_length.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_type.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_interface.page6
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_param_type.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_tag.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_pointer.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_zero_terminated.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_find_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_alignment.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_type.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_field.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_fields.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_methods.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_size.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_is_discriminated.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.value_info_get_value.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_address.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_flags.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_invoker.page4
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_offset.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_signal.page2
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_invoke.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArrayType.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.equal.page8
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_container.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_name.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.iterate_attributes.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.CallableInfo.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Direction.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfo.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfoFlags.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FunctionInfoFlags.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.PropertyInfo.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_error_domain.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_gtype.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_name.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_default.page6
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_info.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require_private.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ScopeType.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Transfer.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeTag.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.VFuncInfoFlags.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ValueInfo.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_closure.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_destroy.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_direction.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_ownership_transfer.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_scope.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_type.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_caller_allocates.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_optional.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_return_value.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_skip.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_load_type.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_may_be_null.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.base_info_get_type.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_arg.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_caller_owns.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_n_args.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_attribute.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_type.page6
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_iterate_return_attributes.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_arg.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_return_type.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_may_return_null.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_skip_return.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_free_value.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_type.page6
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_value.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_n_methods.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_storage_type.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_value.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_field.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_flags.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_offset.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_size.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_type.page6
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_set_field.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_flags.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_property.page6
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_symbol.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_vfunc.page6
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_invoke.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_vfunc.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_constant.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_iface_struct.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_constants.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_methods.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_prerequisites.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_properties.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_signals.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_vfuncs.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_prerequisite.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_property.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_signal.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_vfunc.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method_using_interfaces.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_signal.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_vfunc.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_abstract.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_class_struct.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_constant.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_field.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_fundamental.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function_pointer.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_interface.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_constants.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_fields.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_interfaces.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_methods.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_properties.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_signals.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_vfuncs.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_parent.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_property.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function_pointer.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function_pointer.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_signal.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_init.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_name.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function_pointer.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_vfunc.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_flags.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_ownership_transfer.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_type.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_g_type.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_init.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_name.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_class_closure.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_flags.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_true_stops_emit.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_find_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_alignment.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_field.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_fields.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_methods.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_size.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_is_gtype_struct.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_fixed_size.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_length.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_type.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_interface.page6
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_param_type.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_tag.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_pointer.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_zero_terminated.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_find_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_alignment.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator_type.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_field.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_method.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_fields.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_methods.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_size.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_is_discriminated.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.value_info_get_value.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_address.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_flags.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_invoker.page4
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_offset.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_signal.page2
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_invoke.page2
309 files changed, 448 insertions, 444 deletions
diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py
index 59991a08..23a14a71 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 da62f442..1a88368b 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 8a120d43..ed856912 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 41866da5..1194cd10 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 f4f86317..89acaa6c 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 332bf110..09675891 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 35cfe51a..76c6766b 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 e156e6cd..87dd1ae2 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:
&lt;example&gt;
-&lt;title&gt;Casting a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> to <link xref="GIRepository.BaseInfo">GIBaseInfo</link>&lt;/title&gt;
+&lt;title&gt;Casting a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> to <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>&lt;/title&gt;
&lt;programlisting&gt;
GIFunctionInfo *function_info = ...;
GIBaseInfo *info = (GIBaseInfo*)function_info;
&lt;/programlisting&gt;
&lt;/example&gt;
-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>&lt;example&gt;
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 d0123bdc..ab20f816 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 d8dd6472..b010ba34 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 a1812f4e..0e90ebad 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 81310c96..87df966c 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 929c4e80..962e3ffa 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 5a5cbc93..4d383595 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 adb9512a..56f3b93e 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 01605528..07e562c4 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 4aa65f4d..39fe665e 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 88c66180..07cee8c8 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 9d3fe96e..05beefe8 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 f544083a..423eaf70 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 98e37db6..f539b312 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 6a9d8de6..5f12828b 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 b79e210f..37319a50 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 ca21e541..328d5fed 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 c39aa56d..a750dfde 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 9207bfd4..39ad0fa5 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 ab5c30bd..090a24e4 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 5f1d8d53..3c04cd1d 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 8352426b..eb27640d 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 26357fdb..679e068e 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 bf54be1e..1367c1ef 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 7de3f079..abfa566d 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 854de5bd..22aa6517 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 9601506e..42254f27 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 6e1b5599..90010c2e 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 897577bf..10647329 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 4807605a..c5be3027 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 e3eebedc..ad3d6510 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 80a7f556..ab56ef96 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 f5f65623..aa7958dd 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 17ad36a5..2464f7e9 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 8dffbd79..7ab4bcd4 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 e7cc1036..45290de8 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 afb4ace8..b2199374 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 1bbdd382..2e38de20 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 3c01df21..9dd576a6 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 bc01a09b..47fc89c0 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 1c4e9764..08d4639d 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 2e1f3724..142d2bbd 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 d63a90b3..dd13a310 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 27628a19..50ee4dfd 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 813198d6..c2747442 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 fdf33e93..c8c0ba6f 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 24f223af..99db1419 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 915303bd..0a599f0c 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 0ed4a24d..648d5fde 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 3066b4c5..c7672099 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 fbf2f1c6..eee2a089 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 90ec787c..343ae75b 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 6e0e7c45..76719c94 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 6aaeeb0b..28706303 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 1b7c115a..624c4278 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 eb8117a3..06e35cdc 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 b6827655..0a58368d 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 a179c36d..69a18a9b 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 6f321d1a..e36ee57a 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 bbb50b43..318ccc93 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()&lt;!-- --&gt;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 3fd47d75..6c4df0d9 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 339f08cb..d78596e6 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 64e77ea7..5634b169 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 a08e1616..89d83a5e 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 4007dcf0..f98c84f8 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 baecbd92..7139f14c 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 b28b4fb2..2ea816f4 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 d05d65aa..712f2d14 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 fa3c91a8..f0805f58 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 7ffb5241..79bff47d 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 2c61ec7e..3e202f22 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 d3de0343..db11a191 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 d36f1cff..366d742b 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 a901af27..f8ef5592 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 1e4dabd1..6e7c62dc 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 d25d78c3..ebf712a1 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 f16fafa7..a4a57f68 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 0c5c0231..2e451f9e 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 9f34efaa..0a99d39f 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 5a94cd1a..2b5c7c5b 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 41ab20ef..ddb04488 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 9e9872cc..3064b45f 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 9ccc7f29..cb46abbe 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 f31f6c6d..b0f52449 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 9723604b..912a70fc 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 b76b8414..94ade854 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 bea6b86b..d751b2f3 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 5a790667..b62b9ead 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 afe462f9..c52ca1d0 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 0f6ed3c1..99d7f6ea 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 07b08f2b..421d938f 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 c506dc2f..867bb57c 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 ceedbfd4..cb1b65b9 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 768cbeb4..73ae0e99 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 1c484925..4d9bc224 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 99c2f078..158773e8 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 b7fbec36..21701c66 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 95269b0b..b0aba2d4 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 152c9cd6..67263ae0 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 c16fee60..950070a4 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 1b76add8..442d6020 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 fffecb1e..ed92e254 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 1754b123..a21b5b3f 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 c2241461..a67af92d 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 84040c0c..9b3b2f46 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 3f71fef3..775ece37 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 a5e4c649..846fc455 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 63979c00..5e41efef 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 d5eca0a1..990754fb 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 21a24d1c..e069cdad 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 6c3ac439..419336b2 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 6e94729d..b82f0a0f 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 9a91fd33..a1765091 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 3e495794..29534f23 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 5182c03c..bbd3180b 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 190060ab..e986f96c 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 014ce452..5d7da64c 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 9b160f1a..412b9c27 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 abe1dec0..7baf0de6 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 e37c3638..2ef40a5f 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 4a2c2cb7..ae21e5dc 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 3268edaa..00ab1074 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 34d26f39..170bd82e 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 fa1ef5f5..7a42b85c 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 34c38bed..def200be 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 91d62aaf..bcd94a74 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 864b2938..29e33110 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 e0385cdb..69d95e3f 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 3b88d465..1e174ed4 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 c6598e75..aaa367f0 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 12a7e288..00129c25 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 7fc1f430..674f446f 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 552d0b19..3d88c323 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 5e17b3a4..c88852ab 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 997b6585..9cc0106a 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 ba6217b1..f51155c1 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 d3a127f3..a9a03d09 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 de0dcd1f..8c08e549 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 3b47ff3b..e3cd6d41 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 40d1492f..ec10c17b 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 6b98dace..e5aa879d 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 248b472c..5c46a467 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 3758e194..637db67b 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 391965d9..750128ed 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 bc082b29..d6eafd9b 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 90b32f95..d0550f30 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 7855068a..f6423d8f 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 fde4f774..2ae55cd1 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 c644e220..b12d431b 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 da62f442..1a88368b 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 c4e27143..e7e329fc 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 507aac89..c529cb1c 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 d0f3f00d..5ec55809 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 697a1d06..9ef317d0 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 d0123bdc..ab20f816 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 d8dd6472..b010ba34 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 a1812f4e..0e90ebad 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 81310c96..87df966c 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 929c4e80..962e3ffa 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 5a5cbc93..4d383595 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 d50b9286..843b68bd 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 8e16064d..006ce3cd 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 0f9a17aa..5b84d4f0 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 3ba3243b..1c8e529d 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 d9dfc684..62e45494 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 ed80f2b0..4995f3ce 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 7a9e4049..034914e0 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 6a9d8de6..5f12828b 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 b79e210f..37319a50 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 ca21e541..328d5fed 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 c39aa56d..a750dfde 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 9207bfd4..39ad0fa5 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 74b0afeb..4cc663eb 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 1a6ca593..be3a4f75 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 abc06921..c96c426c 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 2d415d45..3a7c65eb 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 d613626d..63ccc342 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 1336153a..3b71b73b 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 9a0835cf..1f297fcd 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 61aefb21..91d1988e 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 40fa3aa6..ccad77e5 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 8eeabcf2..8d26c654 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 38c84f7f..27e5ac45 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 254da25c..d9034276 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 2064d404..765af90d 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 552d4e24..eb335624 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 700ff5e0..46f340ca 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 ba7e31a6..831e9fb0 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 c951308a..52ddc1ba 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 a73377a5..e54edfed 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 de2ff2d9..fd04e15e 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 7f152f8d..8f3cbcd1 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 423ba0d2..04e7aafe 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 96946975..8e7c10a8 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 35d64ac6..48152a32 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 ca96710e..58eb9469 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 85908bce..542313d3 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 ccd6bf9d..6369c8ac 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 77cb434d..994391a8 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 db076a3c..e4986277 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 7c8f1b9b..e9076cca 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 0deb0e3a..06fc6c95 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 2c6429cc..a9d26dab 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 bdc59ccd..d5ce386c 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 1847c489..97434ebf 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 9b320cb2..19f80ecc 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 f9f2d3f0..f001fcaf 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 6292ef9b..e4a3ee1f 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 4a68c7bc..fd08039c 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 3fad6e07..45b8a82e 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 e75087ab..fffd2485 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 8b51bc79..e7ba3c8a 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 4a2696dc..0ad45094 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()&lt;!-- --&gt;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 c531f4ca..be95a519 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 e21ffae9..b23e4e43 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 0e9a9be9..5b3fbcef 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 53164c62..571bbde9 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 3041741d..760a0963 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 4315c0bb..a574e0cc 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 955c13b1..ba351b3a 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 22170969..70db1464 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 fb47efc2..6c9502de 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 36ecd435..1174ec4e 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 15f67c90..62c0bc10 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 debb73bf..2dea057c 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 9d681fa8..6cff4155 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 492a2c54..f46af599 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 55e56f24..58b6809b 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 8bf686c4..40ca69b0 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 e43c4b4e..6e4bd653 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 8a9aaeb7..fc49ce8f 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 115bc09f..5618afa5 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 63f1321e..b546701a 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 0555f577..bc529fc3 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 9a0fb0e1..2d6fde91 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 a22a332a..29bea30e 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 8e976527..66a55496 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 0fce5314..d689de9c 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 32fa4df8..2550997b 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 b94d3950..611cf305 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 d421cc09..c24d3c0d 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 aeb8f04c..650d9153 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 d72d5a8d..1e9074bf 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 38adb8be..a56b0b4f 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 71b1819c..3d996e49 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 104ef395..f50535e9 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 67b98537..a5241419 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 468a2ca1..a4868af8 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 f31bbaee..963126b2 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 df7bb715..ce8a4563 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 e76dc9d6..ac7d6c5c 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 c9a6bdf0..00fbf109 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 d91835a1..9e30f51f 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 67544b2d..9c2646d7 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 4f4de592..be2b9216 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 63a168db..25e2243a 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 9e0cb248..154bcb35 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 c89acfa3..63b00c72 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 1aabcb4c..5584f78c 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 d971d959..d9200d3a 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 9a999ea8..ca54411e 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 c67f539b..e645fab7 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 54f4e7a4..f1a8e85b 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 3e823007..f0119c02 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 45cede0e..b2d63463 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 24ed6a8d..a127f2ad 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 1ad8157b..9a12d01d 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 ae40e74f..01a6085b 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 c8997ea3..d98975b0 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 601d8bf4..3f0c7578 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 6d80c0fd..537bbfa1 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 5062e253..cac0bbc3 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 614092b2..ef731f07 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 f2e3d474..9648a53b 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 197bef13..83eb6c17 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 7be4513a..d46018f1 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 05d6e38b..546ba03e 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 0e6d6a6f..b848767e 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 28e3e324..7280cfbb 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 c9fe478a..e9122f32 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 12684fdf..1433f665 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 fe47628b..6c8c038d 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 54dc522f..f4bd50a9 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 e02346e0..f8383b64 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 737c6a78..1c78bdd0 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 df153c2f..1e8ccc8f 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 e7a8f653..41a4478f 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 a1edfa7e..4f2bc8cf 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 56568692..c6d1c99c 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 aca31df4..71971333 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 6fdceba0..b0f9c60e 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 dbfa9f7a..8467d7ef 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 c2d7fc77..aa6a24a8 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 9d0ed2fc..7fd35af7 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 f6f0c7a5..957b9305 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 ae932328..da4d0c04 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 c4142d6f..ecccffca 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 99e3c48a..c4690bf1 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 5409a296..95819a90 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 83c323ce..da482367 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 70466c64..b6bf3019 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 a3ce4d48..197cb20f 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>