diff --git a/qa/logging-config/src/test/java/org/elasticsearch/common/logging/JsonLoggerTests.java b/qa/logging-config/src/test/java/org/elasticsearch/common/logging/JsonLoggerTests.java
index 9dbf1e19508d4..fd8217d4c78fb 100644
--- a/qa/logging-config/src/test/java/org/elasticsearch/common/logging/JsonLoggerTests.java
+++ b/qa/logging-config/src/test/java/org/elasticsearch/common/logging/JsonLoggerTests.java
@@ -107,8 +107,8 @@ public void testDeprecatedMessageWithoutXOpaqueId() throws IOException {
                     hasEntry("node.name", "sample-name"),
                     hasEntry("message", "deprecated message1"),
                     hasEntry("data_stream.type", "logs"),
-                    hasEntry("data_stream.datatype", "deprecation"),
-                    hasEntry("data_stream.namespace", "elasticsearch"),
+                    hasEntry("data_stream.dataset", "deprecation.elasticsearch"),
+                    hasEntry("data_stream.namespace", "default"),
                     hasEntry("ecs.version", DeprecatedMessage.ECS_VERSION),
                     hasEntry("key", "a key"),
                     not(hasKey("x-opaque-id"))
@@ -145,8 +145,8 @@ public void testDeprecatedMessage() throws Exception {
                             hasEntry("node.name", "sample-name"),
                             hasEntry("message", "deprecated message1"),
                             hasEntry("data_stream.type", "logs"),
-                            hasEntry("data_stream.datatype", "deprecation"),
-                            hasEntry("data_stream.namespace", "elasticsearch"),
+                            hasEntry("data_stream.dataset", "deprecation.elasticsearch"),
+                            hasEntry("data_stream.namespace", "default"),
                             hasEntry("ecs.version", DeprecatedMessage.ECS_VERSION),
                             hasEntry("key", "someKey"),
                             hasEntry("x-opaque-id", "someId")
diff --git a/server/src/main/java/org/elasticsearch/common/logging/DeprecatedMessage.java b/server/src/main/java/org/elasticsearch/common/logging/DeprecatedMessage.java
index 32a50b165bcf7..0b48b485d869d 100644
--- a/server/src/main/java/org/elasticsearch/common/logging/DeprecatedMessage.java
+++ b/server/src/main/java/org/elasticsearch/common/logging/DeprecatedMessage.java
@@ -34,8 +34,8 @@ public class DeprecatedMessage  {
     public static ESLogMessage of(String key, String xOpaqueId, String messagePattern, Object... args) {
         ESLogMessage esLogMessage = new ESLogMessage(messagePattern, args)
             .field("data_stream.type", "logs")
-            .field("data_stream.datatype", "deprecation")
-            .field("data_stream.namespace", "elasticsearch")
+            .field("data_stream.dataset", "deprecation.elasticsearch")
+            .field("data_stream.namespace", "default")
             .field("ecs.version", ECS_VERSION)
             .field("key", key);
 
diff --git a/x-pack/plugin/deprecation/qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/DeprecationHttpIT.java b/x-pack/plugin/deprecation/qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/DeprecationHttpIT.java
index 4fd3de1ad68fb..38b3bed7b7a1d 100644
--- a/x-pack/plugin/deprecation/qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/DeprecationHttpIT.java
+++ b/x-pack/plugin/deprecation/qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/DeprecationHttpIT.java
@@ -275,8 +275,8 @@ public void testDeprecationMessagesCanBeIndexed() throws Exception {
                             hasKey("cluster.name"),
                             hasKey("cluster.uuid"),
                             hasKey("log.logger"),
-                            hasEntry("data_stream.datatype", "deprecation"),
-                            hasEntry("data_stream.namespace", "elasticsearch"),
+                            hasEntry("data_stream.dataset", "deprecation.elasticsearch"),
+                            hasEntry("data_stream.namespace", "default"),
                             hasEntry("data_stream.type", "logs"),
                             hasEntry("ecs.version", "1.6"),
                             hasEntry("key", "deprecated_settings"),
@@ -291,8 +291,8 @@ public void testDeprecationMessagesCanBeIndexed() throws Exception {
                             hasKey("cluster.name"),
                             hasKey("cluster.uuid"),
                             hasKey("log.logger"),
-                            hasEntry("data_stream.datatype", "deprecation"),
-                            hasEntry("data_stream.namespace", "elasticsearch"),
+                            hasEntry("data_stream.dataset", "deprecation.elasticsearch"),
+                            hasEntry("data_stream.namespace", "default"),
                             hasEntry("data_stream.type", "logs"),
                             hasEntry("ecs.version", "1.6"),
                             hasEntry("key", "deprecated_route"),