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

author: Jasper St. Pierre <jstpierre@mecheye.net> 2013-02-15 08:23:10 -0500
committer: Jasper St. Pierre <jstpierre@mecheye.net> 2013-02-15 19:54:08 -0500
commit: 3dba3c40da7bc026bfa83109dc46ceb67471dd9d (patch)
tree: 10f278ffae7839ae1698f568785351e3c3819689
parent: d05e20a61d3e381e46fcb306f806566bbbd76312 (diff)
download: gobject-introspection-3dba3c40da7bc026bfa83109dc46ceb67471dd9d.tar.gz
368 files changed, 370 insertions, 370 deletions
diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py
index 7f337d21..e962b914 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 4246c2aa..414f5c63 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 b65b1ce6..8dd15f1c 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 221b24c8..a12be358 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 2aa3f064..d7e6784d 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 b769ba6d..16b62150 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 b7a834a1..f4a3b7d6 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 b22eaf80..03ceac18 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 8b7912df..e89c8fe6 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 90175931..cd58eed9 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 cdf26c5c..e4cc4c0b 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 20ffffdf..2e6ca61a 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 6ae6806d..c0350d7e 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 96134cf3..e36d25a8 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 2238d903..945acf01 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 cf669406..226b2b97 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 b8d5088c..885412fb 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 6c34095a..34406b7b 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 d7adac12..2828964e 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 217ae08b..49d937a1 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 c9a864f7..0424719e 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 3f845502..5120baf8 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 1bc89fbd..8476fd89 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 6c5d1e7f..a5dafb97 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 de78bd3e..3fcd8188 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 94c689ed..22fb98dd 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 78e1db7e..4d6029a1 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 c2e5f111..c602a896 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 329c9688..a5ccad47 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 57eff666..6daccb5e 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 48b5bfd6..9091617a 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 21d810ae..2d2b5749 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 4f00498d..896d02ad 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 8cfb6191..67b1c4fc 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 af7c408e..871ec7af 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 47459952..0b1b6b86 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 eb2fc332..1a61cfbb 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 fdeb3979..814eef35 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 b91471d7..993998e4 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 d53564b0..f1bfd923 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 46a61b27..d74f95bf 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 fb2b54c3..7da1b86e 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 b06580f3..b9c69d2b 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 746d830c..3209f200 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 8f83b375..f42e16bb 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 32500e14..fa40bfc3 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 2c85b269..0323a1be 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 b59223c9..78bdb648 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 8ed0b6d6..1f509214 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 460c4615..3467ca20 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 46d62528..276450e6 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 8a1fd9e5..a258a3e6 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 10e8020e..b55a8d78 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 6e400bb3..08cb116d 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 eac21331..751ce883 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 23a6d7d6..5c23da2d 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 5fbf83a5..88e33de3 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 7d1b27be..801bad21 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 3a4ef982..23fa6723 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 da86a8ef..8f0c2d28 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 78b81658..06bccc87 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 b68acc9f..e71147ae 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 301936bb..542c93e4 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 be4b26aa..7b51fd5b 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 3198b66e..82df9040 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 fdb9dbff..0f7923e6 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 6ed46e59..cfd50c56 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 35ea1f41..94c80cfa 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 7891d88b..b1c37efb 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 8992abc1..758a30d7 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 109cb52f..c6a31f90 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 eb60f557..176211b3 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 f9f05b2f..038b73f9 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 24489cf6..9dd2cbaa 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 f8c06b4f..669ab1ce 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 14c8ba67..4f2183d8 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 2b27fe66..0770d0d3 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 a2eb7eaf..5e719483 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 b2853ef8..1c46dfbb 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 c0f99504..ea33a826 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 7ff7b0ba..35c06780 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 771bba8c..b3ff3bf7 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 096b7547..9ee87686 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 d0f6009d..fe260691 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 d3210cab..024db932 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 44279520..4eaa0365 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 a4f99805..c54fa622 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 d80d786c..dca89e84 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 df6625d8..aee3f2c6 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 f557941c..75b7bb2c 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 06c0c624..cd2081f8 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 9ea28a1f..22ec5729 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 c61e93e0..74701f7d 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 8053e0bf..78bf63ba 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 0ba6cbbe..553ddd20 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 2784f146..6aa09744 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 aa9a02e4..52e58775 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 f0ca7210..b1bd51aa 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 9d23bbd8..ded4a799 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 ed5f9c06..20278cd2 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 a237385c..f0edd05a 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 4a7427e1..26fc7905 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 a66646bd..31deab7f 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 2b720ebf..a632f8f4 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 0c9440b6..e42b0d74 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 c79a2f57..b8b162cf 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 471c51cd..e052ed5d 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 5dc0d89c..a04abd75 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 e8088523..bebf7737 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 0b6dd5dc..ef9361fd 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 32bdcff6..4f58e6fb 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 cc1c627e..fc993130 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 eb65fe36..67efe7c5 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 bcd4fd5d..6498ac29 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 dd7f050d..fac9f167 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 d8729783..7e032668 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 63fedadb..1010a017 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 d0dbe7c3..8d658f50 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 4d378e36..ef231f5c 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 7eb5735f..13570b66 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 717525fa..ce1111fd 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 2f7d526e..0e77f853 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 4723d33f..6816eaf4 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 774f3234..aef9deca 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 806b6e74..4ba4bf67 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 11a0f0d0..b6badcfe 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 4e474d0d..aa50a26e 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 b1e037f5..606b4a12 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 a69df607..760e0be7 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 e8a48794..7cd52364 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 63e540d3..cd47036a 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 b01add00..b9016e87 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 cd68ab76..c1d085aa 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 dddc4d57..385fe89f 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 3d3c7563..28ca71af 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 a6b653a0..bda3e9a0 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 dca11c35..c7e03ace 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 dfaf746a..95f06fbb 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 bee0dd0d..e971b2d6 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 744cbf0e..fe1b6472 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 757033ff..1dbb5dc0 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 d94103f8..3b2f26d6 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 5a09792b..1c6c1660 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 ecfd04f7..87645bcf 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 dce6f596..23ba26b8 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 4e2a8e4f..dcc20f6c 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 182f153f..0b32befd 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 68806e88..826efd85 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 bc94a277..e66d4932 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 260c8dde..e171f820 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 86788025..1781562f 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 1dc774f8..88dee520 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 ab006514..c652a104 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 456f9cc0..efdc5c45 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 60b38154..f4920bed 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 1a05ace0..fe924f40 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 0e159413..1ecac0d2 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 f5fcb437..071fb0d5 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 85e76394..6e69b52e 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 9fe30619..b4e88aaf 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 e2b38f8e..2629154a 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 e350d80e..9910236c 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 d083007e..9750cc3f 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 ea1ac4fd..f050eb66 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 af12914b..ed3159d0 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 90e7e881..1ecf6c1e 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 2d8d0b61..1cfcfdcb 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 4524842d..e00b489c 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 983cb507..357d0694 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 09b0559b..3bbdfed1 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 31e6b146..07eaa505 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 3871f1f2..065d7456 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 5c607d18..fb0679af 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 675aba97..25154985 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 a6ad4b17..34fbfe39 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 90bedec3..e4770525 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 ec94048c..58c58e31 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 aa015c53..d491fa61 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 75381509..a1c06605 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 bbd16fe1..63acc894 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 d2eea266..3d32ba0b 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 2a13be92..58c5268b 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 0a900ee7..c02f3b95 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 b4ae4584..2aadb427 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 1c10cea0..f0c50f5f 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 6896d2ef..67510263 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 32fe8e54..4d97f31f 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 9ad27108..4cc806d4 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 0313a70d..7ccc1327 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 10789f27..499a0475 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 5e191991..5e3fc24d 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 426bd98b..a9ae5b2f 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 95950d77..999c8500 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 ee47fb3e..cb2ea92f 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 e557650d..bfd3189d 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 4abe66bc..ea78efdb 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 427eef38..8f9e2888 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 878b4058..9806d282 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 67a98067..2b548390 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 e9431c76..cd83b9da 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 d5afdb62..59dbbd94 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 be2afb92..d2d83e36 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 6b9f2789..e210a976 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 e636e2d2..edee18bf 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 fb428b2c..7afb97ce 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 e8b0ac5e..51a2ce47 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 c94076ab..16c7ebd8 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 038bb47e..58701043 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 daf47ffa..62cfbf7b 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 c2a7371f..fa1908d1 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 a5a8fa0c..4cbc4dbe 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 4dd41fcb..6eb6e853 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 69351e90..00154848 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 ca6241dd..c7d24096 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 33ad8d1e..765658c0 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 008b4cdd..1a9e2a42 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 f3243ec7..868c2d84 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 0e19f1f8..223d1a2b 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 5ca4dbba..51d53cd8 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 477e9856..9adb4a8b 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 399187ed..b2c0a69a 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 3b9ccb9a..873beb20 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 6195fbc7..6b62ac46 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 9095b088..4be81792 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 9df41fac..0f9ba11a 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 8feb21f4..d8cdbf50 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 e16a8dd2..fa7bc2e8 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 b5c34125..34ae3f9c 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 e37243af..f32ff39e 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 2f820a94..24337f06 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 68ff1b46..8e242c5a 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 f5d18848..92752bf4 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 ed8bb964..2006eaef 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 0fe4bec8..c32efe88 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 5b968832..1e737c0f 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 e5c60beb..825fe351 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 9d7992d6..51ae15f7 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 c024ff89..9fc5a47c 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 ad326337..ad81bff0 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 4da29a86..536a02cd 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 e2d84b81..26ddf0ca 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 60ad1826..eb816b81 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 3c6afc47..39db1de3 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 0df5ae57..30cfee8d 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 e033affb..62c1c4c5 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 5a696b9a..948b271b 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 dafee3c2..6756e0d0 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 40b38b28..a7d70018 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 9cfb531a..e56b5223 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 4b2c4fa3..42cbb0f8 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 879821bb..8e706e8f 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 193d2f37..b3f4448b 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 745bbe75..21e5bac0 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 194ecb52..9b3fc8b0 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 6ee35174..5b83b30a 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 30eaea97..b8f44411 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 4b2459ee..1dcf46cd 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 293e35b5..22d2ebfa 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 ee763269..877f5820 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 c233d794..3a1fc20a 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 b749fa49..4bf83f02 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 8b36aac4..a30b8d27 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 4e8a6366..cfda6fdf 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 a8557047..5de20a93 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 0d7e20b2..af1b9489 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 de92a087..98fa6eba 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 d5074fab..3481fc13 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 cbf04b83..21dc7ee7 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 5452fbf9..86df7941 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 11899cc0..05883e8c 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 6280f9f7..d362cb86 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 cae6c5e4..485e69b8 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 69cff3a7..8ec83767 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 20db07c6..d11a8a08 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 7f35412b..f8d91f13 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 dae0cc0f..7d6a1ac3 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 13940184..04289860 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 e9200597..95f40e3c 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 0f75857f..9a2b7866 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 82b5e5f5..d267b55a 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 f63d37c0..9d362f8d 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 86993b80..43990b2c 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 162ca60b..f0bfb6d3 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 e68a8bb4..5630526c 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 6558c1de..ec91c452 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 9df7b861..5356c011 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 d6c319cf..5bbde33c 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 51143d3e..6d6a257f 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 c8c9cd2d..6bc643fb 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 932fd800..1cb34424 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 44408900..b1d295cf 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 9d656091..df58bb6d 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 31983aa0..072fed9b 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 17d7dd82..161d3f62 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 9488fd83..ee3ed32e 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 4ee31ff8..683efc41 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 d9d1050a..ea516226 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 069ece74..9d098baa 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 f0a80ed0..6b2d3704 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 42f5a251..4873a198 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 b17e2a6d..e28d3a89 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 9c41b074..b4b12c81 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 f12e8447..aab83e50 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 92cb7123..ac3f3d62 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 0bac2640..335d1b21 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 60ffdfd6..702c635c 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 f73e1138..95fd40c8 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 897923c5..534ac13e 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 15e85772..a7e0635b 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 231450ad..ff7d7e56 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 1384052c..cf0f67ab 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 f36bb53c..b0174663 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 7df7b1ef..24ef27f1 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 45f4f8b7..38ffb442 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 e77d4163..f4c4cd80 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 73d31507..8357191f 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 c9a05dff..c0db4608 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 939a9aaa..454fc8a9 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 b5dded4d..e8a6c00f 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 bd58b7c9..2f8ebcb6 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 60308472..d0398835 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 709d8c88..7e995172 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 564bda3d..03e5c07c 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 aed6695e..645792cf 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 3de4c454..c733d1bd 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 7de63061..f43f0bce 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 a7c20bc1..d7210b5e 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 001afa10..147cae22 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 c7dac3f1..c195b821 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 97978203..7946d576 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 fbae0d2d..25161388 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 79ad6018..98c1fd3b 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 8f038dcc..cdb1b928 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 32a64eb6..f33b39ed 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 ebd556aa..e2f45632 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 44ff654e..a9fa29c0 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 9d5ef2fe..7935c215 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 1aa8869c..47fe2cd3 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 5b605e33..1121a7da 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 27538af0..fcffe1bb 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 42e007f4..eea084cb 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 42c1328d..c800fa0a 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 6b020cee..69f6c56f 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 5a788664..3624f8a9 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 9ce19296..51698280 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 4a54bb0d..7875a817 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 e3549dc4..6a499a56 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 b2f91328..01f77785 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 6d91d532..f6943c0a 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 f10846c4..5ace288d 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 142eb447..084d6192 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 862fa15f..b2234a3a 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 a357d9c7..94e367b6 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 63d71619..dc98e475 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 a7e7e66a..abc373ea 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 a489d9a0..eb7ff64b 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 2f7832fa..4bebadc3 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 25f15b13..4d4ff1af 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 6e1b935d..7149eac9 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 efe32369..28ecfc27 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 39c10832..1d1be7dd 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 db0e6143..8074cafd 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 ab07678f..da98d744 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 d6cf8fd3..3aa56f02 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 80d68185..0b775cc3 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 1e31cf4e..5a6bc2e6 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 63d03da8..ef9f97e3 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 78a59f14..847a5c33 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)
author	Jasper St. Pierre <jstpierre@mecheye.net>	2013-02-15 08:23:10 -0500
committer	Jasper St. Pierre <jstpierre@mecheye.net>	2013-02-15 19:54:08 -0500
commit	3dba3c40da7bc026bfa83109dc46ceb67471dd9d (patch)
tree	10f278ffae7839ae1698f568785351e3c3819689
parent	d05e20a61d3e381e46fcb306f806566bbbd76312 (diff)
download	gobject-introspection-3dba3c40da7bc026bfa83109dc46ceb67471dd9d.tar.gz