Reflect namespace changes

24 files changed, 875 insertions, 795 deletions

diff --git a/doc/texinfo/address.texi b/doc/texinfo/address.texi
index 827696877..98b8385ab 100644
--- a/doc/texinfo/address.texi
+++ b/doc/texinfo/address.texi
@@ -1,5 +1,6 @@
 @c This is part of the GNU Mailutils manual.
-@c Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
+@c Copyright (C) 1999,2000,2001,2002,2003,2004,2006
+@c Free Software Foundation, Inc.
 @c See file mailutils.texi for copying conditions.
 @comment *******************************************************************
 
@@ -70,8 +71,8 @@ The index @var{no} is outside of the range of available addresses.
 Invalid usage, usually a required argument was @code{NULL}.
 @end macro
 
-@deftp {Data Type} address_t
-The @code{address_t} object is used to hold information about a parsed
+@deftp {Data Type} mu_address_t
+The @code{mu_address_t} object is used to hold information about a parsed
 RFC822 address list, and is an opaque
 data structure to the user. Functions are provided to retrieve information
 about an address in the address list.
@@ -81,7 +82,7 @@ about an address in the address list.
 @c Functions.
 @c
 
-@deftypefun  int address_create (address_t *@var{addr}, const char *@var{string})
+@deftypefun  int mu_address_create (mu_address_t *@var{addr}, const char *@var{string})
 This function allocates and initializes @var{addr} by parsing the
 RFC822 address-list @var{string}.
 
@@ -93,7 +94,7 @@ The return value is @code{0} on success and a code number on error conditions:
 @end table
 @end deftypefun
 
-@deftypefun  int address_createv (address_t *@var{addr}, const char *@var{sv}, size_t @var{len})
+@deftypefun  int mu_address_createv (mu_address_t *@var{addr}, const char *@var{sv}, size_t @var{len})
 This function allocates and initializes @var{addr} by parsing the
 array of pointers to RFC822 address-lists in @var{sv}. If @var{len} is
 @code{-1}, then @var{sv} must be @code{NULL} terminated in the fashion of @var{argv},
@@ -107,7 +108,7 @@ The return value is @code{0} on success and a code number on error conditions:
 @end table
 @end deftypefun
 
-@deftypefun void address_destroy (address_t *@var{addr})
+@deftypefun void mu_address_destroy (mu_address_t *@var{addr})
 The @var{addr} is destroyed.
 @end deftypefun
 
@@ -115,10 +116,10 @@ The @var{addr} is destroyed.
 @c address_get_
 @c
 
-@deftypefun  int address_get_nth (address_t @var{addr}, size_t @var{no}, address_t *@var{ret})
+@deftypefun  int mu_address_get_nth (mu_address_t @var{addr}, size_t @var{no}, mu_address_t *@var{ret})
 @end deftypefun
 
-@deftypefun  int address_get_email (address_t @var{addr}, size_t @var{no}, char* @var{buf}, size_t @var{len}, size_t *@var{n})
+@deftypefun  int mu_address_get_email (mu_address_t @var{addr}, size_t @var{no}, char* @var{buf}, size_t @var{len}, size_t *@var{n})
 Accesses the @var{no}th email address component of the address list. This
 address is the plain email address, correctly quoted, suitable for
 using in an smtp dialog, for example, or as the address part of
@@ -134,7 +135,7 @@ The return value is @code{0} on success and a code number on error conditions:
 @end table
 @end deftypefun
 
-@deftypefun  int address_get_local_part (address_t @var{addr}, size_t @var{no}, char *@var{buf}, size_t @var{len}, size_t *@var{n})
+@deftypefun  int mu_address_get_local_part (mu_address_t @var{addr}, size_t @var{no}, char *@var{buf}, size_t @var{len}, size_t *@var{n})
 Accesses the local-part of an email addr-spec extracted while
 parsing the @var{no}th email address.
 
@@ -145,7 +146,7 @@ The return value is @code{0} on success and a code number on error conditions:
 @end table
 @end deftypefun
 
-@deftypefun  int address_get_domain (address_t @var{addr}, size_t @var{no}, char *@var{buf}, size_t @var{len}, size_t *@var{n})
+@deftypefun  int mu_address_get_domain (mu_address_t @var{addr}, size_t @var{no}, char *@var{buf}, size_t @var{len}, size_t *@var{n})
 Accesses the domain of an email addr-spec extracted while
 parsing the @var{no}th email address. This will be @code{0}
 length for a unix-mbox.
