diff --git a/addons/website_forum_doc/__openerp__.py b/addons/website_forum_doc/__openerp__.py
index e40c7d67009..e933e2c51da 100644
--- a/addons/website_forum_doc/__openerp__.py
+++ b/addons/website_forum_doc/__openerp__.py
@@ -34,7 +34,6 @@ Documentation based on question and pertinent answers of Forum
     'data': [
         'data/doc_data.xml',
         'security/ir.model.access.csv',
-        'security/doc_security.xml',
         'views/doc.xml',
         'views/website_doc.xml',
     ],
diff --git a/addons/website_forum_doc/data/doc_data.xml b/addons/website_forum_doc/data/doc_data.xml
index 66c8c7067de..8e047ccee43 100644
--- a/addons/website_forum_doc/data/doc_data.xml
+++ b/addons/website_forum_doc/data/doc_data.xml
@@ -22,22 +22,22 @@
 
         <!-- Stages -->
 
-        <record id="stage_draft" model="forum.post">
+        <record id="stage_draft" model="forum.documentation.stage">
             <field name="name">Ideas</field>
             <field name="sequence">1</field>
         </record>
 
-        <record id="stage_draft" model="forum.post">
+        <record id="stage_draft" model="forum.documentation.stage">
             <field name="name">Draft</field>
             <field name="sequence">2</field>
         </record>
 
-        <record id="stage_draft" model="forum.post">
+        <record id="stage_draft" model="forum.documentation.stage">
             <field name="name">Review</field>
             <field name="sequence">3</field>
         </record>
 
-        <record id="stage_draft" model="forum.post">
+        <record id="stage_draft" model="forum.documentation.stage">
             <field name="name">Publish</field>
             <field name="sequence">4</field>
         </record>
diff --git a/addons/website_forum_doc/data/doc_demo.xml b/addons/website_forum_doc/data/doc_demo.xml
index fe245e1aa33..acccca2f522 100644
--- a/addons/website_forum_doc/data/doc_demo.xml
+++ b/addons/website_forum_doc/data/doc_demo.xml
@@ -3,54 +3,54 @@
     <data>
 
         <!-- Table Of Content -->
-        <record id="toc_functional_doc" model="documentation.toc">
+        <record id="toc_functional_doc" model="forum.documentation.toc">
             <field name="name">Functional Documentation</field>
         </record>
-        <record id="toc_sale" model="documentation.toc">
+        <record id="toc_sale" model="forum.documentation.toc">
             <field name="name">Sales Management</field>
             <field name="parent_id" ref="toc_functional_doc"/>
         </record>
-        <record id="toc_sale_customer" model="documentation.toc">
+        <record id="toc_sale_customer" model="forum.documentation.toc">
             <field name="name">Customers</field>
             <field name="parent_id" ref="toc_sale"/>
         </record>
-        <record id="toc_sale_so" model="documentation.toc">
+        <record id="toc_sale_so" model="forum.documentation.toc">
             <field name="name">Sales orders</field>
             <field name="parent_id" ref="toc_sale"/>
         </record>
-        <record id="toc_0" model="documentation.toc">
+        <record id="toc_0" model="forum.documentation.toc">
             <field name="name">Sales &amp; Warehouse</field>
             <field name="parent_id" ref="toc_sale"/>
         </record>
-        <record id="toc_crm" model="documentation.toc">
+        <record id="toc_crm" model="forum.documentation.toc">
             <field name="name">Customer Relationship Management</field>
             <field name="parent_id" ref="toc_functional_doc"/>
         </record>
-        <record id="toc_crm_lead" model="documentation.toc">
+        <record id="toc_crm_lead" model="forum.documentation.toc">
             <field name="name">Lead &amp; Opportunity</field>
             <field name="parent_id" ref="toc_crm"/>
         </record>
-        <record id="toc_crm_claim" model="documentation.toc">
+        <record id="toc_crm_claim" model="forum.documentation.toc">
             <field name="name">Claims</field>
             <field name="parent_id" ref="toc_crm"/>
         </record>
-        <record id="toc_crm_after_sale" model="documentation.toc">
+        <record id="toc_crm_after_sale" model="forum.documentation.toc">
             <field name="name">After-sale communication</field>
             <field name="parent_id" ref="toc_crm"/>
         </record>
-        <record id="toc_website" model="documentation.toc">
+        <record id="toc_website" model="forum.documentation.toc">
             <field name="name">Website</field>
             <field name="parent_id" ref="toc_functional_doc"/>
         </record>
-        <record id="toc_cms_ecommerce" model="documentation.toc">
+        <record id="toc_cms_ecommerce" model="forum.documentation.toc">
             <field name="name">CMS &amp; eCommerce</field>
             <field name="parent_id" ref="toc_website"/>
         </record>
-        <record id="toc_hrm" model="documentation.toc">
+        <record id="toc_hrm" model="forum.documentation.toc">
             <field name="name">Human Resources Management</field>
             <field name="parent_id" ref="toc_functional_doc"/>
         </record>
-        <record id="toc_hrm_contract" model="documentation.toc">
+        <record id="toc_hrm_contract" model="forum.documentation.toc">
             <field name="name">Employee Contract</field>
             <field name="parent_id" ref="toc_hrm"/>
         </record>