diff --git a/README.md b/README.md
index f373d7a5..bf1e6884 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Documentation
 
 Documentation for this bundle is stored under `Resources/doc` in this repository.
 
-[Read the documentation for master][]
+[Read the documentation for the last stable (1.3)][]
 
 License
 -------
@@ -24,7 +24,7 @@ License
 This bundle is under the MIT license. See the complete license in the bundle:
 
 ```
-    Resources/meta/LICENSE
+Resources/meta/LICENSE
 ```
 
-[Read the documentation for master]: https://github.com/FriendsOfSymfony/FOSMessageBundle/blob/master/Resources/doc/00-index.md
+[Read the documentation for the last stable (1.3)]: https://github.com/FriendsOfSymfony/FOSMessageBundle/blob/master/Resources/doc/00-index.md
diff --git a/Resources/doc/01-installation.md b/Resources/doc/01-installation.md
index 6f4ed9db..f8c9298b 100644
--- a/Resources/doc/01-installation.md
+++ b/Resources/doc/01-installation.md
@@ -11,7 +11,7 @@ The first step is to tell composer that you want to download FOSMessageBundle wh
 be achieved by typing the following at the command prompt:
 
 ```bash
-$ php composer.phar require friendsofsymfony/message-bundle
+$ composer require friendsofsymfony/message-bundle
 ```
 
 ### Step 2 - Setting up your user class
@@ -24,6 +24,7 @@ Your user class may look something like the following:
 
 ```php
 <?php
+// src/AppBundle/Entity/User.php
 
 use Doctrine\ORM\Mapping as ORM;
 use FOS\MessageBundle\Model\ParticipantInterface;
@@ -52,7 +53,7 @@ We provide examples for both Mongo DB and ORM.
 The bundle must be added to your `AppKernel`
 
 ```php
-# app/AppKernel.php
+// app/AppKernel.php
 
 public function registerBundles()
 {
@@ -71,11 +72,9 @@ Add FOSMessageBundle's routing to your application with an optional routing pref
 ```yaml
 # app/config/routing.yml
 
-# ...
 fos_message:
     resource: "@FOSMessageBundle/Resources/config/routing.xml"
     prefix: /optional_routing_prefix
-# ...
 ```
 
 ## Installation Finished
diff --git a/Resources/doc/01a-orm-models.md b/Resources/doc/01a-orm-models.md
index 58ae59b6..4b3e2246 100644
--- a/Resources/doc/01a-orm-models.md
+++ b/Resources/doc/01a-orm-models.md
@@ -14,8 +14,8 @@ Add the following to your `app/config/config.yml` file.
 
 fos_message:
     db_driver: orm
-    thread_class: Acme\MessageBundle\Entity\Thread
-    message_class: Acme\MessageBundle\Entity\Message
+    thread_class: AppBundle\Entity\Thread
+    message_class: AppBundle\Entity\Message
 ```
 
 [Continue with the installation][]
@@ -25,12 +25,12 @@ Message class
 
 ```php
 <?php
-// src/Acme/MessageBundle/Entity/Message.php
+// src/AppBundle/Entity/Message.php
 
-namespace Acme\MessageBundle\Entity;
+namespace AppBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use FOS\MessageBundle\Entity\Message as BaseMessage;
 
 /**
@@ -47,7 +47,7 @@ class Message extends BaseMessage
 
     /**
      * @ORM\ManyToOne(
-     *   targetEntity="Acme\MessageBundle\Entity\Thread",
+     *   targetEntity="AppBundle\Entity\Thread",
      *   inversedBy="messages"
      * )
      * @var \FOS\MessageBundle\Model\ThreadInterface
@@ -55,18 +55,18 @@ class Message extends BaseMessage
     protected $thread;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Acme\UserBundle\Entity\User")
+     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\User")
      * @var \FOS\MessageBundle\Model\ParticipantInterface
      */
     protected $sender;
 
     /**
      * @ORM\OneToMany(
-     *   targetEntity="Acme\MessageBundle\Entity\MessageMetadata",
+     *   targetEntity="AppBundle\Entity\MessageMetadata",
      *   mappedBy="message",
      *   cascade={"all"}
      * )
-     * @var MessageMetadata[]|\Doctrine\Common\Collections\Collection
+     * @var MessageMetadata[]|Collection
      */
     protected $metadata;
 }
