diff --git a/docker-compose.yaml b/docker-compose.yaml
index a840d3adc..c2177017e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -89,12 +89,12 @@ services:
     depends_on:
       - db
 
-  dataset_file_metadata:
+  dataset_worker:
     <<: *common
-    command: "manage dataset_file_metadata_worker"
+    command: "manage dataset_worker"
     restart: unless-stopped
     profiles:
-      - "dataset_file_metadata"
+      - "dataset_worker"
     depends_on:
       - db
 
diff --git a/hexa/datasets/management/commands/dataset_snapshot_worker.py b/hexa/datasets/management/commands/dataset_worker.py
similarity index 100%
rename from hexa/datasets/management/commands/dataset_snapshot_worker.py
rename to hexa/datasets/management/commands/dataset_worker.py
diff --git a/hexa/datasets/models.py b/hexa/datasets/models.py
index 628fa1079..eca44a682 100644
--- a/hexa/datasets/models.py
+++ b/hexa/datasets/models.py
@@ -296,4 +296,4 @@ class Meta:
 
 class DatasetFileMetadataJob(BaseJob):
     class Meta:
-        db_table = "datasets_filemetadatajob"
+        db_table = "datasets_filemetadata_job"
diff --git a/hexa/datasets/queue.py b/hexa/datasets/queue.py
index fd122d4d5..b3d96d8be 100644
--- a/hexa/datasets/queue.py
+++ b/hexa/datasets/queue.py
@@ -7,7 +7,7 @@
 logger = getLogger(__name__)
 
 
-def create_dataset_file_metadata_task(
+def generate_dataset_file_sample_task(
     queue: AtLeastOnceQueue, job: DatasetFileMetadataJob
 ):
     # TODO: imlpement ticket PATHWAYS-98  - extract data in background task
@@ -21,7 +21,7 @@ class DatasetsFileMetadataQueue(AtLeastOnceQueue):
 
 dataset_file_metadata_queue = DatasetsFileMetadataQueue(
     tasks={
-        "generate_file_metadata": create_dataset_file_metadata_task,
+        "generate_file_sample": generate_dataset_file_sample_task,
     },
     notify_channel="dataset_file_metadata_queue",
 )