diff --git a/osbenchmark/resources/metrics-template.json b/osbenchmark/resources/metrics-template.json
index 7943a077..622bb3f0 100644
--- a/osbenchmark/resources/metrics-template.json
+++ b/osbenchmark/resources/metrics-template.json
@@ -31,10 +31,10 @@
       "relative-time-ms": {
         "type": "float"
       },
-      "test-execution-id": {
+      "test-run-id": {
         "type": "keyword"
       },
-      "test-execution-timestamp": {
+      "test-run-timestamp": {
         "type": "date",
         "format": "basic_date_time_no_millis",
         "fields": {
diff --git a/osbenchmark/resources/results-template.json b/osbenchmark/resources/results-template.json
index 7618bf7e..d36fa0f2 100644
--- a/osbenchmark/resources/results-template.json
+++ b/osbenchmark/resources/results-template.json
@@ -23,10 +23,10 @@
       "enabled": true
     },
     "properties": {
-      "test-execution-id": {
+      "test-run-id": {
         "type": "keyword"
       },
-      "test-execution-timestamp": {
+      "test-run-timestamp": {
         "type": "date",
         "format": "basic_date_time_no_millis",
         "fields": {
diff --git a/osbenchmark/resources/test-runs-template.json b/osbenchmark/resources/test-runs-template.json
index d75666a7..c5472261 100644
--- a/osbenchmark/resources/test-runs-template.json
+++ b/osbenchmark/resources/test-runs-template.json
@@ -23,10 +23,10 @@
       "enabled": true
     },
     "properties": {
-      "test-execution-id": {
+      "test-run-id": {
         "type": "keyword"
       },
-      "test-execution-timestamp": {
+      "test-run-timestamp": {
         "type": "date",
         "format": "basic_date_time_no_millis",
         "fields": {