diff --git a/partner_area_management/i18n/partner_area_management.pot b/partner_area_management/i18n/partner_area_management.pot
deleted file mode 100644
index 169314e543ac..000000000000
--- a/partner_area_management/i18n/partner_area_management.pot
+++ /dev/null
@@ -1,78 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* partner_area_management
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-21 20:09+0000\n"
-"PO-Revision-Date: 2015-04-21 20:09+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: partner_area_management
-#: model:ir.model,name:partner_area_management.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: partner_area_management
-#: view:stock.location:partner_area_management.partner_area_management_stock_location_search
-#: field:stock.location,area_dimension:0
-msgid "Dimension"
-msgstr ""
-
-#. module: partner_area_management
-#: field:stock.location,active_dimension:0
-msgid "Area Dimension"
-msgstr ""
-
-#. module: partner_area_management
-#: view:stock.location:partner_area_management.partner_area_management_stock_location_search
-msgid "Group By"
-msgstr ""
-
-#. module: partner_area_management
-#: model:ir.model,name:partner_area_management.model_stock_location
-msgid "Inventory Locations"
-msgstr ""
-
-#. module: partner_area_management
-#: view:res.company:partner_area_management.partner_area_management_res_company_form_view
-msgid "Locations"
-msgstr ""
-
-#. module: partner_area_management
-#: view:stock.location:partner_area_management.partner_area_management_stock_location_search
-msgid "Owner"
-msgstr ""
-
-#. module: partner_area_management
-#: view:stock.location:partner_area_management.partner_area_management_stock_location_search
-msgid "Partner"
-msgstr ""
-
-#. module: partner_area_management
-#: view:stock.location:partner_area_management.partner_area_management_stock_location_form_view
-msgid "Surface"
-msgstr ""
-
-#. module: partner_area_management
-#: help:stock.location,location_uom:0
-msgid "This field corresponds to the unit of measure of the location"
-msgstr ""
-
-#. module: partner_area_management
-#: help:res.company,locations_uom:0
-msgid "This field corresponds to the unit of measure of the warehouse locations"
-msgstr ""
-
-#. module: partner_area_management
-#: field:res.company,locations_uom:0
-#: field:stock.location,location_uom:0
-msgid "Unit of Measure"
-msgstr ""
diff --git a/partner_area_data/README.rst b/stock_location_area_data/README.rst
similarity index 100%
rename from partner_area_data/README.rst
rename to stock_location_area_data/README.rst
diff --git a/partner_area_data/__init__.py b/stock_location_area_data/__init__.py
similarity index 100%
rename from partner_area_data/__init__.py
rename to stock_location_area_data/__init__.py
diff --git a/partner_area_data/__openerp__.py b/stock_location_area_data/__openerp__.py
similarity index 94%
rename from partner_area_data/__openerp__.py
rename to stock_location_area_data/__openerp__.py
index 94ae821bb526..fec0ef1b3676 100644
--- a/partner_area_data/__openerp__.py
+++ b/stock_location_area_data/__openerp__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 {
-    'name': 'Partner Area Data',
+    'name': 'Stock Location Area Data',
     'version': '0.1',
     'author': 'Savoir-faire Linux',
     'maintainer': 'Savoir-faire Linux',
@@ -32,7 +32,7 @@
         'product',
     ],
     'data': [
-        'data/partner_area_data.xml',
+        'data/stock_location_area_data.xml',
     ],
     'installable': True,
     'application': False,
diff --git a/partner_area_data/data/partner_area_data.xml b/stock_location_area_data/data/stock_location_area_data.xml
similarity index 100%
rename from partner_area_data/data/partner_area_data.xml
rename to stock_location_area_data/data/stock_location_area_data.xml
diff --git a/partner_area_data/i18n/fr.po b/stock_location_area_data/i18n/fr.po
similarity index 65%
rename from partner_area_data/i18n/fr.po
rename to stock_location_area_data/i18n/fr.po
index ff6e67308db9..3676c59916d2 100644
--- a/partner_area_data/i18n/fr.po
+++ b/stock_location_area_data/i18n/fr.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# 	* partner_area_data
+# 	* stock_location_area_data
 #
 msgid ""
 msgstr ""
@@ -18,17 +18,17 @@ msgstr ""
 "Language: fr\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#. module: partner_area_data
-#: model:product.uom.categ,name:partner_area_data.product_uom_categ_surface
+#. module: stock_location_area_data
+#: model:product.uom.categ,name:stock_location_area_data.product_uom_categ_surface
 msgid "Surface"
 msgstr "Surface"
 
