diff --git a/models/product.model.lkml b/models/product.model.lkml
index 4da10001..9b823833 100644
--- a/models/product.model.lkml
+++ b/models/product.model.lkml
@@ -1,7 +1,6 @@
 connection: "snowflake"
 
 # Limit include only to the ones really needed by this explore
-include: "/views/marts/mlt/*.view.lkml"
 include: "/views/marts/product/*.view.lkml"
 include: "/views/marts/sales/*.view.lkml"
 include: "/views/reports/product/*.view.lkml"
@@ -208,6 +207,12 @@ explore: fct_feature_daily_snapshot {
   }
 }
 
+explore: fct_trial_request_history {
+  label: "Trial Request History"
+  group_label: "[New] Trial Requests"
+}
+
+# To deprecate in favor of fct_trial_request_history
 explore: fct_in_product_trial_requests {
   label: "Latest In-app Trial Requests"
   group_label: "[New] Trial Requests"
@@ -218,12 +223,6 @@ explore: rpt_active_user_base {
   group_label: "[New] Active Users"
 }
 
-explore: fct_onprem_trial_requests_history  {
-  label: "On-prem Trial Request History"
-  group_label: "[New] Trial Requests"
-
-}
-
 explore: fct_subscription_history {
   label: "Cloud Subscription History (360)"
   group_label: "[New] Cloud 360"
diff --git a/views/marts/mlt/fct_onprem_trial_requests_history.view.lkml b/views/marts/mlt/fct_onprem_trial_requests_history.view.lkml
deleted file mode 100644
index 53321fab..00000000
--- a/views/marts/mlt/fct_onprem_trial_requests_history.view.lkml
+++ /dev/null
@@ -1,276 +0,0 @@
-view: fct_onprem_trial_requests_history {
-  # The sql_table_name parameter indicates the underlying database table
-  # to be used for all fields in this view.
-  sql_table_name: "MART_MLT".fct_onprem_trial_requests_history ;;
-  label: "  * Trial Request: On-prem"
-
-
-  ###
-  ### IDs
-  ###
-
-  dimension: trial_request_id {
-    type: string
-    sql: ${TABLE}.trial_request_id ;;
-    primary_key: yes
-    hidden: no
-  }
-
-
-  dimension: server_id {
-    type: string
-    sql: ${TABLE}.server_id ;;
-    label: "Server ID"
-    description: "The id of the server where the trial request originates from."
-  }
-
-
-  ###
-  ### Basic trial information
-  ###
-
-
-  dimension: trial_email {
-    type: string
-    sql: ${TABLE}."TRIAL_EMAIL" ;;
-  }
-
-  dimension: email_domain {
-    type: string
-    sql: ${TABLE}.email_domain ;;
-    label: "Email Domain"
-    description: "The domain part of the email. Useful for grouping requests from same companies."
-  }
-
-  dimension: company_name {
-    type: string
-    sql: ${TABLE}.company_name ;;
-    label: "Company Name"
-    description: "The name of the company requesting the trial."
-  }
-
-  dimension: company_size_bucket {
-    type: string
-    sql: ${TABLE}.company_size_bucket ;;
-    label: "Company Size (Bucket)"
-    description: "Company size, belonging in one of the following buckets: 1-50, 50-100, 100-500, 500-1000, 1000-2500, 2500+."
-  }
-
-  dimension: country_name {
-    type: string
-    sql: ${TABLE}.country_name ;;
-    label: "Country"
-    description: "The name of the country, as filled in in the trial request form."
-  }
-
-  dimension: name {
-    type: string
-    sql: ${TABLE}.name ;;
-    label: "Name"
-    description: "The display name of the user who requested the trial."
-  }
-
-  dimension: request_source {
-    type: string
-    sql: ${TABLE}.request_source ;;
-    label: "Request Source"
-    description: "Whether this trial request is originating from In-app or from Mattermost website."
-  }
-
-  dimension: site_name {
-    type: string
-    sql: ${TABLE}.site_name ;;
-    label: "Site Name"
-    description: "The name of the Mattermost installation, as defined in the administrator view."
-  }
-
-  dimension: site_url {
-    type: string
-    sql: ${TABLE}.site_url ;;
-    label: "Site URL"
-    description: "The URL of the installation set via the system console in Mattermost by the user, or https://mattermost.com if trial was requested from mattermost.com/trial."
-  }
-
-  dimension: num_users {
-    type: number
-    sql: ${TABLE}.num_users ;;
-    label: "Number of Users"
-    description: "The number of users."
-  }
-
-
-  dimension: is_valid_trial_email {
-    type: yesno
-    sql: ${TABLE}.is_valid_trial_email ;;
-    label: "Is Valid Email?"
-    description: "Whether the current email is valid. Emails are considered valid if they match format `%_@__%.__%`` and don't contain any of the characters `'\/()&$^!`."
-  }
-
-  dimension: is_first_trial {
-    type: yesno
-    sql: ${TABLE}.is_first_trial ;;
-    label: "Is First Trial?"
-    description: "Whether this is the first trial (in chronological order) requested by this email."
-  }
-
-  dimension: is_last_trial {
-    type: yesno
-    sql: ${TABLE}.is_last_trial ;;
-    label: "Is Last Trial?"
-    description: "Whether this is the first trial (in chronological order) requested by this email."
-  }
-
-
-  ###
-  ### Dates for the current trial
-  ###
-
-  dimension_group: start_at {
-    type: time
-    timeframes: [raw, date, week, month, quarter, year]
-    sql: CAST(${TABLE}.start_at AS TIMESTAMP_NTZ) ;;
-    label: "Start At"
-    description: "Date when trial starts at. Note that trials start as soon as the trial request is created, making this date similar to trial creation timestamp."
-  }
-
-
-  dimension_group: end {
-    type: time
-    timeframes: [raw, date, week, month, quarter, year]
-    sql: CAST(${TABLE}.end_at AS TIMESTAMP_NTZ) ;;
-    label: "End At"
-    description: "Date when trial ends at."
-  }
-
-  ###
-  ### Company type
-  ###
-
-  dimension: marked_as_smb {
-    type: yesno
-    sql: ${TABLE}.marked_as_smb;;
-    label: "Marked as SMB?"
-    description: "Whether a lead with company type equals to SMB for the same email exists."
-  }
-
-  dimension: marked_as_enterprise {
-    type: yesno
-    sql: ${TABLE}.marked_as_enterprise;;
-    label: "Marked as Enterprise?"
-    description: "Whether a lead with company type equals to Enterprise for the same email exists."
-  }
-
-  dimension: marked_as_midmarket {
-    type: yesno
-    sql: ${TABLE}.marked_as_midmarket;;
-    label: "Marked as Midmarket?"
-    description: "Whether a lead with company type equals to Midmarket for the same email exists."
-  }
-
-  dimension: marked_as_federal {
-    type: yesno
-    sql: ${TABLE}.marked_as_federal;;
-    label: "Marked as Federal?"
-    description: "Whether a lead with company type equals to Federal for the same email exists."
-  }
-
-  dimension: marked_as_academic {
-    type: yesno
-    sql: ${TABLE}.marked_as_academic;;
-    label: "Marked as Academic?"
-    description: "Whether a lead with company type equals to Academic for the same email exists."
-  }
-
-  dimension: marked_as_mme {
-    type: yesno
-    sql: ${TABLE}.marked_as_mme;;
-    label: "Marked as MME?"
-    description: "Whether a lead with company type equals to MME for the same email exists."
-  }
-
-  dimension: marked_as_non_profit {
-    type: yesno
-    sql: ${TABLE}.marked_as_non_profit;;
-    label: "Marked as Non-Profit?"
-    description: "Whether a lead with company type equals to Non-Profit for the same email exists."
-  }
-
-  dimension: num_company_types {
-    type: number
-    sql: ${TABLE}.num_company_types;;
-    label: "Number of Company Types"
-    description: "The number of different company types that are matching the current trial request."
-  }
-
-  ###
-  ### Extra dimensions
-  ###
-
-
-  dimension: contact_email {
-    type: string
-    sql: ${TABLE}.contact_email ;;
-    label: "Contact Email"
-    description: "The contact email, as filled in in the input box in the trial request form. Prefer trial email."
-    view_label: " * Trial Request: Source data"
-  }
-
-  dimension: email {
-    type: string
-    sql: ${TABLE}.email ;;
-    label: "Email"
-    description: "Used for backwards compatibility. Should be the same with contact email if contact email is not null. Prefer trial email."
-    view_label: " * Trial Request: Source data"
-  }
-
-
-  ###
-  ### Metadata related to all trial request history from current email.
-  ###
-
-  dimension_group: first_trial_start {
-    type: time
-    timeframes: [raw, date, week, month, quarter, year]
-    sql: CAST(${TABLE}.first_trial_start_at AS TIMESTAMP_NTZ) ;;
-    label: "First Trial Started At"
-    view_label: " * History: Summary"
-    description: "The start date of the first trial (in chronological order) for the current email."
-  }
-
-  dimension_group: last_trial_start {
-    type: time
-    timeframes: [raw, date, week, month, quarter, year]
-    sql: CAST(${TABLE}.last_trial_start_at AS TIMESTAMP_NTZ) ;;
-    label: "Last Trial Started At"
-    view_label: " * History: Summary"
-    description: "The start date of the latest trial (in chronological order) for the current email."
-  }
-
-  dimension: total_trial_requests {
-    type: number
-    sql: ${TABLE}.total_trial_requests ;;
-    label: "Total Trial Requests"
-    view_label: " * History: Summary"
-    description: "The total number of trial requests for the current email."
-  }
-
-
-  ###
-  ### Measures
-  ###
-  measure: total_num_users {
-    type: sum
-    sql: ${num_users} ;;
-    label: "Total number of users"
-    view_label: " * Metrics: Trial Requests"
-  }
-
-
-
-  measure: count {
-    type: count
-    drill_fields: [trial_request_id, start_at_date, trial_email, name, company_name, site_name, country_name]
-    label: "Count Trial Requests"
-    view_label: " * Metrics: Trial Requests"
-  }
-}
diff --git a/views/marts/product/fct_trial_request_history.view.lkml b/views/marts/product/fct_trial_request_history.view.lkml
new file mode 100644
index 00000000..1840a013
--- /dev/null
+++ b/views/marts/product/fct_trial_request_history.view.lkml
@@ -0,0 +1,225 @@
+view: fct_trial_request_history {
+  sql_table_name: "MART_PRODUCT".fct_trial_request_history ;;
+  label: "Trial Request History"
+
+  ###
+  ###
+  ###
+
+  dimension: trial_request_id {
+    type: string
+    sql: ${TABLE}.trial_request_id ;;
+    primary_key: yes
+    label: "Trial Request ID"
+  }
+
+
+  ###
+  ### Requestor information
+  ###
+
+  dimension: first_name {
+    type: string
+    sql: ${TABLE}.first_name ;;
+    description: "The user's first name."
+  }
+
+  dimension: last_name {
+    type: string
+    sql: ${TABLE}.last_name ;;
+    description: "The user's last name."
+  }
+
+  dimension: company_name {
+    type: string
+    sql: ${TABLE}.company_name ;;
+    description: "The company's name. If not provided, 'Unknown' is used."
+  }
+
+
+  dimension: site_url {
+    type: string
+    sql: ${TABLE}.site_url ;;
+    label: "Site URL"
+    description: "The URL of the installation."
+  }
+
+  dimension: trial_email {
+    type: string
+    sql: ${TABLE}."TRIAL_EMAIL" ;;
+    description: "The email requesting the trial. It is the contact email provided in the signup form. If not filled in, it's  the email of the user requesting the trial."
+  }
+
+  dimension: email_domain {
+    type: string
+    sql: ${TABLE}.email_domain ;;
+    description: "The domain part of the email."
+  }
+
+  dimension: contact_email {
+    type: string
+    sql: ${TABLE}.contact_email ;;
+    group_label: "Extra information"
+    description: "The contact email in the signup form (if any)."
+  }
+
+  dimension: user_email {
+    type: string
+    sql: ${TABLE}.user_email ;;
+    group_label: "Extra information"
+    description: "The email of the user requesting the trial request. Not to be confused with contact email. Available only in on-prem trial requests."
+  }
+
+  ###
+  ### Dates
+  ###
+
+  dimension_group: created {
+    type: time
+    timeframes: [raw, date, week, month, quarter, year]
+    convert_tz: no
+    datatype: date
+    sql: ${TABLE}.created_at ;;
+    description: "Date when trial request was created."
+  }
+
+
+  dimension_group: start_at {
+    type: time
+    timeframes: [raw, time, date, week, month, quarter, year]
+    sql: CAST(${TABLE}.start_at AS TIMESTAMP_NTZ) ;;
+    description: "The time when the trial started at."
+  }
+
+  dimension_group: end {
+    type: time
+    timeframes: [raw, time, date, week, month, quarter, year]
+    sql: CAST(${TABLE}.end_at AS TIMESTAMP_NTZ) ;;
+    description: "The time when the trial ends at."
+  }
+
+
+  dimension_group: first_trial_start {
+    type: time
+    timeframes: [raw, time, date, week, month, quarter, year]
+    sql: CAST(${TABLE}.first_trial_start AS TIMESTAMP_NTZ) ;;
+    description: "The start time of the first trial for the given trial email."
+  }
+
+  dimension_group: last_trial_start {
+    type: time
+    timeframes: [raw, time, date, week, month, quarter, year]
+    sql: CAST(${TABLE}.last_trial_start_at AS TIMESTAMP_NTZ) ;;
+    description: "The start time of the last trial for the given trial email."
+  }
+
+  ###
+  ### Company type
+  ###
+
+  dimension: marked_as_academic {
+    type: yesno
+    sql: ${TABLE}.marked_as_academic ;;
+    label: "Academic"
+    description: "Whether a lead with Academic company type exists for the given trial email"
+    group_label: "Company Type"
+  }
+
+  dimension: marked_as_enterprise {
+    type: yesno
+    sql: ${TABLE}.marked_as_enterprise;;
+    label: "Enterprise"
+    description: "Whether a lead with Enterprise company type exists for the given trial email"
+    group_label: "Company Type"
+  }
+
+  dimension: marked_as_federal {
+    type: yesno
+    sql: ${TABLE}.marked_as_federal ;;
+    label: "Federal"
+    description: "Whether a lead with Federal company type exists for the given trial email"
+    group_label: "Company Type"
+  }
+
+  dimension: marked_as_midmarket {
+    type: yesno
+    sql: ${TABLE}."marked_as_midmarket" ;;
+    label: "Midmarket"
+    description: "Whether a lead with Midmarket company type exists for the given trial email"
+    group_label: "Company Type"
+  }
+
+  dimension: marked_as_mme {
+    type: yesno
+    sql: ${TABLE}.marked_as_mme ;;
+    label: "MME"
+    description: "Whether a lead with MME company type exists for the given trial email"
+    group_label: "Company Type"
+  }
+
+  dimension: marked_as_non_profit {
+    type: yesno
+    sql: ${TABLE}.marked_as_non_profit ;;
+    label: "Non-profit"
+    description: "Whether a lead with Non-profit company type exists for the given trial email"
+    group_label: "Company Type"
+  }
+
+  dimension: marked_as_smb {
+    type: yesno
+    sql: ${TABLE}.marked_as_smb ;;
+    label: "SMB"
+    description: "Whether a lead with SMB company type exists for the given trial email"
+    group_label: "Company Type"
+  }
+
+
+  # A measure is a field that uses a SQL aggregate function. Here are defined sum and average
+  # measures for this dimension, but you can also add measures of many different aggregates.
+  # Click on the type parameter to see all the options in the Quick Help panel on the right.
+
+  ###
+  ### Metadata
+  ###
+
+  dimension: request_source {
+    type: string
+    sql: ${TABLE}.request_source ;;
+    label: "Request Source"
+    description: "The source of the request. Can be `In-Product`, `Website` or `Stripe`."
+  }
+
+  dimension: request_type {
+    type: string
+    sql: ${TABLE}.request_type ;;
+    label: "Request Type"
+    description: "The type of the request. Can be `cloud` or `in-product`."
+  }
+
+
+  dimension: num_company_types {
+    type: number
+    sql: ${TABLE}.num_company_types ;;
+  }
+
+  measure: count {
+    type: count
+    drill_fields: [trial_request_id, trial_email, first_name, last_name, company_name]
+    label: "Total Trial Requests"
+  }
+
+
+  measure: count_unique_email {
+    type: count_distinct
+    sql: ${trial_email} ;;
+    drill_fields: [trial_request_id, trial_email, first_name, last_name, company_name]
+    label: "Total Unique Emails"
+  }
+
+  measure: count_unique_email_domain {
+    type: count_distinct
+    sql: ${email_domain} ;;
+    drill_fields: [trial_request_id, trial_email, first_name, last_name, company_name]
+    label: "Total Unique Email Domain"
+  }
+}
diff --git a/views/marts/sales/fct_in_product_trial_requests.view.lkml b/views/marts/sales/fct_in_product_trial_requests.view.lkml
index ff7020a2..fd650ed3 100644
--- a/views/marts/sales/fct_in_product_trial_requests.view.lkml
+++ b/views/marts/sales/fct_in_product_trial_requests.view.lkml
@@ -115,9 +115,9 @@ view: fct_in_product_trial_requests {
     sql: ${TABLE}.last_name ;;
     label: "Last Name"
     description: "The user's last name. This value may originate from:
-      - Last name (if directly provided).
-      - By splitting the name string on first space and keeping the second part.
-      - If none of the above are available, the first 40 characters of the 'username' part of the email.
+    - Last name (if directly provided).
+    - By splitting the name string on first space and keeping the second part.
+    - If none of the above are available, the first 40 characters of the 'username' part of the email.
     "
     view_label: "Company: Information"
   }