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

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

@@ -42,7 +42,7 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 0,
         useCompactNotation: false,
         applicableContexts: measure_applicable_contexts_js_1.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.',
     },
     [measures_js_1.MEASURE.ORDERS_UNITS]: {
@@ -79,7 +79,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC Units',
         tooltip: 'Total product units purchased by new customers. Useful for understanding acquisition basket size.',
     },
@@ -98,7 +98,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Units',
         tooltip: 'Total product units purchased by returning customers. Reflects repeat buyer basket size.',
     },
@@ -118,14 +118,14 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.NUMBER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '',
@@ -138,7 +138,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.NUMBER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -146,7 +146,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -159,7 +159,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.NUMBER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -226,7 +226,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -245,7 +245,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -264,7 +264,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -283,7 +283,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -302,7 +302,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -321,7 +321,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -341,6 +341,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_TOTAL_AOV]: {
         priority: 1,
         title: 'Total AOV',
+        shortTitle: 'Total AOV',
         description: 'Average order value based on total revenue.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -361,6 +362,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_GROSS_AOV]: {
         priority: 2,
         title: 'Gross AOV',
+        shortTitle: 'Gross AOV',
         description: 'Average order value based on gross revenue.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -381,6 +383,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_NET_AOV]: {
         priority: 3,
         title: 'Net AOV',
+        shortTitle: 'Net AOV',
         description: 'Average order value based on net revenue.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -400,7 +403,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -421,7 +424,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -442,7 +445,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -463,7 +466,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -484,7 +487,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -505,7 +508,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -527,6 +530,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_COGS]: {
         priority: 1,
         title: 'COGS',
+        shortTitle: 'COGS',
         description: 'Cost of goods sold.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -544,7 +548,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_COGS]: {
         priority: 11,
-        title: 'NC COGS',
+        title: 'New Customer COGS',
         shortTitle: 'NC COGS',
         description: 'COGS for new customer orders.',
         sumPrefix: '$',
@@ -558,12 +562,12 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Cost of goods sold for orders placed by new customers. Used to calculate new customer gross margin.',
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_COGS]: {
         priority: 21,
-        title: 'RC COGS',
+        title: 'Returning Customer COGS',
         shortTitle: 'RC COGS',
         description: 'COGS for returning customer orders.',
         sumPrefix: '$',
@@ -577,12 +581,13 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Cost of goods sold for orders placed by returning customers. Used to calculate repeat-buyer gross margin.',
     },
     [measures_js_1.MEASURE.ORDERS_COGS_PER_ORDER]: {
         priority: 3,
         title: 'COGS Per Order',
+        shortTitle: 'COGS/Order',
         description: 'Average COGS per order.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -595,14 +600,14 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '',
@@ -615,7 +620,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -623,7 +628,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -636,7 +641,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC COGS/Order',
         tooltip: 'Average product cost per returning customer order.',
         formulaDisplay: 'RC COGS ÷ RC Order Count',
@@ -663,6 +668,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_REFUND_COUNT]: {
         priority: 2,
         title: 'Refund Count',
+        shortTitle: 'Refund Count',
         description: 'Number of refunded orders.',
         sumPrefix: '',
         sumSuffix: '',
@@ -675,12 +681,13 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'The number of orders that had a refund issued. Use with Refund Rate to understand the scale of returns.',
     },
     [measures_js_1.MEASURE.ORDERS_REFUND_PERCENT]: {
         priority: 3,
         title: 'Refund %',
+        shortTitle: 'Refund %',
         description: 'Percentage of orders refunded.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -693,7 +700,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -713,7 +720,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -734,7 +741,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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.',
     },
@@ -753,13 +760,13 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC Refund Ct',
         tooltip: 'The number of new customer orders that had a refund issued.',
     },
     [measures_js_1.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: '',
@@ -773,7 +780,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -793,7 +800,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC Ref/Ord',
         tooltip: 'Average refund dollar amount per new customer order placed.',
         formulaDisplay: 'NC Refunds ÷ NC Order Count',
@@ -814,7 +821,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Refunds',
         tooltip: 'The total dollar amount refunded to returning customers. High values may indicate quality issues affecting repeat buyers.',
     },