-#. module: partner_area_data
-#: model:product.uom,name:partner_area_data.product_uom_feet2
+#. module: stock_location_area_data
+#: model:product.uom,name:stock_location_area_data.product_uom_feet2
 msgid "feet²"
 msgstr "pied²"
 
-#. module: partner_area_data
-#: model:product.uom,name:partner_area_data.product_uom_m2
+#. module: stock_location_area_data
+#: model:product.uom,name:stock_location_area_data.product_uom_m2
 msgid "m²"
 msgstr "m²"
diff --git a/partner_area_data/i18n/partner_area_data.pot b/stock_location_area_data/i18n/stock_location_area_data.pot
similarity index 58%
rename from partner_area_data/i18n/partner_area_data.pot
rename to stock_location_area_data/i18n/stock_location_area_data.pot
index 12ea2e38b4e8..b552cc969e2a 100644
--- a/partner_area_data/i18n/partner_area_data.pot
+++ b/stock_location_area_data/i18n/stock_location_area_data.pot
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* partner_area_data
+#	* stock_location_area_data
 #
 msgid ""
 msgstr ""
@@ -15,17 +15,17 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: partner_area_data
-#: model:product.uom.categ,name:partner_area_data.product_uom_categ_surface
+#. module: stock_location_area_data
+#: model:product.uom.categ,name:stock_location_area_data.product_uom_categ_surface
 msgid "Surface"
 msgstr ""
 
-#. module: partner_area_data
-#: model:product.uom,name:partner_area_data.product_uom_feet2
+#. module: stock_location_area_data
+#: model:product.uom,name:stock_location_area_data.product_uom_feet2
 msgid "feet²"
 msgstr ""
 
-#. module: partner_area_data
-#: model:product.uom,name:partner_area_data.product_uom_m2
+#. module: stock_location_area_data
+#: model:product.uom,name:stock_location_area_data.product_uom_m2
 msgid "m²"
 msgstr ""
