diff --git a/README.md b/README.md
index d221cc9b22142c9f4a3a08359a77180ae2ecdeec..90c3c86deeb375a7cc01b70038657c230932cce5 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Odoo is a suite of web based open source business apps.
 
 The main Odoo Apps include an <a href="https://www.odoo.com/page/crm">Open Source CRM</a>,
 <a href="https://www.odoo.com/page/website-builder">Website Builder</a>,
-<a href="https://www.odoo.com/page/e-commerce">e-Commerce</a>,
+<a href="https://www.odoo.com/page/e-commerce">eCommerce</a>,
 <a href="https://www.odoo.com/page/warehouse">Warehouse Management</a>,
 <a href="https://www.odoo.com/page/project-management">Project Management</a>,
 <a href="https://www.odoo.com/page/accounting">Billing &amp; Accounting</a>,
diff --git a/addons/payment/data/payment_acquirer_data.xml b/addons/payment/data/payment_acquirer_data.xml
index 84a40489b307f8c76a28bfadf4f54d80ef1dc8f4..1a46fe631b0734a26e5db5cf37ad4fc460c40a7b 100644
--- a/addons/payment/data/payment_acquirer_data.xml
+++ b/addons/payment/data/payment_acquirer_data.xml
@@ -28,7 +28,7 @@
                 A payment gateway to accept online payments via credit cards.
             </p>
             <ul>
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
             </ul>
         </field>
     </record>
@@ -43,7 +43,7 @@
                 Ingenico Payment Services (formerly Ogone) supports credit cards, debit cards and bank transfers.
             </p>
             <ul class="list-inline">
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
                 <li><i class="fa fa-check"/>Cards storage</li>
                 <li><i class="fa fa-check"/>Pay button in emails</li>
             </ul>
@@ -60,7 +60,7 @@
                 A payment gateway to accept online payments via credit cards, debit cards and bank transfers.
             </p>
             <ul>
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
             </ul>
         </field>
     </record>
@@ -75,7 +75,7 @@
                 A payment gateway to accept online payments via credit cards and e-checks.
             </p>
             <ul class="list-inline">
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
                 <li><i class="fa fa-check"/>Cards storage</li>
                 <li><i class="fa fa-check"/>Authorize &amp; Capture</li>
             </ul>
@@ -93,7 +93,7 @@
                 Provide instructions to customers so that they can pay their orders manually.
             </p>
             <ul>
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
             </ul>
         </field>
     </record>
@@ -108,7 +108,7 @@
                 A payment gateway from Atos Worldline to accept online payments via credit cards.
             </p>
             <ul>
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
             </ul>
         </field>
     </record>
@@ -123,7 +123,7 @@
                 PayPal is the easiest way to accept payments via Paypal or credit cards.
             </p>
             <ul class="list-inline">
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
                 <li><i class="fa fa-check"/>Pay button in emails</li>
             </ul>
         </field>
@@ -139,7 +139,7 @@
                 A payment gateway to accept online payments via credit cards.
             </p>
             <ul>
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
             </ul>
         </field>
 
@@ -156,7 +156,7 @@
                 A generic acquirer payment acquirer.
             </p>
             <ul>
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
             </ul>
         </field>
     </record>
@@ -171,7 +171,7 @@
                 PayU India is an online payments solutions company serving the Indian market.
             </p>
             <ul class="list-inline">
-                <li><i class="fa fa-check"/>e-Commerce</li>
+                <li><i class="fa fa-check"/>eCommerce</li>
                 <li><i class="fa fa-check"/>Subscription</li>
                 <li><i class="fa fa-check"/>Pay button in emails</li>
             </ul>
diff --git a/addons/website/README.md b/addons/website/README.md
index 8b00e6d4b08aa3479d51e40985e5c6c65351169a..2f31310c83746ab81ca2185ac13d7facc1d9c735 100644
--- a/addons/website/README.md
+++ b/addons/website/README.md
@@ -36,7 +36,7 @@ Enterprise-Ready, out-of-the-box
 Activate ready-to-use enterprise features in just a click; e-commerce,
 call-to-actions, jobs announces, events, customer references, blogs, etc.
 