@@ -77,9 +77,9 @@ MessageMetadata class
 
 ```php
 <?php
-// src/Acme/MessageBundle/Entity/MessageMetadata.php
+// src/AppBundle/Entity/MessageMetadata.php
 
-namespace Acme\MessageBundle\Entity;
+namespace AppBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use FOS\MessageBundle\Entity\MessageMetadata as BaseMessageMetadata;
@@ -98,7 +98,7 @@ class MessageMetadata extends BaseMessageMetadata
 
     /**
      * @ORM\ManyToOne(
-     *   targetEntity="Acme\MessageBundle\Entity\Message",
+     *   targetEntity="AppBundle\Entity\Message",
      *   inversedBy="metadata"
      * )
      * @var \FOS\MessageBundle\Model\MessageInterface
@@ -106,7 +106,7 @@ class MessageMetadata extends BaseMessageMetadata
     protected $message;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Acme\UserBundle\Entity\User")
+     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\User")
      * @var \FOS\MessageBundle\Model\ParticipantInterface
      */
     protected $participant;
@@ -118,12 +118,12 @@ Thread class
 
 ```php
 <?php
-// src/Acme/MessageBundle/Entity/Thread.php
+// src/AppBundle/Entity/Thread.php
 
-namespace Acme\MessageBundle\Entity;
+namespace AppBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use FOS\MessageBundle\Entity\Thread as BaseThread;
 
 /**
@@ -139,27 +139,27 @@ class Thread extends BaseThread
     protected $id;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Acme\UserBundle\Entity\User")
+     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\User")
      * @var \FOS\MessageBundle\Model\ParticipantInterface
      */
     protected $createdBy;
 
     /**
      * @ORM\OneToMany(
-     *   targetEntity="Acme\MessageBundle\Entity\Message",
+     *   targetEntity="AppBundle\Entity\Message",
      *   mappedBy="thread"
      * )
-     * @var Message[]|\Doctrine\Common\Collections\Collection
+     * @var Message[]|Collection
      */
     protected $messages;
 
     /**
      * @ORM\OneToMany(
-     *   targetEntity="Acme\MessageBundle\Entity\ThreadMetadata",
+     *   targetEntity="AppBundle\Entity\ThreadMetadata",
      *   mappedBy="thread",
      *   cascade={"all"}
      * )
-     * @var ThreadMetadata[]|\Doctrine\Common\Collections\Collection
+     * @var ThreadMetadata[]|Collection
      */
     protected $metadata;
 }
@@ -170,9 +170,9 @@ ThreadMetadata class
 
 ```php
 <?php
-// src/Acme/MessageBundle/Entity/ThreadMetadata.php
+// src/AppBundle/Entity/ThreadMetadata.php
 
-namespace Acme\MessageBundle\Entity;
+namespace AppBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use FOS\MessageBundle\Entity\ThreadMetadata as BaseThreadMetadata;
@@ -191,7 +191,7 @@ class ThreadMetadata extends BaseThreadMetadata
 
     /**
      * @ORM\ManyToOne(
-     *   targetEntity="Acme\MessageBundle\Entity\Thread",
+     *   targetEntity="AppBundle\Entity\Thread",
      *   inversedBy="metadata"
      * )
      * @var \FOS\MessageBundle\Model\ThreadInterface
@@ -199,7 +199,7 @@ class ThreadMetadata extends BaseThreadMetadata
     protected $thread;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Acme\UserBundle\Entity\User")
+     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\User")
      * @var \FOS\MessageBundle\Model\ParticipantInterface
      */
     protected $participant;
diff --git a/Resources/doc/01b-odm-models.md b/Resources/doc/01b-odm-models.md
index 2be1cb41..58d881e8 100644
--- a/Resources/doc/01b-odm-models.md
+++ b/Resources/doc/01b-odm-models.md
@@ -14,8 +14,8 @@ Add the following to your `app/config/config.yml` file.
 
 fos_message:
     db_driver: mongodb
-    thread_class: Acme\MessageBundle\Document\Thread
-    message_class: Acme\MessageBundle\Document\Message
+    thread_class: AppBundle\Document\Thread
+    message_class: AppBundle\Document\Message
 ```
 
 You may have to include the MessageBundle in your Doctrine mapping configuration,