@@ -833,13 +840,13 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Refund Ct',
         tooltip: 'The number of returning customer orders that had a refund issued.',
     },
     [measures_js_1.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: '',
@@ -853,7 +860,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -873,7 +880,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Ref/Ord',
         tooltip: 'Average refund dollar amount per returning customer order placed.',
         formulaDisplay: 'RC Refunds ÷ RC Order Count',
@@ -912,7 +919,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -932,7 +939,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -940,7 +947,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '$',
@@ -954,12 +961,12 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Total dollar value of discounts applied to new customer orders.',
     },
     [measures_js_1.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: '',
@@ -973,14 +980,14 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -994,14 +1001,14 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -1015,12 +1022,12 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Total dollar value of discounts applied to returning customer orders.',
     },
     [measures_js_1.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: '',
@@ -1034,14 +1041,14 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -1055,7 +1062,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -1094,7 +1101,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -1114,7 +1121,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'Shipping/Order',
         tooltip: 'Average shipping fee collected per order.',
         formulaDisplay: 'Total Shipping ÷ Order Count',
@@ -1122,7 +1129,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '$',
@@ -1136,12 +1143,12 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Total shipping fees collected from new customer orders.',
     },
     [measures_js_1.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: '',
@@ -1155,14 +1162,14 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -1176,14 +1183,14 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average shipping fee collected per new customer order.',
         formulaDisplay: 'NC Shipping ÷ NC Order Count',
         formula: 'nc_shipping / nc_order_count',
     },
     [measures_js_1.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: '$',
@@ -1197,12 +1204,12 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Total shipping fees collected from returning customer orders.',
     },
     [measures_js_1.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: '',
@@ -1216,14 +1223,14 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -1237,7 +1244,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average shipping fee collected per returning customer order.',
         formulaDisplay: 'RC Shipping ÷ RC Order Count',
         formula: 'rc_shipping / rc_order_count',
@@ -1276,7 +1283,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -1296,14 +1303,14 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average tax amount collected per order.',
         formulaDisplay: 'Total Tax ÷ Order Count',
         formula: 'total_tax / order_count',
     },
     [measures_js_1.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: '$',
@@ -1317,12 +1324,12 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Total tax collected from new customer orders.',
     },
     [measures_js_1.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: '',
@@ -1336,14 +1343,14 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -1357,14 +1364,14 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average tax amount collected per new customer order.',
         formulaDisplay: 'NC Tax ÷ NC Order Count',
         formula: 'nc_tax / nc_order_count',
     },
     [measures_js_1.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: '$',
@@ -1378,12 +1385,12 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Total tax collected from returning customer orders.',
     },
     [measures_js_1.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: '',
@@ -1397,14 +1404,14 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -1418,7 +1425,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average tax amount collected per returning customer order.',
         formulaDisplay: 'RC Tax ÷ RC Order Count',
         formula: 'rc_tax / rc_order_count',
@@ -1467,28 +1474,27 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM1_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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)',
     },
     [measures_js_1.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: '$',
@@ -1497,19 +1503,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM1_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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)',
     },
     [measures_js_1.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: '$',
@@ -1518,12 +1523,11 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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)',
@@ -1537,14 +1541,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM2_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -1558,14 +1561,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM3_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Average Contribution Margin 3 per order, after all layered cost deductions.',
         formulaDisplay: 'CM3 ÷ Order Count',
         formula: 'cm3 / order_count',
@@ -1580,21 +1582,20 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM4_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -1603,19 +1604,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM2_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -1624,19 +1624,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM3_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -1645,19 +1644,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM4_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -1666,19 +1664,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -1687,19 +1684,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -1708,12 +1704,11 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM4_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -1733,7 +1728,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.NUMBER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -1742,6 +1737,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMERS]: {
         priority: 2,
         title: 'New Customers',
+        shortTitle: 'New Customers',
         description: 'Count of unique new customers.',
         sumPrefix: '',
         sumSuffix: '',
@@ -1754,7 +1750,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'The number of distinct customers making their first-ever purchase in the period. Core acquisition metric.',
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMERS]: {
@@ -1772,13 +1768,13 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
-        shortTitle: 'Ret. Customers',
+        applicableContexts: measure_applicable_contexts_js_1.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.',
     },
     [measures_js_1.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: '%',
@@ -1791,7 +1787,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -1799,7 +1795,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '%',
@@ -1812,7 +1808,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -1833,7 +1829,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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.',
     },
