@adtrackify/at-tracking-event-types 4.57.1 → 4.59.0

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

@@ -42,7 +42,7 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 0,
         useCompactNotation: false,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'Unique Cust.',
+        shortTitle: 'Unique Customers',
         tooltip: 'The count of distinct customers who placed at least one order in the period. Each customer is counted once regardless of how many orders they placed.',
     },
     [measures_js_1.MEASURE.ORDERS_UNITS]: {
@@ -125,7 +125,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_UNITS_PER_ORDER]: {
         priority: 12,
-        title: 'NC Units Per Order',
+        title: 'New Customer Units Per Order',
         description: 'Average units per order for new customers.',
         sumPrefix: '',
         sumSuffix: '',
@@ -146,7 +146,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_UNITS_PER_ORDER]: {
         priority: 22,
-        title: 'RC Units Per Order',
+        title: 'Returning Customer Units Per Order',
         description: 'Average units per order for returning customers.',
         sumPrefix: '',
         sumSuffix: '',
@@ -181,7 +181,7 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 2,
         useCompactNotation: true,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'Total Rev.',
+        shortTitle: 'Revenue (Total)',
         tooltip: 'The total dollar amount collected from all orders including shipping and taxes, before any refunds.',
     },
     [measures_js_1.MEASURE.ORDERS_GROSS_REVENUE]: {
@@ -200,7 +200,7 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 2,
         useCompactNotation: true,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'Gross Rev.',
+        shortTitle: 'Revenue (Gross)',
         tooltip: 'Revenue from product sales before subtracting discounts or refunds. The starting point for margin calculations.',
     },
     [measures_js_1.MEASURE.ORDERS_NET_REVENUE]: {
@@ -219,14 +219,14 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 2,
         useCompactNotation: true,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'Net Rev.',
+        shortTitle: 'Revenue (Net)',
         tooltip: 'Revenue after subtracting discounts and refunds from gross revenue. The primary revenue metric for profitability analysis.',
         formulaDisplay: 'Gross Revenue − Discounts − Refunds',
         formula: 'gross_revenue - discounts - refunds',
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_REVENUE]: {
         priority: 11,
-        title: 'NC Total Revenue',
+        title: 'New Customer Total Revenue',
         description: 'Total revenue from new customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -240,12 +240,12 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 2,
         useCompactNotation: true,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'NC Total Rev.',
+        shortTitle: 'NC Revenue (Total)',
         tooltip: 'Total revenue collected from first-time buyers including shipping and taxes. Reflects the raw dollar value of acquisition.',
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_REVENUE]: {
         priority: 12,
-        title: 'NC Gross Revenue',
+        title: 'New Customer Gross Revenue',
         description: 'Gross revenue from new customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -259,12 +259,12 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 2,
         useCompactNotation: true,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'NC Gross Rev.',
+        shortTitle: 'NC Rev. (Gross)',
         tooltip: 'Gross product revenue from new customers before discounts and refunds. Used to calculate new customer gross margin.',
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_NET_REVENUE]: {
         priority: 13,
-        title: 'NC Net Revenue',
+        title: 'New Customer Net Revenue',
         description: 'Net revenue from new customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -278,12 +278,12 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 2,
         useCompactNotation: true,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'NC Net Rev.',
+        shortTitle: 'NC Revenue (Net)',
         tooltip: 'Net revenue from new customers after discounts and refunds. The clearest measure of first-order monetization.',
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_REVENUE]: {
         priority: 21,
-        title: 'RC Total Revenue',
+        title: 'Returning Customer Total Revenue',
         description: 'Total revenue from returning customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -297,12 +297,12 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 2,
         useCompactNotation: true,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'RC Total Rev.',
+        shortTitle: 'RC Rev. (Total)',
         tooltip: 'Total revenue from repeat buyers including shipping and taxes. High values indicate strong retention and LTV.',
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_REVENUE]: {
         priority: 22,
-        title: 'RC Gross Revenue',
+        title: 'Returning Customer Gross Revenue',
         description: 'Gross revenue from returning customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -316,12 +316,12 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 2,
         useCompactNotation: true,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'RC Gross Rev.',
+        shortTitle: 'RC Revenue (Gross)',
         tooltip: 'Gross product revenue from returning customers before discounts and refunds.',
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_NET_REVENUE]: {
         priority: 23,
-        title: 'RC Net Revenue',
+        title: 'Returning Customer Net Revenue',
         description: 'Net revenue from returning customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -335,12 +335,13 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 2,
         useCompactNotation: true,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'RC Net Rev.',
+        shortTitle: 'RC Revenue (Net)',
         tooltip: 'Net revenue from returning customers after discounts and refunds. Key input for repeat-purchase profitability.',
     },
     [measures_js_1.MEASURE.ORDERS_TOTAL_AOV]: {
         priority: 1,
         title: 'Total AOV',
+        shortTitle: 'AOV (Total)',
         description: 'Average order value based on total revenue.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -361,6 +362,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_GROSS_AOV]: {
         priority: 2,
         title: 'Gross AOV',
+        shortTitle: 'AOV (Gross)',
         description: 'Average order value based on gross revenue.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -381,6 +383,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_NET_AOV]: {
         priority: 3,
         title: 'Net AOV',
+        shortTitle: 'AOV (Net)',
         description: 'Average order value based on net revenue.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -400,7 +403,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_AOV]: {
         priority: 11,
-        title: 'NC Total AOV',
+        title: 'New Customer Total AOV',
         description: 'Average order value for new customers (total revenue).',
         sumPrefix: '$',
         sumSuffix: '',
@@ -414,14 +417,14 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 2,
         useCompactNotation: false,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'NC Total AOV',
+        shortTitle: 'NC AOV (Total)',
         tooltip: 'Average total transaction value for first-time buyers. Compare to RC Total AOV to see if new customers spend more or less.',
         formulaDisplay: 'NC Total Revenue ÷ NC Order Count',
         formula: 'nc_total_revenue / nc_order_count',
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_AOV]: {
         priority: 12,
-        title: 'NC Gross AOV',
+        title: 'New Customer Gross AOV',
         description: 'Average order value for new customers (gross revenue).',
         sumPrefix: '$',
         sumSuffix: '',
@@ -435,14 +438,14 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 2,
         useCompactNotation: false,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'NC Gross AOV',
+        shortTitle: 'NC AOV (Gross)',
         tooltip: 'Average gross revenue per order for new customers before discounts and refunds.',
         formulaDisplay: 'NC Gross Revenue ÷ NC Order Count',
         formula: 'nc_gross_revenue / nc_order_count',
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_NET_AOV]: {
         priority: 13,
-        title: 'NC Net AOV',
+        title: 'New Customer Net AOV',
         description: 'Average order value for new customers (net revenue).',
         sumPrefix: '$',
         sumSuffix: '',
@@ -456,14 +459,14 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 2,
         useCompactNotation: false,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'NC Net AOV',
+        shortTitle: 'NC AOV (Net)',
         tooltip: 'Average net revenue per order for new customers after discounts and refunds. Key input for new customer payback calculations.',
         formulaDisplay: 'NC Net Revenue ÷ NC Order Count',
         formula: 'nc_net_revenue / nc_order_count',
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_AOV]: {
         priority: 21,
-        title: 'RC Total AOV',
+        title: 'Returning Customer Total AOV',
         description: 'Average order value for returning customers (total revenue).',
         sumPrefix: '$',
         sumSuffix: '',
@@ -477,14 +480,14 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 2,
         useCompactNotation: false,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'RC Total AOV',
+        shortTitle: 'RC AOV (Total)',
         tooltip: 'Average total transaction value for returning buyers. Typically higher than new customer AOV as loyal customers buy more.',
         formulaDisplay: 'RC Total Revenue ÷ RC Order Count',
         formula: 'rc_total_revenue / rc_order_count',
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_AOV]: {
         priority: 22,
-        title: 'RC Gross AOV',
+        title: 'Returning Customer Gross AOV',
         description: 'Average order value for returning customers (gross revenue).',
         sumPrefix: '$',
         sumSuffix: '',
@@ -498,14 +501,14 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 2,
         useCompactNotation: false,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'RC Gross AOV',
+        shortTitle: 'RC AOV (Gross)',
         tooltip: 'Average gross revenue per order for returning customers before discounts and refunds.',
         formulaDisplay: 'RC Gross Revenue ÷ RC Order Count',
         formula: 'rc_gross_revenue / rc_order_count',
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_NET_AOV]: {
         priority: 23,
-        title: 'RC Net AOV',
+        title: 'Returning Customer Net AOV',
         description: 'Average order value for returning customers (net revenue).',
         sumPrefix: '$',
         sumSuffix: '',
@@ -519,7 +522,7 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 2,
         useCompactNotation: false,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'RC Net AOV',
+        shortTitle: 'RC AOV (Net)',
         tooltip: 'Average net revenue per order for returning customers after discounts and refunds.',
         formulaDisplay: 'RC Net Revenue ÷ RC Order Count',
         formula: 'rc_net_revenue / rc_order_count',
@@ -527,6 +530,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_COGS]: {
         priority: 1,
         title: 'COGS',
+        shortTitle: 'COGS',
         description: 'Cost of goods sold.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -544,7 +548,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_COGS]: {
         priority: 11,
-        title: 'NC COGS',
+        title: 'New Customer COGS',
         shortTitle: 'NC COGS',
         description: 'COGS for new customer orders.',
         sumPrefix: '$',
@@ -563,7 +567,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_COGS]: {
         priority: 21,
-        title: 'RC COGS',
+        title: 'Returning Customer COGS',
         shortTitle: 'RC COGS',
         description: 'COGS for returning customer orders.',
         sumPrefix: '$',
@@ -583,6 +587,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_COGS_PER_ORDER]: {
         priority: 3,
         title: 'COGS Per Order',
+        shortTitle: 'COGS/Order',
         description: 'Average COGS per order.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -602,7 +607,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_COGS_PER_ORDER]: {
         priority: 13,
-        title: 'NC COGS Per Order',
+        title: 'New Customer COGS Per Order',
         description: 'Average COGS per order for new customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -623,7 +628,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_COGS_PER_ORDER]: {
         priority: 23,
-        title: 'RC COGS Per Order',
+        title: 'Returning Customer COGS Per Order',
         description: 'Average COGS per order for returning customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -663,6 +668,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_REFUND_COUNT]: {
         priority: 2,
         title: 'Refund Count',
+        shortTitle: 'Refund Count',
         description: 'Number of refunded orders.',
         sumPrefix: '',
         sumSuffix: '',
@@ -681,6 +687,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_REFUND_PERCENT]: {
         priority: 3,
         title: 'Refund %',
+        shortTitle: 'Refund %',
         description: 'Percentage of orders refunded.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -759,7 +766,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_REFUND_PERCENT]: {
         priority: 7,
-        title: 'NC Refund %',
+        title: 'New Customer Refund %',
         shortTitle: 'NC Refund %',
         description: 'Percentage of new customer orders refunded.',
         sumPrefix: '',
@@ -839,7 +846,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_REFUND_PERCENT]: {
         priority: 11,
-        title: 'RC Refund %',
+        title: 'Returning Customer Refund %',
         shortTitle: 'RC Refund %',
         description: 'Percentage of returning customer orders refunded.',
         sumPrefix: '',
@@ -940,7 +947,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_DISCOUNTS]: {
         priority: 15,
-        title: 'NC Discount Amount',
+        title: 'New Customer Discount Amount',
         shortTitle: 'NC Discounts',
         description: 'Total discount amount for new customers.',
         sumPrefix: '$',
@@ -959,7 +966,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_DISCOUNT_PERCENT]: {
         priority: 16,
-        title: 'NC Discount %',
+        title: 'New Customer Discount %',
         shortTitle: 'NC Discount %',
         description: 'Discounts as percentage of new customer gross revenue.',
         sumPrefix: '',
@@ -980,7 +987,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_DISCOUNT_PER_ORDER]: {
         priority: 17,
-        title: 'NC Discount Per Order',
+        title: 'New Customer Discount Per Order',
         shortTitle: 'NC Discount/Order',
         description: 'Average discount per new customer order.',
         sumPrefix: '$',
@@ -1001,7 +1008,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_DISCOUNTS]: {
         priority: 18,
-        title: 'RC Discount Amount',
+        title: 'Returning Customer Discount Amount',
         shortTitle: 'RC Discounts',
         description: 'Total discount amount for returning customers.',
         sumPrefix: '$',
@@ -1020,7 +1027,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_DISCOUNT_PERCENT]: {
         priority: 19,
-        title: 'RC Discount %',
+        title: 'Returning Customer Discount %',
         shortTitle: 'RC Discount %',
         description: 'Discounts as percentage of returning customer gross revenue.',
         sumPrefix: '',
@@ -1041,7 +1048,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_DISCOUNT_PER_ORDER]: {
         priority: 20,
-        title: 'RC Discount Per Order',
+        title: 'Returning Customer Discount Per Order',
         shortTitle: 'RC Discount/Order',
         description: 'Average discount per returning customer order.',
         sumPrefix: '$',
@@ -1122,7 +1129,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_SHIPPING]: {
         priority: 34,
-        title: 'NC Shipping Revenue',
+        title: 'New Customer Shipping Revenue',
         shortTitle: 'NC Shipping',
         description: 'Total shipping revenue from new customers.',
         sumPrefix: '$',
@@ -1141,7 +1148,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_SHIPPING_PERCENT]: {
         priority: 35,
-        title: 'NC Shipping %',
+        title: 'New Customer Shipping %',
         shortTitle: 'NC Ship. %',
         description: 'Shipping as percentage of new customer total revenue.',
         sumPrefix: '',
@@ -1162,7 +1169,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_SHIPPING_PER_ORDER]: {
         priority: 36,
-        title: 'NC Shipping Per Order',
+        title: 'New Customer Shipping Per Order',
         shortTitle: 'NC Shipping/Order',
         description: 'Average shipping per new customer order.',
         sumPrefix: '$',
@@ -1183,7 +1190,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_SHIPPING]: {
         priority: 37,
-        title: 'RC Shipping Revenue',
+        title: 'Returning Customer Shipping Revenue',
         shortTitle: 'RC Shipping',
         description: 'Total shipping revenue from returning customers.',
         sumPrefix: '$',
@@ -1202,7 +1209,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_SHIPPING_PERCENT]: {
         priority: 38,
-        title: 'RC Shipping %',
+        title: 'Returning Customer Shipping %',
         shortTitle: 'RC Ship. %',
         description: 'Shipping as percentage of returning customer total revenue.',
         sumPrefix: '',
@@ -1223,7 +1230,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_SHIPPING_PER_ORDER]: {
         priority: 39,
-        title: 'RC Shipping Per Order',
+        title: 'Returning Customer Shipping Per Order',
         shortTitle: 'RC Shipping/Order',
         description: 'Average shipping per returning customer order.',
         sumPrefix: '$',
@@ -1303,7 +1310,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_TAX]: {
         priority: 44,
-        title: 'NC Tax Collected',
+        title: 'New Customer Tax Collected',
         shortTitle: 'NC Tax',
         description: 'Total tax collected from new customers.',
         sumPrefix: '$',
@@ -1322,7 +1329,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_TAX_PERCENT]: {
         priority: 45,
-        title: 'NC Tax %',
+        title: 'New Customer Tax %',
         shortTitle: 'NC Tax %',
         description: 'Tax as percentage of new customer total revenue.',
         sumPrefix: '',
@@ -1343,7 +1350,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_TAX_PER_ORDER]: {
         priority: 46,
-        title: 'NC Tax Per Order',
+        title: 'New Customer Tax Per Order',
         shortTitle: 'NC Tax/Order',
         description: 'Average tax per new customer order.',
         sumPrefix: '$',
@@ -1364,7 +1371,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_TAX]: {
         priority: 47,
-        title: 'RC Tax Collected',
+        title: 'Returning Customer Tax Collected',
         shortTitle: 'RC Tax',
         description: 'Total tax collected from returning customers.',
         sumPrefix: '$',
@@ -1383,7 +1390,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_TAX_PERCENT]: {
         priority: 48,
-        title: 'RC Tax %',
+        title: 'Returning Customer Tax %',
         shortTitle: 'RC Tax %',
         description: 'Tax as percentage of returning customer total revenue.',
         sumPrefix: '',
@@ -1404,7 +1411,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_TAX_PER_ORDER]: {
         priority: 49,
-        title: 'RC Tax Per Order',
+        title: 'Returning Customer Tax Per Order',
         shortTitle: 'RC Tax/Order',
         description: 'Average tax per returning customer order.',
         sumPrefix: '$',
@@ -1467,7 +1474,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_CM1_PER_ORDER]: {
         priority: 5,
-        title: 'CM1 Per Order (Gross Margin Per Order)',
+        title: 'CM1 Per Order',
         shortTitle: 'CM1/Order',
         description: 'Average CM1 per order. Net Revenue minus Effective COGS divided by order count.',
         sumPrefix: '$',
@@ -1476,8 +1483,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM1_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -1488,7 +1494,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM1_PER_ORDER]: {
         priority: 15,
-        title: 'NC CM1 Per Order',
+        title: 'New Customer CM1 Per Order',
         shortTitle: 'NC CM1/Order',
         description: 'Average CM1 per new customer order.',
         sumPrefix: '$',
@@ -1497,8 +1503,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM1_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -1509,7 +1514,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_PER_ORDER]: {
         priority: 25,
-        title: 'RC CM1 Per Order',
+        title: 'Returning Customer CM1 Per Order',
         shortTitle: 'RC CM1/Order',
         description: 'Average CM1 per returning customer order.',
         sumPrefix: '$',
@@ -1518,8 +1523,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -1539,8 +1543,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM2_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -1560,8 +1563,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM3_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -1582,8 +1584,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM4_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -1594,7 +1595,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM2_PER_ORDER]: {
         priority: 16,
-        title: 'NC CM2 Per Order',
+        title: 'New Customer CM2 Per Order',
         shortTitle: 'NC CM2/Order',
         description: 'Average CM2 per new customer order.',
         sumPrefix: '$',
@@ -1603,8 +1604,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM2_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -1615,7 +1615,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM3_PER_ORDER]: {
         priority: 17,
-        title: 'NC CM3 Per Order',
+        title: 'New Customer CM3 Per Order',
         shortTitle: 'NC CM3/Order',
         description: 'Average CM3 per new customer order.',
         sumPrefix: '$',
@@ -1624,8 +1624,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM3_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -1636,7 +1635,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM4_PER_ORDER]: {
         priority: 18,
-        title: 'NC CM4 Per Order',
+        title: 'New Customer CM4 Per Order',
         shortTitle: 'NC CM4/Order',
         description: 'Average CM4 (operating profit) per new customer order.',
         sumPrefix: '$',
@@ -1645,8 +1644,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM4_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -1657,7 +1655,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_PER_ORDER]: {
         priority: 26,
-        title: 'RC CM2 Per Order',
+        title: 'Returning Customer CM2 Per Order',
         shortTitle: 'RC CM2/Order',
         description: 'Average CM2 per returning customer order.',
         sumPrefix: '$',
@@ -1666,8 +1664,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -1678,7 +1675,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_PER_ORDER]: {
         priority: 27,
-        title: 'RC CM3 Per Order',
+        title: 'Returning Customer CM3 Per Order',
         shortTitle: 'RC CM3/Order',
         description: 'Average CM3 per returning customer order.',
         sumPrefix: '$',
@@ -1687,8 +1684,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -1699,7 +1695,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM4_PER_ORDER]: {
         priority: 28,
-        title: 'RC CM4 Per Order',
+        title: 'Returning Customer CM4 Per Order',
         shortTitle: 'RC CM4/Order',
         description: 'Average CM4 (operating profit) per returning customer order.',
         sumPrefix: '$',
@@ -1708,8 +1704,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM4_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -1742,6 +1737,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMERS]: {
         priority: 2,
         title: 'New Customers',
+        shortTitle: 'New Customers',
         description: 'Count of unique new customers.',
         sumPrefix: '',
         sumSuffix: '',
@@ -1773,12 +1769,12 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 0,
         useCompactNotation: false,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'Ret. Customers',
+        shortTitle: 'Returning Customers',
         tooltip: 'The number of distinct customers who have ordered before and purchased again in the period. Core retention metric.',
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_RATE]: {
         priority: 33,
-        title: 'NC Gross Revenue Rate',
+        title: 'New Customer Gross Revenue Rate',
         description: 'New customer gross revenue as percentage of total gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -1799,7 +1795,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RATE]: {
         priority: 34,
-        title: 'RC Gross Revenue Rate',
+        title: 'Returning Customer Gross Revenue Rate',
         description: 'Returning customer gross revenue as percentage of total gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -1901,6 +1897,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_DISCOUNT_COUNT]: {
         priority: 12,
         title: 'Discount Count',
+        shortTitle: 'Discount Count',
         description: 'Count of orders with discounts.',
         sumPrefix: '',
         sumSuffix: '',
@@ -1939,7 +1936,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_DISCOUNT_GROSS_RATE]: {
         priority: 16,
-        title: 'NC Discount Gross Rate',
+        title: 'New Customer Discount Gross Rate',
         description: 'New customer discount as percentage of gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -1953,14 +1950,14 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 2,
         useCompactNotation: false,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'NC Disc. Gross',
+        shortTitle: 'NC Disc. (Gross)',
         tooltip: 'New customer discounts as a share of new customer gross revenue. High rates suggest heavy promotion to drive acquisition.',
         formulaDisplay: 'NC Discounts ÷ NC Gross Revenue × 100',
         formula: 'nc_discounts / nc_gross_revenue * 100',
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_DISCOUNT_GROSS_RATE]: {
         priority: 17,
-        title: 'RC Discount Gross Rate',
+        title: 'Returning Customer Discount Gross Rate',
         description: 'Returning customer discount as percentage of gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -1974,14 +1971,14 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 2,
         useCompactNotation: false,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
-        shortTitle: 'RC Disc. Gross',
+        shortTitle: 'RC Disc. (Gross)',
         tooltip: 'Returning customer discounts as a share of returning customer gross revenue. High rates may indicate loyalty discounts cutting into repeat margins.',
         formulaDisplay: 'RC Discounts ÷ RC Gross Revenue × 100',
         formula: 'rc_discounts / rc_gross_revenue * 100',
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_DISCOUNT_ORDER_RATE]: {
         priority: 18,
-        title: 'NC Discount Order Rate',
+        title: 'New Customer Discount Order Rate',
         description: 'Percentage of new customer orders with discount.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -2002,7 +1999,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_DISCOUNT_ORDER_RATE]: {
         priority: 19,
-        title: 'RC Discount Order Rate',
+        title: 'Returning Customer Discount Order Rate',
         description: 'Percentage of returning customer orders with discount.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -2044,7 +2041,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_REFUND_PLUS_DISCOUNT]: {
         priority: 22,
-        title: 'NC Refund + Discount',
+        title: 'New Customer Refund + Discount',
         description: 'New customer refund and discount combined.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -2065,7 +2062,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_REFUND_PLUS_DISCOUNT]: {
         priority: 23,
-        title: 'RC Refund + Discount',
+        title: 'Returning Customer Refund + Discount',
         description: 'Returning customer refund and discount combined.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -2101,6 +2098,7 @@ exports.ORDERS_MEASURES_MAP = {
         useCompactNotation: true,
         applicableContexts: measure_applicable_contexts_js_1.STANDARD_APPLICABLE_CONTEXTS,
         tooltip: 'The order subtotal before shipping and taxes are added. Reflects the product value customers commit to at checkout.',
+        hideFromUI: true,
     },
     [measures_js_1.MEASURE.ORDERS_NET_PLUS_SHIPPING]: {
         priority: 5,
@@ -2122,6 +2120,7 @@ exports.ORDERS_MEASURES_MAP = {
         tooltip: 'Net revenue plus shipping collected. Useful for businesses where shipping is a meaningful revenue contributor.',
         formulaDisplay: 'Net Revenue + Shipping',
         formula: 'net_revenue + shipping',
+        hideFromUI: true,
     },
     [measures_js_1.MEASURE.ORDERS_CANCELLED_COUNT]: {
         priority: 51,
@@ -2163,7 +2162,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CANCELLED_COUNT]: {
         priority: 53,
-        title: 'NC Cancelled Orders',
+        title: 'New Customer Cancelled Orders',
         description: 'Count of cancelled orders from new customers.',
         sumPrefix: '',
         sumSuffix: '',
@@ -2182,7 +2181,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CANCELLED_AMOUNT]: {
         priority: 54,
-        title: 'NC Cancelled Amount',
+        title: 'New Customer Cancelled Amount',
         description: 'Cancelled order amount from new customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -2220,7 +2219,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CANCELLED_AMOUNT]: {
         priority: 56,
-        title: 'RC Cancelled Amount',
+        title: 'Returning Customer Cancelled Amount',
         description: 'Cancelled order amount from returning customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -2247,8 +2246,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_GROSS_PROFIT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -2260,7 +2258,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT]: {
         priority: 2,
-        title: 'NC Gross Profit',
+        title: 'New Customer Gross Profit',
         description: 'Gross profit from new customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -2268,8 +2266,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -2279,7 +2276,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT]: {
         priority: 3,
-        title: 'RC Gross Profit',
+        title: 'Returning Customer Gross Profit',
         description: 'Gross profit from returning customers.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -2287,8 +2284,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -2306,8 +2302,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_GROSS_PROFIT_GROSS_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2319,7 +2314,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_GROSS_PERCENT]: {
         priority: 12,
-        title: 'NC Gross Profit % (of Gross)',
+        title: 'New Customer Gross Profit % (of Gross)',
         description: 'NC gross profit as percentage of NC gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -2327,8 +2322,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_GROSS_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2338,7 +2332,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_GROSS_PERCENT]: {
         priority: 13,
-        title: 'RC Gross Profit % (of Gross)',
+        title: 'Returning Customer Gross Profit % (of Gross)',
         description: 'RC gross profit as percentage of RC gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -2346,8 +2340,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_GROSS_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2365,8 +2358,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_GROSS_PROFIT_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2378,7 +2370,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_PER_ORDER]: {
         priority: 22,
-        title: 'NC Gross Profit Per Order',
+        title: 'New Customer Gross Profit Per Order',
         description: 'Average gross profit per new customer order.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -2386,8 +2378,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_PROFIT_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2397,7 +2388,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_PER_ORDER]: {
         priority: 23,
-        title: 'RC Gross Profit Per Order',
+        title: 'Returning Customer Gross Profit Per Order',
         description: 'Average gross profit per returning customer order.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -2405,8 +2396,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_PROFIT_PER_ORDER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2437,7 +2427,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_COGS_GROSS_RATE]: {
         priority: 35,
-        title: 'NC COGS / Gross Rate',
+        title: 'New Customer COGS / Gross Rate',
         description: 'NC COGS as percentage of gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -2458,7 +2448,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_COGS_GROSS_RATE]: {
         priority: 38,
-        title: 'RC COGS / Gross Rate',
+        title: 'Returning Customer COGS / Gross Rate',
         description: 'RC COGS as percentage of gross revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -2500,7 +2490,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_COGS_NET_RATE]: {
         priority: 36,
-        title: 'NC COGS / Net Rate',
+        title: 'New Customer COGS / Net Rate',
         description: 'NC COGS as percentage of net revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -2521,7 +2511,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_COGS_NET_RATE]: {
         priority: 39,
-        title: 'RC COGS / Net Rate',
+        title: 'Returning Customer COGS / Net Rate',
         description: 'RC COGS as percentage of net revenue.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -2667,7 +2657,7 @@ exports.ORDERS_MEASURES_MAP = {
         decimalPlaces: 0,
         useCompactNotation: true,
         applicableContexts: measure_applicable_contexts_js_1.LTV_COHORT_APPLICABLE_CONTEXTS,
-        shortTitle: 'Cohort Cust.',
+        shortTitle: 'Cohort Customers',
         tooltip: 'The number of customers who made their first purchase in the cohort period. The denominator for all per-customer cohort metrics.',
     },
     [measures_js_1.MEASURE.ORDERS_COHORT_RETENTION_PERCENT]: {
@@ -2714,6 +2704,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_TOP_PRODUCTS]: {
         priority: 9,
         title: 'Top Products',
+        shortTitle: 'Top Products',
         description: 'Top selling products by revenue.',
         sumPrefix: '',
         sumSuffix: '',
@@ -2731,7 +2722,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_CPA]: {
         priority: 2,
-        title: 'Cost Per Order',
+        title: 'CPA',
         shortTitle: 'CPA',
         description: 'The amount spent per order acquisition.',
         sumPrefix: '$',
@@ -2740,8 +2731,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CPA,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -2752,7 +2742,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CPA]: {
         priority: 52,
-        title: 'New Customer Cost Per Order',
+        title: 'New Customer CPA',
         shortTitle: 'NC CPA',
         description: 'The amount spent per new customer order acquisition.',
         sumPrefix: '$',
@@ -2761,8 +2751,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CPA,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -2773,8 +2762,8 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_TOTAL_ROAS]: {
         priority: 1,
-        title: 'Return on Ad Spend',
-        shortTitle: 'ROAS',
+        title: 'ROAS (Total Sales)',
+        shortTitle: 'ROAS (Total)',
         description: 'Total Order Revenue divided by Total Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
@@ -2782,8 +2771,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_TOTAL_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2795,7 +2783,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_GROSS_ROAS]: {
         priority: 3,
         title: 'ROAS (Gross Sales)',
-        shortTitle: 'ROAS Gross',
+        shortTitle: 'ROAS (Gross)',
         description: 'Gross Order Sales divided by Total Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
@@ -2803,8 +2791,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_GROSS_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2816,7 +2803,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_NET_ROAS]: {
         priority: 4,
         title: 'ROAS (Net Sales)',
-        shortTitle: 'ROAS Net',
+        shortTitle: 'ROAS (Net)',
         description: 'Net Order Sales divided by Total Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
@@ -2824,8 +2811,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NET_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2845,8 +2831,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2857,8 +2842,8 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_ROAS]: {
         priority: 12,
-        title: 'NC ROAS (Gross Sales)',
-        shortTitle: 'NC ROAS Gross',
+        title: 'New Customer ROAS (Gross Sales)',
+        shortTitle: 'NC ROAS (Gross)',
         description: 'New Customer Gross Order Sales divided by Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
@@ -2866,8 +2851,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2878,8 +2862,8 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_NET_ROAS]: {
         priority: 13,
-        title: 'NC ROAS (Net Sales)',
-        shortTitle: 'NC ROAS Net',
+        title: 'New Customer ROAS (Net Sales)',
+        shortTitle: 'NC ROAS (Net)',
         description: 'New Customer Net Order Sales divided by Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
@@ -2887,8 +2871,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_NET_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2908,8 +2891,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CPA,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -2929,8 +2911,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2941,8 +2922,8 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_ROAS]: {
         priority: 22,
-        title: 'RC ROAS (Gross Sales)',
-        shortTitle: 'RC ROAS Gross',
+        title: 'Returning Customer ROAS (Gross Sales)',
+        shortTitle: 'RC ROAS (Gross)',
         description: 'Returning Customer Gross Order Sales divided by Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
@@ -2950,8 +2931,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2962,8 +2942,8 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_NET_ROAS]: {
         priority: 23,
-        title: 'RC ROAS (Net Sales)',
-        shortTitle: 'RC ROAS Net',
+        title: 'Returning Customer ROAS (Net Sales)',
+        shortTitle: 'RC ROAS (Net)',
         description: 'Returning Customer Net Order Sales divided by Ad Spend.',
         sumPrefix: '',
         sumSuffix: 'x',
@@ -2971,8 +2951,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_NET_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -2992,8 +2971,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM1_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3014,8 +2992,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM2_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3036,8 +3013,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM3_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3048,7 +3024,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM1_ROAS]: {
         priority: 54,
-        title: 'NC CM1 ROAS',
+        title: 'New Customer CM1 ROAS',
         shortTitle: 'NC CM1 ROAS',
         description: 'New Customer CM1 (Gross Margin) divided by Ad Spend.',
         sumPrefix: '',
@@ -3057,8 +3033,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM1_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3069,7 +3044,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM2_ROAS]: {
         priority: 55,
-        title: 'NC CM2 ROAS',
+        title: 'New Customer CM2 ROAS',
         shortTitle: 'NC CM2 ROAS',
         description: 'New Customer CM2 divided by Ad Spend.',
         sumPrefix: '',
@@ -3078,8 +3053,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM2_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3090,7 +3064,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM3_ROAS]: {
         priority: 56,
-        title: 'NC CM3 ROAS',
+        title: 'New Customer CM3 ROAS',
         shortTitle: 'NC CM3 ROAS',
         description: 'New Customer CM3 divided by Ad Spend.',
         sumPrefix: '',
@@ -3099,8 +3073,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM3_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3111,7 +3084,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_ROAS]: {
         priority: 57,
-        title: 'RC CM1 ROAS',
+        title: 'Returning Customer CM1 ROAS',
         shortTitle: 'RC CM1 ROAS',
         description: 'Returning Customer CM1 (Gross Margin) divided by Ad Spend.',
         sumPrefix: '',
@@ -3120,8 +3093,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3132,7 +3104,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_ROAS]: {
         priority: 58,
-        title: 'RC CM2 ROAS',
+        title: 'Returning Customer CM2 ROAS',
         shortTitle: 'RC CM2 ROAS',
         description: 'Returning Customer CM2 divided by Ad Spend.',
         sumPrefix: '',
@@ -3141,8 +3113,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3153,7 +3124,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_ROAS]: {
         priority: 59,
-        title: 'RC CM3 ROAS',
+        title: 'Returning Customer CM3 ROAS',
         shortTitle: 'RC CM3 ROAS',
         description: 'Returning Customer CM3 divided by Ad Spend.',
         sumPrefix: '',
@@ -3162,8 +3133,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: 'x',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_ROAS,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.MULTIPLIER,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3183,8 +3153,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_TOTAL_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3196,7 +3165,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_GROSS_MER]: {
         priority: 32,
         title: 'MER (Gross Sales)',
-        shortTitle: 'MER Gross',
+        shortTitle: 'MER (Gross)',
         description: 'Marketing Efficiency Ratio using Gross Order Sales.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -3204,8 +3173,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_GROSS_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3217,7 +3185,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_NET_MER]: {
         priority: 33,
         title: 'MER (Net Sales)',
-        shortTitle: 'MER Net',
+        shortTitle: 'MER (Net)',
         description: 'Marketing Efficiency Ratio using Net Order Sales.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -3225,8 +3193,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NET_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3237,7 +3204,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_MER]: {
         priority: 36,
-        title: 'NC Marketing Efficiency Ratio',
+        title: 'New Customer Marketing Efficiency Ratio',
         shortTitle: 'NC MER',
         description: 'Marketing Efficiency Ratio using New Customer Order Revenue.',
         sumPrefix: '',
@@ -3246,8 +3213,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3259,7 +3225,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MER]: {
         priority: 37,
         title: 'NC MER (Gross Sales)',
-        shortTitle: 'NC MER Gross',
+        shortTitle: 'NC MER (Gross)',
         description: 'Marketing Efficiency Ratio using New Customer Gross Order Sales.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -3267,8 +3233,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3279,8 +3244,8 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_NET_MER]: {
         priority: 38,
-        title: 'NC MER (Net Sales)',
-        shortTitle: 'NC MER Net',
+        title: 'New Customer MER (Net Sales)',
+        shortTitle: 'NC MER (Net)',
         description: 'Marketing Efficiency Ratio using New Customer Net Order Sales.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -3288,8 +3253,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_NET_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3300,7 +3264,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_MER]: {
         priority: 41,
-        title: 'RC Marketing Efficiency Ratio',
+        title: 'Returning Customer Marketing Efficiency Ratio',
         shortTitle: 'RC MER',
         description: 'Marketing Efficiency Ratio using Returning Customer Order Revenue.',
         sumPrefix: '',
@@ -3309,8 +3273,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3321,8 +3284,8 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MER]: {
         priority: 42,
-        title: 'RC MER (Gross Sales)',
-        shortTitle: 'RC MER Gross',
+        title: 'Returning Customer MER (Gross Sales)',
+        shortTitle: 'RC MER (Gross)',
         description: 'Marketing Efficiency Ratio using Returning Customer Gross Order Sales.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -3330,8 +3293,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3342,8 +3304,8 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MER]: {
         priority: 43,
-        title: 'RC MER (Net Sales)',
-        shortTitle: 'RC MER Net',
+        title: 'Returning Customer MER (Net Sales)',
+        shortTitle: 'RC MER (Net)',
         description: 'Marketing Efficiency Ratio using Returning Customer Net Order Sales.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -3351,8 +3313,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_NET_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3372,8 +3333,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM1_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3394,8 +3354,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM2_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3416,8 +3375,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM3_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3428,7 +3386,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM1_MER]: {
         priority: 64,
-        title: 'NC CM1 MER',
+        title: 'New Customer CM1 MER',
         shortTitle: 'NC CM1 MER',
         description: 'Marketing Efficiency Ratio using New Customer CM1.',
         sumPrefix: '',
@@ -3437,8 +3395,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM1_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3449,7 +3406,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM2_MER]: {
         priority: 65,
-        title: 'NC CM2 MER',
+        title: 'New Customer CM2 MER',
         shortTitle: 'NC CM2 MER',
         description: 'Marketing Efficiency Ratio using New Customer CM2.',
         sumPrefix: '',
@@ -3458,8 +3415,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM2_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3470,7 +3426,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM3_MER]: {
         priority: 66,
-        title: 'NC CM3 MER',
+        title: 'New Customer CM3 MER',
         shortTitle: 'NC CM3 MER',
         description: 'Marketing Efficiency Ratio using New Customer CM3.',
         sumPrefix: '',
@@ -3479,8 +3435,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM3_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3491,7 +3446,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_MER]: {
         priority: 67,
-        title: 'RC CM1 MER',
+        title: 'Returning Customer CM1 MER',
         shortTitle: 'RC CM1 MER',
         description: 'Marketing Efficiency Ratio using Returning Customer CM1.',
         sumPrefix: '',
@@ -3500,8 +3455,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3512,7 +3466,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_MER]: {
         priority: 68,
-        title: 'RC CM2 MER',
+        title: 'Returning Customer CM2 MER',
         shortTitle: 'RC CM2 MER',
         description: 'Marketing Efficiency Ratio using Returning Customer CM2.',
         sumPrefix: '',
@@ -3521,8 +3475,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3533,7 +3486,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_MER]: {
         priority: 69,
-        title: 'RC CM3 MER',
+        title: 'Returning Customer CM3 MER',
         shortTitle: 'RC CM3 MER',
         description: 'Marketing Efficiency Ratio using Returning Customer CM3.',
         sumPrefix: '',
@@ -3542,8 +3495,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_MER,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3563,8 +3515,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_TOTAL_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -3576,7 +3527,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_GROSS_RAAD]: {
         priority: 72,
         title: 'RAAD (Gross Sales)',
-        shortTitle: 'RAAD Gross',
+        shortTitle: 'RAAD (Gross)',
         description: 'Gross Order Sales minus Ad Spend.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -3584,8 +3535,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_GROSS_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -3597,7 +3547,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_NET_RAAD]: {
         priority: 73,
         title: 'RAAD (Net Sales)',
-        shortTitle: 'RAAD Net',
+        shortTitle: 'RAAD (Net)',
         description: 'Net Order Sales minus Ad Spend.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -3605,8 +3555,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NET_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -3626,8 +3575,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_TOTAL_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3647,8 +3595,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_GROSS_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3660,7 +3607,7 @@ exports.ORDERS_MEASURES_MAP = {
     [measures_js_1.MEASURE.ORDERS_NET_RAAD_PERCENT]: {
         priority: 76,
         title: 'RAAD % of Net Sales',
-        shortTitle: 'RAAD % Net',
+        shortTitle: 'RAAD % (Net)',
         description: 'Revenue After Ad Spend as percentage of Net Sales.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -3668,8 +3615,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NET_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3680,7 +3626,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_RAAD]: {
         priority: 77,
-        title: 'NC Revenue After Ad Spend',
+        title: 'New Customer Revenue After Ad Spend',
         shortTitle: 'NC RAAD',
         description: 'New Customer Order Revenue minus Ad Spend.',
         sumPrefix: '$',
@@ -3689,8 +3635,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -3701,7 +3646,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_RAAD]: {
         priority: 78,
-        title: 'NC RAAD (Gross Sales)',
+        title: 'New Customer RAAD (Gross Sales)',
         shortTitle: 'NC RAAD Gross',
         description: 'New Customer Gross Order Sales minus Ad Spend.',
         sumPrefix: '$',
@@ -3710,8 +3655,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -3722,8 +3666,8 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_NET_RAAD]: {
         priority: 79,
-        title: 'NC RAAD (Net Sales)',
-        shortTitle: 'NC RAAD Net',
+        title: 'New Customer RAAD (Net Sales)',
+        shortTitle: 'NC RAAD (Net)',
         description: 'New Customer Net Order Sales minus Ad Spend.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -3731,8 +3675,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_NET_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -3743,7 +3686,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_RAAD_PERCENT]: {
         priority: 80,
-        title: 'NC RAAD % of Total Revenue',
+        title: 'New Customer RAAD % of Total Revenue',
         shortTitle: 'NC RAAD %',
         description: 'NC Revenue After Ad Spend as percentage of NC Total Revenue.',
         sumPrefix: '',
@@ -3752,8 +3695,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_TOTAL_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3764,8 +3706,8 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_RAAD_PERCENT]: {
         priority: 81,
-        title: 'NC RAAD % of Gross Sales',
-        shortTitle: 'NC RAAD % Gross',
+        title: 'New Customer RAAD % of Gross Sales',
+        shortTitle: 'NC RAAD % (Gross)',
         description: 'NC Revenue After Ad Spend as percentage of NC Gross Sales.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -3773,8 +3715,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_GROSS_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3785,8 +3726,8 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_NET_RAAD_PERCENT]: {
         priority: 82,
-        title: 'NC RAAD % of Net Sales',
-        shortTitle: 'NC RAAD % Net',
+        title: 'New Customer RAAD % of Net Sales',
+        shortTitle: 'NC RAAD % (Net)',
         description: 'NC Revenue After Ad Spend as percentage of NC Net Sales.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -3794,8 +3735,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_NET_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3806,7 +3746,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD]: {
         priority: 83,
-        title: 'RC Revenue After Ad Spend',
+        title: 'Returning Customer Revenue After Ad Spend',
         shortTitle: 'RC RAAD',
         description: 'Returning Customer Order Revenue minus Ad Spend.',
         sumPrefix: '$',
@@ -3815,8 +3755,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -3827,8 +3766,8 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD]: {
         priority: 84,
-        title: 'RC RAAD (Gross Sales)',
-        shortTitle: 'RC RAAD Gross',
+        title: 'Returning Customer RAAD (Gross Sales)',
+        shortTitle: 'RC RAAD (Gross)',
         description: 'Returning Customer Gross Order Sales minus Ad Spend.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -3836,8 +3775,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -3848,8 +3786,8 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD]: {
         priority: 85,
-        title: 'RC RAAD (Net Sales)',
-        shortTitle: 'RC RAAD Net',
+        title: 'Returning Customer RAAD (Net Sales)',
+        shortTitle: 'RC RAAD (Net)',
         description: 'Returning Customer Net Order Sales minus Ad Spend.',
         sumPrefix: '$',
         sumSuffix: '',
@@ -3857,8 +3795,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -3869,7 +3806,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD_PERCENT]: {
         priority: 86,
-        title: 'RC RAAD % of Total Revenue',
+        title: 'Returning Customer RAAD % of Total Revenue',
         shortTitle: 'RC RAAD %',
         description: 'RC Revenue After Ad Spend as percentage of RC Total Revenue.',
         sumPrefix: '',
@@ -3878,8 +3815,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_TOTAL_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3890,7 +3826,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD_PERCENT]: {
         priority: 87,
-        title: 'RC RAAD % of Gross Sales',
+        title: 'Returning Customer RAAD % of Gross Sales',
         shortTitle: 'RC RAAD % Gross',
         description: 'RC Revenue After Ad Spend as percentage of RC Gross Sales.',
         sumPrefix: '',
@@ -3899,8 +3835,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_GROSS_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3911,8 +3846,8 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD_PERCENT]: {
         priority: 88,
-        title: 'RC RAAD % of Net Sales',
-        shortTitle: 'RC RAAD % Net',
+        title: 'Returning Customer RAAD % of Net Sales',
+        shortTitle: 'RC RAAD % (Net)',
         description: 'RC Revenue After Ad Spend as percentage of RC Net Sales.',
         sumPrefix: '',
         sumSuffix: '%',
@@ -3920,8 +3855,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_NET_RAAD_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_PERFORMANCE,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3942,8 +3876,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM2,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -3964,8 +3897,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM2_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -3976,7 +3908,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM2]: {
         priority: 12,
-        title: 'NC Contribution Margin 2',
+        title: 'New Customer Contribution Margin 2',
         shortTitle: 'NC CM2',
         description: 'New customer CM1 minus shipping, gateway, and variable costs.',
         sumPrefix: '$',
@@ -3985,8 +3917,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM2,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -3997,7 +3928,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM2_PERCENT]: {
         priority: 36,
-        title: 'NC CM2 Margin',
+        title: 'New Customer CM2 Margin',
         shortTitle: 'NC CM2 %',
         description: 'NC CM2 as a percentage of NC Net Revenue.',
         sumPrefix: '',
@@ -4006,8 +3937,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM2_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -4018,7 +3948,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM2]: {
         priority: 22,
-        title: 'RC Contribution Margin 2',
+        title: 'Returning Customer Contribution Margin 2',
         shortTitle: 'RC CM2',
         description: 'Returning customer CM1 minus shipping, gateway, and variable costs.',
         sumPrefix: '$',
@@ -4027,8 +3957,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM2,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -4039,7 +3968,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_PERCENT]: {
         priority: 40,
-        title: 'RC CM2 Margin',
+        title: 'Returning Customer CM2 Margin',
         shortTitle: 'RC CM2 %',
         description: 'RC CM2 as a percentage of RC Net Revenue.',
         sumPrefix: '',
@@ -4048,8 +3977,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM2_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -4070,8 +3998,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM3,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -4092,8 +4019,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM3_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -4104,7 +4030,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM3]: {
         priority: 13,
-        title: 'NC Contribution Margin 3',
+        title: 'New Customer Contribution Margin 3',
         shortTitle: 'NC CM3',
         description: 'New customer CM2 minus ad spend.',
         sumPrefix: '$',
@@ -4113,8 +4039,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM3,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -4125,7 +4050,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM3_PERCENT]: {
         priority: 37,
-        title: 'NC CM3 Margin',
+        title: 'New Customer CM3 Margin',
         shortTitle: 'NC CM3 %',
         description: 'NC CM3 as a percentage of NC Net Revenue.',
         sumPrefix: '',
@@ -4134,8 +4059,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM3_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -4146,7 +4070,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM3]: {
         priority: 23,
-        title: 'RC Contribution Margin 3',
+        title: 'Returning Customer Contribution Margin 3',
         shortTitle: 'RC CM3',
         description: 'Returning customer CM2 minus ad spend.',
         sumPrefix: '$',
@@ -4155,8 +4079,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM3,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -4167,7 +4090,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_PERCENT]: {
         priority: 41,
-        title: 'RC CM3 Margin',
+        title: 'Returning Customer CM3 Margin',
         shortTitle: 'RC CM3 %',
         description: 'RC CM3 as a percentage of RC Net Revenue.',
         sumPrefix: '',
@@ -4176,8 +4099,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM3_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -4198,8 +4120,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM4,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -4220,8 +4141,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM4_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -4232,7 +4152,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM4]: {
         priority: 14,
-        title: 'NC CM4 (Operating Profit)',
+        title: 'New Customer CM4 (Operating Profit)',
         shortTitle: 'NC CM4',
         description: 'New customer CM3 minus Fixed Costs. Operating profit from new customer acquisitions.',
         sumPrefix: '$',
@@ -4241,8 +4161,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM4,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -4253,7 +4172,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM4_PERCENT]: {
         priority: 38,
-        title: 'NC CM4 % (Operating Margin)',
+        title: 'New Customer CM4 % (Operating Margin)',
         shortTitle: 'NC CM4 %',
         description: 'NC CM4 as a percentage of NC Net Revenue. Operating margin from new customers.',
         sumPrefix: '',
@@ -4262,8 +4181,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM4_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -4274,7 +4192,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM4]: {
         priority: 24,
-        title: 'RC CM4 (Operating Profit)',
+        title: 'Returning Customer CM4 (Operating Profit)',
         shortTitle: 'RC CM4',
         description: 'Returning customer CM3 minus Fixed Costs. Operating profit from repeat purchases.',
         sumPrefix: '$',
@@ -4283,8 +4201,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM4,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -4295,7 +4212,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM4_PERCENT]: {
         priority: 42,
-        title: 'RC CM4 % (Operating Margin)',
+        title: 'Returning Customer CM4 % (Operating Margin)',
         shortTitle: 'RC CM4 %',
         description: 'RC CM4 as a percentage of RC Net Revenue. Operating margin from returning customers.',
         sumPrefix: '',
@@ -4304,8 +4221,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM4_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -4325,8 +4241,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM1,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -4346,8 +4261,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.CHANNEL,
         measure: measures_js_1.MEASURE.ORDERS_CM1_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -4358,7 +4272,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM1]: {
         priority: 11,
-        title: 'NC CM1 (Gross Margin)',
+        title: 'New Customer CM1 (Gross Margin)',
         shortTitle: 'NC CM1',
         description: 'New customer Net Revenue minus Effective COGS. Includes impact of returns/discounts.',
         sumPrefix: '$',
@@ -4367,8 +4281,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM1,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -4379,7 +4292,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM1_PERCENT]: {
         priority: 35,
-        title: 'NC CM1 % (Gross Margin %)',
+        title: 'New Customer CM1 % (Gross Margin %)',
         shortTitle: 'NC CM1 %',
         description: 'NC CM1 as a percentage of NC Net Revenue. Includes impact of returns/discounts.',
         sumPrefix: '',
@@ -4388,8 +4301,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_NEW_CUSTOMER_CM1_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,
@@ -4400,7 +4312,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM1]: {
         priority: 21,
-        title: 'RC CM1 (Gross Margin)',
+        title: 'Returning Customer CM1 (Gross Margin)',
         shortTitle: 'RC CM1',
         description: 'Returning customer Net Revenue minus Effective COGS. Includes impact of returns/discounts.',
         sumPrefix: '$',
@@ -4409,8 +4321,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM1,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.CURRENCY,
         decimalPlaces: 2,
         useCompactNotation: true,
@@ -4421,7 +4332,7 @@ exports.ORDERS_MEASURES_MAP = {
     },
     [measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_PERCENT]: {
         priority: 39,
-        title: 'RC CM1 % (Gross Margin %)',
+        title: 'Returning Customer CM1 % (Gross Margin %)',
         shortTitle: 'RC CM1 %',
         description: 'RC CM1 as a percentage of RC Net Revenue. Includes impact of returns/discounts.',
         sumPrefix: '',
@@ -4430,8 +4341,7 @@ exports.ORDERS_MEASURES_MAP = {
         avgSuffix: '%',
         icon: measure_icon_js_1.MEASURE_ICON.SHOPIFY,
         measure: measures_js_1.MEASURE.ORDERS_RETURNING_CUSTOMER_CM1_PERCENT,
-        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS,
-        subcategory: measure_categories_js_1.MEASURE_SUBCATEGORY.ORDERS_CONTRIBUTION_MARGIN,
+        category: measure_categories_js_1.MEASURE_CATEGORY.ORDERS_AD_PERFORMANCE,
         valueType: measure_value_type_js_1.MeasureValueType.PERCENTAGE,
         decimalPlaces: 2,
         useCompactNotation: false,