@@ -39,9 +39,9 @@ Message class
 
 ```php
 <?php
-// src/Acme/MessageBundle/Document/Message.php
+// src/AppBundle/Document/Message.php
 
-namespace Acme\MessageBundle\Document;
+namespace AppBundle\Document;
 
 use Doctrine\ODM\MongoDB\Mapping\Annotations as MongoDB;
 use FOS\MessageBundle\Document\Message as BaseMessage;
@@ -57,17 +57,17 @@ class Message extends BaseMessage
     protected $id;
 
     /**
-     * @MongoDB\EmbedMany(targetDocument="Acme\MessageBundle\Document\MessageMetadata")
+     * @MongoDB\EmbedMany(targetDocument="AppBundle\Document\MessageMetadata")
      */
     protected $metadata;
 
     /**
-     * @MongoDB\ReferenceOne(targetDocument="Acme\MessageBundle\Document\Thread")
+     * @MongoDB\ReferenceOne(targetDocument="AppBundle\Document\Thread")
      */
     protected $thread;
 
     /**
-     * @MongoDB\ReferenceOne(targetDocument="Acme\UserBundle\Document\User")
+     * @MongoDB\ReferenceOne(targetDocument="AppBundle\Document\User")
      */
     protected $sender;
 }
@@ -78,8 +78,9 @@ MessageMetadata class
 
 ```php
 <?php
+// src/AppBundle/Document/MessageMetadata.php
 
-namespace Mashup\MessageBundle\Document;
+namespace AppBundle\Document;
 
 use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
 use FOS\MessageBundle\Document\MessageMetadata as BaseMessageMetadata;
@@ -90,7 +91,7 @@ use FOS\MessageBundle\Document\MessageMetadata as BaseMessageMetadata;
 class MessageMetadata extends BaseMessageMetadata
 {
     /**
-     * @ODM\ReferenceOne(targetDocument="Mashup\UserBundle\Document\User")
+     * @ODM\ReferenceOne(targetDocument="AppBundle\Document\User")
      */
     protected $participant;
 }
@@ -101,9 +102,9 @@ Thread class
 
 ```php
 <?php
-// src/Acme/MessageBundle/Document/Thread.php
+// src/AppBundle/Document/Thread.php
 
-namespace Acme\MessageBundle\Document;
+namespace AppBundle\Document;
 
 use Doctrine\ODM\MongoDB\Mapping\Annotations as MongoDB;
 use FOS\MessageBundle\Document\Thread as BaseThread;
@@ -119,22 +120,22 @@ class Thread extends BaseThread
     protected $id;
 
     /**
-     * @MongoDB\ReferenceMany(targetDocument="Acme\MessageBundle\Document\Message")
+     * @MongoDB\ReferenceMany(targetDocument="AppBundle\Document\Message")
      */
     protected $messages;
 
     /**
-     * @MongoDB\EmbedMany(targetDocument="Acme\MessageBundle\Document\ThreadMetadata")
+     * @MongoDB\EmbedMany(targetDocument="AppBundle\Document\ThreadMetadata")
      */
     protected $metadata;
 
     /**
-     * @MongoDB\ReferenceMany(targetDocument="Acme\UserBundle\Document\User")
+     * @MongoDB\ReferenceMany(targetDocument="AppBundle\Document\User")
      */
     protected $participants;
 
     /**
-     * @MongoDB\ReferenceOne(targetDocument="Acme\UserBundle\Document\User")
+     * @MongoDB\ReferenceOne(targetDocument="AppBundle\Document\User")
      */
     protected $createdBy;
 }
@@ -145,8 +146,9 @@ ThreadMetadata class
 
 ```php
 <?php
+// src/AppBundle/Document/ThreadMetadata.php
 
-namespace Mashup\MessageBundle\Document;
+namespace AppBundle\Document;
 
 use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
 use FOS\MessageBundle\Document\ThreadMetadata as BaseThreadMetadata;
@@ -157,7 +159,7 @@ use FOS\MessageBundle\Document\ThreadMetadata as BaseThreadMetadata;
 class ThreadMetadata extends BaseThreadMetadata
 {
     /**
-     * @ODM\ReferenceOne(targetDocument="Mashup\UserBundle\Document\User")
+     * @ODM\ReferenceOne(targetDocument="AppBundle\Document\User")
      */
     protected $participant;
 }
