[gobject-introspection] docwriter: Use the fully-qualified name for functions and methods



commit 3dba3c40da7bc026bfa83109dc46ceb67471dd9d
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Feb 15 08:23:10 2013 -0500

    docwriter: Use the fully-qualified name for functions and methods

 giscanner/docwriter.py                             |    6 +++---
 .../Regress.AnnotationObject.allow_none.page       |    2 +-
 .../Regress.AnnotationObject.calleeowns.page       |    2 +-
 .../Regress.AnnotationObject.calleesowns.page      |    2 +-
 .../Regress.AnnotationObject.compute_sum.page      |    2 +-
 .../Regress.AnnotationObject.compute_sum_n.page    |    2 +-
 .../Regress.AnnotationObject.compute_sum_nz.page   |    2 +-
 .../Regress.AnnotationObject.create_object.page    |    2 +-
 .../Regress.AnnotationObject.do_not_use.page       |    2 +-
 .../Regress.AnnotationObject.extra_annos.page      |    2 +-
 .../Regress.AnnotationObject.foreach.page          |    2 +-
 .../Regress.AnnotationObject.get_hash.page         |    2 +-
 .../Regress.AnnotationObject.get_objects.page      |    2 +-
 .../Regress.AnnotationObject.get_strings.page      |    2 +-
 .../Regress.AnnotationObject.hidden_self.page      |    2 +-
 .../Regress.AnnotationObject.in.page               |    2 +-
 .../Regress.AnnotationObject.inout.page            |    2 +-
 .../Regress.AnnotationObject.inout2.page           |    2 +-
 .../Regress.AnnotationObject.inout3.page           |    2 +-
 .../Regress.AnnotationObject.method.page           |    2 +-
 .../Regress.AnnotationObject.notrans.page          |    2 +-
 .../Regress.AnnotationObject.out.page              |    2 +-
 .../Regress.AnnotationObject.parse_args.page       |    2 +-
 .../Regress.AnnotationObject.set_data.page         |    2 +-
 .../Regress.AnnotationObject.set_data2.page        |    2 +-
 .../Regress.AnnotationObject.set_data3.page        |    2 +-
 .../Regress.AnnotationObject.string_out.page       |    2 +-
 .../Regress.AnnotationObject.use_buffer.page       |    2 +-
 .../Regress.AnnotationObject.watch_full.page       |    2 +-
 .../Regress.AnnotationObject.with_voidp.page       |    2 +-
 .../Regress.FooBRect.add.page                      |    2 +-
 .../Regress.FooBRect.new.page                      |    2 +-
 .../Regress.FooBoxed.method.page                   |    2 +-
 .../Regress.FooBoxed.new.page                      |    2 +-
 .../Regress.FooBuffer.some_method.page             |    2 +-
 .../Regress.FooDBusData.method.page                |    2 +-
 .../Regress.FooForeignStruct.copy.page             |    2 +-
 .../Regress.FooForeignStruct.new.page              |    2 +-
 .../Regress.FooInterface.do_regress_foo.page       |    2 +-
 .../Regress.FooObject.append_new_stack_layer.page  |    2 +-
 .../Regress.FooObject.dup_name.page                |    2 +-
 .../Regress.FooObject.external_type.page           |    2 +-
 .../Regress.FooObject.get_name.page                |    2 +-
 .../Regress.FooObject.handle_glyph.page            |    2 +-
 .../Regress.FooObject.is_it_time_yet.page          |    2 +-
 .../Regress.FooObject.new.page                     |    2 +-
 .../Regress.FooObject.new_as_super.page            |    2 +-
 .../Regress.FooObject.read.page                    |    2 +-
 .../Regress.FooObject.various.page                 |    2 +-
 .../Regress.FooObject.virtual_method.page          |    2 +-
 .../Regress.FooRectangle.add.page                  |    2 +-
 .../Regress.FooSubInterface.do_bar.page            |    2 +-
 .../Regress.FooSubInterface.do_baz.page            |    2 +-
 .../Regress.FooSubobject.new.page                  |    2 +-
 .../Regress.TestBoxed.copy.page                    |    2 +-
 .../Regress.TestBoxed.equals.page                  |    2 +-
 .../Regress.TestBoxed.new.page                     |    2 +-
 ...ess.TestBoxed.new_alternative_constructor1.page |    2 +-
 ...ess.TestBoxed.new_alternative_constructor2.page |    2 +-
 ...ess.TestBoxed.new_alternative_constructor3.page |    2 +-
 .../Regress.TestBoxedB.copy.page                   |    2 +-
 .../Regress.TestBoxedB.new.page                    |    2 +-
 .../Regress.TestBoxedC.new.page                    |    2 +-
 .../Regress.TestBoxedD.copy.page                   |    2 +-
 .../Regress.TestBoxedD.free.page                   |    2 +-
 .../Regress.TestBoxedD.get_magic.page              |    2 +-
 .../Regress.TestBoxedD.new.page                    |    2 +-
 .../Regress.TestFloating.new.page                  |    2 +-
 .../Regress.TestFundamentalObject.ref.page         |    2 +-
 .../Regress.TestFundamentalObject.unref.page       |    2 +-
 .../Regress.TestFundamentalSubObject.new.page      |    2 +-
 .../Regress.TestInheritDrawable.do_foo.page        |    2 +-
 ...ess.TestInheritDrawable.do_foo_maybe_throw.page |    2 +-
 .../Regress.TestInheritDrawable.get_origin.page    |    2 +-
 .../Regress.TestInheritDrawable.get_size.page      |    2 +-
 .../Regress.TestObj.constructor.page               |    2 +-
 .../Regress.TestObj.do_matrix.page                 |    2 +-
 ...gress.TestObj.emit_sig_with_foreign_struct.page |    2 +-
 .../Regress.TestObj.emit_sig_with_int64.page       |    2 +-
 .../Regress.TestObj.emit_sig_with_obj.page         |    2 +-
 .../Regress.TestObj.emit_sig_with_uint64.page      |    2 +-
 .../Regress.TestObj.forced_method.page             |    2 +-
 .../Regress.TestObj.instance_method.page           |    2 +-
 .../Regress.TestObj.instance_method_callback.page  |    2 +-
 .../Regress.TestObj.new.page                       |    2 +-
 .../Regress.TestObj.new_callback.page              |    2 +-
 .../Regress.TestObj.new_from_file.page             |    2 +-
 .../Regress.TestObj.set_bare.page                  |    2 +-
 .../Regress.TestObj.skip_inout_param.page          |    2 +-
 .../Regress.TestObj.skip_out_param.page            |    2 +-
 .../Regress.TestObj.skip_param.page                |    2 +-
 .../Regress.TestObj.skip_return_val.page           |    2 +-
 .../Regress.TestObj.skip_return_val_no_out.page    |    2 +-
 .../Regress.TestObj.torture_signature_0.page       |    2 +-
 .../Regress.TestObj.torture_signature_1.page       |    2 +-
 .../Regress.TestSimpleBoxedA.copy.page             |    2 +-
 .../Regress.TestSimpleBoxedA.equals.page           |    2 +-
 .../Regress.TestSimpleBoxedB.copy.page             |    2 +-
 .../Regress.TestStructA.clone.page                 |    2 +-
 .../Regress.TestStructB.clone.page                 |    2 +-
 .../Regress.TestStructFixedArray.frob.page         |    2 +-
 .../Regress.TestSubObj.instance_method.page        |    2 +-
 .../Regress.TestSubObj.new.page                    |    2 +-
 .../Regress.TestSubObj.unset_bare.page             |    2 +-
 .../Regress.TestWi8021x.get_testbool.page          |    2 +-
 .../Regress.TestWi8021x.new.page                   |    2 +-
 .../Regress.TestWi8021x.set_testbool.page          |    2 +-
 .../Regress.AnnotationObject.allow_none.page       |    2 +-
 .../Regress.AnnotationObject.calleeowns.page       |    2 +-
 .../Regress.AnnotationObject.calleesowns.page      |    2 +-
 .../Regress.AnnotationObject.compute_sum.page      |    2 +-
 .../Regress.AnnotationObject.compute_sum_n.page    |    2 +-
 .../Regress.AnnotationObject.compute_sum_nz.page   |    2 +-
 .../Regress.AnnotationObject.create_object.page    |    2 +-
 .../Regress.AnnotationObject.do_not_use.page       |    2 +-
 .../Regress.AnnotationObject.extra_annos.page      |    2 +-
 .../Regress.AnnotationObject.foreach.page          |    2 +-
 .../Regress.AnnotationObject.get_hash.page         |    2 +-
 .../Regress.AnnotationObject.get_objects.page      |    2 +-
 .../Regress.AnnotationObject.get_strings.page      |    2 +-
 .../Regress.AnnotationObject.hidden_self.page      |    2 +-
 .../Regress.AnnotationObject.in.page               |    2 +-
 .../Regress.AnnotationObject.inout.page            |    2 +-
 .../Regress.AnnotationObject.inout2.page           |    2 +-
 .../Regress.AnnotationObject.inout3.page           |    2 +-
 .../Regress.AnnotationObject.method.page           |    2 +-
 .../Regress.AnnotationObject.notrans.page          |    2 +-
 .../Regress.AnnotationObject.out.page              |    2 +-
 .../Regress.AnnotationObject.parse_args.page       |    2 +-
 .../Regress.AnnotationObject.set_data.page         |    2 +-
 .../Regress.AnnotationObject.set_data2.page        |    2 +-
 .../Regress.AnnotationObject.set_data3.page        |    2 +-
 .../Regress.AnnotationObject.string_out.page       |    2 +-
 .../Regress.AnnotationObject.use_buffer.page       |    2 +-
 .../Regress.AnnotationObject.watch_full.page       |    2 +-
 .../Regress.AnnotationObject.with_voidp.page       |    2 +-
 .../Regress.FooBRect.add.page                      |    2 +-
 .../Regress.FooBoxed.method.page                   |    2 +-
 .../Regress.FooBuffer.some_method.page             |    2 +-
 .../Regress.FooDBusData.method.page                |    2 +-
 .../Regress.FooForeignStruct.copy.page             |    2 +-
 .../Regress.FooInterface.do_regress_foo.page       |    2 +-
 .../Regress.FooInterface.static_method.page        |    2 +-
 .../Regress.FooObject.a_global_method.page         |    2 +-
 .../Regress.FooObject.append_new_stack_layer.page  |    2 +-
 .../Regress.FooObject.dup_name.page                |    2 +-
 .../Regress.FooObject.external_type.page           |    2 +-
 .../Regress.FooObject.get_default.page             |    2 +-
 .../Regress.FooObject.get_name.page                |    2 +-
 .../Regress.FooObject.handle_glyph.page            |    2 +-
 .../Regress.FooObject.is_it_time_yet.page          |    2 +-
 .../Regress.FooObject.read.page                    |    2 +-
 .../Regress.FooObject.static_meth.page             |    2 +-
 .../Regress.FooObject.various.page                 |    2 +-
 .../Regress.FooObject.virtual_method.page          |    2 +-
 .../Regress.FooRectangle.add.page                  |    2 +-
 .../Regress.FooSubInterface.do_bar.page            |    2 +-
 .../Regress.FooSubInterface.do_baz.page            |    2 +-
 .../Regress.TestBoxed.copy.page                    |    2 +-
 .../Regress.TestBoxed.equals.page                  |    2 +-
 .../Regress.TestBoxedB.copy.page                   |    2 +-
 .../Regress.TestBoxedD.copy.page                   |    2 +-
 .../Regress.TestBoxedD.free.page                   |    2 +-
 .../Regress.TestBoxedD.get_magic.page              |    2 +-
 .../Regress.TestFundamentalObject.ref.page         |    2 +-
 .../Regress.TestFundamentalObject.unref.page       |    2 +-
 .../Regress.TestInheritDrawable.do_foo.page        |    2 +-
 ...ess.TestInheritDrawable.do_foo_maybe_throw.page |    2 +-
 .../Regress.TestInheritDrawable.get_origin.page    |    2 +-
 .../Regress.TestInheritDrawable.get_size.page      |    2 +-
 .../Regress.TestObj.do_matrix.page                 |    2 +-
 ...gress.TestObj.emit_sig_with_foreign_struct.page |    2 +-
 .../Regress.TestObj.emit_sig_with_int64.page       |    2 +-
 .../Regress.TestObj.emit_sig_with_obj.page         |    2 +-
 .../Regress.TestObj.emit_sig_with_uint64.page      |    2 +-
 .../Regress.TestObj.forced_method.page             |    2 +-
 .../Regress.TestObj.instance_method.page           |    2 +-
 .../Regress.TestObj.instance_method_callback.page  |    2 +-
 .../Regress.TestObj.null_out.page                  |    2 +-
 .../Regress.TestObj.set_bare.page                  |    2 +-
 .../Regress.TestObj.skip_inout_param.page          |    2 +-
 .../Regress.TestObj.skip_out_param.page            |    2 +-
 .../Regress.TestObj.skip_param.page                |    2 +-
 .../Regress.TestObj.skip_return_val.page           |    2 +-
 .../Regress.TestObj.skip_return_val_no_out.page    |    2 +-
 .../Regress.TestObj.static_method.page             |    2 +-
 .../Regress.TestObj.static_method_callback.page    |    2 +-
 .../Regress.TestObj.torture_signature_0.page       |    2 +-
 .../Regress.TestObj.torture_signature_1.page       |    2 +-
 .../Regress.TestSimpleBoxedA.const_return.page     |    2 +-
 .../Regress.TestSimpleBoxedA.copy.page             |    2 +-
 .../Regress.TestSimpleBoxedA.equals.page           |    2 +-
 .../Regress.TestSimpleBoxedB.copy.page             |    2 +-
 .../Regress.TestStructA.clone.page                 |    2 +-
 .../Regress.TestStructA.parse.page                 |    2 +-
 .../Regress.TestStructB.clone.page                 |    2 +-
 .../Regress.TestStructFixedArray.frob.page         |    2 +-
 .../Regress.TestSubObj.instance_method.page        |    2 +-
 .../Regress.TestSubObj.unset_bare.page             |    2 +-
 .../Regress.TestWi8021x.get_testbool.page          |    2 +-
 .../Regress.TestWi8021x.set_testbool.page          |    2 +-
 .../Regress.TestWi8021x.static_method.page         |    2 +-
 .../Regress.aliased_caller_alloc.page              |    2 +-
 .../Regress.annotation_attribute_func.page         |    2 +-
 .../Regress.annotation_custom_destroy.page         |    2 +-
 .../Regress.annotation_get_source_file.page        |    2 +-
 .../Regress.annotation_init.page                   |    2 +-
 ...ress.annotation_invalid_regress_annotation.page |    2 +-
 .../Regress.annotation_ptr_array.page              |    2 +-
 .../Regress.annotation_return_array.page           |    2 +-
 .../Regress.annotation_return_filename.page        |    2 +-
 .../Regress.annotation_set_source_file.page        |    2 +-
 ...s.annotation_space_after_comment_bug631690.page |    2 +-
 .../Regress.annotation_string_array_length.page    |    2 +-
 .../Regress.annotation_string_zero_terminated.page |    2 +-
 ...ress.annotation_string_zero_terminated_out.page |    2 +-
 .../Regress.annotation_test_parsing_bug630862.page |    2 +-
 .../Regress.annotation_transfer_floating.page      |    2 +-
 .../Regress.annotation_versioned.page              |    2 +-
 .../Regress.atest_error_quark.page                 |    2 +-
 .../Regress.foo_async_ready_callback.page          |    2 +-
 .../Regress.foo_destroy_notify_callback.page       |    2 +-
 .../Regress.foo_init.page                          |    2 +-
 .../Regress.foo_method_external_references.page    |    2 +-
 .../Regress.foo_not_a_constructor_new.page         |    2 +-
 .../Regress.foo_test_array.page                    |    2 +-
 .../Regress.foo_test_const_char_param.page         |    2 +-
 .../Regress.foo_test_const_char_retval.page        |    2 +-
 .../Regress.foo_test_const_struct_param.page       |    2 +-
 .../Regress.foo_test_const_struct_retval.page      |    2 +-
 .../Regress.foo_test_string_array.page             |    2 +-
 .../Regress.foo_test_string_array_with_g.page      |    2 +-
 .../Regress.foo_test_unsigned_qualifier.page       |    2 +-
 .../Regress.foo_test_unsigned_type.page            |    2 +-
 .../Regress.func_obj_null_in.page                  |    2 +-
 .../Regress.global_get_flags_out.page              |    2 +-
 .../Regress.has_parameter_named_attrs.page         |    2 +-
 .../Regress.introspectable_via_alias.page          |    2 +-
 .../Regress.set_abort_on_error.page                |    2 +-
 .../Regress.test_array_callback.page               |    2 +-
 .../Regress.test_array_fixed_out_objects.page      |    2 +-
 .../Regress.test_array_fixed_size_int_in.page      |    2 +-
 .../Regress.test_array_fixed_size_int_out.page     |    2 +-
 .../Regress.test_array_fixed_size_int_return.page  |    2 +-
 .../Regress.test_array_gint16_in.page              |    2 +-
 .../Regress.test_array_gint32_in.page              |    2 +-
 .../Regress.test_array_gint64_in.page              |    2 +-
 .../Regress.test_array_gint8_in.page               |    2 +-
 .../Regress.test_array_gtype_in.page               |    2 +-
 .../Regress.test_array_int_full_out.page           |    2 +-
 .../Regress.test_array_int_in.page                 |    2 +-
 .../Regress.test_array_int_inout.page              |    2 +-
 .../Regress.test_array_int_none_out.page           |    2 +-
 .../Regress.test_array_int_null_in.page            |    2 +-
 .../Regress.test_array_int_null_out.page           |    2 +-
 .../Regress.test_array_int_out.page                |    2 +-
 .../Regress.test_async_ready_callback.page         |    2 +-
 .../Regress.test_boolean.page                      |    2 +-
 .../Regress.test_boolean_false.page                |    2 +-
 .../Regress.test_boolean_true.page                 |    2 +-
 .../Regress.test_cairo_context_full_return.page    |    2 +-
 .../Regress.test_cairo_context_none_in.page        |    2 +-
 .../Regress.test_cairo_surface_full_out.page       |    2 +-
 .../Regress.test_cairo_surface_full_return.page    |    2 +-
 .../Regress.test_cairo_surface_none_in.page        |    2 +-
 .../Regress.test_cairo_surface_none_return.page    |    2 +-
 .../Regress.test_callback.page                     |    2 +-
 .../Regress.test_callback_async.page               |    2 +-
 .../Regress.test_callback_destroy_notify.page      |    2 +-
 ....test_callback_destroy_notify_no_user_data.page |    2 +-
 .../Regress.test_callback_thaw_async.page          |    2 +-
 .../Regress.test_callback_thaw_notifications.page  |    2 +-
 .../Regress.test_callback_user_data.page           |    2 +-
 .../Regress.test_closure.page                      |    2 +-
 .../Regress.test_closure_one_arg.page              |    2 +-
 .../Regress.test_closure_variant.page              |    2 +-
 .../Regress.test_date_in_gvalue.page               |    2 +-
 .../Regress.test_def_error_quark.page              |    2 +-
 .../Regress.test_double.page                       |    2 +-
 .../Regress.test_filename_return.page              |    2 +-
 .../Regress.test_float.page                        |    2 +-
 .../Regress.test_garray_container_return.page      |    2 +-
 .../Regress.test_garray_full_return.page           |    2 +-
 .../Regress.test_gerror_callback.page              |    2 +-
 .../Regress.test_ghash_container_return.page       |    2 +-
 .../Regress.test_ghash_everything_return.page      |    2 +-
 .../Regress.test_ghash_gvalue_in.page              |    2 +-
 .../Regress.test_ghash_gvalue_return.page          |    2 +-
 ...egress.test_ghash_nested_everything_return.page |    2 +-
 ...gress.test_ghash_nested_everything_return2.page |    2 +-
 .../Regress.test_ghash_nothing_in.page             |    2 +-
 .../Regress.test_ghash_nothing_in2.page            |    2 +-
 .../Regress.test_ghash_nothing_return.page         |    2 +-
 .../Regress.test_ghash_nothing_return2.page        |    2 +-
 .../Regress.test_ghash_null_in.page                |    2 +-
 .../Regress.test_ghash_null_out.page               |    2 +-
 .../Regress.test_ghash_null_return.page            |    2 +-
 .../Regress.test_glist_container_return.page       |    2 +-
 .../Regress.test_glist_everything_return.page      |    2 +-
 .../Regress.test_glist_nothing_in.page             |    2 +-
 .../Regress.test_glist_nothing_in2.page            |    2 +-
 .../Regress.test_glist_nothing_return.page         |    2 +-
 .../Regress.test_glist_nothing_return2.page        |    2 +-
 .../Regress.test_glist_null_in.page                |    2 +-
 .../Regress.test_glist_null_out.page               |    2 +-
 .../Regress.test_gslist_container_return.page      |    2 +-
 .../Regress.test_gslist_everything_return.page     |    2 +-
 .../Regress.test_gslist_nothing_in.page            |    2 +-
 .../Regress.test_gslist_nothing_in2.page           |    2 +-
 .../Regress.test_gslist_nothing_return.page        |    2 +-
 .../Regress.test_gslist_nothing_return2.page       |    2 +-
 .../Regress.test_gslist_null_in.page               |    2 +-
 .../Regress.test_gslist_null_out.page              |    2 +-
 .../Regress.test_gtype.page                        |    2 +-
 .../Regress.test_gvariant_as.page                  |    2 +-
 .../Regress.test_gvariant_asv.page                 |    2 +-
 .../Regress.test_gvariant_i.page                   |    2 +-
 .../Regress.test_gvariant_s.page                   |    2 +-
 .../Regress.test_gvariant_v.page                   |    2 +-
 .../Regress.test_hash_table_callback.page          |    2 +-
 .../Regress.test_int.page                          |    2 +-
 .../Regress.test_int16.page                        |    2 +-
 .../Regress.test_int32.page                        |    2 +-
 .../Regress.test_int64.page                        |    2 +-
 .../Regress.test_int8.page                         |    2 +-
 .../Regress.test_int_out_utf8.page                 |    2 +-
 .../Regress.test_int_value_arg.page                |    2 +-
 .../Regress.test_long.page                         |    2 +-
 .../Regress.test_multi_callback.page               |    2 +-
 .../Regress.test_multi_double_args.page            |    2 +-
 .../Regress.test_multiline_doc_comments.page       |    2 +-
 .../Regress.test_nested_parameter.page             |    2 +-
 .../Regress.test_null_gerror_callback.page         |    2 +-
 .../Regress.test_owned_gerror_callback.page        |    2 +-
 .../Regress.test_short.page                        |    2 +-
 .../Regress.test_simple_callback.page              |    2 +-
 .../Regress.test_size.page                         |    2 +-
 .../Regress.test_ssize.page                        |    2 +-
 .../Regress.test_strv_in.page                      |    2 +-
 .../Regress.test_strv_in_gvalue.page               |    2 +-
 .../Regress.test_strv_out.page                     |    2 +-
 .../Regress.test_strv_out_c.page                   |    2 +-
 .../Regress.test_strv_out_container.page           |    2 +-
 .../Regress.test_strv_outarg.page                  |    2 +-
 .../Regress.test_timet.page                        |    2 +-
 .../Regress.test_torture_signature_0.page          |    2 +-
 .../Regress.test_torture_signature_1.page          |    2 +-
 .../Regress.test_torture_signature_2.page          |    2 +-
 .../Regress.test_uint.page                         |    2 +-
 .../Regress.test_uint16.page                       |    2 +-
 .../Regress.test_uint32.page                       |    2 +-
 .../Regress.test_uint64.page                       |    2 +-
 .../Regress.test_uint8.page                        |    2 +-
 .../Regress.test_ulong.page                        |    2 +-
 .../Regress.test_unichar.page                      |    2 +-
 .../Regress.test_unsigned_enum_param.page          |    2 +-
 .../Regress.test_ushort.page                       |    2 +-
 .../Regress.test_utf8_const_in.page                |    2 +-
 .../Regress.test_utf8_const_return.page            |    2 +-
 .../Regress.test_utf8_inout.page                   |    2 +-
 .../Regress.test_utf8_nonconst_return.page         |    2 +-
 .../Regress.test_utf8_null_in.page                 |    2 +-
 .../Regress.test_utf8_null_out.page                |    2 +-
 .../Regress.test_utf8_out.page                     |    2 +-
 .../Regress.test_utf8_out_nonconst_return.page     |    2 +-
 .../Regress.test_utf8_out_out.page                 |    2 +-
 .../Regress.test_value_return.page                 |    2 +-
 .../Regress.test_versioning.page                   |    2 +-
 368 files changed, 370 insertions(+), 370 deletions(-)
