diff --git a/src/agents/metadata_extractor.py b/src/agents/metadata_collector.py
similarity index 98%
rename from src/agents/metadata_extractor.py
rename to src/agents/metadata_collector.py
index 45a19102..af2a21b5 100644
--- a/src/agents/metadata_extractor.py
+++ b/src/agents/metadata_collector.py
@@ -32,9 +32,9 @@ from minio.error import S3Error
 
 load_dotenv()
 
-logger = logging.getLogger("metadata-extractor")
+logger = logging.getLogger("metadata-collector")
 
-AGENT_NAME = os.getenv("ROOM_METADATA_EXTRACTOR_AGENT_NAME", "metadata-extractor")
+AGENT_NAME = os.getenv("METADATA_COLLECTOR_AGENT_NAME", "metadata-collector")
 
 
 def prewarm(proc: JobProcess):
diff --git a/src/backend/core/api/viewsets.py b/src/backend/core/api/viewsets.py
index beb41597..b52a9b5c 100644
--- a/src/backend/core/api/viewsets.py
+++ b/src/backend/core/api/viewsets.py
@@ -44,9 +44,9 @@ from core.recording.event.exceptions import (
 )
 from core.recording.event.notification import notification_service
 from core.recording.event.parsers import get_parser
-from core.recording.services.metadata_extractor import (
-    MetadataExtractorException,
-    MetadataExtractorService,
+from core.recording.services.metadata_collector import (
+    MetadataCollectorException,
+    MetadataCollectorService,
 )
 from core.recording.worker.exceptions import (
     RecordingStartError,
@@ -341,12 +341,12 @@ class RoomViewSet(
             )
 
         if (
-            settings.ROOM_METADATA_EXTRACTOR_ENABLED
+            settings.METADATA_COLLECTOR_ENABLED
             and recording.mode == models.RecordingModeChoices.TRANSCRIPT
         ):
             try:
-                MetadataExtractorService().start(recording)
-            except MetadataExtractorException:
+                MetadataCollectorService().start(recording)
+            except MetadataCollectorException:
                 pass
 
         return drf_response.Response(
diff --git a/src/backend/core/recording/services/metadata_extractor.py b/src/backend/core/recording/services/metadata_collector.py
similarity index 86%
rename from src/backend/core/recording/services/metadata_extractor.py
rename to src/backend/core/recording/services/metadata_collector.py
index 5b6ae881..b154b5c7 100644
--- a/src/backend/core/recording/services/metadata_extractor.py
+++ b/src/backend/core/recording/services/metadata_collector.py
@@ -14,11 +14,11 @@ from core import utils
 logger = getLogger(__name__)
 
 
-class MetadataExtractorException(Exception):
+class MetadataCollectorException(Exception):
     """Wip."""
 
 
-class MetadataExtractorService:
+class MetadataCollectorService:
     """Wip."""
 
     @async_to_sync
@@ -31,7 +31,7 @@ class MetadataExtractorService:
         try:
             response = await lkapi.agent_dispatch.create_dispatch(
                 CreateAgentDispatchRequest(
-                    agent_name=settings.ROOM_METADATA_EXTRACTOR_AGENT_NAME,
+                    agent_name=settings.METADATA_COLLECTOR_AGENT_NAME,
                     room=room_id,
                     metadata=str(recording.id),
                 )
@@ -40,7 +40,7 @@ class MetadataExtractorService:
             logger.exception(
                 "Failed to create metadata extractor agent for room %s", room_id
             )
-            raise MetadataExtractorException(
+            raise MetadataCollectorException(
                 "Failed to create metadata extractor agent"
             ) from e
         finally:
@@ -50,7 +50,7 @@ class MetadataExtractorService:
 
         if not dispatch_id:
             logger.error("LiveKit response missing dispatch ID for room %s", room_id)
-            raise MetadataExtractorException(
+            raise MetadataCollectorException(
                 f"LiveKit did not return a dispatch_id for room {room_id}"
             )
 
@@ -70,7 +70,7 @@ class MetadataExtractorService:
                 (
                     d.id
                     for d in dispatches
-                    if d.agent_name == settings.ROOM_METADATA_EXTRACTOR_AGENT_NAME
+                    if d.agent_name == settings.METADATA_COLLECTOR_AGENT_NAME
                 ),
                 None,
             )
@@ -90,7 +90,7 @@ class MetadataExtractorService:
                 "Failed to stop metadata extractor agent dispatch for room %s",
                 room_name,
             )
-            raise MetadataExtractorException(
+            raise MetadataCollectorException(
                 f"Failed to stop metadata metadata extractor agent for room {room_name}"
             ) from e
         finally:
diff --git a/src/backend/core/services/livekit_events.py b/src/backend/core/services/livekit_events.py
index 40be4e66..238c1193 100644
--- a/src/backend/core/services/livekit_events.py
+++ b/src/backend/core/services/livekit_events.py
@@ -12,9 +12,9 @@ from django.conf import settings
 from livekit import api
 
 from core import models, utils
-from core.recording.services.metadata_extractor import (
-    MetadataExtractorException,
-    MetadataExtractorService,
+from core.recording.services.metadata_collector import (
+    MetadataCollectorException,
+    MetadataCollectorService,
 )
 from core.recording.services.recording_events import (
     RecordingEventsError,
@@ -179,12 +179,12 @@ class LiveKitEventsService:
             logger.exception("Failed to update room's metadata: %s", e)
 
         if (
-            settings.ROOM_METADATA_EXTRACTOR_ENABLED
+            settings.METADATA_COLLECTOR_ENABLED
             and recording.mode == models.RecordingModeChoices.TRANSCRIPT
         ):
             try:
-                MetadataExtractorService().stop(recording)
-            except MetadataExtractorException:
+                MetadataCollectorService().stop(recording)
+            except MetadataCollectorException:
                 pass
 
         if (
diff --git a/src/backend/meet/settings.py b/src/backend/meet/settings.py
index bd2e9522..3325c2c7 100755
--- a/src/backend/meet/settings.py
+++ b/src/backend/meet/settings.py
@@ -808,13 +808,13 @@ class Base(Configuration):
         environ_prefix=None,
     )
 
-    # Metadata Extractor settings
-    ROOM_METADATA_EXTRACTOR_ENABLED = values.BooleanValue(
-        False, environ_name="ROOM_METADATA_EXTRACTOR_ENABLED", environ_prefix=None
+    # Metadata collector settings
+    METADATA_COLLECTOR_ENABLED = values.BooleanValue(
+        False, environ_name="METADATA_COLLECTOR_ENABLED", environ_prefix=None
     )
-    ROOM_METADATA_EXTRACTOR_AGENT_NAME = values.Value(
-        "metadata-extractor",
-        environ_name="ROOM_METADATA_EXTRACTOR_AGENT_NAME",
+    METADATA_COLLECTOR_AGENT_NAME = values.Value(
+        "metadata-collector",
+        environ_name="METADATA_COLLECTOR_AGENT_NAME",
         environ_prefix=None,
     )
 
diff --git a/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl b/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl
index 323108df..d137262b 100644
--- a/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl
+++ b/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl
@@ -85,7 +85,7 @@ backend:
     AWS_S3_DOMAIN_REPLACE: https://minio.127.0.0.1.nip.io
     CELERY_ENABLED: True
     CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1
-    ROOM_METADATA_EXTRACTOR_ENABLED: True
+    METADATA_COLLECTOR_ENABLED: True
 
 
   migrate:
@@ -297,7 +297,7 @@ agents:
 
   command:
     - "python"
-    - "metadata_extractor.py"
+    - "metadata_collector.py"
     - "start"
 
   # Extra volume mounts to manage our local custom CA and avoid to disable ssl