diff --git a/flags/selector-flag-combined-metadata.json b/flags/selector-flag-combined-metadata.json
index cdefb50..57246f4 100644
--- a/flags/selector-flag-combined-metadata.json
+++ b/flags/selector-flag-combined-metadata.json
@@ -1,6 +1,6 @@
 {
   "flags": {
-    "metadata-flag": {
+    "combined-metadata-flag": {
       "state": "ENABLED",
       "variants": {
         "true": true,
diff --git a/flags/selector-flag-set-metadata.json b/flags/selector-flag-set-metadata.json
index e048dd2..da917cc 100644
--- a/flags/selector-flag-set-metadata.json
+++ b/flags/selector-flag-set-metadata.json
@@ -1,6 +1,6 @@
 {
   "flags": {
-    "metadata-flag": {
+    "set-metadata-flag": {
       "state": "ENABLED",
       "variants": {
         "true": true,
diff --git a/gherkin/metadata.feature b/gherkin/metadata.feature
index 597ea08..c8bb1d5 100644
--- a/gherkin/metadata.feature
+++ b/gherkin/metadata.feature
@@ -20,7 +20,7 @@ Feature: flag and flag set metadata
   Scenario: Returns flag set metadata
     Given an option "selector" of type "String" with value "rawflags/selector-flag-set-metadata.json"
     And a stable flagd provider
-    And a Boolean-flag with key "metadata-flag" and a default value "true"
+    And a Boolean-flag with key "set-metadata-flag" and a default value "true"
     When the flag was evaluated with details
     Then the resolved metadata should contain
       | key     | metadata_type | value |
@@ -32,7 +32,7 @@ Feature: flag and flag set metadata
   Scenario: Flag metadata overwrites flag set metadata
     Given an option "selector" of type "String" with value "rawflags/selector-flag-combined-metadata.json"
     And a stable flagd provider
-    And a Boolean-flag with key "metadata-flag" and a default value "true"
+    And a Boolean-flag with key "combined-metadata-flag" and a default value "true"
     When the flag was evaluated with details
     Then the resolved metadata should contain
       | key              | metadata_type | value |