--- /usr/bin/postgresql_autodoc.base    2012-09-30 15:40:23.000000000 -0700
+++ /usr/bin/postgresql_autodoc 2012-09-30 15:49:40.000000000 -0700
@@ -888,7 +888,11 @@ sub info_collect {
     $sth_Function->execute();
     while ( my $functions = $sth_Function->fetchrow_hashref and not $table_out )
     {
-        my $schema       = $functions->{'namespace'};
+        my @fclass       = split('__', $functions->{'function_name'});
+        if (scalar(@fclass) == 1) {
+            unshift(@fclass, $functions->{'namespace'});
+        }
+        my $schema       = $fclass[0];
         my $comment      = $functions->{'comment'};
         my $functionargs = $functions->{'function_args'};
         my @types        = split( ' ', $functionargs );
@@ -917,7 +921,7 @@ sub info_collect {
             push( @parameters, $parameter );
         }
         my $functionname = sprintf( '%s(%s)',
-            $functions->{'function_name'},
+            $fclass[1],
             join( ', ', @parameters ) );

         my $ret_type = $functions->{'returns_set'} ? 'SET OF ' : '';