diff --git a/addons/hr_equipment/models/__init__.py b/addons/hr_equipment/models/__init__.py
deleted file mode 100644
index 96f730a43a9..00000000000
--- a/addons/hr_equipment/models/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import hr_equipment
-import res_config
diff --git a/addons/hr_equipment/__init__.py b/addons/maintenance/__init__.py
similarity index 100%
rename from addons/hr_equipment/__init__.py
rename to addons/maintenance/__init__.py
diff --git a/addons/hr_equipment/__openerp__.py b/addons/maintenance/__openerp__.py
similarity index 67%
rename from addons/hr_equipment/__openerp__.py
rename to addons/maintenance/__openerp__.py
index 5019846aaf8..5bf2c830568 100644
--- a/addons/hr_equipment/__openerp__.py
+++ b/addons/maintenance/__openerp__.py
@@ -10,13 +10,13 @@
     'depends': ['hr'],
     'summary': 'Equipments, Assets, Internal Hardware, Allocation Tracking',
     'data': [
-        'security/hr_equipment.xml',
+        'security/maintenance.xml',
         'security/ir.model.access.csv',
-        'data/hr_equipment_data.xml',
-        'views/res_config_views.xml',
-        'views/hr_equipment_views.xml',
+        'data/maintenance_data.xml',
+        'views/maintenance_config_settings_views.xml',
+        'views/maintenance_views.xml',
     ],
-    'demo': ['data/hr_equipment_demo.xml'],
+    'demo': ['data/maintenance_demo.xml'],
     'installable': True,
     'application': True,
 }
