diff --git a/apps/trigger/src/tasks/introspect-data/get-table-statistics-task.ts b/apps/trigger/src/tasks/introspect-data/get-table-statistics-task.ts
index 4c2fdf2a3..bc5f5cd62 100644
--- a/apps/trigger/src/tasks/introspect-data/get-table-statistics-task.ts
+++ b/apps/trigger/src/tasks/introspect-data/get-table-statistics-task.ts
@@ -354,7 +354,8 @@ export const getTableStatisticsTask: ReturnType<
         dataSourceId: payload.dataSourceId,
         databaseIdentifier: payload.table.database,
         schema: payload.table.schema,
-        databaseName: payload.table.name,
+        databaseName: payload.table.database,
+        name: payload.table.name,
         metadata,
       });
 
diff --git a/packages/database/src/queries/datasets/update-dataset-metadata.ts b/packages/database/src/queries/datasets/update-dataset-metadata.ts
index 297a665c3..fcd2a83c7 100644
--- a/packages/database/src/queries/datasets/update-dataset-metadata.ts
+++ b/packages/database/src/queries/datasets/update-dataset-metadata.ts
@@ -9,6 +9,7 @@ const InputSchema = z.object({
   databaseIdentifier: z.string().min(1, 'Database identifier is required'),
   schema: z.string().min(1, 'Schema is required'),
   databaseName: z.string().min(1, 'Database name is required'),
+  name: z.string().min(1, 'Dataset/table name is required'),
   metadata: DatasetMetadataSchema,
 });
 
@@ -34,6 +35,7 @@ export async function updateDatasetMetadata(input: UpdateDatasetMetadataInput) {
         eq(datasets.databaseIdentifier, validated.databaseIdentifier),
         eq(datasets.schema, validated.schema),
         eq(datasets.databaseName, validated.databaseName),
+        eq(datasets.name, validated.name),
         isNull(datasets.deletedAt)
       )
     )
@@ -41,7 +43,7 @@ export async function updateDatasetMetadata(input: UpdateDatasetMetadataInput) {
 
   if (!result[0]) {
     throw new Error(
-      `Dataset not found: ${validated.databaseIdentifier}.${validated.schema}.${validated.databaseName}`
+      `Dataset not found: ${validated.databaseIdentifier}.${validated.schema}.${validated.name}`
     );
   }