diff --git a/partner_area_management/README.rst b/stock_location_area_management/README.rst
similarity index 100%
rename from partner_area_management/README.rst
rename to stock_location_area_management/README.rst
diff --git a/partner_area_management/__init__.py b/stock_location_area_management/__init__.py
similarity index 100%
rename from partner_area_management/__init__.py
rename to stock_location_area_management/__init__.py
diff --git a/partner_area_management/__openerp__.py b/stock_location_area_management/__openerp__.py
similarity index 94%
rename from partner_area_management/__openerp__.py
rename to stock_location_area_management/__openerp__.py
index 3d63c91e96f3..1f0d2f174482 100644
--- a/partner_area_management/__openerp__.py
+++ b/stock_location_area_management/__openerp__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 {
-    'name': 'Partner Area Management',
+    'name': 'Stock Location Area Management',
     'version': '0.1',
     'author': 'Savoir-faire Linux',
     'maintainer': 'Savoir-faire Linux',
@@ -30,7 +30,7 @@
     'summary': "Enter a location's area based on different units of measure",
     'depends': [
         'stock',
-        'partner_area_data'
+        'stock_location_area_data'
     ],
     'data': [
         'views/res_company.xml',
diff --git a/partner_area_management/i18n/fr.po b/stock_location_area_management/i18n/fr.po
similarity index 54%
rename from partner_area_management/i18n/fr.po
rename to stock_location_area_management/i18n/fr.po
index 55c6d5b387f8..6768d43dd520 100644
--- a/partner_area_management/i18n/fr.po
+++ b/stock_location_area_management/i18n/fr.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# 	* partner_area_management
+# 	* stock_location_area_management
 #
 msgid ""
 msgstr ""
@@ -18,64 +18,64 @@ msgstr ""
 "Language: fr\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#. module: partner_area_management
-#: model:ir.model,name:partner_area_management.model_res_company
+#. module: stock_location_area_management
+#: model:ir.model,name:stock_location_area_management.model_res_company
 msgid "Companies"
 msgstr "Sociétés"
 
-#. module: partner_area_management
-#: view:stock.location:partner_area_management.partner_area_management_stock_location_search
+#. module: stock_location_area_management
+#: view:stock.location:stock_location_area_management.stock_location_area_management_stock_location_search
 #: field:stock.location,area_dimension:0
 msgid "Dimension"
 msgstr "Dimension"
 
-#. module: partner_area_management
+#. module: stock_location_area_management
 #: field:stock.location,active_dimension:0
 msgid "Area Dimension"
 msgstr "Dimension de la surface"
 
-#. module: partner_area_management
-#: view:stock.location:partner_area_management.partner_area_management_stock_location_search
+#. module: stock_location_area_management
+#: view:stock.location:stock_location_area_management.stock_location_area_management_stock_location_search
 msgid "Group By"
 msgstr "Grouper par"
 
-#. module: partner_area_management
-#: model:ir.model,name:partner_area_management.model_stock_location
+#. module: stock_location_area_management
+#: model:ir.model,name:stock_location_area_management.model_stock_location
 msgid "Inventory Locations"
 msgstr "Emplacements d'inventaire"
 
-#. module: partner_area_management
-#: view:res.company:partner_area_management.partner_area_management_res_company_form_view
+#. module: stock_location_area_management
+#: view:res.company:stock_location_area_management.stock_location_area_management_res_company_form_view
 msgid "Locations"
 msgstr "Emplacements"
 
-#. module: partner_area_management
-#: view:stock.location:partner_area_management.partner_area_management_stock_location_search
+#. module: stock_location_area_management
+#: view:stock.location:stock_location_area_management.stock_location_area_management_stock_location_search
 msgid "Owner"
 msgstr "Propriétaire"
 
-#. module: partner_area_management
-#: view:stock.location:partner_area_management.partner_area_management_stock_location_search
+#. module: stock_location_area_management
+#: view:stock.location:stock_location_area_management.stock_location_area_management_stock_location_search
 msgid "Partner"
 msgstr "Partenaire"
 
-#. module: partner_area_management
-#: view:stock.location:partner_area_management.partner_area_management_stock_location_form_view
+#. module: stock_location_area_management
+#: view:stock.location:stock_location_area_management.stock_location_area_management_stock_location_form_view
 msgid "Surface"
 msgstr "Surface"
 
-#. module: partner_area_management
+#. module: stock_location_area_management
 #: help:stock.location,location_uom:0
 msgid "This field corresponds to the unit of measure of the location"
 msgstr "Ce champ correspond à l'unité de mesure de l'emplacement"
 
-#. module: partner_area_management
+#. module: stock_location_area_management
 #: help:res.company,locations_uom:0
 msgid ""
 "This field corresponds to the unit of measure of the warehouse locations"
 msgstr "Ce champ correspond à l'unité de mesure des emplacements de l'entrepôt"
 
-#. module: partner_area_management
+#. module: stock_location_area_management
 #: field:res.company,locations_uom:0 field:stock.location,location_uom:0
 msgid "Unit of Measure"
 msgstr "Unité de mesure"
diff --git a/stock_location_area_management/i18n/stock_location_area_management.pot b/stock_location_area_management/i18n/stock_location_area_management.pot
new file mode 100644
index 000000000000..055adf49a768
--- /dev/null
+++ b/stock_location_area_management/i18n/stock_location_area_management.pot
@@ -0,0 +1,78 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* stock_location_area_management
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-04-21 20:09+0000\n"
+"PO-Revision-Date: 2015-04-21 20:09+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: stock_location_area_management
+#: model:ir.model,name:stock_location_area_management.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: stock_location_area_management
+#: view:stock.location:stock_location_area_management.stock_location_area_management_stock_location_search
+#: field:stock.location,area_dimension:0
+msgid "Dimension"
+msgstr ""
+
+#. module: stock_location_area_management
+#: field:stock.location,active_dimension:0
+msgid "Area Dimension"
+msgstr ""
+
+#. module: stock_location_area_management
+#: view:stock.location:stock_location_area_management.stock_location_area_management_stock_location_search
+msgid "Group By"
+msgstr ""
+
+#. module: stock_location_area_management
+#: model:ir.model,name:stock_location_area_management.model_stock_location
+msgid "Inventory Locations"
+msgstr ""
+
+#. module: stock_location_area_management
+#: view:res.company:stock_location_area_management.stock_location_area_management_res_company_form_view
+msgid "Locations"
+msgstr ""
+
+#. module: stock_location_area_management
+#: view:stock.location:stock_location_area_management.stock_location_area_management_stock_location_search
+msgid "Owner"
+msgstr ""
+
+#. module: stock_location_area_management
+#: view:stock.location:stock_location_area_management.stock_location_area_management_stock_location_search
+msgid "Partner"
+msgstr ""
+
+#. module: stock_location_area_management
+#: view:stock.location:stock_location_area_management.stock_location_area_management_stock_location_form_view
+msgid "Surface"
+msgstr ""
+
+#. module: stock_location_area_management
+#: help:stock.location,location_uom:0
+msgid "This field corresponds to the unit of measure of the location"
+msgstr ""
+
+#. module: stock_location_area_management
+#: help:res.company,locations_uom:0
+msgid "This field corresponds to the unit of measure of the warehouse locations"
+msgstr ""
+
+#. module: stock_location_area_management
+#: field:res.company,locations_uom:0
+#: field:stock.location,location_uom:0
+msgid "Unit of Measure"
+msgstr ""
diff --git a/partner_area_management/models/__init__.py b/stock_location_area_management/models/__init__.py
similarity index 100%
rename from partner_area_management/models/__init__.py
rename to stock_location_area_management/models/__init__.py
diff --git a/partner_area_management/models/res_company.py b/stock_location_area_management/models/res_company.py
similarity index 95%
rename from partner_area_management/models/res_company.py
rename to stock_location_area_management/models/res_company.py
index 5c7e0a71d2c0..eaa9b8db62c7 100644
--- a/partner_area_management/models/res_company.py
+++ b/stock_location_area_management/models/res_company.py
@@ -35,7 +35,7 @@ def _get_default_locations_uom(self):
         Get the unit of measure m² (default)
         :return: Unit of measure m²
         """
-        return self.env.ref('partner_area_data.product_uom_m2')
+        return self.env.ref('stock_location_area_data.product_uom_m2')
 
     locations_uom = fields.Many2one(
         string='Unit of Measure',
diff --git a/partner_area_management/models/stock_location.py b/stock_location_area_management/models/stock_location.py
similarity index 100%
rename from partner_area_management/models/stock_location.py
rename to stock_location_area_management/models/stock_location.py
diff --git a/partner_area_management/views/res_company.xml b/stock_location_area_management/views/res_company.xml
similarity index 76%
rename from partner_area_management/views/res_company.xml
rename to stock_location_area_management/views/res_company.xml
index 6ce0eaed5683..45ba9bdab504 100644
--- a/partner_area_management/views/res_company.xml
+++ b/stock_location_area_management/views/res_company.xml
@@ -2,9 +2,9 @@
 <openerp>
   <data>
 
-    <record id="partner_area_management_res_company_form_view"
+    <record id="stock_location_area_management_res_company_form_view"
             model="ir.ui.view">
-      <field name="name">partner.area.management.res.company.form</field>
+      <field name="name">stock.location.area.management.res.company.form</field>
       <field name="inherit_id" ref="base.view_company_form"/>
       <field name="model">res.company</field>
       <field name="arch" type="xml">
diff --git a/partner_area_management/views/stock_location.xml b/stock_location_area_management/views/stock_location.xml
similarity index 78%
rename from partner_area_management/views/stock_location.xml
rename to stock_location_area_management/views/stock_location.xml
index 5689b5fd8175..5a6f22689e10 100644
--- a/partner_area_management/views/stock_location.xml
+++ b/stock_location_area_management/views/stock_location.xml
@@ -2,9 +2,9 @@
 <openerp>
   <data>
 
-    <record id="partner_area_management_stock_location_form_view"
+    <record id="stock_location_area_management_stock_location_form_view"
             model="ir.ui.view">
-      <field name="name">partner.area.management.stock.location.form</field>
+      <field name="name">stock.location.area.management.stock.location.form</field>
       <field name="inherit_id" ref="stock.view_location_form"/>
       <field name="model">stock.location</field>
       <field name="arch" type="xml">
@@ -22,9 +22,9 @@
       </field>
     </record>
 
-    <record id="partner_area_management_stock_location_list_view"
+    <record id="stock_location_area_management_stock_location_list_view"
             model="ir.ui.view">
-      <field name="name">partner.area.management.stock.location.list</field>
+      <field name="name">stock.location.area.management.stock.location.list</field>
       <field name="inherit_id" ref="stock.view_location_tree2"/>
       <field name="model">stock.location</field>
       <field name="arch" type="xml">
@@ -35,9 +35,9 @@
       </field>
     </record>
 
-    <record id="partner_area_management_stock_location_search"
+    <record id="stock_location_area_management_stock_location_search"
             model="ir.ui.view">
-      <field name="name">partner.area.management.stock.location.search</field>
+      <field name="name">stock.location.area.management.stock.location.search</field>
       <field name="model">stock.location</field>
       <field name="inherit_id" ref="stock.view_location_search"/>
       <field name="arch" type="xml">