diff --git a/addons/hr_equipment/data/hr_equipment_data.xml b/addons/maintenance/data/maintenance_data.xml
similarity index 100%
rename from addons/hr_equipment/data/hr_equipment_data.xml
rename to addons/maintenance/data/maintenance_data.xml
diff --git a/addons/hr_equipment/data/hr_equipment_demo.xml b/addons/maintenance/data/maintenance_demo.xml
similarity index 100%
rename from addons/hr_equipment/data/hr_equipment_demo.xml
rename to addons/maintenance/data/maintenance_demo.xml
diff --git a/addons/hr_equipment/i18n/af.po b/addons/maintenance/i18n/af.po
similarity index 100%
rename from addons/hr_equipment/i18n/af.po
rename to addons/maintenance/i18n/af.po
diff --git a/addons/hr_equipment/i18n/am.po b/addons/maintenance/i18n/am.po
similarity index 100%
rename from addons/hr_equipment/i18n/am.po
rename to addons/maintenance/i18n/am.po
diff --git a/addons/hr_equipment/i18n/ar.po b/addons/maintenance/i18n/ar.po
similarity index 100%
rename from addons/hr_equipment/i18n/ar.po
rename to addons/maintenance/i18n/ar.po
diff --git a/addons/hr_equipment/i18n/bg.po b/addons/maintenance/i18n/bg.po
similarity index 100%
rename from addons/hr_equipment/i18n/bg.po
rename to addons/maintenance/i18n/bg.po
diff --git a/addons/hr_equipment/i18n/bs.po b/addons/maintenance/i18n/bs.po
similarity index 100%
rename from addons/hr_equipment/i18n/bs.po
rename to addons/maintenance/i18n/bs.po
diff --git a/addons/hr_equipment/i18n/ca.po b/addons/maintenance/i18n/ca.po
similarity index 100%
rename from addons/hr_equipment/i18n/ca.po
rename to addons/maintenance/i18n/ca.po
diff --git a/addons/hr_equipment/i18n/cs.po b/addons/maintenance/i18n/cs.po
similarity index 100%
rename from addons/hr_equipment/i18n/cs.po
rename to addons/maintenance/i18n/cs.po
diff --git a/addons/hr_equipment/i18n/da.po b/addons/maintenance/i18n/da.po
similarity index 100%
rename from addons/hr_equipment/i18n/da.po
rename to addons/maintenance/i18n/da.po
diff --git a/addons/hr_equipment/i18n/de.po b/addons/maintenance/i18n/de.po
similarity index 100%
rename from addons/hr_equipment/i18n/de.po
rename to addons/maintenance/i18n/de.po
diff --git a/addons/hr_equipment/i18n/el.po b/addons/maintenance/i18n/el.po
similarity index 100%
rename from addons/hr_equipment/i18n/el.po
rename to addons/maintenance/i18n/el.po
diff --git a/addons/hr_equipment/i18n/en_GB.po b/addons/maintenance/i18n/en_GB.po
similarity index 100%
rename from addons/hr_equipment/i18n/en_GB.po
rename to addons/maintenance/i18n/en_GB.po
diff --git a/addons/hr_equipment/i18n/en_US.po b/addons/maintenance/i18n/en_US.po
similarity index 100%
rename from addons/hr_equipment/i18n/en_US.po
rename to addons/maintenance/i18n/en_US.po
diff --git a/addons/hr_equipment/i18n/es.po b/addons/maintenance/i18n/es.po
similarity index 100%
rename from addons/hr_equipment/i18n/es.po
rename to addons/maintenance/i18n/es.po
diff --git a/addons/hr_equipment/i18n/es_AR.po b/addons/maintenance/i18n/es_AR.po
similarity index 100%
rename from addons/hr_equipment/i18n/es_AR.po
rename to addons/maintenance/i18n/es_AR.po
diff --git a/addons/hr_equipment/i18n/es_BO.po b/addons/maintenance/i18n/es_BO.po
similarity index 100%
rename from addons/hr_equipment/i18n/es_BO.po
rename to addons/maintenance/i18n/es_BO.po
diff --git a/addons/hr_equipment/i18n/es_CL.po b/addons/maintenance/i18n/es_CL.po
similarity index 100%
rename from addons/hr_equipment/i18n/es_CL.po
rename to addons/maintenance/i18n/es_CL.po
diff --git a/addons/hr_equipment/i18n/es_CO.po b/addons/maintenance/i18n/es_CO.po
similarity index 100%
rename from addons/hr_equipment/i18n/es_CO.po
rename to addons/maintenance/i18n/es_CO.po
diff --git a/addons/hr_equipment/i18n/es_CR.po b/addons/maintenance/i18n/es_CR.po
similarity index 100%
rename from addons/hr_equipment/i18n/es_CR.po
rename to addons/maintenance/i18n/es_CR.po
diff --git a/addons/hr_equipment/i18n/es_DO.po b/addons/maintenance/i18n/es_DO.po
similarity index 100%
rename from addons/hr_equipment/i18n/es_DO.po
rename to addons/maintenance/i18n/es_DO.po
diff --git a/addons/hr_equipment/i18n/es_EC.po b/addons/maintenance/i18n/es_EC.po
similarity index 100%
rename from addons/hr_equipment/i18n/es_EC.po
rename to addons/maintenance/i18n/es_EC.po
diff --git a/addons/hr_equipment/i18n/es_MX.po b/addons/maintenance/i18n/es_MX.po
similarity index 100%
rename from addons/hr_equipment/i18n/es_MX.po
rename to addons/maintenance/i18n/es_MX.po
diff --git a/addons/hr_equipment/i18n/es_PE.po b/addons/maintenance/i18n/es_PE.po
similarity index 100%
rename from addons/hr_equipment/i18n/es_PE.po
rename to addons/maintenance/i18n/es_PE.po
diff --git a/addons/hr_equipment/i18n/es_PY.po b/addons/maintenance/i18n/es_PY.po
similarity index 100%
rename from addons/hr_equipment/i18n/es_PY.po
rename to addons/maintenance/i18n/es_PY.po
diff --git a/addons/hr_equipment/i18n/es_VE.po b/addons/maintenance/i18n/es_VE.po
similarity index 100%
rename from addons/hr_equipment/i18n/es_VE.po
rename to addons/maintenance/i18n/es_VE.po
diff --git a/addons/hr_equipment/i18n/et.po b/addons/maintenance/i18n/et.po
similarity index 100%
rename from addons/hr_equipment/i18n/et.po
rename to addons/maintenance/i18n/et.po
diff --git a/addons/hr_equipment/i18n/eu.po b/addons/maintenance/i18n/eu.po
similarity index 100%
rename from addons/hr_equipment/i18n/eu.po
rename to addons/maintenance/i18n/eu.po
diff --git a/addons/hr_equipment/i18n/fa.po b/addons/maintenance/i18n/fa.po
similarity index 100%
rename from addons/hr_equipment/i18n/fa.po
rename to addons/maintenance/i18n/fa.po
diff --git a/addons/hr_equipment/i18n/fi.po b/addons/maintenance/i18n/fi.po
similarity index 100%
rename from addons/hr_equipment/i18n/fi.po
rename to addons/maintenance/i18n/fi.po
diff --git a/addons/hr_equipment/i18n/fr.po b/addons/maintenance/i18n/fr.po
similarity index 100%
rename from addons/hr_equipment/i18n/fr.po
rename to addons/maintenance/i18n/fr.po
diff --git a/addons/hr_equipment/i18n/fr_BE.po b/addons/maintenance/i18n/fr_BE.po
similarity index 100%
rename from addons/hr_equipment/i18n/fr_BE.po
rename to addons/maintenance/i18n/fr_BE.po
diff --git a/addons/hr_equipment/i18n/fr_CA.po b/addons/maintenance/i18n/fr_CA.po
similarity index 100%
rename from addons/hr_equipment/i18n/fr_CA.po
rename to addons/maintenance/i18n/fr_CA.po
diff --git a/addons/hr_equipment/i18n/gl.po b/addons/maintenance/i18n/gl.po
similarity index 100%
rename from addons/hr_equipment/i18n/gl.po
rename to addons/maintenance/i18n/gl.po
diff --git a/addons/hr_equipment/i18n/gu.po b/addons/maintenance/i18n/gu.po
similarity index 100%
rename from addons/hr_equipment/i18n/gu.po
rename to addons/maintenance/i18n/gu.po
diff --git a/addons/hr_equipment/i18n/he.po b/addons/maintenance/i18n/he.po
similarity index 100%
rename from addons/hr_equipment/i18n/he.po
rename to addons/maintenance/i18n/he.po
diff --git a/addons/hr_equipment/i18n/hi.po b/addons/maintenance/i18n/hi.po
similarity index 100%
rename from addons/hr_equipment/i18n/hi.po
rename to addons/maintenance/i18n/hi.po
diff --git a/addons/hr_equipment/i18n/hr.po b/addons/maintenance/i18n/hr.po
similarity index 100%
rename from addons/hr_equipment/i18n/hr.po
rename to addons/maintenance/i18n/hr.po
diff --git a/addons/hr_equipment/i18n/hr_equipment.pot b/addons/maintenance/i18n/hr_equipment.pot
similarity index 100%
rename from addons/hr_equipment/i18n/hr_equipment.pot
rename to addons/maintenance/i18n/hr_equipment.pot
diff --git a/addons/hr_equipment/i18n/hu.po b/addons/maintenance/i18n/hu.po
similarity index 100%
rename from addons/hr_equipment/i18n/hu.po
rename to addons/maintenance/i18n/hu.po
diff --git a/addons/hr_equipment/i18n/id.po b/addons/maintenance/i18n/id.po
similarity index 100%
rename from addons/hr_equipment/i18n/id.po
rename to addons/maintenance/i18n/id.po
diff --git a/addons/hr_equipment/i18n/it.po b/addons/maintenance/i18n/it.po
similarity index 100%
rename from addons/hr_equipment/i18n/it.po
rename to addons/maintenance/i18n/it.po
diff --git a/addons/hr_equipment/i18n/ja.po b/addons/maintenance/i18n/ja.po
similarity index 100%
rename from addons/hr_equipment/i18n/ja.po
rename to addons/maintenance/i18n/ja.po
diff --git a/addons/hr_equipment/i18n/ka.po b/addons/maintenance/i18n/ka.po
similarity index 100%
rename from addons/hr_equipment/i18n/ka.po
rename to addons/maintenance/i18n/ka.po
diff --git a/addons/hr_equipment/i18n/kab.po b/addons/maintenance/i18n/kab.po
similarity index 100%
rename from addons/hr_equipment/i18n/kab.po
rename to addons/maintenance/i18n/kab.po
diff --git a/addons/hr_equipment/i18n/kk.po b/addons/maintenance/i18n/kk.po
similarity index 100%
rename from addons/hr_equipment/i18n/kk.po
rename to addons/maintenance/i18n/kk.po
diff --git a/addons/hr_equipment/i18n/ko.po b/addons/maintenance/i18n/ko.po
similarity index 100%
rename from addons/hr_equipment/i18n/ko.po
rename to addons/maintenance/i18n/ko.po
diff --git a/addons/hr_equipment/i18n/lt.po b/addons/maintenance/i18n/lt.po
similarity index 100%
rename from addons/hr_equipment/i18n/lt.po
rename to addons/maintenance/i18n/lt.po
diff --git a/addons/hr_equipment/i18n/lv.po b/addons/maintenance/i18n/lv.po
similarity index 100%
rename from addons/hr_equipment/i18n/lv.po
rename to addons/maintenance/i18n/lv.po
diff --git a/addons/hr_equipment/i18n/mk.po b/addons/maintenance/i18n/mk.po
similarity index 100%
rename from addons/hr_equipment/i18n/mk.po
rename to addons/maintenance/i18n/mk.po
diff --git a/addons/hr_equipment/i18n/mn.po b/addons/maintenance/i18n/mn.po
similarity index 100%
rename from addons/hr_equipment/i18n/mn.po
rename to addons/maintenance/i18n/mn.po
diff --git a/addons/hr_equipment/i18n/nb.po b/addons/maintenance/i18n/nb.po
similarity index 100%
rename from addons/hr_equipment/i18n/nb.po
rename to addons/maintenance/i18n/nb.po
diff --git a/addons/hr_equipment/i18n/nl.po b/addons/maintenance/i18n/nl.po
similarity index 100%
rename from addons/hr_equipment/i18n/nl.po
rename to addons/maintenance/i18n/nl.po
diff --git a/addons/hr_equipment/i18n/nl_BE.po b/addons/maintenance/i18n/nl_BE.po
similarity index 100%
rename from addons/hr_equipment/i18n/nl_BE.po
rename to addons/maintenance/i18n/nl_BE.po
diff --git a/addons/hr_equipment/i18n/pl.po b/addons/maintenance/i18n/pl.po
similarity index 100%
rename from addons/hr_equipment/i18n/pl.po
rename to addons/maintenance/i18n/pl.po
diff --git a/addons/hr_equipment/i18n/pt.po b/addons/maintenance/i18n/pt.po
similarity index 100%
rename from addons/hr_equipment/i18n/pt.po
rename to addons/maintenance/i18n/pt.po
diff --git a/addons/hr_equipment/i18n/pt_BR.po b/addons/maintenance/i18n/pt_BR.po
similarity index 100%
rename from addons/hr_equipment/i18n/pt_BR.po
rename to addons/maintenance/i18n/pt_BR.po
diff --git a/addons/hr_equipment/i18n/ro.po b/addons/maintenance/i18n/ro.po
similarity index 100%
rename from addons/hr_equipment/i18n/ro.po
rename to addons/maintenance/i18n/ro.po
diff --git a/addons/hr_equipment/i18n/ru.po b/addons/maintenance/i18n/ru.po
similarity index 100%
rename from addons/hr_equipment/i18n/ru.po
rename to addons/maintenance/i18n/ru.po
diff --git a/addons/hr_equipment/i18n/sk.po b/addons/maintenance/i18n/sk.po
similarity index 100%
rename from addons/hr_equipment/i18n/sk.po
rename to addons/maintenance/i18n/sk.po
diff --git a/addons/hr_equipment/i18n/sl.po b/addons/maintenance/i18n/sl.po
similarity index 100%
rename from addons/hr_equipment/i18n/sl.po
rename to addons/maintenance/i18n/sl.po
diff --git a/addons/hr_equipment/i18n/sq.po b/addons/maintenance/i18n/sq.po
similarity index 100%
rename from addons/hr_equipment/i18n/sq.po
rename to addons/maintenance/i18n/sq.po
diff --git a/addons/hr_equipment/i18n/sr.po b/addons/maintenance/i18n/sr.po
similarity index 100%
rename from addons/hr_equipment/i18n/sr.po
rename to addons/maintenance/i18n/sr.po
diff --git a/addons/hr_equipment/i18n/sr@latin.po b/addons/maintenance/i18n/sr@latin.po
similarity index 100%
rename from addons/hr_equipment/i18n/sr@latin.po
rename to addons/maintenance/i18n/sr@latin.po
diff --git a/addons/hr_equipment/i18n/sv.po b/addons/maintenance/i18n/sv.po
similarity index 100%
rename from addons/hr_equipment/i18n/sv.po
rename to addons/maintenance/i18n/sv.po
diff --git a/addons/hr_equipment/i18n/th.po b/addons/maintenance/i18n/th.po
similarity index 100%
rename from addons/hr_equipment/i18n/th.po
rename to addons/maintenance/i18n/th.po
diff --git a/addons/hr_equipment/i18n/tr.po b/addons/maintenance/i18n/tr.po
similarity index 100%
rename from addons/hr_equipment/i18n/tr.po
rename to addons/maintenance/i18n/tr.po
diff --git a/addons/hr_equipment/i18n/uk.po b/addons/maintenance/i18n/uk.po
similarity index 100%
rename from addons/hr_equipment/i18n/uk.po
rename to addons/maintenance/i18n/uk.po
diff --git a/addons/hr_equipment/i18n/vi.po b/addons/maintenance/i18n/vi.po
similarity index 100%
rename from addons/hr_equipment/i18n/vi.po
rename to addons/maintenance/i18n/vi.po
diff --git a/addons/hr_equipment/i18n/zh_CN.po b/addons/maintenance/i18n/zh_CN.po
similarity index 100%
rename from addons/hr_equipment/i18n/zh_CN.po
rename to addons/maintenance/i18n/zh_CN.po
diff --git a/addons/hr_equipment/i18n/zh_TW.po b/addons/maintenance/i18n/zh_TW.po
similarity index 100%
rename from addons/hr_equipment/i18n/zh_TW.po
rename to addons/maintenance/i18n/zh_TW.po
diff --git a/addons/maintenance/models/__init__.py b/addons/maintenance/models/__init__.py
new file mode 100644
index 00000000000..427d3df6a82
--- /dev/null
+++ b/addons/maintenance/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+import maintenance
+import maintenance_config_settings
diff --git a/addons/hr_equipment/models/hr_equipment.py b/addons/maintenance/models/maintenance.py
similarity index 99%
rename from addons/hr_equipment/models/hr_equipment.py
rename to addons/maintenance/models/maintenance.py
index a4a2cfa8486..e0c4590dfd3 100644
--- a/addons/hr_equipment/models/hr_equipment.py
+++ b/addons/maintenance/models/maintenance.py
@@ -82,7 +82,7 @@ class HrEquipment(models.Model):
     def _track_subtype(self, init_values):
         self.ensure_one()
         if ('employee_id' in init_values and self.employee_id) or ('department_id' in init_values and self.department_id):
