diff --git a/account_payment_terminal/__manifest__.py b/account_payment_terminal/__manifest__.py
index 5d2fc311087..aefff410bd2 100644
--- a/account_payment_terminal/__manifest__.py
+++ b/account_payment_terminal/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "Account Payment Terminal",
     "summary": """This addon allows to pay invoices using payment terminal""",
-    "version": "14.0.1.0.0",
+    "version": "16.0.1.0.0",
     "license": "AGPL-3",
     "author": "ACSONE SA/NV, Odoo Community Association (OCA)",
     "maintainers": ["sbejaoui"],
@@ -12,10 +12,17 @@
     "depends": ["account"],
     "data": [
         "security/account_payment_terminal.xml",
-        "views/webclient_templates.xml",
-        "views/account_payment_terminal.xml",
-        "views/account_journal.xml",
+        "views/account_payment_terminal_views.xml",
+        "views/account_journal_views.xml",
         "views/oca_payment_terminal_form_mixin.xml",
         "wizards/account_payment_register.xml",
     ],
+    "assets": {
+        "web.assets_backend": [
+            "account_payment_terminal/static/src/js/views/"
+            "payment_terminal_form/payment_terminal_form_controller.js",
+            "account_payment_terminal/static/src/js/views/"
+            "payment_terminal_form/payment_terminal_form_view.js",
+        ],
+    },
 }
diff --git a/account_payment_terminal/views/account_journal.xml b/account_payment_terminal/views/account_journal_views.xml
similarity index 100%
rename from account_payment_terminal/views/account_journal.xml
rename to account_payment_terminal/views/account_journal_views.xml
diff --git a/account_payment_terminal/views/account_payment_terminal.xml b/account_payment_terminal/views/account_payment_terminal_views.xml
similarity index 100%
rename from account_payment_terminal/views/account_payment_terminal.xml
rename to account_payment_terminal/views/account_payment_terminal_views.xml
diff --git a/account_payment_terminal/views/webclient_templates.xml b/account_payment_terminal/views/webclient_templates.xml
deleted file mode 100644
index 7f4d88454e5..00000000000
--- a/account_payment_terminal/views/webclient_templates.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-  <template id="assets_backend" inherit_id="web.assets_backend">
-    <xpath expr="." position="inside">
-      <script
-                type="text/javascript"
-                src="/account_payment_terminal/static/src/js/views/payment_terminal_form/payment_terminal_form_controller.js"
-            />
-      <script
-                type="text/javascript"
-                src="/account_payment_terminal/static/src/js/views/payment_terminal_form/payment_terminal_form_view.js"
-            />
-    </xpath>
-  </template>
-</odoo>