diff --git a/powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspect.java b/powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspect.java
index e2bf4f2db..87de57b1e 100644
--- a/powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspect.java
+++ b/powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspect.java
@@ -28,8 +28,8 @@
 @Aspect
 public class LambdaMetricsAspect {
     private static final String NAMESPACE = System.getenv("POWERTOOLS_METRICS_NAMESPACE");
-    public static final String TRACE_ID_PROPERTY = "XrayTraceId";
-    public static final String REQUEST_ID_PROPERTY = "AwsRequestId";
+    public static final String TRACE_ID_PROPERTY = "xray_trace_id";
+    public static final String REQUEST_ID_PROPERTY = "function_request_id";
 
     @SuppressWarnings({"EmptyMethod"})
     @Pointcut("@annotation(metrics)")
diff --git a/powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/MetricsLoggerTest.java b/powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/MetricsLoggerTest.java
index 7fc8529e7..3679b04ed 100644
--- a/powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/MetricsLoggerTest.java
+++ b/powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/MetricsLoggerTest.java
@@ -61,7 +61,7 @@ void singleMetricsCaptureUtility() {
                                 .containsEntry("Metric1", 1.0)
                                 .containsEntry("Dimension1", "Value1")
                                 .containsKey("_aws")
-                                .containsEntry("XrayTraceId", "1-5759e988-bd862e3fe1be46a994272793");
+                                .containsEntry("xray_trace_id", "1-5759e988-bd862e3fe1be46a994272793");
                     });
         }
     }
@@ -85,7 +85,7 @@ void singleMetricsCaptureUtilityWithDefaultNameSpace() {
                                 .containsEntry("Metric1", 1.0)
                                 .containsEntry("Dimension1", "Value1")
                                 .containsKey("_aws")
-                                .containsEntry("XrayTraceId", "1-5759e988-bd862e3fe1be46a994272793");
+                                .containsEntry("xray_trace_id", "1-5759e988-bd862e3fe1be46a994272793");
 
                         Map<String, Object> aws = (Map<String, Object>) logAsJson.get("_aws");
 
diff --git a/powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspectTest.java b/powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspectTest.java
index dfb67cc08..ca05c3fbe 100644
--- a/powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspectTest.java
+++ b/powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspectTest.java
@@ -89,8 +89,8 @@ public void metricsWithoutColdStart() {
                                 .containsEntry("Metric2", 1.0)
                                 .containsEntry("Dimension1", "Value1")
                                 .containsKey("_aws")
-                                .containsEntry("XrayTraceId", "1-5759e988-bd862e3fe1be46a994272793")
-                                .containsEntry("AwsRequestId", "123ABC");
+                                .containsEntry("xray_trace_id", "1-5759e988-bd862e3fe1be46a994272793")
+                                .containsEntry("function_request_id", "123ABC");
 
                         Map<String, Object> aws = (Map<String, Object>) logAsJson.get("_aws");
 
@@ -103,7 +103,7 @@ public void metricsWithoutColdStart() {
                         assertThat(logAsJson)
                                 .containsEntry("Metric1", 1.0)
                                 .containsEntry("Service", "booking")
-                                .containsEntry("AwsRequestId", "123ABC")
+                                .containsEntry("function_request_id", "123ABC")
                                 .containsKey("_aws");
                     });
         }
@@ -127,7 +127,7 @@ public void metricsWithColdStart() {
                                 .doesNotContainKey("Metric1")
                                 .containsEntry("ColdStart", 1.0)
                                 .containsEntry("Service", "booking")
-                                .containsEntry("AwsRequestId", "123ABC")
+                                .containsEntry("function_request_id", "123ABC")
                                 .containsKey("_aws");
 
                         logAsJson = readAsJson(s[1]);
@@ -136,7 +136,7 @@ public void metricsWithColdStart() {
                                 .doesNotContainKey("ColdStart")
                                 .containsEntry("Metric1", 1.0)
                                 .containsEntry("Service", "booking")
-                                .containsEntry("AwsRequestId", "123ABC")
+                                .containsEntry("function_request_id", "123ABC")
                                 .containsKey("_aws");
                     });
         }
@@ -160,7 +160,7 @@ public void noColdStartMetricsWhenColdStartDone() {
                                 .doesNotContainKey("Metric1")
                                 .containsEntry("ColdStart", 1.0)
                                 .containsEntry("Service", "booking")
-                                .containsEntry("AwsRequestId", "123ABC")
+                                .containsEntry("function_request_id", "123ABC")
                                 .containsKey("_aws");
 
                         logAsJson = readAsJson(s[1]);
@@ -169,7 +169,7 @@ public void noColdStartMetricsWhenColdStartDone() {
                                 .doesNotContainKey("ColdStart")
                                 .containsEntry("Metric1", 1.0)
                                 .containsEntry("Service", "booking")
-                                .containsEntry("AwsRequestId", "123ABC")
+                                .containsEntry("function_request_id", "123ABC")
                                 .containsKey("_aws");
 
                         logAsJson = readAsJson(s[2]);
@@ -178,7 +178,7 @@ public void noColdStartMetricsWhenColdStartDone() {
                                 .doesNotContainKey("ColdStart")
                                 .containsEntry("Metric1", 1.0)
                                 .containsEntry("Service", "booking")
-                                .containsEntry("AwsRequestId", "123ABC")
+                                .containsEntry("function_request_id", "123ABC")
                                 .containsKey("_aws");
                     });
         }
@@ -200,7 +200,7 @@ public void metricsWithStreamHandler() throws IOException {
                         assertThat(logAsJson)
                                 .containsEntry("Metric1", 1.0)
                                 .containsEntry("Service", "booking")
-                                .containsEntry("AwsRequestId", "123ABC")
+                                .containsEntry("function_request_id", "123ABC")
                                 .containsKey("_aws");
                     });
         }
@@ -277,7 +277,7 @@ public void metricsPublishedEvenHandlerThrowsException() {
                         assertThat(logAsJson)
                                 .containsEntry("CoolMetric", 1.0)
                                 .containsEntry("Service", "booking")
-                                .containsEntry("AwsRequestId", "123ABC")
+                                .containsEntry("function_request_id", "123ABC")
                                 .containsKey("_aws");
                     });
         }