diff --git a/maintenance_server_data/README.rst b/maintenance_server_data/README.rst
deleted file mode 100644
index 2e1e290..0000000
--- a/maintenance_server_data/README.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-======================================
-maintenance_server_data
-======================================
-
-Gather several identification data about the servers to maintain.
-
-Installation
-============
-
-Use Odoo normal module installation procedure to install
-``maintenance_server_data``.
-
-Known issues / Roadmap
-======================
-
-None yet.
-
-Bug Tracker
-===========
-
-Bugs are tracked on `our issues website <https://github.com/elabore-coop/maintenance-tools/issues>`_. In case of
-trouble, please check there if your issue has already been
-reported. If you spotted it first, help us smashing it by providing a
-detailed and welcomed feedback.
-
-Credits
-=======
-
-Contributors
-------------
-
-* Stéphan Sainléger
-
-Funders
--------
-
-The development of this module has been financially supported by:
-* Elabore (https://elabore.coop)
-
-
-Maintainer
-----------
-
-This module is maintained by Elabore.
diff --git a/maintenance_server_data/__manifest__.py b/maintenance_server_data/__manifest__.py
index cbb9857..7f749d2 100644
--- a/maintenance_server_data/__manifest__.py
+++ b/maintenance_server_data/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "maintenance_server_data",
-    "version": "16.0.1.0.0",
+    "version": "18.0.1.0.0",
     "author": "Elabore",
     "website": "https://git.elabore.coop/elabore/maintenance-tools",
     "maintainer": "Stéphan Sainléger",
diff --git a/maintenance_server_data/views/maintenance_equipment.xml b/maintenance_server_data/views/maintenance_equipment.xml
index b9cc213..5db8574 100644
--- a/maintenance_server_data/views/maintenance_equipment.xml
+++ b/maintenance_server_data/views/maintenance_equipment.xml
@@ -23,14 +23,14 @@
             <xpath expr="//notebook" position="inside">
                 <page name="services" string="Services">
                     <field name="service_ids" nolabel="1">
-                        <tree create="true" delete="true" editable="top">
+                        <list create="true" delete="true" editable="top">
                             <field name="service_id" />
                             <field
                                 name="version_id"
                                 domain="[('service_id', '=', service_id)]"
                             />
                             <field name="service_url" />
-                        </tree>
+                        </list>
                     </field>
                 </page>
             </xpath>
@@ -39,7 +39,7 @@
 
 
     <record id="equipment_view_tree_server_inherit" model="ir.ui.view">
-        <field name="name">equipment.tree.server.inherit</field>
+        <field name="name">equipment.list.server.inherit</field>
         <field name="model">maintenance.equipment</field>
         <field name="inherit_id" ref="maintenance.hr_equipment_view_tree" />
         <field name="arch" type="xml">
diff --git a/maintenance_server_data/views/os_distribution.xml b/maintenance_server_data/views/os_distribution.xml
index 0f184d0..56232c8 100644
--- a/maintenance_server_data/views/os_distribution.xml
+++ b/maintenance_server_data/views/os_distribution.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="os_distribution_view_tree" model="ir.ui.view">
-        <field name="name">os.distribution.view.tree</field>
+        <field name="name">os.distribution.view.list</field>
         <field name="model">os.distribution</field>
         <field name="arch" type="xml">
-            <tree string="OS Distributions" editable="top">
+            <list editable="top">
                 <field name="distrib_name" />
                 <field name="distrib_version" />
-            </tree>
+            </list>
         </field>
     </record>
 
     <record id="os_distribution_action" model="ir.actions.act_window">
         <field name="name">OS Distribution</field>
         <field name="res_model">os.distribution</field>
-        <field name="view_mode">tree</field>
+        <field name="view_mode">list</field>
         <field name="view_id" ref="os_distribution_view_tree" />
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
diff --git a/maintenance_server_data/views/service.xml b/maintenance_server_data/views/service.xml
index 6f676c8..a27d4a3 100644
--- a/maintenance_server_data/views/service.xml
+++ b/maintenance_server_data/views/service.xml
@@ -2,46 +2,46 @@
 <odoo>
     <!-- VIEWS -->
     <record id="service_view_tree" model="ir.ui.view">
-        <field name="name">service.view.tree</field>
+        <field name="name">service.view.list</field>
         <field name="model">service</field>
         <field name="arch" type="xml">
-            <tree string="Services" editable="top">
+            <list editable="top">
                 <field name="name" />
-            </tree>
+            </list>
         </field>
     </record>
 
     <record id="service_version_view_tree" model="ir.ui.view">
-        <field name="name">service.version.view.tree</field>
+        <field name="name">service.version.view.list</field>
         <field name="model">service.version</field>
         <field name="arch" type="xml">
-            <tree string="Service versions" editable="top">
+            <list editable="top">
                 <field name="service_id" />
                 <field name="name" />
                 <field name="is_last_version" />
-            </tree>
+            </list>
         </field>
     </record>
 
     <record id="backup_server_view_tree" model="ir.ui.view">
-        <field name="name">backup.server.view.tree</field>
+        <field name="name">backup.server.view.list</field>
         <field name="model">backup.server</field>
         <field name="arch" type="xml">
-            <tree string="Backup Servers" editable="top">
+            <list editable="top">
                 <field name="name" />
-            </tree>
+            </list>
         </field>
     </record>
 
     <record id="service_instance_view_tree" model="ir.ui.view">
-        <field name="name">service.instance.view.tree</field>
+        <field name="name">service.instance.view.list</field>
         <field name="model">service.instance</field>
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <field name="equipment_id" />
                 <field name="service_id" />
                 <field name="version_id" />
-            </tree>
+            </list>
         </field>
     </record>
 
@@ -86,7 +86,7 @@
     <record id="service_action" model="ir.actions.act_window">
         <field name="name">Service</field>
         <field name="res_model">service</field>
-        <field name="view_mode">tree</field>
+        <field name="view_mode">list</field>
         <field name="view_id" ref="service_view_tree" />
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
@@ -98,7 +98,7 @@
     <record id="service_version_action" model="ir.actions.act_window">
         <field name="name">Service Version</field>
         <field name="res_model">service.version</field>
-        <field name="view_mode">tree</field>
+        <field name="view_mode">list</field>
         <field name="view_id" ref="service_version_view_tree" />
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
@@ -110,7 +110,7 @@
     <record id="backup_server_action" model="ir.actions.act_window">
         <field name="name">Backup server</field>
         <field name="res_model">backup.server</field>
-        <field name="view_mode">tree</field>
+        <field name="view_mode">list</field>
         <field name="view_id" ref="backup_server_view_tree" />
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
@@ -122,7 +122,7 @@
     <record id="service_instance_action" model="ir.actions.act_window">
         <field name="name">Services</field>
         <field name="res_model">service.instance</field>
-        <field name="view_mode">tree</field>
+        <field name="view_mode">list</field>
         <field name="view_id" ref="service_instance_view_tree" />
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">