refactor: rename "indicators" to "EO products" throughout

Full rename across codebase:
- app/indicators/ → app/eo_products/
- IndicatorResult → ProductResult, IndicatorMeta → ProductMeta
- IndicatorRegistry → ProductRegistry, BaseIndicator → BaseProduct
- NdviIndicator → NdviProduct (and Water, SAR, Buildup)
- indicator_id → product_id in models, APIs, and frontend
- /api/indicators → /api/eo-products
- All user-facing text updated
- Frontend page/element IDs updated
- 27 tests passing

Generated with [Claude Code](https://claude.ai/code)
via [Happy](https://happy.engineering)

Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Happy <yesreply@happy.engineering>

app/advisor.py

@@ -12,7 +12,7 @@ logger = logging.getLogger(__name__)
 _SYSTEM_PROMPT = """\
 You are a remote sensing advisor for humanitarian programme teams. Given a geographic location, provide a brief analysis recommendation.
 
-Available Earth observation indicators:
+Available EO products:
 - ndvi: Vegetation health from Sentinel-2. Detects drought, crop stress, deforestation.
 - water: Water extent (MNDWI) from Sentinel-2. Detects flooding, drought, reservoir changes.
 - sar: Radar backscatter from Sentinel-1. Detects ground surface changes, flooding, construction.
@@ -25,7 +25,7 @@ Respond with JSON only, no markdown. Structure:
   "context": "1-3 sentences about this region and recent relevant events",
   "recommended_start": "YYYY-MM-DD",
   "recommended_end": "YYYY-MM-DD",
-  "indicator_priorities": ["indicator_id", ...],
+  "product_priorities": ["indicator_id", ...],
   "reasoning": "1 sentence per indicator explaining why it is relevant here"
 }"""
 
@@ -33,7 +33,7 @@ _EMPTY_RESPONSE = {
     "context": None,
     "recommended_start": None,
     "recommended_end": None,
-    "indicator_priorities": None,
+    "product_priorities": None,
     "reasoning": None,
 }
 
@@ -85,7 +85,7 @@ async def get_aoi_advice(bbox: list[float]) -> dict:
         advice = json.loads(raw)
 
         # Validate expected keys are present
-        for key in ("context", "recommended_start", "recommended_end", "indicator_priorities", "reasoning"):
+        for key in ("context", "recommended_start", "recommended_end", "product_priorities", "reasoning"):
             if key not in advice:
                 logger.warning("AOI advisor response missing key: %s", key)
                 return _EMPTY_RESPONSE
@@ -94,10 +94,10 @@ async def get_aoi_advice(bbox: list[float]) -> dict:
         date.fromisoformat(advice["recommended_start"])
         date.fromisoformat(advice["recommended_end"])
 
-        # Filter indicator_priorities to only known indicators
+        # Filter product_priorities to only known indicators
         valid_ids = {"ndvi", "water", "sar", "buildup"}
-        advice["indicator_priorities"] = [
-            i for i in advice["indicator_priorities"] if i in valid_ids
+        advice["product_priorities"] = [
+            i for i in advice["product_priorities"] if i in valid_ids
         ]
 
         return advice

app/analysis/compound.py

@@ -1,4 +1,4 @@
-"""Cross-indicator compound signal detection."""
+"""Cross-EO-product compound signal detection."""
 from __future__ import annotations
 
 import numpy as np
@@ -15,10 +15,10 @@ def compute_overlap_pct(mask_a: np.ndarray, mask_b: np.ndarray) -> float:
     return float(intersection / min_count * 100)
 
 
-def _tag_confidence(n_indicators: int, overlap_pct: float) -> str:
-    if n_indicators >= 3 and overlap_pct > 20:
+def _tag_confidence(n_products: int, overlap_pct: float) -> str:
+    if n_products >= 3 and overlap_pct > 20:
         return "strong"
-    if n_indicators >= 2 and overlap_pct >= 10:
+    if n_products >= 2 and overlap_pct >= 10:
         return "moderate"
     return "weak"
 
@@ -28,12 +28,12 @@ def detect_compound_signals(
     pixel_area_ha: float,
     threshold: float = 2.0,
 ) -> list[CompoundSignal]:
-    """Test for compound signal patterns across indicator z-score rasters."""
+    """Test for compound signal patterns across EO product z-score rasters."""
     decline: dict[str, np.ndarray] = {}
     increase: dict[str, np.ndarray] = {}
-    for ind_id, z in zscore_rasters.items():
-        decline[ind_id] = z < -threshold
-        increase[ind_id] = z > threshold
+    for product_id, z in zscore_rasters.items():
+        decline[product_id] = z < -threshold
+        increase[product_id] = z > threshold
 
     signals: list[CompoundSignal] = []
 

app/analysis/confidence.py

@@ -1,4 +1,4 @@
-"""Three-factor confidence scoring for EO indicators.
+"""Three-factor confidence scoring for EO products.
 
 Factors: temporal coverage, baseline depth, spatial completeness.
 Observation density was removed — without per-scene metadata from

app/analysis/seasonal.py

@@ -1,4 +1,4 @@
-"""Seasonal baseline computation for EO indicators.
+"""Seasonal baseline computation for EO products.
 
 Groups multi-year monthly composites by calendar month and computes
 per-pixel and AOI-level statistics for seasonal anomaly detection.

app/api/jobs.py

@@ -21,7 +21,7 @@ async def list_jobs(email: str = Depends(get_current_user)):
             "status": j.status.value,
             "aoi_name": j.request.aoi.name,
             "created_at": j.created_at.isoformat(),
-            "indicator_count": len(j.request.indicator_ids),
+            "product_count": len(j.request.indicator_ids),
         }
         for j in jobs
     ]
@@ -45,7 +45,7 @@ async def get_job(job_id: str, email: str = Depends(get_current_user)):
         "id": job.id,
         "status": job.status.value,
         "progress": job.progress,
-        "indicator_ids": job.request.indicator_ids,
+        "product_ids": job.request.indicator_ids,
         "results": [r.model_dump() for r in job.results],
         "created_at": job.created_at.isoformat(),
         "updated_at": job.updated_at.isoformat(),

app/api/{indicators_api.py → products_api.py}

@@ -1,9 +1,9 @@
 from fastapi import APIRouter
-from app.indicators import registry
+from app.eo_products import registry
 
-router = APIRouter(prefix="/api/indicators", tags=["indicators"])
+router = APIRouter(prefix="/api/eo-products", tags=["eo-products"])
 
 
 @router.get("")
-async def list_indicators():
+async def list_products():
     return [meta.model_dump() for meta in registry.catalogue()]

app/config.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 import os
 
-# Per-indicator native resolutions (meters)
+# Per-product native resolutions (meters)
 NDVI_RESOLUTION_M: int = 10
 WATER_RESOLUTION_M: int = 20
 SAR_RESOLUTION_M: int = 10
@@ -38,7 +38,7 @@ OPENEO_CLIENT_SECRET: str | None = os.environ.get("OPENEO_CLIENT_SECRET")
 ANTHROPIC_API_KEY: str | None = os.environ.get("ANTHROPIC_API_KEY")
 
 # Expert weights for the visual overview composite score.
-# Normalized to 1.0. Indicators not selected or skipped are excluded
+# Normalized to 1.0. Products not selected or skipped are excluded
 # and weights are re-normalized.
 OVERVIEW_WEIGHTS: dict[str, float] = {
     "ndvi": 0.30,

app/database.py

@@ -6,7 +6,7 @@ from datetime import datetime, UTC
 
 import aiosqlite
 
-from app.models import Job, JobRequest, JobStatus, IndicatorResult
+from app.models import Job, JobRequest, JobStatus, ProductResult
 
 
 class Database:
@@ -80,7 +80,7 @@ class Database:
             await db.commit()
 
     async def update_job_progress(
-        self, job_id: str, indicator_id: str, indicator_status: str
+        self, job_id: str, product_id: str, indicator_status: str
     ) -> None:
         await self._ensure_init()
         now = datetime.now(UTC).isoformat()
@@ -90,14 +90,14 @@ class Database:
             )
             row = await cursor.fetchone()
             progress = json.loads(row[0])
-            progress[indicator_id] = indicator_status
+            progress[product_id] = indicator_status
             await db.execute(
                 "UPDATE jobs SET progress_json = ?, updated_at = ? WHERE id = ?",
                 (json.dumps(progress), now, job_id),
             )
             await db.commit()
 
-    async def save_job_result(self, job_id: str, result: IndicatorResult) -> None:
+    async def save_job_result(self, job_id: str, result: ProductResult) -> None:
         await self._ensure_init()
         now = datetime.now(UTC).isoformat()
         async with aiosqlite.connect(self.db_path) as db:
@@ -121,7 +121,7 @@ class Database:
             status=JobStatus(row["status"]),
             progress=json.loads(row["progress_json"]),
             results=[
-                IndicatorResult.model_validate(r)
+                ProductResult.model_validate(r)
                 for r in json.loads(row["results_json"])
             ],
             error=row["error"],

app/eo_products/__init__.py

@@ -0,0 +1,11 @@
+from app.eo_products.base import ProductRegistry
+from app.eo_products.ndvi import NdviProduct
+from app.eo_products.water import WaterProduct
+from app.eo_products.sar import SarProduct
+from app.eo_products.buildup import BuiltupProduct
+
+registry = ProductRegistry()
+registry.register(NdviProduct())
+registry.register(WaterProduct())
+registry.register(SarProduct())
+registry.register(BuiltupProduct())

app/{indicators → eo_products}/base.py

@@ -7,7 +7,7 @@ from typing import Optional
 
 import numpy as np
 
-from app.models import AOI, TimeRange, IndicatorResult, IndicatorMeta
+from app.models import AOI, TimeRange, ProductResult, ProductMeta
 
 
 @dataclass
@@ -24,7 +24,7 @@ class SpatialData:
     vmax: float | None = None
 
 
-class BaseIndicator(abc.ABC):
+class BaseProduct(abc.ABC):
     id: str
     name: str
     category: str
@@ -35,8 +35,8 @@ class BaseIndicator(abc.ABC):
     _zscore_raster: np.ndarray | None = None
     _hotspot_mask: np.ndarray | None = None
 
-    def meta(self) -> IndicatorMeta:
-        return IndicatorMeta(
+    def meta(self) -> ProductMeta:
+        return ProductMeta(
             id=self.id,
             name=self.name,
             category=self.category,
@@ -45,7 +45,7 @@ class BaseIndicator(abc.ABC):
         )
 
     @abc.abstractmethod
-    async def process(self, aoi: AOI, time_range: TimeRange, season_months: list[int] | None = None) -> IndicatorResult:
+    async def process(self, aoi: AOI, time_range: TimeRange, season_months: list[int] | None = None) -> ProductResult:
         ...
 
     uses_batch: bool = False
@@ -53,14 +53,14 @@ class BaseIndicator(abc.ABC):
     async def submit_batch(
         self, aoi: AOI, time_range: TimeRange, season_months: list[int] | None = None
     ) -> list:
-        """Submit openEO batch jobs. Override in batch indicators."""
+        """Submit openEO batch jobs. Override in batch EO products."""
         raise NotImplementedError(f"{self.id} does not support batch processing")
 
     async def harvest(
         self, aoi: AOI, time_range: TimeRange, season_months: list[int] | None = None,
         batch_jobs: list | None = None,
-    ) -> IndicatorResult:
-        """Download completed batch jobs and compute result. Override in batch indicators."""
+    ) -> ProductResult:
+        """Download completed batch jobs and compute result. Override in batch EO products."""
         raise NotImplementedError(f"{self.id} does not support batch harvesting")
 
     def get_spatial_data(self) -> Optional[SpatialData]:
@@ -128,20 +128,20 @@ class BaseIndicator(abc.ABC):
         raise FileNotFoundError(f"No GeoTIFF found in {fallback_dir}")
 
 
-class IndicatorRegistry:
+class ProductRegistry:
     def __init__(self) -> None:
-        self._indicators: dict[str, BaseIndicator] = {}
+        self._products: dict[str, BaseProduct] = {}
 
-    def register(self, indicator: BaseIndicator) -> None:
-        self._indicators[indicator.id] = indicator
+    def register(self, product: BaseProduct) -> None:
+        self._products[product.id] = product
 
-    def get(self, indicator_id: str) -> BaseIndicator:
-        if indicator_id not in self._indicators:
-            raise KeyError(f"Unknown indicator: {indicator_id}")
-        return self._indicators[indicator_id]
+    def get(self, product_id: str) -> BaseProduct:
+        if product_id not in self._products:
+            raise KeyError(f"Unknown EO product: {product_id}")
+        return self._products[product_id]
 
     def list_ids(self) -> list[str]:
-        return list(self._indicators.keys())
+        return list(self._products.keys())
 
-    def catalogue(self) -> list[IndicatorMeta]:
-        return [ind.meta() for ind in self._indicators.values()]
+    def catalogue(self) -> list[ProductMeta]:
+        return [p.meta() for p in self._products.values()]

app/{indicators → eo_products}/buildup.py

@@ -1,4 +1,4 @@
-"""Built-up / Settlement Extent Indicator — NDBI via CDSE openEO.
+"""Settlement Extent EO product — NDBI via CDSE openEO.
 
 Computes monthly NDBI composites from Sentinel-2 L2A, classifies built-up
 pixels (NDBI > 0), and tracks settlement extent change against a seasonal
@@ -23,11 +23,11 @@ from app.config import (
     ZSCORE_THRESHOLD,
     MIN_CLUSTER_PIXELS,
 )
-from app.indicators.base import BaseIndicator, SpatialData
+from app.eo_products.base import BaseProduct, SpatialData
 from app.models import (
     AOI,
     TimeRange,
-    IndicatorResult,
+    ProductResult,
     StatusLevel,
     TrendDirection,
     ConfidenceLevel,
@@ -48,7 +48,7 @@ BASELINE_YEARS = 5
 NDBI_THRESHOLD = 0.0  # NDBI > 0 = potential built-up
 
 
-class BuiltupIndicator(BaseIndicator):
+class BuiltupProduct(BaseProduct):
     id = "buildup"
     name = "Settlement Extent"
     category = "D11"
@@ -103,7 +103,7 @@ class BuiltupIndicator(BaseIndicator):
     async def harvest(
         self, aoi: AOI, time_range: TimeRange, season_months: list[int] | None = None,
         batch_jobs: list | None = None,
-    ) -> IndicatorResult:
+    ) -> ProductResult:
         """Download completed batch job results and compute built-up statistics."""
         current_job, baseline_job, true_color_job = batch_jobs
 
@@ -249,11 +249,11 @@ class BuiltupIndicator(BaseIndicator):
                 vmin=-1,
                 vmax=1,
             )