@@ -157,7 +158,7 @@ The return value is @code{0} on success and a code number on error conditions:
 @end table
 @end deftypefun
 
-@deftypefun  int address_get_personal (address_t @var{addr}, size_t @var{no}, char *@var{buf}, size_t @var{len}, size_t *@var{n})
+@deftypefun  int mu_address_get_personal (mu_address_t @var{addr}, size_t @var{no}, char *@var{buf}, size_t @var{len}, size_t *@var{n})
 Accesses the display-name describing the @var{no}th email address. This
 display-name is optional, so may not be present. If it is not present, but
 there is an RFC822 comment after the address, that comment will be
@@ -168,7 +169,7 @@ A group is a kind of a special case. It has a display-name, followed
 by an optional mailbox-list. The display-name will be allocated an address
 all it's own, but all the other elements (local-part, domain, etc.) will
 be zero-length. So "a group: ;" is valid, will have a count of 1, but
-@code{address_get_email()}, and all the rest, will return zero-length output.
+@code{mu_address_get_email()}, and all the rest, will return zero-length output.
 
 The return value is @code{0} on success and a code number on error conditions:
 @table @code
@@ -177,7 +178,7 @@ The return value is @code{0} on success and a code number on error conditions:
 @end table
 @end deftypefun
 
-@deftypefun  int address_get_comments (address_t @var{addr}, size_t @var{no}, char *@var{buf}, size_t @var{len}, size_t *@var{n})
+@deftypefun  int mu_address_get_comments (mu_address_t @var{addr}, size_t @var{no}, char *@var{buf}, size_t @var{len}, size_t *@var{n})
 Accesses the comments extracted while parsing the @var{no}th email address.
 These comments have no defined meaning, and are not currently collected.
 
@@ -188,7 +189,7 @@ The return value is @code{0} on success and a code number on error conditions:
 @end table
 @end deftypefun
 
-@deftypefun  int address_get_route (address_t @var{addr}, size_t @var{no}, char *@var{buf}, size_t @var{len}, size_t *@var{n})
+@deftypefun  int mu_address_get_route (mu_address_t @var{addr}, size_t @var{no}, char *@var{buf}, size_t @var{len}, size_t *@var{n})
 Accesses the route of an email addr-spec extracted while
 parsing the @var{no}th email address. This is a rarely used RFC822 address
 syntax, but is legal in SMTP as well. The entire route is returned as
@@ -205,7 +206,7 @@ The return value is @code{0} on success and a code number on error conditions:
 @c address_aget_
 @c
 
-@deftypefun  int address_aget_email (address_t @var{addr}, size_t @var{no}, char **@var{bufp})
+@deftypefun  int mu_address_aget_email (mu_address_t @var{addr}, size_t @var{no}, char **@var{bufp})
 As above, but mallocs the email address, if present,
 and write a pointer to it into @var{bufp}. @var{bufp} will be @code{NULL}
 if there is no email address to return.
@@ -217,20 +218,20 @@ The return value is @code{0} on success and a code number on error conditions:
 @end table
 @end deftypefun
 
-@deftypefun  int address_aget_local_part (address_t @var{addr}, size_t @var{no}, char **@var{buf})
+@deftypefun  int mu_address_aget_local_part (mu_address_t @var{addr}, size_t @var{no}, char **@var{buf})
 @end deftypefun
 
-@deftypefun  int address_aget_domain (address_t @var{addr}, size_t @var{no}, char **@var{buf})
+@deftypefun  int mu_address_aget_domain (mu_address_t @var{addr}, size_t @var{no}, char **@var{buf})
 @end deftypefun
 
-@deftypefun  int address_aget_personal (address_t @var{addr}, size_t @var{no}, char **@var{buf})
+@deftypefun  int mu_address_aget_personal (mu_address_t @var{addr}, size_t @var{no}, char **@var{buf})
 @end deftypefun
 
 @c
 @c -----------
 @c
 
-@deftypefun  int address_is_group (address_t @var{addr}, size_t @var{no}, int *@var{yes})
+@deftypefun  int mu_address_is_group (mu_address_t @var{addr}, size_t @var{no}, int *@var{yes})
 Sets *@var{yes} to @code{1} if this address is just the name of a group,
 @code{0} otherwise. This is faster than checking if the address has
 a non-zero length personal, and a zero-length local_part and domain.