-Traditional e-Commerce and CMS have poorly designed backends as it's not their
+Traditional eCommerce and CMS have poorly designed backends as it's not their
 core focus. With the Odoo integration, you benefit from the best management
 software to follow-up on your orders, your jobs applicants, your leads, etc.
 
diff --git a/addons/website/static/description/index.html b/addons/website/static/description/index.html
index 413e4ec6bb8f259a00632a06a5272944d15d1864..658c0e95215ed9fda2bba47fc45adcea5d6132cb 100644
--- a/addons/website/static/description/index.html
+++ b/addons/website/static/description/index.html
@@ -121,7 +121,7 @@
         <div class="oe_span4">
           <h4><b>Sell Online</b></h4>
           <ul class="list-unstyled">
-            <li>- e-Commerce</li>
+            <li>- eCommerce</li>
             <li>- Event Tickets</li>
           </ul>
           <h4 class="oe_mt32"><b>Full Marketing Stack</b></h4>
diff --git a/addons/website_crm/static/description/index.html b/addons/website_crm/static/description/index.html
index d5d915bdb4e0d9bc12610c42abebe05460a2a5e3..d580e4c9cdef7890f67a83dff1affaa394470c16 100644
--- a/addons/website_crm/static/description/index.html
+++ b/addons/website_crm/static/description/index.html
@@ -47,7 +47,7 @@
         <h3 class="oe_slogan">Get hundreds of open source apps for free</h3>
         <div class="oe_span4">
             <a href="/apps/website_sale">
-                <h3>e-Commerce</h3>
+                <h3>eCommerce</h3>
                 <div class="oe_row_img oe_centered">
                     <img class="oe_picture oe_screenshot" src="website_sale.png">
                 </div>
diff --git a/addons/website_event/README.md b/addons/website_event/README.md
index 6c2275c9651a04e1be7b84e1966bca45da109b7a..862c44a685ca163c16fb5b3593955a760fddf7c3 100644
--- a/addons/website_event/README.md
+++ b/addons/website_event/README.md
@@ -100,7 +100,7 @@ Fully Integrated With Others Apps
 ### Get hundreds of open source apps for free
 
 
-### e-Commerce
+### eCommerce
 
 Promote products, sell online, optimize visitors' shopping experiences.
 
diff --git a/addons/website_event/static/description/index.html b/addons/website_event/static/description/index.html
index 58be24a0ced35ba96a7de77709e23762c7cc0c5e..6b3085d49e2678b6a4a1c7ef16150cdda046d072 100644
--- a/addons/website_event/static/description/index.html
+++ b/addons/website_event/static/description/index.html
@@ -71,7 +71,7 @@
             <h2 class="oe_slogan oe_mt32" style="text-align: left; color:#A24689;">Get sponsors to come to you</h2>
             <h3 class="oe_slogan" style="text-align: left;">Sell sponsorship, promote your sponsors</h3>
             <p class="oe_mt32 text-justify">
-            Easily manage existing and new sponsors with Odoo Events. Add sponsors to your events and publish sponsors per level (e.g., gold) on the bottom of every page of the event. Sell sponsorship packages online through Odoo e-Commerce.</p>
+            Easily manage existing and new sponsors with Odoo Events. Add sponsors to your events and publish sponsors per level (e.g., gold) on the bottom of every page of the event. Sell sponsorship packages online through Odoo eCommerce.</p>
         </div>
         <div class="oe_span6">
             <img class="oe_picture oe_screenshot" src="website_seo.png" style="margin-left: -1px;">
diff --git a/addons/website_event_track/README.md b/addons/website_event_track/README.md
index 9f6f5948d5b5da26a2d27a3a59b512ecfeab5769..c78babcb64c6db0e8625d3d042d161d942c3dbb7 100644
--- a/addons/website_event_track/README.md
+++ b/addons/website_event_track/README.md
@@ -28,7 +28,7 @@ Manage Sponsors
 
 Add sponsors to your events and publish sponsors per level (e.g. bronze, silver, gold) on the bottom of every page of the event.
 
-Sell sponsorship packages online through the Odoo e-Commerce for a full sales cycle integration.
+Sell sponsorship packages online through the Odoo eCommerce for a full sales cycle integration.
 
 Communicate Efficiently
 -----------------------
