Index: docs/src/_build/html/.buildinfo
===================================================================
--- docs/src/_build/html/.buildinfo	(revision 13)
+++ docs/src/_build/html/.buildinfo	(revision 16)
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: d6b13f3c5a0c2b1ecbf54831463e3bec
+config: ceb77347f0c7a864ec9030a8b3dabfdc
 tags: fbb0d17656682115ca4d033fb2f83ba1
Index: docs/src/_build/html/_sources/configuration.txt
===================================================================
--- docs/src/_build/html/_sources/configuration.txt	(revision 13)
+++ docs/src/_build/html/_sources/configuration.txt	(revision 16)
@@ -6,20 +6,20 @@
 .. _configuration_daemon:
 
-Postman daemon configuration file
+Mailjam daemon configuration file
 ---------------------------------
 
-All the configurations that can be applied to the Postman daemon are registered
-in the **postman.conf** file. That file contains ini-style [1]_ configuration 
+All the configurations that can be applied to the Mailjam daemon are registered
+in the **mailjam.conf** file. That file contains ini-style [1]_ configuration 
 parameters, separated in different *categories*.
 
 .. note::
 
-   The postman.conf file will be installed in different locations depending on
+   The mailjam.conf file will be installed in different locations depending on
    your setup. The usual locations are:
 