---
diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py
index 7f337d2..e962b91 100644
--- a/giscanner/docwriter.py
+++ b/giscanner/docwriter.py
@@ -458,7 +458,7 @@ class DocFormatterPython(DocFormatterIntrospectableBase):
 
     def format_function_name(self, func):
         if func.parent is not None:
-            return "%s.%s" % (func.parent.name, func.name)
+            return "%s.%s" % (self.format_page_name(func.parent), func.name)
         else:
             return func.name
 
@@ -523,9 +523,9 @@ class DocFormatterGjs(DocFormatterIntrospectableBase):
 
     def format_function_name(self, func):
         if func.is_method:
-            return "%s.prototype.%s" % (func.parent.name, func.name)
+            return "%s.prototype.%s" % (self.format_page_name(func.parent), func.name)
         elif func.is_constructor:
-            return "%s.%s" % (func.parent.name, func.name)
+            return "%s.%s" % (self.format_page_name(func.parent), func.name)
         else:
             return func.name
 
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page
index 4246c2a..414f5c6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.allow_none</title>
+  <title>Regress.AnnotationObject.prototype.allow_none</title>
   
 <synopsis><code mime="text/x-gjs">
 function allow_none(somearg:String):GObject.Object {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page
index b65b1ce..8dd15f1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.calleeowns</title>
+  <title>Regress.AnnotationObject.prototype.calleeowns</title>
   
 <synopsis><code mime="text/x-gjs">
 function calleeowns():Number {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page
index 221b24c..a12be35 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.calleesowns</title>
+  <title>Regress.AnnotationObject.prototype.calleesowns</title>
   
 <synopsis><code mime="text/x-gjs">
 function calleesowns():Number {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page
index 2aa3f06..d7e6784 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.compute_sum</title>
+  <title>Regress.AnnotationObject.prototype.compute_sum</title>
   
 <synopsis><code mime="text/x-gjs">
 function compute_sum(nums:[Number]):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page
index b769ba6..16b6215 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.compute_sum_n</title>
+  <title>Regress.AnnotationObject.prototype.compute_sum_n</title>
   
 <synopsis><code mime="text/x-gjs">
 function compute_sum_n(nums:[Number]):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page
index b7a834a..f4a3b7d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.compute_sum_nz</title>
+  <title>Regress.AnnotationObject.prototype.compute_sum_nz</title>
   
 <synopsis><code mime="text/x-gjs">
 function compute_sum_nz(nums:[Number]):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page
index b22eaf8..03ceac1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.create_object</title>
+  <title>Regress.AnnotationObject.prototype.create_object</title>
   
 <synopsis><code mime="text/x-gjs">
 function create_object():GObject.Object {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page
index 8b7912d..e89c8fe 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.do_not_use</title>
+  <title>Regress.AnnotationObject.prototype.do_not_use</title>
   
 <synopsis><code mime="text/x-gjs">
 function do_not_use():GObject.Object {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page
index 9017593..cd58eed 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.extra_annos</title>
+  <title>Regress.AnnotationObject.prototype.extra_annos</title>
   
 <synopsis><code mime="text/x-gjs">
 function extra_annos():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page
index cdf26c5..e4cc4c0 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.foreach</title>
+  <title>Regress.AnnotationObject.prototype.foreach</title>
   
 <synopsis><code mime="text/x-gjs">
 function foreach(func:Regress.AnnotationForeachFunc):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page
index 20ffffd..2e6ca61 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.get_hash</title>
+  <title>Regress.AnnotationObject.prototype.get_hash</title>
   
 <synopsis><code mime="text/x-gjs">
 function get_hash():{String: GObject.Object} {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
index 6ae6806..c0350d7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.get_objects</title>
+  <title>Regress.AnnotationObject.prototype.get_objects</title>
   
 <synopsis><code mime="text/x-gjs">
 function get_objects():[Regress.AnnotationObject] {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
index 96134cf..e36d25a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.get_strings</title>
+  <title>Regress.AnnotationObject.prototype.get_strings</title>
   
 <synopsis><code mime="text/x-gjs">
 function get_strings():[String] {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page
index 2238d90..945acf0 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.hidden_self</title>
+  <title>Regress.AnnotationObject.prototype.hidden_self</title>
   
 <synopsis><code mime="text/x-gjs">
 function hidden_self():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page
index cf66940..226b2b9 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.in</title>
+  <title>Regress.AnnotationObject.prototype.in</title>
   
 <synopsis><code mime="text/x-gjs">
 function in(inarg:Number):Number {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page
index b8d5088..885412f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.inout</title>
+  <title>Regress.AnnotationObject.prototype.inout</title>
   
 <synopsis><code mime="text/x-gjs">
 function inout(inoutarg:Number):Number {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page
index 6c34095..34406b7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.inout2</title>
+  <title>Regress.AnnotationObject.prototype.inout2</title>
   
 <synopsis><code mime="text/x-gjs">
 function inout2(inoutarg:Number):Number {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page
index d7adac1..2828964 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.inout3</title>
+  <title>Regress.AnnotationObject.prototype.inout3</title>
   
 <synopsis><code mime="text/x-gjs">
 function inout3(inoutarg:Number):Number {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page
index 217ae08..49d937a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.method</title>
+  <title>Regress.AnnotationObject.prototype.method</title>
   
 <synopsis><code mime="text/x-gjs">
 function method():Number {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page
index c9a864f..0424719 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.notrans</title>
+  <title>Regress.AnnotationObject.prototype.notrans</title>
   
 <synopsis><code mime="text/x-gjs">
 function notrans():GObject.Object {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page
index 3f84550..5120baf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.out</title>
+  <title>Regress.AnnotationObject.prototype.out</title>
   
 <synopsis><code mime="text/x-gjs">
 function out():Number {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page
index 1bc89fb..8476fd8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.parse_args</title>
+  <title>Regress.AnnotationObject.prototype.parse_args</title>
   
 <synopsis><code mime="text/x-gjs">
 function parse_args(argv:[String]):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page
index 6c5d1e7..a5dafb9 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.set_data</title>
+  <title>Regress.AnnotationObject.prototype.set_data</title>
   
 <synopsis><code mime="text/x-gjs">
 function set_data(data:[guint8]):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page
index de78bd3..3fcd818 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.set_data2</title>
+  <title>Regress.AnnotationObject.prototype.set_data2</title>
   
 <synopsis><code mime="text/x-gjs">
 function set_data2(data:[gint8]):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page
index 94c689e..22fb98d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.set_data3</title>
+  <title>Regress.AnnotationObject.prototype.set_data3</title>
   
 <synopsis><code mime="text/x-gjs">
 function set_data3(data:[guint8]):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page
index 78e1db7..4d6029a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.string_out</title>
+  <title>Regress.AnnotationObject.prototype.string_out</title>
   
 <synopsis><code mime="text/x-gjs">
 function string_out():Boolean {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page
index c2e5f11..c602a89 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.use_buffer</title>
+  <title>Regress.AnnotationObject.prototype.use_buffer</title>
   
 <synopsis><code mime="text/x-gjs">
 function use_buffer(bytes:guint8):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page
index 329c968..a5ccad4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.watch_full</title>
+  <title>Regress.AnnotationObject.prototype.watch_full</title>
   
 <synopsis><code mime="text/x-gjs">
 function watch_full(func:Regress.AnnotationForeachFunc):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page
index 57eff66..6daccb5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.prototype.with_voidp</title>
+  <title>Regress.AnnotationObject.prototype.with_voidp</title>
   
 <synopsis><code mime="text/x-gjs">
 function with_voidp(data:gpointer):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page
index 48b5bfd..9091617 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooBRect.prototype.add</title>
+  <title>Regress.FooBRect.prototype.add</title>
   
 <synopsis><code mime="text/x-gjs">
 function add(b2:Regress.FooBRect):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page
index 21d810a..2d2b574 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>FooBRect.new</title>
+  <title>Regress.FooBRect.new</title>
   
 <synopsis><code mime="text/x-gjs">
 function new(x:Number, y:Number):Regress.FooBRect {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page
index 4f00498..896d02a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>FooBoxed.prototype.method</title>
+  <title>Regress.FooBoxed.prototype.method</title>
   
 <synopsis><code mime="text/x-gjs">
 function method():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page
index 8cfb619..67b1c4f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>FooBoxed.new</title>
+  <title>Regress.FooBoxed.new</title>
   
 <synopsis><code mime="text/x-gjs">
 function new():Regress.FooBoxed {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page
index af7c408..871ec7a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>FooBuffer.prototype.some_method</title>
+  <title>Regress.FooBuffer.prototype.some_method</title>
   
 <synopsis><code mime="text/x-gjs">
 function some_method():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page
index 4745995..0b1b6b8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>FooDBusData.prototype.method</title>
+  <title>Regress.FooDBusData.prototype.method</title>
   
 <synopsis><code mime="text/x-gjs">
 function method():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page
index eb2fc33..1a61cfb 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>FooForeignStruct.prototype.copy</title>
+  <title>Regress.FooForeignStruct.prototype.copy</title>
   
 <synopsis><code mime="text/x-gjs">
 function copy():Regress.FooForeignStruct {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page
index fdeb397..814eef3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>FooForeignStruct.new</title>
+  <title>Regress.FooForeignStruct.new</title>
   
 <synopsis><code mime="text/x-gjs">
 function new():Regress.FooForeignStruct {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page
index b91471d..993998e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooInterface.prototype.do_regress_foo</title>
+  <title>Regress.FooInterface.prototype.do_regress_foo</title>
   
 <synopsis><code mime="text/x-gjs">
 function do_regress_foo(x:Number):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page
index d53564b..f1bfd92 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.prototype.append_new_stack_layer</title>
+  <title>Regress.FooObject.prototype.append_new_stack_layer</title>
   
 <synopsis><code mime="text/x-gjs">
 function append_new_stack_layer(x:Number):Regress.FooOtherObject {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page
index 46a61b2..d74f95b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.prototype.dup_name</title>
+  <title>Regress.FooObject.prototype.dup_name</title>
   
 <synopsis><code mime="text/x-gjs">
 function dup_name():String {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page
index fb2b54c..7da1b86 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.prototype.external_type</title>
+  <title>Regress.FooObject.prototype.external_type</title>
   
 <synopsis><code mime="text/x-gjs">
 function external_type():Utility.Object {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page
index b06580f..b9c69d2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.prototype.get_name</title>
+  <title>Regress.FooObject.prototype.get_name</title>
   
 <synopsis><code mime="text/x-gjs">
 function get_name():String {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page
index 746d830..3209f20 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.prototype.handle_glyph</title>
+  <title>Regress.FooObject.prototype.handle_glyph</title>
   
 <synopsis><code mime="text/x-gjs">
 function handle_glyph(glyph:Utility.Glyph):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page
index 8f83b37..f42e16b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.prototype.is_it_time_yet</title>
+  <title>Regress.FooObject.prototype.is_it_time_yet</title>
   
 <synopsis><code mime="text/x-gjs">
 function is_it_time_yet(time:Number):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page
index 32500e1..fa40bfc 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.new</title>
+  <title>Regress.FooObject.new</title>
   
 <synopsis><code mime="text/x-gjs">
 function new():Regress.FooObject {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page
index 2c85b26..0323a1b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.new_as_super</title>
+  <title>Regress.FooObject.new_as_super</title>
   
 <synopsis><code mime="text/x-gjs">
 function new_as_super():GObject.Object {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page
index b59223c..78bdb64 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.prototype.read</title>
+  <title>Regress.FooObject.prototype.read</title>
   
 <synopsis><code mime="text/x-gjs">
 function read(offset:Number, length:Number):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page
index 8ed0b6d..1f50921 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.prototype.various</title>
+  <title>Regress.FooObject.prototype.various</title>
   
 <synopsis><code mime="text/x-gjs">
 function various(data:gpointer, some_type:GType):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page
index 460c461..3467ca2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.prototype.virtual_method</title>
+  <title>Regress.FooObject.prototype.virtual_method</title>
   
 <synopsis><code mime="text/x-gjs">
 function virtual_method(first_param:Number):Boolean {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page
index 46d6252..276450e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooRectangle.prototype.add</title>
+  <title>Regress.FooRectangle.prototype.add</title>
   
 <synopsis><code mime="text/x-gjs">
 function add(r2:Regress.FooRectangle):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page
index 8a1fd9e..a258a3e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>FooSubInterface.prototype.do_bar</title>
+  <title>Regress.FooSubInterface.prototype.do_bar</title>
   
 <synopsis><code mime="text/x-gjs">
 function do_bar():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page
index 10e8020..b55a8d7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooSubInterface.prototype.do_baz</title>
+  <title>Regress.FooSubInterface.prototype.do_baz</title>
   
 <synopsis><code mime="text/x-gjs">
 function do_baz(callback:GObject.Callback):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page
index 6e400bb..08cb116 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>FooSubobject.new</title>
+  <title>Regress.FooSubobject.new</title>
   
 <synopsis><code mime="text/x-gjs">
 function new():Regress.FooSubobject {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page
index eac2133..751ce88 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxed.prototype.copy</title>
+  <title>Regress.TestBoxed.prototype.copy</title>
   
 <synopsis><code mime="text/x-gjs">
 function copy():Regress.TestBoxed {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page
index 23a6d7d..5c23da2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxed.prototype.equals</title>
+  <title>Regress.TestBoxed.prototype.equals</title>
   
 <synopsis><code mime="text/x-gjs">
 function equals(other:Regress.TestBoxed):Boolean {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page
index 5fbf83a..88e33de 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxed.new</title>
+  <title>Regress.TestBoxed.new</title>
   
 <synopsis><code mime="text/x-gjs">
 function new():Regress.TestBoxed {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page
index 7d1b27b..801bad2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxed.new_alternative_constructor1</title>
+  <title>Regress.TestBoxed.new_alternative_constructor1</title>
   
 <synopsis><code mime="text/x-gjs">
 function new_alternative_constructor1(i:Number):Regress.TestBoxed {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page
index 3a4ef98..23fa672 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxed.new_alternative_constructor2</title>
+  <title>Regress.TestBoxed.new_alternative_constructor2</title>
   
 <synopsis><code mime="text/x-gjs">
 function new_alternative_constructor2(i:Number, j:Number):Regress.TestBoxed {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page
index da86a8e..8f0c2d2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxed.new_alternative_constructor3</title>
+  <title>Regress.TestBoxed.new_alternative_constructor3</title>
   
 <synopsis><code mime="text/x-gjs">
 function new_alternative_constructor3(s:String):Regress.TestBoxed {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page
index 78b8165..06bccc8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxedB.prototype.copy</title>
+  <title>Regress.TestBoxedB.prototype.copy</title>
   
 <synopsis><code mime="text/x-gjs">
 function copy():Regress.TestBoxedB {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page
index b68acc9..e71147a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxedB.new</title>
+  <title>Regress.TestBoxedB.new</title>
   
 <synopsis><code mime="text/x-gjs">
 function new(some_int8:gint8, some_long:Number):Regress.TestBoxedB {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page
index 301936b..542c93e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxedC.new</title>
+  <title>Regress.TestBoxedC.new</title>
   
 <synopsis><code mime="text/x-gjs">
 function new():Regress.TestBoxedC {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page
index be4b26a..7b51fd5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxedD.prototype.copy</title>
+  <title>Regress.TestBoxedD.prototype.copy</title>
   
 <synopsis><code mime="text/x-gjs">
 function copy():Regress.TestBoxedD {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page
index 3198b66..82df904 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxedD.prototype.free</title>
+  <title>Regress.TestBoxedD.prototype.free</title>
   
 <synopsis><code mime="text/x-gjs">
 function free():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page
index fdb9dbf..0f7923e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxedD.prototype.get_magic</title>
+  <title>Regress.TestBoxedD.prototype.get_magic</title>
   
 <synopsis><code mime="text/x-gjs">
 function get_magic():Number {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page
index 6ed46e5..cfd50c5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxedD.new</title>
+  <title>Regress.TestBoxedD.new</title>
   
 <synopsis><code mime="text/x-gjs">
 function new(a_string:String, a_int:Number):Regress.TestBoxedD {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page
index 35ea1f4..94c80cf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestFloating.new</title>
+  <title>Regress.TestFloating.new</title>
   
 <synopsis><code mime="text/x-gjs">
 function new():Regress.TestFloating {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page
index 7891d88..b1c37ef 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestFundamentalObject.prototype.ref</title>
+  <title>Regress.TestFundamentalObject.prototype.ref</title>
   
 <synopsis><code mime="text/x-gjs">
 function ref():Regress.TestFundamentalObject {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page
index 8992abc..758a30d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestFundamentalObject.prototype.unref</title>
+  <title>Regress.TestFundamentalObject.prototype.unref</title>
   
 <synopsis><code mime="text/x-gjs">
 function unref():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page
index 109cb52..c6a31f9 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page
@@ -22,7 +22,7 @@
     </api:function>
 
   </info>
-  <title>TestFundamentalSubObject.new</title>
+  <title>Regress.TestFundamentalSubObject.new</title>
   
 <synopsis><code mime="text/x-gjs">
 function new(data:String):Regress.TestFundamentalSubObject {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page
index eb60f55..176211b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestInheritDrawable.prototype.do_foo</title>
+  <title>Regress.TestInheritDrawable.prototype.do_foo</title>
   
 <synopsis><code mime="text/x-gjs">
 function do_foo(x:Number):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
index f9f05b2..038b73f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestInheritDrawable.prototype.do_foo_maybe_throw</title>
+  <title>Regress.TestInheritDrawable.prototype.do_foo_maybe_throw</title>
   
 <synopsis><code mime="text/x-gjs">
 function do_foo_maybe_throw(x:Number):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page
index 24489cf..9dd2cba 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestInheritDrawable.prototype.get_origin</title>
+  <title>Regress.TestInheritDrawable.prototype.get_origin</title>
   
 <synopsis><code mime="text/x-gjs">
 function get_origin():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page
index f8c06b4..669ab1c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestInheritDrawable.prototype.get_size</title>
+  <title>Regress.TestInheritDrawable.prototype.get_size</title>
   
 <synopsis><code mime="text/x-gjs">
 function get_size():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page
index 14c8ba6..4f2183d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.constructor</title>
+  <title>Regress.TestObj.constructor</title>
   
 <synopsis><code mime="text/x-gjs">
 function constructor():Regress.TestObj {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page
index 2b27fe6..0770d0d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.prototype.do_matrix</title>
+  <title>Regress.TestObj.prototype.do_matrix</title>
   
 <synopsis><code mime="text/x-gjs">
 function do_matrix(somestr:String):Number {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
index a2eb7ea..5e71948 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.prototype.emit_sig_with_foreign_struct</title>
+  <title>Regress.TestObj.prototype.emit_sig_with_foreign_struct</title>
   
 <synopsis><code mime="text/x-gjs">
 function emit_sig_with_foreign_struct():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page
index b2853ef..1c46dfb 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.prototype.emit_sig_with_int64</title>
+  <title>Regress.TestObj.prototype.emit_sig_with_int64</title>
   
 <synopsis><code mime="text/x-gjs">
 function emit_sig_with_int64():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page
index c0f9950..ea33a82 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.prototype.emit_sig_with_obj</title>
+  <title>Regress.TestObj.prototype.emit_sig_with_obj</title>
   
 <synopsis><code mime="text/x-gjs">
 function emit_sig_with_obj():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page
index 7ff7b0b..35c0678 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.prototype.emit_sig_with_uint64</title>
+  <title>Regress.TestObj.prototype.emit_sig_with_uint64</title>
   
 <synopsis><code mime="text/x-gjs">
 function emit_sig_with_uint64():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page
index 771bba8..b3ff3bf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.prototype.forced_method</title>
+  <title>Regress.TestObj.prototype.forced_method</title>
   
 <synopsis><code mime="text/x-gjs">
 function forced_method():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page
index 096b754..9ee8768 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.prototype.instance_method</title>
+  <title>Regress.TestObj.prototype.instance_method</title>
   
 <synopsis><code mime="text/x-gjs">
 function instance_method():Number {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page
index d0f6009..fe26069 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.prototype.instance_method_callback</title>
+  <title>Regress.TestObj.prototype.instance_method_callback</title>
   
 <synopsis><code mime="text/x-gjs">
 function instance_method_callback(callback:Regress.TestCallback):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page
index d3210ca..024db93 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.new</title>
+  <title>Regress.TestObj.new</title>
   
 <synopsis><code mime="text/x-gjs">
 function new(obj:Regress.TestObj):Regress.TestObj {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page
index 4427952..4eaa036 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.new_callback</title>
+  <title>Regress.TestObj.new_callback</title>
   
 <synopsis><code mime="text/x-gjs">
 function new_callback(callback:Regress.TestCallbackUserData):Regress.TestObj {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page
index a4f9980..c54fa62 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.new_from_file</title>
+  <title>Regress.TestObj.new_from_file</title>
   
 <synopsis><code mime="text/x-gjs">
 function new_from_file(x:String):Regress.TestObj {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page
index d80d786..dca89e8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.prototype.set_bare</title>
+  <title>Regress.TestObj.prototype.set_bare</title>
   
 <synopsis><code mime="text/x-gjs">
 function set_bare(bare:GObject.Object):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page
index df6625d..aee3f2c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page
@@ -36,7 +36,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.prototype.skip_inout_param</title>
+  <title>Regress.TestObj.prototype.skip_inout_param</title>
   
 <synopsis><code mime="text/x-gjs">
 function skip_inout_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page
index f557941..75b7bb2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page
@@ -36,7 +36,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.prototype.skip_out_param</title>
+  <title>Regress.TestObj.prototype.skip_out_param</title>
   
 <synopsis><code mime="text/x-gjs">
 function skip_out_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page
index 06c0c62..cd2081f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page
@@ -36,7 +36,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.prototype.skip_param</title>
+  <title>Regress.TestObj.prototype.skip_param</title>
   
 <synopsis><code mime="text/x-gjs">
 function skip_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page
index 9ea28a1..22ec572 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page
@@ -36,7 +36,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.prototype.skip_return_val</title>
+  <title>Regress.TestObj.prototype.skip_return_val</title>
   
 <synopsis><code mime="text/x-gjs">
 function skip_return_val(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page
index c61e93e..74701f7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.prototype.skip_return_val_no_out</title>
+  <title>Regress.TestObj.prototype.skip_return_val_no_out</title>
   
 <synopsis><code mime="text/x-gjs">
 function skip_return_val_no_out(a:Number):Boolean {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page
index 8053e0b..78bf63b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.prototype.torture_signature_0</title>
+  <title>Regress.TestObj.prototype.torture_signature_0</title>
   
 <synopsis><code mime="text/x-gjs">
 function torture_signature_0(x:Number, foo:String, m:Number):void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page
index 0ba6cbb..553ddd2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.prototype.torture_signature_1</title>
+  <title>Regress.TestObj.prototype.torture_signature_1</title>
   
 <synopsis><code mime="text/x-gjs">
 function torture_signature_1(x:Number, foo:String, m:Number):Boolean {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page
index 2784f14..6aa0974 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestSimpleBoxedA.prototype.copy</title>
+  <title>Regress.TestSimpleBoxedA.prototype.copy</title>
   
 <synopsis><code mime="text/x-gjs">
 function copy():Regress.TestSimpleBoxedA {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page
index aa9a02e..52e5877 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestSimpleBoxedA.prototype.equals</title>
+  <title>Regress.TestSimpleBoxedA.prototype.equals</title>
   
 <synopsis><code mime="text/x-gjs">
 function equals(other_a:Regress.TestSimpleBoxedA):Boolean {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page
index f0ca721..b1bd51a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestSimpleBoxedB.prototype.copy</title>
+  <title>Regress.TestSimpleBoxedB.prototype.copy</title>
   
 <synopsis><code mime="text/x-gjs">
 function copy():Regress.TestSimpleBoxedB {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page
index 9d23bbd..ded4a79 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestStructA.prototype.clone</title>
+  <title>Regress.TestStructA.prototype.clone</title>
   
 <synopsis><code mime="text/x-gjs">
 function clone():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page
index ed5f9c0..20278cd 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestStructB.prototype.clone</title>
+  <title>Regress.TestStructB.prototype.clone</title>
   
 <synopsis><code mime="text/x-gjs">
 function clone():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page
index a237385..f0edd05 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestStructFixedArray.prototype.frob</title>
+  <title>Regress.TestStructFixedArray.prototype.frob</title>
   
 <synopsis><code mime="text/x-gjs">
 function frob():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page
index 4a7427e..26fc790 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestSubObj.prototype.instance_method</title>
+  <title>Regress.TestSubObj.prototype.instance_method</title>
   
 <synopsis><code mime="text/x-gjs">
 function instance_method():Number {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page
index a66646b..31deab7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestSubObj.new</title>
+  <title>Regress.TestSubObj.new</title>
   
 <synopsis><code mime="text/x-gjs">
 function new():Regress.TestObj {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page
index 2b720eb..a632f8f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestSubObj.prototype.unset_bare</title>
+  <title>Regress.TestSubObj.prototype.unset_bare</title>
   
 <synopsis><code mime="text/x-gjs">
 function unset_bare():void {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page
index 0c9440b..e42b0d7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestWi8021x.prototype.get_testbool</title>
+  <title>Regress.TestWi8021x.prototype.get_testbool</title>
   
 <synopsis><code mime="text/x-gjs">
 function get_testbool():Boolean {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page
index c79a2f5..b8b162c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestWi8021x.new</title>
+  <title>Regress.TestWi8021x.new</title>
   
 <synopsis><code mime="text/x-gjs">
 function new():Regress.TestWi8021x {
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page 
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page
index 471c51c..e052ed5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestWi8021x.prototype.set_testbool</title>
+  <title>Regress.TestWi8021x.prototype.set_testbool</title>
   
 <synopsis><code mime="text/x-gjs">
 function set_testbool(v:Boolean):void {
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page
index 5dc0d89..a04abd7 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.allow_none</title>
+  <title>Regress.AnnotationObject.allow_none</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page
index e808852..bebf773 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.calleeowns</title>
+  <title>Regress.AnnotationObject.calleeowns</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, GObject.Object)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page
index 0b6dd5d..ef9361f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.calleesowns</title>
+  <title>Regress.AnnotationObject.calleesowns</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, GObject.Object, GObject.Object)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page
index 32bdcff..4f58e6f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.compute_sum</title>
+  <title>Regress.AnnotationObject.compute_sum</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, [int])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page
index cc1c627..fc99313 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.compute_sum_n</title>
+  <title>Regress.AnnotationObject.compute_sum_n</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, [int], int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page
index eb65fe3..67efe7c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.compute_sum_nz</title>
+  <title>Regress.AnnotationObject.compute_sum_nz</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, [int], int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page
index bcd4fd5..6498ac2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.create_object</title>
+  <title>Regress.AnnotationObject.create_object</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page
index dd7f050..fac9f16 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.do_not_use</title>
+  <title>Regress.AnnotationObject.do_not_use</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page
index d872978..7e03266 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.extra_annos</title>
+  <title>Regress.AnnotationObject.extra_annos</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page
index 63fedad..1010a01 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.foreach</title>
+  <title>Regress.AnnotationObject.foreach</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, Regress.AnnotationForeachFunc, gpointer)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page
index d0dbe7c..8d658f5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.get_hash</title>
+  <title>Regress.AnnotationObject.get_hash</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
index 4d378e3..ef231f5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.get_objects</title>
+  <title>Regress.AnnotationObject.get_objects</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
index 7eb5735..13570b6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.get_strings</title>
+  <title>Regress.AnnotationObject.get_strings</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page
index 717525f..ce1111f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.hidden_self</title>
+  <title>Regress.AnnotationObject.hidden_self</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page
index 2f7d526..0e77f85 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.in</title>
+  <title>Regress.AnnotationObject.in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page
index 4723d33..6816eaf 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.inout</title>
+  <title>Regress.AnnotationObject.inout</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page
index 774f323..aef9dec 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.inout2</title>
+  <title>Regress.AnnotationObject.inout2</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page
index 806b6e7..4ba4bf6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.inout3</title>
+  <title>Regress.AnnotationObject.inout3</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page
index 11a0f0d..b6badcf 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.method</title>
+  <title>Regress.AnnotationObject.method</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page
index 4e474d0..aa50a26 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.notrans</title>
+  <title>Regress.AnnotationObject.notrans</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page
index b1e037f..606b4a1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.out</title>
+  <title>Regress.AnnotationObject.out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page
index a69df60..760e0be 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.parse_args</title>
+  <title>Regress.AnnotationObject.parse_args</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, int, [unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page
index e8a4879..7cd5236 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.set_data</title>
+  <title>Regress.AnnotationObject.set_data</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, [guint8], gsize)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page
index 63e540d..cd47036 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.set_data2</title>
+  <title>Regress.AnnotationObject.set_data2</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, [gint8], gsize)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page
index b01add0..b9016e8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.set_data3</title>
+  <title>Regress.AnnotationObject.set_data3</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, [guint8], gsize)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page
index cd68ab7..c1d085a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.string_out</title>
+  <title>Regress.AnnotationObject.string_out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page
index dddc4d5..385fe89 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.use_buffer</title>
+  <title>Regress.AnnotationObject.use_buffer</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, guint8)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page
index 3d3c756..28ca71a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page
@@ -32,7 +32,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.watch_full</title>
+  <title>Regress.AnnotationObject.watch_full</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, Regress.AnnotationForeachFunc, gpointer, GLib.DestroyNotify)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page
index a6b653a..bda3e9a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>AnnotationObject.with_voidp</title>
+  <title>Regress.AnnotationObject.with_voidp</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, gpointer)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page
index dca11c3..c7e03ac 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>FooBRect.add</title>
+  <title>Regress.FooBRect.add</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooBRect, Regress.FooBRect)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page
index dfaf746..95f06fb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooBoxed.method</title>
+  <title>Regress.FooBoxed.method</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooBoxed)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page
index bee0dd0..e971b2d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooBuffer.some_method</title>
+  <title>Regress.FooBuffer.some_method</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooBuffer)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page
index 744cbf0..fe1b647 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooDBusData.method</title>
+  <title>Regress.FooDBusData.method</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooDBusData)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page
index 757033f..1dbb5dc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooForeignStruct.copy</title>
+  <title>Regress.FooForeignStruct.copy</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooForeignStruct)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page
index d94103f..3b2f26d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>FooInterface.do_regress_foo</title>
+  <title>Regress.FooInterface.do_regress_foo</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooInterface, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page
index 5a09792..1c6c166 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooInterface.static_method</title>
+  <title>Regress.FooInterface.static_method</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page
index ecfd04f..87645bc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.a_global_method</title>
+  <title>Regress.FooObject.a_global_method</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Utility.Object)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page
index dce6f59..23ba26b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.append_new_stack_layer</title>
+  <title>Regress.FooObject.append_new_stack_layer</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page
index 4e2a8e4..dcc20f6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.dup_name</title>
+  <title>Regress.FooObject.dup_name</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page
index 182f153..0b32bef 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.external_type</title>
+  <title>Regress.FooObject.external_type</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page
index 68806e8..826efd8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.get_default</title>
+  <title>Regress.FooObject.get_default</title>
   
 <synopsis><code mime="text/x-python">
 @returns(Regress.FooSubobject)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page
index bc94a27..e66d493 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.get_name</title>
+  <title>Regress.FooObject.get_name</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page
index 260c8dd..e171f82 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.handle_glyph</title>
+  <title>Regress.FooObject.handle_glyph</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject, Utility.Glyph)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page
index 8678802..1781562 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.is_it_time_yet</title>
+  <title>Regress.FooObject.is_it_time_yet</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page
index 1dc774f..88dee52 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.read</title>
+  <title>Regress.FooObject.read</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject, int, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page
index ab00651..c652a10 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.static_meth</title>
+  <title>Regress.FooObject.static_meth</title>
   
 <synopsis><code mime="text/x-python">
 @returns(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page
index 456f9cc..efdc5c4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.various</title>
+  <title>Regress.FooObject.various</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject, gpointer, GType)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page
index 60b3815..f4920be 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>FooObject.virtual_method</title>
+  <title>Regress.FooObject.virtual_method</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooObject, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page
index 1a05ace..fe924f4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>FooRectangle.add</title>
+  <title>Regress.FooRectangle.add</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooRectangle, Regress.FooRectangle)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page
index 0e15941..1ecac0d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>FooSubInterface.do_bar</title>
+  <title>Regress.FooSubInterface.do_bar</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooSubInterface)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page
index f5fcb43..071fb0d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>FooSubInterface.do_baz</title>
+  <title>Regress.FooSubInterface.do_baz</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooSubInterface, GObject.Callback, gpointer)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page
index 85e7639..6e69b52 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxed.copy</title>
+  <title>Regress.TestBoxed.copy</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestBoxed)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page
index 9fe3061..b4e88aa 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxed.equals</title>
+  <title>Regress.TestBoxed.equals</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestBoxed, Regress.TestBoxed)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page
index e2b38f8..2629154 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxedB.copy</title>
+  <title>Regress.TestBoxedB.copy</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestBoxedB)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page
index e350d80..9910236 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxedD.copy</title>
+  <title>Regress.TestBoxedD.copy</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestBoxedD)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page
index d083007..9750cc3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxedD.free</title>
+  <title>Regress.TestBoxedD.free</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestBoxedD)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page
index ea1ac4f..f050eb6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestBoxedD.get_magic</title>
+  <title>Regress.TestBoxedD.get_magic</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestBoxedD)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page
index af12914..ed3159d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestFundamentalObject.ref</title>
+  <title>Regress.TestFundamentalObject.ref</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestFundamentalObject)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page
index 90e7e88..1ecf6c1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestFundamentalObject.unref</title>
+  <title>Regress.TestFundamentalObject.unref</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestFundamentalObject)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page
index 2d8d0b6..1cfcfdc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>TestInheritDrawable.do_foo</title>
+  <title>Regress.TestInheritDrawable.do_foo</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestInheritDrawable, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
index 4524842..e00b489 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>TestInheritDrawable.do_foo_maybe_throw</title>
+  <title>Regress.TestInheritDrawable.do_foo_maybe_throw</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestInheritDrawable, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page
index 983cb50..357d069 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>TestInheritDrawable.get_origin</title>
+  <title>Regress.TestInheritDrawable.get_origin</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestInheritDrawable, int, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page
index 09b0559..3bbdfed 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>TestInheritDrawable.get_size</title>
+  <title>Regress.TestInheritDrawable.get_size</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestInheritDrawable, int, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page
index 31e6b14..07eaa50 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.do_matrix</title>
+  <title>Regress.TestObj.do_matrix</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
index 3871f1f..065d745 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.emit_sig_with_foreign_struct</title>
+  <title>Regress.TestObj.emit_sig_with_foreign_struct</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page
index 5c607d1..fb0679a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.emit_sig_with_int64</title>
+  <title>Regress.TestObj.emit_sig_with_int64</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page
index 675aba9..2515498 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.emit_sig_with_obj</title>
+  <title>Regress.TestObj.emit_sig_with_obj</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page
index a6ad4b1..34fbfe3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.emit_sig_with_uint64</title>
+  <title>Regress.TestObj.emit_sig_with_uint64</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page
index 90bedec..e477052 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.forced_method</title>
+  <title>Regress.TestObj.forced_method</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page
index ec94048..58c58e3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.instance_method</title>
+  <title>Regress.TestObj.instance_method</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page
index aa015c5..d491fa6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.instance_method_callback</title>
+  <title>Regress.TestObj.instance_method_callback</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, Regress.TestCallback)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page
index 7538150..a1c0660 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.null_out</title>
+  <title>Regress.TestObj.null_out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page
index bbd16fe..63acc89 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.set_bare</title>
+  <title>Regress.TestObj.set_bare</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, GObject.Object)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page
index d2eea26..3d32ba0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page
@@ -48,7 +48,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.skip_inout_param</title>
+  <title>Regress.TestObj.skip_inout_param</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, int, int, float, int, int, int, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page
index 2a13be9..58c5268 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page
@@ -48,7 +48,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.skip_out_param</title>
+  <title>Regress.TestObj.skip_out_param</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, int, int, float, int, int, int, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page
index 0a900ee..c02f3b9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page
@@ -48,7 +48,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.skip_param</title>
+  <title>Regress.TestObj.skip_param</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, int, int, float, int, int, int, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page
index b4ae458..2aadb42 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page
@@ -48,7 +48,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.skip_return_val</title>
+  <title>Regress.TestObj.skip_return_val</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, int, int, float, int, int, int, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page
index 1c10cea..f0c50f5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.skip_return_val_no_out</title>
+  <title>Regress.TestObj.skip_return_val_no_out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page
index 6896d2e..6751026 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.static_method</title>
+  <title>Regress.TestObj.static_method</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page
index 32fe8e5..4d97f31 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.static_method_callback</title>
+  <title>Regress.TestObj.static_method_callback</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallback)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page
index 9ad2710..4cc806d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page
@@ -44,7 +44,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.torture_signature_0</title>
+  <title>Regress.TestObj.torture_signature_0</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, int, float, int, unicode, int, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page
index 0313a70..7ccc132 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page
@@ -44,7 +44,7 @@
     </api:function>
 
   </info>
-  <title>TestObj.torture_signature_1</title>
+  <title>Regress.TestObj.torture_signature_1</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj, int, float, int, unicode, int, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page
index 10789f2..499a047 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>TestSimpleBoxedA.const_return</title>
+  <title>Regress.TestSimpleBoxedA.const_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns(Regress.TestSimpleBoxedA)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page
index 5e19199..5e3fc24 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestSimpleBoxedA.copy</title>
+  <title>Regress.TestSimpleBoxedA.copy</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestSimpleBoxedA)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page
index 426bd98..a9ae5b2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>TestSimpleBoxedA.equals</title>
+  <title>Regress.TestSimpleBoxedA.equals</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestSimpleBoxedA, Regress.TestSimpleBoxedA)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page
index 95950d7..999c850 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestSimpleBoxedB.copy</title>
+  <title>Regress.TestSimpleBoxedB.copy</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestSimpleBoxedB)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page
index ee47fb3..cb2ea92 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>TestStructA.clone</title>
+  <title>Regress.TestStructA.clone</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestStructA, Regress.TestStructA)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page
index e557650..bfd3189 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>TestStructA.parse</title>
+  <title>Regress.TestStructA.parse</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestStructA, unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page
index 4abe66b..ea78efd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>TestStructB.clone</title>
+  <title>Regress.TestStructB.clone</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestStructB, Regress.TestStructB)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page
index 427eef3..8f9e288 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestStructFixedArray.frob</title>
+  <title>Regress.TestStructFixedArray.frob</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestStructFixedArray)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page
index 878b405..9806d28 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestSubObj.instance_method</title>
+  <title>Regress.TestSubObj.instance_method</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestSubObj)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page
index 67a9806..2b54839 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestSubObj.unset_bare</title>
+  <title>Regress.TestSubObj.unset_bare</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestSubObj)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page
index e9431c7..cd83b9d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestWi8021x.get_testbool</title>
+  <title>Regress.TestWi8021x.get_testbool</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestWi8021x)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page
index d5afdb6..59dbbd9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>TestWi8021x.set_testbool</title>
+  <title>Regress.TestWi8021x.set_testbool</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestWi8021x, bool)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page
index be2afb9..d2d83e3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>TestWi8021x.static_method</title>
+  <title>Regress.TestWi8021x.static_method</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page
index 6b9f278..e210a97 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.aliased_caller_alloc</title>
+  <title>Index.aliased_caller_alloc</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AliasedTestBoxed)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page
index e636e2d..edee18b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.annotation_attribute_func</title>
+  <title>Index.annotation_attribute_func</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationObject, unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page
index fb428b2..7afb97c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>Regress.annotation_custom_destroy</title>
+  <title>Index.annotation_custom_destroy</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.AnnotationCallback, Regress.AnnotationNotifyFunc, gpointer)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page
index e8b0ac5..51a2ce4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.annotation_get_source_file</title>
+  <title>Index.annotation_get_source_file</title>
   
 <synopsis><code mime="text/x-python">
 @returns(filename)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page
index c94076a..16c7ebd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.annotation_init</title>
+  <title>Index.annotation_init</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int, [unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page
index 038bb47..5870104 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.annotation_invalid_regress_annotation</title>
+  <title>Index.annotation_invalid_regress_annotation</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page
index daf47ff..62cfbf7 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.annotation_ptr_array</title>
+  <title>Index.annotation_ptr_array</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([GObject.Value])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page
index c2a7371..fa1908d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.annotation_return_array</title>
+  <title>Index.annotation_return_array</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page
index a5a8fa0..4cbc4db 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.annotation_return_filename</title>
+  <title>Index.annotation_return_filename</title>
   
 <synopsis><code mime="text/x-python">
 @returns(filename)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page
index 4dd41fc..6eb6e85 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.annotation_set_source_file</title>
+  <title>Index.annotation_set_source_file</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(filename)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page
index 69351e9..0015484 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.annotation_space_after_comment_bug631690</title>
+  <title>Index.annotation_space_after_comment_bug631690</title>
   
 <synopsis><code mime="text/x-python">
 @returns(none)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page
index ca6241d..c7d2409 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.annotation_string_array_length</title>
+  <title>Index.annotation_string_array_length</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int, [unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page
index 33ad8d1..765658c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.annotation_string_zero_terminated</title>
+  <title>Index.annotation_string_zero_terminated</title>
   
 <synopsis><code mime="text/x-python">
 @returns([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page
index 008b4cd..1a9e2a4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.annotation_string_zero_terminated_out</title>
+  <title>Index.annotation_string_zero_terminated_out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page
index f3243ec..868c2d8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.annotation_test_parsing_bug630862</title>
+  <title>Index.annotation_test_parsing_bug630862</title>
   
 <synopsis><code mime="text/x-python">
 @returns(GObject.Object)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page
index 0e19f1f..223d1a2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.annotation_transfer_floating</title>
+  <title>Index.annotation_transfer_floating</title>
   
 <synopsis><code mime="text/x-python">
 @returns(GObject.Object)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page
index 5ca4dbb..51d53cd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.annotation_versioned</title>
+  <title>Index.annotation_versioned</title>
   
 <synopsis><code mime="text/x-python">
 @returns(none)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page
index 477e985..9adb4a8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.atest_error_quark</title>
+  <title>Index.atest_error_quark</title>
   
 <synopsis><code mime="text/x-python">
 @returns(GLib.Quark)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page
index 399187e..b2c0a69 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>Regress.foo_async_ready_callback</title>
+  <title>Index.foo_async_ready_callback</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Gio.Cancellable, Gio.AsyncReadyCallback, gpointer)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page
index 3b9ccb9..873beb2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>Regress.foo_destroy_notify_callback</title>
+  <title>Index.foo_destroy_notify_callback</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooCallback, gpointer, GLib.DestroyNotify)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page
index 6195fbc..6b62ac4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.foo_init</title>
+  <title>Index.foo_init</title>
   
 <synopsis><code mime="text/x-python">
 @returns(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page
index 9095b08..4be8179 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page
@@ -32,7 +32,7 @@
     </api:function>
 
   </info>
-  <title>Regress.foo_method_external_references</title>
+  <title>Index.foo_method_external_references</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Utility.Object, Utility.EnumType, Utility.FlagType, Utility.Struct)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page
index 9df41fa..0f9ba11 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.foo_not_a_constructor_new</title>
+  <title>Index.foo_not_a_constructor_new</title>
   
 <synopsis><code mime="text/x-python">
 @returns(Regress.FooObject)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page
index 8feb21f..d8cdbf5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.foo_test_array</title>
+  <title>Index.foo_test_array</title>
   
 <synopsis><code mime="text/x-python">
 @returns([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page
index e16a8dd..fa7bc2e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.foo_test_const_char_param</title>
+  <title>Index.foo_test_const_char_param</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page
index b5c3412..34ae3f9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.foo_test_const_char_retval</title>
+  <title>Index.foo_test_const_char_retval</title>
   
 <synopsis><code mime="text/x-python">
 @returns(unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page
index e37243a..f32ff39 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.foo_test_const_struct_param</title>
+  <title>Index.foo_test_const_struct_param</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.FooStruct)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page
index 2f820a9..24337f0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.foo_test_const_struct_retval</title>
+  <title>Index.foo_test_const_struct_retval</title>
   
 <synopsis><code mime="text/x-python">
 @returns(Regress.FooStruct)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page
index 68ff1b4..8e242c5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.foo_test_string_array</title>
+  <title>Index.foo_test_string_array</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page
index f5d1884..92752bf 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.foo_test_string_array_with_g</title>
+  <title>Index.foo_test_string_array_with_g</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page
index ed8bb96..2006eae 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.foo_test_unsigned_qualifier</title>
+  <title>Index.foo_test_unsigned_qualifier</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page
index 0fe4bec..c32efe8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.foo_test_unsigned_type</title>
+  <title>Index.foo_test_unsigned_type</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page
index 5b96883..1e737c0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.func_obj_null_in</title>
+  <title>Index.func_obj_null_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestObj)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page
index e5c60be..825fe35 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.global_get_flags_out</title>
+  <title>Index.global_get_flags_out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestFlags)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page
index 9d7992d..51ae15f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.has_parameter_named_attrs</title>
+  <title>Index.has_parameter_named_attrs</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int, [guint32])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page
index c024ff8..9fc5a47 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.introspectable_via_alias</title>
+  <title>Index.introspectable_via_alias</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.PtrArrayAlias)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page
index ad32633..ad81bff 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.set_abort_on_error</title>
+  <title>Index.set_abort_on_error</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(bool)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page
index 4da29a8..536a02c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_array_callback</title>
+  <title>Index.test_array_callback</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallbackArray)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page
index e2d84b8..26ddf0c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_array_fixed_out_objects</title>
+  <title>Index.test_array_fixed_out_objects</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([Regress.TestObj])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page
index 60ad182..eb816b8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_array_fixed_size_int_in</title>
+  <title>Index.test_array_fixed_size_int_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([int])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page
index 3c6afc4..39db1de 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_array_fixed_size_int_out</title>
+  <title>Index.test_array_fixed_size_int_out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([int])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page
index 0df5ae5..30cfee8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_array_fixed_size_int_return</title>
+  <title>Index.test_array_fixed_size_int_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns([int])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page
index e033aff..62c1c4c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_array_gint16_in</title>
+  <title>Index.test_array_gint16_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int, [gint16])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page
index 5a696b9..948b271 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_array_gint32_in</title>
+  <title>Index.test_array_gint32_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int, [gint32])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page
index dafee3c..6756e0d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_array_gint64_in</title>
+  <title>Index.test_array_gint64_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int, [int])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page
index 40b38b2..a7d7001 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_array_gint8_in</title>
+  <title>Index.test_array_gint8_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int, [gint8])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page
index 9cfb531..e56b522 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_array_gtype_in</title>
+  <title>Index.test_array_gtype_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int, [GType])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page
index 4b2c4fa..42cbb0f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_array_int_full_out</title>
+  <title>Index.test_array_int_full_out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page
index 879821b..8e706e8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_array_int_in</title>
+  <title>Index.test_array_int_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int, [int])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page
index 193d2f3..b3f4448 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_array_int_inout</title>
+  <title>Index.test_array_int_inout</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int, [int])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page
index 745bbe7..21e5bac 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_array_int_none_out</title>
+  <title>Index.test_array_int_none_out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page
index 194ecb5..9b3fc8b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_array_int_null_in</title>
+  <title>Index.test_array_int_null_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([int], int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page
index 6ee3517..5b83b30 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_array_int_null_out</title>
+  <title>Index.test_array_int_null_out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([int], int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page
index 30eaea9..b8f4441 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_array_int_out</title>
+  <title>Index.test_array_int_out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int, [int])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page
index 4b2459e..1dcf46c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_async_ready_callback</title>
+  <title>Index.test_async_ready_callback</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Gio.AsyncReadyCallback)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page
index 293e35b..22d2ebf 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_boolean</title>
+  <title>Index.test_boolean</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(bool)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page
index ee76326..877f582 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_boolean_false</title>
+  <title>Index.test_boolean_false</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(bool)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page
index c233d79..3a1fc20 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_boolean_true</title>
+  <title>Index.test_boolean_true</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(bool)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page
index b749fa4..4bf83f0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_cairo_context_full_return</title>
+  <title>Index.test_cairo_context_full_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns(cairo.Context)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page
index 8b36aac..a30b8d2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_cairo_context_none_in</title>
+  <title>Index.test_cairo_context_none_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(cairo.Context)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page
index 4e8a636..cfda6fd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_cairo_surface_full_out</title>
+  <title>Index.test_cairo_surface_full_out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(cairo.Surface)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page
index a855704..5de20a9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_cairo_surface_full_return</title>
+  <title>Index.test_cairo_surface_full_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns(cairo.Surface)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page
index 0d7e20b..af1b948 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_cairo_surface_none_in</title>
+  <title>Index.test_cairo_surface_none_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(cairo.Surface)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page
index de92a08..98fa6eb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_cairo_surface_none_return</title>
+  <title>Index.test_cairo_surface_none_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns(cairo.Surface)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page
index d5074fa..3481fc1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_callback</title>
+  <title>Index.test_callback</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallback)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page
index cbf04b8..21dc7ee 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_callback_async</title>
+  <title>Index.test_callback_async</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallbackUserData, gpointer)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page
index 5452fbf..86df794 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_callback_destroy_notify</title>
+  <title>Index.test_callback_destroy_notify</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallbackUserData, gpointer, GLib.DestroyNotify)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page
index 11899cc..05883e8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_callback_destroy_notify_no_user_data</title>
+  <title>Index.test_callback_destroy_notify_no_user_data</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallbackUserData, GLib.DestroyNotify)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page
index 6280f9f..d362cb8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_callback_thaw_async</title>
+  <title>Index.test_callback_thaw_async</title>
   
 <synopsis><code mime="text/x-python">
 @returns(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page
index cae6c5e..485e69b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_callback_thaw_notifications</title>
+  <title>Index.test_callback_thaw_notifications</title>
   
 <synopsis><code mime="text/x-python">
 @returns(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page
index 69cff3a..8ec8376 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_callback_user_data</title>
+  <title>Index.test_callback_user_data</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallbackUserData, gpointer)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page
index 20db07c..d11a8a0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_closure</title>
+  <title>Index.test_closure</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(GObject.Closure)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page
index 7f35412..f8d91f1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_closure_one_arg</title>
+  <title>Index.test_closure_one_arg</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(GObject.Closure, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page
index dae0cc0..7d6a1ac 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_closure_variant</title>
+  <title>Index.test_closure_variant</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(GObject.Closure, GLib.Variant)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page
index 1394018..0428986 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_date_in_gvalue</title>
+  <title>Index.test_date_in_gvalue</title>
   
 <synopsis><code mime="text/x-python">
 @returns(GObject.Value)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page
index e920059..95f40e3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_def_error_quark</title>
+  <title>Index.test_def_error_quark</title>
   
 <synopsis><code mime="text/x-python">
 @returns(GLib.Quark)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page
index 0f75857..9a2b786 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_double</title>
+  <title>Index.test_double</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(float)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page
index 82b5e5f..d267b55 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_filename_return</title>
+  <title>Index.test_filename_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns([filename])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page
index f63d37c..9d362f8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_float</title>
+  <title>Index.test_float</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(float)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page
index 86993b8..43990b2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_garray_container_return</title>
+  <title>Index.test_garray_container_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page
index 162ca60..f0bfb6d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_garray_full_return</title>
+  <title>Index.test_garray_full_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page
index e68a8bb..5630526 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_gerror_callback</title>
+  <title>Index.test_gerror_callback</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallbackGError)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page
index 6558c1d..ec91c45 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_ghash_container_return</title>
+  <title>Index.test_ghash_container_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns({unicode: unicode})
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page
index 9df7b86..5356c01 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_ghash_everything_return</title>
+  <title>Index.test_ghash_everything_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns({unicode: unicode})
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page
index d6c319c..5bbde33 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_ghash_gvalue_in</title>
+  <title>Index.test_ghash_gvalue_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts({unicode: GObject.Value})
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page
index 51143d3..6d6a257 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_ghash_gvalue_return</title>
+  <title>Index.test_ghash_gvalue_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns({unicode: GObject.Value})
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page
index c8c9cd2..6bc643f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_ghash_nested_everything_return</title>
+  <title>Index.test_ghash_nested_everything_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns({unicode: {unicode: unicode}})
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page
index 932fd80..1cb3442 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_ghash_nested_everything_return2</title>
+  <title>Index.test_ghash_nested_everything_return2</title>
   
 <synopsis><code mime="text/x-python">
 @returns({unicode: {unicode: unicode}})
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page
index 4440890..b1d295c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_ghash_nothing_in</title>
+  <title>Index.test_ghash_nothing_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts({unicode: unicode})
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page
index 9d65609..df58bb6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_ghash_nothing_in2</title>
+  <title>Index.test_ghash_nothing_in2</title>
   
 <synopsis><code mime="text/x-python">
 @accepts({unicode: unicode})
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page
index 31983aa..072fed9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_ghash_nothing_return</title>
+  <title>Index.test_ghash_nothing_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns({unicode: unicode})
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page
index 17d7dd8..161d3f6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_ghash_nothing_return2</title>
+  <title>Index.test_ghash_nothing_return2</title>
   
 <synopsis><code mime="text/x-python">
 @returns({unicode: unicode})
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page
index 9488fd8..ee3ed32 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_ghash_null_in</title>
+  <title>Index.test_ghash_null_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts({unicode: unicode})
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page
index 4ee31ff..683efc4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_ghash_null_out</title>
+  <title>Index.test_ghash_null_out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts({unicode: unicode})
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page
index d9d1050..ea51622 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_ghash_null_return</title>
+  <title>Index.test_ghash_null_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns({unicode: unicode})
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page
index 069ece7..9d098ba 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_glist_container_return</title>
+  <title>Index.test_glist_container_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page
index f0a80ed..6b2d370 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_glist_everything_return</title>
+  <title>Index.test_glist_everything_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page
index 42f5a25..4873a19 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_glist_nothing_in</title>
+  <title>Index.test_glist_nothing_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page
index b17e2a6..e28d3a8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_glist_nothing_in2</title>
+  <title>Index.test_glist_nothing_in2</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page
index 9c41b07..b4b12c8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_glist_nothing_return</title>
+  <title>Index.test_glist_nothing_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page
index f12e844..aab83e5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_glist_nothing_return2</title>
+  <title>Index.test_glist_nothing_return2</title>
   
 <synopsis><code mime="text/x-python">
 @returns([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page
index 92cb712..ac3f3d6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_glist_null_in</title>
+  <title>Index.test_glist_null_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page
index 0bac264..335d1b2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_glist_null_out</title>
+  <title>Index.test_glist_null_out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page
index 60ffdfd..702c635 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_gslist_container_return</title>
+  <title>Index.test_gslist_container_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page
index f73e113..95fd40c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_gslist_everything_return</title>
+  <title>Index.test_gslist_everything_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page
index 897923c..534ac13 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_gslist_nothing_in</title>
+  <title>Index.test_gslist_nothing_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page
index 15e8577..a7e0635 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_gslist_nothing_in2</title>
+  <title>Index.test_gslist_nothing_in2</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page
index 231450a..ff7d7e5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_gslist_nothing_return</title>
+  <title>Index.test_gslist_nothing_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page
index 1384052..cf0f67a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_gslist_nothing_return2</title>
+  <title>Index.test_gslist_nothing_return2</title>
   
 <synopsis><code mime="text/x-python">
 @returns([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page
index f36bb53..b017466 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_gslist_null_in</title>
+  <title>Index.test_gslist_null_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page
index 7df7b1e..24ef27f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_gslist_null_out</title>
+  <title>Index.test_gslist_null_out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page
index 45f4f8b..38ffb44 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_gtype</title>
+  <title>Index.test_gtype</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(GType)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page
index e77d416..f4c4cd8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_gvariant_as</title>
+  <title>Index.test_gvariant_as</title>
   
 <synopsis><code mime="text/x-python">
 @returns(GLib.Variant)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page
index 73d3150..8357191 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_gvariant_asv</title>
+  <title>Index.test_gvariant_asv</title>
   
 <synopsis><code mime="text/x-python">
 @returns(GLib.Variant)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page
index c9a05df..c0db460 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_gvariant_i</title>
+  <title>Index.test_gvariant_i</title>
   
 <synopsis><code mime="text/x-python">
 @returns(GLib.Variant)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page
index 939a9aa..454fc8a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_gvariant_s</title>
+  <title>Index.test_gvariant_s</title>
   
 <synopsis><code mime="text/x-python">
 @returns(GLib.Variant)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page
index b5dded4..e8a6c00 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_gvariant_v</title>
+  <title>Index.test_gvariant_v</title>
   
 <synopsis><code mime="text/x-python">
 @returns(GLib.Variant)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page
index bd58b7c..2f8ebcb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_hash_table_callback</title>
+  <title>Index.test_hash_table_callback</title>
   
 <synopsis><code mime="text/x-python">
 @accepts({unicode: int}, Regress.TestCallbackHashtable)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page
index 6030847..d039883 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_int</title>
+  <title>Index.test_int</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page
index 709d8c8..7e99517 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_int16</title>
+  <title>Index.test_int16</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(gint16)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page
index 564bda3..03e5c07 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_int32</title>
+  <title>Index.test_int32</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(gint32)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page
index aed6695..645792c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_int64</title>
+  <title>Index.test_int64</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page
index 3de4c45..c733d1b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_int8</title>
+  <title>Index.test_int8</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(gint8)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page
index 7de6306..f43f0bc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_int_out_utf8</title>
+  <title>Index.test_int_out_utf8</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int, unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page
index a7c20bc..d7210b5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_int_value_arg</title>
+  <title>Index.test_int_value_arg</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(GObject.Value)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page
index 001afa1..147cae2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_long</title>
+  <title>Index.test_long</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
index c7dac3f..c195b82 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_multi_callback</title>
+  <title>Index.test_multi_callback</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallback)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page
index 9797820..7946d57 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page
@@ -28,7 +28,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_multi_double_args</title>
+  <title>Index.test_multi_double_args</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(float, float, float)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page
index fbae0d2..2516138 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_multiline_doc_comments</title>
+  <title>Index.test_multiline_doc_comments</title>
   
 <synopsis><code mime="text/x-python">
 @returns(none)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page
index 79ad601..98c1fd3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_nested_parameter</title>
+  <title>Index.test_nested_parameter</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page
index 8f038dc..cdb1b92 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_null_gerror_callback</title>
+  <title>Index.test_null_gerror_callback</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallbackGError)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page
index 32a64eb..f33b39e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_owned_gerror_callback</title>
+  <title>Index.test_owned_gerror_callback</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallbackOwnedGError)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page
index ebd556a..e2f4563 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_short</title>
+  <title>Index.test_short</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(gshort)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page
index 44ff654..a9fa29c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_simple_callback</title>
+  <title>Index.test_simple_callback</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestSimpleCallback)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page
index 9d5ef2f..7935c21 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_size</title>
+  <title>Index.test_size</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(gsize)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page
index 1aa8869..47fe2cd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_ssize</title>
+  <title>Index.test_ssize</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(gssize)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page
index 5b605e3..1121a7d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_strv_in</title>
+  <title>Index.test_strv_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page
index 27538af..fcffe1b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_strv_in_gvalue</title>
+  <title>Index.test_strv_in_gvalue</title>
   
 <synopsis><code mime="text/x-python">
 @returns(GObject.Value)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page
index 42e007f..eea084c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_strv_out</title>
+  <title>Index.test_strv_out</title>
   
 <synopsis><code mime="text/x-python">
 @returns([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page
index 42c1328..c800fa0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_strv_out_c</title>
+  <title>Index.test_strv_out_c</title>
   
 <synopsis><code mime="text/x-python">
 @returns([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page
index 6b020ce..69f6c56 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_strv_out_container</title>
+  <title>Index.test_strv_out_container</title>
   
 <synopsis><code mime="text/x-python">
 @returns([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page
index 5a78866..3624f8a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_strv_outarg</title>
+  <title>Index.test_strv_outarg</title>
   
 <synopsis><code mime="text/x-python">
 @accepts([unicode])
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page
index 9ce1929..5169828 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_timet</title>
+  <title>Index.test_timet</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page
index 4a54bb0..7875a81 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page
@@ -40,7 +40,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_torture_signature_0</title>
+  <title>Index.test_torture_signature_0</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int, float, int, unicode, int, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page
index e3549dc..6a499a5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page
@@ -40,7 +40,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_torture_signature_1</title>
+  <title>Index.test_torture_signature_1</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int, float, int, unicode, int, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page
index b2f9132..01f7778 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page
@@ -52,7 +52,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_torture_signature_2</title>
+  <title>Index.test_torture_signature_2</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int, Regress.TestCallbackUserData, gpointer, GLib.DestroyNotify, float, int, unicode, int, int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page
index 6d91d53..f6943c0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_uint</title>
+  <title>Index.test_uint</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page
index f10846c..5ace288 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_uint16</title>
+  <title>Index.test_uint16</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(guint16)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page
index 142eb44..084d619 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_uint32</title>
+  <title>Index.test_uint32</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(guint32)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page
index 862fa15..b2234a3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_uint64</title>
+  <title>Index.test_uint64</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page
index a357d9c..94e367b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_uint8</title>
+  <title>Index.test_uint8</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(guint8)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page
index 63d7161..dc98e47 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_ulong</title>
+  <title>Index.test_ulong</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page
index a7e7e66..abc373e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_unichar</title>
+  <title>Index.test_unichar</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page
index a489d9a..eb7ff64 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_unsigned_enum_param</title>
+  <title>Index.test_unsigned_enum_param</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestEnumUnsigned)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page
index 2f7832f..4bebadc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_ushort</title>
+  <title>Index.test_ushort</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(gushort)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page
index 25f15b1..4d4ff1a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_utf8_const_in</title>
+  <title>Index.test_utf8_const_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page
index 6e1b935..7149eac 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_utf8_const_return</title>
+  <title>Index.test_utf8_const_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns(unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page
index efe3236..28ecfc2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_utf8_inout</title>
+  <title>Index.test_utf8_inout</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page
index 39c1083..1d1be7d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_utf8_nonconst_return</title>
+  <title>Index.test_utf8_nonconst_return</title>
   
 <synopsis><code mime="text/x-python">
 @returns(unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page
index db0e614..8074caf 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_utf8_null_in</title>
+  <title>Index.test_utf8_null_in</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page
index ab07678..da98d74 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_utf8_null_out</title>
+  <title>Index.test_utf8_null_out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page
index d6cf8fd..3aa56f0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_utf8_out</title>
+  <title>Index.test_utf8_out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page
index 80d6818..0b775cc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_utf8_out_nonconst_return</title>
+  <title>Index.test_utf8_out_nonconst_return</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page
index 1e31cf4..5a6bc2e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page
@@ -24,7 +24,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_utf8_out_out</title>
+  <title>Index.test_utf8_out_out</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(unicode, unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page
index 63d03da..ef9f97e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_value_return</title>
+  <title>Index.test_value_return</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page 
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page
index 78a59f1..847a5c3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page
@@ -16,7 +16,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_versioning</title>
+  <title>Index.test_versioning</title>
   
 <synopsis><code mime="text/x-python">
 @returns(none)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]