diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php
index 6eb66fdb3..78ebb94d6 100755
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -288,8 +288,8 @@ class Order extends BaseAction implements EventSubscriberInterface
      */
     public function sendOrderEmail(OrderEvent $event)
     {
-        $contact_email = ConfigQuery::read('contact_email');
-        if($contact_email) {
+        $store_email = ConfigQuery::read('store_email');
+        if($store_email) {
             $order = $event->getOrder();
             $customer = $order->getCustomer();
 
@@ -311,7 +311,7 @@ class Order extends BaseAction implements EventSubscriberInterface
 
             $instance = \Swift_Message::newInstance($subject)
                 ->addTo($customer->getEmail(), $customer->getFirstname()." ".$customer->getLastname())
-                ->addFrom(ConfigQuery::read('contact_email'), ConfigQuery::read('company_name'))
+                ->addFrom($store_email, ConfigQuery::read('store_name'))
             ;
             $instance
                 ->setBody($htmlMessage, 'text/html')
diff --git a/install/insert.sql b/install/insert.sql
index 83218aa68..77e19ad40 100755
--- a/install/insert.sql
+++ b/install/insert.sql
@@ -30,8 +30,8 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('thelia_customer_remember_me_cookie_name', 'tcrmcn', 0, 0, NOW(), NOW()),
 ('thelia_customer_remember_me_cookie_expiration', 31536000, 0, 0, NOW(), NOW()),
 ('session_config.handlers', 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler', 0, 0, NOW(), NOW()),
-('company_name','', 0, 0, NOW(), NOW()),
-('contact_email','', 0, 0, NOW(), NOW()),
+('store_name','', 0, 1, NOW(), NOW()),
+('store_email','', 0, 1, NOW(), NOW()),
 ('url_site','', 0, 0, NOW(), NOW()),
 ('one_domain_foreach_lang','0', 1, 1, NOW(), NOW()),
 ('pdf_invoice_file', 'invoice', 0, 0, NOW(), NOW()),
@@ -1294,6 +1294,6 @@ INSERT INTO `message` (`id`, `name`, `secured`, `created_at`, `updated_at`, `ver
 (1, 'order_confirmation', NULL, NOW(), NOW(), 2, NOW(), NULL);
 
 INSERT INTO `message_i18n` (`id`, `locale`, `title`, `subject`, `text_message`, `html_message`) VALUES
-(1, 'en_US', 'order confirmation', 'Commande : Commande : {$order_ref}', '{assign var="order_id" value=1}\r\n\r\n{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n    {loop name="currency.order" type="currency" id=$CURRENCY}\r\n        {assign "orderCurrency" $CODE}\r\n    {/loop}\r\n{loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n{loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}\\r\\n\r\n{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}\\r\\n\r\n{$ZIPCODE} {$CITY}\\r\\n\r\n{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}\\r\\n\r\n{/loop}\r\nConfirmation de commande {$REF} du {format_date date=$INVOICE_DATE}\\r\\n\\r\\n\r\nLes articles commandés:\\r\\n\r\n{loop type="order_product" name="order-products" order=$ID}\r\n{if $WAS_IN_PROMO == 1}\r\n    {assign "realPrice" $PROMO_PRICE}\r\n    {assign "realTax" $PROMO_PRICE_TAX}\r\n    {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n{else}\r\n    {assign "realPrice" $PRICE}\r\n    {assign "realTax" $PRICE_TAX}\r\n    {assign "realTaxedPrice" $TAXED_PRICE}\r\n{/if}\r\n    \\r\\n\r\n    Article : {$TITLE}\r\n{ifloop rel="combinations"}\r\n    {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n    {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}\\r\\n\r\n{/loop}\r\n{/ifloop}\\r\\n\r\n    Quantité : {$QUANTITY}\\r\\n\r\n    Prix unitaire TTC : {$realTaxedPrice} {$orderCurrency}\\r\\n\r\n{/loop}\r\n\\r\\n-----------------------------------------\\r\\n\r\nMontant total TTC :    {$TOTAL_TAXED_AMOUNT - $POSTAGE} {$orderCurrency} \\r\\n\r\nFrais de port TTC :    {$POSTAGE} {$orderCurrency} \\r\\n\r\nSomme totale:            {$TOTAL_TAXED_AMOUNT} {$orderCurrency} \\r\\n\r\n==================================\\r\\n\\r\\n\r\nVotre facture est disponible dans la rubrique mon compte sur {config key="url_site"}\r\n{/loop}', '{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n    {loop name="currency.order" type="currency" id=$CURRENCY}\r\n        {assign "orderCurrency" $SYMBOL}\r\n    {/loop}\r\n{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}\r\n    {assign var="customer_ref" value=$REF}\r\n{/loop}\r\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"\r\n        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r\n<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="fr">\r\n<head>\r\n    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>\r\n    <title>courriel de confirmation de commande de {config key="url_site"} </title>\r\n    {literal}\r\n    <style type="text/css">body {font-family: Arial, Helvetica, sans-serif; font-size:100%; text-align:center;}#liencompte {margin:15px 0 ; text-align:center; font-size:10pt;}#wrapper {width:480pt;margin:0 auto;}#entete {padding-bottom:20px;margin-bottom:10px;border-bottom:1px dotted #000;}#logotexte {float:left;width:180pt;height:75pt;border:1pt solid #000;font-size:18pt;text-align:center;}#logoimg{float:left;}#h2 {margin:0;padding:0;font-size:140%;text-align:center;}#h3 {margin:0;padding:0;font-size:120%;text-align:center;}#tableprix {margin:0 auto;border-collapse:collapse;font-size:80%;}#intitules {font-weight:bold;text-align:center;}#ref {width:65pt;border:1px solid #000;}#designation {width:278pt;border:1px solid #000;}#pu {width:65pt;border:1px solid #000;}#qte {width:60pt;border:1px solid #000;}.ligneproduit{font-weight:normal;}.cellref{text-align:right;padding-right:6pt;border:1px solid #000;}.celldsg{text-align:left;padding-left:6pt;border:1px solid #000;}.cellpu{text-align:right;padding-right:6pt;border:1px solid #000;}.cellqte{text-align:right;padding-right:6pt;border:1px solid #000;}.lignevide{border-bottom:1px solid #000;}.totauxtitre{text-align:right;padding-right:6pt;border-left:1px solid #000;}.totauxcmdtitre{text-align:right;padding-right:6pt;border-left:1px solid #000;border-bottom:1px solid #000;}.totauxprix{text-align:right;padding-right:6pt;border:1px solid #000;}.blocadresses{display:inline;float:left;width:228pt;margin:12pt 4pt 12pt 5pt;font-size:80%;line-height:18pt;text-align:left;border:1px solid #000;}.stylenom{margin:0;padding:0 0 0 10pt;border-bottom:1px solid #000;}.styleliste{margin:0;padding:0 0 0 10pt;}</style>\r\n    {/literal}\r\n</head>\r\n<body>\r\n<div id="wrapper">\r\n    <div id="entete"><h1 id="logotexte">{config key="company_name"}</h1>\r\n        <h2 id="info">Confirmation de commande</h2>\r\n        <h3 id="commande">N&deg; {$REF} du <span style="font-size:80%">{format_date date=$INVOICE_DATE output="date"}</span></h3>\r\n    </div>\r\n    <table id="tableprix" border="0">\r\n        <tbody>\r\n        <tr id="intitules">\r\n            <th id="ref">R&eacute;f&eacute;rence</th>\r\n            <th id="designation">D&eacute;signation</th>\r\n            <th id="pu">P.U. &euro;</th>\r\n            <th id="qte">Qt&eacute;</th>\r\n        </tr>\r\n        {loop type="order_product" name="order-products" order=$ID}\r\n        {if $WAS_IN_PROMO == 1}\r\n            {assign "realPrice" $PROMO_PRICE}\r\n            {assign "realTax" $PROMO_PRICE_TAX}\r\n            {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n        {else}\r\n            {assign "realPrice" $PRICE}\r\n            {assign "realTax" $PRICE_TAX}\r\n            {assign "realTaxedPrice" $TAXED_PRICE}\r\n        {/if}\r\n            <tr class="ligneproduit">\r\n                <td class="cellref">{$REF}</td>\r\n                <td class="celldsg">{$TITLE}\r\n                    {ifloop rel="combinations"}\r\n                        {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n                            {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}<br>\r\n                        {/loop}\r\n                    {/ifloop}\r\n                </td>\r\n                <td class="cellpu">{$orderCurrency} {$realTaxedPrice}</td>\r\n                <td class="cellqte">{$QUANTITY}</td>\r\n            </tr>\r\n        {/loop}\r\n        <!-- insere une ligne vide -->\r\n        <tr class="ligneproduit">\r\n            <td class="lignevide" colspan="4">&nbsp;</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxtitre" colspan="3">Montant total avant remise &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$TOTAL_TAXED_AMOUNT - $POSTAGE}</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxtitre" colspan="3">Port &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$POSTAGE}</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxcmdtitre" colspan="3">Montant total de la commande &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$TOTAL_TAXED_AMOUNT}</td>\r\n        </tr>\r\n        </tbody>\r\n    </table>\r\n    <div class="blocadresses">\r\n        <p class="stylenom">LIVRAISON : {loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}</p>\r\n    {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n        <p class="styleliste">N&deg; de client : {$customer_ref}</p>\r\n        <p class="styleliste">Nom :\r\n            {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}</p>\r\n        <p class="styleliste">N&deg; et rue :\r\n            {$ADDRESS1}</p>\r\n        <p class="styleliste">Compl&eacute;ment : {$ADDRESS2}\r\n            {$ADDRESS3}</p>\r\n        <p class="styleliste">Code postal : {$ZIPCODE}</p>\r\n        <p class="styleliste">Ville : {$CITY}</p>\r\n        <p class="styleliste">Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}</p>\r\n    </div>\r\n    {/loop}\r\n    <div class="blocadresses">\r\n        <p class="stylenom">FACTURATION : paiement par {loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}</p>\r\n    {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS}\r\n        <p class="styleliste">N&deg; de client : {$customer_ref}</p>\r\n        <p class="styleliste">Nom :\r\n            {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}</p>\r\n        <p class="styleliste">N&deg; et rue :\r\n            {$ADDRESS1}</p>\r\n        <p class="styleliste">Compl&eacute;ment : {$ADDRESS2}\r\n            {$ADDRESS3}</p>\r\n        <p class="styleliste">Code postal : {$ZIPCODE}</p>\r\n        <p class="styleliste">Ville : {$CITY}</p>\r\n        <p class="styleliste">Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}</p>\r\n    </div>\r\n    {/loop}\r\n    <p id="liencompte">Le suivi de votre commande est disponible dans la rubrique mon compte sur <a href="{config key="url_site"}">{config key="url_site"}</a></p>\r\n</div>\r\n</body>\r\n</html>\r\n{/loop}'),
-(1, 'fr_FR', 'order confirmation', 'Commande : {$order_ref}', '{assign var="order_id" value=1}\r\n\r\n{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n    {loop name="currency.order" type="currency" id=$CURRENCY}\r\n        {assign "orderCurrency" $CODE}\r\n    {/loop}\r\n{loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n{loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}\\r\\n\r\n{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}\\r\\n\r\n{$ZIPCODE} {$CITY}\\r\\n\r\n{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}\\r\\n\r\n{/loop}\r\nConfirmation de commande {$REF} du {format_date date=$INVOICE_DATE}\\r\\n\\r\\n\r\nLes articles commandés:\\r\\n\r\n{loop type="order_product" name="order-products" order=$ID}\r\n{if $WAS_IN_PROMO == 1}\r\n    {assign "realPrice" $PROMO_PRICE}\r\n    {assign "realTax" $PROMO_PRICE_TAX}\r\n    {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n{else}\r\n    {assign "realPrice" $PRICE}\r\n    {assign "realTax" $PRICE_TAX}\r\n    {assign "realTaxedPrice" $TAXED_PRICE}\r\n{/if}\r\n    \\r\\n\r\n    Article : {$TITLE}\r\n{ifloop rel="combinations"}\r\n    {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n    {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}\\r\\n\r\n{/loop}\r\n{/ifloop}\\r\\n\r\n    Quantité : {$QUANTITY}\\r\\n\r\n    Prix unitaire TTC : {$realTaxedPrice} {$orderCurrency}\\r\\n\r\n{/loop}\r\n\\r\\n-----------------------------------------\\r\\n\r\nMontant total TTC :    {$TOTAL_TAXED_AMOUNT - $POSTAGE} {$orderCurrency} \\r\\n\r\nFrais de port TTC :    {$POSTAGE} {$orderCurrency} \\r\\n\r\nSomme totale:            {$TOTAL_TAXED_AMOUNT} {$orderCurrency} \\r\\n\r\n==================================\\r\\n\\r\\n\r\nVotre facture est disponible dans la rubrique mon compte sur {config key="url_site"}\r\n{/loop}', '{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n    {loop name="currency.order" type="currency" id=$CURRENCY}\r\n        {assign "orderCurrency" $SYMBOL}\r\n    {/loop}\r\n{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}\r\n    {assign var="customer_ref" value=$REF}\r\n{/loop}\r\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"\r\n        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r\n<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="fr">\r\n<head>\r\n    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>\r\n    <title>courriel de confirmation de commande de {config key="url_site"} </title>\r\n    {literal}\r\n    <style type="text/css">body {font-family: Arial, Helvetica, sans-serif; font-size:100%; text-align:center;}#liencompte {margin:15px 0 ; text-align:center; font-size:10pt;}#wrapper {width:480pt;margin:0 auto;}#entete {padding-bottom:20px;margin-bottom:10px;border-bottom:1px dotted #000;}#logotexte {float:left;width:180pt;height:75pt;border:1pt solid #000;font-size:18pt;text-align:center;}#logoimg{float:left;}#h2 {margin:0;padding:0;font-size:140%;text-align:center;}#h3 {margin:0;padding:0;font-size:120%;text-align:center;}#tableprix {margin:0 auto;border-collapse:collapse;font-size:80%;}#intitules {font-weight:bold;text-align:center;}#ref {width:65pt;border:1px solid #000;}#designation {width:278pt;border:1px solid #000;}#pu {width:65pt;border:1px solid #000;}#qte {width:60pt;border:1px solid #000;}.ligneproduit{font-weight:normal;}.cellref{text-align:right;padding-right:6pt;border:1px solid #000;}.celldsg{text-align:left;padding-left:6pt;border:1px solid #000;}.cellpu{text-align:right;padding-right:6pt;border:1px solid #000;}.cellqte{text-align:right;padding-right:6pt;border:1px solid #000;}.lignevide{border-bottom:1px solid #000;}.totauxtitre{text-align:right;padding-right:6pt;border-left:1px solid #000;}.totauxcmdtitre{text-align:right;padding-right:6pt;border-left:1px solid #000;border-bottom:1px solid #000;}.totauxprix{text-align:right;padding-right:6pt;border:1px solid #000;}.blocadresses{display:inline;float:left;width:228pt;margin:12pt 4pt 12pt 5pt;font-size:80%;line-height:18pt;text-align:left;border:1px solid #000;}.stylenom{margin:0;padding:0 0 0 10pt;border-bottom:1px solid #000;}.styleliste{margin:0;padding:0 0 0 10pt;}</style>\r\n    {/literal}\r\n</head>\r\n<body>\r\n<div id="wrapper">\r\n    <div id="entete"><h1 id="logotexte">{config key="company_name"}</h1>\r\n        <h2 id="info">Confirmation de commande</h2>\r\n        <h3 id="commande">N&deg; {$REF} du <span style="font-size:80%">{format_date date=$INVOICE_DATE output="date"}</span></h3>\r\n    </div>\r\n    <table id="tableprix" border="0">\r\n        <tbody>\r\n        <tr id="intitules">\r\n            <th id="ref">R&eacute;f&eacute;rence</th>\r\n            <th id="designation">D&eacute;signation</th>\r\n            <th id="pu">P.U. &euro;</th>\r\n            <th id="qte">Qt&eacute;</th>\r\n        </tr>\r\n        {loop type="order_product" name="order-products" order=$ID}\r\n        {if $WAS_IN_PROMO == 1}\r\n            {assign "realPrice" $PROMO_PRICE}\r\n            {assign "realTax" $PROMO_PRICE_TAX}\r\n            {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n        {else}\r\n            {assign "realPrice" $PRICE}\r\n            {assign "realTax" $PRICE_TAX}\r\n            {assign "realTaxedPrice" $TAXED_PRICE}\r\n        {/if}\r\n            <tr class="ligneproduit">\r\n                <td class="cellref">{$REF}</td>\r\n                <td class="celldsg">{$TITLE}\r\n                    {ifloop rel="combinations"}\r\n                        {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n                            {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}<br>\r\n                        {/loop}\r\n                    {/ifloop}\r\n                </td>\r\n                <td class="cellpu">{$orderCurrency} {$realTaxedPrice}</td>\r\n                <td class="cellqte">{$QUANTITY}</td>\r\n            </tr>\r\n        {/loop}\r\n        <!-- insere une ligne vide -->\r\n        <tr class="ligneproduit">\r\n            <td class="lignevide" colspan="4">&nbsp;</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxtitre" colspan="3">Montant total avant remise &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$TOTAL_TAXED_AMOUNT - $POSTAGE}</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxtitre" colspan="3">Port &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$POSTAGE}</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxcmdtitre" colspan="3">Montant total de la commande &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$TOTAL_TAXED_AMOUNT}</td>\r\n        </tr>\r\n        </tbody>\r\n    </table>\r\n    <div class="blocadresses">\r\n        <p class="stylenom">LIVRAISON : {loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}</p>\r\n    {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n        <p class="styleliste">N&deg; de client : {$customer_ref}</p>\r\n        <p class="styleliste">Nom :\r\n            {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}</p>\r\n        <p class="styleliste">N&deg; et rue :\r\n            {$ADDRESS1}</p>\r\n        <p class="styleliste">Compl&eacute;ment : {$ADDRESS2}\r\n            {$ADDRESS3}</p>\r\n        <p class="styleliste">Code postal : {$ZIPCODE}</p>\r\n        <p class="styleliste">Ville : {$CITY}</p>\r\n        <p class="styleliste">Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}</p>\r\n    </div>\r\n    {/loop}\r\n    <div class="blocadresses">\r\n        <p class="stylenom">FACTURATION : paiement par {loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}</p>\r\n    {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS}\r\n        <p class="styleliste">N&deg; de client : {$customer_ref}</p>\r\n        <p class="styleliste">Nom :\r\n            {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}</p>\r\n        <p class="styleliste">N&deg; et rue :\r\n            {$ADDRESS1}</p>\r\n        <p class="styleliste">Compl&eacute;ment : {$ADDRESS2}\r\n            {$ADDRESS3}</p>\r\n        <p class="styleliste">Code postal : {$ZIPCODE}</p>\r\n        <p class="styleliste">Ville : {$CITY}</p>\r\n        <p class="styleliste">Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}</p>\r\n    </div>\r\n    {/loop}\r\n    <p id="liencompte">Le suivi de votre commande est disponible dans la rubrique mon compte sur <a href="{config key="url_site"}">{config key="url_site"}</a></p>\r\n</div>\r\n</body>\r\n</html>\r\n{/loop}');
+(1, 'en_US', 'order confirmation', 'Commande : Commande : {$order_ref}', '{assign var="order_id" value=1}\r\n\r\n{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n    {loop name="currency.order" type="currency" id=$CURRENCY}\r\n        {assign "orderCurrency" $CODE}\r\n    {/loop}\r\n{loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n{loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}\\r\\n\r\n{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}\\r\\n\r\n{$ZIPCODE} {$CITY}\\r\\n\r\n{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}\\r\\n\r\n{/loop}\r\nConfirmation de commande {$REF} du {format_date date=$INVOICE_DATE}\\r\\n\\r\\n\r\nLes articles commandés:\\r\\n\r\n{loop type="order_product" name="order-products" order=$ID}\r\n{if $WAS_IN_PROMO == 1}\r\n    {assign "realPrice" $PROMO_PRICE}\r\n    {assign "realTax" $PROMO_PRICE_TAX}\r\n    {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n{else}\r\n    {assign "realPrice" $PRICE}\r\n    {assign "realTax" $PRICE_TAX}\r\n    {assign "realTaxedPrice" $TAXED_PRICE}\r\n{/if}\r\n    \\r\\n\r\n    Article : {$TITLE}\r\n{ifloop rel="combinations"}\r\n    {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n    {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}\\r\\n\r\n{/loop}\r\n{/ifloop}\\r\\n\r\n    Quantité : {$QUANTITY}\\r\\n\r\n    Prix unitaire TTC : {$realTaxedPrice} {$orderCurrency}\\r\\n\r\n{/loop}\r\n\\r\\n-----------------------------------------\\r\\n\r\nMontant total TTC :    {$TOTAL_TAXED_AMOUNT - $POSTAGE} {$orderCurrency} \\r\\n\r\nFrais de port TTC :    {$POSTAGE} {$orderCurrency} \\r\\n\r\nSomme totale:            {$TOTAL_TAXED_AMOUNT} {$orderCurrency} \\r\\n\r\n==================================\\r\\n\\r\\n\r\nVotre facture est disponible dans la rubrique mon compte sur {config key="url_site"}\r\n{/loop}', '{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n    {loop name="currency.order" type="currency" id=$CURRENCY}\r\n        {assign "orderCurrency" $SYMBOL}\r\n    {/loop}\r\n{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}\r\n    {assign var="customer_ref" value=$REF}\r\n{/loop}\r\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"\r\n        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r\n<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="fr">\r\n<head>\r\n    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>\r\n    <title>courriel de confirmation de commande de {config key="url_site"} </title>\r\n    {literal}\r\n    <style type="text/css">body {font-family: Arial, Helvetica, sans-serif; font-size:100%; text-align:center;}#liencompte {margin:15px 0 ; text-align:center; font-size:10pt;}#wrapper {width:480pt;margin:0 auto;}#entete {padding-bottom:20px;margin-bottom:10px;border-bottom:1px dotted #000;}#logotexte {float:left;width:180pt;height:75pt;border:1pt solid #000;font-size:18pt;text-align:center;}#logoimg{float:left;}#h2 {margin:0;padding:0;font-size:140%;text-align:center;}#h3 {margin:0;padding:0;font-size:120%;text-align:center;}#tableprix {margin:0 auto;border-collapse:collapse;font-size:80%;}#intitules {font-weight:bold;text-align:center;}#ref {width:65pt;border:1px solid #000;}#designation {width:278pt;border:1px solid #000;}#pu {width:65pt;border:1px solid #000;}#qte {width:60pt;border:1px solid #000;}.ligneproduit{font-weight:normal;}.cellref{text-align:right;padding-right:6pt;border:1px solid #000;}.celldsg{text-align:left;padding-left:6pt;border:1px solid #000;}.cellpu{text-align:right;padding-right:6pt;border:1px solid #000;}.cellqte{text-align:right;padding-right:6pt;border:1px solid #000;}.lignevide{border-bottom:1px solid #000;}.totauxtitre{text-align:right;padding-right:6pt;border-left:1px solid #000;}.totauxcmdtitre{text-align:right;padding-right:6pt;border-left:1px solid #000;border-bottom:1px solid #000;}.totauxprix{text-align:right;padding-right:6pt;border:1px solid #000;}.blocadresses{display:inline;float:left;width:228pt;margin:12pt 4pt 12pt 5pt;font-size:80%;line-height:18pt;text-align:left;border:1px solid #000;}.stylenom{margin:0;padding:0 0 0 10pt;border-bottom:1px solid #000;}.styleliste{margin:0;padding:0 0 0 10pt;}</style>\r\n    {/literal}\r\n</head>\r\n<body>\r\n<div id="wrapper">\r\n    <div id="entete"><h1 id="logotexte">{config key="store_name"}</h1>\r\n        <h2 id="info">Confirmation de commande</h2>\r\n        <h3 id="commande">N&deg; {$REF} du <span style="font-size:80%">{format_date date=$INVOICE_DATE output="date"}</span></h3>\r\n    </div>\r\n    <table id="tableprix" border="0">\r\n        <tbody>\r\n        <tr id="intitules">\r\n            <th id="ref">R&eacute;f&eacute;rence</th>\r\n            <th id="designation">D&eacute;signation</th>\r\n            <th id="pu">P.U. &euro;</th>\r\n            <th id="qte">Qt&eacute;</th>\r\n        </tr>\r\n        {loop type="order_product" name="order-products" order=$ID}\r\n        {if $WAS_IN_PROMO == 1}\r\n            {assign "realPrice" $PROMO_PRICE}\r\n            {assign "realTax" $PROMO_PRICE_TAX}\r\n            {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n        {else}\r\n            {assign "realPrice" $PRICE}\r\n            {assign "realTax" $PRICE_TAX}\r\n            {assign "realTaxedPrice" $TAXED_PRICE}\r\n        {/if}\r\n            <tr class="ligneproduit">\r\n                <td class="cellref">{$REF}</td>\r\n                <td class="celldsg">{$TITLE}\r\n                    {ifloop rel="combinations"}\r\n                        {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n                            {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}<br>\r\n                        {/loop}\r\n                    {/ifloop}\r\n                </td>\r\n                <td class="cellpu">{$orderCurrency} {$realTaxedPrice}</td>\r\n                <td class="cellqte">{$QUANTITY}</td>\r\n            </tr>\r\n        {/loop}\r\n        <!-- insere une ligne vide -->\r\n        <tr class="ligneproduit">\r\n            <td class="lignevide" colspan="4">&nbsp;</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxtitre" colspan="3">Montant total avant remise &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$TOTAL_TAXED_AMOUNT - $POSTAGE}</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxtitre" colspan="3">Port &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$POSTAGE}</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxcmdtitre" colspan="3">Montant total de la commande &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$TOTAL_TAXED_AMOUNT}</td>\r\n        </tr>\r\n        </tbody>\r\n    </table>\r\n    <div class="blocadresses">\r\n        <p class="stylenom">LIVRAISON : {loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}</p>\r\n    {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n        <p class="styleliste">N&deg; de client : {$customer_ref}</p>\r\n        <p class="styleliste">Nom :\r\n            {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}</p>\r\n        <p class="styleliste">N&deg; et rue :\r\n            {$ADDRESS1}</p>\r\n        <p class="styleliste">Compl&eacute;ment : {$ADDRESS2}\r\n            {$ADDRESS3}</p>\r\n        <p class="styleliste">Code postal : {$ZIPCODE}</p>\r\n        <p class="styleliste">Ville : {$CITY}</p>\r\n        <p class="styleliste">Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}</p>\r\n    </div>\r\n    {/loop}\r\n    <div class="blocadresses">\r\n        <p class="stylenom">FACTURATION : paiement par {loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}</p>\r\n    {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS}\r\n        <p class="styleliste">N&deg; de client : {$customer_ref}</p>\r\n        <p class="styleliste">Nom :\r\n            {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}</p>\r\n        <p class="styleliste">N&deg; et rue :\r\n            {$ADDRESS1}</p>\r\n        <p class="styleliste">Compl&eacute;ment : {$ADDRESS2}\r\n            {$ADDRESS3}</p>\r\n        <p class="styleliste">Code postal : {$ZIPCODE}</p>\r\n        <p class="styleliste">Ville : {$CITY}</p>\r\n        <p class="styleliste">Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}</p>\r\n    </div>\r\n    {/loop}\r\n    <p id="liencompte">Le suivi de votre commande est disponible dans la rubrique mon compte sur <a href="{config key="url_site"}">{config key="url_site"}</a></p>\r\n</div>\r\n</body>\r\n</html>\r\n{/loop}'),
+(1, 'fr_FR', 'order confirmation', 'Commande : {$order_ref}', '{assign var="order_id" value=1}\r\n\r\n{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n    {loop name="currency.order" type="currency" id=$CURRENCY}\r\n        {assign "orderCurrency" $CODE}\r\n    {/loop}\r\n{loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n{loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}\\r\\n\r\n{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}\\r\\n\r\n{$ZIPCODE} {$CITY}\\r\\n\r\n{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}\\r\\n\r\n{/loop}\r\nConfirmation de commande {$REF} du {format_date date=$INVOICE_DATE}\\r\\n\\r\\n\r\nLes articles commandés:\\r\\n\r\n{loop type="order_product" name="order-products" order=$ID}\r\n{if $WAS_IN_PROMO == 1}\r\n    {assign "realPrice" $PROMO_PRICE}\r\n    {assign "realTax" $PROMO_PRICE_TAX}\r\n    {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n{else}\r\n    {assign "realPrice" $PRICE}\r\n    {assign "realTax" $PRICE_TAX}\r\n    {assign "realTaxedPrice" $TAXED_PRICE}\r\n{/if}\r\n    \\r\\n\r\n    Article : {$TITLE}\r\n{ifloop rel="combinations"}\r\n    {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n    {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}\\r\\n\r\n{/loop}\r\n{/ifloop}\\r\\n\r\n    Quantité : {$QUANTITY}\\r\\n\r\n    Prix unitaire TTC : {$realTaxedPrice} {$orderCurrency}\\r\\n\r\n{/loop}\r\n\\r\\n-----------------------------------------\\r\\n\r\nMontant total TTC :    {$TOTAL_TAXED_AMOUNT - $POSTAGE} {$orderCurrency} \\r\\n\r\nFrais de port TTC :    {$POSTAGE} {$orderCurrency} \\r\\n\r\nSomme totale:            {$TOTAL_TAXED_AMOUNT} {$orderCurrency} \\r\\n\r\n==================================\\r\\n\\r\\n\r\nVotre facture est disponible dans la rubrique mon compte sur {config key="url_site"}\r\n{/loop}', '{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n    {loop name="currency.order" type="currency" id=$CURRENCY}\r\n        {assign "orderCurrency" $SYMBOL}\r\n    {/loop}\r\n{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}\r\n    {assign var="customer_ref" value=$REF}\r\n{/loop}\r\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"\r\n        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r\n<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="fr">\r\n<head>\r\n    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>\r\n    <title>courriel de confirmation de commande de {config key="url_site"} </title>\r\n    {literal}\r\n    <style type="text/css">body {font-family: Arial, Helvetica, sans-serif; font-size:100%; text-align:center;}#liencompte {margin:15px 0 ; text-align:center; font-size:10pt;}#wrapper {width:480pt;margin:0 auto;}#entete {padding-bottom:20px;margin-bottom:10px;border-bottom:1px dotted #000;}#logotexte {float:left;width:180pt;height:75pt;border:1pt solid #000;font-size:18pt;text-align:center;}#logoimg{float:left;}#h2 {margin:0;padding:0;font-size:140%;text-align:center;}#h3 {margin:0;padding:0;font-size:120%;text-align:center;}#tableprix {margin:0 auto;border-collapse:collapse;font-size:80%;}#intitules {font-weight:bold;text-align:center;}#ref {width:65pt;border:1px solid #000;}#designation {width:278pt;border:1px solid #000;}#pu {width:65pt;border:1px solid #000;}#qte {width:60pt;border:1px solid #000;}.ligneproduit{font-weight:normal;}.cellref{text-align:right;padding-right:6pt;border:1px solid #000;}.celldsg{text-align:left;padding-left:6pt;border:1px solid #000;}.cellpu{text-align:right;padding-right:6pt;border:1px solid #000;}.cellqte{text-align:right;padding-right:6pt;border:1px solid #000;}.lignevide{border-bottom:1px solid #000;}.totauxtitre{text-align:right;padding-right:6pt;border-left:1px solid #000;}.totauxcmdtitre{text-align:right;padding-right:6pt;border-left:1px solid #000;border-bottom:1px solid #000;}.totauxprix{text-align:right;padding-right:6pt;border:1px solid #000;}.blocadresses{display:inline;float:left;width:228pt;margin:12pt 4pt 12pt 5pt;font-size:80%;line-height:18pt;text-align:left;border:1px solid #000;}.stylenom{margin:0;padding:0 0 0 10pt;border-bottom:1px solid #000;}.styleliste{margin:0;padding:0 0 0 10pt;}</style>\r\n    {/literal}\r\n</head>\r\n<body>\r\n<div id="wrapper">\r\n    <div id="entete"><h1 id="logotexte">{config key="store_name"}</h1>\r\n        <h2 id="info">Confirmation de commande</h2>\r\n        <h3 id="commande">N&deg; {$REF} du <span style="font-size:80%">{format_date date=$INVOICE_DATE output="date"}</span></h3>\r\n    </div>\r\n    <table id="tableprix" border="0">\r\n        <tbody>\r\n        <tr id="intitules">\r\n            <th id="ref">R&eacute;f&eacute;rence</th>\r\n            <th id="designation">D&eacute;signation</th>\r\n            <th id="pu">P.U. &euro;</th>\r\n            <th id="qte">Qt&eacute;</th>\r\n        </tr>\r\n        {loop type="order_product" name="order-products" order=$ID}\r\n        {if $WAS_IN_PROMO == 1}\r\n            {assign "realPrice" $PROMO_PRICE}\r\n            {assign "realTax" $PROMO_PRICE_TAX}\r\n            {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n        {else}\r\n            {assign "realPrice" $PRICE}\r\n            {assign "realTax" $PRICE_TAX}\r\n            {assign "realTaxedPrice" $TAXED_PRICE}\r\n        {/if}\r\n            <tr class="ligneproduit">\r\n                <td class="cellref">{$REF}</td>\r\n                <td class="celldsg">{$TITLE}\r\n                    {ifloop rel="combinations"}\r\n                        {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n                            {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}<br>\r\n                        {/loop}\r\n                    {/ifloop}\r\n                </td>\r\n                <td class="cellpu">{$orderCurrency} {$realTaxedPrice}</td>\r\n                <td class="cellqte">{$QUANTITY}</td>\r\n            </tr>\r\n        {/loop}\r\n        <!-- insere une ligne vide -->\r\n        <tr class="ligneproduit">\r\n            <td class="lignevide" colspan="4">&nbsp;</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxtitre" colspan="3">Montant total avant remise &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$TOTAL_TAXED_AMOUNT - $POSTAGE}</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxtitre" colspan="3">Port &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$POSTAGE}</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxcmdtitre" colspan="3">Montant total de la commande &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$TOTAL_TAXED_AMOUNT}</td>\r\n        </tr>\r\n        </tbody>\r\n    </table>\r\n    <div class="blocadresses">\r\n        <p class="stylenom">LIVRAISON : {loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}</p>\r\n    {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n        <p class="styleliste">N&deg; de client : {$customer_ref}</p>\r\n        <p class="styleliste">Nom :\r\n            {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}</p>\r\n        <p class="styleliste">N&deg; et rue :\r\n            {$ADDRESS1}</p>\r\n        <p class="styleliste">Compl&eacute;ment : {$ADDRESS2}\r\n            {$ADDRESS3}</p>\r\n        <p class="styleliste">Code postal : {$ZIPCODE}</p>\r\n        <p class="styleliste">Ville : {$CITY}</p>\r\n        <p class="styleliste">Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}</p>\r\n    </div>\r\n    {/loop}\r\n    <div class="blocadresses">\r\n        <p class="stylenom">FACTURATION : paiement par {loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}</p>\r\n    {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS}\r\n        <p class="styleliste">N&deg; de client : {$customer_ref}</p>\r\n        <p class="styleliste">Nom :\r\n            {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}</p>\r\n        <p class="styleliste">N&deg; et rue :\r\n            {$ADDRESS1}</p>\r\n        <p class="styleliste">Compl&eacute;ment : {$ADDRESS2}\r\n            {$ADDRESS3}</p>\r\n        <p class="styleliste">Code postal : {$ZIPCODE}</p>\r\n        <p class="styleliste">Ville : {$CITY}</p>\r\n        <p class="styleliste">Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}</p>\r\n    </div>\r\n    {/loop}\r\n    <p id="liencompte">Le suivi de votre commande est disponible dans la rubrique mon compte sur <a href="{config key="url_site"}">{config key="url_site"}</a></p>\r\n</div>\r\n</body>\r\n</html>\r\n{/loop}');
 
diff --git a/local/modules/Front/Controller/ContactController.php b/local/modules/Front/Controller/ContactController.php
index 567528836..2ff4452d7 100644
--- a/local/modules/Front/Controller/ContactController.php
+++ b/local/modules/Front/Controller/ContactController.php
@@ -47,7 +47,7 @@ class ContactController extends BaseFrontController
 
             $message = \Swift_Message::newInstance($form->get('subject')->getData())
                 ->addFrom($form->get('email')->getData(), $form->get('name')->getData())
-                ->addTo(ConfigQuery::read('contact_email'), ConfigQuery::read('company_name'))
+                ->addTo(ConfigQuery::read('store_email'), ConfigQuery::read('store_name'))
                 ->setBody($form->get('message')->getData())
             ;
 
diff --git a/templates/frontOffice/default/layout.tpl b/templates/frontOffice/default/layout.tpl
index d8433e848..00d11f545 100644
--- a/templates/frontOffice/default/layout.tpl
+++ b/templates/frontOffice/default/layout.tpl
@@ -1,9 +1,9 @@
 {* Declare assets directory, relative to template base directory *}
 {declare_assets directory='assets'}
 {block name="no-return-functions"}{/block}
-{assign var="company_name" value="{config key="company_name"}"}
-{if not $company_name}
-    {assign var="company_name" value="{intl l='Thelia V2'}"}
+{assign var="store_name" value="{config key="store_name"}"}
+{if not $store_name}
+    {assign var="store_name" value="{intl l='Thelia V2'}"}
 {/if}
 <!doctype html>
 <!--
@@ -37,14 +37,14 @@ GNU General Public License : http://www.gnu.org/licenses/
     <meta charset="utf-8">
 
     {* Page Title *}
-    <title>{block name="page-title"}{strip}{if $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title} - {/foreach}{/if}{$company_name}{/strip}{/block}</title>
+    <title>{block name="page-title"}{strip}{if $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title} - {/foreach}{/if}{$store_name}{/strip}{/block}</title>
 
     {* Meta Tags *}
     <meta name="generator" content="{intl l='Thelia V2'}">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     {block name="meta"}
-        <meta name="description" content="{$company_name}">
+        <meta name="description" content="{$store_name}">
         <meta name="robots" content="noindex,nofollow">
     {/block}
 
@@ -86,7 +86,7 @@ GNU General Public License : http://www.gnu.org/licenses/
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="{navigate to="index"}">{$company_name}</a>
+                <a class="navbar-brand" href="{navigate to="index"}">{$store_name}</a>
             </div>
 
             <!-- Place everything within .nav-collapse to hide it until above 768px -->
@@ -146,8 +146,8 @@ GNU General Public License : http://www.gnu.org/licenses/
     <header class="container" role="banner">
         <div class="header">
             <h1 class="logo">
-                <a href="{navigate to="index"}" title="{$company_name}">
-                    {images file='assets/img/logo.gif'}<img src="{$asset_url}" alt="{$company_name}">{/images}
+                <a href="{navigate to="index"}" title="{$store_name}">
+                    {images file='assets/img/logo.gif'}<img src="{$asset_url}" alt="{$store_name}">{/images}
                 </a>
             </h1>
 
@@ -356,7 +356,7 @@ GNU General Public License : http://www.gnu.org/licenses/
                     <section class="block block-contact" itemscope itemtype="http://schema.org/Organization">
                         <div class="block-heading"><h3 class="block-title">{intl l="Contact Us"}</h3></div>
                         <div class="block-content">
-                            <meta itemprop="name" content="{$company_name}">
+                            <meta itemprop="name" content="{$store_name}">
                             <ul>
                                 <li class="contact-address">
                                     <address class="adr" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
diff --git a/templates/pdf/default/delivery.html b/templates/pdf/default/delivery.html
index 9aec97a7b..318ddff7e 100644
--- a/templates/pdf/default/delivery.html
+++ b/templates/pdf/default/delivery.html
@@ -68,7 +68,7 @@
 
                     <div style="text-align: center; padding-bottom: 5mm;">
                         <h1 style="font-size: 5mm;">
-                            {config key="company_name"}
+                            {config key="store_name"}
                             <!-- Vous pouvez remplacer #VARIABLE(nomsite) par le nom de votre entreprise -->
                         </h1>
 
diff --git a/templates/pdf/default/invoice.html b/templates/pdf/default/invoice.html
index 828b5786c..9b864f217 100644
--- a/templates/pdf/default/invoice.html
+++ b/templates/pdf/default/invoice.html
@@ -59,7 +59,7 @@
             <td style="width:50%; padding: 0; border: none;" valign="bottom">
 
                 <div style="text-align: center; padding-bottom: 10mm;">
-                    <h1>{config key="company_name"}</h1>
+                    <h1>{config key="store_name"}</h1>
                     <p><!-- Insérer ici l'adresse de votre entreprise --></p>
                     <h2>{intl l="invoice"} {$INVOICE_REF}</h2>
                 </div>
diff --git a/web/install/config.php b/web/install/config.php
index f4e3c9896..d3d4fe869 100755
--- a/web/install/config.php
+++ b/web/install/config.php
@@ -90,11 +90,11 @@ $_SESSION['install']['step'] = $step;
         </div>
         <div class="form-group">
             <label for="email_contact">Contact email :</label>
-            <input id="email_contact" class="form-control" type="text" name="email_contact" placeholder="foo@bar.com" value="" required>
+            <input id="email_contact" class="form-control" type="text" name="store_email" placeholder="foo@bar.com" value="" required>
         </div>
         <div class="form-group">
             <label for="site_name">Company name :</label>
-            <input id="site_name" class="form-control" type="text" name="company_name" placeholder="" value="" required>
+            <input id="site_name" class="form-control" type="text" name="store_name" placeholder="" value="" required>
         </div>
         <div class="form-group">
             <label for="site_name">website url :</label>
diff --git a/web/install/end.php b/web/install/end.php
index e10a18cb6..9cca8ede1 100755
--- a/web/install/end.php
+++ b/web/install/end.php
@@ -37,12 +37,12 @@ if($_SESSION['install']['step'] == 5) {
 
 
     \Thelia\Model\ConfigQuery::create()
-        ->filterByName('contact_email')
-        ->update(array('Value' => $_POST['email_contact']));
+        ->filterByName('store_email')
+        ->update(array('Value' => $_POST['store_email']));
 
     \Thelia\Model\ConfigQuery::create()
-        ->filterByName('company_name')
-        ->update(array('Value' => $_POST['company_name']));
+        ->filterByName('store_name')
+        ->update(array('Value' => $_POST['store_name']));
 
     \Thelia\Model\ConfigQuery::create()
         ->filterByName('url_site')