@adtrackify/at-tracking-event-types 4.46.0 → 4.48.0

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

@@ -86,6 +86,7 @@ export const ORDERS_MEASURES_MAP = {
     [MEASURE.ORDERS_UNITS]: {
         priority: 2,
         title: 'Units Sold',
+        shortTitle: 'Units',
         description: 'Total number of units sold.',
         sumPrefix: '',
         sumSuffix: '',
@@ -601,11 +602,12 @@ export const ORDERS_MEASURES_MAP = {
         useCompactNotation: true,
         applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'The total cost of products sold, including manufacturing or purchase costs. Subtracted from revenue to calculate gross margin.',
-        relatedMeasures: [MEASURE.ORDERS_CM1, MEASURE.ORDERS_COGS_PER_ORDER, MEASURE.ORDERS_COGS_GROSS_RATE],
+        relatedMeasures: [MEASURE.ORDERS_GROSS_MARGIN, MEASURE.ORDERS_COGS_PER_ORDER, MEASURE.ORDERS_COGS_GROSS_RATE],
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_COGS]: {
         priority: 11,
         title: 'NC COGS',
+        shortTitle: 'NC COGS',
         description: 'COGS for new customer orders.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -620,11 +622,12 @@ export const ORDERS_MEASURES_MAP = {
         useCompactNotation: true,
         applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
         tooltip: 'Cost of goods sold for orders placed by new customers. Used to calculate new customer gross margin.',
-        relatedMeasures: [MEASURE.ORDERS_COGS, MEASURE.ORDERS_NEW_CUSTOMER_CM1, MEASURE.ORDERS_RETURNING_CUSTOMER_COGS],
+        relatedMeasures: [MEASURE.ORDERS_COGS, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN, MEASURE.ORDERS_RETURNING_CUSTOMER_COGS],
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_COGS]: {
         priority: 21,
         title: 'RC COGS',
+        shortTitle: 'RC COGS',
         description: 'COGS for returning customer orders.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -639,7 +642,7 @@ export const ORDERS_MEASURES_MAP = {
         useCompactNotation: true,
         applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
         tooltip: 'Cost of goods sold for orders placed by returning customers. Used to calculate repeat-buyer gross margin.',
-        relatedMeasures: [MEASURE.ORDERS_COGS, MEASURE.ORDERS_RETURNING_CUSTOMER_CM1, MEASURE.ORDERS_NEW_CUSTOMER_COGS],
+        relatedMeasures: [MEASURE.ORDERS_COGS, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN, MEASURE.ORDERS_NEW_CUSTOMER_COGS],
     },
     [MEASURE.ORDERS_COGS_PER_ORDER]: {
         priority: 3,
@@ -660,7 +663,7 @@ export const ORDERS_MEASURES_MAP = {
         tooltip: 'Average product cost per order. Useful for understanding the cost structure of a typical order.',
         formulaDisplay: 'COGS ÷ Order Count',
         formula: 'cogs / order_count',
-        relatedMeasures: [MEASURE.ORDERS_COGS, MEASURE.ORDERS_CM1_PER_ORDER, MEASURE.ORDERS_NEW_CUSTOMER_COGS_PER_ORDER],
+        relatedMeasures: [MEASURE.ORDERS_COGS, MEASURE.ORDERS_GROSS_MARGIN_PER_ORDER, MEASURE.ORDERS_NEW_CUSTOMER_COGS_PER_ORDER],
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_COGS_PER_ORDER]: {
         priority: 13,
@@ -706,9 +709,315 @@ export const ORDERS_MEASURES_MAP = {
         formula: 'rc_cogs / rc_order_count',
         relatedMeasures: [MEASURE.ORDERS_COGS_PER_ORDER, MEASURE.ORDERS_NEW_CUSTOMER_COGS_PER_ORDER, MEASURE.ORDERS_RETURNING_CUSTOMER_COGS],
     },
+    [MEASURE.ORDERS_GROSS_MARGIN]: {
+        priority: 100,
+        title: 'Gross Margin',
+        description: 'DEPRECATED: Use CM1 instead. Revenue minus COGS.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_GROSS_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: true,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        tooltip: 'Gross revenue minus the cost of goods sold. Represents the profit before operating expenses.',
+        formulaDisplay: 'Gross Revenue − COGS',
+        formula: 'gross_revenue - cogs',
+        relatedMeasures: [MEASURE.ORDERS_COGS, MEASURE.ORDERS_GROSS_REVENUE, MEASURE.ORDERS_GROSS_MARGIN_GROSS_RATE, MEASURE.ORDERS_NET_MARGIN],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN]: {
+        priority: 100,
+        title: 'NC Gross Margin',
+        description: 'DEPRECATED: Use CM1 instead. Gross margin from new customers.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: true,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        shortTitle: 'NC Gross Margin',
+        tooltip: 'Gross revenue from new customers minus their COGS. Shows the pre-expense profit from acquisition orders.',
+        formulaDisplay: 'NC Gross Revenue − NC COGS',
+        formula: 'nc_gross_revenue - nc_cogs',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_MARGIN, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN, MEASURE.ORDERS_NEW_CUSTOMER_COGS],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN]: {
+        priority: 100,
+        title: 'RC Gross Margin',
+        description: 'DEPRECATED: Use CM1 instead. Gross margin from returning customers.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: true,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC Gross Margin',
+        tooltip: 'Gross revenue from returning customers minus their COGS. Reflects the profitability of repeat business.',
+        formulaDisplay: 'RC Gross Revenue − RC COGS',
+        formula: 'rc_gross_revenue - rc_cogs',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_MARGIN, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN, MEASURE.ORDERS_RETURNING_CUSTOMER_COGS],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_GROSS_MARGIN_PER_ORDER]: {
+        priority: 100,
+        title: 'Gross Margin Per Order',
+        description: 'DEPRECATED: Use CM1 instead. Average gross margin per order.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_GROSS_MARGIN_PER_ORDER,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'Gross Margin/Ord',
+        tooltip: 'Average gross profit earned per order. Helps benchmark profitability against ad spend on a per-order basis.',
+        formulaDisplay: 'Gross Margin ÷ Order Count',
+        formula: 'gross_margin / order_count',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_MARGIN, MEASURE.ORDERS_NET_MARGIN_PER_ORDER, MEASURE.ORDERS_COGS_PER_ORDER],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN_PER_ORDER]: {
+        priority: 100,
+        title: 'NC Gross Margin Per Order',
+        description: 'DEPRECATED: Use CM1 instead. Average gross margin per order for new customers.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN_PER_ORDER,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'NC GM/Order',
+        tooltip: 'Average gross profit per new customer order. Compare to CPA to evaluate first-order unit economics.',
+        formulaDisplay: 'NC Gross Margin ÷ NC Order Count',
+        formula: 'nc_gross_margin / nc_order_count',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_MARGIN_PER_ORDER, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN_PER_ORDER, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN_PER_ORDER]: {
+        priority: 100,
+        title: 'RC Gross Margin Per Order',
+        description: 'DEPRECATED: Use CM1 instead. Average gross margin per order for returning customers.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN_PER_ORDER,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC GM/Order',
+        tooltip: 'Average gross profit per returning customer order.',
+        formulaDisplay: 'RC Gross Margin ÷ RC Order Count',
+        formula: 'rc_gross_margin / rc_order_count',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_MARGIN_PER_ORDER, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN_PER_ORDER, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_NET_MARGIN]: {
+        priority: 100,
+        title: 'Net Margin',
+        description: 'DEPRECATED: Use CM1 instead. Net revenue minus COGS.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NET_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: true,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        tooltip: 'Net revenue (after discounts and refunds) minus cost of goods sold. A tighter profitability view than gross margin.',
+        formulaDisplay: 'Net Revenue − COGS',
+        formula: 'net_revenue - cogs',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_MARGIN, MEASURE.ORDERS_NET_REVENUE, MEASURE.ORDERS_COGS, MEASURE.ORDERS_NET_MARGIN_NET_RATE],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN]: {
+        priority: 100,
+        title: 'NC Net Margin',
+        description: 'DEPRECATED: Use CM1 instead. Net margin from new customers.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: true,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        shortTitle: 'NC Net Margin',
+        tooltip: 'Net margin from new customer orders after discounts and refunds minus COGS.',
+        formulaDisplay: 'NC Net Revenue − NC COGS',
+        formula: 'nc_net_revenue - nc_cogs',
+        relatedMeasures: [MEASURE.ORDERS_NET_MARGIN, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN]: {
+        priority: 100,
+        title: 'RC Net Margin',
+        description: 'DEPRECATED: Use CM1 instead. Net margin from returning customers.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: true,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC Net Margin',
+        tooltip: 'Net margin from returning customer orders after discounts and refunds minus COGS.',
+        formulaDisplay: 'RC Net Revenue − RC COGS',
+        formula: 'rc_net_revenue - rc_cogs',
+        relatedMeasures: [MEASURE.ORDERS_NET_MARGIN, MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_NET_MARGIN_PER_ORDER]: {
+        priority: 100,
+        title: 'Net Margin Per Order',
+        description: 'DEPRECATED: Use CM1 instead. Average net margin per order.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NET_MARGIN_PER_ORDER,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'Net Margin/Ord',
+        tooltip: 'Average net profit per order after discounts, refunds, and COGS.',
+        formulaDisplay: 'Net Margin ÷ Order Count',
+        formula: 'net_margin / order_count',
+        relatedMeasures: [MEASURE.ORDERS_NET_MARGIN, MEASURE.ORDERS_GROSS_MARGIN_PER_ORDER, MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN_PER_ORDER],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN_PER_ORDER]: {
+        priority: 100,
+        title: 'NC Net Margin Per Order',
+        description: 'DEPRECATED: Use CM1 instead. Average net margin per order for new customers.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN_PER_ORDER,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'NC NM/Order',
+        tooltip: 'Average net profit per new customer order. Use with CPA to evaluate whether acquisition is profitable at the first order.',
+        formulaDisplay: 'NC Net Margin ÷ NC Order Count',
+        formula: 'nc_net_margin / nc_order_count',
+        relatedMeasures: [MEASURE.ORDERS_NET_MARGIN_PER_ORDER, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN_PER_ORDER, MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN_PER_ORDER]: {
+        priority: 100,
+        title: 'RC Net Margin Per Order',
+        description: 'DEPRECATED: Use CM1 instead. Average net margin per order for returning customers.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN_PER_ORDER,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC NM/Order',
+        tooltip: 'Average net profit per returning customer order.',
+        formulaDisplay: 'RC Net Margin ÷ RC Order Count',
+        formula: 'rc_net_margin / rc_order_count',
+        relatedMeasures: [MEASURE.ORDERS_NET_MARGIN_PER_ORDER, MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN_PER_ORDER, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_REFUND_AMOUNT]: {
+        priority: 1,
+        title: 'Refund Amount',
+        description: 'Total refund amount.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_REFUND_AMOUNT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: true,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        tooltip: 'The total dollar amount refunded to customers in the period. High values reduce net revenue and signal product or fulfillment issues.',
+        relatedMeasures: [MEASURE.ORDERS_REFUND_PERCENT, MEASURE.ORDERS_REFUND_COUNT, MEASURE.ORDERS_DISCOUNT_AMOUNT, MEASURE.ORDERS_NET_REVENUE],
+        aliases: [MEASURE.ORDERS_REFUNDS],
+    },
     [MEASURE.ORDERS_REFUNDS]: {
         priority: 1,
-        title: 'Refunds',
+        title: 'Refund Amount',
         description: 'Total refund amount.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -724,6 +1033,8 @@ export const ORDERS_MEASURES_MAP = {
         applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'The total dollar amount refunded to customers in the period. High values reduce net revenue and signal product or fulfillment issues.',
         relatedMeasures: [MEASURE.ORDERS_REFUND_RATE, MEASURE.ORDERS_REFUND_COUNT, MEASURE.ORDERS_DISCOUNTS, MEASURE.ORDERS_NET_REVENUE],
+        deprecated: true,
+        hideFromUI: true,
     },
     [MEASURE.ORDERS_REFUND_COUNT]: {
         priority: 2,
@@ -744,6 +1055,28 @@ export const ORDERS_MEASURES_MAP = {
         tooltip: 'The number of orders that had a refund issued. Use with Refund Rate to understand the scale of returns.',
         relatedMeasures: [MEASURE.ORDERS_REFUNDS, MEASURE.ORDERS_REFUND_RATE, MEASURE.ORDERS_COUNT],
     },
+    [MEASURE.ORDERS_REFUND_PERCENT]: {
+        priority: 3,
+        title: 'Refund %',
+        description: 'Percentage of orders refunded.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_REFUND_PERCENT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_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',
+        relatedMeasures: [MEASURE.ORDERS_REFUNDS, MEASURE.ORDERS_REFUND_COUNT],
+        aliases: [MEASURE.ORDERS_REFUND_RATE],
+    },
     [MEASURE.ORDERS_REFUND_RATE]: {
         priority: 3,
         title: 'Refund Rate',
@@ -764,6 +1097,8 @@ export const ORDERS_MEASURES_MAP = {
         formulaDisplay: 'Refund Count ÷ Order Count × 100',
         formula: 'refund_count / order_count * 100',
         relatedMeasures: [MEASURE.ORDERS_REFUNDS, MEASURE.ORDERS_REFUND_COUNT, MEASURE.ORDERS_DISCOUNT_RATE],
+        deprecated: true,
+        hideFromUI: true,
     },
     [MEASURE.ORDERS_REFUND_PER_ORDER]: {
         priority: 4,
@@ -787,9 +1122,197 @@ export const ORDERS_MEASURES_MAP = {
         formula: 'total_refunds / order_count',
         relatedMeasures: [MEASURE.ORDERS_REFUNDS, MEASURE.ORDERS_DISCOUNT_PER_ORDER, MEASURE.ORDERS_NET_AOV],
     },
+    [MEASURE.ORDERS_NEW_CUSTOMER_REFUNDS]: {
+        priority: 5,
+        title: 'New Customer Refunds',
+        description: 'Total refund amount for new customers.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_REFUNDS,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: true,
+        applicableContexts: ORDERS_ATTRIBUTION_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.',
+        relatedMeasures: [MEASURE.ORDERS_REFUND_AMOUNT, MEASURE.ORDERS_RETURNING_CUSTOMER_REFUNDS, MEASURE.ORDERS_NEW_CUSTOMER_REFUND_COUNT],
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_REFUND_COUNT]: {
+        priority: 6,
+        title: 'New Customer Refund Count',
+        description: 'Number of refunds for new customers.',
+        sumPrefix: '',
+        sumSuffix: '',
+        avgPrefix: '',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_REFUND_COUNT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
+        valueType: MeasureValueType.NUMBER,
+        decimalPlaces: 0,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'NC Refund Ct',
+        tooltip: 'The number of new customer orders that had a refund issued.',
+        relatedMeasures: [MEASURE.ORDERS_REFUND_COUNT, MEASURE.ORDERS_RETURNING_CUSTOMER_REFUND_COUNT, MEASURE.ORDERS_NEW_CUSTOMER_REFUNDS],
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_REFUND_RATE]: {
+        priority: 7,
+        title: 'New Customer Refund Rate',
+        description: 'Percentage of new customer orders refunded.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_REFUND_RATE,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'NC Refund %',
+        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',
+        relatedMeasures: [MEASURE.ORDERS_REFUND_PERCENT, MEASURE.ORDERS_RETURNING_CUSTOMER_REFUND_RATE, MEASURE.ORDERS_NEW_CUSTOMER_REFUND_COUNT],
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_REFUND_PER_ORDER]: {
+        priority: 8,
+        title: 'New Customer Refund per Order',
+        description: 'Average refund amount per new customer order.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_REFUND_PER_ORDER,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'NC Ref/Ord',
+        tooltip: 'Average refund dollar amount per new customer order placed.',
+        formulaDisplay: 'NC Refunds ÷ NC Order Count',
+        formula: 'nc_refunds / nc_order_count',
+        relatedMeasures: [MEASURE.ORDERS_REFUND_PER_ORDER, MEASURE.ORDERS_RETURNING_CUSTOMER_REFUND_PER_ORDER, MEASURE.ORDERS_NEW_CUSTOMER_REFUNDS],
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_REFUNDS]: {
+        priority: 9,
+        title: 'Returning Customer Refunds',
+        description: 'Total refund amount for returning customers.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_REFUNDS,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: true,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC Refunds',
+        tooltip: 'The total dollar amount refunded to returning customers. High values may indicate quality issues affecting repeat buyers.',
+        relatedMeasures: [MEASURE.ORDERS_REFUND_AMOUNT, MEASURE.ORDERS_NEW_CUSTOMER_REFUNDS, MEASURE.ORDERS_RETURNING_CUSTOMER_REFUND_COUNT],
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_REFUND_COUNT]: {
+        priority: 10,
+        title: 'Returning Customer Refund Count',
+        description: 'Number of refunds for returning customers.',
+        sumPrefix: '',
+        sumSuffix: '',
+        avgPrefix: '',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_REFUND_COUNT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
+        valueType: MeasureValueType.NUMBER,
+        decimalPlaces: 0,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC Refund Ct',
+        tooltip: 'The number of returning customer orders that had a refund issued.',
+        relatedMeasures: [MEASURE.ORDERS_REFUND_COUNT, MEASURE.ORDERS_NEW_CUSTOMER_REFUND_COUNT, MEASURE.ORDERS_RETURNING_CUSTOMER_REFUNDS],
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_REFUND_RATE]: {
+        priority: 11,
+        title: 'Returning Customer Refund Rate',
+        description: 'Percentage of returning customer orders refunded.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_REFUND_RATE,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC Refund %',
+        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',
+        relatedMeasures: [MEASURE.ORDERS_REFUND_PERCENT, MEASURE.ORDERS_NEW_CUSTOMER_REFUND_RATE, MEASURE.ORDERS_RETURNING_CUSTOMER_REFUND_COUNT],
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_REFUND_PER_ORDER]: {
+        priority: 12,
+        title: 'Returning Customer Refund per Order',
+        description: 'Average refund amount per returning customer order.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_REFUND_PER_ORDER,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC Ref/Ord',
+        tooltip: 'Average refund dollar amount per returning customer order placed.',
+        formulaDisplay: 'RC Refunds ÷ RC Order Count',
+        formula: 'rc_refunds / rc_order_count',
+        relatedMeasures: [MEASURE.ORDERS_REFUND_PER_ORDER, MEASURE.ORDERS_NEW_CUSTOMER_REFUND_PER_ORDER, MEASURE.ORDERS_RETURNING_CUSTOMER_REFUNDS],
+    },
+    [MEASURE.ORDERS_DISCOUNT_AMOUNT]: {
+        priority: 11,
+        title: 'Discount Amount',
+        description: 'Total discount amount.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_DISCOUNT_AMOUNT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: true,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        tooltip: 'The total dollar value of discounts applied across all orders. High discount totals reduce gross margin.',
+        relatedMeasures: [MEASURE.ORDERS_DISCOUNT_PERCENT, MEASURE.ORDERS_REFUND_AMOUNT, MEASURE.ORDERS_GROSS_REVENUE, MEASURE.ORDERS_NET_REVENUE],
+        aliases: [MEASURE.ORDERS_DISCOUNTS],
+    },
     [MEASURE.ORDERS_DISCOUNTS]: {
         priority: 11,
-        title: 'Discounts',
+        title: 'Discount Amount',
         description: 'Total discount amount.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -805,7 +1328,30 @@ export const ORDERS_MEASURES_MAP = {
         applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'The total dollar value of discounts applied across all orders. High discount totals reduce gross margin.',
         relatedMeasures: [MEASURE.ORDERS_DISCOUNT_RATE, MEASURE.ORDERS_REFUNDS, MEASURE.ORDERS_GROSS_REVENUE, MEASURE.ORDERS_NET_REVENUE],
-        aliases: [MEASURE.ORDERS_DISCOUNT_AMOUNT],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_DISCOUNT_PERCENT]: {
+        priority: 13,
+        title: 'Discount %',
+        description: 'Discounts as percentage of gross revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_DISCOUNT_PERCENT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_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',
+        relatedMeasures: [MEASURE.ORDERS_DISCOUNT_AMOUNT, MEASURE.ORDERS_REFUND_PERCENT, MEASURE.ORDERS_GROSS_REVENUE],
+        aliases: [MEASURE.ORDERS_DISCOUNT_RATE],
     },
     [MEASURE.ORDERS_DISCOUNT_RATE]: {
         priority: 13,
@@ -827,6 +1373,8 @@ export const ORDERS_MEASURES_MAP = {
         formulaDisplay: 'Discounts ÷ Gross Revenue × 100',
         formula: 'discounts / gross_revenue * 100',
         relatedMeasures: [MEASURE.ORDERS_DISCOUNTS, MEASURE.ORDERS_REFUND_RATE, MEASURE.ORDERS_GROSS_REVENUE],
+        deprecated: true,
+        hideFromUI: true,
     },
     [MEASURE.ORDERS_DISCOUNT_PER_ORDER]: {
         priority: 14,
@@ -852,7 +1400,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_SHIPPING]: {
         priority: 31,
-        title: 'Shipping',
+        title: 'Shipping Revenue',
         description: 'Total shipping revenue.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -869,6 +1417,28 @@ export const ORDERS_MEASURES_MAP = {
         tooltip: 'Total shipping fees collected from customers across all orders. Shipping revenue offsets fulfillment costs.',
         relatedMeasures: [MEASURE.ORDERS_SHIPPING_RATE, MEASURE.ORDERS_SHIPPING_PER_ORDER, MEASURE.ORDERS_TOTAL_REVENUE],
     },
+    [MEASURE.ORDERS_SHIPPING_PERCENT]: {
+        priority: 32,
+        title: 'Shipping %',
+        description: 'Shipping as percentage of total revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_SHIPPING_PERCENT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_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',
+        relatedMeasures: [MEASURE.ORDERS_SHIPPING, MEASURE.ORDERS_TAX_PERCENT, MEASURE.ORDERS_TOTAL_REVENUE],
+        aliases: [MEASURE.ORDERS_SHIPPING_RATE],
+    },
     [MEASURE.ORDERS_SHIPPING_RATE]: {
         priority: 32,
         title: 'Shipping Rate',
@@ -889,6 +1459,8 @@ export const ORDERS_MEASURES_MAP = {
         formulaDisplay: 'Shipping ÷ Total Revenue × 100',
         formula: 'shipping / total_revenue * 100',
         relatedMeasures: [MEASURE.ORDERS_SHIPPING, MEASURE.ORDERS_TAX_RATE, MEASURE.ORDERS_TOTAL_REVENUE],
+        deprecated: true,
+        hideFromUI: true,
     },
     [MEASURE.ORDERS_SHIPPING_PER_ORDER]: {
         priority: 33,
@@ -914,7 +1486,7 @@ export const ORDERS_MEASURES_MAP = {
     },
     [MEASURE.ORDERS_TAX]: {
         priority: 41,
-        title: 'Tax',
+        title: 'Tax Collected',
         description: 'Total tax collected.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -931,6 +1503,28 @@ export const ORDERS_MEASURES_MAP = {
         tooltip: 'Total sales tax collected from customers across all orders. Tax is typically passed through and not retained as revenue.',
         relatedMeasures: [MEASURE.ORDERS_TAX_RATE, MEASURE.ORDERS_TAX_PER_ORDER, MEASURE.ORDERS_TOTAL_REVENUE],
     },
+    [MEASURE.ORDERS_TAX_PERCENT]: {
+        priority: 42,
+        title: 'Tax %',
+        description: 'Tax as percentage of total revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_TAX_PERCENT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_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',
+        relatedMeasures: [MEASURE.ORDERS_TAX, MEASURE.ORDERS_SHIPPING_PERCENT, MEASURE.ORDERS_TOTAL_REVENUE],
+        aliases: [MEASURE.ORDERS_TAX_RATE],
+    },
     [MEASURE.ORDERS_TAX_RATE]: {
         priority: 42,
         title: 'Tax Rate',
@@ -951,6 +1545,8 @@ export const ORDERS_MEASURES_MAP = {
         formulaDisplay: 'Tax ÷ Total Revenue × 100',
         formula: 'tax / total_revenue * 100',
         relatedMeasures: [MEASURE.ORDERS_TAX, MEASURE.ORDERS_SHIPPING_RATE, MEASURE.ORDERS_TOTAL_REVENUE],
+        deprecated: true,
+        hideFromUI: true,
     },
     [MEASURE.ORDERS_TAX_PER_ORDER]: {
         priority: 43,
@@ -973,6 +1569,52 @@ export const ORDERS_MEASURES_MAP = {
         formula: 'total_tax / order_count',
         relatedMeasures: [MEASURE.ORDERS_TAX, MEASURE.ORDERS_SHIPPING_PER_ORDER, MEASURE.ORDERS_TOTAL_AOV],
     },
+    [MEASURE.ORDERS_NEW_CUSTOMER_PERCENT]: {
+        priority: 31,
+        title: 'New Customer %',
+        description: 'Percentage of orders from new customers.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_PERCENT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CUSTOMERS,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        shortTitle: 'NC %',
+        tooltip: 'The percentage of total orders placed by first-time buyers. A high NC rate means the business is acquisition-heavy vs. retention-driven.',
+        formulaDisplay: 'NC Orders ÷ Total Orders × 100',
+        formula: 'nc_order_count / order_count * 100',
+        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_PERCENT, MEASURE.ORDERS_NEW_CUSTOMER_COUNT, MEASURE.ORDERS_COUNT],
+        aliases: [MEASURE.ORDERS_NEW_CUSTOMER_RATE],
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_PERCENT]: {
+        priority: 32,
+        title: 'Returning Customer %',
+        description: 'Percentage of orders from returning customers.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_PERCENT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CUSTOMERS,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC %',
+        tooltip: 'The percentage of total orders placed by repeat buyers. A high RC rate signals strong customer loyalty and retention.',
+        formulaDisplay: 'RC Orders ÷ Total Orders × 100',
+        formula: 'rc_order_count / order_count * 100',
+        relatedMeasures: [MEASURE.ORDERS_NEW_CUSTOMER_PERCENT, MEASURE.ORDERS_RETURNING_CUSTOMER_COUNT, MEASURE.ORDERS_COUNT],
+        aliases: [MEASURE.ORDERS_RETURNING_CUSTOMER_RATE],
+    },
     [MEASURE.ORDERS_NEW_CUSTOMER_RATE]: {
         priority: 31,
         title: 'New Customer Rate',
@@ -994,6 +1636,8 @@ export const ORDERS_MEASURES_MAP = {
         formulaDisplay: 'NC Orders ÷ Total Orders × 100',
         formula: 'nc_order_count / order_count * 100',
         relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_RATE, MEASURE.ORDERS_NEW_CUSTOMER_COUNT, MEASURE.ORDERS_COUNT],
+        deprecated: true,
+        hideFromUI: true,
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_RATE]: {
         priority: 32,
@@ -1016,6 +1660,77 @@ export const ORDERS_MEASURES_MAP = {
         formulaDisplay: 'RC Orders ÷ Total Orders × 100',
         formula: 'rc_order_count / order_count * 100',
         relatedMeasures: [MEASURE.ORDERS_NEW_CUSTOMER_RATE, MEASURE.ORDERS_RETURNING_CUSTOMER_COUNT, MEASURE.ORDERS_COUNT],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_CM1_MARGIN_RATE]: {
+        priority: 100,
+        title: 'CM1 Rate',
+        description: 'DEPRECATED: Use ORDERS_CM1_PERCENT instead. Contribution Margin 1 as percentage of revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_CM1_MARGIN_RATE,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        tooltip: 'Contribution Margin 1 (gross margin minus variable selling costs) as a percentage of revenue. Measures product-level profitability.',
+        formulaDisplay: 'CM1 ÷ Revenue × 100',
+        formula: 'cm1 / revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_CM2_MARGIN_RATE, MEASURE.ORDERS_CM3_MARGIN_RATE, MEASURE.ORDERS_CM1_PER_ORDER],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_CM2_MARGIN_RATE]: {
+        priority: 100,
+        title: 'CM2 Rate',
+        description: 'Contribution Margin 2 as percentage of revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_CM2_MARGIN_RATE,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        tooltip: 'Contribution Margin 2 (CM1 minus marketing costs) as a percentage of revenue. Reflects post-marketing profitability.',
+        formulaDisplay: 'CM2 ÷ Revenue × 100',
+        formula: 'cm2 / revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_CM1_MARGIN_RATE, MEASURE.ORDERS_CM3_MARGIN_RATE, MEASURE.ORDERS_CM2_PER_ORDER],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_CM3_MARGIN_RATE]: {
+        priority: 100,
+        title: 'CM3 Rate',
+        description: 'DEPRECATED: Use ORDERS_CM3_PERCENT instead. Contribution Margin 3 as percentage of revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_CM3_MARGIN_RATE,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        tooltip: 'Contribution Margin 3 (CM2 minus additional fixed costs) as a percentage of revenue. The final contribution margin layer.',
+        formulaDisplay: 'CM3 ÷ Revenue × 100',
+        formula: 'cm3 / revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_CM1_MARGIN_RATE, MEASURE.ORDERS_CM2_MARGIN_RATE, MEASURE.ORDERS_CM3_PER_ORDER],
+        deprecated: true,
+        hideFromUI: true,
     },
     [MEASURE.ORDERS_CM1_PER_ORDER]: {
         priority: 5,
@@ -1037,7 +1752,54 @@ export const ORDERS_MEASURES_MAP = {
         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)',
-        relatedMeasures: [MEASURE.ORDERS_CM1_PERCENT, MEASURE.ORDERS_CM2_PER_ORDER, MEASURE.ORDERS_CM3_PER_ORDER],
+        relatedMeasures: [MEASURE.ORDERS_CM1_MARGIN_RATE, MEASURE.ORDERS_CM2_PER_ORDER, MEASURE.ORDERS_CM3_PER_ORDER],
+        aliases: [MEASURE.ORDERS_NET_PRODUCT_MARGIN_PER_ORDER, MEASURE.ORDERS_GROSS_MARGIN_PER_ORDER, MEASURE.ORDERS_NET_MARGIN_PER_ORDER],
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_CM1_PER_ORDER]: {
+        priority: 15,
+        title: 'NC CM1 Per Order',
+        shortTitle: 'NC CM1/Order',
+        description: 'Average CM1 per new customer order.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_CM1_PER_ORDER,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_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)',
+        relatedMeasures: [MEASURE.ORDERS_CM1_PER_ORDER, MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_PER_ORDER],
+        aliases: [MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN_PER_ORDER, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN_PER_ORDER, MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN_PER_ORDER],
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_PER_ORDER]: {
+        priority: 25,
+        title: 'RC CM1 Per Order',
+        shortTitle: 'RC CM1/Order',
+        description: 'Average CM1 per returning customer order.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_PER_ORDER,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_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)',
+        relatedMeasures: [MEASURE.ORDERS_CM1_PER_ORDER, MEASURE.ORDERS_NEW_CUSTOMER_CM1_PER_ORDER],
+        aliases: [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN_PER_ORDER, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN_PER_ORDER, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN_PER_ORDER],
     },
     [MEASURE.ORDERS_CM2_PER_ORDER]: {
         priority: 6,
@@ -1058,7 +1820,7 @@ export const ORDERS_MEASURES_MAP = {
         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',
-        relatedMeasures: [MEASURE.ORDERS_CM2_PERCENT, MEASURE.ORDERS_CM1_PER_ORDER, MEASURE.ORDERS_CM3_PER_ORDER],
+        relatedMeasures: [MEASURE.ORDERS_CM2_MARGIN_RATE, MEASURE.ORDERS_CM1_PER_ORDER, MEASURE.ORDERS_CM3_PER_ORDER],
     },
     [MEASURE.ORDERS_CM3_PER_ORDER]: {
         priority: 7,
@@ -1079,7 +1841,7 @@ export const ORDERS_MEASURES_MAP = {
         tooltip: 'Average Contribution Margin 3 per order, after all layered cost deductions.',
         formulaDisplay: 'CM3 ÷ Order Count',
         formula: 'cm3 / order_count',
-        relatedMeasures: [MEASURE.ORDERS_CM3_PERCENT, MEASURE.ORDERS_CM1_PER_ORDER, MEASURE.ORDERS_CM2_PER_ORDER],
+        relatedMeasures: [MEASURE.ORDERS_CM3_MARGIN_RATE, MEASURE.ORDERS_CM1_PER_ORDER, MEASURE.ORDERS_CM2_PER_ORDER],
     },
     [MEASURE.ORDERS_AVG_ORDERS_PER_CUSTOMER]: {
         priority: 6,
@@ -1592,39 +2354,234 @@ export const ORDERS_MEASURES_MAP = {
         description: 'Count of cancelled orders from returning customers.',
         sumPrefix: '',
         sumSuffix: '',
-        avgPrefix: '',
+        avgPrefix: '',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CANCELLED_COUNT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
+        valueType: MeasureValueType.NUMBER,
+        decimalPlaces: 0,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC Cancellations',
+        tooltip: 'The number of returning customer orders that were cancelled before fulfillment.',
+        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_CANCELLED_AMOUNT, MEASURE.ORDERS_CANCELLED_COUNT, MEASURE.ORDERS_RETURNING_CUSTOMER_COUNT],
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_CANCELLED_AMOUNT]: {
+        priority: 56,
+        title: 'RC Cancelled Amount',
+        description: 'Cancelled order amount from returning customers.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CANCELLED_AMOUNT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: true,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC Cancelled $',
+        tooltip: 'The total dollar value of cancelled returning customer orders.',
+        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_CANCELLED_COUNT, MEASURE.ORDERS_CANCELLED_AMOUNT, MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_REVENUE],
+    },
+    [MEASURE.ORDERS_GROSS_PROFIT]: {
+        priority: 1,
+        title: 'Gross Profit',
+        description: 'Revenue minus cost of goods sold.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_GROSS_PROFIT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: true,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        shortTitle: 'Gross Profit',
+        tooltip: 'Revenue minus cost of goods sold. Shows product-level profitability before operating expenses.',
+        formulaDisplay: 'Revenue - COGS',
+        formula: 'revenue - cogs',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_PROFIT_GROSS_PERCENT, MEASURE.ORDERS_GROSS_REVENUE, MEASURE.ORDERS_COGS],
+        aliases: [MEASURE.ORDERS_GROSS_PRODUCT_MARGIN],
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT]: {
+        priority: 2,
+        title: 'NC Gross Profit',
+        description: 'Gross profit from new customers.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: true,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        shortTitle: 'NC Gross Profit',
+        tooltip: 'Gross profit from new customer orders.',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_PROFIT, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT],
+        aliases: [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PRODUCT_MARGIN],
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT]: {
+        priority: 3,
+        title: 'RC Gross Profit',
+        description: 'Gross profit from returning customers.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: true,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC Gross Profit',
+        tooltip: 'Gross profit from returning customer orders.',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_PROFIT, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT],
+        aliases: [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PRODUCT_MARGIN],
+    },
+    [MEASURE.ORDERS_GROSS_PROFIT_GROSS_PERCENT]: {
+        priority: 11,
+        title: 'Gross Profit % (of Gross)',
+        description: 'Gross profit as percentage of gross revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_GROSS_PROFIT_GROSS_PERCENT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        shortTitle: 'GP % (Gross)',
+        tooltip: 'Gross profit as a share of gross revenue.',
+        formulaDisplay: 'Gross Profit ÷ Gross Revenue × 100',
+        formula: 'gross_profit / gross_revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_PROFIT, MEASURE.ORDERS_GROSS_PROFIT_PER_ORDER],
+        aliases: [MEASURE.ORDERS_GROSS_PRODUCT_MARGIN_GROSS_RATE, MEASURE.ORDERS_GROSS_PRODUCT_MARGIN_NET_RATE],
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_GROSS_PERCENT]: {
+        priority: 12,
+        title: 'NC Gross Profit % (of Gross)',
+        description: 'NC gross profit as percentage of NC gross revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_GROSS_PERCENT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        shortTitle: 'NC GP % (Gross)',
+        tooltip: 'New customer gross profit as a share of their gross revenue.',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_PROFIT_GROSS_PERCENT, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_GROSS_PERCENT],
+        aliases: [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PRODUCT_MARGIN_GROSS_RATE, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PRODUCT_MARGIN_NET_RATE],
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_GROSS_PERCENT]: {
+        priority: 13,
+        title: 'RC Gross Profit % (of Gross)',
+        description: 'RC gross profit as percentage of RC gross revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_GROSS_PERCENT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC GP % (Gross)',
+        tooltip: 'Returning customer gross profit as a share of their gross revenue.',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_PROFIT_GROSS_PERCENT, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_GROSS_PERCENT],
+        aliases: [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PRODUCT_MARGIN_GROSS_RATE, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PRODUCT_MARGIN_NET_RATE],
+    },
+    [MEASURE.ORDERS_GROSS_PROFIT_PER_ORDER]: {
+        priority: 21,
+        title: 'Gross Profit Per Order',
+        description: 'Average gross profit per order.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CANCELLED_COUNT,
+        measure: MEASURE.ORDERS_GROSS_PROFIT_PER_ORDER,
         category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
-        valueType: MeasureValueType.NUMBER,
-        decimalPlaces: 0,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
-        shortTitle: 'RC Cancellations',
-        tooltip: 'The number of returning customer orders that were cancelled before fulfillment.',
-        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_CANCELLED_AMOUNT, MEASURE.ORDERS_CANCELLED_COUNT, MEASURE.ORDERS_RETURNING_CUSTOMER_COUNT],
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        shortTitle: 'GP/Order',
+        tooltip: 'Average gross profit per order.',
+        formulaDisplay: 'Gross Profit ÷ Order Count',
+        formula: 'gross_profit / order_count',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_PROFIT, MEASURE.ORDERS_TOTAL_AOV],
+        aliases: [MEASURE.ORDERS_GROSS_PRODUCT_MARGIN_PER_ORDER],
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_PER_ORDER]: {
+        priority: 22,
+        title: 'NC Gross Profit Per Order',
+        description: 'Average gross profit per new customer order.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_PER_ORDER,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        shortTitle: 'NC GP/Order',
+        tooltip: 'Average gross profit per new customer order.',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_PROFIT_PER_ORDER, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_PER_ORDER],
+        aliases: [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PRODUCT_MARGIN_PER_ORDER],
     },
-    [MEASURE.ORDERS_RETURNING_CUSTOMER_CANCELLED_AMOUNT]: {
-        priority: 56,
-        title: 'RC Cancelled Amount',
-        description: 'Cancelled order amount from returning customers.',
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_PER_ORDER]: {
+        priority: 23,
+        title: 'RC Gross Profit Per Order',
+        description: 'Average gross profit per returning customer order.',
         sumPrefix: '$',
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CANCELLED_AMOUNT,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_PER_ORDER,
         category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_ADJUSTMENTS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
-        useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
-        shortTitle: 'RC Cancelled $',
-        tooltip: 'The total dollar value of cancelled returning customer orders.',
-        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_CANCELLED_COUNT, MEASURE.ORDERS_CANCELLED_AMOUNT, MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_REVENUE],
+        useCompactNotation: false,
+        applicableContexts: STANDARD_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC GP/Order',
+        tooltip: 'Average gross profit per returning customer order.',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_PROFIT_PER_ORDER, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_PER_ORDER],
+        aliases: [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PRODUCT_MARGIN_PER_ORDER],
     },
     [MEASURE.ORDERS_GROSS_PRODUCT_MARGIN]: {
         priority: 1,
@@ -1643,9 +2600,10 @@ export const ORDERS_MEASURES_MAP = {
         useCompactNotation: true,
         applicableContexts: [],
         hideFromUI: true,
+        deprecated: true,
         shortTitle: 'Gross Prod. Margin',
         tooltip: 'Gross margin calculated at the product level, before order-level adjustments like shipping or taxes.',
-        relatedMeasures: [MEASURE.ORDERS_CM1, MEASURE.ORDERS_NET_PRODUCT_MARGIN, MEASURE.ORDERS_GROSS_PRODUCT_MARGIN_GROSS_RATE],
+        relatedMeasures: [MEASURE.ORDERS_GROSS_MARGIN, MEASURE.ORDERS_NET_PRODUCT_MARGIN, MEASURE.ORDERS_GROSS_PRODUCT_MARGIN_GROSS_RATE],
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PRODUCT_MARGIN]: {
         priority: 2,
@@ -1664,9 +2622,10 @@ export const ORDERS_MEASURES_MAP = {
         useCompactNotation: true,
         applicableContexts: [],
         hideFromUI: true,
+        deprecated: true,
         shortTitle: 'NC Gross Prod. Mg',
         tooltip: 'Product-level gross margin from new customer orders.',
-        relatedMeasures: [MEASURE.ORDERS_GROSS_PRODUCT_MARGIN, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PRODUCT_MARGIN, MEASURE.ORDERS_NEW_CUSTOMER_CM1],
+        relatedMeasures: [MEASURE.ORDERS_GROSS_PRODUCT_MARGIN, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PRODUCT_MARGIN, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN],
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PRODUCT_MARGIN]: {
         priority: 3,
@@ -1685,9 +2644,10 @@ export const ORDERS_MEASURES_MAP = {
         useCompactNotation: true,
         applicableContexts: [],
         hideFromUI: true,
+        deprecated: true,
         shortTitle: 'RC Gross Prod. Mg',
         tooltip: 'Product-level gross margin from returning customer orders.',
-        relatedMeasures: [MEASURE.ORDERS_GROSS_PRODUCT_MARGIN, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PRODUCT_MARGIN, MEASURE.ORDERS_RETURNING_CUSTOMER_CM1],
+        relatedMeasures: [MEASURE.ORDERS_GROSS_PRODUCT_MARGIN, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PRODUCT_MARGIN, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN],
     },
     [MEASURE.ORDERS_GROSS_PRODUCT_MARGIN_GROSS_RATE]: {
         priority: 11,
@@ -1710,7 +2670,7 @@ export const ORDERS_MEASURES_MAP = {
         tooltip: 'Gross product margin as a share of gross revenue. Shows how efficiently products are priced relative to their costs.',
         formulaDisplay: 'Gross Product Margin ÷ Gross Revenue × 100',
         formula: 'gross_product_margin / gross_revenue * 100',
-        relatedMeasures: [MEASURE.ORDERS_GROSS_PRODUCT_MARGIN_NET_RATE, MEASURE.ORDERS_GROSS_PRODUCT_MARGIN, MEASURE.ORDERS_CM1_PERCENT],
+        relatedMeasures: [MEASURE.ORDERS_GROSS_PRODUCT_MARGIN_NET_RATE, MEASURE.ORDERS_GROSS_PRODUCT_MARGIN, MEASURE.ORDERS_GROSS_MARGIN_GROSS_RATE],
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PRODUCT_MARGIN_GROSS_RATE]: {
         priority: 12,
@@ -1913,9 +2873,10 @@ export const ORDERS_MEASURES_MAP = {
         useCompactNotation: true,
         applicableContexts: [],
         hideFromUI: true,
+        deprecated: true,
         shortTitle: 'Net Prod. Margin',
         tooltip: 'Net margin calculated at the product level after discounts and refunds, but before order-level fees.',
-        relatedMeasures: [MEASURE.ORDERS_CM1, MEASURE.ORDERS_GROSS_PRODUCT_MARGIN, MEASURE.ORDERS_NET_PRODUCT_MARGIN_NET_RATE],
+        relatedMeasures: [MEASURE.ORDERS_NET_MARGIN, MEASURE.ORDERS_GROSS_PRODUCT_MARGIN, MEASURE.ORDERS_NET_PRODUCT_MARGIN_NET_RATE],
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN]: {
         priority: 22,
@@ -1934,9 +2895,10 @@ export const ORDERS_MEASURES_MAP = {
         useCompactNotation: true,
         applicableContexts: [],
         hideFromUI: true,
+        deprecated: true,
         shortTitle: 'NC Net Prod. Mg',
         tooltip: 'Product-level net margin from new customer orders after discounts and refunds.',
-        relatedMeasures: [MEASURE.ORDERS_NET_PRODUCT_MARGIN, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN, MEASURE.ORDERS_NEW_CUSTOMER_CM1],
+        relatedMeasures: [MEASURE.ORDERS_NET_PRODUCT_MARGIN, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN, MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN],
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN]: {
         priority: 23,
@@ -1955,9 +2917,10 @@ export const ORDERS_MEASURES_MAP = {
         useCompactNotation: true,
         applicableContexts: [],
         hideFromUI: true,
+        deprecated: true,
         shortTitle: 'RC Net Prod. Mg',
         tooltip: 'Product-level net margin from returning customer orders after discounts and refunds.',
-        relatedMeasures: [MEASURE.ORDERS_NET_PRODUCT_MARGIN, MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN, MEASURE.ORDERS_RETURNING_CUSTOMER_CM1],
+        relatedMeasures: [MEASURE.ORDERS_NET_PRODUCT_MARGIN, MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN],
     },
     [MEASURE.ORDERS_NET_PRODUCT_MARGIN_GROSS_RATE]: {
         priority: 31,
@@ -1976,6 +2939,7 @@ export const ORDERS_MEASURES_MAP = {
         useCompactNotation: false,
         applicableContexts: [],
         hideFromUI: true,
+        deprecated: true,
         shortTitle: 'NPM / Gross %',
         tooltip: 'Net product margin as a share of gross revenue.',
         formulaDisplay: 'Net Product Margin ÷ Gross Revenue × 100',
@@ -1999,6 +2963,7 @@ export const ORDERS_MEASURES_MAP = {
         useCompactNotation: false,
         applicableContexts: [],
         hideFromUI: true,
+        deprecated: true,
         shortTitle: 'NC NPM/Gross %',
         tooltip: 'New customer net product margin as a share of their gross revenue.',
         formulaDisplay: 'NC Net Product Margin ÷ NC Gross Revenue × 100',
@@ -2022,149 +2987,444 @@ export const ORDERS_MEASURES_MAP = {
         useCompactNotation: false,
         applicableContexts: [],
         hideFromUI: true,
+        deprecated: true,
         shortTitle: 'RC NPM/Gross %',
         tooltip: 'Returning customer net product margin as a share of their gross revenue.',
         formulaDisplay: 'RC Net Product Margin ÷ RC Gross Revenue × 100',
         formula: 'rc_net_product_margin / rc_gross_revenue * 100',
         relatedMeasures: [MEASURE.ORDERS_NET_PRODUCT_MARGIN_GROSS_RATE, MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN_GROSS_RATE],
     },
-    [MEASURE.ORDERS_NET_PRODUCT_MARGIN_NET_RATE]: {
-        priority: 34,
-        title: 'Net Product Margin / Net Rate',
-        description: 'Net product margin as percentage of net revenue.',
+    [MEASURE.ORDERS_NET_PRODUCT_MARGIN_NET_RATE]: {
+        priority: 34,
+        title: 'Net Product Margin / Net Rate',
+        description: 'Net product margin as percentage of net revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NET_PRODUCT_MARGIN_NET_RATE,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: [],
+        hideFromUI: true,
+        deprecated: true,
+        shortTitle: 'NPM / Net %',
+        tooltip: 'Net product margin as a share of net revenue. Shows the post-discount, post-refund product profit rate.',
+        formulaDisplay: 'Net Product Margin ÷ Net Revenue × 100',
+        formula: 'net_product_margin / net_revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_NET_PRODUCT_MARGIN_GROSS_RATE, MEASURE.ORDERS_NET_PRODUCT_MARGIN, MEASURE.ORDERS_GROSS_PRODUCT_MARGIN_NET_RATE],
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN_NET_RATE]: {
+        priority: 35,
+        title: 'NC Net Product Margin / Net Rate',
+        description: 'NC net product margin as percentage of net revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN_NET_RATE,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: [],
+        hideFromUI: true,
+        deprecated: true,
+        shortTitle: 'NC NPM/Net %',
+        tooltip: 'New customer net product margin as a share of their net revenue.',
+        formulaDisplay: 'NC Net Product Margin ÷ NC Net Revenue × 100',
+        formula: 'nc_net_product_margin / nc_net_revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_NET_PRODUCT_MARGIN_NET_RATE, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN_NET_RATE],
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN_NET_RATE]: {
+        priority: 36,
+        title: 'RC Net Product Margin / Net Rate',
+        description: 'RC net product margin as percentage of net revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN_NET_RATE,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: [],
+        hideFromUI: true,
+        deprecated: true,
+        shortTitle: 'RC NPM/Net %',
+        tooltip: 'Returning customer net product margin as a share of their net revenue.',
+        formulaDisplay: 'RC Net Product Margin ÷ RC Net Revenue × 100',
+        formula: 'rc_net_product_margin / rc_net_revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_NET_PRODUCT_MARGIN_NET_RATE, MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN_NET_RATE],
+    },
+    [MEASURE.ORDERS_NET_PRODUCT_MARGIN_PER_ORDER]: {
+        priority: 37,
+        title: 'Net Product Margin Per Order',
+        description: 'Average net product margin per order.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NET_PRODUCT_MARGIN_PER_ORDER,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: [],
+        hideFromUI: true,
+        deprecated: true,
+        shortTitle: 'NPM/Order',
+        tooltip: 'Average net product margin per order. Reflects per-transaction profitability after returns and adjustments.',
+        formulaDisplay: 'Net Product Margin ÷ Order Count',
+        formula: 'net_product_margin / order_count',
+        relatedMeasures: [MEASURE.ORDERS_NET_PRODUCT_MARGIN, MEASURE.ORDERS_GROSS_PRODUCT_MARGIN_PER_ORDER, MEASURE.ORDERS_COUNT],
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN_PER_ORDER]: {
+        priority: 38,
+        title: 'NC Net Product Margin Per Order',
+        description: 'Average net product margin per new customer order.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN_PER_ORDER,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: [],
+        hideFromUI: true,
+        deprecated: true,
+        shortTitle: 'NC NPM/Order',
+        tooltip: 'Average net product margin per new customer order.',
+        formulaDisplay: 'NC Net Product Margin ÷ NC Order Count',
+        formula: 'nc_net_product_margin / nc_order_count',
+        relatedMeasures: [MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN, MEASURE.ORDERS_NET_PRODUCT_MARGIN_PER_ORDER, MEASURE.ORDERS_NEW_CUSTOMER_COUNT],
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN_PER_ORDER]: {
+        priority: 39,
+        title: 'RC Net Product Margin Per Order',
+        description: 'Average net product margin per returning customer order.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN_PER_ORDER,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: [],
+        hideFromUI: true,
+        deprecated: true,
+        shortTitle: 'RC NPM/Order',
+        tooltip: 'Average net product margin per returning customer order.',
+        formulaDisplay: 'RC Net Product Margin ÷ RC Order Count',
+        formula: 'rc_net_product_margin / rc_order_count',
+        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN, MEASURE.ORDERS_NET_PRODUCT_MARGIN_PER_ORDER, MEASURE.ORDERS_RETURNING_CUSTOMER_COUNT],
+    },
+    [MEASURE.ORDERS_GROSS_MARGIN_GROSS_RATE]: {
+        priority: 100,
+        title: 'Gross Margin / Gross Rate',
+        description: 'DEPRECATED: Use CM1 instead. Gross margin as percentage of gross revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_GROSS_MARGIN_GROSS_RATE,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'GM / Gross %',
+        tooltip: 'Gross margin (revenue minus COGS) as a percentage of gross revenue. The standard gross margin percentage metric.',
+        formulaDisplay: 'Gross Margin ÷ Gross Revenue × 100',
+        formula: 'gross_margin / gross_revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_MARGIN_NET_RATE, MEASURE.ORDERS_GROSS_MARGIN, MEASURE.ORDERS_NET_MARGIN_GROSS_RATE],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN_GROSS_RATE]: {
+        priority: 100,
+        title: 'NC Gross Margin / Gross Rate',
+        description: 'DEPRECATED: Use CM1 instead. NC gross margin as percentage of gross revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN_GROSS_RATE,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'NC GM/Gross %',
+        tooltip: 'New customer gross margin as a share of their gross revenue.',
+        formulaDisplay: 'NC Gross Margin ÷ NC Gross Revenue × 100',
+        formula: 'nc_gross_margin / nc_gross_revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_MARGIN_GROSS_RATE, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN_GROSS_RATE, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN_NET_RATE],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN_GROSS_RATE]: {
+        priority: 100,
+        title: 'RC Gross Margin / Gross Rate',
+        description: 'DEPRECATED: Use CM1 instead. RC gross margin as percentage of gross revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN_GROSS_RATE,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC GM/Gross %',
+        tooltip: 'Returning customer gross margin as a share of their gross revenue.',
+        formulaDisplay: 'RC Gross Margin ÷ RC Gross Revenue × 100',
+        formula: 'rc_gross_margin / rc_gross_revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_MARGIN_GROSS_RATE, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN_GROSS_RATE, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN_NET_RATE],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_GROSS_MARGIN_NET_RATE]: {
+        priority: 100,
+        title: 'Gross Margin / Net Rate',
+        description: 'DEPRECATED: Use CM1 instead. Gross margin as percentage of net revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_GROSS_MARGIN_NET_RATE,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'GM / Net %',
+        tooltip: 'Gross margin as a share of net revenue (after discounts and refunds). Typically higher than the gross rate due to the smaller denominator.',
+        formulaDisplay: 'Gross Margin ÷ Net Revenue × 100',
+        formula: 'gross_margin / net_revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_MARGIN_GROSS_RATE, MEASURE.ORDERS_GROSS_MARGIN, MEASURE.ORDERS_NET_MARGIN_NET_RATE],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN_NET_RATE]: {
+        priority: 100,
+        title: 'NC Gross Margin / Net Rate',
+        description: 'DEPRECATED: Use CM1 instead. NC gross margin as percentage of net revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN_NET_RATE,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'NC GM/Net %',
+        tooltip: 'New customer gross margin as a share of their net revenue.',
+        formulaDisplay: 'NC Gross Margin ÷ NC Net Revenue × 100',
+        formula: 'nc_gross_margin / nc_net_revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_MARGIN_NET_RATE, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN_NET_RATE, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN_GROSS_RATE],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN_NET_RATE]: {
+        priority: 100,
+        title: 'RC Gross Margin / Net Rate',
+        description: 'DEPRECATED: Use CM1 instead. RC gross margin as percentage of net revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN_NET_RATE,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC GM/Net %',
+        tooltip: 'Returning customer gross margin as a share of their net revenue.',
+        formulaDisplay: 'RC Gross Margin ÷ RC Net Revenue × 100',
+        formula: 'rc_gross_margin / rc_net_revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_MARGIN_NET_RATE, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN_NET_RATE, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN_GROSS_RATE],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_NET_MARGIN_GROSS_RATE]: {
+        priority: 100,
+        title: 'Net Margin / Gross Rate',
+        description: 'DEPRECATED: Use CM1 instead. Net margin as percentage of gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_NET_PRODUCT_MARGIN_NET_RATE,
+        measure: MEASURE.ORDERS_NET_MARGIN_GROSS_RATE,
         category: MEASURE_CATEGORY.ORDERS,
         subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: [],
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'NM / Gross %',
+        tooltip: 'Net margin (net revenue minus COGS) as a share of gross revenue. A conservative profitability rate that absorbs all revenue reductions.',
+        formulaDisplay: 'Net Margin ÷ Gross Revenue × 100',
+        formula: 'net_margin / gross_revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_NET_MARGIN_NET_RATE, MEASURE.ORDERS_NET_MARGIN, MEASURE.ORDERS_GROSS_MARGIN_GROSS_RATE],
+        deprecated: true,
         hideFromUI: true,
-        shortTitle: 'NPM / Net %',
-        tooltip: 'Net product margin as a share of net revenue. Shows the post-discount, post-refund product profit rate.',
-        formulaDisplay: 'Net Product Margin ÷ Net Revenue × 100',
-        formula: 'net_product_margin / net_revenue * 100',
-        relatedMeasures: [MEASURE.ORDERS_NET_PRODUCT_MARGIN_GROSS_RATE, MEASURE.ORDERS_NET_PRODUCT_MARGIN, MEASURE.ORDERS_GROSS_PRODUCT_MARGIN_NET_RATE],
     },
-    [MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN_NET_RATE]: {
-        priority: 35,
-        title: 'NC Net Product Margin / Net Rate',
-        description: 'NC net product margin as percentage of net revenue.',
+    [MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN_GROSS_RATE]: {
+        priority: 100,
+        title: 'NC Net Margin / Gross Rate',
+        description: 'DEPRECATED: Use CM1 instead. NC net margin as percentage of gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN_NET_RATE,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN_GROSS_RATE,
         category: MEASURE_CATEGORY.ORDERS,
         subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: [],
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'NC NM/Gross %',
+        tooltip: 'New customer net margin as a share of their gross revenue.',
+        formulaDisplay: 'NC Net Margin ÷ NC Gross Revenue × 100',
+        formula: 'nc_net_margin / nc_gross_revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_NET_MARGIN_GROSS_RATE, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN_GROSS_RATE, MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN_NET_RATE],
+        deprecated: true,
         hideFromUI: true,
-        shortTitle: 'NC NPM/Net %',
-        tooltip: 'New customer net product margin as a share of their net revenue.',
-        formulaDisplay: 'NC Net Product Margin ÷ NC Net Revenue × 100',
-        formula: 'nc_net_product_margin / nc_net_revenue * 100',
-        relatedMeasures: [MEASURE.ORDERS_NET_PRODUCT_MARGIN_NET_RATE, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN_NET_RATE],
     },
-    [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN_NET_RATE]: {
-        priority: 36,
-        title: 'RC Net Product Margin / Net Rate',
-        description: 'RC net product margin as percentage of net revenue.',
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN_GROSS_RATE]: {
+        priority: 100,
+        title: 'RC Net Margin / Gross Rate',
+        description: 'DEPRECATED: Use CM1 instead. RC net margin as percentage of gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN_NET_RATE,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN_GROSS_RATE,
         category: MEASURE_CATEGORY.ORDERS,
         subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: [],
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC NM/Gross %',
+        tooltip: 'Returning customer net margin as a share of their gross revenue.',
+        formulaDisplay: 'RC Net Margin ÷ RC Gross Revenue × 100',
+        formula: 'rc_net_margin / rc_gross_revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_NET_MARGIN_GROSS_RATE, MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN_GROSS_RATE, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN_NET_RATE],
+        deprecated: true,
         hideFromUI: true,
-        shortTitle: 'RC NPM/Net %',
-        tooltip: 'Returning customer net product margin as a share of their net revenue.',
-        formulaDisplay: 'RC Net Product Margin ÷ RC Net Revenue × 100',
-        formula: 'rc_net_product_margin / rc_net_revenue * 100',
-        relatedMeasures: [MEASURE.ORDERS_NET_PRODUCT_MARGIN_NET_RATE, MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN_NET_RATE],
     },
-    [MEASURE.ORDERS_NET_PRODUCT_MARGIN_PER_ORDER]: {
-        priority: 37,
-        title: 'Net Product Margin Per Order',
-        description: 'Average net product margin per order.',
-        sumPrefix: '$',
-        sumSuffix: '',
-        avgPrefix: '$',
-        avgSuffix: '',
+    [MEASURE.ORDERS_NET_MARGIN_NET_RATE]: {
+        priority: 100,
+        title: 'Net Margin / Net Rate',
+        description: 'DEPRECATED: Use CM1 instead. Net margin as percentage of net revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_NET_PRODUCT_MARGIN_PER_ORDER,
+        measure: MEASURE.ORDERS_NET_MARGIN_NET_RATE,
         category: MEASURE_CATEGORY.ORDERS,
         subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
-        valueType: MeasureValueType.CURRENCY,
+        valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: [],
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'NM / Net %',
+        tooltip: 'Net margin as a share of net revenue. This is the standard net margin percentage, showing profit after all product-level costs.',
+        formulaDisplay: 'Net Margin ÷ Net Revenue × 100',
+        formula: 'net_margin / net_revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_NET_MARGIN_GROSS_RATE, MEASURE.ORDERS_NET_MARGIN, MEASURE.ORDERS_GROSS_MARGIN_NET_RATE],
+        deprecated: true,
         hideFromUI: true,
-        shortTitle: 'NPM/Order',
-        tooltip: 'Average net product margin per order. Reflects per-transaction profitability after returns and adjustments.',
-        formulaDisplay: 'Net Product Margin ÷ Order Count',
-        formula: 'net_product_margin / order_count',
-        relatedMeasures: [MEASURE.ORDERS_NET_PRODUCT_MARGIN, MEASURE.ORDERS_GROSS_PRODUCT_MARGIN_PER_ORDER, MEASURE.ORDERS_COUNT],
     },
-    [MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN_PER_ORDER]: {
-        priority: 38,
-        title: 'NC Net Product Margin Per Order',
-        description: 'Average net product margin per new customer order.',
-        sumPrefix: '$',
-        sumSuffix: '',
-        avgPrefix: '$',
-        avgSuffix: '',
+    [MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN_NET_RATE]: {
+        priority: 100,
+        title: 'NC Net Margin / Net Rate',
+        description: 'DEPRECATED: Use CM1 instead. NC net margin as percentage of net revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN_PER_ORDER,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN_NET_RATE,
         category: MEASURE_CATEGORY.ORDERS,
         subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
-        valueType: MeasureValueType.CURRENCY,
+        valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: [],
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'NC NM/Net %',
+        tooltip: 'New customer net margin as a share of their net revenue.',
+        formulaDisplay: 'NC Net Margin ÷ NC Net Revenue × 100',
+        formula: 'nc_net_margin / nc_net_revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_NET_MARGIN_NET_RATE, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN_NET_RATE, MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN_GROSS_RATE],
+        deprecated: true,
         hideFromUI: true,
-        shortTitle: 'NC NPM/Order',
-        tooltip: 'Average net product margin per new customer order.',
-        formulaDisplay: 'NC Net Product Margin ÷ NC Order Count',
-        formula: 'nc_net_product_margin / nc_order_count',
-        relatedMeasures: [MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN, MEASURE.ORDERS_NET_PRODUCT_MARGIN_PER_ORDER, MEASURE.ORDERS_NEW_CUSTOMER_COUNT],
     },
-    [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN_PER_ORDER]: {
-        priority: 39,
-        title: 'RC Net Product Margin Per Order',
-        description: 'Average net product margin per returning customer order.',
-        sumPrefix: '$',
-        sumSuffix: '',
-        avgPrefix: '$',
-        avgSuffix: '',
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN_NET_RATE]: {
+        priority: 100,
+        title: 'RC Net Margin / Net Rate',
+        description: 'DEPRECATED: Use CM1 instead. RC net margin as percentage of net revenue.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN_PER_ORDER,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN_NET_RATE,
         category: MEASURE_CATEGORY.ORDERS,
         subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
-        valueType: MeasureValueType.CURRENCY,
+        valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
-        applicableContexts: [],
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'RC NM/Net %',
+        tooltip: 'Returning customer net margin as a share of their net revenue.',
+        formulaDisplay: 'RC Net Margin ÷ RC Net Revenue × 100',
+        formula: 'rc_net_margin / rc_net_revenue * 100',
+        relatedMeasures: [MEASURE.ORDERS_NET_MARGIN_NET_RATE, MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN_NET_RATE, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN_GROSS_RATE],
+        deprecated: true,
         hideFromUI: true,
-        shortTitle: 'RC NPM/Order',
-        tooltip: 'Average net product margin per returning customer order.',
-        formulaDisplay: 'RC Net Product Margin ÷ RC Order Count',
-        formula: 'rc_net_product_margin / rc_order_count',
-        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN, MEASURE.ORDERS_NET_PRODUCT_MARGIN_PER_ORDER, MEASURE.ORDERS_RETURNING_CUSTOMER_COUNT],
     },
     [MEASURE.ORDERS_COGS_GROSS_RATE]: {
         priority: 31,
@@ -2186,7 +3446,7 @@ export const ORDERS_MEASURES_MAP = {
         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',
         formula: 'cogs / gross_revenue * 100',
-        relatedMeasures: [MEASURE.ORDERS_COGS_NET_RATE, MEASURE.ORDERS_COGS, MEASURE.ORDERS_CM1_PERCENT],
+        relatedMeasures: [MEASURE.ORDERS_COGS_NET_RATE, MEASURE.ORDERS_COGS, MEASURE.ORDERS_GROSS_MARGIN_GROSS_RATE],
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_COGS_GROSS_RATE]: {
         priority: 35,
@@ -2252,7 +3512,7 @@ export const ORDERS_MEASURES_MAP = {
         tooltip: 'COGS as a share of net revenue. Higher than gross rate because discounts and refunds reduce the denominator.',
         formulaDisplay: 'COGS ÷ Net Revenue × 100',
         formula: 'cogs / net_revenue * 100',
-        relatedMeasures: [MEASURE.ORDERS_COGS_GROSS_RATE, MEASURE.ORDERS_COGS, MEASURE.ORDERS_CM1_PERCENT],
+        relatedMeasures: [MEASURE.ORDERS_COGS_GROSS_RATE, MEASURE.ORDERS_COGS, MEASURE.ORDERS_GROSS_MARGIN_NET_RATE],
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_COGS_NET_RATE]: {
         priority: 36,
@@ -2435,6 +3695,29 @@ export const ORDERS_MEASURES_MAP = {
         tooltip: 'The number of customers who made their first purchase in the cohort period. The denominator for all per-customer cohort metrics.',
         relatedMeasures: [MEASURE.ORDERS_COHORT_GROSS_REVENUE, MEASURE.ORDERS_COHORT_RETENTION_RATE, MEASURE.ORDERS_COHORT_AOV],
     },
+    [MEASURE.ORDERS_COHORT_RETENTION_PERCENT]: {
+        priority: 43,
+        title: 'Cohort Retention %',
+        description: 'Customer retention rate by cohort.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_COHORT_RETENTION_PERCENT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_LTV,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        shortTitle: 'Cohort Retention',
+        tooltip: 'The percentage of customers in a cohort who made an additional purchase in a subsequent period. Higher retention drives LTV.',
+        formulaDisplay: 'Returning Cohort Customers ÷ Initial Cohort Customers × 100',
+        formula: 'returning_cohort_customers / initial_cohort_customers * 100',
+        relatedMeasures: [MEASURE.ORDERS_COHORT_CUSTOMERS, MEASURE.ORDERS_COHORT_GROSS_REVENUE, MEASURE.ORDERS_LTV],
+        aliases: [MEASURE.ORDERS_COHORT_RETENTION_RATE],
+    },
     [MEASURE.ORDERS_COHORT_RETENTION_RATE]: {
         priority: 43,
         title: 'Cohort Retention Rate',
@@ -2456,6 +3739,8 @@ export const ORDERS_MEASURES_MAP = {
         formulaDisplay: 'Returning Cohort Customers ÷ Initial Cohort Customers × 100',
         formula: 'returning_cohort_customers / initial_cohort_customers * 100',
         relatedMeasures: [MEASURE.ORDERS_COHORT_CUSTOMERS, MEASURE.ORDERS_COHORT_GROSS_REVENUE, MEASURE.ORDERS_LTV],
+        deprecated: true,
+        hideFromUI: true,
     },
     [MEASURE.ORDERS_COHORT_AOV]: {
         priority: 42,
@@ -2804,6 +4089,7 @@ export const ORDERS_MEASURES_MAP = {
         formulaDisplay: '(Total Ad Spend ÷ Gross Order Sales) × 100',
         formula: '(spend / gross_sales) * 100',
         relatedMeasures: [MEASURE.ORDERS_TOTAL_MER, MEASURE.ORDERS_NET_MER, MEASURE.ORDERS_GROSS_ROAS],
+        aliases: [MEASURE.ORDERS_SPEND_GROSS_PERCENT],
     },
     [MEASURE.ORDERS_NET_MER]: {
         priority: 33,
@@ -2826,6 +4112,7 @@ export const ORDERS_MEASURES_MAP = {
         formulaDisplay: '(Total Ad Spend ÷ Net Order Sales) × 100',
         formula: '(spend / net_sales) * 100',
         relatedMeasures: [MEASURE.ORDERS_TOTAL_MER, MEASURE.ORDERS_GROSS_MER, MEASURE.ORDERS_NET_ROAS],
+        aliases: [MEASURE.ORDERS_SPEND_NET_PERCENT],
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_MER]: {
         priority: 36,
@@ -3299,277 +4586,110 @@ export const ORDERS_MEASURES_MAP = {
         avgPrefix: '$',
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
-        valueType: MeasureValueType.CURRENCY,
-        decimalPlaces: 2,
-        useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_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',
-        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD, MEASURE.ORDERS_GROSS_RAAD],
-    },
-    [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD]: {
-        priority: 85,
-        title: 'RC RAAD (Net Sales)',
-        shortTitle: 'RC RAAD Net',
-        description: 'Returning Customer Net Order Sales minus Ad Spend.',
-        sumPrefix: '$',
-        sumSuffix: '',
-        avgPrefix: '$',
-        avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
-        valueType: MeasureValueType.CURRENCY,
-        decimalPlaces: 2,
-        useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_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',
-        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD, MEASURE.ORDERS_NET_RAAD],
-    },
-    [MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD_PERCENT]: {
-        priority: 86,
-        title: 'RC RAAD % of Total Revenue',
-        shortTitle: 'RC RAAD %',
-        description: 'RC Revenue After Ad Spend as percentage of RC Total Revenue.',
-        sumPrefix: '',
-        sumSuffix: '%',
-        avgPrefix: '',
-        avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
-        valueType: MeasureValueType.PERCENTAGE,
-        decimalPlaces: 2,
-        useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_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',
-        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD, MEASURE.ORDERS_TOTAL_RAAD_PERCENT],
-    },
-    [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD_PERCENT]: {
-        priority: 87,
-        title: 'RC RAAD % of Gross Sales',
-        shortTitle: 'RC RAAD % Gross',
-        description: 'RC Revenue After Ad Spend as percentage of RC Gross Sales.',
-        sumPrefix: '',
-        sumSuffix: '%',
-        avgPrefix: '',
-        avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
-        valueType: MeasureValueType.PERCENTAGE,
-        decimalPlaces: 2,
-        useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_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',
-        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD, MEASURE.ORDERS_GROSS_RAAD_PERCENT],
-    },
-    [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD_PERCENT]: {
-        priority: 88,
-        title: 'RC RAAD % of Net Sales',
-        shortTitle: 'RC RAAD % Net',
-        description: 'RC Revenue After Ad Spend as percentage of RC Net Sales.',
-        sumPrefix: '',
-        sumSuffix: '%',
-        avgPrefix: '',
-        avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
-        valueType: MeasureValueType.PERCENTAGE,
-        decimalPlaces: 2,
-        useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_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',
-        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD, MEASURE.ORDERS_NET_RAAD_PERCENT],
-    },
-    [MEASURE.ORDERS_EFFECTIVE_COGS]: {
-        priority: 2,
-        title: 'Effective Cost of Goods Sold',
-        shortTitle: 'Effective COGS',
-        description: 'Net Cost of Goods Sold (Orders COGS + Handling - Refund COGS).',
-        sumPrefix: '$',
-        sumSuffix: '',
-        avgPrefix: '$',
-        avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_EFFECTIVE_COGS,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_COGS,
-        valueType: MeasureValueType.CURRENCY,
-        decimalPlaces: 2,
-        useCompactNotation: true,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
-        tooltip: 'The true cost of products sold, accounting for returns and handling fees.',
-        formulaDisplay: 'Orders COGS + Handling − Refund COGS',
-        formula: 'orders_cogs + handling - refund_cogs',
-        relatedMeasures: [MEASURE.ORDERS_EFFECTIVE_COGS_PERCENT, MEASURE.ORDERS_COGS_FROM_ORDERS, MEASURE.ORDERS_COGS_FROM_REFUNDS, MEASURE.ORDERS_CM1],
-    },
-    [MEASURE.ORDERS_EFFECTIVE_COGS_PERCENT]: {
-        priority: 33,
-        title: 'Effective COGS %',
-        shortTitle: 'COGS %',
-        description: 'Effective COGS as a percentage of Net Sales.',
-        sumPrefix: '',
-        sumSuffix: '%',
-        avgPrefix: '',
-        avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_EFFECTIVE_COGS_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_COGS,
-        valueType: MeasureValueType.PERCENTAGE,
-        decimalPlaces: 2,
-        useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
-        tooltip: 'What percentage of net sales goes toward product costs. Lower means higher gross margins.',
-        formulaDisplay: '(Effective COGS ÷ Net Sales) × 100',
-        formula: '(effective_cogs / net_sales) * 100',
-        relatedMeasures: [MEASURE.ORDERS_EFFECTIVE_COGS, MEASURE.ORDERS_CM1_PERCENT],
-    },
-    [MEASURE.ORDERS_NEW_CUSTOMER_EFFECTIVE_COGS]: {
-        priority: 12,
-        title: 'NC Effective COGS',
-        shortTitle: 'NC COGS',
-        description: 'Effective COGS for new customer orders.',
-        sumPrefix: '$',
-        sumSuffix: '',
-        avgPrefix: '$',
-        avgSuffix: '',
-        icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_NEW_CUSTOMER_EFFECTIVE_COGS,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD,
         category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_COGS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
         applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
-        tooltip: 'Cost of goods sold for orders from first-time customers.',
-        relatedMeasures: [MEASURE.ORDERS_EFFECTIVE_COGS, MEASURE.ORDERS_NEW_CUSTOMER_EFFECTIVE_COGS_PERCENT],
-    },
-    [MEASURE.ORDERS_NEW_CUSTOMER_EFFECTIVE_COGS_PERCENT]: {
-        priority: 34,
-        title: 'NC Effective COGS %',
-        shortTitle: 'NC COGS %',
-        description: 'NC Effective COGS as a percentage of NC Net Sales.',
-        sumPrefix: '',
-        sumSuffix: '%',
-        avgPrefix: '',
-        avgSuffix: '%',
-        icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_NEW_CUSTOMER_EFFECTIVE_COGS_PERCENT,
-        category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_COGS,
-        valueType: MeasureValueType.PERCENTAGE,
-        decimalPlaces: 2,
-        useCompactNotation: false,
-        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
-        tooltip: 'What percentage of new customer net sales goes toward product costs.',
-        formulaDisplay: '(NC Effective COGS ÷ NC Net Sales) × 100',
-        formula: '(nc_effective_cogs / nc_net_sales) * 100',
-        relatedMeasures: [MEASURE.ORDERS_NEW_CUSTOMER_EFFECTIVE_COGS, MEASURE.ORDERS_EFFECTIVE_COGS_PERCENT],
+        tooltip: 'Returning customer gross order sales remaining after subtracting advertising costs.',
+        formulaDisplay: 'RC Gross Order Sales − Ad Spend',
+        formula: 'rc_gross_sales - spend',
+        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD, MEASURE.ORDERS_GROSS_RAAD],
     },
-    [MEASURE.ORDERS_RETURNING_CUSTOMER_EFFECTIVE_COGS]: {
-        priority: 22,
-        title: 'RC Effective COGS',
-        shortTitle: 'RC COGS',
-        description: 'Effective COGS for returning customer orders.',
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD]: {
+        priority: 85,
+        title: 'RC RAAD (Net Sales)',
+        shortTitle: 'RC RAAD Net',
+        description: 'Returning Customer Net Order Sales minus Ad Spend.',
         sumPrefix: '$',
         sumSuffix: '',
         avgPrefix: '$',
         avgSuffix: '',
         icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_EFFECTIVE_COGS,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD,
         category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_COGS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
         valueType: MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
         applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
-        tooltip: 'Cost of goods sold for orders from returning customers.',
-        relatedMeasures: [MEASURE.ORDERS_EFFECTIVE_COGS, MEASURE.ORDERS_RETURNING_CUSTOMER_EFFECTIVE_COGS_PERCENT],
+        tooltip: 'Returning customer net order sales remaining after subtracting advertising costs.',
+        formulaDisplay: 'RC Net Order Sales − Ad Spend',
+        formula: 'rc_net_sales - spend',
+        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD, MEASURE.ORDERS_NET_RAAD],
     },
-    [MEASURE.ORDERS_RETURNING_CUSTOMER_EFFECTIVE_COGS_PERCENT]: {
-        priority: 37,
-        title: 'RC Effective COGS %',
-        shortTitle: 'RC COGS %',
-        description: 'RC Effective COGS as a percentage of RC Net Sales.',
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD_PERCENT]: {
+        priority: 86,
+        title: 'RC RAAD % of Total Revenue',
+        shortTitle: 'RC RAAD %',
+        description: 'RC Revenue After Ad Spend as percentage of RC Total Revenue.',
         sumPrefix: '',
         sumSuffix: '%',
         avgPrefix: '',
         avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_EFFECTIVE_COGS_PERCENT,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD_PERCENT,
         category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_COGS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
         valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
         applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
-        tooltip: 'What percentage of returning customer net sales goes toward product costs.',
-        formulaDisplay: '(RC Effective COGS ÷ RC Net Sales) × 100',
-        formula: '(rc_effective_cogs / rc_net_sales) * 100',
-        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_EFFECTIVE_COGS, MEASURE.ORDERS_EFFECTIVE_COGS_PERCENT],
+        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',
+        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD, MEASURE.ORDERS_TOTAL_RAAD_PERCENT],
     },
-    [MEASURE.ORDERS_COGS_FROM_ORDERS]: {
-        priority: 4,
-        title: 'COGS (Orders)',
-        shortTitle: 'Order COGS',
-        description: 'Cost of Goods Sold from orders.',
-        sumPrefix: '$',
-        sumSuffix: '',
-        avgPrefix: '$',
-        avgSuffix: '',
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD_PERCENT]: {
+        priority: 87,
+        title: 'RC RAAD % of Gross Sales',
+        shortTitle: 'RC RAAD % Gross',
+        description: 'RC Revenue After Ad Spend as percentage of RC Gross Sales.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_COGS_FROM_ORDERS,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD_PERCENT,
         category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_COGS,
-        valueType: MeasureValueType.CURRENCY,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
-        useCompactNotation: true,
+        useCompactNotation: false,
         applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
-        tooltip: 'Direct product costs for fulfilled orders before accounting for returns.',
-        relatedMeasures: [MEASURE.ORDERS_COGS_FROM_REFUNDS, MEASURE.ORDERS_EFFECTIVE_COGS],
+        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',
+        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD, MEASURE.ORDERS_GROSS_RAAD_PERCENT],
     },
-    [MEASURE.ORDERS_COGS_FROM_REFUNDS]: {
-        priority: 5,
-        title: 'COGS (Refunds)',
-        shortTitle: 'Refund COGS',
-        description: 'Cost of Goods Sold recovered from refunds.',
-        sumPrefix: '$',
-        sumSuffix: '',
-        avgPrefix: '$',
-        avgSuffix: '',
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD_PERCENT]: {
+        priority: 88,
+        title: 'RC RAAD % of Net Sales',
+        shortTitle: 'RC RAAD % Net',
+        description: 'RC Revenue After Ad Spend as percentage of RC Net Sales.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
         icon: MEASURE_ICON.SHOPIFY,
-        measure: MEASURE.ORDERS_COGS_FROM_REFUNDS,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD_PERCENT,
         category: MEASURE_CATEGORY.ORDERS,
-        subcategory: MEASURE_SUBCATEGORY.ORDERS_COGS,
-        valueType: MeasureValueType.CURRENCY,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        valueType: MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
-        useCompactNotation: true,
+        useCompactNotation: false,
         applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
-        tooltip: 'Product costs recovered when orders are refunded.',
-        relatedMeasures: [MEASURE.ORDERS_COGS_FROM_ORDERS, MEASURE.ORDERS_EFFECTIVE_COGS],
+        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',
+        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD, MEASURE.ORDERS_NET_RAAD_PERCENT],
     },
     [MEASURE.ORDERS_VARIABLE_COSTS]: {
         priority: 51,
         title: 'Variable Costs',
+        shortTitle: 'Var. Costs',
         description: 'Total custom variable expenses (per-order fees, % of sales, etc.).',
         sumPrefix: '$',
         sumSuffix: '',
@@ -3584,11 +4704,12 @@ export const ORDERS_MEASURES_MAP = {
         useCompactNotation: true,
         applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
         tooltip: 'Costs that scale with order volume, such as transaction fees and fulfillment costs.',
-        relatedMeasures: [MEASURE.ORDERS_VARIABLE_COSTS_PERCENT, MEASURE.ORDERS_FIXED_COSTS, MEASURE.ORDERS_CM2_PERCENT],
+        relatedMeasures: [MEASURE.ORDERS_VARIABLE_COSTS_PERCENT, MEASURE.ORDERS_FIXED_COSTS, MEASURE.ORDERS_CM2_MARGIN_RATE],
     },
     [MEASURE.ORDERS_VARIABLE_COSTS_PERCENT]: {
         priority: 61,
         title: 'Variable Costs %',
+        shortTitle: 'Var. Costs %',
         description: 'Variable costs as a percentage of Net Sales.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -3610,7 +4731,7 @@ export const ORDERS_MEASURES_MAP = {
     [MEASURE.ORDERS_NEW_CUSTOMER_VARIABLE_COSTS]: {
         priority: 71,
         title: 'NC Variable Costs',
-        shortTitle: 'NC Variable',
+        shortTitle: 'NC Variable Costs',
         description: 'Variable costs attributed to new customer orders.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -3652,7 +4773,7 @@ export const ORDERS_MEASURES_MAP = {
     [MEASURE.ORDERS_RETURNING_CUSTOMER_VARIABLE_COSTS]: {
         priority: 81,
         title: 'RC Variable Costs',
-        shortTitle: 'RC Variable',
+        shortTitle: 'RC Variable Costs',
         description: 'Variable costs attributed to returning customer orders.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -3694,6 +4815,7 @@ export const ORDERS_MEASURES_MAP = {
     [MEASURE.ORDERS_FIXED_COSTS]: {
         priority: 52,
         title: 'Fixed Costs',
+        shortTitle: 'Fixed Costs',
         description: 'Total fixed expenses (rent, salaries, software, etc.).',
         sumPrefix: '$',
         sumSuffix: '',
@@ -3708,11 +4830,12 @@ export const ORDERS_MEASURES_MAP = {
         useCompactNotation: true,
         applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
         tooltip: 'Overhead costs that remain constant regardless of order volume.',
-        relatedMeasures: [MEASURE.ORDERS_FIXED_COSTS_PERCENT, MEASURE.ORDERS_VARIABLE_COSTS, MEASURE.ORDERS_CM1],
+        relatedMeasures: [MEASURE.ORDERS_FIXED_COSTS_PERCENT, MEASURE.ORDERS_VARIABLE_COSTS, MEASURE.ORDERS_NET_MARGIN],
     },
     [MEASURE.ORDERS_FIXED_COSTS_PERCENT]: {
         priority: 62,
         title: 'Fixed Costs %',
+        shortTitle: 'Fixed Costs %',
         description: 'Fixed costs as a percentage of Net Sales.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -3734,7 +4857,7 @@ export const ORDERS_MEASURES_MAP = {
     [MEASURE.ORDERS_NEW_CUSTOMER_FIXED_COSTS]: {
         priority: 72,
         title: 'NC Fixed Costs',
-        shortTitle: 'NC Fixed',
+        shortTitle: 'NC Fixed Costs',
         description: 'Fixed costs attributed to new customer orders.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -3776,7 +4899,7 @@ export const ORDERS_MEASURES_MAP = {
     [MEASURE.ORDERS_RETURNING_CUSTOMER_FIXED_COSTS]: {
         priority: 82,
         title: 'RC Fixed Costs',
-        shortTitle: 'RC Fixed',
+        shortTitle: 'RC Fixed Costs',
         description: 'Fixed costs attributed to returning customer orders.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -3818,6 +4941,7 @@ export const ORDERS_MEASURES_MAP = {
     [MEASURE.ORDERS_SHIPPING_COSTS]: {
         priority: 53,
         title: 'Shipping Costs',
+        shortTitle: 'Ship. Costs',
         description: 'Seller-side shipping expenses.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -3832,11 +4956,12 @@ export const ORDERS_MEASURES_MAP = {
         useCompactNotation: true,
         applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
         tooltip: 'What you pay to ship orders to customers (not what customers pay for shipping).',
-        relatedMeasures: [MEASURE.ORDERS_SHIPPING_COSTS_PERCENT, MEASURE.ORDERS_CM2_PERCENT, MEASURE.ORDERS_VARIABLE_COSTS],
+        relatedMeasures: [MEASURE.ORDERS_SHIPPING_COSTS_PERCENT, MEASURE.ORDERS_CM2_MARGIN_RATE, MEASURE.ORDERS_VARIABLE_COSTS],
     },
     [MEASURE.ORDERS_SHIPPING_COSTS_PERCENT]: {
         priority: 63,
         title: 'Shipping Costs %',
+        shortTitle: 'Ship. Costs %',
         description: 'Shipping costs as a percentage of Net Sales.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -3873,7 +4998,7 @@ export const ORDERS_MEASURES_MAP = {
         useCompactNotation: true,
         applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
         tooltip: 'Transaction fees paid to payment processors like Stripe, PayPal, or Shopify Payments.',
-        relatedMeasures: [MEASURE.ORDERS_PAYMENT_GATEWAY_COSTS_PERCENT, MEASURE.ORDERS_CM2_PERCENT, MEASURE.ORDERS_VARIABLE_COSTS],
+        relatedMeasures: [MEASURE.ORDERS_PAYMENT_GATEWAY_COSTS_PERCENT, MEASURE.ORDERS_CM2_MARGIN_RATE, MEASURE.ORDERS_VARIABLE_COSTS],
     },
     [MEASURE.ORDERS_PAYMENT_GATEWAY_COSTS_PERCENT]: {
         priority: 64,
@@ -3897,6 +5022,78 @@ export const ORDERS_MEASURES_MAP = {
         formula: '(payment_gateway_costs / net_sales) * 100',
         relatedMeasures: [MEASURE.ORDERS_PAYMENT_GATEWAY_COSTS, MEASURE.ORDERS_SHIPPING_COSTS_PERCENT],
     },
+    [MEASURE.ORDERS_GROSS_PROFIT_PERCENT]: {
+        priority: 100,
+        title: 'Gross Profit Margin',
+        shortTitle: 'Gross Margin %',
+        description: 'DEPRECATED: Use ORDERS_CM1_PERCENT instead. Gross Profit as a percentage of Net Sales.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_GROSS_PROFIT_PERCENT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        tooltip: 'What percentage of net sales remains after product costs. Higher is better.',
+        formulaDisplay: '(Gross Profit ÷ Net Sales) × 100',
+        formula: '(gross_profit / net_sales) * 100',
+        relatedMeasures: [MEASURE.ORDERS_GROSS_PROFIT, MEASURE.ORDERS_CM2_PERCENT, MEASURE.ORDERS_NET_PROFIT_PERCENT],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_PERCENT]: {
+        priority: 100,
+        title: 'NC Gross Profit Margin',
+        shortTitle: 'NC Gross Margin %',
+        description: 'DEPRECATED: Use ORDERS_NEW_CUSTOMER_CM1_PERCENT instead. NC Gross Profit as a percentage of NC Net Sales.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_PERCENT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        tooltip: 'What percentage of new customer net sales remains after product costs.',
+        formulaDisplay: '(NC Gross Profit ÷ NC Net Sales) × 100',
+        formula: '(nc_gross_profit / nc_net_sales) * 100',
+        relatedMeasures: [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT, MEASURE.ORDERS_GROSS_PROFIT_PERCENT],
+        deprecated: true,
+        hideFromUI: true,
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_PERCENT]: {
+        priority: 100,
+        title: 'RC Gross Profit Margin',
+        shortTitle: 'RC Gross Margin %',
+        description: 'DEPRECATED: Use ORDERS_RETURNING_CUSTOMER_CM1_PERCENT instead. RC Gross Profit as a percentage of RC Net Sales.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_PERCENT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_PRODUCT_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_APPLICABLE_CONTEXTS,
+        tooltip: 'What percentage of returning customer net sales remains after product costs.',
+        formulaDisplay: '(RC Gross Profit ÷ RC Net Sales) × 100',
+        formula: '(rc_gross_profit / rc_net_sales) * 100',
+        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT, MEASURE.ORDERS_GROSS_PROFIT_PERCENT],
+        deprecated: true,
+        hideFromUI: true,
+    },
     [MEASURE.ORDERS_CM2]: {
         priority: 2,
         title: 'Contribution Margin 2',
@@ -3917,7 +5114,7 @@ export const ORDERS_MEASURES_MAP = {
         tooltip: 'Profit after deducting fulfillment and variable operating costs.',
         formulaDisplay: '(CM1) − (Shipping) − (Gateway) − (Variable Costs)',
         formula: '(cm1) - (shipping) - (gateway) - (variable_costs)',
-        relatedMeasures: [MEASURE.ORDERS_CM1, MEASURE.ORDERS_CM2_PERCENT, MEASURE.ORDERS_CM3],
+        relatedMeasures: [MEASURE.ORDERS_GROSS_PROFIT, MEASURE.ORDERS_CM2_PERCENT, MEASURE.ORDERS_CM3],
     },
     [MEASURE.ORDERS_CM2_PERCENT]: {
         priority: 32,
@@ -3939,7 +5136,8 @@ export const ORDERS_MEASURES_MAP = {
         tooltip: 'What percentage of net revenue remains after product and variable costs.',
         formulaDisplay: '(CM2) ÷ (Net Revenue) × 100',
         formula: '((cm2) / (net_revenue)) * 100',
-        relatedMeasures: [MEASURE.ORDERS_CM2, MEASURE.ORDERS_CM1_PERCENT, MEASURE.ORDERS_CM3_PERCENT],
+        relatedMeasures: [MEASURE.ORDERS_CM2, MEASURE.ORDERS_GROSS_PROFIT_PERCENT, MEASURE.ORDERS_CM3_PERCENT],
+        aliases: [MEASURE.ORDERS_CM2_MARGIN_RATE],
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM2]: {
         priority: 12,
@@ -3961,7 +5159,7 @@ export const ORDERS_MEASURES_MAP = {
         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)',
-        relatedMeasures: [MEASURE.ORDERS_CM2, MEASURE.ORDERS_NEW_CUSTOMER_CM1, MEASURE.ORDERS_NEW_CUSTOMER_CM3],
+        relatedMeasures: [MEASURE.ORDERS_CM2, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT, MEASURE.ORDERS_NEW_CUSTOMER_CM3],
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM2_PERCENT]: {
         priority: 36,
@@ -4005,7 +5203,7 @@ export const ORDERS_MEASURES_MAP = {
         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)',
-        relatedMeasures: [MEASURE.ORDERS_CM2, MEASURE.ORDERS_RETURNING_CUSTOMER_CM1, MEASURE.ORDERS_RETURNING_CUSTOMER_CM3],
+        relatedMeasures: [MEASURE.ORDERS_CM2, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT, MEASURE.ORDERS_RETURNING_CUSTOMER_CM3],
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_PERCENT]: {
         priority: 40,
@@ -4072,6 +5270,7 @@ export const ORDERS_MEASURES_MAP = {
         formulaDisplay: '(CM3) ÷ (Net Revenue) × 100',
         formula: '((cm3) / (net_revenue)) * 100',
         relatedMeasures: [MEASURE.ORDERS_CM3, MEASURE.ORDERS_CM2_PERCENT, MEASURE.ORDERS_NET_PROFIT_PERCENT],
+        aliases: [MEASURE.ORDERS_CM3_MARGIN_RATE],
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM3]: {
         priority: 13,
@@ -4161,6 +5360,144 @@ export const ORDERS_MEASURES_MAP = {
         formula: '((rc_cm3) / (rc_net_revenue)) * 100',
         relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_CM3, MEASURE.ORDERS_CM3_PERCENT],
     },
+    [MEASURE.ORDERS_CM4]: {
+        priority: 4,
+        title: 'CM4 (Operating Profit)',
+        shortTitle: 'CM4',
+        description: 'CM3 minus Fixed Costs. Your operating profit after all variable and fixed costs.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_CM4,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: true,
+        applicableContexts: ORDERS_ATTRIBUTION_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)',
+        relatedMeasures: [MEASURE.ORDERS_CM3, MEASURE.ORDERS_FIXED_COSTS, MEASURE.ORDERS_CM4_PERCENT],
+        aliases: [MEASURE.ORDERS_NET_PROFIT],
+    },
+    [MEASURE.ORDERS_CM4_PERCENT]: {
+        priority: 34,
+        title: 'CM4 % (Operating Margin)',
+        shortTitle: 'CM4 %',
+        description: 'CM4 as a percentage of Net Revenue. Your operating margin after all costs.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_CM4_PERCENT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_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',
+        relatedMeasures: [MEASURE.ORDERS_CM4, MEASURE.ORDERS_CM3_PERCENT],
+        aliases: [MEASURE.ORDERS_NET_PROFIT_PERCENT],
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_CM4]: {
+        priority: 14,
+        title: 'NC CM4 (Operating Profit)',
+        shortTitle: 'NC CM4',
+        description: 'New customer CM3 minus Fixed Costs. Operating profit from new customer acquisitions.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_CM4,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: true,
+        applicableContexts: ORDERS_ATTRIBUTION_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)',
+        relatedMeasures: [MEASURE.ORDERS_CM4, MEASURE.ORDERS_NEW_CUSTOMER_CM3, MEASURE.ORDERS_NEW_CUSTOMER_CM4_PERCENT],
+        aliases: [MEASURE.ORDERS_NEW_CUSTOMER_NET_PROFIT],
+    },
+    [MEASURE.ORDERS_NEW_CUSTOMER_CM4_PERCENT]: {
+        priority: 38,
+        title: 'NC CM4 % (Operating Margin)',
+        shortTitle: 'NC CM4 %',
+        description: 'NC CM4 as a percentage of NC Net Revenue. Operating margin from new customers.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_NEW_CUSTOMER_CM4_PERCENT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_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',
+        relatedMeasures: [MEASURE.ORDERS_NEW_CUSTOMER_CM4, MEASURE.ORDERS_CM4_PERCENT],
+        aliases: [MEASURE.ORDERS_NEW_CUSTOMER_NET_PROFIT_PERCENT],
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_CM4]: {
+        priority: 24,
+        title: 'RC CM4 (Operating Profit)',
+        shortTitle: 'RC CM4',
+        description: 'Returning customer CM3 minus Fixed Costs. Operating profit from repeat purchases.',
+        sumPrefix: '$',
+        sumSuffix: '',
+        avgPrefix: '$',
+        avgSuffix: '',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM4,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.CURRENCY,
+        decimalPlaces: 2,
+        useCompactNotation: true,
+        applicableContexts: ORDERS_ATTRIBUTION_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)',
+        relatedMeasures: [MEASURE.ORDERS_CM4, MEASURE.ORDERS_RETURNING_CUSTOMER_CM3, MEASURE.ORDERS_RETURNING_CUSTOMER_CM4_PERCENT],
+        aliases: [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PROFIT],
+    },
+    [MEASURE.ORDERS_RETURNING_CUSTOMER_CM4_PERCENT]: {
+        priority: 42,
+        title: 'RC CM4 % (Operating Margin)',
+        shortTitle: 'RC CM4 %',
+        description: 'RC CM4 as a percentage of RC Net Revenue. Operating margin from returning customers.',
+        sumPrefix: '',
+        sumSuffix: '%',
+        avgPrefix: '',
+        avgSuffix: '%',
+        icon: MEASURE_ICON.SHOPIFY,
+        measure: MEASURE.ORDERS_RETURNING_CUSTOMER_CM4_PERCENT,
+        category: MEASURE_CATEGORY.ORDERS,
+        subcategory: MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        valueType: MeasureValueType.PERCENTAGE,
+        decimalPlaces: 2,
+        useCompactNotation: false,
+        applicableContexts: ORDERS_ATTRIBUTION_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',
+        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_CM4, MEASURE.ORDERS_CM4_PERCENT],
+        aliases: [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PROFIT_PERCENT],
+    },
     [MEASURE.ORDERS_NET_PROFIT]: {
         priority: 4,
         title: 'CM4 (Operating Profit)',
@@ -4182,6 +5519,8 @@ export const ORDERS_MEASURES_MAP = {
         formulaDisplay: '(CM3) − (Fixed Costs)',
         formula: '(cm3) - (fixed_costs)',
         relatedMeasures: [MEASURE.ORDERS_CM3, MEASURE.ORDERS_FIXED_COSTS, MEASURE.ORDERS_NET_PROFIT_PERCENT],
+        deprecated: true,
+        hideFromUI: true,
     },
     [MEASURE.ORDERS_NET_PROFIT_PERCENT]: {
         priority: 34,
@@ -4203,7 +5542,9 @@ export const ORDERS_MEASURES_MAP = {
         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',
-        relatedMeasures: [MEASURE.ORDERS_NET_PROFIT, MEASURE.ORDERS_CM3_PERCENT, MEASURE.ORDERS_CM1_PERCENT],
+        relatedMeasures: [MEASURE.ORDERS_NET_PROFIT, MEASURE.ORDERS_CM3_PERCENT, MEASURE.ORDERS_GROSS_PROFIT_PERCENT],
+        deprecated: true,
+        hideFromUI: true,
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_NET_PROFIT]: {
         priority: 14,
@@ -4226,6 +5567,8 @@ export const ORDERS_MEASURES_MAP = {
         formulaDisplay: '(NC CM3) − (NC Fixed Costs)',
         formula: '(nc_cm3) - (nc_fixed_costs)',
         relatedMeasures: [MEASURE.ORDERS_NET_PROFIT, MEASURE.ORDERS_NEW_CUSTOMER_CM3, MEASURE.ORDERS_NEW_CUSTOMER_NET_PROFIT_PERCENT],
+        deprecated: true,
+        hideFromUI: true,
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_NET_PROFIT_PERCENT]: {
         priority: 38,
@@ -4248,6 +5591,8 @@ export const ORDERS_MEASURES_MAP = {
         formulaDisplay: '((NC CM4) ÷ (NC Net Revenue)) × 100',
         formula: '((nc_cm4) / (nc_net_revenue)) * 100',
         relatedMeasures: [MEASURE.ORDERS_NEW_CUSTOMER_NET_PROFIT, MEASURE.ORDERS_NET_PROFIT_PERCENT],
+        deprecated: true,
+        hideFromUI: true,
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PROFIT]: {
         priority: 24,
@@ -4270,6 +5615,8 @@ export const ORDERS_MEASURES_MAP = {
         formulaDisplay: '(RC CM3) − (RC Fixed Costs)',
         formula: '(rc_cm3) - (rc_fixed_costs)',
         relatedMeasures: [MEASURE.ORDERS_NET_PROFIT, MEASURE.ORDERS_RETURNING_CUSTOMER_CM3, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PROFIT_PERCENT],
+        deprecated: true,
+        hideFromUI: true,
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PROFIT_PERCENT]: {
         priority: 42,
@@ -4292,6 +5639,8 @@ export const ORDERS_MEASURES_MAP = {
         formulaDisplay: '((RC CM4) ÷ (RC Net Revenue)) × 100',
         formula: '((rc_cm4) / (rc_net_revenue)) * 100',
         relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PROFIT, MEASURE.ORDERS_NET_PROFIT_PERCENT],
+        deprecated: true,
+        hideFromUI: true,
     },
     [MEASURE.ORDERS_CM1]: {
         priority: 1,
@@ -4313,7 +5662,8 @@ export const ORDERS_MEASURES_MAP = {
         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)',
-        relatedMeasures: [MEASURE.ORDERS_CM1_PERCENT, MEASURE.ORDERS_CM2, MEASURE.ORDERS_EFFECTIVE_COGS],
+        relatedMeasures: [MEASURE.ORDERS_CM1_PERCENT, MEASURE.ORDERS_CM2, MEASURE.ORDERS_GROSS_PROFIT],
+        aliases: [MEASURE.ORDERS_GROSS_PROFIT, MEASURE.ORDERS_NET_PRODUCT_MARGIN, MEASURE.ORDERS_GROSS_MARGIN, MEASURE.ORDERS_NET_MARGIN],
     },
     [MEASURE.ORDERS_CM1_PERCENT]: {
         priority: 31,
@@ -4335,7 +5685,8 @@ export const ORDERS_MEASURES_MAP = {
         tooltip: 'CM1 as a percentage of Net Revenue. The conservative gross margin percentage calculation.',
         formulaDisplay: '(CM1) ÷ (Net Revenue) × 100',
         formula: '((cm1) / (net_revenue)) * 100',
-        relatedMeasures: [MEASURE.ORDERS_CM1, MEASURE.ORDERS_CM2_PERCENT, MEASURE.ORDERS_NET_PROFIT_PERCENT],
+        relatedMeasures: [MEASURE.ORDERS_CM1, MEASURE.ORDERS_CM2_PERCENT, MEASURE.ORDERS_GROSS_PROFIT_PERCENT],
+        aliases: [MEASURE.ORDERS_GROSS_PROFIT_PERCENT, MEASURE.ORDERS_NET_PRODUCT_MARGIN_GROSS_RATE, MEASURE.ORDERS_NET_PRODUCT_MARGIN_NET_RATE, MEASURE.ORDERS_CM1_MARGIN_RATE, MEASURE.ORDERS_GROSS_MARGIN_GROSS_RATE, MEASURE.ORDERS_GROSS_MARGIN_NET_RATE, MEASURE.ORDERS_NET_MARGIN_GROSS_RATE, MEASURE.ORDERS_NET_MARGIN_NET_RATE],
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM1]: {
         priority: 11,
@@ -4357,7 +5708,8 @@ export const ORDERS_MEASURES_MAP = {
         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)',
-        relatedMeasures: [MEASURE.ORDERS_CM1, MEASURE.ORDERS_NEW_CUSTOMER_CM1_PERCENT, MEASURE.ORDERS_NEW_CUSTOMER_CM2],
+        relatedMeasures: [MEASURE.ORDERS_CM1, MEASURE.ORDERS_NEW_CUSTOMER_CM1_PERCENT, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT],
+        aliases: [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT, MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MARGIN, MEASURE.ORDERS_NEW_CUSTOMER_NET_MARGIN],
     },
     [MEASURE.ORDERS_NEW_CUSTOMER_CM1_PERCENT]: {
         priority: 35,
@@ -4379,7 +5731,8 @@ export const ORDERS_MEASURES_MAP = {
         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',
-        relatedMeasures: [MEASURE.ORDERS_NEW_CUSTOMER_CM1, MEASURE.ORDERS_CM1_PERCENT, MEASURE.ORDERS_NEW_CUSTOMER_CM2_PERCENT],
+        relatedMeasures: [MEASURE.ORDERS_NEW_CUSTOMER_CM1, MEASURE.ORDERS_CM1_PERCENT, MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_PERCENT],
+        aliases: [MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_PERCENT, MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN_GROSS_RATE, MEASURE.ORDERS_NEW_CUSTOMER_NET_PRODUCT_MARGIN_NET_RATE],
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM1]: {
         priority: 21,
@@ -4401,7 +5754,8 @@ export const ORDERS_MEASURES_MAP = {
         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)',
-        relatedMeasures: [MEASURE.ORDERS_CM1, MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_PERCENT, MEASURE.ORDERS_RETURNING_CUSTOMER_CM2],
+        relatedMeasures: [MEASURE.ORDERS_CM1, MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_PERCENT, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT],
+        aliases: [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MARGIN, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MARGIN],
     },
     [MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_PERCENT]: {
         priority: 39,
@@ -4423,7 +5777,8 @@ export const ORDERS_MEASURES_MAP = {
         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',
-        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_CM1, MEASURE.ORDERS_CM1_PERCENT, MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_PERCENT],
+        relatedMeasures: [MEASURE.ORDERS_RETURNING_CUSTOMER_CM1, MEASURE.ORDERS_CM1_PERCENT, MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_PERCENT],
+        aliases: [MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_PERCENT, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN_GROSS_RATE, MEASURE.ORDERS_RETURNING_CUSTOMER_NET_PRODUCT_MARGIN_NET_RATE],
     },
 };
 //# sourceMappingURL=orders-measure-definitions.js.map