@adtrackify/at-tracking-event-types 4.57.0 → 4.58.0

package/dist/esm/types/api/measures/definitions/orders-measure-definitions.js

@@ -2,7 +2,7 @@ import { MEASURE } from '../measures.js';
 import { MEASURE_CATEGORY, MEASURE_SUBCATEGORY } from '../measure-categories.js';
 import { MEASURE_ICON } from '../measure-icon.js';
 import { MeasureValueType } from '../measure-value-type.js';
-import { LTV_COHORT_APPLICABLE_CONTEXTS, ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS, STANDARD_APPLICABLE_CONTEXTS, } from './measure-applicable-contexts.js';
+import { LTV_COHORT_APPLICABLE_CONTEXTS, STANDARD_APPLICABLE_CONTEXTS, } from './measure-applicable-contexts.js';
 export const ORDERS_MEASURES_MAP = {
     [MEASURE.ORDERS_COUNT]: {
         priority: 1,
@@ -39,7 +39,7 @@ export const ORDERS_MEASURES_MAP = {
         decimalPlaces: 0,
         useCompactNotation: false,
         applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'Unique Cust.',
+        shortTitle: 'Unique Customers',
         tooltip: 'The count of distinct customers who placed at least one order in the period. Each customer is counted once regardless of how many orders they placed.',
     },
     [MEASURE.ORDERS_UNITS]: {
@@ -76,7 +76,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC Units',
         tooltip: 'Total product units purchased by new customers. Useful for understanding acquisition basket size.',
     },
@@ -95,7 +95,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Units',
         tooltip: 'Total product units purchased by returning customers. Reflects repeat buyer basket size.',
     },
@@ -115,14 +115,14 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.NUMBER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'The average number of product units included in each order. Higher values indicate larger basket sizes.',
         formulaDisplay: 'Units Sold ÷ Order Count',
         formula: 'units_sold / order_count',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_UNITS_PER_ORDER]: {
         priority: 12,
-        title: 'NC Units Per Order',
+        title: 'New Customer Units Per Order',
         description: 'Average units per order for new customers.',
         sumPrefix: '',
         sumSuffix: '',
@@ -135,7 +135,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.NUMBER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC Units/Order',
         tooltip: 'Average number of units per order for new customers. Compare to returning customers to gauge first-time buyer behavior.',
         formulaDisplay: 'NC Units Sold ÷ NC Order Count',
@@ -143,7 +143,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_UNITS_PER_ORDER]: {
         priority: 22,
-        title: 'RC Units Per Order',
+        title: 'Returning Customer Units Per Order',
         description: 'Average units per order for returning customers.',
         sumPrefix: '',
         sumSuffix: '',
@@ -156,7 +156,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.NUMBER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Units/Order',
         tooltip: 'Average number of units per order for returning customers. Higher values than new customers suggest loyalty-driven upsell.',
         formulaDisplay: 'RC Units Sold ÷ RC Order Count',
@@ -223,7 +223,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_REVENUE]: {
         priority: 11,
-        title: 'NC Total Revenue',
+        title: 'New Customer Total Revenue',
         description: 'Total revenue from new customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -242,7 +242,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_REVENUE]: {
         priority: 12,
-        title: 'NC Gross Revenue',
+        title: 'New Customer Gross Revenue',
         description: 'Gross revenue from new customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -261,7 +261,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_NET_REVENUE]: {
         priority: 13,
-        title: 'NC Net Revenue',
+        title: 'New Customer Net Revenue',
         description: 'Net revenue from new customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -280,7 +280,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_REVENUE]: {
         priority: 21,
-        title: 'RC Total Revenue',
+        title: 'Returning Customer Total Revenue',
         description: 'Total revenue from returning customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -299,7 +299,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_REVENUE]: {
         priority: 22,
-        title: 'RC Gross Revenue',
+        title: 'Returning Customer Gross Revenue',
         description: 'Gross revenue from returning customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -318,7 +318,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_REVENUE]: {
         priority: 23,
-        title: 'RC Net Revenue',
+        title: 'Returning Customer Net Revenue',
         description: 'Net revenue from returning customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -338,6 +338,7 @@ export const ORDERS_MEASURES_MAP = {
     [MEASURE.ORDERS_TOTAL_AOV]: {
         priority: 1,
         title: 'Total AOV',
+        shortTitle: 'Total AOV',
         description: 'Average order value based on total revenue.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -358,6 +359,7 @@ export const ORDERS_MEASURES_MAP = {
     [MEASURE.ORDERS_GROSS_AOV]: {
         priority: 2,
         title: 'Gross AOV',
+        shortTitle: 'Gross AOV',
         description: 'Average order value based on gross revenue.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -378,6 +380,7 @@ export const ORDERS_MEASURES_MAP = {
     [MEASURE.ORDERS_NET_AOV]: {
         priority: 3,
         title: 'Net AOV',
+        shortTitle: 'Net AOV',
         description: 'Average order value based on net revenue.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -397,7 +400,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_AOV]: {
         priority: 11,
-        title: 'NC Total AOV',
+        title: 'New Customer Total AOV',
         description: 'Average order value for new customers (total revenue).',
         sumPrefix: '$',
         sumSuffix: '',
@@ -418,7 +421,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_AOV]: {
         priority: 12,
-        title: 'NC Gross AOV',
+        title: 'New Customer Gross AOV',
         description: 'Average order value for new customers (gross revenue).',
         sumPrefix: '$',
         sumSuffix: '',
@@ -439,7 +442,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_NET_AOV]: {
         priority: 13,
-        title: 'NC Net AOV',
+        title: 'New Customer Net AOV',
         description: 'Average order value for new customers (net revenue).',
         sumPrefix: '$',
         sumSuffix: '',
@@ -460,7 +463,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_AOV]: {
         priority: 21,
-        title: 'RC Total AOV',
+        title: 'Returning Customer Total AOV',
         description: 'Average order value for returning customers (total revenue).',
         sumPrefix: '$',
         sumSuffix: '',
@@ -481,7 +484,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_AOV]: {
         priority: 22,
-        title: 'RC Gross AOV',
+        title: 'Returning Customer Gross AOV',
         description: 'Average order value for returning customers (gross revenue).',
         sumPrefix: '$',
         sumSuffix: '',
@@ -502,7 +505,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_AOV]: {
         priority: 23,
-        title: 'RC Net AOV',
+        title: 'Returning Customer Net AOV',
         description: 'Average order value for returning customers (net revenue).',
         sumPrefix: '$',
         sumSuffix: '',
@@ -524,6 +527,7 @@ export const ORDERS_MEASURES_MAP = {
     [MEASURE.ORDERS_COGS]: {
         priority: 1,
         title: 'COGS',
+        shortTitle: 'COGS',
         description: 'Cost of goods sold.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -541,7 +545,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_COGS]: {
         priority: 11,
-        title: 'NC COGS',
+        title: 'New Customer COGS',
         shortTitle: 'NC COGS',
         description: 'COGS for new customer orders.',
         sumPrefix: '$',
@@ -555,12 +559,12 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Cost of goods sold for orders placed by new customers. Used to calculate new customer gross margin.',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_COGS]: {
         priority: 21,
-        title: 'RC COGS',
+        title: 'Returning Customer COGS',
         shortTitle: 'RC COGS',
         description: 'COGS for returning customer orders.',
         sumPrefix: '$',
@@ -574,12 +578,13 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Cost of goods sold for orders placed by returning customers. Used to calculate repeat-buyer gross margin.',
     },
     [MEASURE.ORDERS_COGS_PER_ORDER]: {
         priority: 3,
         title: 'COGS Per Order',
+        shortTitle: 'COGS/Order',
         description: 'Average COGS per order.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -592,14 +597,14 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average product cost per order. Useful for understanding the cost structure of a typical order.',
         formulaDisplay: 'COGS ÷ Order Count',
         formula: 'cogs / order_count',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_COGS_PER_ORDER]: {
         priority: 13,
-        title: 'NC COGS Per Order',
+        title: 'New Customer COGS Per Order',
         description: 'Average COGS per order for new customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -612,7 +617,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC COGS/Order',
         tooltip: 'Average product cost per new customer order. Compare to returning customers to assess cost mix differences.',
         formulaDisplay: 'NC COGS ÷ NC Order Count',
@@ -620,7 +625,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_COGS_PER_ORDER]: {
         priority: 23,
-        title: 'RC COGS Per Order',
+        title: 'Returning Customer COGS Per Order',
         description: 'Average COGS per order for returning customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -633,7 +638,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC COGS/Order',
         tooltip: 'Average product cost per returning customer order.',
         formulaDisplay: 'RC COGS ÷ RC Order Count',
@@ -660,6 +665,7 @@ export const ORDERS_MEASURES_MAP = {
     [MEASURE.ORDERS_REFUND_COUNT]: {
         priority: 2,
         title: 'Refund Count',
+        shortTitle: 'Refund Count',
         description: 'Number of refunded orders.',
         sumPrefix: '',
         sumSuffix: '',
@@ -672,12 +678,13 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'The number of orders that had a refund issued. Use with Refund Rate to understand the scale of returns.',
     },
     [MEASURE.ORDERS_REFUND_PERCENT]: {
         priority: 3,
         title: 'Refund %',
+        shortTitle: 'Refund %',
         description: 'Percentage of orders refunded.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -690,7 +697,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'The share of orders that resulted in a refund. Elevated refund rates can indicate product quality, sizing, or expectation issues.',
         formulaDisplay: 'Refund Count ÷ Order Count × 100',
         formula: 'refund_count / order_count * 100',
@@ -710,7 +717,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'Refund/Order',
         tooltip: 'Average refund dollar amount per order placed. Useful for modeling the true realized revenue per order.',
         formulaDisplay: 'Total Refunds ÷ Order Count',
@@ -731,7 +738,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC Refunds',
         tooltip: 'The total dollar amount refunded to new customers. High values may indicate product/expectation issues with first-time buyers.',
     },
@@ -750,13 +757,13 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC Refund Ct',
         tooltip: 'The number of new customer orders that had a refund issued.',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_REFUND_PERCENT]: {
         priority: 7,
-        title: 'NC Refund %',
+        title: 'New Customer Refund %',
         shortTitle: 'NC Refund %',
         description: 'Percentage of new customer orders refunded.',
         sumPrefix: '',
@@ -770,7 +777,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'The share of new customer orders that resulted in a refund.',
         formulaDisplay: 'NC Refund Count ÷ NC Order Count × 100',
         formula: 'nc_refund_count / nc_order_count * 100',
@@ -790,7 +797,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC Ref/Ord',
         tooltip: 'Average refund dollar amount per new customer order placed.',
         formulaDisplay: 'NC Refunds ÷ NC Order Count',
@@ -811,7 +818,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Refunds',
         tooltip: 'The total dollar amount refunded to returning customers. High values may indicate quality issues affecting repeat buyers.',
     },
@@ -830,13 +837,13 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Refund Ct',
         tooltip: 'The number of returning customer orders that had a refund issued.',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_REFUND_PERCENT]: {
         priority: 11,
-        title: 'RC Refund %',
+        title: 'Returning Customer Refund %',
         shortTitle: 'RC Refund %',
         description: 'Percentage of returning customer orders refunded.',
         sumPrefix: '',
@@ -850,7 +857,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'The share of returning customer orders that resulted in a refund.',
         formulaDisplay: 'RC Refund Count ÷ RC Order Count × 100',
         formula: 'rc_refund_count / rc_order_count * 100',
@@ -870,7 +877,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Ref/Ord',
         tooltip: 'Average refund dollar amount per returning customer order placed.',
         formulaDisplay: 'RC Refunds ÷ RC Order Count',
@@ -909,7 +916,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Discounts as a share of gross revenue. A high discount rate erodes margin and may indicate over-reliance on promotions.',
         formulaDisplay: 'Discounts ÷ Gross Revenue × 100',
         formula: 'discounts / gross_revenue * 100',
@@ -929,7 +936,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'Discount/Order',
         tooltip: 'Average discount dollar value applied per order. Useful for understanding how much revenue is being given away per transaction.',
         formulaDisplay: 'Total Discounts ÷ Order Count',
@@ -937,7 +944,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_DISCOUNTS]: {
         priority: 15,
-        title: 'NC Discount Amount',
+        title: 'New Customer Discount Amount',
         shortTitle: 'NC Discounts',
         description: 'Total discount amount for new customers.',
         sumPrefix: '$',
@@ -951,12 +958,12 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Total dollar value of discounts applied to new customer orders.',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_DISCOUNT_PERCENT]: {
         priority: 16,
-        title: 'NC Discount %',
+        title: 'New Customer Discount %',
         shortTitle: 'NC Discount %',
         description: 'Discounts as percentage of new customer gross revenue.',
         sumPrefix: '',
@@ -970,14 +977,14 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'New customer discounts as a percentage of new customer gross revenue.',
         formulaDisplay: 'NC Discounts ÷ NC Gross Revenue × 100',
         formula: 'nc_discounts / nc_gross_revenue * 100',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_DISCOUNT_PER_ORDER]: {
         priority: 17,
-        title: 'NC Discount Per Order',
+        title: 'New Customer Discount Per Order',
         shortTitle: 'NC Discount/Order',
         description: 'Average discount per new customer order.',
         sumPrefix: '$',
@@ -991,14 +998,14 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average discount dollar value applied per new customer order.',
         formulaDisplay: 'NC Discounts ÷ NC Order Count',
         formula: 'nc_discounts / nc_order_count',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_DISCOUNTS]: {
         priority: 18,
-        title: 'RC Discount Amount',
+        title: 'Returning Customer Discount Amount',
         shortTitle: 'RC Discounts',
         description: 'Total discount amount for returning customers.',
         sumPrefix: '$',
@@ -1012,12 +1019,12 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Total dollar value of discounts applied to returning customer orders.',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_DISCOUNT_PERCENT]: {
         priority: 19,
-        title: 'RC Discount %',
+        title: 'Returning Customer Discount %',
         shortTitle: 'RC Discount %',
         description: 'Discounts as percentage of returning customer gross revenue.',
         sumPrefix: '',
@@ -1031,14 +1038,14 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Returning customer discounts as a percentage of returning customer gross revenue.',
         formulaDisplay: 'RC Discounts ÷ RC Gross Revenue × 100',
         formula: 'rc_discounts / rc_gross_revenue * 100',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_DISCOUNT_PER_ORDER]: {
         priority: 20,
-        title: 'RC Discount Per Order',
+        title: 'Returning Customer Discount Per Order',
         shortTitle: 'RC Discount/Order',
         description: 'Average discount per returning customer order.',
         sumPrefix: '$',
@@ -1052,7 +1059,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average discount dollar value applied per returning customer order.',
         formulaDisplay: 'RC Discounts ÷ RC Order Count',
         formula: 'rc_discounts / rc_order_count',
@@ -1091,7 +1098,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Shipping revenue as a share of total revenue. A declining rate may indicate free shipping promotions affecting margins.',
         formulaDisplay: 'Shipping ÷ Total Revenue × 100',
         formula: 'shipping / total_revenue * 100',
@@ -1111,7 +1118,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'Shipping/Order',
         tooltip: 'Average shipping fee collected per order.',
         formulaDisplay: 'Total Shipping ÷ Order Count',
@@ -1119,7 +1126,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_SHIPPING]: {
         priority: 34,
-        title: 'NC Shipping Revenue',
+        title: 'New Customer Shipping Revenue',
         shortTitle: 'NC Shipping',
         description: 'Total shipping revenue from new customers.',
         sumPrefix: '$',
@@ -1133,12 +1140,12 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Total shipping fees collected from new customer orders.',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_SHIPPING_PERCENT]: {
         priority: 35,
-        title: 'NC Shipping %',
+        title: 'New Customer Shipping %',
         shortTitle: 'NC Ship. %',
         description: 'Shipping as percentage of new customer total revenue.',
         sumPrefix: '',
@@ -1152,14 +1159,14 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'New customer shipping revenue as a percentage of new customer total revenue.',
         formulaDisplay: 'NC Shipping ÷ NC Total Revenue × 100',
         formula: 'nc_shipping / nc_total_revenue * 100',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_SHIPPING_PER_ORDER]: {
         priority: 36,
-        title: 'NC Shipping Per Order',
+        title: 'New Customer Shipping Per Order',
         shortTitle: 'NC Shipping/Order',
         description: 'Average shipping per new customer order.',
         sumPrefix: '$',
@@ -1173,14 +1180,14 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average shipping fee collected per new customer order.',
         formulaDisplay: 'NC Shipping ÷ NC Order Count',
         formula: 'nc_shipping / nc_order_count',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_SHIPPING]: {
         priority: 37,
-        title: 'RC Shipping Revenue',
+        title: 'Returning Customer Shipping Revenue',
         shortTitle: 'RC Shipping',
         description: 'Total shipping revenue from returning customers.',
         sumPrefix: '$',
@@ -1194,12 +1201,12 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Total shipping fees collected from returning customer orders.',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_SHIPPING_PERCENT]: {
         priority: 38,
-        title: 'RC Shipping %',
+        title: 'Returning Customer Shipping %',
         shortTitle: 'RC Ship. %',
         description: 'Shipping as percentage of returning customer total revenue.',
         sumPrefix: '',
@@ -1213,14 +1220,14 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Returning customer shipping revenue as a percentage of returning customer total revenue.',
         formulaDisplay: 'RC Shipping ÷ RC Total Revenue × 100',
         formula: 'rc_shipping / rc_total_revenue * 100',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_SHIPPING_PER_ORDER]: {
         priority: 39,
-        title: 'RC Shipping Per Order',
+        title: 'Returning Customer Shipping Per Order',
         shortTitle: 'RC Shipping/Order',
         description: 'Average shipping per returning customer order.',
         sumPrefix: '$',
@@ -1234,7 +1241,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average shipping fee collected per returning customer order.',
         formulaDisplay: 'RC Shipping ÷ RC Order Count',
         formula: 'rc_shipping / rc_order_count',
@@ -1273,7 +1280,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Tax collected as a share of total revenue. Useful for estimating effective tax burden across markets.',
         formulaDisplay: 'Tax ÷ Total Revenue × 100',
         formula: 'tax / total_revenue * 100',
@@ -1293,14 +1300,14 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average tax amount collected per order.',
         formulaDisplay: 'Total Tax ÷ Order Count',
         formula: 'total_tax / order_count',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_TAX]: {
         priority: 44,
-        title: 'NC Tax Collected',
+        title: 'New Customer Tax Collected',
         shortTitle: 'NC Tax',
         description: 'Total tax collected from new customers.',
         sumPrefix: '$',
@@ -1314,12 +1321,12 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Total tax collected from new customer orders.',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_TAX_PERCENT]: {
         priority: 45,
-        title: 'NC Tax %',
+        title: 'New Customer Tax %',
         shortTitle: 'NC Tax %',
         description: 'Tax as percentage of new customer total revenue.',
         sumPrefix: '',
@@ -1333,14 +1340,14 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'New customer tax as a percentage of new customer total revenue.',
         formulaDisplay: 'NC Tax ÷ NC Total Revenue × 100',
         formula: 'nc_tax / nc_total_revenue * 100',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_TAX_PER_ORDER]: {
         priority: 46,
-        title: 'NC Tax Per Order',
+        title: 'New Customer Tax Per Order',
         shortTitle: 'NC Tax/Order',
         description: 'Average tax per new customer order.',
         sumPrefix: '$',
@@ -1354,14 +1361,14 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average tax amount collected per new customer order.',
         formulaDisplay: 'NC Tax ÷ NC Order Count',
         formula: 'nc_tax / nc_order_count',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_TAX]: {
         priority: 47,
-        title: 'RC Tax Collected',
+        title: 'Returning Customer Tax Collected',
         shortTitle: 'RC Tax',
         description: 'Total tax collected from returning customers.',
         sumPrefix: '$',
@@ -1375,12 +1382,12 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Total tax collected from returning customer orders.',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_TAX_PERCENT]: {
         priority: 48,
-        title: 'RC Tax %',
+        title: 'Returning Customer Tax %',
         shortTitle: 'RC Tax %',
         description: 'Tax as percentage of returning customer total revenue.',
         sumPrefix: '',
@@ -1394,14 +1401,14 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Returning customer tax as a percentage of returning customer total revenue.',
         formulaDisplay: 'RC Tax ÷ RC Total Revenue × 100',
         formula: 'rc_tax / rc_total_revenue * 100',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_TAX_PER_ORDER]: {
         priority: 49,
-        title: 'RC Tax Per Order',
+        title: 'Returning Customer Tax Per Order',
         shortTitle: 'RC Tax/Order',
         description: 'Average tax per returning customer order.',
         sumPrefix: '$',
@@ -1415,7 +1422,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average tax amount collected per returning customer order.',
         formulaDisplay: 'RC Tax ÷ RC Order Count',
         formula: 'rc_tax / rc_order_count',
@@ -1464,28 +1471,27 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_CM1_PER_ORDER]: {
         priority: 5,
-        title: 'CM1 Per Order (Gross Margin Per Order)',
+        title: 'CM1 Per Order',
         shortTitle: 'CM1/Order',
         description: 'Average CM1 per order. Net Revenue minus Effective COGS divided by order count.',
         sumPrefix: '$',
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM1_PER_ORDER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'CM1 Per Order is the conservative gross margin per order using Net Revenue minus Effective COGS.',
         formulaDisplay: '(CM1) ÷ (Order Count)',
         formula: '(cm1) / (order_count)',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM1_PER_ORDER]: {
         priority: 15,
-        title: 'NC CM1 Per Order',
+        title: 'New Customer CM1 Per Order',
         shortTitle: 'NC CM1/Order',
         description: 'Average CM1 per new customer order.',
         sumPrefix: '$',
@@ -1494,19 +1500,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM1_PER_ORDER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'NC CM1 Per Order is the conservative gross margin per new customer order.',
         formulaDisplay: '(NC CM1) ÷ (NC Order Count)',
         formula: '(nc_cm1) / (nc_order_count)',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_PER_ORDER]: {
         priority: 25,
-        title: 'RC CM1 Per Order',
+        title: 'Returning Customer CM1 Per Order',
         shortTitle: 'RC CM1/Order',
         description: 'Average CM1 per returning customer order.',
         sumPrefix: '$',
@@ -1515,12 +1520,11 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_PER_ORDER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'RC CM1 Per Order is the conservative gross margin per returning customer order.',
         formulaDisplay: '(RC CM1) ÷ (RC Order Count)',
         formula: '(rc_cm1) / (rc_order_count)',
@@ -1534,14 +1538,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM2_PER_ORDER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average Contribution Margin 2 per order, after deducting marketing costs. Helps assess marketing efficiency at the order level.',
         formulaDisplay: 'CM2 ÷ Order Count',
         formula: 'cm2 / order_count',
@@ -1555,14 +1558,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM3_PER_ORDER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average Contribution Margin 3 per order, after all layered cost deductions.',
         formulaDisplay: 'CM3 ÷ Order Count',
         formula: 'cm3 / order_count',
@@ -1577,21 +1579,20 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM4_PER_ORDER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average Contribution Margin 4 (operating profit) per order, after deducting all costs including fixed costs.',
         formulaDisplay: 'CM4 ÷ Order Count',
         formula: 'cm4 / order_count',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM2_PER_ORDER]: {
         priority: 16,
-        title: 'NC CM2 Per Order',
+        title: 'New Customer CM2 Per Order',
         shortTitle: 'NC CM2/Order',
         description: 'Average CM2 per new customer order.',
         sumPrefix: '$',
@@ -1600,19 +1601,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM2_PER_ORDER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average Contribution Margin 2 per new customer order, after deducting marketing costs.',
         formulaDisplay: 'NC CM2 ÷ NC Order Count',
         formula: 'nc_cm2 / nc_order_count',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM3_PER_ORDER]: {
         priority: 17,
-        title: 'NC CM3 Per Order',
+        title: 'New Customer CM3 Per Order',
         shortTitle: 'NC CM3/Order',
         description: 'Average CM3 per new customer order.',
         sumPrefix: '$',
@@ -1621,19 +1621,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM3_PER_ORDER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average Contribution Margin 3 per new customer order, after all layered cost deductions.',
         formulaDisplay: 'NC CM3 ÷ NC Order Count',
         formula: 'nc_cm3 / nc_order_count',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM4_PER_ORDER]: {
         priority: 18,
-        title: 'NC CM4 Per Order',
+        title: 'New Customer CM4 Per Order',
         shortTitle: 'NC CM4/Order',
         description: 'Average CM4 (operating profit) per new customer order.',
         sumPrefix: '$',
@@ -1642,19 +1641,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM4_PER_ORDER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average Contribution Margin 4 (operating profit) per new customer order, after deducting all costs including fixed costs.',
         formulaDisplay: 'NC CM4 ÷ NC Order Count',
         formula: 'nc_cm4 / nc_order_count',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_PER_ORDER]: {
         priority: 26,
-        title: 'RC CM2 Per Order',
+        title: 'Returning Customer CM2 Per Order',
         shortTitle: 'RC CM2/Order',
         description: 'Average CM2 per returning customer order.',
         sumPrefix: '$',
@@ -1663,19 +1661,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_PER_ORDER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average Contribution Margin 2 per returning customer order, after deducting marketing costs.',
         formulaDisplay: 'RC CM2 ÷ RC Order Count',
         formula: 'rc_cm2 / rc_order_count',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_PER_ORDER]: {
         priority: 27,
-        title: 'RC CM3 Per Order',
+        title: 'Returning Customer CM3 Per Order',
         shortTitle: 'RC CM3/Order',
         description: 'Average CM3 per returning customer order.',
         sumPrefix: '$',
@@ -1684,19 +1681,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_PER_ORDER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average Contribution Margin 3 per returning customer order, after all layered cost deductions.',
         formulaDisplay: 'RC CM3 ÷ RC Order Count',
         formula: 'rc_cm3 / rc_order_count',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM4_PER_ORDER]: {
         priority: 28,
-        title: 'RC CM4 Per Order',
+        title: 'Returning Customer CM4 Per Order',
         shortTitle: 'RC CM4/Order',
         description: 'Average CM4 (operating profit) per returning customer order.',
         sumPrefix: '$',
@@ -1705,12 +1701,11 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM4_PER_ORDER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average Contribution Margin 4 (operating profit) per returning customer order, after deducting all costs including fixed costs.',
         formulaDisplay: 'RC CM4 ÷ RC Order Count',
         formula: 'rc_cm4 / rc_order_count',
@@ -1730,7 +1725,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.NUMBER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'Avg Orders/Cust',
         tooltip: 'The average number of orders placed per unique customer in the period. Higher values indicate strong repeat purchase behavior.',
         formulaDisplay: 'Order Count ÷ Unique Customers',
@@ -1739,6 +1734,7 @@ export const ORDERS_MEASURES_MAP = {
     [MEASURE.ORDERS_NEW_CUSTOMERS]: {
         priority: 2,
         title: 'New Customers',
+        shortTitle: 'New Customers',
         description: 'Count of unique new customers.',
         sumPrefix: '',
         sumSuffix: '',
@@ -1751,7 +1747,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'The number of distinct customers making their first-ever purchase in the period. Core acquisition metric.',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMERS]: {
@@ -1769,13 +1765,13 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
-        shortTitle: 'Ret. Customers',
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        shortTitle: 'Returning Customers',
         tooltip: 'The number of distinct customers who have ordered before and purchased again in the period. Core retention metric.',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_RATE]: {
         priority: 33,
-        title: 'NC Gross Revenue Rate',
+        title: 'New Customer Gross Revenue Rate',
         description: 'New customer gross revenue as percentage of total gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -1788,7 +1784,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC Gross Rate',
         tooltip: 'New customer gross revenue as a share of total gross revenue. Shows how much of top-line sales comes from first-time buyers.',
         formulaDisplay: 'NC Gross Revenue ÷ Gross Revenue × 100',
@@ -1796,7 +1792,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RATE]: {
         priority: 34,
-        title: 'RC Gross Revenue Rate',
+        title: 'Returning Customer Gross Revenue Rate',
         description: 'Returning customer gross revenue as percentage of total gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -1809,7 +1805,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Gross Rate',
         tooltip: 'Returning customer gross revenue as a share of total gross revenue. High values indicate a retention-driven revenue base.',
         formulaDisplay: 'RC Gross Revenue ÷ Gross Revenue × 100',
@@ -1830,7 +1826,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'Refund by Date',
         tooltip: 'Refund amounts attributed to the date the refund was issued. Use this to track when refunds actually hit, not when orders were placed.',
     },
@@ -1849,7 +1845,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'Refund by Order',
         tooltip: 'Refund amounts attributed to the original order date. Useful for cohort analysis and understanding which order batches had high returns.',
     },
@@ -1868,7 +1864,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'Refund Gross %',
         tooltip: 'Total refunds as a percentage of gross revenue. Shows what portion of sales value is being returned.',
         formulaDisplay: 'Refunds ÷ Gross Revenue × 100',
@@ -1889,7 +1885,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'Refund Net %',
         tooltip: 'Total refunds as a percentage of net revenue. A higher rate here vs. gross rate means discounts compound the refund impact.',
         formulaDisplay: 'Refunds ÷ Net Revenue × 100',
@@ -1898,6 +1894,7 @@ export const ORDERS_MEASURES_MAP = {
     [MEASURE.ORDERS_DISCOUNT_COUNT]: {
         priority: 12,
         title: 'Discount Count',
+        shortTitle: 'Discount Count',
         description: 'Count of orders with discounts.',
         sumPrefix: '',
         sumSuffix: '',
@@ -1910,7 +1907,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'The number of orders that had at least one discount applied. Compare to total orders to gauge discount usage frequency.',
     },
     [MEASURE.ORDERS_DISCOUNT_GROSS_RATE]: {
@@ -1928,7 +1925,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'Disc. Gross Rate',
         tooltip: 'Total discounts as a share of gross revenue. Tracks how aggressively promotional pricing is eroding top-line sales.',
         formulaDisplay: 'Discounts ÷ Gross Revenue × 100',
@@ -1936,7 +1933,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_DISCOUNT_GROSS_RATE]: {
         priority: 16,
-        title: 'NC Discount Gross Rate',
+        title: 'New Customer Discount Gross Rate',
         description: 'New customer discount as percentage of gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -1949,7 +1946,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC Disc. Gross',
         tooltip: 'New customer discounts as a share of new customer gross revenue. High rates suggest heavy promotion to drive acquisition.',
         formulaDisplay: 'NC Discounts ÷ NC Gross Revenue × 100',
@@ -1957,7 +1954,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_DISCOUNT_GROSS_RATE]: {
         priority: 17,
-        title: 'RC Discount Gross Rate',
+        title: 'Returning Customer Discount Gross Rate',
         description: 'Returning customer discount as percentage of gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -1970,7 +1967,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Disc. Gross',
         tooltip: 'Returning customer discounts as a share of returning customer gross revenue. High rates may indicate loyalty discounts cutting into repeat margins.',
         formulaDisplay: 'RC Discounts ÷ RC Gross Revenue × 100',
@@ -1978,7 +1975,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_DISCOUNT_ORDER_RATE]: {
         priority: 18,
-        title: 'NC Discount Order Rate',
+        title: 'New Customer Discount Order Rate',
         description: 'Percentage of new customer orders with discount.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -1991,7 +1988,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC Disc. Order %',
         tooltip: 'The share of new customer orders that used a discount code or promotion. High values show how dependent acquisition is on discounting.',
         formulaDisplay: 'NC Discounted Orders ÷ NC Orders × 100',
@@ -1999,7 +1996,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_DISCOUNT_ORDER_RATE]: {
         priority: 19,
-        title: 'RC Discount Order Rate',
+        title: 'Returning Customer Discount Order Rate',
         description: 'Percentage of returning customer orders with discount.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -2012,7 +2009,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Disc. Order %',
         tooltip: 'The share of returning customer orders that used a discount. Elevated values may signal discount dependency in retention.',
         formulaDisplay: 'RC Discounted Orders ÷ RC Orders × 100',
@@ -2033,7 +2030,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'Refund + Disc.',
         tooltip: 'The combined dollar value of refunds and discounts. Represents the total revenue leakage from gross sales.',
         formulaDisplay: 'Refunds + Discounts',
@@ -2041,7 +2038,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_REFUND_PLUS_DISCOUNT]: {
         priority: 22,
-        title: 'NC Refund + Discount',
+        title: 'New Customer Refund + Discount',
         description: 'New customer refund and discount combined.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -2054,7 +2051,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC Ref+Disc',
         tooltip: 'Combined refunds and discounts for new customer orders. Reflects the total revenue given back from first-time buyer transactions.',
         formulaDisplay: 'NC Refunds + NC Discounts',
@@ -2062,7 +2059,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_REFUND_PLUS_DISCOUNT]: {
         priority: 23,
-        title: 'RC Refund + Discount',
+        title: 'Returning Customer Refund + Discount',
         description: 'Returning customer refund and discount combined.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -2075,7 +2072,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Ref+Disc',
         tooltip: 'Combined refunds and discounts for returning customer orders.',
         formulaDisplay: 'RC Refunds + RC Discounts',
@@ -2096,8 +2093,9 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'The order subtotal before shipping and taxes are added. Reflects the product value customers commit to at checkout.',
+        hideFromUI: true,
     },
     [MEASURE.ORDERS_NET_PLUS_SHIPPING]: {
         priority: 5,
@@ -2114,11 +2112,12 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'Net + Ship.',
         tooltip: 'Net revenue plus shipping collected. Useful for businesses where shipping is a meaningful revenue contributor.',
         formulaDisplay: 'Net Revenue + Shipping',
         formula: 'net_revenue + shipping',
+        hideFromUI: true,
     },
     [MEASURE.ORDERS_CANCELLED_COUNT]: {
         priority: 51,
@@ -2135,7 +2134,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'Cancellations',
         tooltip: 'The number of orders that were cancelled before fulfillment. High counts may indicate checkout friction or inventory issues.',
     },
@@ -2154,13 +2153,13 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'Cancelled $',
         tooltip: 'The total dollar value of cancelled orders. Represents potential revenue that was lost before fulfillment.',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CANCELLED_COUNT]: {
         priority: 53,
-        title: 'NC Cancelled Orders',
+        title: 'New Customer Cancelled Orders',
         description: 'Count of cancelled orders from new customers.',
         sumPrefix: '',
         sumSuffix: '',
@@ -2173,13 +2172,13 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC Cancellations',
         tooltip: 'The number of new customer orders that were cancelled before fulfillment.',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CANCELLED_AMOUNT]: {
         priority: 54,
-        title: 'NC Cancelled Amount',
+        title: 'New Customer Cancelled Amount',
         description: 'Cancelled order amount from new customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -2192,7 +2191,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC Cancelled $',
         tooltip: 'The total dollar value of cancelled new customer orders.',
     },
@@ -2211,13 +2210,13 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Cancellations',
         tooltip: 'The number of returning customer orders that were cancelled before fulfillment.',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CANCELLED_AMOUNT]: {
         priority: 56,
-        title: 'RC Cancelled Amount',
+        title: 'Returning Customer Cancelled Amount',
         description: 'Cancelled order amount from returning customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -2230,7 +2229,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Cancelled $',
         tooltip: 'The total dollar value of cancelled returning customer orders.',
     },
@@ -2244,8 +2243,7 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_GROSS_PROFIT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -2257,7 +2255,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT]: {
         priority: 2,
-        title: 'NC Gross Profit',
+        title: 'New Customer Gross Profit',
         description: 'Gross profit from new customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -2265,8 +2263,7 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -2276,7 +2273,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT]: {
         priority: 3,
-        title: 'RC Gross Profit',
+        title: 'Returning Customer Gross Profit',
         description: 'Gross profit from returning customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -2284,8 +2281,7 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -2303,8 +2299,7 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_GROSS_PROFIT_GROSS_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2316,7 +2311,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_GROSS_PERCENT]: {
         priority: 12,
-        title: 'NC Gross Profit % (of Gross)',
+        title: 'New Customer Gross Profit % (of Gross)',
         description: 'NC gross profit as percentage of NC gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -2324,8 +2319,7 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_GROSS_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2335,7 +2329,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_GROSS_PERCENT]: {
         priority: 13,
-        title: 'RC Gross Profit % (of Gross)',
+        title: 'Returning Customer Gross Profit % (of Gross)',
         description: 'RC gross profit as percentage of RC gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -2343,8 +2337,7 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_GROSS_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2362,8 +2355,7 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_GROSS_PROFIT_PER_ORDER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2375,7 +2367,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_PER_ORDER]: {
         priority: 22,
-        title: 'NC Gross Profit Per Order',
+        title: 'New Customer Gross Profit Per Order',
         description: 'Average gross profit per new customer order.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -2383,8 +2375,7 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_PER_ORDER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2394,7 +2385,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_PER_ORDER]: {
         priority: 23,
-        title: 'RC Gross Profit Per Order',
+        title: 'Returning Customer Gross Profit Per Order',
         description: 'Average gross profit per returning customer order.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -2402,8 +2393,7 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_PER_ORDER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2426,7 +2416,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'COGS/Gross %',
         tooltip: 'Cost of goods as a share of gross revenue. The complement of gross margin rate — COGS % + Gross Margin % = 100%.',
         formulaDisplay: 'COGS ÷ Gross Revenue × 100',
@@ -2434,7 +2424,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_COGS_GROSS_RATE]: {
         priority: 35,
-        title: 'NC COGS / Gross Rate',
+        title: 'New Customer COGS / Gross Rate',
         description: 'NC COGS as percentage of gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -2447,7 +2437,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC COGS/Gross %',
         tooltip: 'New customer COGS as a share of their gross revenue.',
         formulaDisplay: 'NC COGS ÷ NC Gross Revenue × 100',
@@ -2455,7 +2445,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_COGS_GROSS_RATE]: {
         priority: 38,
-        title: 'RC COGS / Gross Rate',
+        title: 'Returning Customer COGS / Gross Rate',
         description: 'RC COGS as percentage of gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -2468,7 +2458,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC COGS/Gross %',
         tooltip: 'Returning customer COGS as a share of their gross revenue.',
         formulaDisplay: 'RC COGS ÷ RC Gross Revenue × 100',
@@ -2489,7 +2479,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'COGS/Net %',
         tooltip: 'COGS as a share of net revenue. Higher than gross rate because discounts and refunds reduce the denominator.',
         formulaDisplay: 'COGS ÷ Net Revenue × 100',
@@ -2497,7 +2487,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_COGS_NET_RATE]: {
         priority: 36,
-        title: 'NC COGS / Net Rate',
+        title: 'New Customer COGS / Net Rate',
         description: 'NC COGS as percentage of net revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -2510,7 +2500,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC COGS/Net %',
         tooltip: 'New customer COGS as a share of their net revenue.',
         formulaDisplay: 'NC COGS ÷ NC Net Revenue × 100',
@@ -2518,7 +2508,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_COGS_NET_RATE]: {
         priority: 39,
-        title: 'RC COGS / Net Rate',
+        title: 'Returning Customer COGS / Net Rate',
         description: 'RC COGS as percentage of net revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -2531,7 +2521,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC COGS/Net %',
         tooltip: 'Returning customer COGS as a share of their net revenue.',
         formulaDisplay: 'RC COGS ÷ RC Net Revenue × 100',
@@ -2664,7 +2654,7 @@ export const ORDERS_MEASURES_MAP = {
         decimalPlaces: 0,
         useCompactNotation: true,
         applicableContexts: LTV_COHORT_APPLICABLE_CONTEXTS,
-        shortTitle: 'Cohort Cust.',
+        shortTitle: 'Cohort Customers',
         tooltip: 'The number of customers who made their first purchase in the cohort period. The denominator for all per-customer cohort metrics.',
     },
     [MEASURE.ORDERS_COHORT_RETENTION_PERCENT]: {
@@ -2711,6 +2701,7 @@ export const ORDERS_MEASURES_MAP = {
     [MEASURE.ORDERS_TOP_PRODUCTS]: {
         priority: 9,
         title: 'Top Products',
+        shortTitle: 'Top Products',
         description: 'Top selling products by revenue.',
         sumPrefix: '',
         sumSuffix: '',
@@ -2723,7 +2714,7 @@ export const ORDERS_MEASURES_MAP = {
         valueType: MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'A ranking of products ordered by revenue contribution. Identifies the highest-impact products for merchandising and ad targeting.',
     },
     [MEASURE.ORDERS_CPA]: {
@@ -2735,14 +2726,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CPA,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'How much you spend on average to acquire each order. Lower is better.',
         formulaDisplay: 'Total Ad Spend ÷ Orders',
         formula: 'spend / orders',
@@ -2756,35 +2746,33 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CPA,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'How much you spend to acquire each first-time customer order. Critical for understanding customer acquisition efficiency.',
         formulaDisplay: 'Total Ad Spend ÷ New Customer Orders',
         formula: 'spend / new_customer_orders',
     },
     [MEASURE.ORDERS_TOTAL_ROAS]: {
         priority: 1,
-        title: 'Return on Ad Spend',
-        shortTitle: 'ROAS',
+        title: 'ROAS (Total Sales)',
+        shortTitle: 'ROAS Total',
         description: 'Total Order Revenue divided by Total Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_TOTAL_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'How much revenue you earn for every dollar spent on advertising. A 3x ROAS means $3 revenue per $1 spent.',
         formulaDisplay: 'Total Order Revenue ÷ Total Ad Spend',
         formula: 'total_revenue / spend',
@@ -2798,14 +2786,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_GROSS_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Return on ad spend using gross sales (before discounts and refunds are applied).',
         formulaDisplay: 'Gross Order Sales ÷ Total Ad Spend',
         formula: 'gross_sales / spend',
@@ -2819,14 +2806,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NET_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Return on ad spend using net sales (after discounts and refunds). Most accurate for true profitability.',
         formulaDisplay: 'Net Order Sales ÷ Total Ad Spend',
         formula: 'net_sales / spend',
@@ -2840,56 +2826,53 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Revenue from new customer orders per dollar spent on advertising. Key metric for customer acquisition efficiency.',
         formulaDisplay: 'New Customer Order Revenue ÷ Ad Spend',
         formula: 'nc_revenue / spend',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_ROAS]: {
         priority: 12,
-        title: 'NC ROAS (Gross Sales)',
+        title: 'New Customer ROAS (Gross Sales)',
         shortTitle: 'NC ROAS Gross',
         description: 'New Customer Gross Order Sales divided by Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_GROSS_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Gross sales from new customer orders per dollar spent on advertising.',
         formulaDisplay: 'NC Gross Order Sales ÷ Ad Spend',
         formula: 'nc_gross_sales / spend',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_NET_ROAS]: {
         priority: 13,
-        title: 'NC ROAS (Net Sales)',
+        title: 'New Customer ROAS (Net Sales)',
         shortTitle: 'NC ROAS Net',
         description: 'New Customer Net Order Sales divided by Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_NET_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Net sales from new customer orders per dollar spent on advertising. Most accurate for true acquisition profitability.',
         formulaDisplay: 'NC Net Order Sales ÷ Ad Spend',
         formula: 'nc_net_sales / spend',
@@ -2903,14 +2886,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CPA,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'How much you spend to acquire each repeat customer order. Useful for measuring retention and remarketing campaign efficiency.',
         formulaDisplay: 'Total Ad Spend ÷ Returning Customer Orders',
         formula: 'spend / returning_customer_orders',
@@ -2924,56 +2906,53 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Revenue from returning customer orders per dollar spent on advertising. Key metric for retention efficiency.',
         formulaDisplay: 'Returning Customer Order Revenue ÷ Ad Spend',
         formula: 'rc_revenue / spend',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_ROAS]: {
         priority: 22,
-        title: 'RC ROAS (Gross Sales)',
+        title: 'Returning Customer ROAS (Gross Sales)',
         shortTitle: 'RC ROAS Gross',
         description: 'Returning Customer Gross Order Sales divided by Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Gross sales from returning customer orders per dollar spent on advertising.',
         formulaDisplay: 'RC Gross Order Sales ÷ Ad Spend',
         formula: 'rc_gross_sales / spend',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_ROAS]: {
         priority: 23,
-        title: 'RC ROAS (Net Sales)',
+        title: 'Returning Customer ROAS (Net Sales)',
         shortTitle: 'RC ROAS Net',
         description: 'Returning Customer Net Order Sales divided by Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_NET_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Net sales from returning customer orders per dollar spent on advertising. Most accurate for true retention profitability.',
         formulaDisplay: 'RC Net Order Sales ÷ Ad Spend',
         formula: 'rc_net_sales / spend',
@@ -2987,14 +2966,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM1_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'How much gross margin (CM1) you earn for every dollar spent on advertising.',
         formulaDisplay: 'CM1 ÷ Total Ad Spend',
         formula: 'cm1 / spend',
@@ -3009,14 +2987,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM2_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'How much contribution margin after marketing (CM2) you earn for every dollar spent on advertising.',
         formulaDisplay: 'CM2 ÷ Total Ad Spend',
         formula: 'cm2 / spend',
@@ -3031,140 +3008,133 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM3_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'How much contribution margin after all costs (CM3) you earn for every dollar spent on advertising.',
         formulaDisplay: 'CM3 ÷ Total Ad Spend',
         formula: 'cm3 / spend',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM1_ROAS]: {
         priority: 54,
-        title: 'NC CM1 ROAS',
+        title: 'New Customer CM1 ROAS',
         shortTitle: 'NC CM1 ROAS',
         description: 'New Customer CM1 (Gross Margin) divided by Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM1_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'New customer gross margin (CM1) per dollar spent on advertising.',
         formulaDisplay: 'NC CM1 ÷ Ad Spend',
         formula: 'nc_cm1 / spend',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM2_ROAS]: {
         priority: 55,
-        title: 'NC CM2 ROAS',
+        title: 'New Customer CM2 ROAS',
         shortTitle: 'NC CM2 ROAS',
         description: 'New Customer CM2 divided by Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM2_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'New customer contribution margin after marketing (CM2) per dollar spent on advertising.',
         formulaDisplay: 'NC CM2 ÷ Ad Spend',
         formula: 'nc_cm2 / spend',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM3_ROAS]: {
         priority: 56,
-        title: 'NC CM3 ROAS',
+        title: 'New Customer CM3 ROAS',
         shortTitle: 'NC CM3 ROAS',
         description: 'New Customer CM3 divided by Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM3_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'New customer contribution margin after all costs (CM3) per dollar spent on advertising.',
         formulaDisplay: 'NC CM3 ÷ Ad Spend',
         formula: 'nc_cm3 / spend',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_ROAS]: {
         priority: 57,
-        title: 'RC CM1 ROAS',
+        title: 'Returning Customer CM1 ROAS',
         shortTitle: 'RC CM1 ROAS',
         description: 'Returning Customer CM1 (Gross Margin) divided by Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Returning customer gross margin (CM1) per dollar spent on advertising.',
         formulaDisplay: 'RC CM1 ÷ Ad Spend',
         formula: 'rc_cm1 / spend',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_ROAS]: {
         priority: 58,
-        title: 'RC CM2 ROAS',
+        title: 'Returning Customer CM2 ROAS',
         shortTitle: 'RC CM2 ROAS',
         description: 'Returning Customer CM2 divided by Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Returning customer contribution margin after marketing (CM2) per dollar spent on advertising.',
         formulaDisplay: 'RC CM2 ÷ Ad Spend',
         formula: 'rc_cm2 / spend',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_ROAS]: {
         priority: 59,
-        title: 'RC CM3 ROAS',
+        title: 'Returning Customer CM3 ROAS',
         shortTitle: 'RC CM3 ROAS',
         description: 'Returning Customer CM3 divided by Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_ROAS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Returning customer contribution margin after all costs (CM3) per dollar spent on advertising.',
         formulaDisplay: 'RC CM3 ÷ Ad Spend',
         formula: 'rc_cm3 / spend',
@@ -3178,14 +3148,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_TOTAL_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of your order revenue is spent on advertising. Lower is better—it means more revenue per ad dollar.',
         formulaDisplay: '(Total Ad Spend ÷ Total Order Revenue) × 100',
         formula: '(spend / total_revenue) * 100',
@@ -3199,14 +3168,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_GROSS_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of gross order sales (before discounts and refunds) is spent on advertising.',
         formulaDisplay: '(Total Ad Spend ÷ Gross Order Sales) × 100',
         formula: '(spend / gross_sales) * 100',
@@ -3220,35 +3188,33 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NET_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of net order sales (after discounts and refunds) is spent on advertising.',
         formulaDisplay: '(Total Ad Spend ÷ Net Order Sales) × 100',
         formula: '(spend / net_sales) * 100',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_MER]: {
         priority: 36,
-        title: 'NC Marketing Efficiency Ratio',
+        title: 'New Customer Marketing Efficiency Ratio',
         shortTitle: 'NC MER',
         description: 'Marketing Efficiency Ratio using New Customer Order Revenue.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of new customer order revenue is spent on advertising. Lower is better.',
         formulaDisplay: '(Ad Spend ÷ NC Order Revenue) × 100',
         formula: '(spend / nc_revenue) * 100',
@@ -3262,98 +3228,93 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of new customer gross order sales is spent on advertising.',
         formulaDisplay: '(Ad Spend ÷ NC Gross Order Sales) × 100',
         formula: '(spend / nc_gross_sales) * 100',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_NET_MER]: {
         priority: 38,
-        title: 'NC MER (Net Sales)',
+        title: 'New Customer MER (Net Sales)',
         shortTitle: 'NC MER Net',
         description: 'Marketing Efficiency Ratio using New Customer Net Order Sales.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_NET_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of new customer net order sales is spent on advertising.',
         formulaDisplay: '(Ad Spend ÷ NC Net Order Sales) × 100',
         formula: '(spend / nc_net_sales) * 100',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_MER]: {
         priority: 41,
-        title: 'RC Marketing Efficiency Ratio',
+        title: 'Returning Customer Marketing Efficiency Ratio',
         shortTitle: 'RC MER',
         description: 'Marketing Efficiency Ratio using Returning Customer Order Revenue.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of returning customer order revenue is spent on advertising. Lower is better.',
         formulaDisplay: '(Ad Spend ÷ RC Order Revenue) × 100',
         formula: '(spend / rc_revenue) * 100',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MER]: {
         priority: 42,
-        title: 'RC MER (Gross Sales)',
+        title: 'Returning Customer MER (Gross Sales)',
         shortTitle: 'RC MER Gross',
         description: 'Marketing Efficiency Ratio using Returning Customer Gross Order Sales.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of returning customer gross order sales is spent on advertising.',
         formulaDisplay: '(Ad Spend ÷ RC Gross Order Sales) × 100',
         formula: '(spend / rc_gross_sales) * 100',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MER]: {
         priority: 43,
-        title: 'RC MER (Net Sales)',
+        title: 'Returning Customer MER (Net Sales)',
         shortTitle: 'RC MER Net',
         description: 'Marketing Efficiency Ratio using Returning Customer Net Order Sales.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of returning customer net order sales is spent on advertising.',
         formulaDisplay: '(Ad Spend ÷ RC Net Order Sales) × 100',
         formula: '(spend / rc_net_sales) * 100',
@@ -3367,14 +3328,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM1_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of your gross margin (CM1) is spent on advertising. Lower is better.',
         formulaDisplay: '(Total Ad Spend ÷ CM1) × 100',
         formula: '(spend / cm1) * 100',
@@ -3389,14 +3349,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM2_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of your contribution margin after marketing (CM2) is spent on advertising.',
         formulaDisplay: '(Total Ad Spend ÷ CM2) × 100',
         formula: '(spend / cm2) * 100',
@@ -3411,140 +3370,133 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM3_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of your contribution margin after all costs (CM3) is spent on advertising.',
         formulaDisplay: '(Total Ad Spend ÷ CM3) × 100',
         formula: '(spend / cm3) * 100',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM1_MER]: {
         priority: 64,
-        title: 'NC CM1 MER',
+        title: 'New Customer CM1 MER',
         shortTitle: 'NC CM1 MER',
         description: 'Marketing Efficiency Ratio using New Customer CM1.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM1_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of new customer gross margin (CM1) is spent on advertising.',
         formulaDisplay: '(Ad Spend ÷ NC CM1) × 100',
         formula: '(spend / nc_cm1) * 100',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM2_MER]: {
         priority: 65,
-        title: 'NC CM2 MER',
+        title: 'New Customer CM2 MER',
         shortTitle: 'NC CM2 MER',
         description: 'Marketing Efficiency Ratio using New Customer CM2.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM2_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of new customer contribution margin after marketing (CM2) is spent on advertising.',
         formulaDisplay: '(Ad Spend ÷ NC CM2) × 100',
         formula: '(spend / nc_cm2) * 100',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM3_MER]: {
         priority: 66,
-        title: 'NC CM3 MER',
+        title: 'New Customer CM3 MER',
         shortTitle: 'NC CM3 MER',
         description: 'Marketing Efficiency Ratio using New Customer CM3.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM3_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of new customer contribution margin after all costs (CM3) is spent on advertising.',
         formulaDisplay: '(Ad Spend ÷ NC CM3) × 100',
         formula: '(spend / nc_cm3) * 100',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_MER]: {
         priority: 67,
-        title: 'RC CM1 MER',
+        title: 'Returning Customer CM1 MER',
         shortTitle: 'RC CM1 MER',
         description: 'Marketing Efficiency Ratio using Returning Customer CM1.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of returning customer gross margin (CM1) is spent on advertising.',
         formulaDisplay: '(Ad Spend ÷ RC CM1) × 100',
         formula: '(spend / rc_cm1) * 100',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_MER]: {
         priority: 68,
-        title: 'RC CM2 MER',
+        title: 'Returning Customer CM2 MER',
         shortTitle: 'RC CM2 MER',
         description: 'Marketing Efficiency Ratio using Returning Customer CM2.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of returning customer contribution margin after marketing (CM2) is spent on advertising.',
         formulaDisplay: '(Ad Spend ÷ RC CM2) × 100',
         formula: '(spend / rc_cm2) * 100',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_MER]: {
         priority: 69,
-        title: 'RC CM3 MER',
+        title: 'Returning Customer CM3 MER',
         shortTitle: 'RC CM3 MER',
         description: 'Marketing Efficiency Ratio using Returning Customer CM3.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_MER,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of returning customer contribution margin after all costs (CM3) is spent on advertising.',
         formulaDisplay: '(Ad Spend ÷ RC CM3) × 100',
         formula: '(spend / rc_cm3) * 100',
@@ -3558,14 +3510,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_TOTAL_RAAD,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Order revenue remaining after subtracting advertising costs. A quick measure of marketing profitability.',
         formulaDisplay: 'Total Order Revenue − Ad Spend',
         formula: 'total_revenue - spend',
@@ -3579,14 +3530,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_GROSS_RAAD,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Gross order sales remaining after subtracting advertising costs.',
         formulaDisplay: 'Gross Order Sales − Ad Spend',
         formula: 'gross_sales - spend',
@@ -3600,14 +3550,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NET_RAAD,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Net order sales remaining after subtracting advertising costs. Most accurate for true profitability.',
         formulaDisplay: 'Net Order Sales − Ad Spend',
         formula: 'net_sales - spend',
@@ -3621,14 +3570,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_TOTAL_RAAD_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of your total order revenue remains after ad spend. Higher is better.',
         formulaDisplay: '(RAAD ÷ Total Revenue) × 100',
         formula: '((total_revenue - spend) / total_revenue) * 100',
@@ -3642,14 +3590,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_GROSS_RAAD_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of your gross order sales remains after ad spend.',
         formulaDisplay: '(RAAD Gross ÷ Gross Sales) × 100',
         formula: '((gross_sales - spend) / gross_sales) * 100',
@@ -3663,266 +3610,253 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NET_RAAD_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of your net order sales remains after ad spend. Most accurate profitability view.',
         formulaDisplay: '(RAAD Net ÷ Net Sales) × 100',
         formula: '((net_sales - spend) / net_sales) * 100',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_RAAD]: {
         priority: 77,
-        title: 'NC Revenue After Ad Spend',
+        title: 'New Customer Revenue After Ad Spend',
         shortTitle: 'NC RAAD',
         description: 'New Customer Order Revenue minus Ad Spend.',
         sumPrefix: '$',
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_RAAD,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'New customer order revenue remaining after subtracting advertising costs.',
         formulaDisplay: 'NC Order Revenue − Ad Spend',
         formula: 'nc_revenue - spend',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_RAAD]: {
         priority: 78,
-        title: 'NC RAAD (Gross Sales)',
+        title: 'New Customer RAAD (Gross Sales)',
         shortTitle: 'NC RAAD Gross',
         description: 'New Customer Gross Order Sales minus Ad Spend.',
         sumPrefix: '$',
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_GROSS_RAAD,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'New customer gross order sales remaining after subtracting advertising costs.',
         formulaDisplay: 'NC Gross Order Sales − Ad Spend',
         formula: 'nc_gross_sales - spend',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_NET_RAAD]: {
         priority: 79,
-        title: 'NC RAAD (Net Sales)',
+        title: 'New Customer RAAD (Net Sales)',
         shortTitle: 'NC RAAD Net',
         description: 'New Customer Net Order Sales minus Ad Spend.',
         sumPrefix: '$',
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_NET_RAAD,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'New customer net order sales remaining after subtracting advertising costs.',
         formulaDisplay: 'NC Net Order Sales − Ad Spend',
         formula: 'nc_net_sales - spend',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_RAAD_PERCENT]: {
         priority: 80,
-        title: 'NC RAAD % of Total Revenue',
+        title: 'New Customer RAAD % of Total Revenue',
         shortTitle: 'NC RAAD %',
         description: 'NC Revenue After Ad Spend as percentage of NC Total Revenue.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_RAAD_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of new customer order revenue remains after ad spend.',
         formulaDisplay: '(NC RAAD ÷ NC Revenue) × 100',
         formula: '((nc_revenue - spend) / nc_revenue) * 100',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_RAAD_PERCENT]: {
         priority: 81,
-        title: 'NC RAAD % of Gross Sales',
+        title: 'New Customer RAAD % of Gross Sales',
         shortTitle: 'NC RAAD % Gross',
         description: 'NC Revenue After Ad Spend as percentage of NC Gross Sales.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_GROSS_RAAD_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of new customer gross order sales remains after ad spend.',
         formulaDisplay: '(NC RAAD Gross ÷ NC Gross Sales) × 100',
         formula: '((nc_gross_sales - spend) / nc_gross_sales) * 100',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_NET_RAAD_PERCENT]: {
         priority: 82,
-        title: 'NC RAAD % of Net Sales',
+        title: 'New Customer RAAD % of Net Sales',
         shortTitle: 'NC RAAD % Net',
         description: 'NC Revenue After Ad Spend as percentage of NC Net Sales.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_NET_RAAD_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of new customer net order sales remains after ad spend.',
         formulaDisplay: '(NC RAAD Net ÷ NC Net Sales) × 100',
         formula: '((nc_net_sales - spend) / nc_net_sales) * 100',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD]: {
         priority: 83,
-        title: 'RC Revenue After Ad Spend',
+        title: 'Returning Customer Revenue After Ad Spend',
         shortTitle: 'RC RAAD',
         description: 'Returning Customer Order Revenue minus Ad Spend.',
         sumPrefix: '$',
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Returning customer order revenue remaining after subtracting advertising costs.',
         formulaDisplay: 'RC Order Revenue − Ad Spend',
         formula: 'rc_revenue - spend',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD]: {
         priority: 84,
-        title: 'RC RAAD (Gross Sales)',
+        title: 'Returning Customer RAAD (Gross Sales)',
         shortTitle: 'RC RAAD Gross',
         description: 'Returning Customer Gross Order Sales minus Ad Spend.',
         sumPrefix: '$',
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Returning customer gross order sales remaining after subtracting advertising costs.',
         formulaDisplay: 'RC Gross Order Sales − Ad Spend',
         formula: 'rc_gross_sales - spend',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD]: {
         priority: 85,
-        title: 'RC RAAD (Net Sales)',
+        title: 'Returning Customer RAAD (Net Sales)',
         shortTitle: 'RC RAAD Net',
         description: 'Returning Customer Net Order Sales minus Ad Spend.',
         sumPrefix: '$',
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Returning customer net order sales remaining after subtracting advertising costs.',
         formulaDisplay: 'RC Net Order Sales − Ad Spend',
         formula: 'rc_net_sales - spend',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD_PERCENT]: {
         priority: 86,
-        title: 'RC RAAD % of Total Revenue',
+        title: 'Returning Customer RAAD % of Total Revenue',
         shortTitle: 'RC RAAD %',
         description: 'RC Revenue After Ad Spend as percentage of RC Total Revenue.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of returning customer order revenue remains after ad spend.',
         formulaDisplay: '(RC RAAD ÷ RC Revenue) × 100',
         formula: '((rc_revenue - spend) / rc_revenue) * 100',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD_PERCENT]: {
         priority: 87,
-        title: 'RC RAAD % of Gross Sales',
+        title: 'Returning Customer RAAD % of Gross Sales',
         shortTitle: 'RC RAAD % Gross',
         description: 'RC Revenue After Ad Spend as percentage of RC Gross Sales.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of returning customer gross order sales remains after ad spend.',
         formulaDisplay: '(RC RAAD Gross ÷ RC Gross Sales) × 100',
         formula: '((rc_gross_sales - spend) / rc_gross_sales) * 100',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD_PERCENT]: {
         priority: 88,
-        title: 'RC RAAD % of Net Sales',
+        title: 'Returning Customer RAAD % of Net Sales',
         shortTitle: 'RC RAAD % Net',
         description: 'RC Revenue After Ad Spend as percentage of RC Net Sales.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of returning customer net order sales remains after ad spend.',
         formulaDisplay: '(RC RAAD Net ÷ RC Net Sales) × 100',
         formula: '((rc_net_sales - spend) / rc_net_sales) * 100',
@@ -3937,14 +3871,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM2,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Profit after deducting fulfillment and variable operating costs.',
         formulaDisplay: '(CM1) − (Shipping) − (Gateway) − (Variable Costs)',
         formula: '(cm1) - (shipping) - (gateway) - (variable_costs)',
@@ -3959,21 +3892,20 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM2_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of net revenue remains after product and variable costs.',
         formulaDisplay: '(CM2) ÷ (Net Revenue) × 100',
         formula: '((cm2) / (net_revenue)) * 100',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM2]: {
         priority: 12,
-        title: 'NC Contribution Margin 2',
+        title: 'New Customer Contribution Margin 2',
         shortTitle: 'NC CM2',
         description: 'New customer CM1 minus shipping, gateway, and variable costs.',
         sumPrefix: '$',
@@ -3982,19 +3914,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM2,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Profit from new customers after subtracting fulfillment and variable costs.',
         formulaDisplay: '(NC CM1) − (Shipping) − (Gateway) − (Variable Costs)',
         formula: '(nc_cm1) - (nc_shipping) - (nc_gateway) - (nc_variable_costs)',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM2_PERCENT]: {
         priority: 36,
-        title: 'NC CM2 Margin',
+        title: 'New Customer CM2 Margin',
         shortTitle: 'NC CM2 %',
         description: 'NC CM2 as a percentage of NC Net Revenue.',
         sumPrefix: '',
@@ -4003,19 +3934,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM2_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of new customer net revenue remains after variable costs.',
         formulaDisplay: '(NC CM2) ÷ (NC Net Revenue) × 100',
         formula: '((nc_cm2) / (nc_net_revenue)) * 100',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM2]: {
         priority: 22,
-        title: 'RC Contribution Margin 2',
+        title: 'Returning Customer Contribution Margin 2',
         shortTitle: 'RC CM2',
         description: 'Returning customer CM1 minus shipping, gateway, and variable costs.',
         sumPrefix: '$',
@@ -4024,19 +3954,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM2,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Profit from returning customers after subtracting fulfillment and variable costs.',
         formulaDisplay: '(RC CM1) − (Shipping) − (Gateway) − (Variable Costs)',
         formula: '(rc_cm1) - (rc_shipping) - (rc_gateway) - (rc_variable_costs)',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_PERCENT]: {
         priority: 40,
-        title: 'RC CM2 Margin',
+        title: 'Returning Customer CM2 Margin',
         shortTitle: 'RC CM2 %',
         description: 'RC CM2 as a percentage of RC Net Revenue.',
         sumPrefix: '',
@@ -4045,12 +3974,11 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of returning customer net revenue remains after variable costs.',
         formulaDisplay: '(RC CM2) ÷ (RC Net Revenue) × 100',
         formula: '((rc_cm2) / (rc_net_revenue)) * 100',
@@ -4065,14 +3993,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM3,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Profit after all variable costs including advertising. Key metric for marketing profitability.',
         formulaDisplay: '(CM2) − (Ad Spend)',
         formula: '(cm2) - (blended_ad_spend)',
@@ -4087,21 +4014,20 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM3_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of net revenue remains after all variable costs including advertising.',
         formulaDisplay: '(CM3) ÷ (Net Revenue) × 100',
         formula: '((cm3) / (net_revenue)) * 100',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM3]: {
         priority: 13,
-        title: 'NC Contribution Margin 3',
+        title: 'New Customer Contribution Margin 3',
         shortTitle: 'NC CM3',
         description: 'New customer CM2 minus ad spend.',
         sumPrefix: '$',
@@ -4110,19 +4036,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM3,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Profit from new customers after subtracting all variable costs including advertising.',
         formulaDisplay: '(NC CM2) − (Ad Spend)',
         formula: '(nc_cm2) - (nc_ad_spend)',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM3_PERCENT]: {
         priority: 37,
-        title: 'NC CM3 Margin',
+        title: 'New Customer CM3 Margin',
         shortTitle: 'NC CM3 %',
         description: 'NC CM3 as a percentage of NC Net Revenue.',
         sumPrefix: '',
@@ -4131,19 +4056,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM3_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of new customer net revenue remains after all variable costs.',
         formulaDisplay: '(NC CM3) ÷ (NC Net Revenue) × 100',
         formula: '((nc_cm3) / (nc_net_revenue)) * 100',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM3]: {
         priority: 23,
-        title: 'RC Contribution Margin 3',
+        title: 'Returning Customer Contribution Margin 3',
         shortTitle: 'RC CM3',
         description: 'Returning customer CM2 minus ad spend.',
         sumPrefix: '$',
@@ -4152,19 +4076,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM3,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Profit from returning customers after subtracting all variable costs including advertising.',
         formulaDisplay: '(RC CM2) − (Ad Spend)',
         formula: '(rc_cm2) - (rc_ad_spend)',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_PERCENT]: {
         priority: 41,
-        title: 'RC CM3 Margin',
+        title: 'Returning Customer CM3 Margin',
         shortTitle: 'RC CM3 %',
         description: 'RC CM3 as a percentage of RC Net Revenue.',
         sumPrefix: '',
@@ -4173,12 +4096,11 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of returning customer net revenue remains after all variable costs.',
         formulaDisplay: '(RC CM3) ÷ (RC Net Revenue) × 100',
         formula: '((rc_cm3) / (rc_net_revenue)) * 100',
@@ -4193,14 +4115,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM4,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'CM4 is your operating profit after all costs. Calculated as CM3 (profit after marketing) minus Fixed Costs (salaries, software, rent).',
         formulaDisplay: '(CM3) − (Fixed Costs)',
         formula: '(cm3) - (fixed_costs)',
@@ -4215,21 +4136,20 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM4_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of net revenue becomes operating profit. The ultimate efficiency metric showing profitability after all variable and fixed costs.',
         formulaDisplay: '((CM4) ÷ (Net Revenue)) × 100',
         formula: '((cm4) / (net_revenue)) * 100',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM4]: {
         priority: 14,
-        title: 'NC CM4 (Operating Profit)',
+        title: 'New Customer CM4 (Operating Profit)',
         shortTitle: 'NC CM4',
         description: 'New customer CM3 minus Fixed Costs. Operating profit from new customer acquisitions.',
         sumPrefix: '$',
@@ -4238,19 +4158,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM4,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Operating profit from new customer acquisitions after all variable and fixed costs.',
         formulaDisplay: '(NC CM3) − (NC Fixed Costs)',
         formula: '(nc_cm3) - (nc_fixed_costs)',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM4_PERCENT]: {
         priority: 38,
-        title: 'NC CM4 % (Operating Margin)',
+        title: 'New Customer CM4 % (Operating Margin)',
         shortTitle: 'NC CM4 %',
         description: 'NC CM4 as a percentage of NC Net Revenue. Operating margin from new customers.',
         sumPrefix: '',
@@ -4259,19 +4178,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM4_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of new customer net revenue becomes operating profit after all costs.',
         formulaDisplay: '((NC CM4) ÷ (NC Net Revenue)) × 100',
         formula: '((nc_cm4) / (nc_net_revenue)) * 100',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM4]: {
         priority: 24,
-        title: 'RC CM4 (Operating Profit)',
+        title: 'Returning Customer CM4 (Operating Profit)',
         shortTitle: 'RC CM4',
         description: 'Returning customer CM3 minus Fixed Costs. Operating profit from repeat purchases.',
         sumPrefix: '$',
@@ -4280,19 +4198,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM4,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Operating profit from returning customer orders after all variable and fixed costs.',
         formulaDisplay: '(RC CM3) − (RC Fixed Costs)',
         formula: '(rc_cm3) - (rc_fixed_costs)',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM4_PERCENT]: {
         priority: 42,
-        title: 'RC CM4 % (Operating Margin)',
+        title: 'Returning Customer CM4 % (Operating Margin)',
         shortTitle: 'RC CM4 %',
         description: 'RC CM4 as a percentage of RC Net Revenue. Operating margin from returning customers.',
         sumPrefix: '',
@@ -4301,12 +4218,11 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM4_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'What percentage of returning customer net revenue becomes operating profit after all costs.',
         formulaDisplay: '((RC CM4) ÷ (RC Net Revenue)) × 100',
         formula: '((rc_cm4) / (rc_net_revenue)) * 100',
@@ -4320,14 +4236,13 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM1,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'CM1 is the conservative gross margin calculation using Net Revenue (after returns/discounts) minus Effective COGS.',
         formulaDisplay: '(Net Revenue) − (Effective COGS)',
         formula: '(net_revenue) - (effective_cogs)',
@@ -4341,21 +4256,20 @@ export const ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
+        icon: MEASURE_ICON.CHANNEL,
         measure: MEASURE.ORDERS_CM1_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'CM1 as a percentage of Net Revenue. The conservative gross margin percentage calculation.',
         formulaDisplay: '(CM1) ÷ (Net Revenue) × 100',
         formula: '((cm1) / (net_revenue)) * 100',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM1]: {
         priority: 11,
-        title: 'NC CM1 (Gross Margin)',
+        title: 'New Customer CM1 (Gross Margin)',
         shortTitle: 'NC CM1',
         description: 'New customer Net Revenue minus Effective COGS. Includes impact of returns/discounts.',
         sumPrefix: '$',
@@ -4364,19 +4278,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM1,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'NC CM1 is the conservative gross margin for new customers using Net Revenue minus Effective COGS.',
         formulaDisplay: '(NC Net Revenue) − (NC Effective COGS)',
         formula: '(nc_net_revenue) - (nc_effective_cogs)',
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM1_PERCENT]: {
         priority: 35,
-        title: 'NC CM1 % (Gross Margin %)',
+        title: 'New Customer CM1 % (Gross Margin %)',
         shortTitle: 'NC CM1 %',
         description: 'NC CM1 as a percentage of NC Net Revenue. Includes impact of returns/discounts.',
         sumPrefix: '',
@@ -4385,19 +4298,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_NEW_CUSTOMER_CM1_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'NC CM1 as a percentage of NC Net Revenue. The conservative gross margin percentage for new customers.',
         formulaDisplay: '(NC CM1) ÷ (NC Net Revenue) × 100',
         formula: '((nc_cm1) / (nc_net_revenue)) * 100',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM1]: {
         priority: 21,
-        title: 'RC CM1 (Gross Margin)',
+        title: 'Returning Customer CM1 (Gross Margin)',
         shortTitle: 'RC CM1',
         description: 'Returning customer Net Revenue minus Effective COGS. Includes impact of returns/discounts.',
         sumPrefix: '$',
@@ -4406,19 +4318,18 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM1,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'RC CM1 is the conservative gross margin for returning customers using Net Revenue minus Effective COGS.',
         formulaDisplay: '(RC Net Revenue) − (RC Effective COGS)',
         formula: '(rc_net_revenue) - (rc_effective_cogs)',
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_PERCENT]: {
         priority: 39,
-        title: 'RC CM1 % (Gross Margin %)',
+        title: 'Returning Customer CM1 % (Gross Margin %)',
         shortTitle: 'RC CM1 %',
         description: 'RC CM1 as a percentage of RC Net Revenue. Includes impact of returns/discounts.',
         sumPrefix: '',
@@ -4427,12 +4338,11 @@ export const ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
         measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'RC CM1 as a percentage of RC Net Revenue. The conservative gross margin percentage for returning customers.',
         formulaDisplay: '(RC CM1) ÷ (RC Net Revenue) × 100',
         formula: '((rc_cm1) / (rc_net_revenue)) * 100',