diff --git a/Resources/doc/02-basic-usage.md b/Resources/doc/02-basic-usage.md
index 409aa139..745a18f3 100644
--- a/Resources/doc/02-basic-usage.md
+++ b/Resources/doc/02-basic-usage.md
@@ -10,21 +10,21 @@ Get user threads
 Get the threads in the inbox of the authenticated user::
 
 ```php
-    $provider = $container->get('fos_message.provider');
+$provider = $container->get('fos_message.provider');
 
-    $threads = $provider->getInboxThreads();
+$threads = $provider->getInboxThreads();
 ```
 
 And the threads in the sentbox::
 
 ```php
-    $threads = $provider->getSentThreads();
+$threads = $provider->getSentThreads();
 ```
 
 To get a single thread, check it belongs to the authenticated user and mark it as read::
 
 ```php
-    $thread = $provider->getThread($threadId);
+$thread = $provider->getThread($threadId);
 ```
 
 Manipulate threads
@@ -33,36 +33,40 @@ Manipulate threads
 See `FOS\\MessageBundle\\Model\\ThreadInterface` for the complete list of available methods::
 
 ```php
-    // Print the thread subject
-    echo $thread->getSubject();
+// Print the thread subject
+echo $thread->getSubject();
 
-    // Get the tread participants
-    $participants = $thread->getParticipants();
+// Get the tread participants
+$participants = $thread->getParticipants();
 
-    // Know if this participant has read this thread
-    if ($thread->isReadByParticipant($participant))
+// Know if this participant has read this thread
+if ($thread->isReadByParticipant($participant))
 
-    // Know if this participant has deleted this thread
-    if ($thread->isDeletedByParticipant($participant))
+// Know if this participant has deleted this thread
+if ($thread->isDeletedByParticipant($participant))
 ```
 
+Be careful when manipulating thread participants: you may have to persist the thread to synchronize
+the thread metadata using `$container->get('fos_message.thread_manager')->saveThread($thread, false)`
+(the second argument as `false` meaning to not flush the modifications).
+
 Manipulate messages
 -------------------
 
 See ``FOS\\MessageBundle\\Model\\MessageInterface`` for the complete list of available methods::
 
 ```php
-    // Print the message body
-    echo $message->getBody();
+// Print the message body
+echo $message->getBody();
 
-    // Get the message sender participant
-    $sender = $message->getSender();
+// Get the message sender participant
+$sender = $message->getSender();
 
-    // Get the message thread
-    $thread = $message->getThread();
+// Get the message thread
+$thread = $message->getThread();
 
-    // Know if this participant has read this message
-    if ($message->isReadByParticipant($participant))
+// Know if this participant has read this message
+if ($message->isReadByParticipant($participant))
 ```
 
 Compose a message
@@ -71,23 +75,23 @@ Compose a message
 Create a new message thread::
 
 ```php
-    $composer = $container->get('fos_message.composer');
-
-    $message = $composer->newThread()
-        ->setSender($jack)
-        ->addRecipient($clyde)
-        ->setSubject('Hi there')
-        ->setBody('This is a test message')
-        ->getMessage();
+$composer = $container->get('fos_message.composer');
+
+$message = $composer->newThread()
+    ->setSender($jack)
+    ->addRecipient($clyde)
+    ->setSubject('Hi there')
+    ->setBody('This is a test message')
+    ->getMessage();
 ```
 
 And to reply to this thread::
 
 ```php
-    $message = $composer->reply($thread)
-        ->setSender($clyde)
-        ->setBody('This is the answer to the test message')
-        ->getMessage();
+$message = $composer->reply($thread)
+    ->setSender($clyde)
+    ->setBody('This is the answer to the test message')
+    ->getMessage();
 ```
 
 Note that when replying, we don't need to provide the subject nor the recipient.
@@ -99,9 +103,8 @@ Send a message
 Nothing's easier than sending the message you've just composed::
 
 ```php
-    $sender = $container->get('fos_message.sender');
-
-    $sender->send($message);
+$sender = $container->get('fos_message.sender');
+$sender->send($message);
 ```
 
 Number of Unread Messages
@@ -110,9 +113,8 @@ Number of Unread Messages
 You can return the number of unread messages for the authenticated user with::
 
 ```php
-    $provider = $container->get('fos_message.provider');
-
-    $provider->getNbUnreadMessages()
+$provider = $container->get('fos_message.provider');
+$provider->getNbUnreadMessages();
 ```
 
 Will return an integer, the number of unread messages.
