prismcast 1.8.0 → 1.9.0

package/dist/channels/index.js

@@ -1,33 +1,33 @@
-// Channel identity fields — metadata that describes the channel itself, independent of which provider serves it. This is the single source of truth for the
-// identity/provider-specific field separation used by: (1) applyVariantInheritance in providers.ts (identity fields always come from the canonical),
+// Channel identity fields — metadata that describes the channel itself, independent of which service serves it. This is the single source of truth for the
+// identity/service-specific field separation used by: (1) applyVariantInheritance in services.ts (identity fields always come from the canonical),
 // (2) startup migration in userChannels.ts (strips legacy identity fields from variant entries), and (3) DELTA_ALLOWED_FIELDS derivation (identity +
-// provider-specific editable fields). Adding a new identity field here automatically propagates to all three consumers.
-export const CHANNEL_IDENTITY_FIELDS = new Set(["channelNumber", "hdhrEnabled", "name", "stationId", "tags", "tvgShift"]);
+// service-specific editable fields). Adding a new identity field here automatically propagates to all three consumers.
+export const CHANNEL_IDENTITY_FIELDS = new Set(["channelNumber", "guideTitle", "hdhrEnabled", "logoUrl", "name", "stationId", "tags", "tvgShift"]);
 // Predefined tag vocabulary. These tags ship with PrismCast and are assigned to predefined channel definitions below. Users can delete predefined tags from
 // their registry (they're tracked in channels.json deletedTags) and create their own tags. The runtime vocabulary is: (PREDEFINED_TAGS - deletedTags) + userTags.
-export const PREDEFINED_TAGS = ["documentary", "entertainment", "hbo", "kids", "lifestyle", "local", "movies", "news", "showtime", "sports", "starz"];
-// Site provider key. When a channel has its own streaming website, this key is used in the providers map. The site provider always wins as canonical.
+export const PREDEFINED_TAGS = ["Documentary", "Entertainment", "HBO", "Kids", "Lifestyle", "Local", "Movies", "News", "Showtime", "Sports", "Starz"];
+// Site service key. When a channel has its own streaming website, this key is used in the services map. The site service always wins as canonical.
 const SITE_KEY = "site";
-/* Nested channel definitions. Each entry maps a channel key to a ChannelDefinition with identity fields (name, stationId) and a providers map keyed by provider
- * slug. The "site" key represents the channel's own streaming website. All other keys are multi-provider platform slugs (cox, directv, hulu, sling, spectrum,
+/* Nested channel definitions. Each entry maps a channel key to a ChannelDefinition with identity fields (name, stationId) and a services map keyed by service
+ * slug. The "site" key represents the channel's own streaming website. All other keys are multi-service platform slugs (cox, directv, hulu, sling, spectrum,
  * xfinity, yttv, foxone, paramountplus).
  *
  * At module load, the flattener compiles these nested definitions into the flat ChannelMap consumed by the rest of the codebase. Each variant entry gets
- * canonicalKey set to its parent definition's key, which buildProviderGroups in providers.ts uses to assemble provider groups.
+ * canonicalKey set to its parent definition's key, which buildServiceGroups in services.ts uses to assemble service groups.
  *
  * Canonical resolution rules:
- * 1. If "site" exists in providers, the canonical always gets the site URL.
- * 2. Otherwise, the provider whose key sorts first alphabetically (computed, not source-order) becomes canonical.
+ * 1. If "site" exists in services, the canonical always gets the site URL.
+ * 2. Otherwise, the service whose key sorts first alphabetically (computed, not source-order) becomes canonical.
  *
- * Adding a new provider never changes canonicals unless a "site" entry is introduced.
+ * Adding a new service never changes canonicals unless a "site" entry is introduced.
  *
  * Pacific timezone support:
  * - pacificStationId on an East ChannelDefinition triggers auto-generation of a Pacific sibling.
  * - Manual Pacific definitions (keys ending in "p") can pre-declare overrides (e.g., West-specific channelSelectors).
- * - Pacific generation merges inherited providers from the East definition into the Pacific definition, skipping providers whose channelSelector contains
- *   "East" or "West" and never overwriting existing Pacific providers. See generatePacificDefinitions() for full rules.
+ * - Pacific generation merges inherited services from the East definition into the Pacific definition, skipping services whose channelSelector contains
+ *   "East" or "West" and never overwriting existing Pacific services. See generatePacificDefinitions() for full rules.
  *
- * FAST channels: This list contains only traditional linear TV networks and public broadcasters — no FAST (Free Ad-Supported Streaming Television) channels.
+ * FAST channels: This list contains only traditional linear TV networks and public broadcasters - no FAST (Free Ad-Supported Streaming Television) channels.
  * FAST channels from platforms like Pluto TV or Tubi should not be added here. Users who want FAST content can add them as user-defined channels through the
  * web UI or user channels file, or preferably use dedicated high-quality integrations such as Plex Channels, Pluto for Channels, or Tubi for Channels.
  */