@@ -1852,7 +1848,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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.',
     },
@@ -1871,7 +1867,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -1892,7 +1888,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -1901,6 +1897,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_DISCOUNT_COUNT]: {
         priority: 12,
         title: 'Discount Count',
+        shortTitle: 'Discount Count',
         description: 'Count of orders with discounts.',
         sumPrefix: '',
         sumSuffix: '',
@@ -1913,7 +1910,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'The number of orders that had at least one discount applied. Compare to total orders to gauge discount usage frequency.',
     },
     [measures_js_1.MEASURE.ORDERS_DISCOUNT_GROSS_RATE]: {
@@ -1931,7 +1928,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -1939,7 +1936,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '%',
@@ -1952,7 +1949,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -1960,7 +1957,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '%',
@@ -1973,7 +1970,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -1981,7 +1978,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '%',
@@ -1994,7 +1991,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -2002,7 +1999,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '%',
@@ -2015,7 +2012,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -2036,7 +2033,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -2044,7 +2041,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -2057,7 +2054,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -2065,7 +2062,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -2078,7 +2075,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Ref+Disc',
         tooltip: 'Combined refunds and discounts for returning customer orders.',
         formulaDisplay: 'RC Refunds + RC Discounts',
@@ -2099,8 +2096,9 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'The order subtotal before shipping and taxes are added. Reflects the product value customers commit to at checkout.',
+        hideFromUI: true,
     },
     [measures_js_1.MEASURE.ORDERS_NET_PLUS_SHIPPING]: {
         priority: 5,
@@ -2117,11 +2115,12 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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,
     },
     [measures_js_1.MEASURE.ORDERS_CANCELLED_COUNT]: {
         priority: 51,
@@ -2138,7 +2137,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'Cancellations',
         tooltip: 'The number of orders that were cancelled before fulfillment. High counts may indicate checkout friction or inventory issues.',
     },
@@ -2157,13 +2156,13 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'Cancelled $',
         tooltip: 'The total dollar value of cancelled orders. Represents potential revenue that was lost before fulfillment.',
     },
     [measures_js_1.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: '',
@@ -2176,13 +2175,13 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC Cancellations',
         tooltip: 'The number of new customer orders that were cancelled before fulfillment.',
     },
     [measures_js_1.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: '',
@@ -2195,7 +2194,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'NC Cancelled $',
         tooltip: 'The total dollar value of cancelled new customer orders.',
     },
@@ -2214,13 +2213,13 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Cancellations',
         tooltip: 'The number of returning customer orders that were cancelled before fulfillment.',
     },
     [measures_js_1.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: '',
@@ -2233,7 +2232,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         shortTitle: 'RC Cancelled $',
         tooltip: 'The total dollar value of cancelled returning customer orders.',
     },