-            self._indicator_raster_path = change_map_path
+            self._product_raster_path = change_map_path
             self._render_band = 1
 
-            return IndicatorResult(
-                indicator_id=self.id,
+            return ProductResult(
+                product_id=self.id,
                 headline=headline,
                 status=status,
                 trend=trend,
@@ -318,11 +318,11 @@ class BuiltupIndicator(BaseIndicator):
                 vmin=-0.5,
                 vmax=0.5,
             )
-            self._indicator_raster_path = current_path
+            self._product_raster_path = current_path
             self._render_band = peak_band
 
-            return IndicatorResult(
-                indicator_id=self.id,
+            return ProductResult(
+                product_id=self.id,
                 headline=headline,
                 status=status,
                 trend=trend,
@@ -357,12 +357,12 @@ class BuiltupIndicator(BaseIndicator):
 
     async def process(
         self, aoi: AOI, time_range: TimeRange, season_months: list[int] | None = None
-    ) -> IndicatorResult:
+    ) -> ProductResult:
         return await self._process_openeo(aoi, time_range, season_months)
 
     async def _process_openeo(
         self, aoi: AOI, time_range: TimeRange, season_months: list[int] | None
-    ) -> IndicatorResult:
+    ) -> ProductResult:
         import asyncio
 
         conn = get_connection()
@@ -521,11 +521,11 @@ class BuiltupIndicator(BaseIndicator):
             vmin=-1,
             vmax=1,
         )
-        self._indicator_raster_path = change_map_path
+        self._product_raster_path = change_map_path
         self._render_band = 1
 
-        return IndicatorResult(
-            indicator_id=self.id,
+        return ProductResult(
+            product_id=self.id,
             headline=headline,
             status=status,
             trend=trend,

app/{indicators → eo_products}/ndvi.py

@@ -1,4 +1,4 @@
-"""NDVI Vegetation Indicator — pixel-level via CDSE openEO.
+"""Vegetation (NDVI) EO product — pixel-level via CDSE openEO.
 
 Computes monthly median NDVI composites from Sentinel-2 L2A, compares
 current period to a 5-year baseline, and classifies vegetation change
@@ -22,11 +22,11 @@ from app.config import (
     ZSCORE_THRESHOLD,
     MIN_CLUSTER_PIXELS,
 )
-from app.indicators.base import BaseIndicator, SpatialData
+from app.eo_products.base import BaseProduct, SpatialData
 from app.models import (
     AOI,
     TimeRange,
-    IndicatorResult,
+    ProductResult,
     StatusLevel,
     TrendDirection,
     ConfidenceLevel,
@@ -46,7 +46,7 @@ logger = logging.getLogger(__name__)
 BASELINE_YEARS = 5
 
 
-class NdviIndicator(BaseIndicator):
+class NdviProduct(BaseProduct):
     id = "ndvi"
     name = "Vegetation (NDVI)"
     category = "D2"
@@ -101,7 +101,7 @@ class NdviIndicator(BaseIndicator):
     async def harvest(
         self, aoi: AOI, time_range: TimeRange, season_months: list[int] | None = None,
         batch_jobs: list | None = None,
-    ) -> IndicatorResult:
+    ) -> ProductResult:
         """Download completed batch job results and compute NDVI statistics."""
         current_job, baseline_job, true_color_job = batch_jobs
 
@@ -234,13 +234,13 @@ class NdviIndicator(BaseIndicator):
             map_type="raster", label="NDVI", colormap="RdYlGn",
             vmin=-0.2, vmax=0.9,
         )
-        self._indicator_raster_path = current_path
+        self._product_raster_path = current_path
         self._true_color_path = true_color_path
         self._ndvi_peak_band = current_stats["peak_month_band"]
         self._render_band = current_stats["peak_month_band"]
 
-        return IndicatorResult(
-            indicator_id=self.id,
+        return ProductResult(
+            product_id=self.id,
             headline=headline,
             status=status,
             trend=trend,
@@ -275,12 +275,12 @@ class NdviIndicator(BaseIndicator):
 
     async def process(
         self, aoi: AOI, time_range: TimeRange, season_months: list[int] | None = None
-    ) -> IndicatorResult:
+    ) -> ProductResult:
         return await self._process_openeo(aoi, time_range, season_months)
 
     async def _process_openeo(
         self, aoi: AOI, time_range: TimeRange, season_months: list[int] | None
-    ) -> IndicatorResult:
+    ) -> ProductResult:
         import asyncio
 
         conn = get_connection()
@@ -415,13 +415,13 @@ class NdviIndicator(BaseIndicator):
             vmax=0.9,
         )
         # Store paths for the worker to use
-        self._indicator_raster_path = current_path
+        self._product_raster_path = current_path
         self._true_color_path = true_color_path
         self._ndvi_peak_band = current_stats["peak_month_band"]
         self._render_band = current_stats["peak_month_band"]
 
-        return IndicatorResult(
-            indicator_id=self.id,
+        return ProductResult(
+            product_id=self.id,
             headline=headline,
             status=status,
             trend=trend,

app/{indicators → eo_products}/sar.py

@@ -1,4 +1,4 @@
-"""SAR Backscatter Indicator — Sentinel-1 GRD via CDSE openEO.
+"""SAR Backscatter EO product — Sentinel-1 GRD via CDSE openEO.
 
 Computes monthly VV/VH median composites, detects ground surface change
 and potential flood events against a seasonal baseline using z-score
@@ -22,11 +22,11 @@ from app.config import (
     ZSCORE_THRESHOLD,
     MIN_CLUSTER_PIXELS,
 )
-from app.indicators.base import BaseIndicator, SpatialData
+from app.eo_products.base import BaseProduct, SpatialData
 from app.models import (
     AOI,
     TimeRange,
-    IndicatorResult,
+    ProductResult,
     StatusLevel,
     TrendDirection,
     ConfidenceLevel,
@@ -45,7 +45,7 @@ CHANGE_THRESHOLD_DB = 3.0  # dB change considered significant
 FLOOD_SIGMA = 2.0  # Standard deviations below baseline mean
 
 
-class SarIndicator(BaseIndicator):
+class SarProduct(BaseProduct):
     id = "sar"
     name = "SAR Backscatter"
     category = "D10"
@@ -96,7 +96,7 @@ class SarIndicator(BaseIndicator):
     async def harvest(
         self, aoi: AOI, time_range: TimeRange, season_months: list[int] | None = None,
         batch_jobs: list | None = None,
-    ) -> IndicatorResult:
+    ) -> ProductResult:
         """Download completed batch job results and compute SAR statistics."""
         current_job, baseline_job, true_color_job = batch_jobs
 
@@ -255,7 +255,7 @@ class SarIndicator(BaseIndicator):
                 vmin=-6,
                 vmax=6,
             )
-            self._indicator_raster_path = change_map_path
+            self._product_raster_path = change_map_path
             self._render_band = 1
             map_layer_path = change_map_path
 
@@ -296,7 +296,7 @@ class SarIndicator(BaseIndicator):
                 vmin=-25,
                 vmax=0,
             )
-            self._indicator_raster_path = current_path
+            self._product_raster_path = current_path
             self._render_band = 1
             map_layer_path = current_path
 
@@ -310,8 +310,8 @@ class SarIndicator(BaseIndicator):
 
         self._true_color_path = true_color_path
 
