diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Account.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Account.json
index 350e30107d..28818af199 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Account.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Account.json
@@ -90,7 +90,7 @@
         },
         "shippingAddress": {
             "type": "address",
-            "view": "Crm:Account.Fields.ShippingAddress"
+            "view": "crm:views/account/fields/shipping-address"
         },
         "shippingAddressStreet": {
             "type": "text",
diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json
index 3e8686addd..eccf93833e 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json
@@ -36,7 +36,7 @@
         "reminders": {
             "type": "jsonArray",
             "notStorable": true,
-            "view": "Crm:Meeting.Fields.Reminders"
+            "view": "crm:views/meeting/fields/reminders"
         },
         "direction": {
             "type": "enum",
diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json
index d23365f7f9..3161f068e1 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json
@@ -26,7 +26,7 @@
             "type": "enum",
             "options": ["New", "Assigned", "In Process", "Converted", "Recycled", "Dead"],
             "default": "New",
-            "view": "Fields.EnumStyled",
+            "view": "views/fields/enum-styled",
             "style": {
                 "Converted": "success",
                 "Recycled": "danger",
diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json
index c20eecfedd..a0181bca33 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json
@@ -36,7 +36,7 @@
         "reminders": {
             "type": "jsonArray",
             "notStorable": true,
-            "view": "Crm:Meeting.Fields.Reminders"
+            "view": "crm:views/meeting/fields/reminders"
         },
         "description": {
             "type": "text"
diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json
index 86d24a58d1..ef6e03cb14 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json
@@ -28,14 +28,14 @@
                 "<>": "(opportunity.amount * amount_currency_alias.rate * opportunity.probability / 100) <> {value}"
             },
             "orderBy": "amountWeightedConverted {direction}",
-            "view": "Fields.CurrencyConverted"
+            "view": "views/fields/currency-converted"
         },
         "account": {
             "type": "link"
         },
         "contacts": {
             "type": "linkMultiple",
-            "view": "Crm:Opportunity.Fields.Contacts",
+            "view": "crm:views/opportunity/fields/contacts",
             "columns": {
                 "role": "opportunityRole"
             }
@@ -43,7 +43,7 @@
         "stage": {
             "type": "enum",
             "options": ["Prospecting", "Qualification", "Needs Analysis", "Value Proposition", "Id. Decision Makers", "Perception Analysis", "Proposal/Price Quote", "Negotiation/Review", "Closed Won", "Closed Lost"],
-            "view": "Crm:Opportunity.Fields.Stage",
+            "view": "crm:views/opportunity/fields/stage",
             "default": "Prospecting",
             "audited": true
         },
@@ -55,7 +55,7 @@
         },
         "leadSource": {
             "type": "enum",
-            "view": "Crm:Opportunity.Fields.LeadSource",
+            "view": "crm:views/opportunity/fields/lead-source",
             "customizationOptionsDisabled": true,
             "default": ""
         },
diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json
index c5dccff71a..d6298bbec5 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json
@@ -8,7 +8,7 @@
         "status": {
             "type": "enum",
             "options": ["Not Started", "Started", "Completed", "Canceled", "Deferred"],
-            "view": "Fields.EnumStyled",
+            "view": "views/fields/enum-styled",
             "style": {
                 "Completed": "success"
             },
@@ -28,7 +28,7 @@
         "dateEnd": {
             "type": "datetimeOptional",
             "after": "dateStart",
-            "view": "Crm:Task.Fields.DateEnd",
+            "view": "crm:views/task/fields/date-end",
             "audited": true
         },
         "dateStartDate": {
diff --git a/application/Espo/Resources/metadata/entityDefs/InboundEmail.json b/application/Espo/Resources/metadata/entityDefs/InboundEmail.json
index ff05dd1988..a82879b8ed 100644
--- a/application/Espo/Resources/metadata/entityDefs/InboundEmail.json
+++ b/application/Espo/Resources/metadata/entityDefs/InboundEmail.json
@@ -9,7 +9,7 @@
             "type": "varchar",
             "required": true,
             "maxLength": 100,
-            "view": "EmailAccount.Fields.EmailAddress",
+            "view": "views/email-account/fields/email-address",
             "trim": true
         },
         "status": {
@@ -41,7 +41,7 @@
             "type": "varchar",
             "required": true,
             "default": "INBOX",
-            "view": "InboundEmail.Fields.Folders"
+            "view": "views/inbound-email/fields/folders"
         },
         "fetchSince": {
             "type": "date",
@@ -75,7 +75,7 @@
         },
         "targetUserPosition": {
             "type": "enum",
-            "view": "InboundEmail.Fields.TargetUserPosition",
+            "view": "views/inbound-email/fields/target-user-position",
             "tooltip": true
         },
         "reply": {