diff --git a/__init__.py b/__init__.py
index bfe39a8..deddfc0 100644
--- a/__init__.py
+++ b/__init__.py
@@ -7,7 +7,7 @@ from .reporting import *
 
 def register():
     Pool.register(
-        PosDevice,
+        SaleDevice,
         module='sale_pos_esc', type_='model')
     Pool.register(
         Receipt,
diff --git a/device.py b/device.py
index fde0ca2..157acbd 100644
--- a/device.py
+++ b/device.py
@@ -7,12 +7,12 @@ from trytond.model import ModelView, fields
 from trytond.pool import Pool, PoolMeta
 from trytond.rpc import RPC
 
-__all__ = ['PosDevice']
+__all__ = ['SaleDevice']
 __metaclass__ = PoolMeta
 
 
-class PosDevice:
-    __name__ = 'sale_pos.device'
+class SaleDevice:
+    __name__ = 'sale.device'
     printer_port = fields.Char(string='Printer Port', help='Port type the '
             'receipt printer is conntected to.')
     display_port = fields.Char('Display port', help='Like /dev/ttyS0')
@@ -22,7 +22,7 @@ class PosDevice:
 
     @classmethod
     def __setup__(cls):
-        super(PosDevice, cls).__setup__()
+        super(SaleDevice, cls).__setup__()
         cls.__rpc__.update({
                 'test_printer': RPC(instantiate=0),
                 'test_display': RPC(instantiate=0),
diff --git a/device.xml b/device.xml
index f0df3dc..00eaee0 100644
--- a/device.xml
+++ b/device.xml
@@ -3,16 +3,15 @@
       copyright notices and license terms. -->
 <tryton>
     <data>
-        <record model="ir.ui.view" id="pos_device_form">
-            <field name="model">sale_pos.device</field>
-            <field name="inherit" ref="sale_pos.pos_device_form"/>
-            <field name="name">pos_device_form</field>
+        <record model="ir.ui.view" id="sale_device_form">
+            <field name="model">sale.device</field>
+            <field name="inherit" ref="sale_payment.sale_device_form_view"/>
+            <field name="name">sale_device_form</field>
         </record>
-        <record model="ir.ui.view" id="pos_device_tree">
-            <field name="model">sale_pos.device</field>
-            <field name="inherit" ref="sale_pos.pos_device_tree"/>
-            <field name="name">pos_device_tree</field>
+        <record model="ir.ui.view" id="sale_device_tree">
+            <field name="model">sale.device</field>
+            <field name="inherit" ref="sale_payment.sale_device_tree_view"/>
+            <field name="name">sale_device_tree</field>
         </record>
-
     </data>
 </tryton>
diff --git a/tryton.cfg b/tryton.cfg
index 7395857..f8144d5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,6 +1,7 @@
 [tryton]
-version=3.0.0
+version=3.4.0
 depends:
     sale_pos
+    sale_payment
 xml:
     device.xml
diff --git a/view/pos_device_form.xml b/view/sale_device_form.xml
similarity index 100%
rename from view/pos_device_form.xml
rename to view/sale_device_form.xml
diff --git a/view/pos_device_tree.xml b/view/sale_device_tree.xml
similarity index 100%
rename from view/pos_device_tree.xml
rename to view/sale_device_tree.xml