-        return IndicatorResult(
-            indicator_id=self.id,
+        return ProductResult(
+            product_id=self.id,
             headline=headline,
             status=status,
             trend=trend,
@@ -345,12 +345,12 @@ class SarIndicator(BaseIndicator):
 
     async def process(
         self, aoi: AOI, time_range: TimeRange, season_months: list[int] | None = None
-    ) -> IndicatorResult:
+    ) -> ProductResult:
         return await self._process_openeo(aoi, time_range, season_months)
 
     async def _process_openeo(
         self, aoi: AOI, time_range: TimeRange, season_months: list[int] | None
-    ) -> IndicatorResult:
+    ) -> ProductResult:
         import asyncio
 
         conn = get_connection()
@@ -524,11 +524,11 @@ class SarIndicator(BaseIndicator):
             vmin=-6,
             vmax=6,
         )
-        self._indicator_raster_path = change_map_path
+        self._product_raster_path = change_map_path
         self._render_band = 1
 
-        return IndicatorResult(
-            indicator_id=self.id,
+        return ProductResult(
+            product_id=self.id,
             headline=headline,
             status=status,
             trend=trend,

app/{indicators → eo_products}/water.py

@@ -1,4 +1,4 @@
-"""Water Bodies Indicator — pixel-level MNDWI via CDSE openEO.
+"""Water Bodies EO product — pixel-level MNDWI via CDSE openEO.
 
 Computes monthly MNDWI composites from Sentinel-2 L2A, classifies water
 pixels (MNDWI > 0), and tracks water extent change against a 5-year
@@ -22,11 +22,11 @@ from app.config import (
     ZSCORE_THRESHOLD,
     MIN_CLUSTER_PIXELS,
 )
-from app.indicators.base import BaseIndicator, SpatialData
+from app.eo_products.base import BaseProduct, SpatialData
 from app.models import (
     AOI,
     TimeRange,
-    IndicatorResult,
+    ProductResult,
     StatusLevel,
     TrendDirection,
     ConfidenceLevel,
@@ -47,7 +47,7 @@ BASELINE_YEARS = 5
 WATER_THRESHOLD = 0.0  # MNDWI > 0 = water
 
 
-class WaterIndicator(BaseIndicator):
+class WaterProduct(BaseProduct):
     id = "water"
     name = "Water Bodies"
     category = "D9"
@@ -102,7 +102,7 @@ class WaterIndicator(BaseIndicator):
     async def harvest(
         self, aoi: AOI, time_range: TimeRange, season_months: list[int] | None = None,
         batch_jobs: list | None = None,
-    ) -> IndicatorResult:
+    ) -> ProductResult:
         """Download completed batch job results and compute water statistics."""
         current_job, baseline_job, true_color_job = batch_jobs
 
@@ -247,12 +247,12 @@ class WaterIndicator(BaseIndicator):
             vmin=-0.5,
             vmax=0.5,
         )
-        self._indicator_raster_path = current_path
+        self._product_raster_path = current_path
         self._true_color_path = true_color_path
         self._render_band = current_stats["peak_water_band"]
 
-        return IndicatorResult(
-            indicator_id=self.id,
+        return ProductResult(
+            product_id=self.id,
             headline=headline,
             status=status,
             trend=trend,
@@ -289,12 +289,12 @@ class WaterIndicator(BaseIndicator):
 
     async def process(
         self, aoi: AOI, time_range: TimeRange, season_months: list[int] | None = None
-    ) -> IndicatorResult:
+    ) -> ProductResult:
         return await self._process_openeo(aoi, time_range, season_months)
 
     async def _process_openeo(
         self, aoi: AOI, time_range: TimeRange, season_months: list[int] | None
-    ) -> IndicatorResult:
+    ) -> ProductResult:
         import asyncio
 
         conn = get_connection()
@@ -429,12 +429,12 @@ class WaterIndicator(BaseIndicator):
             vmin=-0.5,
             vmax=0.5,
         )
-        self._indicator_raster_path = current_path
+        self._product_raster_path = current_path
         self._true_color_path = true_color_path
         self._render_band = current_stats["peak_water_band"]
 