@@ -247,7 +248,7 @@ The return value is @code{0} on success and a code number on error conditions:
 @end table
 @end deftypefun
 
-@deftypefun  int address_to_string (address_t *@var{addr}, char *@var{buf}, size_t @var{len}, size_t *@var{n})
+@deftypefun  int mu_address_to_string (mu_address_t *@var{addr}, char *@var{buf}, size_t @var{len}, size_t *@var{n})
 Returns the entire address list as a single RFC822 formatted address list.
 
 The return value is @code{0} on success and a code number on error conditions:
@@ -257,7 +258,7 @@ The return value is @code{0} on success and a code number on error conditions:
 @end table
 @end deftypefun
 
-@deftypefun  int address_get_count (address_t @var{addr}, size_t *@var{count})
+@deftypefun  int mu_address_get_count (mu_address_t @var{addr}, size_t *@var{count})
 Returns a count of the addresses in the address list.
 
 If @var{addr} is @code{NULL}, the count is @code{0}. If @var{count} is
@@ -266,22 +267,22 @@ not @code{NULL}, the count will be written to *@var{count}.
 The return value is @code{0}.
 @end deftypefun
 
-@deftypefun  int address_get_group_count (address_t @var{addr}, size_t *)
+@deftypefun  int mu_address_get_group_count (mu_address_t @var{addr}, size_t *)
 @end deftypefun
 
-@deftypefun  int address_get_email_count (address_t @var{addr}, size_t *)
+@deftypefun  int mu_address_get_email_count (mu_address_t @var{addr}, size_t *)
 @end deftypefun
 
-@deftypefun  int address_get_unix_mailbox_count (address_t @var{addr}, size_t *)
+@deftypefun  int mu_address_get_unix_mailbox_count (mu_address_t @var{addr}, size_t *)
 @end deftypefun
 
-@deftypefun  int address_contains_email (address_t @var{addr}, const char *@var{email})
+@deftypefun  int mu_address_contains_email (mu_address_t @var{addr}, const char *@var{email})
 @end deftypefun
 
-@deftypefun  int address_union (address_t *@var{a}, address_t @var{b})
+@deftypefun  int mu_address_union (mu_address_t *@var{a}, mu_address_t @var{b})
 @end deftypefun
 
-@deftypefun size_t address_format_string (address_t @var{addr}, char *@var{buf}, size_t @var{buflen})
+@deftypefun size_t mu_address_format_string (mu_address_t @var{addr}, char *@var{buf}, size_t @var{buflen})
 @end deftypefun
 
 @subheading Example
diff --git a/doc/texinfo/attribute.texi b/doc/texinfo/attribute.texi
index 004a8bc49..908b1d709 100644
--- a/doc/texinfo/attribute.texi
+++ b/doc/texinfo/attribute.texi
@@ -1,148 +1,149 @@
 @c This is part of the GNU Mailutils manual.
-@c Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
+@c Copyright (C) 1999,2000,2001,2002,2003,2004,2006
+@c Free Software Foundation, Inc.
 @c See file mailutils.texi for copying conditions.
 @comment *******************************************************************
 
 @smallexample