@@ -35,8 +35,8 @@ const SITE_KEY = "site";
 const BASE_CHANNEL_DEFINITIONS = {
     abc: {
         name: "ABC",
-        tags: ["local"],
-        providers: {
+        tags: ["Local"],
+        services: {
             cox: { channelSelector: "ABC", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "ABC", url: "https://stream.directv.com" },
             hulu: { channelSelector: "ABC", url: "https://www.hulu.com/live" },
@@ -49,9 +49,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     abcnews: {
         name: "ABC News Live",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "113380",
-        providers: {
+        services: {
             cox: { channelSelector: "ABCNL", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "ABC News Live", url: "https://stream.directv.com" },
             hulu: { channelSelector: "ABC News Live", url: "https://www.hulu.com/live" },
@@ -62,10 +62,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     ae: {
         name: "A&E",
-        tags: ["documentary", "entertainment"],
+        tags: ["Documentary", "Entertainment"],
         pacificStationId: "57439",
         stationId: "51529",
-        providers: {
+        services: {
             cox: { channelSelector: "A&E", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "A&E", url: "https://stream.directv.com" },
             hulu: { channelSelector: "A&E", url: "https://www.hulu.com/live" },
@@ -78,9 +78,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     ahc: {
         name: "American Heroes",
-        tags: ["documentary"],
+        tags: ["Documentary"],
         stationId: "78808",
-        providers: {
+        services: {
             cox: { channelSelector: "American Heroes", url: "https://watchtv.cox.com/listings" },
             site: { url: "https://watch.foodnetwork.com/channel/ahc" },
             spectrum: { channelSelector: "American Heroes Channel", url: "https://watch.spectrum.net/guide" },
@@ -89,10 +89,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     amc: {
         name: "AMC",
-        tags: ["entertainment", "movies"],
+        tags: ["Entertainment", "Movies"],
         pacificStationId: "78836",
         stationId: "59337",
-        providers: {
+        services: {
             cox: { channelSelector: "AMC", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "AMC", url: "https://stream.directv.com" },
             sling: { channelSelector: "AMC", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
@@ -103,19 +103,19 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     amcthrillers: {
         name: "AMC Thrillers",
-        tags: ["entertainment", "movies"],
+        tags: ["Entertainment", "Movies"],
         stationId: "115678",
-        providers: {
+        services: {
             sling: { channelSelector: "AMC Thrillers", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
             yttv: { channelSelector: "AMC Thrillers", url: "https://tv.youtube.com/live" },
         },
     },
     animal: {
         name: "Animal Planet",
-        tags: ["documentary"],
+        tags: ["Documentary"],
         pacificStationId: "68785",
         stationId: "57394",
-        providers: {
+        services: {
             cox: { channelSelector: "Animal Planet", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Animal Planet", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Animal Planet", url: "https://www.hulu.com/live" },
@@ -127,9 +127,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     axstv: {
         name: "AXS TV",
-        tags: ["entertainment", "sports"],
+        tags: ["Entertainment", "Sports"],
         stationId: "28506",
-        providers: {
+        services: {
             cox: { channelSelector: "AXS TV", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "AXS TV", url: "https://stream.directv.com" },
             spectrum: { channelSelector: "AXS TV", url: "https://watch.spectrum.net/guide" },
@@ -138,10 +138,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     bbcamerica: {
         name: "BBC America",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         pacificStationId: "76739",
         stationId: "64492",
-        providers: {
+        services: {
             cox: { channelSelector: "BBC America", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "BBC America", url: "https://stream.directv.com" },
             sling: { channelSelector: "BBC America", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
@@ -152,9 +152,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     bbcnews: {
         name: "BBC News (North America)",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "101449",
-        providers: {
+        services: {
             cox: { channelSelector: "BBC News", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "BBC News", url: "https://stream.directv.com" },
             sling: { channelSelector: "BBC News", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
@@ -165,10 +165,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     bet: {
         name: "BET",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         pacificStationId: "64673",
         stationId: "63236",
-        providers: {
+        services: {
             cox: { channelSelector: "BET", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "BET", url: "https://stream.directv.com" },
             hulu: { channelSelector: "BET", url: "https://www.hulu.com/live" },
@@ -181,10 +181,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     bether: {
         name: "BET Her",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         pacificStationId: "97360",
         stationId: "63220",
-        providers: {
+        services: {
             cox: { channelSelector: "BET Her", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "BET Her", url: "https://stream.directv.com" },
             spectrum: { channelSelector: "BET Her", url: "https://watch.spectrum.net/guide" },
@@ -194,9 +194,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     bigten: {
         name: "Big 10",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "58321",
-        providers: {
+        services: {
             cox: { channelSelector: "Big Ten Network", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Big Ten", url: "https://stream.directv.com" },
             foxone: { channelSelector: "BTN", url: "https://www.fox.com/live/channels" },
@@ -209,9 +209,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     bloomberg: {
         name: "Bloomberg Television",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "71799",
-        providers: {
+        services: {
             cox: { channelSelector: "Bloomberg", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Bloomberg TV", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Bloomberg Television", url: "https://www.hulu.com/live" },
@@ -223,17 +223,17 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     bloombergoriginals: {
         name: "Bloomberg Originals",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "175656",
-        providers: {
+        services: {
             yttv: { channelSelector: "Bloomberg Originals", url: "https://tv.youtube.com/live" },
         },
     },
     bravo: {
         name: "Bravo",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "58625",
-        providers: {
+        services: {
             cox: { channelSelector: "Bravo", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Bravo", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Bravo", url: "https://www.hulu.com/live" },
@@ -246,18 +246,18 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     bravop: {
         name: "Bravo (Pacific)",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "73994",
-        providers: {
+        services: {
             site: { url: "https://www.nbc.com/live?brand=bravo&callsign=bravo_west" },
         },
     },
     cartoon: {
         name: "Cartoon Network",
-        tags: ["kids"],
+        tags: ["Kids"],
         pacificStationId: "67703",
         stationId: "60048",
-        providers: {
+        services: {
             cox: { channelSelector: "Cartoon Network", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Cartoon Network", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Cartoon Network (East)", url: "https://www.hulu.com/live" },
@@ -268,16 +268,16 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     cartoonp: {
         name: "Cartoon Network (Pacific)",
-        tags: ["kids"],
+        tags: ["Kids"],
         stationId: "67703",
-        providers: {
+        services: {
             hulu: { channelSelector: "Cartoon Network (West)", url: "https://www.hulu.com/live" },
         },
     },
     cbs: {
         name: "CBS",
-        tags: ["local"],
-        providers: {
+        tags: ["Local"],
+        services: {
             cox: { channelSelector: "CBS", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "CBS", url: "https://stream.directv.com" },
             hulu: { channelSelector: "CBS", url: "https://www.hulu.com/live" },
@@ -290,18 +290,18 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     cbsnews: {
         name: "CBS News 24/7",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "104846",
-        providers: {
+        services: {
             hulu: { channelSelector: "CBS News 24/7", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "CBS News 24/7", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
         },
     },
     cbssports: {
         name: "CBS Sports Network",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "59250",
-        providers: {
+        services: {
             cox: { channelSelector: "CBS Sports Network", url: "https://watchtv.cox.com/listings" },
             hulu: { channelSelector: "CBS Sports Network", url: "https://www.hulu.com/live" },
             spectrum: { channelSelector: "CBS Sports Network", url: "https://watch.spectrum.net/guide" },
@@ -311,10 +311,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     cmt: {
         name: "CMT",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         pacificStationId: "64610",
         stationId: "59440",
-        providers: {
+        services: {
             cox: { channelSelector: "CMT", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "CMT", url: "https://stream.directv.com" },
             hulu: { channelSelector: "CMT", url: "https://www.hulu.com/live" },
@@ -325,9 +325,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     cnbc: {
         name: "CNBC",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "58780",
-        providers: {
+        services: {
             cox: { channelSelector: "CNBC", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "CNBC", url: "https://stream.directv.com" },
             hulu: { channelSelector: "CNBC", url: "https://www.hulu.com/live" },
@@ -340,18 +340,18 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     cnbcworld: {
         name: "CNBC World",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "26849",
-        providers: {
+        services: {
             directv: { channelSelector: "CNBC World", url: "https://stream.directv.com" },
             spectrum: { channelSelector: "CNBC World", url: "https://watch.spectrum.net/guide" },
         },
     },
     cnn: {
         name: "CNN",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "58646",
-        providers: {
+        services: {
             cox: { channelSelector: "CNN", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "CNN", url: "https://stream.directv.com" },
             hulu: { channelSelector: "CNN", url: "https://www.hulu.com/live" },
@@ -364,9 +364,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     cnni: {
         name: "CNN International",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "83110",
-        providers: {
+        services: {
             directv: { channelSelector: "CNNi HD East", url: "https://stream.directv.com" },
             hulu: { channelSelector: "CNN International", url: "https://www.hulu.com/live" },
             site: { url: "https://www.cnn.com/videos/cnn-i" },
@@ -375,10 +375,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     comedycentral: {
         name: "Comedy Central",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         pacificStationId: "64599",
         stationId: "62420",
-        providers: {
+        services: {
             cox: { channelSelector: "Comedy Central", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Comedy Central", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Comedy Central", url: "https://www.hulu.com/live" },
@@ -390,9 +390,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     cooking: {
         name: "Cooking",
-        tags: ["lifestyle"],
+        tags: ["Lifestyle"],
         stationId: "68065",
-        providers: {
+        services: {
             cox: { channelSelector: "Cooking Channel", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Cooking Channel", url: "https://stream.directv.com" },
             site: { url: "https://watch.foodnetwork.com/channel/cooking-channel" },
@@ -402,9 +402,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     cspan: {
         name: "C-SPAN",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "68344",
-        providers: {
+        services: {
             cox: { channelSelector: "C-SPAN", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "C-SPAN", url: "https://stream.directv.com" },
             hulu: { channelSelector: "C-SPAN", url: "https://www.hulu.com/live" },
@@ -416,9 +416,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     cspan2: {
         name: "C-SPAN 2",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "68334",
-        providers: {
+        services: {
             cox: { channelSelector: "CPN2D", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "C-SPAN2", url: "https://stream.directv.com" },
             hulu: { channelSelector: "C-SPAN2", url: "https://www.hulu.com/live" },
@@ -430,9 +430,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     cspan3: {
         name: "C-SPAN 3",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "68332",
-        providers: {
+        services: {
             cox: { channelSelector: "CPN3H", url: "https://watchtv.cox.com/listings" },
             hulu: { channelSelector: "C-SPAN3", url: "https://www.hulu.com/live" },
             site: { url: "https://www.c-span.org/networks/?autoplay=true&channel=c-span-3" },
@@ -443,8 +443,8 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     cw: {
         name: "CW",
-        tags: ["local"],
-        providers: {
+        tags: ["Local"],
+        services: {
             cox: { channelSelector: "CW TV", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "CW", url: "https://stream.directv.com" },
             hulu: { channelSelector: "CW", url: "https://www.hulu.com/live" },
@@ -455,9 +455,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     destinationamerica: {
         name: "Destination America",
-        tags: ["documentary"],
+        tags: ["Documentary"],
         stationId: "60468",
-        providers: {
+        services: {
             cox: { channelSelector: "Destination America", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Destination America HD", url: "https://stream.directv.com" },
             site: { url: "https://watch.foodnetwork.com/channel/destination-america" },
@@ -467,10 +467,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     discovery: {
         name: "Discovery",
-        tags: ["documentary"],
+        tags: ["Documentary"],
         pacificStationId: "80399",
         stationId: "56905",
-        providers: {
+        services: {
             cox: { channelSelector: "Discovery Channel", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Discovery", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Discovery", url: "https://www.hulu.com/live" },
@@ -483,9 +483,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     discoverylife: {
         name: "Discovery Life",
-        tags: ["documentary"],
+        tags: ["Documentary"],
         stationId: "92204",
-        providers: {
+        services: {
             cox: { channelSelector: "Discovery Life", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Discovery Life", url: "https://stream.directv.com" },
             site: { url: "https://watch.foodnetwork.com/channel/discovery-life" },
@@ -495,9 +495,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     discoveryturbo: {
         name: "Discovery Turbo",
-        tags: ["documentary"],
+        tags: ["Documentary"],
         stationId: "31046",
-        providers: {
+        services: {
             cox: { channelSelector: "Discovery Turbo", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Discovery Turbo", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Discovery Turbo", url: "https://www.hulu.com/live" },
@@ -510,10 +510,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     disney: {
         name: "Disney",
-        tags: ["kids"],
+        tags: ["Kids"],
         pacificStationId: "63320",
         stationId: "59684",
-        providers: {
+        services: {
             cox: { channelSelector: "Disney Channel", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Disney Channel", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Disney Channel", url: "https://www.hulu.com/live" },
@@ -526,10 +526,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     disneyjr: {
         name: "Disney Jr.",
-        tags: ["kids"],
+        tags: ["Kids"],
         pacificStationId: "75004",
         stationId: "74885",
-        providers: {
+        services: {
             cox: { channelSelector: "Disney Jr.", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Disney Junior", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Disney Junior", url: "https://www.hulu.com/live" },
@@ -541,10 +541,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     disneyxd: {
         name: "Disney XD",
-        tags: ["kids"],
+        tags: ["Kids"],
         pacificStationId: "63322",
         stationId: "60006",
-        providers: {
+        services: {
             cox: { channelSelector: "Disney XD", url: "https://watchtv.cox.com/listings" },
             hulu: { channelSelector: "Disney XD", url: "https://www.hulu.com/live" },
             site: { url: "https://disneynow.com/watch-live?brand=009" },
@@ -555,9 +555,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     e: {
         name: "E!",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "61812",
-        providers: {
+        services: {
             cox: { channelSelector: "E!", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "E!", url: "https://stream.directv.com" },
             hulu: { channelSelector: "E!", url: "https://www.hulu.com/live" },
@@ -570,17 +570,17 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     ep: {
         name: "E! (Pacific)",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "91579",
-        providers: {
+        services: {
             site: { channelSelector: "E-_West", url: "https://www.usanetwork.com/live" },
         },
     },
     espn: {
         name: "ESPN",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "32645",
-        providers: {
+        services: {
             cox: { channelSelector: "ESPN", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "ESPN", url: "https://stream.directv.com" },
             disneyplus: { channelSelector: "poster_linear_espn_none", url: "https://www.disneyplus.com/browse/live" },
@@ -594,9 +594,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     espn2: {
         name: "ESPN2",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "45507",
-        providers: {
+        services: {
             cox: { channelSelector: "ES2HD", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "ESPN2", url: "https://stream.directv.com" },
             disneyplus: { channelSelector: "poster_linear_espn2_none", url: "https://www.disneyplus.com/browse/live" },
@@ -610,9 +610,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     espnacc: {
         name: "ACC Network",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "111871",
-        providers: {
+        services: {
             cox: { channelSelector: "ACC Network", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "ACC Network", url: "https://stream.directv.com" },
             disneyplus: { channelSelector: "poster_linear_acc-network_none", url: "https://www.disneyplus.com/browse/live" },
@@ -625,9 +625,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     espndeportes: {
         name: "ESPN Deportes",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "71914",
-        providers: {
+        services: {
             cox: { channelSelector: "ESPN Deportes", url: "https://watchtv.cox.com/listings" },
             disneyplus: { channelSelector: "poster_linear_espn-deportes_none", url: "https://www.disneyplus.com/browse/live" },
             site: { url: "https://www.espn.com/watch/player?network=espndeportes" },
@@ -638,9 +638,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     espnews: {
         name: "ESPNews",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "59976",
-        providers: {
+        services: {
             cox: { channelSelector: "ESWHD", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "ESPNews", url: "https://stream.directv.com" },
             disneyplus: { channelSelector: "poster_linear_espnews_none", url: "https://www.disneyplus.com/browse/live" },
@@ -653,9 +653,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     espnsec: {
         name: "SEC Network",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "89714",
-        providers: {
+        services: {
             cox: { channelSelector: "SEC", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "SEC Network", url: "https://stream.directv.com" },
             disneyplus: { channelSelector: "poster_linear_sec-network_none", url: "https://www.disneyplus.com/browse/live" },
@@ -668,9 +668,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     espnu: {
         name: "ESPNU",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "60696",
-        providers: {
+        services: {
             cox: { channelSelector: "ESPNU", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "ESPNU", url: "https://stream.directv.com" },
             disneyplus: { channelSelector: "poster_linear_espnu_none", url: "https://www.disneyplus.com/browse/live" },
@@ -683,9 +683,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     fbc: {
         name: "Fox Business",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "58718",
-        providers: {
+        services: {
             cox: { channelSelector: "Fox Business", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Fox Business Network", url: "https://stream.directv.com" },
             foxone: { channelSelector: "FBN", url: "https://www.fox.com/live/channels" },
@@ -698,9 +698,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     fnc: {
         name: "Fox News",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "60179",
-        providers: {
+        services: {
             cox: { channelSelector: "Fox News", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Fox News Channel", url: "https://stream.directv.com" },
             foxone: { channelSelector: "FNC", url: "https://www.fox.com/live/channels" },
@@ -714,10 +714,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     food: {
         name: "Food Network",
-        tags: ["lifestyle"],
+        tags: ["Lifestyle"],
         pacificStationId: "82119",
         stationId: "50747",
-        providers: {
+        services: {
             cox: { channelSelector: "Food Network", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Food Network", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Food Network", url: "https://www.hulu.com/live" },
@@ -730,12 +730,12 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     fox: {
         name: "Fox",
-        tags: ["local"],
-        providers: {
+        tags: ["Local"],
+        services: {
             cox: { channelSelector: "Fox", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "FOX", url: "https://stream.directv.com" },
+            foxone: { channelSelector: "FOXD2C", url: "https://www.fox.com/live/channels" },
             hulu: { channelSelector: "Fox", url: "https://www.hulu.com/live" },
-            site: { channelSelector: "FOXD2C", url: "https://www.fox.com/live/channels" },
             sling: { channelSelector: "FOX", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
             spectrum: { channelSelector: "FOX", url: "https://watch.spectrum.net/guide" },
             xfinity: { channelSelector: "Fox", url: "https://www.xfinity.com/stream/listings" },
@@ -744,9 +744,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     foxdeportes: {
         name: "Fox Deportes",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "72189",
-        providers: {
+        services: {
             cox: { channelSelector: "Fox Deportes", url: "https://watchtv.cox.com/listings" },
             foxone: { channelSelector: "FOXD", url: "https://www.fox.com/live/channels" },
             site: { url: "https://www.foxsports.com/live/foxdep" },
@@ -757,36 +757,36 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     foxsoccerplus: {
         name: "Fox Soccer Plus",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "66879",
-        providers: {
+        services: {
             site: { url: "https://www.foxsports.com/live/fsp" },
             yttv: { channelSelector: "FOX Soccer Plus", url: "https://tv.youtube.com/live" },
         },
     },
     france24: {
         name: "France 24",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "60961",
-        providers: {
+        services: {
             site: { url: "https://www.france24.com/en/live" },
             sling: { channelSelector: "France 24 (English)", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
         },
     },
     france24fr: {
         name: "France 24 (French)",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "58685",
-        providers: {
+        services: {
             site: { url: "https://www.france24.com/fr/direct" },
             sling: { channelSelector: "France 24", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
         },
     },
     freeform: {
         name: "Freeform",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "59615",
-        providers: {
+        services: {
             cox: { channelSelector: "Freeform", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Freeform HD", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Freeform", url: "https://www.hulu.com/live" },
@@ -798,17 +798,17 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     freeformp: {
         name: "Freeform (Pacific)",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "63324",
-        providers: {
+        services: {
             site: { url: "https://www.freeform.com/watch-live/3507c750-e86a-4c0f-8ff4-dd23c4859009" },
         },
     },
     fs1: {
         name: "FS1",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "82547",
-        providers: {
+        services: {
             cox: { channelSelector: "FOX Sports 1", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "FOX Sports 1", url: "https://stream.directv.com" },
             foxone: { channelSelector: "FS1", url: "https://www.fox.com/live/channels" },
@@ -822,9 +822,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     fs2: {
         name: "FS2",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "59305",
-        providers: {
+        services: {
             cox: { channelSelector: "FOX Sports 2", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "FOX Sports 2", url: "https://stream.directv.com" },
             foxone: { channelSelector: "FS2", url: "https://www.fox.com/live/channels" },
@@ -837,9 +837,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     fx: {
         name: "FX",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "58574",
-        providers: {
+        services: {
             cox: { channelSelector: "FX", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "FX", url: "https://stream.directv.com" },
             hulu: { channelSelector: "FX", url: "https://www.hulu.com/live" },
@@ -852,10 +852,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     fxm: {
         name: "FXM",
-        tags: ["movies"],
+        tags: ["Movies"],
         pacificStationId: "98488",
         stationId: "70253",
-        providers: {
+        services: {
             cox: { channelSelector: "FXM", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "FX Movie Channel", url: "https://stream.directv.com" },
             hulu: { channelSelector: "FXM", url: "https://www.hulu.com/live" },
@@ -867,17 +867,17 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     fxp: {
         name: "FX (Pacific)",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "59814",
-        providers: {
+        services: {
             site: { url: "https://abc.com/watch-live/2cee3401-f63b-42d0-b32e-962fef610b9e" },
         },
     },
     fxx: {
         name: "FXX",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "66379",
-        providers: {
+        services: {
             cox: { channelSelector: "FXX", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "FXX", url: "https://stream.directv.com" },
             hulu: { channelSelector: "FXX", url: "https://www.hulu.com/live" },
@@ -889,18 +889,18 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     fxxp: {
         name: "FXX (Pacific)",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "82571",
-        providers: {
+        services: {
             site: { url: "https://abc.com/watch-live/e4c83395-62ed-4a49-829a-c55ab3c33e7d" },
         },
     },
     fyi: {
         name: "FYI",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         pacificStationId: "92372",
         stationId: "58988",
-        providers: {
+        services: {
             cox: { channelSelector: "FYI", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "FYI", url: "https://stream.directv.com" },
             hulu: { channelSelector: "FYI", url: "https://www.hulu.com/live" },
@@ -911,10 +911,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     gameshow: {
         name: "Game Show Network",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         pacificStationId: "90210",
         stationId: "68827",
-        providers: {
+        services: {
             cox: { channelSelector: "Game Show Network", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "GSN HD", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Game Show Network", url: "https://www.hulu.com/live" },
@@ -925,9 +925,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     golf: {
         name: "Golf",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "61854",
-        providers: {
+        services: {
             cox: { channelSelector: "Golf Channel", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Golf Channel", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Golf Channel", url: "https://www.hulu.com/live" },
@@ -940,10 +940,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     hallmark: {
         name: "Hallmark",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         pacificStationId: "66415",
         stationId: "66268",
-        providers: {
+        services: {
             cox: { channelSelector: "Hallmark Channel", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Hallmark Channel", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Hallmark Channel", url: "https://www.hulu.com/live" },
@@ -954,9 +954,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     hallmarkfamily: {
         name: "Hallmark Family",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "105723",
-        providers: {
+        services: {
             cox: { channelSelector: "HFM", url: "https://watchtv.cox.com/listings" },
             spectrum: { channelSelector: "Hallmark Family", url: "https://watch.spectrum.net/guide" },
             xfinity: { channelSelector: "HFM", url: "https://www.xfinity.com/stream/listings" },
@@ -965,10 +965,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     hallmarkmystery: {
         name: "Hallmark Mystery",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         pacificStationId: "66412",
         stationId: "46710",
-        providers: {
+        services: {
             cox: { channelSelector: "HMYS", url: "https://watchtv.cox.com/listings" },
             hulu: { channelSelector: "Hallmark Mystery", url: "https://www.hulu.com/live" },
             spectrum: { channelSelector: "Hallmark Mystery", url: "https://watch.spectrum.net/guide" },
@@ -978,9 +978,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     hbo: {
         name: "HBO",
-        tags: ["hbo", "movies"],
+        tags: ["HBO", "Movies"],
         stationId: "19548",
-        providers: {
+        services: {
             cox: { channelSelector: "HBO", url: "https://watchtv.cox.com/listings" },
             site: { channelSelector: "HBO", url: "https://play.hbomax.com" },
             xfinity: { channelSelector: "HBO", url: "https://www.xfinity.com/stream/listings" },
@@ -989,9 +989,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     hbocomedy: {
         name: "HBO Comedy",
-        tags: ["hbo", "movies"],
+        tags: ["HBO", "Movies"],
         stationId: "59839",
-        providers: {
+        services: {
             cox: { channelSelector: "HBOCH", url: "https://watchtv.cox.com/listings" },
             site: { channelSelector: "HBO Comedy", url: "https://play.hbomax.com" },
             xfinity: { channelSelector: "HBOCH", url: "https://www.xfinity.com/stream/listings" },
@@ -1000,9 +1000,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     hbodrama: {
         name: "HBO Drama",
-        tags: ["hbo", "movies"],
+        tags: ["HBO", "Movies"],
         stationId: "59363",
-        providers: {
+        services: {
             cox: { channelSelector: "HBOSH", url: "https://watchtv.cox.com/listings" },
             site: { channelSelector: "HBO Drama", url: "https://play.hbomax.com" },
             xfinity: { channelSelector: "HBOSH", url: "https://www.xfinity.com/stream/listings" },
@@ -1011,9 +1011,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     hbohits: {
         name: "HBO Hits",
-        tags: ["hbo", "movies"],
+        tags: ["HBO", "Movies"],
         stationId: "59368",
-        providers: {
+        services: {
             cox: { channelSelector: "HBO2H", url: "https://watchtv.cox.com/listings" },
             site: { channelSelector: "HBO Hits", url: "https://play.hbomax.com" },
             xfinity: { channelSelector: "HBO2H", url: "https://www.xfinity.com/stream/listings" },
@@ -1022,9 +1022,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     hbomovies: {
         name: "HBO Movies",
-        tags: ["hbo", "movies"],
+        tags: ["HBO", "Movies"],
         stationId: "59845",
-        providers: {
+        services: {
             cox: { channelSelector: "HBOZH", url: "https://watchtv.cox.com/listings" },
             site: { channelSelector: "HBO Movies", url: "https://play.hbomax.com" },
             xfinity: { channelSelector: "HBOZH", url: "https://www.xfinity.com/stream/listings" },
@@ -1033,10 +1033,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     hgtv: {
         name: "HGTV",
-        tags: ["lifestyle"],
+        tags: ["Lifestyle"],
         pacificStationId: "87317",
         stationId: "49788",
-        providers: {
+        services: {
             cox: { channelSelector: "HGTV", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "HGTV", url: "https://stream.directv.com" },
             hulu: { channelSelector: "HGTV", url: "https://www.hulu.com/live" },
@@ -1049,10 +1049,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     history: {
         name: "History",
-        tags: ["documentary"],
+        tags: ["Documentary"],
         pacificStationId: "88545",
         stationId: "57708",
-        providers: {
+        services: {
             cox: { channelSelector: "History", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "HISTORY", url: "https://stream.directv.com" },
             hulu: { channelSelector: "The HISTORY Channel", url: "https://www.hulu.com/live" },
@@ -1064,9 +1064,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     hln: {
         name: "HLN",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "64549",
-        providers: {
+        services: {
             cox: { channelSelector: "HLN", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "HLN", url: "https://stream.directv.com" },
             hulu: { channelSelector: "HLN", url: "https://www.hulu.com/live" },
@@ -1079,10 +1079,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     id: {
         name: "Investigation Discovery",
-        tags: ["documentary"],
+        tags: ["Documentary"],
         pacificStationId: "80309",
         stationId: "65342",
-        providers: {
+        services: {
             cox: { channelSelector: "Investigation Discovery", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Investigation Discovery", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Investigation Discovery", url: "https://www.hulu.com/live" },
@@ -1095,10 +1095,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     ifc: {
         name: "IFC",
-        tags: ["entertainment", "movies"],
+        tags: ["Entertainment", "Movies"],
         pacificStationId: "109735",
         stationId: "59444",
-        providers: {
+        services: {
             cox: { channelSelector: "IFC", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "IFC", url: "https://stream.directv.com" },
             sling: { channelSelector: "IFC", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
@@ -1109,9 +1109,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     indieplex: {
         name: "IndiePlex",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "65795",
-        providers: {
+        services: {
             hulu: { channelSelector: "IndiePlex (East)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "IndiePlex", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
             spectrum: { channelSelector: "IndiePlex", url: "https://watch.spectrum.net/guide" },
@@ -1119,18 +1119,18 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     indieplexp: {
         name: "IndiePlex (Pacific)",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "65796",
-        providers: {
+        services: {
             hulu: { channelSelector: "IndiePlex (West)", url: "https://www.hulu.com/live" },
         },
     },
     lifetime: {
         name: "Lifetime",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         pacificStationId: "60250",
         stationId: "60150",
-        providers: {
+        services: {
             cox: { channelSelector: "Lifetime", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Lifetime", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Lifetime", url: "https://www.hulu.com/live" },
@@ -1142,10 +1142,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     lmn: {
         name: "Lifetime Movie Network",
-        tags: ["entertainment", "movies"],
+        tags: ["Entertainment", "Movies"],
         pacificStationId: "92373",
         stationId: "55887",
-        providers: {
+        services: {
             cox: { channelSelector: "Lifetime Movies", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Lifetime Movie Network", url: "https://stream.directv.com" },
             hulu: { channelSelector: "LMN", url: "https://www.hulu.com/live" },
@@ -1155,10 +1155,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     magnolia: {
         name: "Magnolia Network",
-        tags: ["lifestyle"],
+        tags: ["Lifestyle"],
         pacificStationId: "122081",
         stationId: "67375",
-        providers: {
+        services: {
             cox: { channelSelector: "Magnolia Network", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Magnolia Network", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Magnolia Network", url: "https://www.hulu.com/live" },
@@ -1170,10 +1170,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     mgmplus: {
         name: "MGM+",
-        tags: ["movies"],
+        tags: ["Movies"],
         pacificStationId: "95927",
         stationId: "65687",
-        providers: {
+        services: {
             cox: { channelSelector: "MGM+", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "MGM+", url: "https://stream.directv.com" },
             xfinity: { channelSelector: "MGM+", url: "https://www.xfinity.com/stream/listings" },
@@ -1181,9 +1181,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     mlb: {
         name: "MLB Network",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "62081",
-        providers: {
+        services: {
             cox: { channelSelector: "MLB Network", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "MLB Network", url: "https://stream.directv.com" },
             hulu: { channelSelector: "MLB Network", url: "https://www.hulu.com/live" },
@@ -1193,9 +1193,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     movieplex: {
         name: "MoviePlex",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "83075",
-        providers: {
+        services: {
             hulu: { channelSelector: "MoviePlex (East)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "MoviePlex", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
             spectrum: { channelSelector: "Movieplex", url: "https://watch.spectrum.net/guide" },
@@ -1203,33 +1203,33 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     movieplexp: {
         name: "MoviePlex (Pacific)",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "105963",
-        providers: {
+        services: {
             hulu: { channelSelector: "MoviePlex (West)", url: "https://www.hulu.com/live" },
         },
     },
     msg: {
         name: "MSG",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "35402",
-        providers: {
+        services: {
             directv: { channelSelector: "MSG", url: "https://stream.directv.com" },
         },
     },
     msgsn: {
         name: "MSG Sportsnet",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "35383",
-        providers: {
+        services: {
             directv: { channelSelector: "MSG Sportsnet HD 635", url: "https://stream.directv.com" },
         },
     },
     msnow: {
         name: "MS NOW",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "64241",
-        providers: {
+        services: {
             cox: { channelSelector: "MS NOW", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "MS Now", url: "https://stream.directv.com" },
             hulu: { channelSelector: "MS NOW", url: "https://www.hulu.com/live" },
@@ -1243,10 +1243,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     mtv: {
         name: "MTV",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         pacificStationId: "64630",
         stationId: "60964",
-        providers: {
+        services: {
             cox: { channelSelector: "MTV", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "MTV", url: "https://stream.directv.com" },
             hulu: { channelSelector: "MTV", url: "https://www.hulu.com/live" },
@@ -1257,10 +1257,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     mtv2: {
         name: "MTV2",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         pacificStationId: "75506",
         stationId: "75077",
-        providers: {
+        services: {
             cox: { channelSelector: "MTV2", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "MTV2", url: "https://stream.directv.com" },
             spectrum: { channelSelector: "MTV2", url: "https://watch.spectrum.net/guide" },
@@ -1269,9 +1269,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     mtvclassic: {
         name: "MTV Classic",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "92240",
-        providers: {
+        services: {
             cox: { channelSelector: "MTV Classic", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "MTV Classic", url: "https://stream.directv.com" },
             spectrum: { channelSelector: "MTV Classic", url: "https://watch.spectrum.net/guide" },
@@ -1280,9 +1280,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     natgeo: {
         name: "National Geographic",
-        tags: ["documentary"],
+        tags: ["Documentary"],
         stationId: "49438",
-        providers: {
+        services: {
             cox: { channelSelector: "Nat Geo", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "National Geographic Channel", url: "https://stream.directv.com" },
             hulu: { channelSelector: "National Geographic", url: "https://www.hulu.com/live" },
@@ -1295,17 +1295,17 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     natgeop: {
         name: "National Geographic (Pacific)",
-        tags: ["documentary"],
+        tags: ["Documentary"],
         stationId: "71601",
-        providers: {
+        services: {
             site: { url: "https://www.nationalgeographic.com/tv/watch-live/91456580-f32f-417c-8e1a-9f82640832a7" },
         },
     },
     natgeowild: {
         name: "Nat Geo Wild",
-        tags: ["documentary"],
+        tags: ["Documentary"],
         stationId: "67331",
-        providers: {
+        services: {
             cox: { channelSelector: "National Geographic WILD", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Nat Geo WILD", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Nat Geo WILD", url: "https://www.hulu.com/live" },
@@ -1317,9 +1317,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     nba: {
         name: "NBA TV",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "45526",
-        providers: {
+        services: {
             cox: { channelSelector: "NBA TV", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "NBA TV", url: "https://stream.directv.com" },
             site: { url: "https://www.nba.com/watch/nba-tv" },
@@ -1330,8 +1330,8 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     nbc: {
         name: "NBC",
-        tags: ["local"],
-        providers: {
+        tags: ["Local"],
+        services: {
             cox: { channelSelector: "NBC", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "NBC", url: "https://stream.directv.com" },
             hulu: { channelSelector: "NBC", url: "https://www.hulu.com/live" },
@@ -1344,9 +1344,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     nbcnews: {
         name: "NBC News Now",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "114174",
-        providers: {
+        services: {
             cox: { channelSelector: "NBC News NOW", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "NBC News Now", url: "https://stream.directv.com" },
             hulu: { channelSelector: "NBC News NOW", url: "https://www.hulu.com/live" },
@@ -1358,57 +1358,57 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     nbcsbayarea: {
         name: "NBC Sports Bay Area",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "63138",
-        providers: {
+        services: {
             site: { url: "https://www.nbc.com/live?brand=rsn-bay-area&callsign=nbcsbayarea" },
         },
     },
     nbcsboston: {
         name: "NBC Sports Boston",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "49198",
-        providers: {
+        services: {
             site: { url: "https://www.nbc.com/live?brand=rsn-boston&callsign=nbcsboston" },
         },
     },
     nbcscalifornia: {
         name: "NBC Sports California",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "45540",
-        providers: {
+        services: {
             site: { url: "https://www.nbc.com/live?brand=rsn-california&callsign=nbcscalifornia" },
         },
     },
     nbcsn: {
         name: "NBC Sports Network",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "194412",
-        providers: {
+        services: {
             yttv: { channelSelector: "NBC Sports Network", url: "https://tv.youtube.com/live" },
         },
     },
     nbcsphiladelphia: {
         name: "NBC Sports Philadelphia",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "32571",
-        providers: {
+        services: {
             site: { url: "https://www.nbc.com/live?brand=rsn-philadelphia&callsign=nbcsphiladelphia" },
         },
     },
     necn: {
         name: "NECN",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "66278",
-        providers: {
+        services: {
             site: { url: "https://www.nbc.com/live?brand=necn&callsign=necn" },
         },
     },
     nfl: {
         name: "NFL Network",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "45399",
-        providers: {
+        services: {
             cox: { channelSelector: "NFL Network", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "NFL Network", url: "https://stream.directv.com" },
             hulu: { channelSelector: "NFL Network", url: "https://www.hulu.com/live" },
@@ -1420,9 +1420,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     nhl: {
         name: "NHL Network",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "58690",
-        providers: {
+        services: {
             cox: { channelSelector: "NHL Network", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "NHL Network HD", url: "https://stream.directv.com" },
             spectrum: { channelSelector: "NHL Network", url: "https://watch.spectrum.net/guide" },
@@ -1431,9 +1431,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     own: {
         name: "OWN",
-        tags: ["lifestyle"],
+        tags: ["Lifestyle"],
         stationId: "70388",
-        providers: {
+        services: {
             cox: { channelSelector: "OWN", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "OWN", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Oprah Winfrey Network", url: "https://www.hulu.com/live" },
@@ -1445,9 +1445,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     oxygen: {
         name: "Oxygen",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "70522",
-        providers: {
+        services: {
             cox: { channelSelector: "Oxygen True Crime", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Oxygen True Crime", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Oxygen True Crime", url: "https://www.hulu.com/live" },
@@ -1459,17 +1459,17 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     oxygenp: {
         name: "Oxygen (Pacific)",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "74032",
-        providers: {
+        services: {
             site: { channelSelector: "Oxygen_West", url: "https://www.usanetwork.com/live" },
         },
     },
     paramount: {
         name: "Paramount Network",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "59186",
-        providers: {
+        services: {
             cox: { channelSelector: "Paramount Network", url: "https://watchtv.cox.com/listings" },
             hulu: { channelSelector: "Paramount Network", url: "https://www.hulu.com/live" },
             spectrum: { channelSelector: "Paramount Network", url: "https://watch.spectrum.net/guide" },
@@ -1479,16 +1479,16 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     paramountp: {
         name: "Paramount (Pacific)",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "64593",
-        providers: {
+        services: {
             yttv: { channelSelector: "Paramount Network", url: "https://tv.youtube.com/live" },
         },
     },
     pbs: {
         name: "PBS",
-        tags: ["local"],
-        providers: {
+        tags: ["Local"],
+        services: {
             cox: { channelSelector: "PBS", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "PBS", url: "https://stream.directv.com" },
             hulu: { channelSelector: "PBS", url: "https://www.hulu.com/live" },
@@ -1499,27 +1499,27 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     pbschicago: {
         name: "PBS Chicago (WTTW)",
-        tags: ["local"],
+        tags: ["Local"],
         stationId: "30415",
-        providers: {
+        services: {
             hulu: { channelSelector: "PBS", url: "https://www.hulu.com/live" },
             site: { url: "https://www.wttw.com/wttw-live-stream" },
         },
     },
     pbslakeshore: {
         name: "PBS Lakeshore (WYIN)",
-        tags: ["local"],
+        tags: ["Local"],
         stationId: "49237",
-        providers: {
+        services: {
             hulu: { channelSelector: "Lakeshore PBS", url: "https://www.hulu.com/live" },
             site: { url: "https://video.lakeshorepbs.org/livestream" },
         },
     },
     retroplex: {
         name: "RetroPlex",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "65791",
-        providers: {
+        services: {
             hulu: { channelSelector: "RetroPlex (East)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "RetroPlex", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
             spectrum: { channelSelector: "RetroPlex", url: "https://watch.spectrum.net/guide" },
@@ -1527,17 +1527,17 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     retroplexp: {
         name: "RetroPlex (Pacific)",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "65793",
-        providers: {
+        services: {
             hulu: { channelSelector: "RetroPlex (West)", url: "https://www.hulu.com/live" },
         },
     },
     science: {
         name: "Science",
-        tags: ["documentary"],
+        tags: ["Documentary"],
         stationId: "57390",
-        providers: {
+        services: {
             cox: { channelSelector: "Science Channel", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Science", url: "https://stream.directv.com" },
             site: { url: "https://watch.foodnetwork.com/channel/science" },
@@ -1547,9 +1547,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     showtime: {
         name: "Showtime",
-        tags: ["movies", "showtime"],
+        tags: ["Movies", "Showtime"],
         stationId: "91620",
-        providers: {
+        services: {
             cox: { channelSelector: "PSHOh", url: "https://watchtv.cox.com/listings" },
             paramountplus: { url: "https://www.paramountplus.com/live-tv/stream/showtime-east" },
             xfinity: { channelSelector: "PSHOh", url: "https://www.xfinity.com/stream/listings" },
@@ -1558,18 +1558,18 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     showtimep: {
         name: "Showtime (Pacific)",
-        tags: ["movies", "showtime"],
+        tags: ["Movies", "Showtime"],
         stationId: "91621",
-        providers: {
+        services: {
             paramountplus: { url: "https://www.paramountplus.com/live-tv/stream/showtime-west" },
         },
     },
     smithsonian: {
         name: "Smithsonian Channel",
-        tags: ["documentary"],
+        tags: ["Documentary"],
         pacificStationId: "82695",
         stationId: "58532",
-        providers: {
+        services: {
             cox: { channelSelector: "Smithsonian", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Smithsonian Channel HD", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Smithsonian Channel", url: "https://www.hulu.com/live" },
@@ -1580,17 +1580,17 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     sny: {
         name: "SportsNet New York",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "50038",
-        providers: {
+        services: {
             directv: { channelSelector: "SportsNet New York HD 639", url: "https://stream.directv.com" },
         },
     },
     starz: {
         name: "Starz",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "34941",
-        providers: {
+        services: {
             cox: { channelSelector: "STARZ", url: "https://watchtv.cox.com/listings" },
             hulu: { channelSelector: "STARZ (East)", url: "https://www.hulu.com/live" },
             site: { url: "https://www.starz.com/us/en/play/2" },
@@ -1600,60 +1600,60 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     starzcinema: {
         name: "Starz Cinema",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "67236",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Cinema (East)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "Starz Cinema", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
         },
     },
     starzcinemap: {
         name: "Starz Cinema (Pacific)",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "67365",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Cinema (West)", url: "https://www.hulu.com/live" },
         },
     },
     starzcomedy: {
         name: "Starz Comedy",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "57569",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Comedy (East)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "Starz Comedy", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
         },
     },
     starzcomedyp: {
         name: "Starz Comedy (Pacific)",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "57575",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Comedy (West)", url: "https://www.hulu.com/live" },
         },
     },
     starzedge: {
         name: "Starz Edge",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "57573",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Edge (East)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "Starz Edge", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
         },
     },
     starzedgep: {
         name: "Starz Edge (Pacific)",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "57578",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Edge (West)", url: "https://www.hulu.com/live" },
         },
     },
     starzencore: {
         name: "Starz Encore",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "36225",
-        providers: {
+        services: {
             cox: { channelSelector: "STZEH", url: "https://watchtv.cox.com/listings" },
             hulu: { channelSelector: "STARZ Encore (East)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "Starz Encore", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
@@ -1662,9 +1662,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     starzencoreaction: {
         name: "Starz Encore Action",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "72015",
-        providers: {
+        services: {
             cox: { channelSelector: "STZAH", url: "https://watchtv.cox.com/listings" },
             hulu: { channelSelector: "STARZ Encore Action (East)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "Starz Encore Action", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
@@ -1673,17 +1673,17 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     starzencoreactionp: {
         name: "Starz Encore Action (Pacific)",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "103833",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Encore Action (West)", url: "https://www.hulu.com/live" },
         },
     },
     starzencoreblack: {
         name: "Starz Encore Black",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "72014",
-        providers: {
+        services: {
             cox: { channelSelector: "STZBH", url: "https://watchtv.cox.com/listings" },
             hulu: { channelSelector: "STARZ Encore Black (East)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "Starz Encore Black", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
@@ -1692,155 +1692,155 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     starzencoreblackp: {
         name: "Starz Encore Black (Pacific)",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "103834",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Encore Black (West)", url: "https://www.hulu.com/live" },
         },
     },
     starzencoreclassic: {
         name: "Starz Encore Classic",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "83404",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Encore Classic (East)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "Starz Encore Classic", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
         },
     },
     starzencoreclassicp: {
         name: "Starz Encore Classic (Pacific)",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "97233",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Encore Classic (West)", url: "https://www.hulu.com/live" },
         },
     },
     starzencoreespanol: {
         name: "Starz Encore Español",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "72016",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Encore Español (East)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "Starz Encore Español", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
         },
     },
     starzencoreespanolp: {
         name: "Starz Encore Español (Pacific)",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "104730",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Encore Español (West)", url: "https://www.hulu.com/live" },
         },
     },
     starzencorefamily: {
         name: "Starz Encore Family",
-        tags: ["kids", "movies", "starz"],
+        tags: ["Kids", "Movies", "Starz"],
         stationId: "14886",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Encore Family (East)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "Starz Encore Family", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
         },
     },
     starzencorefamilyp: {
         name: "Starz Encore Family (Pacific)",
-        tags: ["kids", "movies", "starz"],
+        tags: ["Kids", "Movies", "Starz"],
         stationId: "103829",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Encore Family (West)", url: "https://www.hulu.com/live" },
         },
     },
     starzencorep: {
         name: "Starz Encore (Pacific)",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "67237",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Encore (West)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "Starz Encore West", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
         },
     },
     starzencoresuspense: {
         name: "Starz Encore Suspense",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "83076",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Encore Suspense (East)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "Starz Encore Suspense", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
         },
     },
     starzencoresuspensep: {
         name: "Starz Encore Suspense (Pacific)",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "103836",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Encore Suspense (West)", url: "https://www.hulu.com/live" },
         },
     },
     starzencorewesterns: {
         name: "Starz Encore Westerns",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "14765",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Encore Westerns (East)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "Starz Encore Westerns", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
         },
     },
     starzencorewesternsp: {
         name: "Starz Encore Westerns (Pacific)",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "103856",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Encore Westerns (West)", url: "https://www.hulu.com/live" },
         },
     },
     starzinblack: {
         name: "Starz in Black",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "67235",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ in Black (East)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "Starz in Black", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
         },
     },
     starzinblackp: {
         name: "Starz in Black (Pacific)",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "67367",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ in Black (West)", url: "https://www.hulu.com/live" },
         },
     },
     starzkids: {
         name: "Starz Kids",
-        tags: ["kids", "starz"],
+        tags: ["Kids", "Starz"],
         stationId: "57581",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Kids (East)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "Starz Kids", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
         },
     },
     starzkidsp: {
         name: "Starz Kids (Pacific)",
-        tags: ["kids", "starz"],
+        tags: ["Kids", "Starz"],
         stationId: "57583",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ Kids (West)", url: "https://www.hulu.com/live" },
         },
     },
     starzp: {
         name: "Starz (Pacific)",
-        tags: ["movies", "starz"],
+        tags: ["Movies", "Starz"],
         stationId: "34949",
-        providers: {
+        services: {
             hulu: { channelSelector: "STARZ (West)", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "Starz West", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
         },
     },
     sundancetv: {
         name: "SundanceTV",
-        tags: ["movies"],
+        tags: ["Movies"],
         pacificStationId: "78806",
         stationId: "71280",
-        providers: {
+        services: {
             cox: { channelSelector: "SundanceTV", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Sundance TV", url: "https://stream.directv.com" },
             spectrum: { channelSelector: "SundanceTV", url: "https://watch.spectrum.net/guide" },
@@ -1850,9 +1850,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     syfy: {
         name: "Syfy",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "58623",
-        providers: {
+        services: {
             cox: { channelSelector: "SYFY", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Syfy", url: "https://stream.directv.com" },
             hulu: { channelSelector: "SYFY", url: "https://www.hulu.com/live" },
@@ -1865,17 +1865,17 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     syfyp: {
         name: "Syfy (Pacific)",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "65626",
-        providers: {
+        services: {
             site: { channelSelector: "Syfy_West", url: "https://www.usanetwork.com/live" },
         },
     },
     tbs: {
         name: "TBS",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "58515",
-        providers: {
+        services: {
             cox: { channelSelector: "TBS", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "TBS", url: "https://stream.directv.com" },
             hulu: { channelSelector: "TBS (East)", url: "https://www.hulu.com/live" },
@@ -1888,18 +1888,18 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     tbsp: {
         name: "TBS (Pacific)",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "67890",
-        providers: {
+        services: {
             hulu: { channelSelector: "TBS (West)", url: "https://www.hulu.com/live" },
             site: { url: "https://www.tbs.com/watchtbs/west" },
         },
     },
     tcm: {
         name: "TCM",
-        tags: ["movies"],
+        tags: ["Movies"],
         stationId: "64312",
-        providers: {
+        services: {
             cox: { channelSelector: "TCM", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "TCM", url: "https://stream.directv.com" },
             hulu: { channelSelector: "TCM (East)", url: "https://www.hulu.com/live" },
@@ -1910,18 +1910,18 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     tcmp: {
         name: "TCM (Pacific)",
-        tags: ["movies"],
+        tags: ["Movies"],
         stationId: "64312",
         tvgShift: 3,
-        providers: {
+        services: {
             hulu: { channelSelector: "TCM (West)", url: "https://www.hulu.com/live" },
         },
     },
     tennis: {
         name: "Tennis Channel",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "60316",
-        providers: {
+        services: {
             cox: { channelSelector: "Tennis Channel", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Tennis Channel HD", url: "https://stream.directv.com" },
             spectrum: { channelSelector: "Tennis Channel", url: "https://watch.spectrum.net/guide" },
@@ -1931,9 +1931,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     tennis2: {
         name: "Tennis Channel 2",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "137752",
-        providers: {
+        services: {
             cox: { channelSelector: "T2", url: "https://watchtv.cox.com/listings" },
             hulu: { channelSelector: "Tennis Channel 2", url: "https://www.hulu.com/live" },
             sling: { channelSelector: "T2", url: "https://watch.sling.com/dashboard/grid_guide/grid_guide_a_z" },
@@ -1943,10 +1943,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     tlc: {
         name: "TLC",
-        tags: ["lifestyle"],
+        tags: ["Lifestyle"],
         pacificStationId: "79911",
         stationId: "57391",
-        providers: {
+        services: {
             cox: { channelSelector: "TLC", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "TLC", url: "https://stream.directv.com" },
             hulu: { channelSelector: "TLC", url: "https://www.hulu.com/live" },
@@ -1959,9 +1959,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     tnt: {
         name: "TNT",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "42642",
-        providers: {
+        services: {
             cox: { channelSelector: "TNT", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "TNT", url: "https://stream.directv.com" },
             hulu: { channelSelector: "TNT (East)", url: "https://www.hulu.com/live" },
@@ -1974,19 +1974,19 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     tntp: {
         name: "TNT (Pacific)",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "61340",
-        providers: {
+        services: {
             hulu: { channelSelector: "TNT (West)", url: "https://www.hulu.com/live" },
             site: { url: "https://www.tntdrama.com/watchtnt/west" },
         },
     },
     travel: {
         name: "Travel",
-        tags: ["lifestyle"],
+        tags: ["Lifestyle"],
         pacificStationId: "64525",
         stationId: "59303",
-        providers: {
+        services: {
             cox: { channelSelector: "Travel Channel", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "Travel Channel", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Travel Channel", url: "https://www.hulu.com/live" },
@@ -1999,10 +1999,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     trutv: {
         name: "truTV",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         pacificStationId: "65717",
         stationId: "64490",
-        providers: {
+        services: {
             cox: { channelSelector: "truTV", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "truTV", url: "https://stream.directv.com" },
             hulu: { channelSelector: "truTV (East)", url: "https://www.hulu.com/live" },
@@ -2015,18 +2015,18 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     trutvp: {
         name: "truTV (Pacific)",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "65717",
-        providers: {
+        services: {
             hulu: { channelSelector: "truTV (West)", url: "https://www.hulu.com/live" },
         },
     },
     tvland: {
         name: "TV Land",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         pacificStationId: "74134",
         stationId: "73541",
-        providers: {
+        services: {
             cox: { channelSelector: "TV Land", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "TV Land", url: "https://stream.directv.com" },
             hulu: { channelSelector: "TV Land", url: "https://www.hulu.com/live" },
@@ -2037,9 +2037,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     usa: {
         name: "USA Network",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "58452",
-        providers: {
+        services: {
             cox: { channelSelector: "USA", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "USA Network", url: "https://stream.directv.com" },
             hulu: { channelSelector: "USA", url: "https://www.hulu.com/live" },
@@ -2052,18 +2052,18 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     usap: {
         name: "USA Network (Pacific)",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         stationId: "74030",
-        providers: {
+        services: {
             site: { channelSelector: "USA_West", url: "https://www.usanetwork.com/live" },
         },
     },
     vh1: {
         name: "VH1",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         pacificStationId: "64634",
         stationId: "60046",
-        providers: {
+        services: {
             cox: { channelSelector: "VH1", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "VH1", url: "https://stream.directv.com" },
             hulu: { channelSelector: "VH1", url: "https://www.hulu.com/live" },
@@ -2075,10 +2075,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     vice: {
         name: "Vice",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         pacificStationId: "92375",
         stationId: "65732",
-        providers: {
+        services: {
             cox: { channelSelector: "VICE", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "VICE", url: "https://stream.directv.com" },
             hulu: { channelSelector: "Vice", url: "https://www.hulu.com/live" },
@@ -2089,9 +2089,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     weather: {
         name: "The Weather Channel",
-        tags: ["news"],
+        tags: ["News"],
         stationId: "58812",
-        providers: {
+        services: {
             cox: { channelSelector: "Weather Channel", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "The Weather Channel HD", url: "https://stream.directv.com" },
             hulu: { channelSelector: "The Weather Channel", url: "https://www.hulu.com/live" },
@@ -2102,10 +2102,10 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     wetv: {
         name: "WE tv",
-        tags: ["entertainment"],
+        tags: ["Entertainment"],
         pacificStationId: "108192",
         stationId: "59296",
-        providers: {
+        services: {
             cox: { channelSelector: "WE tv", url: "https://watchtv.cox.com/listings" },
             directv: { channelSelector: "WE TV", url: "https://stream.directv.com" },
             spectrum: { channelSelector: "WE tv", url: "https://watch.spectrum.net/guide" },
@@ -2115,9 +2115,9 @@ const BASE_CHANNEL_DEFINITIONS = {
     },
     yes: {
         name: "YES Network",
-        tags: ["sports"],
+        tags: ["Sports"],
         stationId: "63558",
-        providers: {
+        services: {
             directv: { channelSelector: "Yes Network HD", url: "https://stream.directv.com" },
             spectrum: { channelSelector: "YES Network", url: "https://watch.spectrum.net/guide" },
         },
@@ -2126,36 +2126,36 @@ const BASE_CHANNEL_DEFINITIONS = {
 /* eslint-enable @hjdhjd/blank-line-after-open-brace, @stylistic/comma-dangle, sort-keys */
 // Pacific channel auto-generation.
 /* PrismCast automatically generates Pacific timezone channel definitions to reduce manual maintenance. Generation runs at module load, producing definitions
- * that are functionally identical to hand-written ones. Generated definitions never override manually-defined ones — if a key already exists in
+ * that are functionally identical to hand-written ones. Generated definitions never override manually-defined ones - if a key already exists in
  * BASE_CHANNEL_DEFINITIONS, the manual definition takes precedence.
  *
- * Step 1 — Generate Pacific ChannelDefinitions from East entries with pacificStationId:
+ * Step 1 - Generate Pacific ChannelDefinitions from East entries with pacificStationId:
  *
  *   When an East definition has a pacificStationId field and no "{key}p" entry exists in BASE_CHANNEL_DEFINITIONS, a new Pacific ChannelDefinition is created
- *   with the Pacific station ID, " (Pacific)" appended to the name, and an empty providers map (to be filled by Step 2).
+ *   with the Pacific station ID, " (Pacific)" appended to the name, and an empty services map (to be filled by Step 2).
  *
- *   Example — adding pacificStationId to the East definition:
- *     animal: { name: "Animal Planet", pacificStationId: "68785", stationId: "57394", providers: { ... } }
+ *   Example - adding pacificStationId to the East definition:
+ *     animal: { name: "Animal Planet", pacificStationId: "68785", stationId: "57394", services: { ... } }
  *   Auto-generates:
- *     animalp: { name: "Animal Planet (Pacific)", stationId: "68785", providers: {} }
+ *     animalp: { name: "Animal Planet (Pacific)", stationId: "68785", services: {} }
  *
- * Step 2 — Merge East providers into Pacific definitions:
+ * Step 2 - Merge East services into Pacific definitions:
  *
- *   For every Pacific definition "{key}p" (manual or generated), if a corresponding East definition "{key}" exists, its providers are merged into the Pacific
- *   definition. Providers are skipped if: (a) they already exist in the Pacific definition, or (b) their channelSelector contains "East" or "West" (these have
+ *   For every Pacific definition "{key}p" (manual or generated), if a corresponding East definition "{key}" exists, its services are merged into the Pacific
+ *   definition. Services are skipped if: (a) they already exist in the Pacific definition, or (b) their channelSelector contains "East" or "West" (these have
  *   timezone-specific entries and need manual Pacific definitions with the correct West selector).
  *
- *   Example — East providers merged into auto-generated Pacific:
- *     animal's cox provider: { channelSelector: "Animal Planet", url: "https://watchtv.cox.com/listings" }
+ *   Example - East services merged into auto-generated Pacific:
+ *     animal's cox service: { channelSelector: "Animal Planet", url: "https://watchtv.cox.com/listings" }
  *   Merges into animalp as:
- *     animalp's cox provider: { channelSelector: "Animal Planet", url: "https://watchtv.cox.com/listings" }
+ *     animalp's cox service: { channelSelector: "Animal Planet", url: "https://watchtv.cox.com/listings" }
  *
  * Adding a new channel with Pacific support:
  *
  *   1. Look up both East and Pacific HD station IDs in Gracenote (http://localhost:8089/tms/stations/<search>).
- *   2. Add the East definition with both IDs: mychannel: { name: "...", pacificStationId: "PACIFIC_ID", stationId: "EAST_ID", providers: { ... } }
- *   3. The system auto-generates mychannelp (Pacific definition) and merges all compatible providers.
- *   4. If the Pacific version needs a different URL or channelSelector for specific providers, define mychannelp manually with those overrides.
+ *   2. Add the East definition with both IDs: mychannel: { name: "...", pacificStationId: "PACIFIC_ID", stationId: "EAST_ID", services: { ... } }
+ *   3. The system auto-generates mychannelp (Pacific definition) and merges all compatible services.
+ *   4. If the Pacific version needs a different URL or channelSelector for specific services, define mychannelp manually with those overrides.
  */
 function generatePacificDefinitions(definitions) {
     const eastWestPattern = /east|west/i;
@@ -2172,15 +2172,15 @@ function generatePacificDefinitions(definitions) {
         }
         generated[pacificKey] = {
             name: def.name + " (Pacific)",
-            providers: {},
+            services: {},
             stationId: def.pacificStationId,
             ...(def.tags ? { tags: def.tags } : {})
         };
     }
     // Merge base and generated for Pacific lookup in Step 2.
     const allDefinitions = { ...definitions, ...generated };
-    // Step 2: Merge East providers into Pacific definitions (both manual and generated). For manually-defined Pacific entries, we create a copy with a fresh
-    // providers map to avoid mutating the input definitions.
+    // Step 2: Merge East services into Pacific definitions (both manual and generated). For manually-defined Pacific entries, we create a copy with a fresh
+    // services map to avoid mutating the input definitions.
     for (const [pacKey, originalPacDef] of Object.entries(allDefinitions)) {
         // Only process Pacific keys (ending in "p" with a corresponding East key).
         if (!pacKey.endsWith("p")) {
@@ -2192,20 +2192,20 @@ function generatePacificDefinitions(definitions) {
         if (!eastDef) {
             continue;
         }
-        // Create a copy with a fresh providers map so we never mutate the input definitions (which are the module-level BASE_CHANNEL_DEFINITIONS).
-        const pacDef = { ...originalPacDef, providers: { ...originalPacDef.providers } };
-        // Merge each East provider into the Pacific definition, skipping existing and East/West-specific selectors.
-        for (const [slug, variant] of Object.entries(eastDef.providers)) {
-            // Don't overwrite existing Pacific providers (manual overrides take precedence).
-            if (slug in pacDef.providers) {
+        // Create a copy with a fresh services map so we never mutate the input definitions (which are the module-level BASE_CHANNEL_DEFINITIONS).
+        const pacDef = { ...originalPacDef, services: { ...originalPacDef.services } };
+        // Merge each East service into the Pacific definition, skipping existing and East/West-specific selectors.
+        for (const [slug, variant] of Object.entries(eastDef.services)) {
+            // Don't overwrite existing Pacific services (manual overrides take precedence).
+            if (slug in pacDef.services) {
                 continue;
             }
-            // Skip providers with timezone-specific channelSelectors — these need manual Pacific entries.
+            // Skip services with timezone-specific channelSelectors - these need manual Pacific entries.
             if (variant.channelSelector && eastWestPattern.test(variant.channelSelector)) {
                 continue;
             }
-            // Copy the provider variant. We spread to create a new object so the East and Pacific definitions don't share references.
-            pacDef.providers[slug] = { ...variant };
+            // Copy the service variant. We spread to create a new object so the East and Pacific definitions don't share references.
+            pacDef.services[slug] = { ...variant };
         }
         generated[pacKey] = pacDef;
     }
@@ -2213,41 +2213,41 @@ function generatePacificDefinitions(definitions) {
 }
 // Channel definition flattener.
 /* The flattener compiles nested ChannelDefinition entries into the flat ChannelMap consumed by the rest of the codebase. For each definition, it produces a
- * canonical flat entry (keyed by the definition key) and variant flat entries (keyed as "{definitionKey}-{providerSlug}").
+ * canonical flat entry (keyed by the definition key) and variant flat entries (keyed as "{definitionKey}-{serviceSlug}").
  *
  * Canonical resolution:
- * 1. If "site" exists in providers, the site provider populates the canonical entry. No "{key}-site" variant is emitted.
- * 2. Otherwise, providers are sorted alphabetically by key. The first provider populates the canonical entry. No variant key is emitted for it.
- * 3. All remaining providers produce variant entries keyed as "{key}-{slug}".
+ * 1. If "site" exists in services, the site service populates the canonical entry. No "{key}-site" variant is emitted.
+ * 2. Otherwise, services are sorted alphabetically by key. The first service populates the canonical entry. No variant key is emitted for it.
+ * 3. All remaining services produce variant entries keyed as "{key}-{slug}".
  *
- * Identity fields (name, stationId, channelNumber, tvgShift) are set on the canonical entry and inherited by all variants. Provider-specific fields
- * (channelSelector, url, profile, etc.) come from each ProviderVariant. ProviderVariant fields override ChannelDefinition fields when both are set.
+ * Identity fields (name, stationId, channelNumber, tvgShift) are set on the canonical entry and inherited by all variants. Service-specific fields
+ * (channelSelector, url, profile, etc.) come from each ServiceVariant. ServiceVariant fields override ChannelDefinition fields when both are set.
  */
 function flattenChannelDefinitions(definitions) {
     const channels = {};
     for (const [key, def] of Object.entries(definitions)) {
-        const slugs = Object.keys(def.providers).sort();
+        const slugs = Object.keys(def.services).sort();
         if (slugs.length === 0) {
             continue;
         }
-        // Determine the canonical provider: "site" wins, otherwise first alphabetically.
+        // Determine the canonical service: "site" wins, otherwise first alphabetically.
         const canonicalSlug = slugs.includes(SITE_KEY) ? SITE_KEY : slugs[0];
-        const canonicalVariant = def.providers[canonicalSlug];
-        // Build the canonical flat entry with identity fields + canonical provider's fields. pacificStationId is set only on the canonical entry — it drives Pacific
-        // auto-generation and is not meaningful on provider variants.
+        const canonicalVariant = def.services[canonicalSlug];
+        // Build the canonical flat entry with identity fields + canonical service's fields. pacificStationId is set only on the canonical entry - it drives Pacific
+        // auto-generation and is not meaningful on service variants.
         const canonicalEntry = buildFlatEntry(def, canonicalVariant);
         if (def.pacificStationId) {
             canonicalEntry.pacificStationId = def.pacificStationId;
         }
         channels[key] = canonicalEntry;
-        // Build variant entries for all non-canonical providers. Each variant gets canonicalKey set to the definition key so that buildProviderGroups can group
-        // channels by a single mechanism — scanning canonicalKey — regardless of whether the channel is predefined or user-defined.
+        // Build variant entries for all non-canonical services. Each variant gets canonicalKey set to the definition key so that buildServiceGroups can group
+        // channels by a single mechanism - scanning canonicalKey - regardless of whether the channel is predefined or user-defined.
         for (const slug of slugs) {
             if (slug === canonicalSlug) {
                 continue;
             }
             const variantKey = key + "-" + slug;
-            const variant = def.providers[slug];
+            const variant = def.services[slug];
             const variantEntry = buildFlatEntry(def, variant);
             variantEntry.canonicalKey = key;
             channels[variantKey] = variantEntry;
@@ -2256,10 +2256,10 @@ function flattenChannelDefinitions(definitions) {
     return channels;
 }
 /**
- * Builds a flat Channel entry by merging a ChannelDefinition's identity fields with a ProviderVariant's provider-specific fields. ProviderVariant fields
+ * Builds a flat Channel entry by merging a ChannelDefinition's identity fields with a ServiceVariant's service-specific fields. ServiceVariant fields
  * override ChannelDefinition fields when both are set.
  * @param def - The parent ChannelDefinition with identity fields.
- * @param variant - The ProviderVariant with provider-specific fields.
+ * @param variant - The ServiceVariant with service-specific fields.
  * @returns A flat Channel entry.
  */
 function buildFlatEntry(def, variant) {
@@ -2284,8 +2284,8 @@ function buildFlatEntry(def, variant) {
     if (def.tvgShift !== undefined) {
         entry.tvgShift = def.tvgShift;
     }
-    // Provider-specific fields from ProviderVariant.
-    const variantKeys = ["channelSelector", "dismissSelector", "profile", "provider", "scrollSelector", "scrollTarget", "scrollToBottom"];
+    // Service-specific fields from ServiceVariant.
+    const variantKeys = ["channelSelector", "dismissSelector", "profile", "scrollSelector", "scrollTarget", "scrollToBottom", "service"];
     for (const key of variantKeys) {
         if (variant[key] !== undefined) {
             entry[key] = variant[key];
@@ -2295,7 +2295,7 @@ function buildFlatEntry(def, variant) {
 }
 // Compile the nested definitions into flat output.
 // Pacific-generated entries take precedence over base entries because Step 2 of Pacific generation produces enhanced copies of manual Pacific definitions
-// (e.g., cartoonp with merged East providers). Base entries for non-Pacific keys are unaffected since they don't appear in the generated map.
+// (e.g., cartoonp with merged East services). Base entries for non-Pacific keys are unaffected since they don't appear in the generated map.
 const allDefinitions = { ...BASE_CHANNEL_DEFINITIONS, ...generatePacificDefinitions(BASE_CHANNEL_DEFINITIONS) };
 const CHANNELS = flattenChannelDefinitions(allDefinitions);
 export { CHANNELS, CHANNELS as PREDEFINED_CHANNELS };