@@ -2247,8 +2246,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_GROSS_PROFIT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -2260,7 +2258,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -2268,8 +2266,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -2279,7 +2276,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -2287,8 +2284,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -2306,8 +2302,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_GROSS_PROFIT_GROSS_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2319,7 +2314,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '%',
@@ -2327,8 +2322,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_GROSS_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2338,7 +2332,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '%',
@@ -2346,8 +2340,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_GROSS_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2365,8 +2358,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_GROSS_PROFIT_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2378,7 +2370,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -2386,8 +2378,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2397,7 +2388,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '',
@@ -2405,8 +2396,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2429,7 +2419,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -2437,7 +2427,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '%',
@@ -2450,7 +2440,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -2458,7 +2448,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '%',
@@ -2471,7 +2461,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -2492,7 +2482,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -2500,7 +2490,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '%',
@@ -2513,7 +2503,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -2521,7 +2511,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.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: '%',
@@ -2534,7 +2524,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -2667,7 +2657,7 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 0,
         useCompactNotation: true,
         applicableContexts: measure_applicable_contexts_js_1.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.',
     },
     [measures_js_1.MEASURE.ORDERS_COHORT_RETENTION_PERCENT]: {
@@ -2714,6 +2704,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_TOP_PRODUCTS]: {
         priority: 9,
         title: 'Top Products',
+        shortTitle: 'Top Products',
         description: 'Top selling products by revenue.',
         sumPrefix: '',
         sumSuffix: '',
@@ -2726,7 +2717,7 @@ exports.ORDERS_MEASURES_MAP = {
         valueType: measure_value_type_js_1.MeasureValueType.NUMBER,
         decimalPlaces: 0,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'A ranking of products ordered by revenue contribution. Identifies the highest-impact products for merchandising and ad targeting.',
     },
     [measures_js_1.MEASURE.ORDERS_CPA]: {
@@ -2738,14 +2729,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CPA,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -2759,35 +2749,33 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CPA,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_TOTAL_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -2801,14 +2789,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_GROSS_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -2822,14 +2809,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NET_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -2843,56 +2829,53 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_NET_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -2906,14 +2889,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CPA,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -2927,56 +2909,53 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_NET_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -2990,14 +2969,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM1_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -3012,14 +2990,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM2_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -3034,140 +3011,133 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: 'x',
         avgPrefix: '',
         avgSuffix: 'x',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM3_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM1_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'New customer gross margin (CM1) per dollar spent on advertising.',
         formulaDisplay: 'NC CM1 ÷ Ad Spend',
         formula: 'nc_cm1 / spend',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM2_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM3_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Returning customer gross margin (CM1) per dollar spent on advertising.',
         formulaDisplay: 'RC CM1 ÷ Ad Spend',
         formula: 'rc_cm1 / spend',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -3181,14 +3151,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_TOTAL_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -3202,14 +3171,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_GROSS_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -3223,35 +3191,33 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NET_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -3265,98 +3231,93 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_NET_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -3370,14 +3331,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM1_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -3392,14 +3352,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM2_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -3414,140 +3373,133 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM3_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM1_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM2_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM3_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -3561,14 +3513,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_TOTAL_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -3582,14 +3533,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_GROSS_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Gross order sales remaining after subtracting advertising costs.',
         formulaDisplay: 'Gross Order Sales − Ad Spend',
         formula: 'gross_sales - spend',
@@ -3603,14 +3553,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NET_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -3624,14 +3573,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_TOTAL_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -3645,14 +3593,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_GROSS_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -3666,266 +3613,253 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NET_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'New customer order revenue remaining after subtracting advertising costs.',
         formulaDisplay: 'NC Order Revenue − Ad Spend',
         formula: 'nc_revenue - spend',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_NET_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_NET_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Returning customer order revenue remaining after subtracting advertising costs.',
         formulaDisplay: 'RC Order Revenue − Ad Spend',
         formula: 'rc_revenue - spend',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -3940,14 +3874,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM2,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'Profit after deducting fulfillment and variable operating costs.',
         formulaDisplay: '(CM1) − (Shipping) − (Gateway) − (Variable Costs)',
         formula: '(cm1) - (shipping) - (gateway) - (variable_costs)',
@@ -3962,21 +3895,20 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM2_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -3985,19 +3917,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM2,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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)',
     },
     [measures_js_1.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: '',
@@ -4006,19 +3937,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM2_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -4027,19 +3957,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM2,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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)',
     },
     [measures_js_1.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: '',
@@ -4048,12 +3977,11 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -4068,14 +3996,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM3,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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)',
@@ -4090,21 +4017,20 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM3_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -4113,19 +4039,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM3,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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)',
     },
     [measures_js_1.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: '',
@@ -4134,19 +4059,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM3_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -4155,19 +4079,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM3,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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)',
     },
     [measures_js_1.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: '',
@@ -4176,12 +4099,11 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -4196,14 +4118,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM4,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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)',
@@ -4218,21 +4139,20 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM4_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -4241,19 +4161,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM4,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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)',
     },
     [measures_js_1.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: '',
@@ -4262,19 +4181,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM4_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -4283,19 +4201,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM4,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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)',
     },
     [measures_js_1.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: '',
@@ -4304,12 +4221,11 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM4_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
@@ -4323,14 +4239,13 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM1,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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)',
@@ -4344,21 +4259,20 @@ exports.ORDERS_MEASURES_MAP = {
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
-        icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
+        icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM1_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -4367,19 +4281,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM1,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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)',
     },
     [measures_js_1.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: '',
@@ -4388,19 +4301,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM1_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',
     },
     [measures_js_1.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: '$',
@@ -4409,19 +4321,18 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM1,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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)',
     },
     [measures_js_1.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: '',
@@ -4430,12 +4341,11 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: measure_applicable_contexts_js_1.ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        applicableContexts: measure_applicable_contexts_js_1.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',