diff --git a/x-pack/plugins/ingest_manager/server/routes/data_streams/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/data_streams/handlers.ts
index e4c860713a6f1..2c65b08a68700 100644
--- a/x-pack/plugins/ingest_manager/server/routes/data_streams/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/data_streams/handlers.ts
@@ -31,12 +31,12 @@ export const getListHandler: RequestHandler = async (context, request, response)
             must: [
               {
                 exists: {
-                  field: 'stream.namespace',
+                  field: 'dataset.namespace',
                 },
               },
               {
                 exists: {
-                  field: 'stream.dataset',
+                  field: 'dataset.name',
                 },
               },
             ],
@@ -54,19 +54,19 @@ export const getListHandler: RequestHandler = async (context, request, response)
             aggs: {
               dataset: {
                 terms: {
-                  field: 'stream.dataset',
+                  field: 'dataset.name',
                   size: 1,
                 },
               },
               namespace: {
                 terms: {
-                  field: 'stream.namespace',
+                  field: 'dataset.namespace',
                   size: 1,
                 },
               },
               type: {
                 terms: {
-                  field: 'stream.type',
+                  field: 'dataset.type',
                   size: 1,
                 },
               },
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts
index 85d4a85e245c2..ef3542b7ecffd 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts
@@ -388,12 +388,12 @@ const getIndexQuery = (templateName: string) => ({
         must: [
           {
             exists: {
-              field: 'stream.namespace',
+              field: 'dataset.namespace',
             },
           },
           {
             exists: {
-              field: 'stream.dataset',
+              field: 'dataset.name',
             },
           },
         ],