diff --git a/addons/website_event_track/data/website_event_track_demo.xml b/addons/website_event_track/data/website_event_track_demo.xml
index 7cb043049d308cfe3da253e6a565987281fe3de8..992bf209f2574ce4755c75f5485650464e3d7f87 100644
--- a/addons/website_event_track/data/website_event_track_demo.xml
+++ b/addons/website_event_track/data/website_event_track_demo.xml
@@ -82,7 +82,7 @@
         <field name="state">announced</field>
     </record>
     <record id="event_track7" model="event.track">
-        <field name="name">A technical explanation of Odoo as a CMS and a e-Commerce platform for version 8.</field>
+        <field name="name">A technical explanation of Odoo as a CMS and a eCommerce platform for version 8.</field>
         <field name="website_published" eval="True"/>
         <field name="event_id" ref="event.event_0"/>
         <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 8:30:00')"></field>
diff --git a/addons/website_event_track/static/description/index.html b/addons/website_event_track/static/description/index.html
index d2d5c4c0306501ee700560f794a7cd4dcf29df3c..52dde14fc6defce7f38c415673df79576871bced 100644
--- a/addons/website_event_track/static/description/index.html
+++ b/addons/website_event_track/static/description/index.html
@@ -68,7 +68,7 @@
             Add sponsors to your events and publish sponsors per level (e.g.
             bronze, silver, gold) on the bottom of every page of the event.
           </p><p>
-            Sell sponsorship packages online through the Odoo e-Commerce for
+            Sell sponsorship packages online through the Odoo eCommerce for
             a full sales cycle integration.
           </p>
         </div>
diff --git a/addons/website_forum/data/forum_demo.xml b/addons/website_forum/data/forum_demo.xml
index de0aba2b445fc790d208491245a2e88c522f32e2..4ec354c5766f5bea9705fb7b0b3eab9522dae10a 100644
--- a/addons/website_forum/data/forum_demo.xml
+++ b/addons/website_forum/data/forum_demo.xml
@@ -34,12 +34,12 @@
             <field name="tag_ids" eval="[(4,ref('website_forum.tags_0')), (4,ref('website_forum.tags_1'))]"/>
         </record>
         <record id="question_1" model="forum.post">
-            <field name="name">CMS replacement for ERP and e-Commerce</field>
+            <field name="name">CMS replacement for ERP and eCommerce</field>
             <field name="views">8</field>
             <field name="forum_id" ref="website_forum.forum_help"/>