diff --git a/Resources/doc/03-templating.md b/Resources/doc/03-templating.md
index ac0d10be..156aff7b 100644
--- a/Resources/doc/03-templating.md
+++ b/Resources/doc/03-templating.md
@@ -4,16 +4,16 @@ Templating Helpers for FOSMessageBundle
 MessageBundle provides a few twig functions::
 
 ```html+jinja
-    {# template.html.twig #}
+{# template.html.twig #}
 
-    {# Know if a message is read by the authenticated participant #}
-    {% if not fos_message_is_read(message) %} This message is new! {% endif %}
+{# Know if a message is read by the authenticated participant #}
+{% if not fos_message_is_read(message) %} This message is new! {% endif %}
 
-    {# Know if a thread is read by the authenticated participant. Yes, it's the same function. #}
-    {% if not fos_message_is_read(thread) %} This thread is new! {% endif %}
+{# Know if a thread is read by the authenticated participant. Yes, it's the same function. #}
+{% if not fos_message_is_read(thread) %} This thread is new! {% endif %}
 
-    {# Get the number of new threads for the authenticated participant #}
-    You have {{ fos_message_nb_unread() }} new messages
+{# Get the number of new threads for the authenticated participant #}
+You have {{ fos_message_nb_unread() }} new messages
 ```
 
 [Return to the documentation index](00-index.md)
diff --git a/Resources/doc/05-permissions.md b/Resources/doc/05-permissions.md
index 221906e3..ccecc650 100644
--- a/Resources/doc/05-permissions.md
+++ b/Resources/doc/05-permissions.md
@@ -11,7 +11,7 @@ FOSMessageBundle about it:
 # app/config/config.yml
 
 fos_message:
-    authorizer: acme_message.authorizer
+    authorizer: app.authorizer
 ```
 
 Any such service must implement `FOS\MessageBundle\Security\AuthorizerInterface`.
diff --git a/Resources/doc/06-events.md b/Resources/doc/06-events.md
index 3034f1ed..d9c7676d 100644
--- a/Resources/doc/06-events.md
+++ b/Resources/doc/06-events.md
@@ -4,7 +4,58 @@ FOSMessageBundle Events
 FOSMessageBundle will dispatch events inside the Symfony2 `EventDispatcher` which allows
 you to write listeners to modify or augment behaviour of the MessageBundle process.
 
-You can see definitions and explanations of each event as defined in
-`Event\FOSMessageEvents`.
+You can see definitions and explanations of each event as defined in `Event\FOSMessageEvents`:
+
+```php
+<?php
+
+namespace FOS\MessageBundle\Event;
+
+/**
+ * Declares all events thrown in the MessageBundle.
+ */
+final class FOSMessageEvents
+{
+    /**
+     * The POST_SEND event occurs after a message has been sent
+     * The event is an instance of FOS\MessageBundle\Event\MessageEvent.
+     *
+     * @var string
+     */
+    const POST_SEND = 'fos_message.post_send';
+
+    /**
+     * The POST_DELETE event occurs after a thread has been marked as deleted
+     * The event is an instance of FOS\MessageBundle\Event\ThreadEvent.
+     *
+     * @var string
+     */
+    const POST_DELETE = 'fos_message.post_delete';
+
+    /**
+     * The POST_UNDELETE event occurs after a thread has been marked as undeleted
+     * The event is an instance of FOS\MessageBundle\Event\ThreadEvent.
+     *
+     * @var string
+     */
+    const POST_UNDELETE = 'fos_message.post_undelete';
+
+    /**
+     * The POST_READ event occurs after a thread has been marked as read
+     * The event is an instance of FOS\MessageBundle\Event\ReadableEvent.
+     *
+     * @var string
+     */
+    const POST_READ = 'fos_message.post_read';
+
+    /**
+     * The POST_UNREAD event occurs after a thread has been unread
+     * The event is an instance of FOS\MessageBundle\Event\ReadableEvent.
+     *
+     * @var string
+     */
+    const POST_UNREAD = 'fos_message.post_unread';
+}
+```
 
 [Return to the documentation index](00-index.md)
diff --git a/Resources/doc/90-multiple-recipients.md b/Resources/doc/90-multiple-recipients.md
index 438655e6..d8bc1fd9 100644
--- a/Resources/doc/90-multiple-recipients.md
+++ b/Resources/doc/90-multiple-recipients.md
@@ -8,13 +8,14 @@ Configure your application
 
 fos_message:
     db_driver: orm
-    thread_class: Acme\MessageBundle\Entity\Thread
-    message_class: Acme\MessageBundle\Entity\Message
+    thread_class: AppBundle\Entity\Thread
+    message_class: AppBundle\Entity\Message
     new_thread_form:
-      type:               fos_message.new_thread_multiple_form.type
+      type:               FOS\MessageBundle\FormType\NewThreadMultipleMessageFormType
       handler:            fos_message.new_thread_multiple_form.handler
       model:              FOS\MessageBundle\FormModel\NewThreadMultipleMessage
       name:               message
 ```
 