-            return 'hr_equipment.mt_mat_assign'
+            return 'maintenance.mt_mat_assign'
         return super(HrEquipment, self)._track_subtype(init_values)
 
     @api.multi
@@ -227,9 +227,9 @@ class HrEquipmentRequest(models.Model):
     def _track_subtype(self, init_values):
         self.ensure_one()
         if 'stage_id' in init_values and self.stage_id.sequence <= 1:
-            return 'hr_equipment.mt_req_created'
+            return 'maintenance.mt_req_created'
         elif 'stage_id' in init_values and self.stage_id.sequence > 1:
-            return 'hr_equipment.mt_req_status'
+            return 'maintenance.mt_req_status'
         return super(HrEquipmentRequest, self)._track_subtype(init_values)
 
     name = fields.Char('Subjects', required=True)
diff --git a/addons/hr_equipment/models/res_config.py b/addons/maintenance/models/maintenance_config_settings.py
similarity index 100%
rename from addons/hr_equipment/models/res_config.py
rename to addons/maintenance/models/maintenance_config_settings.py
diff --git a/addons/hr_equipment/security/ir.model.access.csv b/addons/maintenance/security/ir.model.access.csv
similarity index 100%
rename from addons/hr_equipment/security/ir.model.access.csv
rename to addons/maintenance/security/ir.model.access.csv
diff --git a/addons/hr_equipment/security/hr_equipment.xml b/addons/maintenance/security/maintenance.xml
similarity index 100%
rename from addons/hr_equipment/security/hr_equipment.xml
rename to addons/maintenance/security/maintenance.xml
diff --git a/addons/hr_equipment/static/description/icon.png b/addons/maintenance/static/description/icon.png
similarity index 100%
rename from addons/hr_equipment/static/description/icon.png
rename to addons/maintenance/static/description/icon.png
diff --git a/addons/hr_equipment/tests/__init__.py b/addons/maintenance/tests/__init__.py
similarity index 50%
rename from addons/hr_equipment/tests/__init__.py
rename to addons/maintenance/tests/__init__.py
index a43ab866ebc..0ed77b51a2c 100644
--- a/addons/hr_equipment/tests/__init__.py
+++ b/addons/maintenance/tests/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-import test_hr_equipment
+import test_maintenance
diff --git a/addons/hr_equipment/tests/test_hr_equipment.py b/addons/maintenance/tests/test_maintenance.py
similarity index 100%
rename from addons/hr_equipment/tests/test_hr_equipment.py
rename to addons/maintenance/tests/test_maintenance.py
diff --git a/addons/hr_equipment/views/res_config_views.xml b/addons/maintenance/views/maintenance_config_settings_views.xml
similarity index 100%
rename from addons/hr_equipment/views/res_config_views.xml
rename to addons/maintenance/views/maintenance_config_settings_views.xml
diff --git a/addons/hr_equipment/views/hr_equipment_views.xml b/addons/maintenance/views/maintenance_views.xml
similarity index 100%
rename from addons/hr_equipment/views/hr_equipment_views.xml
rename to addons/maintenance/views/maintenance_views.xml