diff --git a/code/Test_definitions/geofencing-subscriptions.feature b/code/Test_definitions/geofencing-subscriptions.feature
index c5f45892..ed719595 100644
--- a/code/Test_definitions/geofencing-subscriptions.feature
+++ b/code/Test_definitions/geofencing-subscriptions.feature
@@ -168,11 +168,11 @@ Feature: Camara Geofencing Subscriptions API, vwip - Operations on subscriptions
     And the response property "$.message" contains a user friendly text
 
     Examples:
-      | device_identifier          | oas_spec_schema                             |
-      | $.config.subscriptionDetail.device.phoneNumber       | /components/schemas/PhoneNumber             |
-      | $.config.subscriptionDetail.device.ipv4Address       | /components/schemas/DeviceIpv4Addr          |
-      | $.config.subscriptionDetail.device.ipv6Address       | /components/schemas/DeviceIpv6Address       |
-      | $.config.subscriptionDetail.device.networkIdentifier | /components/schemas/NetworkAccessIdentifier |
+      | device_identifier                                          | oas_spec_schema                             |
+      | $.config.subscriptionDetail.device.phoneNumber             | /components/schemas/PhoneNumber             |
+      | $.config.subscriptionDetail.device.ipv4Address             | /components/schemas/DeviceIpv4Addr          |
+      | $.config.subscriptionDetail.device.ipv6Address             | /components/schemas/DeviceIpv6Address       |
+      | $.config.subscriptionDetail.device.networkAccessIdentifier | /components/schemas/NetworkAccessIdentifier |
 
  # This scenario may happen e.g. with 2-legged access tokens, which do not identify a single device.
   @geofencing_subscriptions_C01.03_device_not_found
diff --git a/code/Test_definitions/location-retrieval.feature b/code/Test_definitions/location-retrieval.feature
index 1a1878ae..970315ac 100644
--- a/code/Test_definitions/location-retrieval.feature
+++ b/code/Test_definitions/location-retrieval.feature
@@ -82,11 +82,11 @@ Feature: CAMARA Device location retrieval API, vwip - Operation retrieveLocation
     And the response property "$.message" contains a user friendly text
 
     Examples:
-      | device_identifier          | oas_spec_schema                             |
-      | $.device.phoneNumber       | /components/schemas/PhoneNumber             |
-      | $.device.ipv4Address       | /components/schemas/DeviceIpv4Addr          |
-      | $.device.ipv6Address       | /components/schemas/DeviceIpv6Address       |
-      | $.device.networkIdentifier | /components/schemas/NetworkAccessIdentifier |
+      | device_identifier                | oas_spec_schema                             |
+      | $.device.phoneNumber             | /components/schemas/PhoneNumber             |
+      | $.device.ipv4Address             | /components/schemas/DeviceIpv4Addr          |
+      | $.device.ipv6Address             | /components/schemas/DeviceIpv6Address       |
+      | $.device.networkAccessIdentifier | /components/schemas/NetworkAccessIdentifier |
 
   @location_retrieval_C01.03_device_not_found
   Scenario: Some identifier cannot be matched to a device
diff --git a/code/Test_definitions/location-verification.feature b/code/Test_definitions/location-verification.feature
index 1ca6b3dd..ecf400bc 100644
--- a/code/Test_definitions/location-verification.feature
+++ b/code/Test_definitions/location-verification.feature
@@ -101,11 +101,11 @@ Feature: CAMARA Device location verification API, vwip - Operation verifyLocatio
     And the response property "$.message" contains a user friendly text
 
     Examples:
-      | device_identifier          | oas_spec_schema                             |
-      | $.device.phoneNumber       | /components/schemas/PhoneNumber             |
-      | $.device.ipv4Address       | /components/schemas/DeviceIpv4Addr          |
-      | $.device.ipv6Address       | /components/schemas/DeviceIpv6Address       |
-      | $.device.networkIdentifier | /components/schemas/NetworkAccessIdentifier |
+      | device_identifier                | oas_spec_schema                             |
+      | $.device.phoneNumber             | /components/schemas/PhoneNumber             |
+      | $.device.ipv4Address             | /components/schemas/DeviceIpv4Addr          |
+      | $.device.ipv6Address             | /components/schemas/DeviceIpv6Address       |
+      | $.device.networkAccessIdentifier | /components/schemas/NetworkAccessIdentifier |
 
   # This scenario may happen e.g. with 2-legged access tokens, which do not identify a single device.
   @location_verification_C01.03_device_not_found