-Currently multiple functionality is based on FOSUserBundle but you can define custom form type for multiple recipients and use your own recipients transformer
+Currently multiple functionality is based on FOSUserBundle but you can define custom form type for
+multiple recipients and use your own recipients transformer.
diff --git a/Resources/doc/90-sending-a-message-programatically.md b/Resources/doc/90-sending-a-message-programatically.md
index fa0ca0c3..2c67e84a 100644
--- a/Resources/doc/90-sending-a-message-programatically.md
+++ b/Resources/doc/90-sending-a-message-programatically.md
@@ -18,13 +18,13 @@ This is probably all you will need in many cases.
 To compose a message we retrieve the composer service and compose our message:
 
 ```php
-    $sender = $this->get('security.context')->getToken()->getUser();
-    $threadBuilder = $this->get('fos_message.composer')->newThread();
-    $threadBuilder
-        ->addRecipient($recipient) // Retrieved from your backend, your user manager or ...
-        ->setSender($sender)
-        ->setSubject('Stof commented on your pull request #456789')
-        ->setBody('You have a typo, : mondo instead of mongo. Also for coding standards ...');
+$sender = $this->get('security.context')->getToken()->getUser();
+$threadBuilder = $this->get('fos_message.composer')->newThread();
+$threadBuilder
+    ->addRecipient($recipient) // Retrieved from your backend, your user manager or ...
+    ->setSender($sender)
+    ->setSubject('Stof commented on your pull request #456789')
+    ->setBody('You have a typo, : mondo instead of mongo. Also for coding standards ...');
 ```
 
 Sending a message
@@ -33,8 +33,8 @@ Sending a message
 Now all you have to do to send your message is get the sender and tell it to send
 
 ```php
-    $sender = $this->get('fos_message.sender');
-    $sender->send($threadBuilder->getMessage());
+$sender = $this->get('fos_message.sender');
+$sender->send($threadBuilder->getMessage());
 ```
 
 That's it, your message should now have been sent
diff --git a/Resources/doc/99-config-reference.md b/Resources/doc/99-config-reference.md
index d85a58dd..b7f5a391 100644
--- a/Resources/doc/99-config-reference.md
+++ b/Resources/doc/99-config-reference.md
@@ -8,8 +8,8 @@ All configuration options are listed below::
 
 fos_message:
     db_driver:              orm
-    thread_class:           Acme\MessageBundle\Entity\Thread
-    message_class:          Acme\MessageBundle\Entity\Message
+    thread_class:           AppBundle\Entity\Thread
+    message_class:          AppBundle\Entity\Message
     message_manager:        fos_message.message_manager         # See ModelManager\MessageManagerInterface
     thread_manager:         fos_message.thread_manager          # See ModelManager\ThreadManagerInterface
     sender:                 fos_message.sender                  # See Sender\SenderInterface
diff --git a/Resources/doc/99-using-other-user-bundles.md b/Resources/doc/99-using-other-user-bundles.md
index 206dc925..484d99d5 100644
--- a/Resources/doc/99-using-other-user-bundles.md
+++ b/Resources/doc/99-using-other-user-bundles.md
@@ -13,15 +13,16 @@ You can base your own on this one:
 
 ``` php
 <?php
+// src/AppBundle/Form/DataTransformer/UserToUsernameTransformer.php
 
-namespace Acme\UserBundle\Form\DataTransformer;
+namespace AppBundle\Form\DataTransformer;
 
 use Doctrine\Bundle\DoctrineBundle\Registry;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
-use Acme\UserBundle\Entity\User;
+use AppBundle\Entity\User;
 
 /**
  * Transforms between a User instance and a username string
@@ -38,7 +39,7 @@ class UserToUsernameTransformer implements DataTransformerInterface
      */
     public function __construct(Registry $doctrine)
     {
-        $this->repository = $doctrine->getManager()->getRepository('AcmeUserBundle:User');
+        $this->repository = $doctrine->getManager()->getRepository('AppBundle:User');
     }
 
     /**
@@ -57,7 +58,7 @@ class UserToUsernameTransformer implements DataTransformerInterface
         }
 
         if (! $value instanceof User) {
-            throw new UnexpectedTypeException($value, 'Acme\UserBundle\Entity\User');
+            throw new UnexpectedTypeException($value, 'AppBundle\Entity\User');
         }
 
         return $value->getUsername();
@@ -92,15 +93,15 @@ For the moment, there is no configuration key to do it so we will emulate the
 FOSUserBundle transformer by using its name as an alias of our own service:
 
 ``` xml