-            <field name="content"><![CDATA[<p>I use Wordpress as a CMS and e-Commerce platform. The developing in Wordpress is quite easy and solid but it missing ERP feature (there is single plugin to integrate with Frontaccounting) so I wonder:
+            <field name="content"><![CDATA[<p>I use Wordpress as a CMS and eCommerce platform. The developing in Wordpress is quite easy and solid but it missing ERP feature (there is single plugin to integrate with Frontaccounting) so I wonder:
 
-Can I use Odoo as a replacement CMS of Wordpress + e-Commerce plugin?
+Can I use Odoo as a replacement CMS of Wordpress + eCommerce plugin?
 
 In simple words does Odoo became CMS+ERP platform?</p>]]></field>
             <field name="post_type">question</field>
diff --git a/addons/website_forum_doc/data/doc_demo.xml b/addons/website_forum_doc/data/doc_demo.xml
index e83426b0c12181c7fc9511a0eb774d9591e38f41..a1a21191274c6ea8e1df94cb5213289b08110092 100644
--- a/addons/website_forum_doc/data/doc_demo.xml
+++ b/addons/website_forum_doc/data/doc_demo.xml
@@ -64,7 +64,7 @@
             <field name="forum_id" ref="website_forum.forum_help"/>
         </record>
         <record id="toc_cms_ecommerce" model="forum.documentation.toc">
-            <field name="name">CMS &amp; e-Commerce</field>
+            <field name="name">CMS &amp; eCommerce</field>
             <field name="parent_id" ref="toc_website"/>
             <field name="forum_id" ref="website_forum.forum_help"/>
         </record>
diff --git a/addons/website_mail/data/mail_channel_data.xml b/addons/website_mail/data/mail_channel_data.xml
index c1d4f83830f8f050e93e8c3f31e10df304d63a27..f73182a2830dab7a27d3720916e5e2f3258a44ba 100644
--- a/addons/website_mail/data/mail_channel_data.xml
+++ b/addons/website_mail/data/mail_channel_data.xml
@@ -44,7 +44,7 @@
                             <ul style="margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;">
                                 <li dir="ltr">
                                     <p dir="ltr" style="margin-top:0pt;margin-bottom:0pt;">
-                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, e-Commerce, jobs, ...)</span>
+                                        <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>
                                     </p>
                                 </li>
                                 <li dir="ltr">
diff --git a/addons/website_sale/README.md b/addons/website_sale/README.md
index 69d340999130df9e8954a99613cd086f988b140f..5ce2d491fea3b63563a6dd16d95b403bf3467e89 100644
--- a/addons/website_sale/README.md
+++ b/addons/website_sale/README.md
@@ -3,7 +3,7 @@ Odoo e-Commerce
 
 ### Optimize sales with an awesome online store.
 
-Odoo is an <a href="https://www.odoo.com/page/e-commerce">Open Source e-Commerce</a>
+Odoo is an <a href="https://www.odoo.com/page/e-commerce">Open Source eCommerce</a>
 unlike anything you have ever seen before. Get an awesome catalog of products
 and great product description pages.
 
diff --git a/addons/website_sale/__manifest__.py b/addons/website_sale/__manifest__.py
index 2b1899085d0498e935dafd4faf546c36f7fa6854..367d64ec1d4a05300dabd1bc23110163dcf4c2a3 100644
--- a/addons/website_sale/__manifest__.py
+++ b/addons/website_sale/__manifest__.py
@@ -1,5 +1,5 @@
 {
-    'name': 'e-Commerce',
+    'name': 'eCommerce',
     'category': 'Website',
     'sequence': 55,
     'summary': 'Sell Your Products Online',
diff --git a/addons/website_sale/data/web_planner_data.xml b/addons/website_sale/data/web_planner_data.xml
index e7b00f95eb3b9f1d20cc79f9c88e436fa0ea0c3c..ebe643d95d51f7e650434f130922a491710af1c3 100644
--- a/addons/website_sale/data/web_planner_data.xml
+++ b/addons/website_sale/data/web_planner_data.xml
@@ -281,7 +281,7 @@
             <t t-call="web_planner.page">
                 <t t-set="page_title">Sell More</t>
                 <p class="text-muted">
-                    If you have an e-Commerce, one of your objectives is of course to grow your revenues by
+                    If you have an eCommerce, one of your objectives is of course to grow your revenues by
                     selling more and pricier products. Luckily for you, Odoo integrates three powerful
                     customizations for that.
                 </p>
diff --git a/addons/website_sale/security/website_sale.xml b/addons/website_sale/security/website_sale.xml
index 353d60296478f767b19bb3e7c29582ff67138b48..4a129d60ece11e63b289ebd16c6b4edb7da0e688 100644
--- a/addons/website_sale/security/website_sale.xml
+++ b/addons/website_sale/security/website_sale.xml
@@ -37,7 +37,7 @@
     </record>
 
     <record id="website_sale.group_website_multi_image" model="res.groups">
-        <field name="name">Show multi image on e-Commerce</field>
+        <field name="name">Show multi image on eCommerce</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
diff --git a/addons/website_sale/views/backend.xml b/addons/website_sale/views/backend.xml
index 690175e0c7d968b5cc7f7edee6b98b53712a740e..dfb287990c32d0e5342485abf93fc7f03406ea1d 100644
--- a/addons/website_sale/views/backend.xml
+++ b/addons/website_sale/views/backend.xml
@@ -33,7 +33,7 @@
     </record>
 
     <record id="action_orders_ecommerce" model="ir.actions.act_window">
-        <field name="name">e-Commerce Orders</field>
+        <field name="name">eCommerce Orders</field>
         <field name="res_model">sale.order</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('state', 'in', ('sale', 'done'))]</field>
@@ -43,7 +43,7 @@
     </record>
 
     <record id="action_unpaid_orders_ecommerce" model="ir.actions.act_window">
-        <field name="name">Unpaid e-Commerce Orders</field>
+        <field name="name">Unpaid eCommerce Orders</field>
         <field name="res_model">sale.order</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('state', '=', 'sent')]</field>
@@ -53,7 +53,7 @@
     </record>
 
     <record id="action_abandonned_orders_ecommerce" model="ir.actions.act_window">
