diff --git a/pms/__manifest__.py b/pms/__manifest__.py
index ec2c9291f..4707d535b 100644
--- a/pms/__manifest__.py
+++ b/pms/__manifest__.py
@@ -57,19 +57,19 @@
         "views/pms_room_type_views.xml",
         "views/pms_room_views.xml",
         "views/pms_room_closure_reason_views.xml",
-        "views/inherited_account_payment_views.xml",
-        "views/inherited_account_move_views.xml",
-        "views/inherited_res_users_views.xml",
+        "views/account_payment_views.xml",
+        "views/account_move_views.xml",
+        "views/res_users_views.xml",
         "views/pms_room_type_class_views.xml",
         "views/pms_room_type_restriction_views.xml",
         "views/pms_room_type_restriction_item_views.xml",
         "views/pms_service_views.xml",
         "views/pms_service_line_views.xml",
         "views/pms_shared_room_views.xml",
-        "views/inherited_res_partner_views.xml",
-        "views/inherited_product_pricelist_views.xml",
-        "views/inherited_product_template_views.xml",
-        "views/inherited_webclient_templates.xml",
+        "views/res_partner_views.xml",
+        "views/product_pricelist_views.xml",
+        "views/product_template_views.xml",
+        "views/webclient_templates.xml",
         "wizard/folio_make_invoice_advance_views.xml",
     ],
     "demo": ["demo/pms_demo.xml"],
diff --git a/pms/models/__init__.py b/pms/models/__init__.py
index e34c5fd89..e3401835e 100644
--- a/pms/models/__init__.py
+++ b/pms/models/__init__.py
@@ -2,11 +2,11 @@
 # Copyright 2018  Dario Lodeiros
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from . import inherited_ir_http
-from . import inherited_payment_return
+from . import ir_http
+from . import payment_return
 from . import pms_board_service_room_type
 from . import pms_property
-from . import inherited_res_users
+from . import res_users
 from . import pms_floor
 from . import pms_folio
 from . import pms_reservation
@@ -16,22 +16,22 @@ from . import pms_amenity
 from . import pms_amenity_type
 from . import pms_room_type
 from . import pms_service
-from . import inherited_account_move
-from . import inherited_product_template
-from . import inherited_res_company
-from . import inherited_account_payment
+from . import account_move
+from . import product_template
+from . import res_company
+from . import account_payment
 from . import pms_room_type_restriction
 from . import pms_room_type_restriction_item
 from . import pms_reservation_line
 from . import pms_checkin_partner
-from . import inherited_product_pricelist
-from . import inherited_res_partner
-from . import inherited_mail_compose_message
+from . import product_pricelist
+from . import res_partner
+from . import mail_compose_message
 from . import pms_room_type_class
 from . import pms_room_closure_reason
 from . import pms_service_line
 from . import pms_board_service
 from . import pms_board_service_room_type_line
 from . import pms_board_service_line
-from . import inherited_account_move_line
+from . import account_move_line
 from . import pms_cancelation_rule
diff --git a/pms/models/inherited_account_move.py b/pms/models/account_move.py
similarity index 100%
rename from pms/models/inherited_account_move.py
rename to pms/models/account_move.py
diff --git a/pms/models/inherited_account_move_line.py b/pms/models/account_move_line.py
similarity index 100%
rename from pms/models/inherited_account_move_line.py
rename to pms/models/account_move_line.py
diff --git a/pms/models/inherited_account_payment.py b/pms/models/account_payment.py
similarity index 100%
rename from pms/models/inherited_account_payment.py
rename to pms/models/account_payment.py
diff --git a/pms/models/inherited_ir_http.py b/pms/models/ir_http.py
similarity index 100%
rename from pms/models/inherited_ir_http.py
rename to pms/models/ir_http.py
diff --git a/pms/models/inherited_mail_compose_message.py b/pms/models/mail_compose_message.py
similarity index 100%
rename from pms/models/inherited_mail_compose_message.py
rename to pms/models/mail_compose_message.py
diff --git a/pms/models/inherited_payment_return.py b/pms/models/payment_return.py
similarity index 100%
rename from pms/models/inherited_payment_return.py
rename to pms/models/payment_return.py
diff --git a/pms/models/inherited_product_pricelist.py b/pms/models/product_pricelist.py
similarity index 100%
rename from pms/models/inherited_product_pricelist.py
rename to pms/models/product_pricelist.py
diff --git a/pms/models/inherited_product_template.py b/pms/models/product_template.py
similarity index 100%
rename from pms/models/inherited_product_template.py
rename to pms/models/product_template.py
diff --git a/pms/models/inherited_res_company.py b/pms/models/res_company.py
similarity index 100%
rename from pms/models/inherited_res_company.py
rename to pms/models/res_company.py
diff --git a/pms/models/inherited_res_partner.py b/pms/models/res_partner.py
similarity index 100%
rename from pms/models/inherited_res_partner.py
rename to pms/models/res_partner.py
diff --git a/pms/models/inherited_res_users.py b/pms/models/res_users.py
similarity index 100%
rename from pms/models/inherited_res_users.py
rename to pms/models/res_users.py
diff --git a/pms/views/inherited_account_move_views.xml b/pms/views/account_move_views.xml
similarity index 100%
rename from pms/views/inherited_account_move_views.xml
rename to pms/views/account_move_views.xml
diff --git a/pms/views/inherited_account_payment_views.xml b/pms/views/account_payment_views.xml
similarity index 100%
rename from pms/views/inherited_account_payment_views.xml
rename to pms/views/account_payment_views.xml
diff --git a/pms/views/inherited_product_pricelist_views.xml b/pms/views/product_pricelist_views.xml
similarity index 100%
rename from pms/views/inherited_product_pricelist_views.xml
rename to pms/views/product_pricelist_views.xml
diff --git a/pms/views/inherited_product_template_views.xml b/pms/views/product_template_views.xml
similarity index 100%
rename from pms/views/inherited_product_template_views.xml
rename to pms/views/product_template_views.xml
diff --git a/pms/views/inherited_res_partner_views.xml b/pms/views/res_partner_views.xml
similarity index 100%
rename from pms/views/inherited_res_partner_views.xml
rename to pms/views/res_partner_views.xml
diff --git a/pms/views/inherited_res_users_views.xml b/pms/views/res_users_views.xml
similarity index 100%
rename from pms/views/inherited_res_users_views.xml
rename to pms/views/res_users_views.xml
diff --git a/pms/views/inherited_webclient_templates.xml b/pms/views/webclient_templates.xml
similarity index 100%
rename from pms/views/inherited_webclient_templates.xml
rename to pms/views/webclient_templates.xml