-        return IndicatorResult(
-            indicator_id=self.id,
+        return ProductResult(
+            product_id=self.id,
             headline=headline,
             status=status,
             trend=trend,

app/indicators/__init__.py

@@ -1,11 +0,0 @@
-from app.indicators.base import IndicatorRegistry
-from app.indicators.ndvi import NdviIndicator
-from app.indicators.water import WaterIndicator
-from app.indicators.sar import SarIndicator
-from app.indicators.buildup import BuiltupIndicator
-
-registry = IndicatorRegistry()
-registry.register(NdviIndicator())
-registry.register(WaterIndicator())
-registry.register(SarIndicator())
-registry.register(BuiltupIndicator())

app/main.py

@@ -9,9 +9,9 @@ from fastapi.staticfiles import StaticFiles
 from fastapi import Depends
 from app.database import Database
 from app.worker import worker_loop
-from app.indicators import registry
+from app.eo_products import registry
 from app.api.jobs import router as jobs_router, init_router as init_jobs
-from app.api.indicators_api import router as indicators_router
+from app.api.products_api import router as products_router
 from app.api.auth import router as auth_router, get_current_user
 from app.advisor import get_aoi_advice
 from app.models import AoiAdviceRequest
@@ -31,7 +31,7 @@ def create_app(db_path: str = "aperture.db", run_worker: bool = False) -> FastAP
         if OPENEO_CLIENT_ID and OPENEO_CLIENT_SECRET:
             print(f"[Aperture] CDSE credentials configured (client_id={OPENEO_CLIENT_ID[:8]}...)")
         else:
-            print("[Aperture] WARNING: CDSE credentials NOT configured — EO indicators will fail")
+            print("[Aperture] WARNING: CDSE credentials NOT configured — EO products will fail")
         from app.config import ANTHROPIC_API_KEY
         if ANTHROPIC_API_KEY:
             print("[Aperture] Anthropic API key configured (AOI advisor enabled)")
@@ -60,7 +60,7 @@ def create_app(db_path: str = "aperture.db", run_worker: bool = False) -> FastAP
 
     init_jobs(db)
     app.include_router(jobs_router)
-    app.include_router(indicators_router)
+    app.include_router(products_router)
     app.include_router(auth_router)
 
     @app.post("/api/aoi-advice")
@@ -109,23 +109,23 @@ def create_app(db_path: str = "aperture.db", run_worker: bool = False) -> FastAP
             filename=f"aperture_package_{job_id}.zip",
         )
 
-    @app.get("/api/jobs/{job_id}/maps/{indicator_id}")
-    async def get_indicator_map(job_id: str, indicator_id: str, email: str = Depends(get_current_user)):
+    @app.get("/api/jobs/{job_id}/maps/{product_id}")
+    async def get_product_map(job_id: str, product_id: str, email: str = Depends(get_current_user)):
         await _verify_job_access(job_id, email)
-        map_path = _HERE.parent / "results" / job_id / f"{indicator_id}_map.png"
+        map_path = _HERE.parent / "results" / job_id / f"{product_id}_map.png"
         if not map_path.exists():
-            raise HTTPException(status_code=404, detail="Map not available for this indicator")
+            raise HTTPException(status_code=404, detail="Map not available for this EO product")
         return FileResponse(
             path=str(map_path),
             media_type="image/png",
         )
 
-    @app.get("/api/jobs/{job_id}/spatial/{indicator_id}")
-    async def get_indicator_spatial(job_id: str, indicator_id: str, email: str = Depends(get_current_user)):
+    @app.get("/api/jobs/{job_id}/spatial/{product_id}")
+    async def get_product_spatial(job_id: str, product_id: str, email: str = Depends(get_current_user)):
         await _verify_job_access(job_id, email)
-        spatial_path = _HERE.parent / "results" / job_id / f"{indicator_id}_spatial.json"
+        spatial_path = _HERE.parent / "results" / job_id / f"{product_id}_spatial.json"
         if not spatial_path.exists():
-            raise HTTPException(status_code=404, detail="Spatial data not available for this indicator")
+            raise HTTPException(status_code=404, detail="Spatial data not available for this EO product")
         import json as _json
         with open(spatial_path) as f:
             data = _json.load(f)

app/models.py

@@ -91,7 +91,7 @@ class TimeRange(BaseModel):
 class JobRequest(BaseModel):
     aoi: AOI
     time_range: TimeRange = Field(default_factory=TimeRange)
-    indicator_ids: list[str]
+    product_ids: list[str]
     email: str
     season_start: int = Field(default=1, ge=1, le=12)
     season_end: int = Field(default=12, ge=1, le=12)
@@ -107,16 +107,16 @@ class JobRequest(BaseModel):
         else:
             return list(range(self.season_start, 13)) + list(range(1, self.season_end + 1))
 
-    @field_validator("indicator_ids")
+    @field_validator("product_ids")
     @classmethod
-    def require_at_least_one_indicator(cls, v: list[str]) -> list[str]:
+    def require_at_least_one_product(cls, v: list[str]) -> list[str]:
         if len(v) == 0:
-            raise ValueError("At least one indicator must be selected")
+            raise ValueError("At least one EO product must be selected")
         return v
 
 
-class IndicatorResult(BaseModel):
-    indicator_id: str
+class ProductResult(BaseModel):
+    product_id: str
     headline: str
     status: StatusLevel
     trend: TrendDirection
@@ -140,11 +140,11 @@ class Job(BaseModel):
     created_at: datetime = Field(default_factory=datetime.utcnow)
     updated_at: datetime = Field(default_factory=datetime.utcnow)
     progress: dict[str, str] = Field(default_factory=dict)
-    results: list[IndicatorResult] = Field(default_factory=list)
+    results: list[ProductResult] = Field(default_factory=list)
     error: str | None = None
 
 
-class IndicatorMeta(BaseModel):
+class ProductMeta(BaseModel):
     id: str
     name: str
     category: str

app/outputs/charts.py

@@ -32,7 +32,7 @@ TREND_ARROWS = {
 def render_timeseries_chart(
     *,
     chart_data: dict[str, Any],
-    indicator_name: str,
+    product_name: str,
     status: StatusLevel,
     trend: TrendDirection,
     output_path: str,
@@ -45,7 +45,7 @@ def render_timeseries_chart(
     chart_data:
         Dict with keys ``"dates"`` (list of ISO strings ``YYYY-MM``) and
         ``"values"`` (list of numeric values).
-    indicator_name:
+    product_name:
         Human-readable indicator name.
     status:
         Traffic-light status – drives the line/fill colour.
@@ -67,7 +67,7 @@ def render_timeseries_chart(
             "SAR Backscatter": "VV backscatter (dB)",
             "Settlement Extent": "Built-up area (%)",
         }
-        y_label = _default_labels.get(indicator_name, "")
+        y_label = _default_labels.get(product_name, "")
 
     status_color = STATUS_COLORS[status]
     arrow = TREND_ARROWS[trend]
@@ -184,7 +184,7 @@ def render_timeseries_chart(
 
     # Title with trend arrow
     ax.set_title(
-        f"{indicator_name}  {arrow}",
+        f"{product_name}  {arrow}",
         fontsize=12, fontweight="bold", color=INK, pad=10,
     )
 

app/outputs/maps.py

@@ -8,7 +8,7 @@ import matplotlib.patches as mpatches
 import matplotlib.colors as mcolors
 import numpy as np
 
-from app.indicators.base import SpatialData
+from app.eo_products.base import SpatialData
 from app.models import AOI, StatusLevel
 
 # MERLx palette

app/outputs/narrative.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 from typing import Sequence
 
-from app.models import IndicatorResult, StatusLevel, TrendDirection
+from app.models import ProductResult, StatusLevel, TrendDirection
 
 
 # --- Per-indicator interpretation templates ---
@@ -39,24 +39,24 @@ _CROSS_PATTERNS: list[tuple[dict[str, set[StatusLevel]], str]] = [
 ]
 
 _LEAD_TEMPLATES = {
-    StatusLevel.RED: "The situation shows critical concern across one or more indicators.",
+    StatusLevel.RED: "The situation shows critical concern across one or more EO products.",
     StatusLevel.AMBER: "The situation shows elevated concern requiring monitoring.",
-    StatusLevel.GREEN: "All indicators are within normal ranges for this area and period.",
+    StatusLevel.GREEN: "All EO products are within normal ranges for this area and period.",
 }
 
 
-def get_interpretation(indicator_id: str, status: StatusLevel) -> str:
-    """Return a 1-2 sentence interpretation for the given indicator and status."""
+def get_interpretation(product_id: str, status: StatusLevel) -> str:
+    """Return a 1-2 sentence interpretation for the given EO product and status."""
     return _INTERPRETATIONS.get(
-        (indicator_id, status),
-        f"{indicator_id.replace('_', ' ').title()} status is {status.value}.",
+        (product_id, status),
+        f"{product_id.replace('_', ' ').title()} status is {status.value}.",
     )
 
 
-def generate_narrative(results: Sequence[IndicatorResult]) -> str:
+def generate_narrative(results: Sequence[ProductResult]) -> str:
     """Generate a cross-indicator narrative paragraph from indicator results."""
     if not results:
-        return "No indicator data available for narrative generation."
+        return "No EO product data available for narrative generation."
 
     parts: list[str] = []
 
@@ -72,7 +72,7 @@ def generate_narrative(results: Sequence[IndicatorResult]) -> str:
         parts.append(f"{r.headline}.")
 
     # 3. Cross-indicator connection
-    result_map = {r.indicator_id: r.status for r in results}
+    result_map = {r.product_id: r.status for r in results}
     for required, sentence in _CROSS_PATTERNS:
         if all(
             ind_id in result_map and result_map[ind_id] in allowed_statuses
@@ -94,11 +94,11 @@ def generate_compound_signals_text(signals: list) -> str:
     Returns text describing triggered compound signals.
     """
     if not signals:
-        return "No compound signals detected across the indicator set."
+        return "No compound signals detected across the EO product set."
 
     triggered = [s for s in signals if s.triggered]
     if not triggered:
-        return "No compound signals detected across the indicator set."
+        return "No compound signals detected across the EO product set."
 
     parts = []
     for s in triggered:

app/outputs/overview.py

@@ -5,7 +5,7 @@ import json
 from typing import Any, Sequence
 
 from app.config import OVERVIEW_WEIGHTS
-from app.models import IndicatorResult, StatusLevel
+from app.models import ProductResult, StatusLevel
 
 _STATUS_SCORES = {
     StatusLevel.GREEN: 100,
@@ -14,7 +14,7 @@ _STATUS_SCORES = {
 }
 
 # Display names for headline generation
-_INDICATOR_NAMES = {
+_PRODUCT_NAMES = {
     "ndvi": "vegetation decline",
     "sar": "SAR ground change",
     "water": "water extent change",
@@ -22,27 +22,27 @@ _INDICATOR_NAMES = {
 }
 
 
-def compute_composite_score(results: Sequence[IndicatorResult]) -> dict[str, Any]:
-    """Compute weighted composite score from indicator results.
+def compute_composite_score(results: Sequence[ProductResult]) -> dict[str, Any]:
+    """Compute weighted composite score from EO product results.
 
     Returns a dict with: score (0-100), status (GREEN/AMBER/RED),
-    headline, weights_used, per_indicator breakdown.
+    headline, weights_used, per_product breakdown.
     """
     if not results:
         return {
             "score": 0,
             "status": "RED",
-            "headline": "Area conditions: RED (score 0/100) — no indicators available",
+            "headline": "Area conditions: RED (score 0/100) — no EO products available",
             "weights_used": {},
-            "per_indicator": {},
+            "per_product": {},
         }
 
-    # Gather scores for completed indicators
-    per_indicator: dict[str, dict] = {}
+    # Gather scores for completed EO products
+    per_product: dict[str, dict] = {}
     active_weights: dict[str, float] = {}
 
     for result in results:
-        ind_id = result.indicator_id
+        ind_id = result.product_id
         weight = OVERVIEW_WEIGHTS.get(ind_id, 0.05)
         ind_score = _STATUS_SCORES.get(result.status, 50)
 
@@ -50,7 +50,7 @@ def compute_composite_score(results: Sequence[IndicatorResult]) -> dict[str, Any
         anomaly_penalty = min(result.anomaly_months * 3, 20)
         ind_score = max(ind_score - anomaly_penalty, 0)
 
-        per_indicator[ind_id] = {
+        per_product[ind_id] = {
             "status": result.status.value.upper(),
             "score": ind_score,
             "anomaly_months": result.anomaly_months,
@@ -65,7 +65,7 @@ def compute_composite_score(results: Sequence[IndicatorResult]) -> dict[str, Any
 
     # Weighted average
     composite = sum(
-        norm_weights[ind_id] * per_indicator[ind_id]["score"]
+        norm_weights[ind_id] * per_product[ind_id]["score"]
         for ind_id in norm_weights
     )
     composite = round(composite)
@@ -79,36 +79,36 @@ def compute_composite_score(results: Sequence[IndicatorResult]) -> dict[str, Any
         status = "RED"
 
     # Headline: identify top 1-2 drivers of concern
-    headline = _build_headline(composite, status, per_indicator, norm_weights)
+    headline = _build_headline(composite, status, per_product, norm_weights)
 
     return {
         "score": composite,
         "status": status,
         "headline": headline,
         "weights_used": {k: round(v, 3) for k, v in norm_weights.items()},
-        "per_indicator": per_indicator,
+        "per_product": per_product,
     }
 
 
 def _build_headline(
     score: int, status: str,
-    per_indicator: dict, weights: dict,
+    per_product: dict, weights: dict,
 ) -> str:
     """Build a human-readable headline identifying concern drivers."""
     if status == "GREEN":
-        return f"Area conditions: GREEN (score {score}/100) — stable across all indicators"
+        return f"Area conditions: GREEN (score {score}/100) — stable across all EO products"
 
-    # Find indicators contributing most to non-GREEN score
+    # Find EO products contributing most to non-GREEN score
     impacts = []
-    for ind_id, data in per_indicator.items():
+    for ind_id, data in per_product.items():
         if data["score"] < 100:
             impact = weights.get(ind_id, 0) * (100 - data["score"])
-            name = _INDICATOR_NAMES.get(ind_id, ind_id)
+            name = _PRODUCT_NAMES.get(ind_id, ind_id)
             impacts.append((impact, name))
 
     impacts.sort(reverse=True)
     drivers = [name for _, name in impacts[:2]]
-    driver_str = " and ".join(drivers) if drivers else "multiple indicators"
+    driver_str = " and ".join(drivers) if drivers else "multiple EO products"
 
     return f"Area conditions: {status} (score {score}/100) — {driver_str} drive concern"
 

app/outputs/report.py

@@ -22,7 +22,7 @@ from reportlab.platypus import (
 )
 from reportlab.platypus.flowables import KeepTogether
 
-from app.models import AOI, TimeRange, IndicatorResult, StatusLevel
+from app.models import AOI, TimeRange, ProductResult, StatusLevel
 
 # Display names for indicator IDs that don't title-case correctly
 _DISPLAY_NAMES: dict[str, str] = {
@@ -31,8 +31,8 @@ _DISPLAY_NAMES: dict[str, str] = {
 }
 
 
-def _indicator_label(indicator_id: str) -> str:
-    return _DISPLAY_NAMES.get(indicator_id, indicator_id.replace("_", " ").title())
+def _product_label(product_id: str) -> str:
+    return _DISPLAY_NAMES.get(product_id, product_id.replace("_", " ").title())
 
 
 # MERLx palette (as reportlab Color objects)
@@ -158,8 +158,8 @@ def _status_badge_table(status: StatusLevel, styles: dict) -> Table:
     return t
 
 
-def _indicator_block(
-    result: IndicatorResult,
+def _product_block(
+    result: ProductResult,
     styles: dict,
     map_path: str = "",
     chart_path: str = "",
@@ -232,7 +232,7 @@ def _indicator_block(
     elements.append(Paragraph(result.summary, styles["body"]))
 
     # What this means
-    interpretation = get_interpretation(result.indicator_id, result.status)
+    interpretation = get_interpretation(result.product_id, result.status)
     elements.append(Paragraph("<b>What this means</b>", styles["body_muted"]))
     elements.append(Paragraph(interpretation, styles["body"]))
 
@@ -253,7 +253,7 @@ def _indicator_block(
     return elements
 
 
-def _detect_data_sources(results: Sequence[IndicatorResult]) -> str:
+def _detect_data_sources(results: Sequence[ProductResult]) -> str:
     """Scan methodology text to auto-detect known satellite data sources."""
     known_sources = ["Sentinel-2", "Sentinel-1", "FIRMS", "CHIRPS", "MODIS", "Landsat", "VIIRS"]
     found: list[str] = []
@@ -270,11 +270,11 @@ def generate_pdf_report(
     *,
     aoi: AOI,
     time_range: TimeRange,
-    results: Sequence[IndicatorResult],
+    results: Sequence[ProductResult],
     output_path: str,
     summary_map_path: str = "",
-    indicator_map_paths: dict[str, str] | None = None,
-    indicator_hotspot_paths: dict[str, str] | None = None,
+    product_map_paths: dict[str, str] | None = None,
+    product_hotspot_paths: dict[str, str] | None = None,
     overview_score: dict | None = None,
     overview_map_path: str = "",
     compound_signals: list | None = None,
@@ -419,7 +419,7 @@ def generate_pdf_report(
     green_count = sum(1 for r in results if r.status == StatusLevel.GREEN)
     total = len(results)
     count_line = (
-        f"This report covers <b>{total}</b> indicator(s) for <b>{aoi.name}</b> "
+        f"This report covers <b>{total}</b> EO product(s) for <b>{aoi.name}</b> "
         f"over the period {time_range.start} to {time_range.end}. "
         f"<b><font color='{_RED_HEX}'>{red_count}</font></b> at RED, "
         f"<b><font color='{_AMBER_HEX}'>{amber_count}</font></b> at AMBER, "
@@ -433,7 +433,7 @@ def generate_pdf_report(
 
     # Compact summary table
     summary_header = [
-        Paragraph("<b>Indicator</b>", styles["body"]),
+        Paragraph("<b>EO Product</b>", styles["body"]),
         Paragraph("<b>Status</b>", styles["body"]),
         Paragraph("<b>Trend</b>", styles["body"]),
         Paragraph("<b>Confidence</b>", styles["body"]),
@@ -442,7 +442,7 @@ def generate_pdf_report(
     ]
     summary_rows = [summary_header]
     for result in results:
-        label = _indicator_label(result.indicator_id)
+        label = _product_label(result.product_id)
         status_cell = Paragraph(
             f'<font color="white"><b>{STATUS_LABELS[result.status]}</b></font>',
             ParagraphStyle(
@@ -507,7 +507,7 @@ def generate_pdf_report(
         else:
             story.append(Spacer(1, 2 * mm))
             story.append(Paragraph(
-                "No compound signals detected across the indicator set.",
+                "No compound signals detected across the EO product set.",
                 styles["body_muted"],
             ))
 
@@ -518,21 +518,21 @@ def generate_pdf_report(
     # ================================================================== #
     #  SECTION 3: Indicator Deep Dives                                    #
     # ================================================================== #
-    story.append(Paragraph("Indicator Detail", styles["section_heading"]))
+    story.append(Paragraph("EO Product Detail", styles["section_heading"]))
     story.append(Spacer(1, 2 * mm))
 
     for result in results:
-        indicator_label = _indicator_label(result.indicator_id)
-        map_path = (indicator_map_paths or {}).get(result.indicator_id, "")
-        hotspot_path = (indicator_hotspot_paths or {}).get(result.indicator_id, "")
+        product_label = _product_label(result.product_id)
+        map_path = (product_map_paths or {}).get(result.product_id, "")
+        hotspot_path = (product_hotspot_paths or {}).get(result.product_id, "")
 
         # Auto-detect chart path from output directory
-        chart_path = os.path.join(output_dir, f"{result.indicator_id}_chart.png")
+        chart_path = os.path.join(output_dir, f"{result.product_id}_chart.png")
         if not os.path.exists(chart_path):
             chart_path = ""
 
-        block = [Paragraph(indicator_label, styles["section_heading"])]
-        block += _indicator_block(result, styles, map_path=map_path, chart_path=chart_path, hotspot_path=hotspot_path)
+        block = [Paragraph(product_label, styles["section_heading"])]
+        block += _product_block(result, styles, map_path=map_path, chart_path=chart_path, hotspot_path=hotspot_path)
         story.append(KeepTogether(block))
 
     # ================================================================== #
@@ -544,10 +544,10 @@ def generate_pdf_report(
     # Methodology subsection
     story.append(Paragraph("Methodology", styles["section_heading"]))
     for result in results:
-        indicator_label = _indicator_label(result.indicator_id)
+        product_label = _product_label(result.product_id)
         story.append(
             Paragraph(
-                f"<b>{indicator_label}:</b> {result.methodology}",
+                f"<b>{product_label}:</b> {result.methodology}",
                 styles["body"],
             )
         )
@@ -558,7 +558,7 @@ def generate_pdf_report(
     story.append(Spacer(1, 2 * mm))
 
     conf_header = [
-        Paragraph("<b>Indicator</b>", styles["body"]),
+        Paragraph("<b>EO Product</b>", styles["body"]),
         Paragraph("<b>Temporal</b>", styles["body"]),
         Paragraph("<b>Baseline Depth</b>", styles["body"]),
         Paragraph("<b>Spatial Compl.</b>", styles["body"]),
@@ -569,7 +569,7 @@ def generate_pdf_report(
         f = result.confidence_factors
         if f:
             conf_rows.append([
-                Paragraph(_indicator_label(result.indicator_id), styles["body_muted"]),
+                Paragraph(_product_label(result.product_id), styles["body_muted"]),
                 Paragraph(f"{f.get('temporal', 0):.2f}", styles["body_muted"]),
                 Paragraph(f"{f.get('baseline_depth', 0):.2f}", styles["body_muted"]),
                 Paragraph(f"{f.get('spatial_completeness', 0):.2f}", styles["body_muted"]),
@@ -616,7 +616,7 @@ def generate_pdf_report(
         "remote sensing data. Results are intended to support humanitarian situation analysis "
         "and should be interpreted alongside ground-truth information and expert judgement. "
         "Temporal coverage, cloud contamination, and sensor resolution may affect the "
-        "reliability of individual indicators."
+        "reliability of individual EO products."
     )
     story.append(Paragraph("Disclaimer", styles["section_heading"]))
     story.append(Paragraph(disclaimer, styles["body_muted"]))

app/outputs/thresholds.py

@@ -1,8 +1,8 @@
 from app.models import StatusLevel
 
 
-def classify_indicator(indicator_id: str, metrics: dict) -> StatusLevel:
-    classifier = THRESHOLDS.get(indicator_id)
+def classify_indicator(product_id: str, metrics: dict) -> StatusLevel:
+    classifier = THRESHOLDS.get(product_id)
     if classifier is None:
         return StatusLevel.GREEN
     return classifier(metrics)

app/worker.py

@@ -6,9 +6,9 @@ import os
 import time
 import traceback
 from app.database import Database
-from app.indicators.base import IndicatorRegistry
+from app.eo_products.base import ProductRegistry
 from app.models import JobStatus
-from app.outputs.report import generate_pdf_report, _indicator_label
+from app.outputs.report import generate_pdf_report, _product_label
 from app.outputs.package import create_data_package
 from app.outputs.charts import render_timeseries_chart
 from app.outputs.maps import render_indicator_map, render_status_map
@@ -58,7 +58,7 @@ def _save_spatial_json(spatial, status_value: str, path: str) -> None:
         json.dump(obj, f)
 
 
-async def process_job(job_id: str, db: Database, registry: IndicatorRegistry) -> None:
+async def process_job(job_id: str, db: Database, registry: ProductRegistry) -> None:
     job = await db.get_job(job_id)
     if job is None:
         logger.error(f"Job {job_id} not found")
@@ -67,28 +67,28 @@ async def process_job(job_id: str, db: Database, registry: IndicatorRegistry) ->
     try:
         spatial_cache = {}
 
-        # Separate batch vs non-batch indicators
-        batch_indicators = {}
-        process_indicators = []
-        for indicator_id in job.request.indicator_ids:
-            indicator = registry.get(indicator_id)
-            if indicator.uses_batch:
-                batch_indicators[indicator_id] = indicator
+        # Separate batch vs non-batch EO products
+        batch_products = {}
+        process_products = []
+        for product_id in job.request.indicator_ids:
+            product = registry.get(product_id)
+            if product.uses_batch:
+                batch_products[product_id] = product
             else:
-                process_indicators.append((indicator_id, indicator))
+                process_products.append((product_id, product))
 
-        # -- Process batch indicators sequentially --
-        for indicator_id, indicator in batch_indicators.items():
+        # -- Process batch EO products sequentially --
+        for product_id, product in batch_products.items():
             # Submit
-            await db.update_job_progress(job_id, indicator_id, "submitting")
-            jobs = await indicator.submit_batch(
+            await db.update_job_progress(job_id, product_id, "submitting")
+            jobs = await product.submit_batch(
                 job.request.aoi,
                 job.request.time_range,
                 season_months=job.request.season_months(),
             )
             job_ids = [getattr(j, 'job_id', '?') for j in jobs]
-            print(f"[Aperture] Submitted {indicator_id} batch jobs: {job_ids}")
-            await db.update_job_progress(job_id, indicator_id, "processing on CDSE")
+            print(f"[Aperture] Submitted {product_id} batch jobs: {job_ids}")
+            await db.update_job_progress(job_id, product_id, "processing on CDSE")
 
             # Poll — exit early once first job finishes + grace period for others
             GRACE_PERIOD = 600  # 10 min grace after first job finishes
@@ -98,28 +98,28 @@ async def process_job(job_id: str, db: Database, registry: IndicatorRegistry) ->
                 elapsed = time.monotonic() - poll_start
                 statuses = [j.status() for j in jobs]
                 job_ids = [getattr(j, 'job_id', '?') for j in jobs]
-                print(f"[Aperture] Poll {indicator_id} ({elapsed:.0f}s): {list(zip(job_ids, statuses))}")
+                print(f"[Aperture] Poll {product_id} ({elapsed:.0f}s): {list(zip(job_ids, statuses))}")
 
                 if all(s == "finished" for s in statuses):
-                    logger.info("Batch jobs finished for %s", indicator_id)
+                    logger.info("Batch jobs finished for %s", product_id)
                     break
                 elif any(s in ("error", "canceled") for s in statuses):
-                    logger.warning("Batch job failed for %s: %s", indicator_id, statuses)
+                    logger.warning("Batch job failed for %s: %s", product_id, statuses)
                     break
 
                 # Track when first job finishes
                 if first_finished_at is None and any(s == "finished" for s in statuses):
                     first_finished_at = time.monotonic()
-                    print(f"[Aperture] {indicator_id}: first job finished, {GRACE_PERIOD}s grace for remaining")
+                    print(f"[Aperture] {product_id}: first job finished, {GRACE_PERIOD}s grace for remaining")
 
                 # Grace period: once any job finished, give others 10 min then harvest partial
                 if first_finished_at and (time.monotonic() - first_finished_at) >= GRACE_PERIOD:
-                    logger.info("Grace period expired for %s, harvesting partial results", indicator_id)
-                    print(f"[Aperture] {indicator_id}: grace period expired, proceeding with partial results")
+                    logger.info("Grace period expired for %s, harvesting partial results", product_id)
+                    print(f"[Aperture] {product_id}: grace period expired, proceeding with partial results")
                     break
 
                 if elapsed >= BATCH_TIMEOUT:
-                    logger.warning("Batch poll timeout after %.0fs for %s", elapsed, indicator_id)
+                    logger.warning("Batch poll timeout after %.0fs for %s", elapsed, product_id)
                     break
 
                 await asyncio.sleep(BATCH_POLL_INTERVAL)
@@ -129,7 +129,7 @@ async def process_job(job_id: str, db: Database, registry: IndicatorRegistry) ->
             if not any_finished:
                 failed_statuses = list(zip(job_ids, statuses))
                 raise RuntimeError(
-                    f"All batch jobs failed for {indicator_id}: {failed_statuses}"
+                    f"All batch jobs failed for {product_id}: {failed_statuses}"
                 )
 
             # Wrap non-finished jobs so download_results() fails fast
@@ -138,34 +138,34 @@ async def process_job(job_id: str, db: Database, registry: IndicatorRegistry) ->
                 j if s == "finished" else _SkippedJob(getattr(j, 'job_id', '?'))
                 for j, s in zip(jobs, statuses)
             ]
-            await db.update_job_progress(job_id, indicator_id, "downloading")
-            result = await indicator.harvest(
+            await db.update_job_progress(job_id, product_id, "downloading")
+            result = await product.harvest(
                 job.request.aoi,
                 job.request.time_range,
                 season_months=job.request.season_months(),
                 batch_jobs=harvest_jobs,
             )
 
-            spatial = indicator.get_spatial_data()
+            spatial = product.get_spatial_data()
             if spatial is not None:
-                spatial_cache[indicator_id] = spatial
-            print(f"[Aperture] Saving result for {indicator_id}: data_source={result.data_source}, headline={result.headline[:60]}")
+                spatial_cache[product_id] = spatial
+            print(f"[Aperture] Saving result for {product_id}: data_source={result.data_source}, headline={result.headline[:60]}")
             await db.save_job_result(job_id, result)
-            await db.update_job_progress(job_id, indicator_id, "complete")
+            await db.update_job_progress(job_id, product_id, "complete")
 
-        # -- Process non-batch indicators --
-        for indicator_id, indicator in process_indicators:
-            await db.update_job_progress(job_id, indicator_id, "processing")
-            result = await indicator.process(
+        # -- Process non-batch EO products --
+        for product_id, product in process_products:
+            await db.update_job_progress(job_id, product_id, "processing")
+            result = await product.process(
                 job.request.aoi,
                 job.request.time_range,
                 season_months=job.request.season_months(),
             )
-            spatial = indicator.get_spatial_data()
+            spatial = product.get_spatial_data()
             if spatial is not None:
-                spatial_cache[indicator_id] = spatial
+                spatial_cache[product_id] = spatial
             await db.save_job_result(job_id, result)
-            await db.update_job_progress(job_id, indicator_id, "complete")
+            await db.update_job_progress(job_id, product_id, "complete")
 
         # Generate outputs
         job = await db.get_job(job_id)
@@ -179,7 +179,7 @@ async def process_job(job_id: str, db: Database, registry: IndicatorRegistry) ->
             chart_path = os.path.join(results_dir, f"{result.indicator_id}_chart.png")
             render_timeseries_chart(
                 chart_data=result.chart_data,
-                indicator_name=_indicator_label(result.indicator_id),
+                indicator_name=_product_label(result.indicator_id),
                 status=result.status,
                 trend=result.trend,
                 output_path=chart_path,
@@ -192,10 +192,10 @@ async def process_job(job_id: str, db: Database, registry: IndicatorRegistry) ->
 
             if spatial is not None and spatial.map_type == "raster":
                 # Raster-on-true-color rendering for openEO/download indicators
-                indicator_obj = registry.get(result.indicator_id)
-                raster_path = getattr(indicator_obj, '_indicator_raster_path', None)
-                true_color_path = getattr(indicator_obj, '_true_color_path', None)
-                render_band = getattr(indicator_obj, '_render_band', 1)
+                product_obj = registry.get(result.indicator_id)
+                raster_path = getattr(product_obj, '_product_raster_path', None)
+                true_color_path = getattr(product_obj, '_true_color_path', None)
+                render_band = getattr(product_obj, '_render_band', 1)
                 from app.outputs.maps import render_raster_map
                 render_raster_map(
                     true_color_path=true_color_path,
@@ -230,17 +230,17 @@ async def process_job(job_id: str, db: Database, registry: IndicatorRegistry) ->
 
         # Generate hotspot maps for indicators with z-score data
         from app.outputs.maps import render_hotspot_map
-        indicator_hotspot_paths = {}
+        product_hotspot_paths = {}
         for result in job.results:
-            indicator_obj = registry.get(result.indicator_id)
-            zscore_raster = getattr(indicator_obj, '_zscore_raster', None)
-            hotspot_mask = getattr(indicator_obj, '_hotspot_mask', None)
-            true_color_path_ind = getattr(indicator_obj, '_true_color_path', None)
+            product_obj = registry.get(result.indicator_id)
+            zscore_raster = getattr(product_obj, '_zscore_raster', None)
+            hotspot_mask = getattr(product_obj, '_hotspot_mask', None)
+            true_color_path_ind = getattr(product_obj, '_true_color_path', None)
 
             if zscore_raster is not None and hotspot_mask is not None:
                 hotspot_path = os.path.join(results_dir, f"{result.indicator_id}_hotspot.png")
 
-                raster_path = getattr(indicator_obj, '_indicator_raster_path', None)
+                raster_path = getattr(product_obj, '_product_raster_path', None)
                 if raster_path:
                     import rasterio
                     with rasterio.open(raster_path) as src:
@@ -259,7 +259,7 @@ async def process_job(job_id: str, db: Database, registry: IndicatorRegistry) ->
                     output_path=hotspot_path,
                     label=result.indicator_id.upper(),
                 )
-                indicator_hotspot_paths[result.indicator_id] = hotspot_path
+                product_hotspot_paths[result.indicator_id] = hotspot_path
                 output_files.append(hotspot_path)
 
         # Cross-indicator compound signal detection
@@ -268,8 +268,8 @@ async def process_job(job_id: str, db: Database, registry: IndicatorRegistry) ->
 
         zscore_rasters = {}
         for result in job.results:
-            indicator_obj = registry.get(result.indicator_id)
-            z = getattr(indicator_obj, '_zscore_raster', None)
+            product_obj = registry.get(result.indicator_id)
+            z = getattr(product_obj, '_zscore_raster', None)
             if z is not None:
                 zscore_rasters[result.indicator_id] = z
 
@@ -297,7 +297,7 @@ async def process_job(job_id: str, db: Database, registry: IndicatorRegistry) ->
             )
             del resampled
 
-        # Release z-score rasters from indicator instances to free memory
+        # Release z-score rasters from EO product instances to free memory
         del zscore_rasters
         for result in job.results:
             registry.get(result.indicator_id).release_rasters()
@@ -309,11 +309,11 @@ async def process_job(job_id: str, db: Database, registry: IndicatorRegistry) ->
             output_files.append(signals_path)
 
         # Build map paths dict for PDF
-        indicator_map_paths = {}
+        product_map_paths = {}
         for result in job.results:
             mp = os.path.join(results_dir, f"{result.indicator_id}_map.png")
             if os.path.exists(mp):
-                indicator_map_paths[result.indicator_id] = mp
+                product_map_paths[result.indicator_id] = mp
 
         # Generate summary map (worst-case status)
         from app.models import StatusLevel
@@ -332,12 +332,12 @@ async def process_job(job_id: str, db: Database, registry: IndicatorRegistry) ->
         write_overview_score(overview_score, overview_score_path)
         output_files.append(overview_score_path)
 
-        # Overview map: reuse true-color from any raster indicator, or skip
+        # Overview map: reuse true-color from any raster EO product, or skip
         overview_map_path = os.path.join(results_dir, "overview_map.png")
         true_color_path = None
-        for ind_id in job.request.indicator_ids:
-            ind_obj = registry.get(ind_id)
-            tc = getattr(ind_obj, '_true_color_path', None)
+        for product_id in job.request.indicator_ids:
+            product_obj = registry.get(product_id)
+            tc = getattr(product_obj, '_true_color_path', None)
             if tc and os.path.exists(tc):
                 true_color_path = tc
                 break
@@ -360,8 +360,8 @@ async def process_job(job_id: str, db: Database, registry: IndicatorRegistry) ->
             results=job.results,
             output_path=report_path,
             summary_map_path=summary_map_path,
-            indicator_map_paths=indicator_map_paths,
-            indicator_hotspot_paths=indicator_hotspot_paths,
+            product_map_paths=product_map_paths,
+            product_hotspot_paths=product_hotspot_paths,
             overview_score=overview_score,
             overview_map_path=overview_map_path if true_color_path else "",
             compound_signals=compound_signals,
@@ -385,7 +385,7 @@ async def process_job(job_id: str, db: Database, registry: IndicatorRegistry) ->
         await db.update_job_status(job_id, JobStatus.FAILED, error=str(e))
 
 
-async def worker_loop(db: Database, registry: IndicatorRegistry) -> None:
+async def worker_loop(db: Database, registry: ProductRegistry) -> None:
     logger.info("Background worker started")
     while True:
         job = await db.get_next_queued_job()

frontend/index.html

@@ -41,8 +41,8 @@
       overflow: hidden;
     }
 
-    /* Indicators: full column */
-    #page-indicators {
+    /* Products: full column */
+    #page-products {
       height: 100vh;
       flex-direction: column;
       overflow: hidden;
@@ -107,7 +107,7 @@
 
     <!-- Sub-copy -->
     <p class="landing-sub">
-      Select your area, choose your indicators, get evidence-grade
+      Select your area, choose your EO products, get evidence-grade
       satellite analysis delivered — using free, open data.
     </p>
 
@@ -179,7 +179,7 @@
         <div class="steps">
           <span class="step-dot" data-step-page="define-area"></span>
           <span class="step-connector"></span>
-          <span class="step-dot" data-step-page="indicators"></span>
+          <span class="step-dot" data-step-page="products"></span>
           <span class="step-connector"></span>
           <span class="step-dot" data-step-page="confirm"></span>
         </div>
@@ -293,7 +293,7 @@
 
     <div class="map-sidebar-footer">
       <button id="aoi-continue-btn" class="btn btn-primary" style="width:100%;" disabled>
-        Continue to indicators
+        Continue to EO products
       </button>
     </div>
 
@@ -308,9 +308,9 @@
 
 
 <!-- ═══════════════════════════════════════════════════════════
-     PAGE 3 — CHOOSE INDICATORS
+     PAGE 3 — SELECT EO PRODUCTS
      ═══════════════════════════════════════════════════════════ -->
-<div id="page-indicators" class="page">
+<div id="page-products" class="page">
 
   <!-- Top bar -->
   <div class="indicators-topbar">
@@ -320,7 +320,7 @@
       <div class="steps">
         <span class="step-dot" data-step-page="define-area"></span>
         <span class="step-connector"></span>
-        <span class="step-dot" data-step-page="indicators"></span>
+        <span class="step-dot" data-step-page="products"></span>
         <span class="step-connector"></span>
         <span class="step-dot" data-step-page="confirm"></span>
       </div>
@@ -328,32 +328,32 @@
     <div style="display:flex; align-items:center; gap: var(--space-5);">
       <a href="#" class="topbar-link nav-my-analyses">My analyses</a>
       <a href="#" class="topbar-link nav-signout">Sign out</a>
-      <button id="indicators-back-btn" class="btn btn-secondary">Back</button>
+      <button id="products-back-btn" class="btn btn-secondary">Back</button>
     </div>
   </div>
 
   <!-- Page heading -->
   <div style="padding: var(--space-8) var(--space-12) 0; flex-shrink:0; background-color: var(--surface); border-bottom: 1px solid var(--border-light);">
-    <h1 style="font-size: var(--text-xl); font-weight: 600; margin-bottom: var(--space-2);">Choose indicators</h1>
+    <h1 style="font-size: var(--text-xl); font-weight: 600; margin-bottom: var(--space-2);">Select EO Products</h1>
     <p style="font-size: var(--text-xs); color: var(--ink-muted); margin-bottom: var(--space-8);">
-      Select the satellite-derived indicators to include in your analysis.
+      Select the satellite-derived EO products to include in your analysis.
     </p>
   </div>
 
-  <!-- Indicator grid (scrolls) -->
-  <div id="indicators-grid" class="indicators-grid"></div>
+  <!-- Products grid (scrolls) -->
+  <div id="products-grid" class="indicators-grid"></div>
 
   <!-- Sticky summary bar -->
   <div class="indicators-summary-bar">
-    <span id="indicators-summary-text" class="summary-text">
-      Select at least one indicator to continue.
+    <span id="products-summary-text" class="summary-text">
+      Select at least one EO product to continue.
     </span>
-    <button id="indicators-continue-btn" class="btn btn-primary" disabled>
+    <button id="products-continue-btn" class="btn btn-primary" disabled>
       Continue
     </button>
   </div>
 
-</div><!-- /page-indicators -->
+</div><!-- /page-products -->
 
 
 <!-- ═══════════════════════════════════════════════════════════
@@ -369,7 +369,7 @@
       <div class="steps">
         <span class="step-dot" data-step-page="define-area"></span>
         <span class="step-connector"></span>
-        <span class="step-dot" data-step-page="indicators"></span>
+        <span class="step-dot" data-step-page="products"></span>
         <span class="step-connector"></span>
         <span class="step-dot" data-step-page="confirm"></span>
       </div>
@@ -396,7 +396,7 @@
         <span id="confirm-season" class="confirm-row-value">January – December</span>
       </div>
       <div class="confirm-row">
-        <span class="confirm-row-label">Indicators</span>
+        <span class="confirm-row-label">EO Products</span>
         <span id="confirm-indicators" class="confirm-row-value">0</span>
       </div>
     </div>
@@ -431,7 +431,7 @@
         <span id="status-job-id" class="font-data text-xxs text-muted"></span>
       </div>
       <h1 class="status-title">Analysis in progress</h1>
-      <p class="status-subtitle">Your indicators are being processed. This page updates automatically.</p>
+      <p class="status-subtitle">Your EO products are being processed. This page updates automatically.</p>
     </div>
 
     <div id="status-list" class="status-list">

frontend/js/api.js

@@ -7,7 +7,7 @@ const BASE = '';  // same-origin; empty string = relative to current host
 
 /**
  * Fetch wrapper with JSON handling and error propagation.
- * @param {string} path  - Relative path, e.g. "/api/indicators"
+ * @param {string} path  - Relative path, e.g. "/api/eo-products"
  * @param {object} opts  - fetch() options (optional)
  * @returns {Promise<any>}
  */
@@ -35,21 +35,21 @@ async function apiFetch(path, opts = {}) {
   return res.json();
 }
 
-/* ── Indicators ─────────────────────────────────────────── */
+/* ── EO Products ─────────────────────────────────────────── */
 
 /**
- * List all available indicators.
+ * List all available EO products.
  * @returns {Promise<Array<{id, name, category, question, estimated_minutes}>>}
  */
-export async function listIndicators() {
-  return apiFetch('/api/indicators');
+export async function listProducts() {
+  return apiFetch('/api/eo-products');
 }
 
 /* ── Jobs ────────────────────────────────────────────────── */
 
 /**
  * Submit a new analysis job.
- * @param {{aoi, time_range, indicator_ids, email}} payload
+ * @param {{aoi, time_range, product_ids, email}} payload
  * @returns {Promise<{id, status}>}
  */
 export async function submitJob(payload) {
@@ -114,23 +114,23 @@ export function packageUrl(jobId) {
 }
 
 /**
- * Returns the URL for an indicator map PNG.
+ * Returns the URL for an EO product map PNG.
  * @param {string} jobId
- * @param {string} indicatorId
+ * @param {string} productId
  * @returns {string}
  */
-export function mapUrl(jobId, indicatorId) {
-  return `${BASE}/api/jobs/${jobId}/maps/${indicatorId}`;
+export function mapUrl(jobId, productId) {
+  return `${BASE}/api/jobs/${jobId}/maps/${productId}`;
 }
 
 /**
- * Returns the URL for indicator spatial data JSON.
+ * Returns the URL for EO product spatial data JSON.
  * @param {string} jobId
- * @param {string} indicatorId
+ * @param {string} productId
  * @returns {string}
  */
-export function spatialUrl(jobId, indicatorId) {
-  return `${BASE}/api/jobs/${jobId}/spatial/${indicatorId}`;
+export function spatialUrl(jobId, productId) {
+  return `${BASE}/api/jobs/${jobId}/spatial/${productId}`;
 }
 
 /* ── AOI Advisor ───────────────────────────────────────── */
@@ -138,7 +138,7 @@ export function spatialUrl(jobId, indicatorId) {
 /**
  * Get Claude-powered region insight for an AOI.
  * @param {Array<number>} bbox - [minLon, minLat, maxLon, maxLat]
- * @returns {Promise<{context, recommended_start, recommended_end, indicator_priorities, reasoning} | null>}
+ * @returns {Promise<{context, recommended_start, recommended_end, product_priorities, reasoning} | null>}
  */
 export async function getAoiAdvice(bbox) {
   try {

frontend/js/app.js

@@ -5,7 +5,7 @@
 
 import { submitJob, getJob, requestMagicLink, verifyToken, listJobs, getAoiAdvice } from './api.js';
 import { initAoiMap, setAoiSize, geocode, initResultsMap } from './map.js';
-import { initIndicators, getSelectedIds } from './indicators.js';
+import { initProducts, getSelectedIds } from './products.js';
 import { renderResults } from './results.js';
 
 /* ── Application State ───────────────────────────────────── */
@@ -16,7 +16,7 @@ const state = {
   timeRange: null,  // { start, end }
   seasonStart: 1,   // 1-12
   seasonEnd: 12,    // 1-12
-  indicators: [],   // string[]
+  products: [],     // string[]
   jobId: null,      // string
   jobData: null,    // full job response
 };
@@ -44,7 +44,7 @@ function clearSession() {
 
 /* ── Router ──────────────────────────────────────────────── */
 
-const PAGES = ['landing', 'login', 'define-area', 'indicators', 'confirm', 'status', 'results', 'history'];
+const PAGES = ['landing', 'login', 'define-area', 'products', 'confirm', 'status', 'results', 'history'];
 let _currentPage = null;
 let _pollTimer = null;
 
@@ -55,7 +55,7 @@ function navigate(pageId) {
   }
 
   // Auth guard — redirect to login if not authenticated
-  const AUTH_REQUIRED = ['define-area', 'indicators', 'confirm', 'status', 'results', 'history'];
+  const AUTH_REQUIRED = ['define-area', 'products', 'confirm', 'status', 'results', 'history'];
   if (AUTH_REQUIRED.includes(pageId) && !state.session) {
     pageId = 'login';
   }
@@ -79,7 +79,7 @@ const pageSetup = {
   'landing': setupLanding,
   'login': setupLogin,
   'define-area': setupDefineArea,
-  'indicators': setupIndicators,
+  'products': setupProducts,
   'confirm': setupConfirm,
   'status': setupStatus,
   'results': setupResults,
@@ -286,29 +286,29 @@ function setupDefineArea() {
     state.seasonStart = parseInt(document.getElementById('season-start').value);
     state.seasonEnd = parseInt(document.getElementById('season-end').value);
 
-    navigate('indicators');
+    navigate('products');
   }, { once: true });
 }
 
-/* Indicators ──────────────────────────────────────────────── */
+/* Products ──────────────────────────────────────────────── */
 
-function setupIndicators() {
-  updateSteps('indicators');
+function setupProducts() {
+  updateSteps('products');
 
-  const gridEl       = document.getElementById('indicators-grid');
-  const summaryEl    = document.getElementById('indicators-summary-text');
-  const continueBtn  = document.getElementById('indicators-continue-btn');
-  const backBtn      = document.getElementById('indicators-back-btn');
+  const gridEl       = document.getElementById('products-grid');
+  const summaryEl    = document.getElementById('products-summary-text');
+  const continueBtn  = document.getElementById('products-continue-btn');
+  const backBtn      = document.getElementById('products-back-btn');
 
   backBtn.addEventListener('click', () => navigate('define-area'), { once: true });
 
   continueBtn.addEventListener('click', () => {
-    state.indicators = getSelectedIds();
+    state.products = getSelectedIds();
     navigate('confirm');
   }, { once: true });
 
-  initIndicators(gridEl, summaryEl, continueBtn, (ids) => {
-    state.indicators = ids;
+  initProducts(gridEl, summaryEl, continueBtn, (ids) => {
+    state.products = ids;
   });
 }
 
@@ -322,7 +322,7 @@ function setupConfirm() {
   document.getElementById('confirm-area-name').textContent    = aoi.name || '—';
   document.getElementById('confirm-period-start').textContent = state.timeRange?.start || '—';
   document.getElementById('confirm-period-end').textContent   = state.timeRange?.end   || '—';
-  document.getElementById('confirm-indicators').textContent   = state.indicators.length;
+  document.getElementById('confirm-indicators').textContent   = state.products.length;
 
   const monthNames = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'];
   const seasonText = `${monthNames[state.seasonStart - 1]} – ${monthNames[state.seasonEnd - 1]}`;
@@ -338,7 +338,7 @@ function setupConfirm() {
   const backBtn   = document.getElementById('confirm-back-btn');
   const submitBtn = document.getElementById('confirm-submit-btn');
 
-  backBtn.addEventListener('click', () => navigate('indicators'), { once: true });
+  backBtn.addEventListener('click', () => navigate('products'), { once: true });
 
   submitBtn.addEventListener('click', async () => {
     const email = document.getElementById('confirm-email').value.trim();
@@ -356,7 +356,7 @@ function setupConfirm() {
         start: state.timeRange.start,
         end:   state.timeRange.end,
       },
-      indicator_ids: state.indicators,
+      product_ids: state.products,
       email,
       season_start: state.seasonStart,
       season_end: state.seasonEnd,
@@ -415,7 +415,7 @@ function setupStatus() {
 
 function renderStatusList(listEl, job) {
   const progress = job.progress || {};
-  const allIds = job.indicator_ids || Object.keys(progress);
+  const allIds = job.product_ids || Object.keys(progress);
 
   if (!allIds.length) {
     listEl.innerHTML = '<div class="status-item"><span class="status-dot status-dot-queued"></span><span class="status-item-name text-muted">Queued…</span></div>';
@@ -500,7 +500,7 @@ function setupHistory() {
           <span class="history-card-date">${_esc(dateStr)}</span>
           <span><span class="badge badge-${job.status}">${_esc(job.status)}</span></span>
         </div>
-        <div class="history-card-indicators">${job.indicator_count} indicator${job.indicator_count !== 1 ? 's' : ''}</div>
+        <div class="history-card-indicators">${job.indicator_count} EO product${job.indicator_count !== 1 ? 's' : ''}</div>
       `;
       card.addEventListener('click', async () => {
         state.jobId = job.id;
@@ -552,7 +552,7 @@ function wireTopbarLinks() {
 
 /* ── Steps Indicator ─────────────────────────────────────── */
 
-const STEP_PAGES = ['define-area', 'indicators', 'confirm'];
+const STEP_PAGES = ['define-area', 'products', 'confirm'];
 
 function updateSteps(currentPage) {
   const dots = document.querySelectorAll('[data-step-page]');

frontend/js/{indicators.js → products.js}

@@ -1,42 +1,42 @@
 /**
- * Aperture — Indicator Card Selection
- * Renders and manages the indicator grid on the Choose Indicators page.
+ * Aperture — EO Product Card Selection
+ * Renders and manages the product grid on the Select EO Products page.
  */
 
-import { listIndicators } from './api.js';
+import { listProducts } from './api.js';
 
-let _indicators = [];
+let _products = [];
 let _selected = new Set();
 let _onSelectionChange = null; // callback(selectedIds[])
 
 /**
- * Load indicators from the API and render cards into the grid element.
- * @param {HTMLElement} gridEl       - Container for indicator cards
+ * Load EO products from the API and render cards into the grid element.
+ * @param {HTMLElement} gridEl       - Container for product cards
  * @param {HTMLElement} summaryEl    - Summary bar text element
  * @param {HTMLElement} continueBtn  - Continue button to enable/disable
- * @param {function}    onChange     - Called with selected indicator IDs array
+ * @param {function}    onChange     - Called with selected product IDs array
  */
-export async function initIndicators(gridEl, summaryEl, continueBtn, onChange) {
+export async function initProducts(gridEl, summaryEl, continueBtn, onChange) {
   _onSelectionChange = onChange;
   _selected.clear();
   _updateSummary(summaryEl, continueBtn);
 
   // Show loading state
-  gridEl.innerHTML = '<p class="text-muted text-sm" style="grid-column:1/-1; padding: 20px 0;">Loading indicators…</p>';
+  gridEl.innerHTML = '<p class="text-muted text-sm" style="grid-column:1/-1; padding: 20px 0;">Loading EO products…</p>';
 
   try {
-    _indicators = await listIndicators();
+    _products = await listProducts();
   } catch (err) {
-    gridEl.innerHTML = `<p class="text-muted text-sm" style="grid-column:1/-1; padding: 20px 0;">Failed to load indicators: ${err.message}</p>`;
+    gridEl.innerHTML = `<p class="text-muted text-sm" style="grid-column:1/-1; padding: 20px 0;">Failed to load EO products: ${err.message}</p>`;
     return;
   }
 
   gridEl.innerHTML = '';
 
-  for (const ind of _indicators) {
-    const card = _buildCard(ind);
+  for (const product of _products) {
+    const card = _buildCard(product);
     card.addEventListener('click', () => {
-      _toggleCard(ind.id, card);
+      _toggleCard(product.id, card);
       _updateSummary(summaryEl, continueBtn);
     });
     gridEl.appendChild(card);
@@ -44,7 +44,7 @@ export async function initIndicators(gridEl, summaryEl, continueBtn, onChange) {
 }
 
 /**
- * Returns the currently selected indicator IDs.
+ * Returns the currently selected product IDs.
  * @returns {string[]}
  */
 export function getSelectedIds() {
@@ -53,20 +53,20 @@ export function getSelectedIds() {
 
 /* ── Internal helpers ────────────────────────────────────── */
 
-function _buildCard(ind) {
+function _buildCard(product) {
   const card = document.createElement('div');
   card.className = 'indicator-card';
-  card.dataset.id = ind.id;
+  card.dataset.id = product.id;
   card.setAttribute('role', 'checkbox');
   card.setAttribute('aria-checked', 'false');
   card.setAttribute('tabindex', '0');
 
   card.innerHTML = `
-    <div class="indicator-card-name">${_esc(ind.name)}</div>
-    <div class="indicator-card-question">${_esc(ind.question)}</div>
+    <div class="indicator-card-name">${_esc(product.name)}</div>
+    <div class="indicator-card-question">${_esc(product.question)}</div>
     <div class="indicator-card-meta">
-      <span class="indicator-card-category">${_esc(ind.category)}</span>
-      <span class="indicator-card-time font-data">~${ind.estimated_minutes} min</span>
+      <span class="indicator-card-category">${_esc(product.category)}</span>
+      <span class="indicator-card-time font-data">~${product.estimated_minutes} min</span>
     </div>
   `;
 
@@ -97,15 +97,15 @@ function _toggleCard(id, cardEl) {
 
 function _updateSummary(summaryEl, continueBtn) {
   const count = _selected.size;
-  const totalMinutes = _indicators
-    .filter(i => _selected.has(i.id))
-    .reduce((sum, i) => sum + i.estimated_minutes, 0);
+  const totalMinutes = _products
+    .filter(p => _selected.has(p.id))
+    .reduce((sum, p) => sum + p.estimated_minutes, 0);
 
   if (count === 0) {
-    summaryEl.innerHTML = 'Select at least one indicator to continue.';
+    summaryEl.innerHTML = 'Select at least one EO product to continue.';
     continueBtn.disabled = true;
   } else {
-    summaryEl.innerHTML = `<strong>${count} indicator${count !== 1 ? 's' : ''} selected</strong> — estimated delivery: ~${totalMinutes} minute${totalMinutes !== 1 ? 's' : ''}`;
+    summaryEl.innerHTML = `<strong>${count} EO product${count !== 1 ? 's' : ''} selected</strong> — estimated delivery: ~${totalMinutes} minute${totalMinutes !== 1 ? 's' : ''}`;
     continueBtn.disabled = false;
   }
 }

frontend/js/results.js

@@ -1,6 +1,6 @@
 /**
  * Aperture — Results Dashboard
- * Renders indicator result cards and manages the active-card state.
+ * Renders EO product result cards and manages the active-card state.
  */
 
 import { reportUrl, packageUrl, spatialUrl, authDownload, authHeaders } from './api.js';
@@ -13,7 +13,7 @@ let _currentBbox = null;
  * Populate the results panel with indicator result cards.
  * @param {HTMLElement} panelEl  - Scrollable panel container
  * @param {HTMLElement} footerEl - Footer with download links
- * @param {Array}       results  - Array of IndicatorResult objects
+ * @param {Array}       results  - Array of ProductResult objects
  * @param {string}      jobId    - Job ID (for download links)
  * @param {Array<number>} bbox   - AOI bounding box for map overlays
  */
@@ -39,7 +39,7 @@ export function renderResults(panelEl, footerEl, results, jobId, bbox) {
   const first = panelEl.querySelector('.result-card');
   if (first) {
     first.classList.add('active');
-    _showMapForIndicator(first.dataset.indicatorId);
+    _showMapForProduct(first.dataset.productId);
   }
 
   // Download buttons (use fetch + blob to send auth headers)
@@ -64,7 +64,7 @@ export function renderResults(panelEl, footerEl, results, jobId, bbox) {
 function _buildResultCard(result) {
   const card = document.createElement('div');
   card.className = 'result-card';
-  card.dataset.indicatorId = result.indicator_id;
+  card.dataset.productId = result.product_id;
   card.setAttribute('role', 'button');
   card.setAttribute('tabindex', '0');
 
@@ -76,7 +76,7 @@ function _buildResultCard(result) {
 
   card.innerHTML = `
     <div class="result-card-header">
-      <span class="result-card-name">${_esc(result.indicator_id)}</span>
+      <span class="result-card-name">${_esc(result.product_id)}</span>
       ${statusBadge}
     </div>
     ${placeholderBadge}
@@ -89,7 +89,7 @@ function _buildResultCard(result) {
     const panel = card.closest('.results-panel-body');
     panel.querySelectorAll('.result-card').forEach(c => c.classList.remove('active'));
     card.classList.add('active');
-    _showMapForIndicator(result.indicator_id);
+    _showMapForProduct(result.product_id);
   });
 
   card.addEventListener('keydown', (e) => {
@@ -129,9 +129,9 @@ function _esc(str) {
     .replace(/"/g, '&quot;');
 }
 
-function _showMapForIndicator(indicatorId) {
+function _showMapForProduct(productId) {
   if (!_currentJobId || !_currentBbox) return;
-  const url = spatialUrl(_currentJobId, indicatorId);
+  const url = spatialUrl(_currentJobId, productId);
   fetch(url, { headers: authHeaders() })
     .then(res => {
       if (res.ok) return res.json();

tests/conftest.py

@@ -41,13 +41,13 @@ def synthetic_monthly_raster(tmp_path):
 
 
 @pytest.fixture
-def mock_indicator_result():
-    """Factory for IndicatorResult with sensible defaults."""
-    from app.models import IndicatorResult, StatusLevel, TrendDirection, ConfidenceLevel
+def mock_product_result():
+    """Factory for ProductResult with sensible defaults."""
+    from app.models import ProductResult, StatusLevel, TrendDirection, ConfidenceLevel
 
     def _make(**overrides):
         defaults = dict(
-            indicator_id="ndvi",
+            product_id="ndvi",
             headline="Test headline",
             status=StatusLevel.GREEN,
             trend=TrendDirection.STABLE,
@@ -64,6 +64,6 @@ def mock_indicator_result():
             confidence_factors={},
         )
         defaults.update(overrides)
-        return IndicatorResult(**defaults)
+        return ProductResult(**defaults)
 
     return _make

tests/test_models.py

@@ -1,10 +1,10 @@
 """Tests for updated data models."""
-from app.models import IndicatorResult, StatusLevel, TrendDirection, ConfidenceLevel
+from app.models import ProductResult, StatusLevel, TrendDirection, ConfidenceLevel
 
 
 def test_indicator_result_new_fields():
-    result = IndicatorResult(
-        indicator_id="ndvi",
+    result = ProductResult(
+        product_id="ndvi",
         headline="Test",
         status=StatusLevel.AMBER,
         trend=TrendDirection.DETERIORATING,
@@ -31,8 +31,8 @@ def test_indicator_result_new_fields():
 
 
 def test_indicator_result_defaults_for_new_fields():
-    result = IndicatorResult(
-        indicator_id="ndvi",
+    result = ProductResult(
+        product_id="ndvi",
         headline="Test",
         status=StatusLevel.GREEN,
         trend=TrendDirection.STABLE,

tests/test_narrative.py

@@ -2,13 +2,13 @@
 import pytest
 
 
-def test_generate_narrative_includes_zscore_context(mock_indicator_result):
+def test_generate_narrative_includes_zscore_context(mock_product_result):
     """Narrative references z-score context when anomaly data is present."""
     from app.outputs.narrative import generate_narrative
 
     results = [
-        mock_indicator_result(
-            indicator_id="ndvi",
+        mock_product_result(
+            product_id="ndvi",
             status="amber",
             headline="Vegetation decline (z=-1.8)",
             z_score_current=-1.8,