-@code{/* Prefix @emph{attribute_} is reserved. */}
+@code{/* Prefix @emph{mu_attribute_} is reserved. */}
 @code{#include <mailutils/attribute.h>}
 @end smallexample
 
-@deftypefun  int attribute_create (attribute_t *@var{attr}, void *)
+@deftypefun  int mu_attribute_create (mu_attribute_t *@var{attr}, void *)
 @end deftypefun
 
-@deftypefun void attribute_destroy (attribute_t *@var{attr}, void *)
+@deftypefun void mu_attribute_destroy (mu_attribute_t *@var{attr}, void *)
 @end deftypefun
 
-@deftypefun void* attribute_get_owner (attribute_t @var{attr})
+@deftypefun void* mu_attribute_get_owner (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_is_modified (attribute_t @var{attr})
+@deftypefun  int mu_attribute_is_modified (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_clear_modified (attribute_t @var{attr})
+@deftypefun  int mu_attribute_clear_modified (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_set_modified (attribute_t @var{attr})
+@deftypefun  int mu_attribute_set_modified (mu_attribute_t @var{attr})
 @end deftypefun
 
 @c
 @c _is_
 @c
 
-@deftypefun  int attribute_is_userflag (attribute_t @var{attr})
+@deftypefun  int mu_attribute_is_userflag (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_is_seen (attribute_t @var{attr})
+@deftypefun  int mu_attribute_is_seen (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_is_answered (attribute_t @var{attr})
+@deftypefun  int mu_attribute_is_answered (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_is_flagged (attribute_t @var{attr})
+@deftypefun  int mu_attribute_is_flagged (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_is_deleted (attribute_t @var{attr})
+@deftypefun  int mu_attribute_is_deleted (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_is_draft (attribute_t @var{attr})
+@deftypefun  int mu_attribute_is_draft (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_is_recent (attribute_t @var{attr})
+@deftypefun  int mu_attribute_is_recent (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_is_read (attribute_t @var{attr})
+@deftypefun  int mu_attribute_is_read (mu_attribute_t @var{attr})
 @end deftypefun
 
 @c
 @c _set_
 @c
 
-@deftypefun  int attribute_set_userflag (attribute_t @var{attr}, int)
+@deftypefun  int mu_attribute_set_userflag (mu_attribute_t @var{attr}, int)
 @end deftypefun
 
-@deftypefun  int attribute_set_seen (attribute_t @var{attr})
+@deftypefun  int mu_attribute_set_seen (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_set_answered (attribute_t @var{attr})
+@deftypefun  int mu_attribute_set_answered (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_set_flagged (attribute_t @var{attr})
+@deftypefun  int mu_attribute_set_flagged (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_set_deleted (attribute_t @var{attr})
+@deftypefun  int mu_attribute_set_deleted (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_set_draft (attribute_t @var{attr})
+@deftypefun  int mu_attribute_set_draft (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_set_recent (attribute_t @var{attr})
+@deftypefun  int mu_attribute_set_recent (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_set_read (attribute_t @var{attr})
+@deftypefun  int mu_attribute_set_read (mu_attribute_t @var{attr})
 @end deftypefun
 
 @c
 @c _unset_
 @c
 
-@deftypefun  int attribute_unset_userflag (attribute_t @var{attr}, int)
+@deftypefun  int mu_attribute_unset_userflag (mu_attribute_t @var{attr}, int)
 @end deftypefun
 
-@deftypefun  int attribute_unset_seen (attribute_t @var{attr})
+@deftypefun  int mu_attribute_unset_seen (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_unset_answered (attribute_t @var{attr})
+@deftypefun  int mu_attribute_unset_answered (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_unset_flagged (attribute_t @var{attr})
+@deftypefun  int mu_attribute_unset_flagged (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_unset_deleted (attribute_t @var{attr})
+@deftypefun  int mu_attribute_unset_deleted (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_unset_draft (attribute_t @var{attr})
+@deftypefun  int mu_attribute_unset_draft (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_unset_recent (attribute_t @var{attr})
+@deftypefun  int mu_attribute_unset_recent (mu_attribute_t @var{attr})
 @end deftypefun
 
-@deftypefun  int attribute_unset_read (attribute_t @var{attr})
+@deftypefun  int mu_attribute_unset_read (mu_attribute_t @var{attr})
 @end deftypefun
 
 @c
 @c ----------
 @c
 
-@deftypefun  int attribute_get_flags (attribute_t @var{attr}, int *)
+@deftypefun  int mu_attribute_get_flags (mu_attribute_t @var{attr}, int *)
 @end deftypefun
 
-@deftypefun  int attribute_set_flags (attribute_t @var{attr}, int)
+@deftypefun  int mu_attribute_set_flags (mu_attribute_t @var{attr}, int)
 @end deftypefun
 
-@deftypefun  int attribute_unset_flags (attribute_t @var{attr}, int)
+@deftypefun  int mu_attribute_unset_flags (mu_attribute_t @var{attr}, int)
 @end deftypefun
 
-@deftypefun  int attribute_set_set_flags (attribute_t @var{attr}, int (*@var{_set_flags}) (attribute_t, int), void *)
+@deftypefun  int mu_attribute_set_set_flags (mu_attribute_t @var{attr}, int (*@var{_set_flags}) (mu_attribute_t, int), void *)
 @end deftypefun
 
-@deftypefun  int attribute_set_unset_flags (attribute_t @var{attr}, int (*@var{_unset_flags}) (attribute_t, int), void *)
+@deftypefun  int mu_attribute_set_unset_flags (mu_attribute_t @var{attr}, int (*@var{_unset_flags}) (mu_attribute_t, int), void *)
 @end deftypefun
 
-@deftypefun  int attribute_set_get_flags (attribute_t @var{attr}, int (*@var{_get_flags}) (attribute_t, int *), void *)
+@deftypefun  int mu_attribute_set_get_flags (mu_attribute_t @var{attr}, int (*@var{_get_flags}) (mu_attribute_t, int *), void *)
 @end deftypefun
 
 @c
 @c ----------
 @c
 
-@deftypefun  int attribute_is_equal (attribute_t @var{attr1}, attribute_t @var{attr2})
+@deftypefun  int mu_attribute_is_equal (mu_attribute_t @var{attr1}, mu_attribute_t @var{attr2})
 @end deftypefun
 
-@deftypefun  int attribute_copy (attribute_t @var{dst}, attribute_t @var{src})
+@deftypefun  int mu_attribute_copy (mu_attribute_t @var{dst}, mu_attribute_t @var{src})
 @end deftypefun
 
-@deftypefun  int attribute_to_string (attribute_t @var{attr}, char *@var{buf}, size_t @var{len}, size_t *@var{writen})
+@deftypefun  int mu_attribute_to_string (mu_attribute_t @var{attr}, char *@var{buf}, size_t @var{len}, size_t *@var{writen})
 @end deftypefun
 
 @deftypefun  int string_to_flags (const char *@var{buf}, int *)
diff --git a/doc/texinfo/auth.texi b/doc/texinfo/auth.texi
index 3ac72fb44..388725905 100644
--- a/doc/texinfo/auth.texi
+++ b/doc/texinfo/auth.texi
@@ -1,51 +1,51 @@
 @c This is part of the GNU Mailutils manual.
-@c Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
+@c Copyright (C) 1999,2000,2001,2002,2003,2004,2006 Free Software Foundation, Inc.
 @c See file mailutils.texi for copying conditions.
 @comment *******************************************************************
 
 @smallexample
-@code{/* Prefixes @emph{authority_}, @emph{ticket_}, and @emph{wicket_} are reserved. */}
+@code{/* Prefixes @emph{mu_authority_}, @emph{mu_ticket_}, and @emph{mu_wicket_} are reserved. */}
 @code{#include <mailutils/auth.h>}
 
 @end smallexample
 
 There are many ways to authenticate to a server.  To be flexible the
-authentication process is provided by three objects @code{authority_t},
-@code{ticket_t}, and @code{wicket_t}.  The @code{authority_t} can implement
+authentication process is provided by three objects @code{mu_authority_t},
+@code{mu_ticket_t}, and @code{mu_wicket_t}.  The @code{mu_authority_t} can implement
 different protocol like APOP, MD5-AUTH, One Time Passwd, etc. By default
 if a mailbox does not understand or know how to authenticate it falls back
-to user/passwd authentication.  The @code{ticket_t} is a way for
+to user/passwd authentication.  The @code{mu_ticket_t} is a way for
 Mailboxes and Mailers provide a way to authenticate when the URL does not
 contain enough information.  The default action is to call the function
-@code{authority_authenticate()} which will get the @emph{user} and @emph{passwd}
+@code{mu_authority_authenticate()} which will get the @emph{user} and @emph{passwd}
 if not set, this function can be overridden by a custom method.
 
 @c
 @c Ticket
 @c
 
-@deftypefun  int ticket_create (ticket_t *, void *@var{owner})
+@deftypefun  int mu_ticket_create (mu_ticket_t *, void *@var{owner})
 @end deftypefun
 
-@deftypefun void ticket_destroy (ticket_t *, void *@var{owner})
+@deftypefun void mu_ticket_destroy (mu_ticket_t *, void *@var{owner})
 @end deftypefun
 
-@deftypefun  int ticket_set_destroy (ticket_t, void (*) (ticket_t), void *@var{owner})
+@deftypefun  int mu_ticket_set_destroy (mu_ticket_t, void (*) (mu_ticket_t), void *@var{owner})
 @end deftypefun
 
-@deftypefun void* ticket_get_owner (ticket_t)
+@deftypefun void* mu_ticket_get_owner (mu_ticket_t)
 @end deftypefun
 
-@deftypefun  int ticket_set_pop (ticket_t, int (*@var{_pop}) (ticket_t, url_t, const char *, char **), void *)
+@deftypefun  int mu_ticket_set_pop (mu_ticket_t, int (*@var{_pop}) (mu_ticket_t, url_t, const char *, char **), void *)
 @end deftypefun
 
-@deftypefun  int ticket_pop (ticket_t, url_t, const char *, char **)
+@deftypefun  int mu_ticket_pop (mu_ticket_t, url_t, const char *, char **)
 @end deftypefun
 
-@deftypefun  int ticket_set_data (ticket_t, void *, void *@var{owner})
+@deftypefun  int mu_ticket_set_data (mu_ticket_t, void *, void *@var{owner})
 @end deftypefun
 
-@deftypefun  int ticket_get_data (ticket_t, void **)
+@deftypefun  int mu_ticket_get_data (mu_ticket_t, void **)
 @end deftypefun
 
 @c
@@ -54,28 +54,28 @@ if not set, this function can be overridden by a custom method.
 
 @sp 1
 
-@deftypefun  int authority_create (authority_t *, ticket_t, void *)
+@deftypefun  int mu_authority_create (mu_authority_t *, mu_ticket_t, void *)
 @end deftypefun
 
-@deftypefun void authority_destroy (authority_t *, void *)
+@deftypefun void mu_authority_destroy (mu_authority_t *, void *)
 @end deftypefun
 
-@deftypefun void* authority_get_owner (authority_t)
+@deftypefun void* mu_authority_get_owner (mu_authority_t)
 @end deftypefun
 
-@deftypefun  int authority_set_ticket (authority_t, ticket_t)
+@deftypefun  int mu_authority_set_ticket (mu_authority_t, mu_ticket_t)
 @end deftypefun
 
-@deftypefun  int authority_get_ticket (authority_t, ticket_t *)
+@deftypefun  int mu_authority_get_ticket (mu_authority_t, mu_ticket_t *)
 @end deftypefun
 
-@deftypefun  int authority_authenticate (authority_t)
+@deftypefun  int mu_authority_authenticate (mu_authority_t)
 @end deftypefun
 
-@deftypefun  int authority_set_authenticate (authority_t, int (*@var{_authenticate}) (authority_t), void *)
+@deftypefun  int mu_authority_set_authenticate (mu_authority_t, int (*@var{_authenticate}) (mu_authority_t), void *)
 @end deftypefun
 
-@deftypefun  int authority_create_null (authority_t *@var{authority}, void *@var{owner})
+@deftypefun  int mu_authority_create_null (mu_authority_t *@var{authority}, void *@var{owner})
 @end deftypefun
 
 @c
@@ -84,22 +84,22 @@ if not set, this function can be overridden by a custom method.
 
 @sp 1
 
-@deftypefun  int wicket_create (wicket_t *, const char *)
+@deftypefun  int mu_wicket_create (mu_wicket_t *, const char *)
 @end deftypefun
 
-@deftypefun void wicket_destroy (wicket_t *)
+@deftypefun void mu_wicket_destroy (mu_wicket_t *)
 @end deftypefun
 
-@deftypefun  int wicket_set_filename (wicket_t, const char *)
+@deftypefun  int mu_wicket_set_filename (mu_wicket_t, const char *)
 @end deftypefun
 
-@deftypefun  int wicket_get_filename (wicket_t, char *, size_t, size_t *)
+@deftypefun  int mu_wicket_get_filename (mu_wicket_t, char *, size_t, size_t *)
 @end deftypefun
 
-@deftypefun  int wicket_set_ticket (wicket_t, int (*) (wicket_t, const char *, const char *, ticket_t *))
+@deftypefun  int mu_wicket_set_ticket (mu_wicket_t, int (*) (mu_wicket_t, const char *, const char *, mu_ticket_t *))
 @end deftypefun
 
-@deftypefun  int wicket_get_ticket (wicket_t, ticket_t *, const char *, const char *)
+@deftypefun  int mu_wicket_get_ticket (mu_wicket_t, mu_ticket_t *, const char *, const char *)
 @end deftypefun
 
 @c
diff --git a/doc/texinfo/body.texi b/doc/texinfo/body.texi
index c79f13d28..401c92020 100644
--- a/doc/texinfo/body.texi
+++ b/doc/texinfo/body.texi
@@ -1,51 +1,51 @@
 @c This is part of the GNU Mailutils manual.
-@c Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
+@c Copyright (C) 1999,2000,2001,2002,2003,2004,2006 Free Software Foundation, Inc.
 @c See file mailutils.texi for copying conditions.
 @comment *******************************************************************
 
 @smallexample
-@code{/* Prefix @emph{body_} is reserved. */}
+@code{/* Prefix @emph{mu_body_} is reserved. */}
 @code{#include <mailutils/body.h>}
 @end smallexample
 
-@deftypefun  int body_create (body_t *@var{body}, void *@var{owner})
+@deftypefun  int mu_body_create (mu_body_t *@var{body}, void *@var{owner})
 Initialize an object @var{body}.
 @end deftypefun
 
-@deftypefun void body_destroy (body_t *@var{body})
+@deftypefun void mu_body_destroy (mu_body_t *@var{body})
 The resources allocated are release.
 @end deftypefun
 
-@deftypefun void* body_get_owner (body_t @var{body})
+@deftypefun void* mu_body_get_owner (mu_body_t @var{body})
 @end deftypefun
 
-@deftypefun  int body_is_modified (body_t @var{body})
+@deftypefun  int mu_body_is_modified (mu_body_t @var{body})
 @end deftypefun
 
-@deftypefun  int body_clear_modified (body_t @var{body})
+@deftypefun  int mu_body_clear_modified (mu_body_t @var{body})
 @end deftypefun
 
 @c
 @c -----------
 @c
 
-@deftypefun  int body_get_stream (body_t @var{body}, stream_t *@var{stream})
+@deftypefun  int mu_body_get_stream (mu_body_t @var{body}, stream_t *@var{stream})
 @end deftypefun
 
-@deftypefun  int body_set_stream (body_t @var{body}, stream_t @var{stream}, void *@var{owner})
+@deftypefun  int mu_body_set_stream (mu_body_t @var{body}, stream_t @var{stream}, void *@var{owner})
 @end deftypefun
 
-@deftypefun  int body_get_filename (body_t @var{body}, char *@var{buffer}, size_t @var{buflen}, size_t *@var{writen})
+@deftypefun  int mu_body_get_filename (mu_body_t @var{body}, char *@var{buffer}, size_t @var{buflen}, size_t *@var{writen})
 @end deftypefun
 
-@deftypefun  int body_size (body_t @var{body}, size_t *@var{size})
+@deftypefun  int mu_body_size (mu_body_t @var{body}, size_t *@var{size})
 @end deftypefun
 
-@deftypefun  int body_set_size (body_t @var{body}, int (*@var{_size}) (body_t, size_t *), void *@var{owner})
+@deftypefun  int mu_body_set_size (mu_body_t @var{body}, int (*@var{_size}) (mu_body_t, size_t *), void *@var{owner})
 @end deftypefun
 
-@deftypefun  int body_lines (body_t @var{body}, size_t *@var{lines})
+@deftypefun  int mu_body_lines (mu_body_t @var{body}, size_t *@var{lines})
 @end deftypefun
 
-@deftypefun  int body_set_lines (body_t @var{body}, int (*@var{_lines}) (body_t, size_t *), void *@var{owner})
+@deftypefun  int mu_body_set_lines (mu_body_t @var{body}, int (*@var{_lines}) (mu_body_t, size_t *), void *@var{owner})
 @end deftypefun
diff --git a/doc/texinfo/envelope.texi b/doc/texinfo/envelope.texi
index 09a3e8022..c8f8a08b9 100644
--- a/doc/texinfo/envelope.texi
+++ b/doc/texinfo/envelope.texi
@@ -1,47 +1,47 @@
 @c This is part of the GNU Mailutils manual.
-@c Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
+@c Copyright (C) 1999,2000,2001,2002,2003,2004,2006 Free Software Foundation, Inc.
 @c See file mailutils.texi for copying conditions.
 @comment *******************************************************************
 
 @smallexample
-@code{/* Prefix @emph{envelope_} is reserved. */}
+@code{/* Prefix @emph{mu_envelope_} is reserved. */}
 @code{#include <mailutils/envelope.h>}
 @end smallexample
 
-@deftypefun  int envelope_create (envelope_t *, void *)
+@deftypefun  int mu_envelope_create (mu_envelope_t *, void *)
 Primarily for internal use.
 @end deftypefun
 
-@deftypefun void envelope_destroy (envelope_t *, void *)
+@deftypefun void mu_envelope_destroy (mu_envelope_t *, void *)
 Primarily for internal use.
 @end deftypefun
 
-@deftypefun void* envelope_get_owner (envelope_t)
+@deftypefun void* mu_envelope_get_owner (mu_envelope_t)
 @end deftypefun
 
 @c
 @c ----------
 @c
 
-@deftypefun  int envelope_sender (envelope_t, char *, size_t, size_t *)
+@deftypefun  int mu_envelope_sender (mu_envelope_t, char *, size_t, size_t *)
 Get the address that this message was reportedly received from. This
 would be the "mail from" argument if the message was delivered
 or received via SMTP, for example.
 @end deftypefun
 
-@deftypefun int envelope_set_sender (envelope_t, int (*@var{_sender}) (envelope_t, char *, size_t, size_t *), void *)
-Primarily for internal use. The implementation of @code{envelope_t} depends
+@deftypefun int mu_envelope_set_sender (mu_envelope_t, int (*@var{_sender}) (mu_envelope_t, char *, size_t, size_t *), void *)
+Primarily for internal use. The implementation of @code{mu_envelope_t} depends
 on the mailbox type, this allows the function which actually gets
-the sender to be set by the creator of an @code{envelope_t}.
+the sender to be set by the creator of an @code{mu_envelope_t}.
 @end deftypefun
 
-@deftypefun  int envelope_date (envelope_t, char *, size_t, size_t *)
+@deftypefun  int mu_envelope_date (mu_envelope_t, char *, size_t, size_t *)
 Get the date that the message was delivered to the mailbox, in
 something close to ANSI @code{ctime()} format: Mon Jul 05 13:08:27 1999.
 @end deftypefun
 
-@deftypefun int envelope_set_date (envelope_t, int (*@var{_date}) (envelope_t, char *, size_t, size_t *), void *)
-Primarily for internal use. The implementation of @code{envelope_t} depends
+@deftypefun int mu_envelope_set_date (mu_envelope_t, int (*@var{_date}) (mu_envelope_t, char *, size_t, size_t *), void *)
+Primarily for internal use. The implementation of @code{mu_envelope_t} depends
 on the mailbox type, this allows the function which actually gets
-the date to be set by the creator of an @code{envelope_t}.
+the date to be set by the creator of an @code{mu_envelope_t}.
 @end deftypefun
diff --git a/doc/texinfo/folder.texi b/doc/texinfo/folder.texi
index 0a0118709..9ca4c79d6 100644
--- a/doc/texinfo/folder.texi
+++ b/doc/texinfo/folder.texi
@@ -1,31 +1,31 @@
 @c This is part of the GNU Mailutils manual.
-@c Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
+@c Copyright (C) 1999,2000,2001,2002,2003,2004,2006 Free Software Foundation, Inc.
 @c See file mailutils.texi for copying conditions.
 @comment *******************************************************************
 
 @smallexample
-@code{/* Prefix @emph{folder_} is reserved. */}
+@code{/* Prefix @emph{mu_folder_} is reserved. */}
 @code{#include <mailutils/folder.h>}
 
 @end smallexample
 
 @smallexample
 @group
-                             folder_t                  url_t
-  -/var/mail-    +---//--->/-----------------\   +-->/-----------\
- (  alain *-)-+  |         |  url_t        *-|---+   |  port     |
-  ----------  |  |         |-----------------+       |  hostname |
- (  jakob *-)-+--+         |  observer_t   *-|       |  file     |
-  ----------  |            |-----------------+       |  ...      |
- (  jeff  *-)-+            |  stream_t       |       \-----------/
-  ----------  |            |-----------------|
- (  sean  *-)-+            |  auth_t         |
-  ----------               |-----------------|
-                           |  mailbox_t(1)   |
-                           |-----------------|
-                           |  mailbox_t(2)   |
-                           |  ......         |
-                           |  mailbox_t(n)   |
+                             mu_folder_t                mu_url_t
+  -/var/mail-    +---//--->/-------------------\   +-->/-----------\
+ (  alain *-)-+  |         |  mu_url_t       *-|---+   |  port     |
+  ----------  |  |         |-------------------+       |  hostname |
+ (  jakob *-)-+--+         |  mu_observer_t  *-|       |  file     |
+  ----------  |            |-------------------+       |  ...      |
+ (  jeff  *-)-+            |  mu_stream_t      |       \-----------/
+  ----------  |            |-------------------|
+ (  sean  *-)-+            |  mu_auth_t        |
+  ----------               |-------------------|
+                           |  mu_mailbox_t(1)  |
+                           |-------------------|
+                           |  mu_mailbox_t(2)  |
+                           |  ......           |
+                           |  mu_mailbox_t(n)  |
                            \-----------------/
 @end group
 @end smallexample
@@ -34,18 +34,13 @@ Data structures:
 
 @sm