-        <field name="name">Abandonned e-Commerce Orders</field>
+        <field name="name">Abandonned eCommerce Orders</field>
         <field name="res_model">sale.order</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('state', '=', 'cancel')]</field>
@@ -87,7 +87,7 @@
     <menuitem id="menu_catalog_categories" parent="menu_catalog" action="product_public_category_action" sequence="2"/>
 
     <!-- Configuration sub-menus -->
-    <menuitem id="menu_ecommerce_settings" parent="website.menu_website_global_configuration" name="e-Commerce"/>
+    <menuitem id="menu_ecommerce_settings" parent="website.menu_website_global_configuration" name="eCommerce"/>
     <menuitem id="menu_ecommerce_payment_acquirers" parent="menu_ecommerce_settings" name="Payment Acquirers" action="payment.action_payment_acquirer"/>
     <menuitem id="menu_catalog_pricelists" name="Pricelists" parent="menu_ecommerce_settings" action="product.product_pricelist_action2" groups="product.group_pricelist_item" sequence="3"/>
 
diff --git a/addons/website_sale/views/res_config_view.xml b/addons/website_sale/views/res_config_view.xml
index 5592c3216447765e1b632888936fbf862b20d542..c8775cec59897b056052427b3b1bde6210634793 100644
--- a/addons/website_sale/views/res_config_view.xml
+++ b/addons/website_sale/views/res_config_view.xml
@@ -6,7 +6,7 @@
         <field name="inherit_id" ref="website.view_website_config_settings"/>
         <field name="arch" type="xml">
             <group name="social" position="before">
-                <group name="delivery" string="e-Commerce">
+                <group name="delivery" string="eCommerce">
                     <field name="group_website_multiimage" widget="radio"/>
                     <field name="module_website_sale_options" widget="radio"/>
                     <field name="group_sale_pricelist" class="oe_inline" invisible="1"/>
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 50b3ba2a328e5c2f7f16707cf5bff6d7456daee6..19deb3f20e153d5a5ab45e2e96ed2f9325fed9b1 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1326,7 +1326,7 @@
                                   <li>
                                     <label t-if="acquirer.button">
                                         <input t-att-value="acquirer.id" type="radio" name="acquirer" t-att-checked="acquirers[0] == acquirer" />
-                                        <span t-field="acquirer.image_small" t-options='{"widget": "image", "alt-field": "name", "style":"display: inline-block;"}'/>
+                                        <span t-field="acquirer.image_small" t-att-title="acquirer.name" t-field-options='{"widget": "image", "style":"max-width: 60px; display: inline-block"}'/>
                                         <span t-field="acquirer.name" />
                                         <span t-if="acquirer.fees_active">(processing fees apply)</span>
                                     </label>
@@ -1701,7 +1701,7 @@
             <div class="container mt16 mb8">
                 <div class="pull-right" t-ignore="true" t-if="not editable">
                                                       Powered by <a class="label label-danger" href="http://www.odoo.com/page/website-builder">Odoo</a>,
-                                                      the #1 <a href="http://www.odoo.com/page/e-commerce">Open Source e-Commerce</a>.
+                                                      the #1 <a href="http://www.odoo.com/page/e-commerce">Open Source eCommerce</a>.
                                                     </div>
                 <div class="pull-left text-muted">
                                                       Copyright &amp;copy; <span t-field="res_company.name">Company name</span></div>
