diff --git a/addons/picking_wave/security/ir.model.access.csv b/addons/picking_wave/security/ir.model.access.csv
deleted file mode 100644
index 55211a5cd6c..00000000000
--- a/addons/picking_wave/security/ir.model.access.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-picking_wave,picking.wave,model_picking_wave,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/addons/picking_wave/__init__.py b/addons/stock_picking_wave/__init__.py
similarity index 97%
rename from addons/picking_wave/__init__.py
rename to addons/stock_picking_wave/__init__.py
index 83928b4b941..5d412cbda31 100644
--- a/addons/picking_wave/__init__.py
+++ b/addons/stock_picking_wave/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import picking_wave
+import stock_picking_wave
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/picking_wave/__openerp__.py b/addons/stock_picking_wave/__openerp__.py
similarity index 94%
rename from addons/picking_wave/__openerp__.py
rename to addons/stock_picking_wave/__openerp__.py
index e42a8ca0e9c..f20f853d0c0 100644
--- a/addons/picking_wave/__openerp__.py
+++ b/addons/stock_picking_wave/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Picking Waves',
+    'name': 'Stock Picking Waves',
     'version': '1.0',
     'category': 'Stock Management',
     'description': """
@@ -31,7 +31,7 @@ This module adds the picking wave option in warehouse management.
     'website': 'http://www.openerp.com',
     'depends': ['stock'],
     'data': ['security/ir.model.access.csv',
-            'picking_wave_view.xml'],
+            'stock_picking_wave_view.xml'],
     'demo': [],
     'installable': True,
     'auto_install': True,
diff --git a/addons/stock_picking_wave/security/ir.model.access.csv b/addons/stock_picking_wave/security/ir.model.access.csv
new file mode 100644
index 00000000000..f5298b2c08d
--- /dev/null
+++ b/addons/stock_picking_wave/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+stock_picking_wave,stock.picking.wave,model_stock_picking_wave,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/addons/picking_wave/picking_wave.py b/addons/stock_picking_wave/stock_picking_wave.py
similarity index 96%
rename from addons/picking_wave/picking_wave.py
rename to addons/stock_picking_wave/stock_picking_wave.py
index 3e61342183c..1f09c359e1a 100644
--- a/addons/picking_wave/picking_wave.py
+++ b/addons/stock_picking_wave/stock_picking_wave.py
@@ -3,8 +3,8 @@ from openerp.tools.translate import _
 from openerp.osv import fields, osv
 from openerp import workflow
 
-class picking_wave(osv.osv):
-    _name = "picking.wave"
+class stock_picking_wave(osv.osv):
+    _name = "stock.picking.wave"
     _columns = {
         'name': fields.char('name', required=True, help='Name of the picking wave'),
         'resp_id': fields.many2one('res.partner', 'Responsible', help='Person responsible for this wave'),
diff --git a/addons/picking_wave/picking_wave_view.xml b/addons/stock_picking_wave/stock_picking_wave_view.xml
similarity index 92%
rename from addons/picking_wave/picking_wave_view.xml
rename to addons/stock_picking_wave/stock_picking_wave_view.xml
index 5f2a27183ce..dadc4920ee3 100644
--- a/addons/picking_wave/picking_wave_view.xml
+++ b/addons/stock_picking_wave/stock_picking_wave_view.xml
@@ -2,9 +2,9 @@
     <data>
         <record id="view_picking_wave_form" model="ir.ui.view">
             <field name="name">picking.wave.form</field>
-            <field name="model">picking.wave</field>
+            <field name="model">stock.picking.wave</field>
             <field name="arch" type="xml">
-                <form string="Stock Inventory Lines" version="7.0">
+                <form string="Stock Picking Waves" version="7.0">
                     <sheet>
                         <div class="oe_right oe_button_box">
                         <button name="confirm_picking" string="Confirm all pickings" type="object"/>
@@ -47,9 +47,9 @@
 
         <record id="view_picking_wave_tree" model="ir.ui.view">
             <field name="name">picking.wave.tree</field>
-            <field name="model">picking.wave</field>
+            <field name="model">stock.picking.wave</field>
             <field name="arch" type="xml">
-                <tree string="Picking Waves">
+                <tree string="Stock Picking Waves">
                     <field name="name"/>
                     <field name="resp_id"/>
                     <field name="capacity"/>
@@ -63,7 +63,7 @@
         <record id="action_picking_wave" model="ir.actions.act_window">
             <field name="name">Picking Waves</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">picking.wave</field>
+            <field name="res_model">stock.picking.wave</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="help" type="html">