-<service id="acme_user.user_to_username_transformer" class="Acme\UserBundle\Form\DataTransformer\UserToUsernameTransformer">
+<!-- app/config/services.xml -->
+
+<service id="app.user_to_username_transformer" class="AppBundle\Form\DataTransformer\UserToUsernameTransformer">
     <argument type="service" id="doctrine" />
 </service>
 
-<service id="fos_user.user_to_username_transformer" alias="acme_user.user_to_username_transformer" />
+<service id="fos_user.user_to_username_transformer" alias="app.user_to_username_transformer" />
 ```
 
-
-
 ### Problems you may encounter
 
 #### User identifier field is not `id`
@@ -113,28 +114,31 @@ You can copy the default ones (in `FOS\MessageBundle\EntityManager` if you use t
 into your bundle, change their queries and register them as services:
 
 ``` xml
-<service id="acme_user.message_manager" class="Acme\UserBundle\EntityManager\MessageManager" public="false">
+<!-- app/config/services.xml -->
+
+<service id="app.message_manager" class="AppBundle\EntityManager\MessageManager" public="false">
     <argument type="service" id="doctrine.orm.entity_manager" />
     <argument>%fos_message.message_class%</argument>
     <argument>%fos_message.message_meta_class%</argument>
 </service>
 
-<service id="acme_user.thread_manager" class="Acme\UserBundle\EntityManager\ThreadManager" public="false">
+<service id="app.thread_manager" class="AppBundle\EntityManager\ThreadManager" public="false">
     <argument type="service" id="doctrine.orm.entity_manager" />
     <argument>%fos_message.thread_class%</argument>
     <argument>%fos_message.thread_meta_class%</argument>
-    <argument type="service" id="acme_user.message_manager" />
+    <argument type="service" id="app.message_manager" />
 </service>
 ```
 
 Once done, tell FOSMessageBundle to use them in the configuration:
 
 ``` yaml
-# Messages
+# app/config/config.yml
+
 fos_message:
 	# ...
-    thread_manager: acme_user.thread_manager
-    message_manager: acme_user.message_manager
+    thread_manager: app.thread_manager
+    message_manager: app.message_manager
 ```
 
 #### The default form does not work with my User entity
@@ -146,11 +150,11 @@ You have to redefine two things :
 You can copy and paste the bundle versions into your application and define them as services:
 
 ``` xml
-<service id="acme_user.new_thread_form_type" class="Acme\UserBundle\Form\NewThreadMessageFormType" public="false">
-    <argument type="service" id="acme_user.user_to_username_transformer" />
+<service id="app.new_thread_form_type" class="AppBundle\Form\NewThreadMessageFormType" public="false">
+    <argument type="service" id="app.user_to_username_transformer" />
 </service>
 
-<service id="acme_user.new_thread_form_factory" class="Acme\UserBundle\Form\NewThreadMessageFormFactory" public="false">
+<service id="app.new_thread_form_factory" class="AppBundle\Form\NewThreadMessageFormFactory" public="false">
     <argument type="service" id="form.factory" />
     <argument type="service" id="fos_message.new_thread_form.type" />
     <argument>%fos_message.new_thread_form.name%</argument>
@@ -163,11 +167,13 @@ You can copy and paste the bundle versions into your application and define them
 And configure the bundle to use your services:
 
 ``` yaml
+# app/config/config.yml
+
 fos_message:
     # ...
     new_thread_form:
-        type: md.new_thread_form_type
-        factory: md.new_thread_form_factory
+        type: app.new_thread_form_type
+        factory: app.new_thread_form_factory
 ```
 
 #### Another problem?