-   - */etc/postman.conf* - In most Linux systems (like archlinux, gentoo, 
+   - */etc/mailjam.conf* - In most Linux systems (like archlinux, gentoo, 
      fedora, debian, ubuntu, etc)
 
-   - */usr/local/etc/postman.conf* - In most BSD systems (like FreeBSD, OpenBSD,
+   - */usr/local/etc/mailjam.conf* - In most BSD systems (like FreeBSD, OpenBSD,
      NetBSD, etc)
 
@@ -73,5 +73,5 @@
 *******
 
-Default: ``/usr/local/etc/postman/ssl/postman.key``
+Default: ``/usr/local/etc/mailjam/ssl/mailjam.key``
 
 Path to the ssl key used for encrypted SSL sessions.
@@ -86,5 +86,5 @@
 *******
 
-Default: ``/usr/local/etc/postman/ssl/postman.crt``
+Default: ``/usr/local/etc/mailjam/ssl/mailjam.crt``
 
 Path to the ssl certificate used for encrypted SSL sessions.
@@ -99,5 +99,5 @@
 *******
 
-Default: ``/var/log/postman/xmlrpc_server.log``
+Default: ``/var/log/mailjam/xmlrpc_server.log``
 
 Path to the file where log messages will be saved
@@ -128,5 +128,5 @@
 ****
 
-Default: ``/usr/local/postman/storage``
+Default: ``/usr/local/mailjam/storage``
 
 Path to the directory where the backend will save data.
@@ -137,5 +137,5 @@
 ********
 
-Default: ``/usr/local/postman/storage/mailings.json``
+Default: ``/usr/local/mailjam/storage/mailings.json``
 
 Path to the file where the identifiers of existing mailing lists will be saved.
@@ -165,5 +165,5 @@
 **********
 
-Default: ``/usr/local/postman/storage/members.json``
+Default: ``/usr/local/mailjam/storage/members.json``
 
 Path to the file where the identifiers of existing members will be saved.
@@ -191,5 +191,5 @@
 Default: ``true``
 
-Enables/disables the *archives* feature. When enabled, Postman saves copies of
+Enables/disables the *archives* feature. When enabled, Mailjam saves copies of
 email address into an *archive*, so they can be read later, through a web 
 interface.
@@ -220,5 +220,5 @@
 ****
 
-Default: ``/usr/local/postman/archives``
+Default: ``/usr/local/mailjam/archives``
 
 Path to the directory where the archives will be saved.
@@ -238,5 +238,5 @@
 .. warning::
 
-   This parameters are not currently used in postman, we are still working
+   This parameters are not currently used in mailjam, we are still working
    on per-mailing-list configuration parameters.
 
@@ -265,5 +265,5 @@
 .. warning::
 
-   This parameters are not currently used in postman, we are still working
+   This parameters are not currently used in mailjam, we are still working
    on per-member configuration parameters.
 
Index: docs/src/_build/html/_sources/index.txt
===================================================================
--- docs/src/_build/html/_sources/index.txt	(revision 13)
+++ docs/src/_build/html/_sources/index.txt	(revision 16)
@@ -1,6 +1,6 @@
-Postman official documentation
+Mailjam official documentation
 ==============================
 
-This is the official documentation for Postman_, a mailing list management 
+This is the official documentation for Mailjam_, a mailing list management 
 software written in Python_.
 
@@ -25,4 +25,4 @@
 * :ref:`search`
 
-.. _Postman: https://bitbucket.org/codigo23/postman
+.. _Mailjam: https://bitbucket.org/codigo23/mailjam
 .. _Python: http://python.org
Index: docs/src/_build/html/_sources/install.txt
===================================================================
--- docs/src/_build/html/_sources/install.txt	(revision 13)
+++ docs/src/_build/html/_sources/install.txt	(revision 16)
@@ -9,7 +9,7 @@
 ---------------------------
 
-So far, the only dependency you will need in order to run postman is Python_
+So far, the only dependency you will need in order to run mailjam is Python_
 
-Postman has been tested with python *2.7.x*, but it should work with versions
+Mailjam has been tested with python *2.7.x*, but it should work with versions
 *2.6.x* too.
 
@@ -17,7 +17,7 @@
 more about how to install python.
 
-.. _install_postman:
+.. _install_mailjam:
 
-Second, install Postman
+Second, install Mailjam
 -----------------------
 
@@ -27,12 +27,12 @@
 ++++++++++++++++++++
 
-You can install Postman using pip_::
+You can install Mailjam using pip_::
 
-  pip install -e https://bitbucket.org/codigo23/postman#egg=postman
+  pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam
 
 .. note::
 
-   Postman has not been recorded/uploaded to pypi_ yet, so, in order to install 
-   it using pip you will have to provide the URL for the public Postman repo.
+   Mailjam has not been recorded/uploaded to pypi_ yet, so, in order to install 
+   it using pip you will have to provide the URL for the public Mailjam repo.
 
 .. _install_with_easy_install:
@@ -41,5 +41,5 @@
 +++++++++++++++++++++++++++++
 
-You can not install Postman using easy_install_ yet (until we do record/upload 
+You can not install Mailjam using easy_install_ yet (until we do record/upload 
 it to pypi)
 
@@ -49,5 +49,5 @@
 ++++++++++++++++++++++++++++++
 
-You can install Postman inside a virtualenv_. Just create a virtualenv::
+You can install Mailjam inside a virtualenv_. Just create a virtualenv::
 
   virtualenv /path/to/your/env
@@ -64,7 +64,7 @@
      source /path/to/your/env/bin/activate.csh
 
-And, once the environment has been activated, use pip to install Postman::
+And, once the environment has been activated, use pip to install Mailjam::
 
-  env$ pip install -e https://bitbucket.org/codigo23/postman#egg=postman
+  env$ pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam
 
 .. _install_from_sources:
@@ -89,12 +89,12 @@
 ***************
 
-The source code of Postman is hosted in bitbucket_ [1]_. In order to grab
+The source code of Mailjam is hosted in bitbucket_ [1]_. In order to grab
 the latest sources you need Mercurial_.
 
 To get a copy of the sources, just *clone* the repository::
 
-  hg clone https://bitbucket.org/codigo23/postman postman-repo
+  hg clone https://bitbucket.org/codigo23/mailjam mailjam-repo
 
-Then, go inside the *postman-repo* directory and run::
+Then, go inside the *mailjam-repo* directory and run::
 
   python setup.py install
@@ -110,14 +110,14 @@
    This process will work inside a virtualenv_ too.
 
-.. _install_setting_up_postman:
+.. _install_setting_up_mailjam:
 
-Setting up Postman
+Setting up Mailjam
 ------------------
 
 TBW
 
-.. _install_running_postman:
+.. _install_running_mailjam:
 
-Running Postman
+Running Mailjam
 ---------------
 
@@ -140,3 +140,3 @@
 .. _sudo: http://sudo.ws
 
-.. [1] https://bitbucket.org/codigo23/postman
+.. [1] https://bitbucket.org/codigo23/mailjam
Index: docs/src/_build/html/_sources/overview.txt
===================================================================
--- docs/src/_build/html/_sources/overview.txt	(revision 13)
+++ docs/src/_build/html/_sources/overview.txt	(revision 16)
@@ -1,3 +1,3 @@
-Overview of postman's architecture
+Overview of mailjam's architecture
 ==================================
 
@@ -7,5 +7,5 @@
 ------------
 
-Postman has been designed following a **multi-component structure**. There is 
+Mailjam has been designed following a **multi-component structure**. There is 
 **a daemon** that manage the mailing lists and members information in a storage
 backend and there are **different kinds of clients** (currently, three of them)
@@ -14,12 +14,12 @@
 This is the scheme of the architecture:
 
-.. image:: /postman_architecture.png
-   :alt: Scheme of the architecture behind Postman
+.. image:: /mailjam_architecture.png
+   :alt: Scheme of the architecture behind Mailjam
    :class: open_fancybox
 
 
-.. _overview_postman_daemon:
+.. _overview_mailjam_daemon:
 
-Postman daemon
+Mailjam daemon
 --------------
 
@@ -32,5 +32,5 @@
 to add/update/delete data from the backend.
 
-.. _overview_postman_mta_client:
+.. _overview_mailjam_mta_client:
 
 MTA client
@@ -41,5 +41,5 @@
 backend to tell the MTA what it has to do with the incoming emails.
 
-.. _overview_postman_cli_client:
+.. _overview_mailjam_cli_client:
 
 CLI client
@@ -47,7 +47,7 @@
 
 This is a shell-like interface that can be used to add mailing lists to a given
-Postman server, edit such mailing lists information, add members, etc. 
+Mailjam server, edit such mailing lists information, add members, etc. 
 
-.. _overview_postman_web_client:
+.. _overview_mailjam_web_client:
 
 Web client
@@ -56,3 +56,3 @@
 This is a small *webapp* that can be used to perform the same management 
 operations you can achieve using the 
-:ref:`CLI client<overview_postman_cli_client>`.
+:ref:`CLI client<overview_mailjam_cli_client>`.
Index: docs/src/_build/html/_sources/running.txt
===================================================================
--- docs/src/_build/html/_sources/running.txt	(revision 13)
+++ docs/src/_build/html/_sources/running.txt	(revision 16)
@@ -1,3 +1,3 @@
-Running Postman
+Running Mailjam
 ===============
 
Index: docs/src/_build/html/configuration.html
===================================================================
--- docs/src/_build/html/configuration.html	(revision 13)
+++ docs/src/_build/html/configuration.html	(revision 16)
@@ -9,5 +9,5 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Configuration &mdash; Postman 0.1.0 documentation</title>
+    <title>Configuration &mdash; Mailjam 0.1.0 documentation</title>
     
     <link rel="stylesheet" href="_static/default.css" type="text/css" />
@@ -26,6 +26,6 @@
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Postman 0.1.0 documentation" href="index.html" />
-    <link rel="next" title="Running Postman" href="running.html" />
+    <link rel="top" title="Mailjam 0.1.0 documentation" href="index.html" />
+    <link rel="next" title="Running Mailjam" href="running.html" />
     <link rel="prev" title="Installation instructions" href="install.html" /> 
   </head>
@@ -38,10 +38,10 @@
              accesskey="I">index</a></li>
         <li class="right" >
-          <a href="running.html" title="Running Postman"
+          <a href="running.html" title="Running Mailjam"
              accesskey="N">next</a> |</li>
         <li class="right" >
           <a href="install.html" title="Installation instructions"
              accesskey="P">previous</a> |</li>
-        <li><a href="index.html">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>  
@@ -58,5 +58,5 @@
 <ul class="simple">
 <li><a class="reference internal" href="#configuration" id="id9">Configuration</a><ul>
-<li><a class="reference internal" href="#postman-daemon-configuration-file" id="id10">Postman daemon configuration file</a><ul>
+<li><a class="reference internal" href="#mailjam-daemon-configuration-file" id="id10">Mailjam daemon configuration file</a><ul>
 <li><a class="reference internal" href="#xmlrpc-server" id="id11">xmlrpc_server</a><ul>
 <li><a class="reference internal" href="#address" id="id12">address</a></li>
@@ -96,17 +96,17 @@
 </ul>
 </div>
-<div class="section" id="postman-daemon-configuration-file">
-<span id="configuration-daemon"></span><h2><a class="toc-backref" href="#id10">Postman daemon configuration file</a><a class="headerlink" href="#postman-daemon-configuration-file" title="Permalink to this headline">¶</a></h2>
-<p>All the configurations that can be applied to the Postman daemon are registered
-in the <strong>postman.conf</strong> file. That file contains ini-style <a class="footnote-reference" href="#id6" id="id1">[1]</a> configuration
+<div class="section" id="mailjam-daemon-configuration-file">
+<span id="configuration-daemon"></span><h2><a class="toc-backref" href="#id10">Mailjam daemon configuration file</a><a class="headerlink" href="#mailjam-daemon-configuration-file" title="Permalink to this headline">¶</a></h2>
+<p>All the configurations that can be applied to the Mailjam daemon are registered
+in the <strong>mailjam.conf</strong> file. That file contains ini-style <a class="footnote-reference" href="#id6" id="id1">[1]</a> configuration
 parameters, separated in different <em>categories</em>.</p>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
-<p>The postman.conf file will be installed in different locations depending on
+<p>The mailjam.conf file will be installed in different locations depending on
 your setup. The usual locations are:</p>
 <ul class="simple">
-<li><em>/etc/postman.conf</em> - In most Linux systems (like archlinux, gentoo,
+<li><em>/etc/mailjam.conf</em> - In most Linux systems (like archlinux, gentoo,
 fedora, debian, ubuntu, etc)</li>
-<li><em>/usr/local/etc/postman.conf</em> - In most BSD systems (like FreeBSD, OpenBSD,
+<li><em>/usr/local/etc/mailjam.conf</em> - In most BSD systems (like FreeBSD, OpenBSD,
 NetBSD, etc)</li>
 </ul>
@@ -140,5 +140,5 @@
 <div class="section" id="ssl-key">
 <span id="configuration-daemon-xmlrpc-ssl-key"></span><h4><a class="toc-backref" href="#id15">ssl_key</a><a class="headerlink" href="#ssl-key" title="Permalink to this headline">¶</a></h4>
-<p>Default: <tt class="docutils literal"><span class="pre">/usr/local/etc/postman/ssl/postman.key</span></tt></p>
+<p>Default: <tt class="docutils literal"><span class="pre">/usr/local/etc/mailjam/ssl/mailjam.key</span></tt></p>
 <p>Path to the ssl key used for encrypted SSL sessions.</p>
 <div class="admonition warning">
@@ -149,5 +149,5 @@
 <div class="section" id="ssl-crt">
 <span id="configuration-daemon-xmlrpc-ssl-crt"></span><h4><a class="toc-backref" href="#id16">ssl_crt</a><a class="headerlink" href="#ssl-crt" title="Permalink to this headline">¶</a></h4>
-<p>Default: <tt class="docutils literal"><span class="pre">/usr/local/etc/postman/ssl/postman.crt</span></tt></p>
+<p>Default: <tt class="docutils literal"><span class="pre">/usr/local/etc/mailjam/ssl/mailjam.crt</span></tt></p>
 <p>Path to the ssl certificate used for encrypted SSL sessions.</p>
 <div class="admonition warning">
@@ -158,5 +158,5 @@
 <div class="section" id="logfile">
 <span id="configuration-daemon-xmlrpc-logfile"></span><h4><a class="toc-backref" href="#id17">logfile</a><a class="headerlink" href="#logfile" title="Permalink to this headline">¶</a></h4>
-<p>Default: <tt class="docutils literal"><span class="pre">/var/log/postman/xmlrpc_server.log</span></tt></p>
+<p>Default: <tt class="docutils literal"><span class="pre">/var/log/mailjam/xmlrpc_server.log</span></tt></p>
 <p>Path to the file where log messages will be saved</p>
 </div>
@@ -175,10 +175,10 @@
 <div class="section" id="path">
 <span id="configuration-daemon-xmlrpc-path"></span><h4><a class="toc-backref" href="#id20">path</a><a class="headerlink" href="#path" title="Permalink to this headline">¶</a></h4>
-<p>Default: <tt class="docutils literal"><span class="pre">/usr/local/postman/storage</span></tt></p>
+<p>Default: <tt class="docutils literal"><span class="pre">/usr/local/mailjam/storage</span></tt></p>
 <p>Path to the directory where the backend will save data.</p>
 </div>
 <div class="section" id="lists-db">
 <span id="configuration-daemon-storage-lists-db"></span><h4><a class="toc-backref" href="#id21">lists_db</a><a class="headerlink" href="#lists-db" title="Permalink to this headline">¶</a></h4>
-<p>Default: <tt class="docutils literal"><span class="pre">/usr/local/postman/storage/mailings.json</span></tt></p>
+<p>Default: <tt class="docutils literal"><span class="pre">/usr/local/mailjam/storage/mailings.json</span></tt></p>
 <p>Path to the file where the identifiers of existing mailing lists will be saved.</p>
 <div class="admonition note">
@@ -201,5 +201,5 @@
 <div class="section" id="members-db">
 <span id="configuration-daemon-xmlrpc-members-db"></span><h4><a class="toc-backref" href="#id22">members_db</a><a class="headerlink" href="#members-db" title="Permalink to this headline">¶</a></h4>
-<p>Default: <tt class="docutils literal"><span class="pre">/usr/local/postman/storage/members.json</span></tt></p>
+<p>Default: <tt class="docutils literal"><span class="pre">/usr/local/mailjam/storage/members.json</span></tt></p>
 <p>Path to the file where the identifiers of existing members will be saved.</p>
 <div class="admonition note">
@@ -218,5 +218,5 @@
 <span id="configuration-daemon-archive-enabled"></span><h4><a class="toc-backref" href="#id24">enabled</a><a class="headerlink" href="#enabled" title="Permalink to this headline">¶</a></h4>
 <p>Default: <tt class="docutils literal"><span class="pre">true</span></tt></p>
-<p>Enables/disables the <em>archives</em> feature. When enabled, Postman saves copies of
+<p>Enables/disables the <em>archives</em> feature. When enabled, Mailjam saves copies of
 email address into an <em>archive</em>, so they can be read later, through a web
 interface.</p>
@@ -239,5 +239,5 @@
 <div class="section" id="configuration-daemon-archive-path">
 <span id="id5"></span><h4><a class="toc-backref" href="#id26">path</a><a class="headerlink" href="#configuration-daemon-archive-path" title="Permalink to this headline">¶</a></h4>
-<p>Default: <tt class="docutils literal"><span class="pre">/usr/local/postman/archives</span></tt></p>
+<p>Default: <tt class="docutils literal"><span class="pre">/usr/local/mailjam/archives</span></tt></p>
 <p>Path to the directory where the archives will be saved.</p>
 <div class="admonition warning">
@@ -253,5 +253,5 @@
 <div class="admonition warning">
 <p class="first admonition-title">Warning</p>
-<p class="last">This parameters are not currently used in postman, we are still working
+<p class="last">This parameters are not currently used in mailjam, we are still working
 on per-mailing-list configuration parameters.</p>
 </div>
@@ -271,5 +271,5 @@
 <div class="admonition warning">
 <p class="first admonition-title">Warning</p>
-<p class="last">This parameters are not currently used in postman, we are still working
+<p class="last">This parameters are not currently used in mailjam, we are still working
 on per-member configuration parameters.</p>
 </div>
@@ -322,5 +322,5 @@
   <ul>
 <li><a class="reference internal" href="#">Configuration</a><ul>
-<li><a class="reference internal" href="#postman-daemon-configuration-file">Postman daemon configuration file</a><ul>
+<li><a class="reference internal" href="#mailjam-daemon-configuration-file">Mailjam daemon configuration file</a><ul>
 <li><a class="reference internal" href="#xmlrpc-server">xmlrpc_server</a><ul>
 <li><a class="reference internal" href="#address">address</a></li>
@@ -365,5 +365,5 @@
   <h4>Next topic</h4>
   <p class="topless"><a href="running.html"
-                        title="next chapter">Running Postman</a></p>
+                        title="next chapter">Running Mailjam</a></p>
   <h3>This Page</h3>
   <ul class="this-page-menu">
@@ -395,10 +395,10 @@
              >index</a></li>
         <li class="right" >
-          <a href="running.html" title="Running Postman"
+          <a href="running.html" title="Running Mailjam"
              >next</a> |</li>
         <li class="right" >
           <a href="install.html" title="Installation instructions"
              >previous</a> |</li>
-        <li><a href="index.html">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>
Index: docs/src/_build/html/development.html
===================================================================
--- docs/src/_build/html/development.html	(revision 13)
+++ docs/src/_build/html/development.html	(revision 16)
@@ -9,5 +9,5 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Developers documentation &mdash; Postman 0.1.0 documentation</title>
+    <title>Developers documentation &mdash; Mailjam 0.1.0 documentation</title>
     
     <link rel="stylesheet" href="_static/default.css" type="text/css" />
@@ -26,5 +26,5 @@
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Postman 0.1.0 documentation" href="index.html" />
+    <link rel="top" title="Mailjam 0.1.0 documentation" href="index.html" />
     <link rel="prev" title="Some examples" href="examples.html" /> 
   </head>
@@ -39,5 +39,5 @@
           <a href="examples.html" title="Some examples"
              accesskey="P">previous</a> |</li>
-        <li><a href="index.html">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>  
@@ -98,5 +98,5 @@
           <a href="examples.html" title="Some examples"
              >previous</a> |</li>
-        <li><a href="index.html">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>
Index: docs/src/_build/html/examples.html
===================================================================
--- docs/src/_build/html/examples.html	(revision 13)
+++ docs/src/_build/html/examples.html	(revision 16)
@@ -9,5 +9,5 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Some examples &mdash; Postman 0.1.0 documentation</title>
+    <title>Some examples &mdash; Mailjam 0.1.0 documentation</title>
     
     <link rel="stylesheet" href="_static/default.css" type="text/css" />
@@ -26,7 +26,7 @@
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Postman 0.1.0 documentation" href="index.html" />
+    <link rel="top" title="Mailjam 0.1.0 documentation" href="index.html" />
     <link rel="next" title="Developers documentation" href="development.html" />
-    <link rel="prev" title="Running Postman" href="running.html" /> 
+    <link rel="prev" title="Running Mailjam" href="running.html" /> 
   </head>
   <body>
@@ -41,7 +41,7 @@
              accesskey="N">next</a> |</li>
         <li class="right" >
-          <a href="running.html" title="Running Postman"
+          <a href="running.html" title="Running Mailjam"
              accesskey="P">previous</a> |</li>
-        <li><a href="index.html">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>  
@@ -70,5 +70,5 @@
   <h4>Previous topic</h4>
   <p class="topless"><a href="running.html"
-                        title="previous chapter">Running Postman</a></p>
+                        title="previous chapter">Running Mailjam</a></p>
   <h4>Next topic</h4>
   <p class="topless"><a href="development.html"
@@ -106,7 +106,7 @@
              >next</a> |</li>
         <li class="right" >
-          <a href="running.html" title="Running Postman"
+          <a href="running.html" title="Running Mailjam"
              >previous</a> |</li>
-        <li><a href="index.html">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>
Index: docs/src/_build/html/genindex.html
===================================================================
--- docs/src/_build/html/genindex.html	(revision 13)
+++ docs/src/_build/html/genindex.html	(revision 16)
@@ -11,5 +11,5 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Index &mdash; Postman 0.1.0 documentation</title>
+    <title>Index &mdash; Mailjam 0.1.0 documentation</title>
     
     <link rel="stylesheet" href="_static/default.css" type="text/css" />
@@ -28,5 +28,5 @@
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Postman 0.1.0 documentation" href="index.html" /> 
+    <link rel="top" title="Mailjam 0.1.0 documentation" href="index.html" /> 
   </head>
   <body>
@@ -37,5 +37,5 @@
           <a href="#" title="General Index"
              accesskey="I">index</a></li>
-        <li><a href="index.html">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>  
@@ -85,5 +85,5 @@
           <a href="#" title="General Index"
              >index</a></li>
-        <li><a href="index.html">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>
Index: docs/src/_build/html/index.html
===================================================================
--- docs/src/_build/html/index.html	(revision 13)
+++ docs/src/_build/html/index.html	(revision 16)
@@ -9,5 +9,5 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Postman official documentation &mdash; Postman 0.1.0 documentation</title>
+    <title>Mailjam official documentation &mdash; Mailjam 0.1.0 documentation</title>
     
     <link rel="stylesheet" href="_static/default.css" type="text/css" />
@@ -26,6 +26,6 @@
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Postman 0.1.0 documentation" href="#" />
-    <link rel="next" title="Overview of postman’s architecture" href="overview.html" /> 
+    <link rel="top" title="Mailjam 0.1.0 documentation" href="#" />
+    <link rel="next" title="Overview of mailjam’s architecture" href="overview.html" /> 
   </head>
   <body>
@@ -37,7 +37,7 @@
              accesskey="I">index</a></li>
         <li class="right" >
-          <a href="overview.html" title="Overview of postman’s architecture"
+          <a href="overview.html" title="Overview of mailjam’s architecture"
              accesskey="N">next</a> |</li>
-        <li><a href="#">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="#">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>  
@@ -48,14 +48,14 @@
           <div class="body">
             
-  <div class="section" id="postman-official-documentation">
-<h1>Postman official documentation<a class="headerlink" href="#postman-official-documentation" title="Permalink to this headline">¶</a></h1>
-<p>This is the official documentation for <a class="reference external" href="https://bitbucket.org/codigo23/postman">Postman</a>, a mailing list management
+  <div class="section" id="mailjam-official-documentation">
+<h1>Mailjam official documentation<a class="headerlink" href="#mailjam-official-documentation" title="Permalink to this headline">¶</a></h1>
+<p>This is the official documentation for <a class="reference external" href="https://bitbucket.org/codigo23/mailjam">Mailjam</a>, a mailing list management
 software written in <a class="reference external" href="http://python.org">Python</a>.</p>
 <p>Contents:</p>
 <div class="toctree-wrapper compound">
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="overview.html">Overview of postman&#8217;s architecture</a><ul>
+<li class="toctree-l1"><a class="reference internal" href="overview.html">Overview of mailjam&#8217;s architecture</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="overview.html#introduction">Introduction</a></li>
-<li class="toctree-l2"><a class="reference internal" href="overview.html#postman-daemon">Postman daemon</a></li>
+<li class="toctree-l2"><a class="reference internal" href="overview.html#mailjam-daemon">Mailjam daemon</a></li>
 <li class="toctree-l2"><a class="reference internal" href="overview.html#mta-client">MTA client</a></li>
 <li class="toctree-l2"><a class="reference internal" href="overview.html#cli-client">CLI client</a></li>
@@ -65,15 +65,15 @@
 <li class="toctree-l1"><a class="reference internal" href="install.html">Installation instructions</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="install.html#first-install-dependencies">First, install dependencies</a></li>
-<li class="toctree-l2"><a class="reference internal" href="install.html#second-install-postman">Second, install Postman</a></li>
-<li class="toctree-l2"><a class="reference internal" href="install.html#setting-up-postman">Setting up Postman</a></li>
-<li class="toctree-l2"><a class="reference internal" href="install.html#running-postman">Running Postman</a></li>
+<li class="toctree-l2"><a class="reference internal" href="install.html#second-install-mailjam">Second, install Mailjam</a></li>
+<li class="toctree-l2"><a class="reference internal" href="install.html#setting-up-mailjam">Setting up Mailjam</a></li>
+<li class="toctree-l2"><a class="reference internal" href="install.html#running-mailjam">Running Mailjam</a></li>
 <li class="toctree-l2"><a class="reference internal" href="install.html#running-tests-developers-only">Running tests (developers only)</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="configuration.html">Configuration</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="configuration.html#postman-daemon-configuration-file">Postman daemon configuration file</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration.html#mailjam-daemon-configuration-file">Mailjam daemon configuration file</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="running.html">Running Postman</a></li>
+<li class="toctree-l1"><a class="reference internal" href="running.html">Running Mailjam</a></li>
 <li class="toctree-l1"><a class="reference internal" href="examples.html">Some examples</a></li>
 <li class="toctree-l1"><a class="reference internal" href="development.html">Developers documentation</a></li>
@@ -98,5 +98,5 @@
   <h3><a href="#">Table Of Contents</a></h3>
   <ul>
-<li><a class="reference internal" href="#">Postman official documentation</a><ul>
+<li><a class="reference internal" href="#">Mailjam official documentation</a><ul>
 </ul>
 </li>
@@ -106,5 +106,5 @@
   <h4>Next topic</h4>
   <p class="topless"><a href="overview.html"
-                        title="next chapter">Overview of postman&#8217;s architecture</a></p>
+                        title="next chapter">Overview of mailjam&#8217;s architecture</a></p>
   <h3>This Page</h3>
   <ul class="this-page-menu">
@@ -136,7 +136,7 @@
              >index</a></li>
         <li class="right" >
-          <a href="overview.html" title="Overview of postman’s architecture"
+          <a href="overview.html" title="Overview of mailjam’s architecture"
              >next</a> |</li>
-        <li><a href="#">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="#">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>
Index: docs/src/_build/html/install.html
===================================================================
--- docs/src/_build/html/install.html	(revision 13)
+++ docs/src/_build/html/install.html	(revision 16)
@@ -9,5 +9,5 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Installation instructions &mdash; Postman 0.1.0 documentation</title>
+    <title>Installation instructions &mdash; Mailjam 0.1.0 documentation</title>
     
     <link rel="stylesheet" href="_static/default.css" type="text/css" />
@@ -26,7 +26,7 @@
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Postman 0.1.0 documentation" href="index.html" />
+    <link rel="top" title="Mailjam 0.1.0 documentation" href="index.html" />
     <link rel="next" title="Configuration" href="configuration.html" />
-    <link rel="prev" title="Overview of postman’s architecture" href="overview.html" /> 
+    <link rel="prev" title="Overview of mailjam’s architecture" href="overview.html" /> 
   </head>
   <body>
@@ -41,7 +41,7 @@
              accesskey="N">next</a> |</li>
         <li class="right" >
-          <a href="overview.html" title="Overview of postman’s architecture"
+          <a href="overview.html" title="Overview of mailjam’s architecture"
              accesskey="P">previous</a> |</li>
-        <li><a href="index.html">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>  
@@ -59,5 +59,5 @@
 <li><a class="reference internal" href="#installation-instructions" id="id3">Installation instructions</a><ul>
 <li><a class="reference internal" href="#first-install-dependencies" id="id4">First, install dependencies</a></li>
-<li><a class="reference internal" href="#second-install-postman" id="id5">Second, install Postman</a><ul>
+<li><a class="reference internal" href="#second-install-mailjam" id="id5">Second, install Mailjam</a><ul>
 <li><a class="reference internal" href="#installing-using-pip" id="id6">Installing using pip</a></li>
 <li><a class="reference internal" href="#installing-using-easy-install" id="id7">Installing using easy_install</a></li>
@@ -70,6 +70,6 @@
 </ul>
 </li>
-<li><a class="reference internal" href="#setting-up-postman" id="id12">Setting up Postman</a></li>
-<li><a class="reference internal" href="#running-postman" id="id13">Running Postman</a></li>
+<li><a class="reference internal" href="#setting-up-mailjam" id="id12">Setting up Mailjam</a></li>
+<li><a class="reference internal" href="#running-mailjam" id="id13">Running Mailjam</a></li>
 <li><a class="reference internal" href="#running-tests-developers-only" id="id14">Running tests (developers only)</a></li>
 </ul>
@@ -79,31 +79,31 @@
 <div class="section" id="first-install-dependencies">
 <span id="install-dependencies"></span><h2><a class="toc-backref" href="#id4">First, install dependencies</a><a class="headerlink" href="#first-install-dependencies" title="Permalink to this headline">¶</a></h2>
-<p>So far, the only dependency you will need in order to run postman is <a class="reference external" href="http://python.org">Python</a></p>
-<p>Postman has been tested with python <em>2.7.x</em>, but it should work with versions
+<p>So far, the only dependency you will need in order to run mailjam is <a class="reference external" href="http://python.org">Python</a></p>
+<p>Mailjam has been tested with python <em>2.7.x</em>, but it should work with versions
 <em>2.6.x</em> too.</p>
 <p>Please, refer to your operating system package system documentation to learn
 more about how to install python.</p>
 </div>
-<div class="section" id="second-install-postman">
-<span id="install-postman"></span><h2><a class="toc-backref" href="#id5">Second, install Postman</a><a class="headerlink" href="#second-install-postman" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="second-install-mailjam">
+<span id="install-mailjam"></span><h2><a class="toc-backref" href="#id5">Second, install Mailjam</a><a class="headerlink" href="#second-install-mailjam" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="installing-using-pip">
 <span id="install-with-pip"></span><h3><a class="toc-backref" href="#id6">Installing using pip</a><a class="headerlink" href="#installing-using-pip" title="Permalink to this headline">¶</a></h3>
-<p>You can install Postman using <a class="reference external" href="http://www.pip-installer.org/en/latest/index.html">pip</a>:</p>
-<div class="highlight-python"><pre>pip install -e https://bitbucket.org/codigo23/postman#egg=postman</pre>
+<p>You can install Mailjam using <a class="reference external" href="http://www.pip-installer.org/en/latest/index.html">pip</a>:</p>
+<div class="highlight-python"><pre>pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam</pre>
 </div>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
-<p class="last">Postman has not been recorded/uploaded to <a class="reference external" href="http://pypi.python.org/pypi">pypi</a> yet, so, in order to install
-it using pip you will have to provide the URL for the public Postman repo.</p>
+<p class="last">Mailjam has not been recorded/uploaded to <a class="reference external" href="http://pypi.python.org/pypi">pypi</a> yet, so, in order to install
+it using pip you will have to provide the URL for the public Mailjam repo.</p>
 </div>
 </div>
 <div class="section" id="installing-using-easy-install">
 <span id="install-with-easy-install"></span><h3><a class="toc-backref" href="#id7">Installing using easy_install</a><a class="headerlink" href="#installing-using-easy-install" title="Permalink to this headline">¶</a></h3>
-<p>You can not install Postman using <a class="reference external" href="http://peak.telecommunity.com/DevCenter/EasyInstall">easy_install</a> yet (until we do record/upload
+<p>You can not install Mailjam using <a class="reference external" href="http://peak.telecommunity.com/DevCenter/EasyInstall">easy_install</a> yet (until we do record/upload
 it to pypi)</p>
 </div>
 <div class="section" id="installing-inside-a-virtualenv">
 <span id="install-inside-virtualenv"></span><h3><a class="toc-backref" href="#id8">Installing inside a virtualenv</a><a class="headerlink" href="#installing-inside-a-virtualenv" title="Permalink to this headline">¶</a></h3>
-<p>You can install Postman inside a <a class="reference external" href="http://www.virtualenv.org/en/latest/index.html">virtualenv</a>. Just create a virtualenv:</p>
+<p>You can install Mailjam inside a <a class="reference external" href="http://www.virtualenv.org/en/latest/index.html">virtualenv</a>. Just create a virtualenv:</p>
 <div class="highlight-python"><div class="highlight"><pre><span class="n">virtualenv</span> <span class="o">/</span><span class="n">path</span><span class="o">/</span><span class="n">to</span><span class="o">/</span><span class="n">your</span><span class="o">/</span><span class="n">env</span>
 </pre></div>
@@ -121,6 +121,6 @@
 </div>
 </div>
-<p>And, once the environment has been activated, use pip to install Postman:</p>
-<div class="highlight-python"><pre>env$ pip install -e https://bitbucket.org/codigo23/postman#egg=postman</pre>
+<p>And, once the environment has been activated, use pip to install Mailjam:</p>
+<div class="highlight-python"><pre>env$ pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam</pre>
 </div>
 </div>
@@ -136,10 +136,10 @@
 <div class="section" id="from-repository">
 <span id="install-from-repository"></span><h4><a class="toc-backref" href="#id11">From repository</a><a class="headerlink" href="#from-repository" title="Permalink to this headline">¶</a></h4>
-<p>The source code of Postman is hosted in <a class="reference external" href="https://bitbucket.org">bitbucket</a> <a class="footnote-reference" href="#id2" id="id1">[1]</a>. In order to grab
+<p>The source code of Mailjam is hosted in <a class="reference external" href="https://bitbucket.org">bitbucket</a> <a class="footnote-reference" href="#id2" id="id1">[1]</a>. In order to grab
 the latest sources you need <a class="reference external" href="http://mercurial.selenic.com">Mercurial</a>.</p>
 <p>To get a copy of the sources, just <em>clone</em> the repository:</p>
-<div class="highlight-python"><pre>hg clone https://bitbucket.org/codigo23/postman postman-repo</pre>
-</div>
-<p>Then, go inside the <em>postman-repo</em> directory and run:</p>
+<div class="highlight-python"><pre>hg clone https://bitbucket.org/codigo23/mailjam mailjam-repo</pre>
+</div>
+<p>Then, go inside the <em>mailjam-repo</em> directory and run:</p>
 <div class="highlight-python"><pre>python setup.py install</pre>
 </div>
@@ -157,10 +157,10 @@
 </div>
 </div>
-<div class="section" id="setting-up-postman">
-<span id="install-setting-up-postman"></span><h2><a class="toc-backref" href="#id12">Setting up Postman</a><a class="headerlink" href="#setting-up-postman" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="setting-up-mailjam">
+<span id="install-setting-up-mailjam"></span><h2><a class="toc-backref" href="#id12">Setting up Mailjam</a><a class="headerlink" href="#setting-up-mailjam" title="Permalink to this headline">¶</a></h2>
 <p>TBW</p>
 </div>
-<div class="section" id="running-postman">
-<span id="install-running-postman"></span><h2><a class="toc-backref" href="#id13">Running Postman</a><a class="headerlink" href="#running-postman" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="running-mailjam">
+<span id="install-running-mailjam"></span><h2><a class="toc-backref" href="#id13">Running Mailjam</a><a class="headerlink" href="#running-mailjam" title="Permalink to this headline">¶</a></h2>
 <p>TBW</p>
 </div>
@@ -171,5 +171,5 @@
 <colgroup><col class="label" /><col /></colgroup>
 <tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id1">[1]</a></td><td><a class="reference external" href="https://bitbucket.org/codigo23/postman">https://bitbucket.org/codigo23/postman</a></td></tr>
+<tr><td class="label"><a class="fn-backref" href="#id1">[1]</a></td><td><a class="reference external" href="https://bitbucket.org/codigo23/mailjam">https://bitbucket.org/codigo23/mailjam</a></td></tr>
 </tbody>
 </table>
@@ -187,5 +187,5 @@
 <li><a class="reference internal" href="#">Installation instructions</a><ul>
 <li><a class="reference internal" href="#first-install-dependencies">First, install dependencies</a></li>
-<li><a class="reference internal" href="#second-install-postman">Second, install Postman</a><ul>
+<li><a class="reference internal" href="#second-install-mailjam">Second, install Mailjam</a><ul>
 <li><a class="reference internal" href="#installing-using-pip">Installing using pip</a></li>
 <li><a class="reference internal" href="#installing-using-easy-install">Installing using easy_install</a></li>
@@ -198,6 +198,6 @@
 </ul>
 </li>
-<li><a class="reference internal" href="#setting-up-postman">Setting up Postman</a></li>
-<li><a class="reference internal" href="#running-postman">Running Postman</a></li>
+<li><a class="reference internal" href="#setting-up-mailjam">Setting up Mailjam</a></li>
+<li><a class="reference internal" href="#running-mailjam">Running Mailjam</a></li>
 <li><a class="reference internal" href="#running-tests-developers-only">Running tests (developers only)</a></li>
 </ul>
@@ -207,5 +207,5 @@
   <h4>Previous topic</h4>
   <p class="topless"><a href="overview.html"
-                        title="previous chapter">Overview of postman&#8217;s architecture</a></p>
+                        title="previous chapter">Overview of mailjam&#8217;s architecture</a></p>
   <h4>Next topic</h4>
   <p class="topless"><a href="configuration.html"
@@ -243,7 +243,7 @@
              >next</a> |</li>
         <li class="right" >
-          <a href="overview.html" title="Overview of postman’s architecture"
+          <a href="overview.html" title="Overview of mailjam’s architecture"
              >previous</a> |</li>
-        <li><a href="index.html">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>
Index: docs/src/_build/html/overview.html
===================================================================
--- docs/src/_build/html/overview.html	(revision 13)
+++ docs/src/_build/html/overview.html	(revision 16)
@@ -9,5 +9,5 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Overview of postman’s architecture &mdash; Postman 0.1.0 documentation</title>
+    <title>Overview of mailjam’s architecture &mdash; Mailjam 0.1.0 documentation</title>
     
     <link rel="stylesheet" href="_static/default.css" type="text/css" />
@@ -26,7 +26,7 @@
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Postman 0.1.0 documentation" href="index.html" />
+    <link rel="top" title="Mailjam 0.1.0 documentation" href="index.html" />
     <link rel="next" title="Installation instructions" href="install.html" />
-    <link rel="prev" title="Postman official documentation" href="index.html" /> 
+    <link rel="prev" title="Mailjam official documentation" href="index.html" /> 
   </head>
   <body>
@@ -41,7 +41,7 @@
              accesskey="N">next</a> |</li>
         <li class="right" >
-          <a href="index.html" title="Postman official documentation"
+          <a href="index.html" title="Mailjam official documentation"
              accesskey="P">previous</a> |</li>
-        <li><a href="index.html">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>  
@@ -52,12 +52,12 @@
           <div class="body">
             
-  <div class="section" id="overview-of-postman-s-architecture">
-<h1><a class="toc-backref" href="#id1">Overview of postman&#8217;s architecture</a><a class="headerlink" href="#overview-of-postman-s-architecture" title="Permalink to this headline">¶</a></h1>
+  <div class="section" id="overview-of-mailjam-s-architecture">
+<h1><a class="toc-backref" href="#id1">Overview of mailjam&#8217;s architecture</a><a class="headerlink" href="#overview-of-mailjam-s-architecture" title="Permalink to this headline">¶</a></h1>
 <div class="contents topic" id="contents">
 <p class="topic-title first">Contents</p>
 <ul class="simple">
-<li><a class="reference internal" href="#overview-of-postman-s-architecture" id="id1">Overview of postman&#8217;s architecture</a><ul>
+<li><a class="reference internal" href="#overview-of-mailjam-s-architecture" id="id1">Overview of mailjam&#8217;s architecture</a><ul>
 <li><a class="reference internal" href="#introduction" id="id2">Introduction</a></li>
-<li><a class="reference internal" href="#postman-daemon" id="id3">Postman daemon</a></li>
+<li><a class="reference internal" href="#mailjam-daemon" id="id3">Mailjam daemon</a></li>
 <li><a class="reference internal" href="#mta-client" id="id4">MTA client</a></li>
 <li><a class="reference internal" href="#cli-client" id="id5">CLI client</a></li>
@@ -69,13 +69,13 @@
 <div class="section" id="introduction">
 <h2><a class="toc-backref" href="#id2">Introduction</a><a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h2>
-<p>Postman has been designed following a <strong>multi-component structure</strong>. There is
+<p>Mailjam has been designed following a <strong>multi-component structure</strong>. There is
 <strong>a daemon</strong> that manage the mailing lists and members information in a storage
 backend and there are <strong>different kinds of clients</strong> (currently, three of them)
 that <strong>interact with the daemon using a XMLRPC link</strong>.</p>
 <p>This is the scheme of the architecture:</p>
-<img alt="Scheme of the architecture behind Postman" class="open-fancybox" src="_images/postman_architecture.png" />
+<img alt="Scheme of the architecture behind Mailjam" class="open-fancybox" src="_images/mailjam_architecture.png" />
 </div>
-<div class="section" id="postman-daemon">
-<span id="overview-postman-daemon"></span><h2><a class="toc-backref" href="#id3">Postman daemon</a><a class="headerlink" href="#postman-daemon" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="mailjam-daemon">
+<span id="overview-mailjam-daemon"></span><h2><a class="toc-backref" href="#id3">Mailjam daemon</a><a class="headerlink" href="#mailjam-daemon" title="Permalink to this headline">¶</a></h2>
 <p>The daemon will perform all the operations regarding the management of the
 mailing lists and members. The daemon will save information of a given
@@ -86,5 +86,5 @@
 </div>
 <div class="section" id="mta-client">
-<span id="overview-postman-mta-client"></span><h2><a class="toc-backref" href="#id4">MTA client</a><a class="headerlink" href="#mta-client" title="Permalink to this headline">¶</a></h2>
+<span id="overview-mailjam-mta-client"></span><h2><a class="toc-backref" href="#id4">MTA client</a><a class="headerlink" href="#mta-client" title="Permalink to this headline">¶</a></h2>
 <p>This client is attached to a given MTA, and is called but the MTA itself when
 emails for a mailing lists are received. The client performs some checks on the
@@ -92,13 +92,13 @@
 </div>
 <div class="section" id="cli-client">
-<span id="overview-postman-cli-client"></span><h2><a class="toc-backref" href="#id5">CLI client</a><a class="headerlink" href="#cli-client" title="Permalink to this headline">¶</a></h2>
+<span id="overview-mailjam-cli-client"></span><h2><a class="toc-backref" href="#id5">CLI client</a><a class="headerlink" href="#cli-client" title="Permalink to this headline">¶</a></h2>
 <p>This is a shell-like interface that can be used to add mailing lists to a given
-Postman server, edit such mailing lists information, add members, etc.</p>
+Mailjam server, edit such mailing lists information, add members, etc.</p>
 </div>
 <div class="section" id="web-client">
-<span id="overview-postman-web-client"></span><h2><a class="toc-backref" href="#id6">Web client</a><a class="headerlink" href="#web-client" title="Permalink to this headline">¶</a></h2>
+<span id="overview-mailjam-web-client"></span><h2><a class="toc-backref" href="#id6">Web client</a><a class="headerlink" href="#web-client" title="Permalink to this headline">¶</a></h2>
 <p>This is a small <em>webapp</em> that can be used to perform the same management
 operations you can achieve using the
-<a class="reference internal" href="#overview-postman-cli-client"><em>CLI client</em></a>.</p>
+<a class="reference internal" href="#overview-mailjam-cli-client"><em>CLI client</em></a>.</p>
 </div>
 </div>
@@ -112,7 +112,7 @@
   <h3><a href="index.html">Table Of Contents</a></h3>
   <ul>
-<li><a class="reference internal" href="#">Overview of postman&#8217;s architecture</a><ul>
+<li><a class="reference internal" href="#">Overview of mailjam&#8217;s architecture</a><ul>
 <li><a class="reference internal" href="#introduction">Introduction</a></li>
-<li><a class="reference internal" href="#postman-daemon">Postman daemon</a></li>
+<li><a class="reference internal" href="#mailjam-daemon">Mailjam daemon</a></li>
 <li><a class="reference internal" href="#mta-client">MTA client</a></li>
 <li><a class="reference internal" href="#cli-client">CLI client</a></li>
@@ -124,5 +124,5 @@
   <h4>Previous topic</h4>
   <p class="topless"><a href="index.html"
-                        title="previous chapter">Postman official documentation</a></p>
+                        title="previous chapter">Mailjam official documentation</a></p>
   <h4>Next topic</h4>
   <p class="topless"><a href="install.html"
@@ -160,7 +160,7 @@
              >next</a> |</li>
         <li class="right" >
-          <a href="index.html" title="Postman official documentation"
+          <a href="index.html" title="Mailjam official documentation"
              >previous</a> |</li>
-        <li><a href="index.html">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>
Index: docs/src/_build/html/running.html
===================================================================
--- docs/src/_build/html/running.html	(revision 13)
+++ docs/src/_build/html/running.html	(revision 16)
@@ -9,5 +9,5 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Running Postman &mdash; Postman 0.1.0 documentation</title>
+    <title>Running Mailjam &mdash; Mailjam 0.1.0 documentation</title>
     
     <link rel="stylesheet" href="_static/default.css" type="text/css" />
@@ -26,5 +26,5 @@
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Postman 0.1.0 documentation" href="index.html" />
+    <link rel="top" title="Mailjam 0.1.0 documentation" href="index.html" />
     <link rel="next" title="Some examples" href="examples.html" />
     <link rel="prev" title="Configuration" href="configuration.html" /> 
@@ -43,5 +43,5 @@
           <a href="configuration.html" title="Configuration"
              accesskey="P">previous</a> |</li>
-        <li><a href="index.html">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>  
@@ -52,10 +52,10 @@
           <div class="body">
             
-  <div class="section" id="running-postman">
-<h1><a class="toc-backref" href="#id1">Running Postman</a><a class="headerlink" href="#running-postman" title="Permalink to this headline">¶</a></h1>
+  <div class="section" id="running-mailjam">
+<h1><a class="toc-backref" href="#id1">Running Mailjam</a><a class="headerlink" href="#running-mailjam" title="Permalink to this headline">¶</a></h1>
 <div class="contents topic" id="contents">
 <p class="topic-title first">Contents</p>
 <ul class="simple">
-<li><a class="reference internal" href="#running-postman" id="id1">Running Postman</a></li>
+<li><a class="reference internal" href="#running-mailjam" id="id1">Running Mailjam</a></li>
 </ul>
 </div>
@@ -108,5 +108,5 @@
           <a href="configuration.html" title="Configuration"
              >previous</a> |</li>
-        <li><a href="index.html">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>
Index: docs/src/_build/html/search.html
===================================================================
--- docs/src/_build/html/search.html	(revision 13)
+++ docs/src/_build/html/search.html	(revision 16)
@@ -9,5 +9,5 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-    <title>Search &mdash; Postman 0.1.0 documentation</title>
+    <title>Search &mdash; Mailjam 0.1.0 documentation</title>
     
     <link rel="stylesheet" href="_static/default.css" type="text/css" />
@@ -27,5 +27,5 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <script type="text/javascript" src="_static/searchtools.js"></script>
-    <link rel="top" title="Postman 0.1.0 documentation" href="index.html" />
+    <link rel="top" title="Mailjam 0.1.0 documentation" href="index.html" />
   <script type="text/javascript">
     jQuery(function() { Search.loadIndex("searchindex.js"); });
@@ -41,5 +41,5 @@
           <a href="genindex.html" title="General Index"
              accesskey="I">index</a></li>
-        <li><a href="index.html">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>  
@@ -89,5 +89,5 @@
           <a href="genindex.html" title="General Index"
              >index</a></li>
-        <li><a href="index.html">Postman 0.1.0 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Mailjam 0.1.0 documentation</a> &raquo;</li> 
       </ul>
     </div>
Index: docs/src/_build/html/searchindex.js
===================================================================
--- docs/src/_build/html/searchindex.js	(revision 13)
+++ docs/src/_build/html/searchindex.js	(revision 16)
@@ -1,1 +1,1 @@
-Search.setIndex({objects:{},terms:{all:[2,6],code:5,identifi:6,edg:5,just:5,softwar:1,gentoo:6,abl:6,offici:[1,5],becaus:6,tcp:2,ssl_kei:6,session:6,through:6,file:[1,6],follow:2,netbsd:6,disk:6,ssl_crt:6,dynam:6,paramet:6,xml:6,content:[0,1,2,3,4,5,6],privat:6,password:6,locat:6,cli:[1,2],listen:[2,6],also:6,configur:[1,6],activ:5,send:6,should:5,add:[2,6],archlinux:6,appli:6,mail:[1,6,2],save:[2,6],local:6,xmlrpc_server:6,bin:5,applic:6,them:2,sourc:[6,5],env:5,xmlrpc:[2,6],get:5,read:[2,6],auto:6,pypi:5,multi:2,tbw:5,repo:5,ssl:6,traffic:6,usual:6,now:6,mailing_list:6,introduct:[1,2],daemon:[1,6,2],like:[2,6],specif:6,edit:2,list:[1,6,2],upload:5,server:[2,6],separ:6,"default":6,achiev:2,exampl:[1,4,5],updat:[2,6],contain:6,small:2,privileg:5,grab:5,secure_socket_lay:6,where:6,manag:[1,2],mean:6,wiki:6,certif:6,www:6,set:[1,6,5],members_db:6,some:[1,4,2],see:6,design:2,download:5,themselv:6,administr:6,port:[2,6],librari:6,hostnam:6,virtualenv:5,index:1,what:2,still:6,postman:[1,3,6,5,2],matter:6,section:6,wikipedia:6,per:6,yet:[6,5],categori:6,delet:2,written:1,version:5,directori:[6,5],"new":6,"public":[6,5],localhost:6,refer:5,hasn:6,run:[1,3,5],insid:5,web:[1,6,2],style:6,here:6,behaviour:6,extens:6,host:5,base:6,repositori:5,ubuntu:6,releas:5,depend:[1,6,5],modifi:6,bleed:5,valu:6,about:[6,5],perform:2,architectur:[1,2],pymotw:6,current:[2,6],doughellmann:6,page:1,configpars:6,etc:[2,6],fals:6,com:6,disabl:6,logfil:6,oper:[2,5],pleas:5,note:[6,5],overview:[1,2],modul:1,within:6,por:6,easy_instal:5,system:[6,5],email:[2,6],instruct:[1,5],alreadi:2,been:[2,6,5],linux:6,instal:[1,6,5],storag:[2,6],your:[6,5],backend:[2,6],kei:6,avail:6,differ:[2,6],from:[2,6,5],log:6,wai:[6,5],interact:2,support:6,regist:6,three:2,messag:6,mercuri:5,attach:2,json:6,interfac:[2,6],usr:6,"var":6,call:2,scheme:2,type:6,until:5,store:6,more:[6,5],shell:[2,5],option:6,python:[1,6,5],copi:[6,5],search:1,warn:[6,5],thi:[1,6,5,2],allow_chpasswd:6,link:2,too:[2,5],webapp:2,given:[2,6],"true":6,those:6,serv:6,wide:5,kind:2,onli:[1,6,5],conf:6,provid:5,setup:[6,5],work:[6,5],onc:5,second:[1,5],structur:2,tell:2,trick:6,record:5,archiv:6,can:[2,6,5],learn:5,exist:6,mta:[1,2],root:5,address:6,unencrypt:6,featur:6,openbsd:6,ini_fil:6,creat:5,process:5,sudo:5,ani:6,doesn:6,compon:2,packag:5,itself:2,right:6,ini:6,have:5,tabl:1,pip:5,incom:2,path:[6,5],check:[2,5],probabl:5,readi:6,encrypt:6,thei:6,want:5,inform:[2,6],receiv:2,travel:6,when:[2,6,5],same:[2,6],reset:6,member:[2,6],how:5,need:5,html:6,anyon:6,rememb:5,test:[1,5],codigo23:5,you:[2,6,5],document:[0,1,5],enabl:6,regard:2,http:[6,5],allow:2,tcsh:5,clone:5,auto_signup:6,most:6,rpc:6,user:6,crt:6,bsd:6,develop:[0,1,5],data:[2,6],debian:6,org:[6,5],csh:5,other:6,bitbucket:5,lists_db:6,off:6,url:5,doc:6,later:6,request:[2,6],inherit:6,fedora:6,registr:6,client:[1,2],environ:5,freebsd:6,indic:1,far:5,first:[1,5],egg:5,order:5,latest:5},objtypes:{},titles:["Developers documentation","Postman official documentation","Overview of postman&#8217;s architecture","Running Postman","Some examples","Installation instructions","Configuration"],objnames:{},filenames:["development","index","overview","running","examples","install","configuration"]})
+Search.setIndex({objects:{},terms:{all:[2,6],code:5,identifi:6,edg:5,just:5,tcsh:5,wikipedia:6,offici:[1,5],becaus:6,tcp:2,ssl_kei:6,session:6,through:6,url:5,ini_fil:6,follow:2,netbsd:6,disk:6,ssl_crt:6,dynam:6,paramet:6,xml:6,categori:6,privat:6,password:6,locat:6,cli:[1,2],how:5,configur:[1,6],activ:5,send:6,should:5,add:[2,6],archlinux:6,overview:[1,2],mail:[1,6,2],tell:2,save:[2,6],local:6,latest:5,bin:5,applic:6,them:2,sourc:[6,5],rememb:5,xmlrpc:[2,6],get:5,read:[2,6],auto:6,pypi:5,kind:2,tbw:5,repo:5,ssl:6,traffic:6,enabl:6,now:6,mailing_list:6,introduct:[1,2],daemon:[1,6,2],like:[2,6],specif:6,edit:2,list:[1,6,2],upload:5,server:[2,6],separ:6,provid:5,achiev:2,have:5,contain:6,small:2,privileg:5,grab:5,secure_socket_lay:6,where:6,manag:[1,2],mean:6,wiki:6,certif:6,www:6,set:[1,6,5],members_db:6,some:[1,4,2],see:6,member:[2,6],design:2,download:5,run:[1,3,5],port:[2,6],librari:6,virtualenv:5,index:1,what:2,still:6,postman:[],record:5,freebsd:6,section:6,abl:6,per:6,yet:[6,5],content:[0,1,2,3,4,5,6],delet:2,written:1,version:5,"new":6,"public":[6,5],localhost:6,refer:5,hasn:6,more:[6,5],themselv:6,insid:5,web:[1,6,2],pleas:5,style:6,here:6,behaviour:6,extens:6,host:5,base:6,repositori:5,ubuntu:6,releas:5,depend:[1,6,5],modifi:6,bleed:5,valu:6,about:[6,5],architectur:[1,2],pymotw:6,current:[2,6],doughellmann:6,page:1,configpars:6,etc:[2,6],fals:6,com:6,disabl:6,user:6,oper:[2,5],softwar:1,client:[1,2],note:[6,5],appli:6,modul:1,within:6,por:6,easy_instal:5,three:2,email:[2,6],instruct:[1,5],alreadi:2,messag:6,right:6,linux:6,instal:[1,6,5],storag:[2,6],your:[6,5],backend:[2,6],kei:6,mercuri:5,differ:[2,6],from:[2,6,5],log:6,wai:[6,5],attach:2,interact:2,support:6,regist:6,system:[6,5],been:[2,6,5],avail:6,mailjam:[1,3,6,5,2],json:6,interfac:[2,6],usr:6,"var":6,call:2,scheme:2,type:6,administr:6,store:6,listen:[2,6],shell:[2,5],option:6,python:[1,6,5],copi:[6,5],search:1,warn:[6,5],allow_chpasswd:6,link:2,too:[2,5],webapp:2,given:[2,6],"true":6,those:6,serv:6,wide:5,multi:2,onli:[1,6,5],"default":6,setup:[6,5],work:[6,5],onc:5,second:[1,5],structur:2,until:5,trick:6,matter:6,itself:2,can:[2,6,5],learn:5,mta:[1,2],root:5,html:6,address:6,unencrypt:6,featur:6,openbsd:6,conf:6,creat:5,process:5,sudo:5,ani:6,doesn:6,compon:2,packag:5,archiv:6,exist:6,ini:6,file:[1,6],tabl:1,pip:5,incom:2,path:[6,5],check:[2,5],probabl:5,readi:6,encrypt:6,thei:6,want:5,inform:[2,6],perform:2,allow:2,travel:6,when:[2,6,5],same:[2,6],reset:6,lists_db:6,also:6,need:5,xmlrpc_server:6,anyon:6,env:5,test:[1,5],environ:5,you:[2,6,5],document:[0,1,5],updat:[2,6],regard:2,http:[6,5],hostnam:6,gentoo:6,clone:5,auto_signup:6,most:6,rpc:6,logfil:6,crt:6,bsd:6,develop:[0,1,5],data:[2,6],debian:6,org:[6,5],csh:5,other:6,bitbucket:5,receiv:2,off:6,directori:[6,5],doc:6,later:6,request:[2,6],inherit:6,fedora:6,registr:6,exampl:[1,4,5],codigo23:5,thi:[1,6,5,2],indic:1,far:5,first:[1,5],egg:5,order:5,usual:6},objtypes:{},titles:["Developers documentation","Mailjam official documentation","Overview of mailjam&#8217;s architecture","Running Mailjam","Some examples","Installation instructions","Configuration"],objnames:{},filenames:["development","index","overview","running","examples","install","configuration"]})
Index: docs/src/conf.py
===================================================================
--- docs/src/conf.py	(revision 13)
+++ docs/src/conf.py	(revision 16)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 #
-# Postman documentation build configuration file, created by
+# Mailjam documentation build configuration file, created by
 # sphinx-quickstart on Sun May 20 12:34:00 2012.
 #
@@ -41,5 +41,5 @@
 
 # General information about the project.
-project = u'Postman'
+project = u'Mailjam'
 copyright = u'2012, Soluciones Informaticas Codigo23 S.L.U.'
 
@@ -165,5 +165,5 @@
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'Postmandoc'
+htmlhelp_basename = 'Mailjamdoc'
 
 
@@ -184,5 +184,5 @@
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'Postman.tex', u'Postman Documentation',
+  ('index', 'Mailjam.tex', u'Mailjam Documentation',
    u'Soluciones Informaticas Codigo23 S.L.U.', 'manual'),
 ]
@@ -214,5 +214,5 @@
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'postman', u'Postman Documentation',
+    ('index', 'mailjam', u'Mailjam Documentation',
      [u'Soluciones Informaticas Codigo23 S.L.U.'], 1)
 ]
@@ -228,6 +228,6 @@
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'Postman', u'Postman Documentation',
-   u'Soluciones Informaticas Codigo23 S.L.U.', 'Postman', 'One line description of project.',
+  ('index', 'Mailjam', u'Mailjam Documentation',
+   u'Soluciones Informaticas Codigo23 S.L.U.', 'Mailjam', 'One line description of project.',
    'Miscellaneous'),
 ]
@@ -246,5 +246,5 @@
 
 # Bibliographic Dublin Core info.
-epub_title = u'Postman'
+epub_title = u'Mailjam'
 epub_author = u'Soluciones Informaticas Codigo23 S.L.U.'
 epub_publisher = u'Soluciones Informaticas Codigo23 S.L.U.'
Index: docs/src/configuration.rst
===================================================================
--- docs/src/configuration.rst	(revision 13)
+++ docs/src/configuration.rst	(revision 16)
@@ -6,20 +6,20 @@
 .. _configuration_daemon:
 
-Postman daemon configuration file
+Mailjam daemon configuration file
 ---------------------------------
 
-All the configurations that can be applied to the Postman daemon are registered
-in the **postman.conf** file. That file contains ini-style [1]_ configuration 
+All the configurations that can be applied to the Mailjam daemon are registered
+in the **mailjam.conf** file. That file contains ini-style [1]_ configuration 
 parameters, separated in different *categories*.
 
 .. note::
 
-   The postman.conf file will be installed in different locations depending on
+   The mailjam.conf file will be installed in different locations depending on
    your setup. The usual locations are:
 
-   - */etc/postman.conf* - In most Linux systems (like archlinux, gentoo, 
+   - */etc/mailjam.conf* - In most Linux systems (like archlinux, gentoo, 
      fedora, debian, ubuntu, etc)
 
-   - */usr/local/etc/postman.conf* - In most BSD systems (like FreeBSD, OpenBSD,
+   - */usr/local/etc/mailjam.conf* - In most BSD systems (like FreeBSD, OpenBSD,
      NetBSD, etc)
 
@@ -73,5 +73,5 @@
 *******
 
-Default: ``/usr/local/etc/postman/ssl/postman.key``
+Default: ``/usr/local/etc/mailjam/ssl/mailjam.key``
 
 Path to the ssl key used for encrypted SSL sessions.
@@ -86,5 +86,5 @@
 *******
 
-Default: ``/usr/local/etc/postman/ssl/postman.crt``
+Default: ``/usr/local/etc/mailjam/ssl/mailjam.crt``
 
 Path to the ssl certificate used for encrypted SSL sessions.
@@ -99,5 +99,5 @@
 *******
 
-Default: ``/var/log/postman/xmlrpc_server.log``
+Default: ``/var/log/mailjam/xmlrpc_server.log``
 
 Path to the file where log messages will be saved
@@ -128,5 +128,5 @@
 ****
 
-Default: ``/usr/local/postman/storage``
+Default: ``/usr/local/mailjam/storage``
 
 Path to the directory where the backend will save data.
@@ -137,5 +137,5 @@
 ********
 
-Default: ``/usr/local/postman/storage/mailings.json``
+Default: ``/usr/local/mailjam/storage/mailings.json``
 
 Path to the file where the identifiers of existing mailing lists will be saved.
@@ -165,5 +165,5 @@
 **********
 
-Default: ``/usr/local/postman/storage/members.json``
+Default: ``/usr/local/mailjam/storage/members.json``
 
 Path to the file where the identifiers of existing members will be saved.
@@ -191,5 +191,5 @@
 Default: ``true``
 
-Enables/disables the *archives* feature. When enabled, Postman saves copies of
+Enables/disables the *archives* feature. When enabled, Mailjam saves copies of
 email address into an *archive*, so they can be read later, through a web 
 interface.
@@ -220,5 +220,5 @@
 ****
 
-Default: ``/usr/local/postman/archives``
+Default: ``/usr/local/mailjam/archives``
 
 Path to the directory where the archives will be saved.
@@ -238,5 +238,5 @@
 .. warning::
 
-   This parameters are not currently used in postman, we are still working
+   This parameters are not currently used in mailjam, we are still working
    on per-mailing-list configuration parameters.
 
@@ -265,5 +265,5 @@
 .. warning::
 
-   This parameters are not currently used in postman, we are still working
+   This parameters are not currently used in mailjam, we are still working
    on per-member configuration parameters.
 
Index: docs/src/index.rst
===================================================================
--- docs/src/index.rst	(revision 13)
+++ docs/src/index.rst	(revision 16)
@@ -1,6 +1,6 @@
-Postman official documentation
+Mailjam official documentation
 ==============================
 
-This is the official documentation for Postman_, a mailing list management 
+This is the official documentation for Mailjam_, a mailing list management 
 software written in Python_.
 
@@ -25,4 +25,4 @@
 * :ref:`search`
 
-.. _Postman: https://bitbucket.org/codigo23/postman
+.. _Mailjam: https://bitbucket.org/codigo23/mailjam
 .. _Python: http://python.org
Index: docs/src/install.rst
===================================================================
--- docs/src/install.rst	(revision 13)
+++ docs/src/install.rst	(revision 16)
@@ -9,7 +9,7 @@
 ---------------------------
 
-So far, the only dependency you will need in order to run postman is Python_
+So far, the only dependency you will need in order to run mailjam is Python_
 
-Postman has been tested with python *2.7.x*, but it should work with versions
+Mailjam has been tested with python *2.7.x*, but it should work with versions
 *2.6.x* too.
 
@@ -17,7 +17,7 @@
 more about how to install python.
 
-.. _install_postman:
+.. _install_mailjam:
 
-Second, install Postman
+Second, install Mailjam
 -----------------------
 
@@ -27,12 +27,12 @@
 ++++++++++++++++++++
 
-You can install Postman using pip_::
+You can install Mailjam using pip_::
 
-  pip install -e https://bitbucket.org/codigo23/postman#egg=postman
+  pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam
 
 .. note::
 
-   Postman has not been recorded/uploaded to pypi_ yet, so, in order to install 
-   it using pip you will have to provide the URL for the public Postman repo.
+   Mailjam has not been recorded/uploaded to pypi_ yet, so, in order to install 
+   it using pip you will have to provide the URL for the public Mailjam repo.
 
 .. _install_with_easy_install:
@@ -41,5 +41,5 @@
 +++++++++++++++++++++++++++++
 
-You can not install Postman using easy_install_ yet (until we do record/upload 
+You can not install Mailjam using easy_install_ yet (until we do record/upload 
 it to pypi)
 
@@ -49,5 +49,5 @@
 ++++++++++++++++++++++++++++++
 
-You can install Postman inside a virtualenv_. Just create a virtualenv::
+You can install Mailjam inside a virtualenv_. Just create a virtualenv::
 
   virtualenv /path/to/your/env
@@ -64,7 +64,7 @@
      source /path/to/your/env/bin/activate.csh
 
-And, once the environment has been activated, use pip to install Postman::
+And, once the environment has been activated, use pip to install Mailjam::
 
-  env$ pip install -e https://bitbucket.org/codigo23/postman#egg=postman
+  env$ pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam
 
 .. _install_from_sources:
@@ -89,12 +89,12 @@
 ***************
 
-The source code of Postman is hosted in bitbucket_ [1]_. In order to grab
+The source code of Mailjam is hosted in bitbucket_ [1]_. In order to grab
 the latest sources you need Mercurial_.
 
 To get a copy of the sources, just *clone* the repository::
 
-  hg clone https://bitbucket.org/codigo23/postman postman-repo
+  hg clone https://bitbucket.org/codigo23/mailjam mailjam-repo
 
-Then, go inside the *postman-repo* directory and run::
+Then, go inside the *mailjam-repo* directory and run::
 
   python setup.py install
@@ -110,14 +110,14 @@
    This process will work inside a virtualenv_ too.
 
-.. _install_setting_up_postman:
+.. _install_setting_up_mailjam:
 
-Setting up Postman
+Setting up Mailjam
 ------------------
 
 TBW
 
-.. _install_running_postman:
+.. _install_running_mailjam:
 
-Running Postman
+Running Mailjam
 ---------------
 
@@ -140,3 +140,3 @@
 .. _sudo: http://sudo.ws
 
-.. [1] https://bitbucket.org/codigo23/postman
+.. [1] https://bitbucket.org/codigo23/mailjam
Index: docs/src/overview.rst
===================================================================
--- docs/src/overview.rst	(revision 13)
+++ docs/src/overview.rst	(revision 16)
@@ -1,3 +1,3 @@
-Overview of postman's architecture
+Overview of mailjam's architecture
 ==================================
 
@@ -7,5 +7,5 @@
 ------------
 
-Postman has been designed following a **multi-component structure**. There is 
+Mailjam has been designed following a **multi-component structure**. There is 
 **a daemon** that manage the mailing lists and members information in a storage
 backend and there are **different kinds of clients** (currently, three of them)
@@ -14,12 +14,12 @@
 This is the scheme of the architecture:
 
-.. image:: /postman_architecture.png
-   :alt: Scheme of the architecture behind Postman
+.. image:: /mailjam_architecture.png
+   :alt: Scheme of the architecture behind Mailjam
    :class: open_fancybox
 
 
-.. _overview_postman_daemon:
+.. _overview_mailjam_daemon:
 
-Postman daemon
+Mailjam daemon
 --------------
 
@@ -32,5 +32,5 @@
 to add/update/delete data from the backend.
 
-.. _overview_postman_mta_client:
+.. _overview_mailjam_mta_client:
 
 MTA client
@@ -41,5 +41,5 @@
 backend to tell the MTA what it has to do with the incoming emails.
 
-.. _overview_postman_cli_client:
+.. _overview_mailjam_cli_client:
 
 CLI client
@@ -47,7 +47,7 @@
 
 This is a shell-like interface that can be used to add mailing lists to a given
-Postman server, edit such mailing lists information, add members, etc. 
+Mailjam server, edit such mailing lists information, add members, etc. 
 
-.. _overview_postman_web_client:
+.. _overview_mailjam_web_client:
 
 Web client
@@ -56,3 +56,3 @@
 This is a small *webapp* that can be used to perform the same management 
 operations you can achieve using the 
-:ref:`CLI client<overview_postman_cli_client>`.
+:ref:`CLI client<overview_mailjam_cli_client>`.
Index: docs/src/running.rst
===================================================================
--- docs/src/running.rst	(revision 13)
+++ docs/src/running.rst	(revision 16)
@@ -1,3 +1,3 @@
-Running Postman
+Running Mailjam
 ===============
 