diff --git a/addons/website_sale_delivery/__manifest__.py b/addons/website_sale_delivery/__manifest__.py
index 29b4cc2853badc1740444b72e280832ac7a5a357..6b54c891f3ca99f256defa5cfd74ad5ed6c39b3a 100644
--- a/addons/website_sale_delivery/__manifest__.py
+++ b/addons/website_sale_delivery/__manifest__.py
@@ -1,5 +1,5 @@
 {
-    'name': 'e-Commerce Delivery',
+    'name': 'eCommerce Delivery',
     'category': 'Website',
     'summary': 'Add Delivery Costs to Online Sales',
     'website': 'https://www.odoo.com/page/e-commerce',
diff --git a/addons/website_sale_delivery/views/website_sale_delivery_views.xml b/addons/website_sale_delivery/views/website_sale_delivery_views.xml
index 271fbf39eeec3500e8641a1a6615663725bc66a9..73ec58e7a817363bbbff3805ae4a67655f3c10fd 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery_views.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery_views.xml
@@ -13,7 +13,7 @@
             </div>
             <div name="title" position="after">
                 <group name="website">
-                    <field name="website_description" string="Description" placeholder="Description displayed on the e-Commerce and on online quotations."/>
+                    <field name="website_description" string="Description" placeholder="Description displayed on the eCommerce and on online quotations."/>
                 </group>
             </div>
         </field>
diff --git a/addons/website_sale_options/__manifest__.py b/addons/website_sale_options/__manifest__.py
index 1f737a96909606a288fbee3367562904dd365677..323cd78860f6897f139b278dfcf9ec2ff63e17a2 100644
--- a/addons/website_sale_options/__manifest__.py
+++ b/addons/website_sale_options/__manifest__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
-    'name': 'e-Commerce Optional Products',
+    'name': 'eCommerce Optional Products',
     'category': 'Website',
     'version': '1.0',
     'website': 'https://www.odoo.com/page/e-commerce',
diff --git a/addons/website_slides/data/website_slides_demo.xml b/addons/website_slides/data/website_slides_demo.xml
index b106c2dc1615a92ab58c96b99efff41090fd6104..7bea15166eb93a004f6f6fb5202cd1b534701387 100644
--- a/addons/website_slides/data/website_slides_demo.xml
+++ b/addons/website_slides/data/website_slides_demo.xml
@@ -117,14 +117,14 @@
 3. from $2M to $10M Investment Areas To Turn Odoo Mainstream 5 or how to spend $10M as fast as possible and burn a lot of energy...
 4. Release A Product That Deprecates Every Competitor 1 This is something we excel at...
 5. A product growth no one can follow
-6. Version 9: roadmap o 40% Usability: – Improving all existing apps, the right feature at the right place – User onboarding, ease of use o 20% Accounting: – 8 countries in the core o 20% CMS / e-Commerce o 10% New design: – Merge front/backend, mobile, modern design o 10% Framework: o New API
+6. Version 9: roadmap o 40% Usability: – Improving all existing apps, the right feature at the right place – User onboarding, ease of use o 20% Accounting: – 8 countries in the core o 20% CMS / eCommerce o 10% New design: – Merge front/backend, mobile, modern design o 10% Framework: o New API
 7. 1 Release cycle February 2012: v6.1 (13 months) 2 January 2013: v7 (11 months) 3 June 2014: v8 (18 months) 4 June 2015: v9 (12 months) 5 Every new version is a revolution. Version 9 will be even more impressive! January 2011: v6.0
 8. Attract The Mass Of Users 2 It's all about getting users, a lot of users. Not only customers.
-9. An attractive pricing... o The cloud, free for 2 users: – Why the cloud? Smooth user experience. High satisfaction rates as everything works out-of-the-box – Unlimited applications: CRM, CMS, e-Commerce, Accounting, etc. o Millions of CMS/e-Commerce for free: – Already 50k pages on CMS/e-Commerce websites built with Odoo CMS Beta – You can do a lot with 2 users: we don't need to get revenues from CMS/e-Commerce-only instances as we have so many applications to upsell
+9. An attractive pricing... o The cloud, free for 2 users: – Why the cloud? Smooth user experience. High satisfaction rates as everything works out-of-the-box – Unlimited applications: CRM, CMS, eCommerce, Accounting, etc. o Millions of CMS/eCommerce for free: – Already 50k pages on CMS/eCommerce websites built with Odoo CMS Beta – You can do a lot with 2 users: we don't need to get revenues from CMS/eCommerce-only instances as we have so many applications to upsell
 10. Affordable implementations o Lower entry barrier - no huge starting costs for SMEs: – No complex implementation projects – A fixed-price packaged offer o New service offer, 100€ / month per application for: – Implementation assistance and configuration – Unlimited customization of screens, reports, workflows – Monthly upgrades – Training material – Unlimited support tickets, 24/24 response time!
-11. Disrupt A Market Having A Huge Traction 3 Creating the frontend of all apps will not only increase the quality of all apps but also disrupt the CMS/e-Commerce market.
-12. " " The CMS/e-Commerce market looks like the ERP market 6 years ago, before Odoo entered into it. Full of complex products that did not evolve over the past 3 years.
-13. Traditional ERPs o The monetization (and main focus) remains on business apps: – Accounting – Warehouse Management – Project Management – Point of sale – Marketing – HR, ... o But CMS/e-Commerce will bring a huge volume of prospects to our other business apps
+11. Disrupt A Market Having A Huge Traction 3 Creating the frontend of all apps will not only increase the quality of all apps but also disrupt the CMS/eCommerce market.
+12. " " The CMS/eCommerce market looks like the ERP market 6 years ago, before Odoo entered into it. Full of complex products that did not evolve over the past 3 years.
+13. Traditional ERPs o The monetization (and main focus) remains on business apps: – Accounting – Warehouse Management – Project Management – Point of sale – Marketing – HR, ... o But CMS/eCommerce will bring a huge volume of prospects to our other business apps
 14. Make Partners Rich By Making Customers Super-Happy 4 You will like our product and services so much that you will always want to purchase more.
 15. Traditional ERPs o Buy an ERP – Invest on 7 years o Maintain as long as you can – Implementations are so painful that you have no other choice – Upgrades are too expensive o After 7 years : it breaks – You change the product and call other vendors
 16. Traditional ERPs o Modern companies deserve to: – Evolve continuously – Benefit from top features every year – Be free of any legacy constraints – Have the flexibility to customize easily o Odoo Enterprise – our main value proposition: – Providing so much value to customers through continuous upgrades that they will want to purchase even more
diff --git a/doc/_extensions/odoo/layout.html b/doc/_extensions/odoo/layout.html
index 027b663cb57d7cdea2cfdddc4f1346bea4260810..000019b32cfc650cc36b4ad5a652b6afc0fa9829 100644
--- a/doc/_extensions/odoo/layout.html
+++ b/doc/_extensions/odoo/layout.html
@@ -68,7 +68,7 @@
                   </div>
                   <ul>
                     <li><a href="https://www.odoo.com/page/website-builder">Website Builder</a></li>
-                    <li><a href="https://www.odoo.com/page/e-commerce">e-Commerce</a></li>
+                    <li><a href="https://www.odoo.com/page/e-commerce">eCommerce</a></li>
                     <li><a href="https://www.odoo.com/page/blog-engine">Blogs</a></li>
                     <li><a href="https://www.odoo.com/page/community-builder">Forums</a></li>
                     <li><a href="https://www.odoo.com/page/slides">Slides</a></li>
@@ -320,7 +320,7 @@
         <div class="col-sm-5 col-md-4 col-md-offset-1 col-lg-5 col-lg-offset-1">
           <p>
             <small>
-              Odoo is a suite of open source business apps that cover all your company needs: CRM, e-Commerce, accounting, inventory, point of sale, project management, etc.
+              Odoo is a suite of open source business apps that cover all your company needs: CRM, eCommerce, accounting, inventory, point of sale, project management, etc.
               <br/><br/>
               Odoo's unique value proposition is to be at the same time very easy to use and fully integrated.
             </small>
diff --git a/doc/howtos/themes.rst b/doc/howtos/themes.rst
index a3a3b18212fe8c4433a56b5d49549dd90d97dc25..3432be40900eca94a0cb667a12a6ae2a3d2a452b 100644
--- a/doc/howtos/themes.rst
+++ b/doc/howtos/themes.rst
@@ -73,7 +73,7 @@ Odoo default theme structure
 
    **Main features:**
 
-   * Basic layouts for pages, blog and e-Commerce
+   * Basic layouts for pages, blog and eCommerce
    * Website Builder integration
    * Basic Snippets
    * Automatic Less/Sass compiling
@@ -258,7 +258,7 @@ The ``data`` property will contain the xml files list. Right now it’s empty, b
 ``category`` defines your module category (always “Theme”) and, after a slash, the subcategory. You can use one subcategory from the Odoo Apps categories list. (https://www.odoo.com/apps/themes)
 
 
-``depends`` specifies the modules needed by our theme to work properly. For our tutorial theme, we only need website. If you need blogging or e-Commerce features as well, you have to add those modules too.
+``depends`` specifies the modules needed by our theme to work properly. For our tutorial theme, we only need website. If you need blogging or eCommerce features as well, you have to add those modules too.
 
 .. code-block:: python