revised suggest category naming

Author: bani

sql/mozfun/norm/result_type_to_product_name/udf.sql

@@ -75,6 +75,10 @@ RETURNS STRING AS (
       THEN 'merino_market_opt_in'
     WHEN res IN ('tab_serp')
       THEN 'open_tab_to_serp'
+    WHEN res IN ('merino_sports')
+      THEN 'sports'
+    WHEN res IN ('merino_flights')
+      THEN 'flights'
     WHEN res IN (
         'top_site',
         'recent_search',
@@ -90,8 +94,7 @@ RETURNS STRING AS (
         'restrict_keyword_tabs',
         'restrict_keyword_actions',
         'merino_market',
-        'merino_sports',
-        'merino_flights'
+        'important_dates',
       )
       THEN res
     WHEN res LIKE('%opt_in')