diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/ReplaceContactData.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/ReplaceContactData.java
index e60bbc8e..2638a4e5 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/ReplaceContactData.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/ReplaceContactData.java
@@ -47,7 +47,7 @@ public class ReplaceContactData extends UseCase<ReplaceContactData> {
         withTitle("Replace the Contact-Reference in the Partner-Relation", () ->
                 httpPatch("/api/hs/office/relations/%{partnerRelationUuid}", usingJsonBody("""
                         {
-                            "contactUuid": ${Contact: %{newContactCaption}}
+                            "contact.uuid": ${Contact: %{newContactCaption}}
                         }
                         """))
                         .expecting(OK)
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateExternalDebitorForPartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateExternalDebitorForPartner.java
index 194d4513..cf525c30 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateExternalDebitorForPartner.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateExternalDebitorForPartner.java
@@ -55,9 +55,9 @@ public class CreateExternalDebitorForPartner extends UseCase<CreateExternalDebit
         return httpPost("/api/hs/office/debitors", usingJsonBody("""
                 {
                     "debitorRel": {
-                        "anchorUuid": ${Person: %{partnerPersonTradeName}},
-                        "holderUuid": ${Person: Billing GmbH},
-                        "contactUuid": ${Contact: Billing GmbH - Test AG billing}
+                        "anchor.uuid": ${Person: %{partnerPersonTradeName}},
+                        "holder.uuid": ${Person: Billing GmbH},
+                        "contact.uuid": ${Contact: Billing GmbH - Test AG billing}
                      },
                     "debitorNumberSuffix": ${debitorNumberSuffix},
                     "billable": ${billable},
@@ -65,7 +65,7 @@ public class CreateExternalDebitorForPartner extends UseCase<CreateExternalDebit
                     "vatCountryCode": ${vatCountryCode},
                     "vatBusiness": ${vatBusiness},
                     "vatReverseCharge": ${vatReverseCharge},
-                    "refundBankAccountUuid": ${BankAccount: Billing GmbH - refund bank account},
+                    "refundBankAccount.uuid": ${BankAccount: Billing GmbH - refund bank account},
                     "defaultPrefix": ${defaultPrefix}
                 }
                 """))
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSelfDebitorForPartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSelfDebitorForPartner.java
index fc16adb3..1cc7a049 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSelfDebitorForPartner.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSelfDebitorForPartner.java
@@ -48,9 +48,9 @@ public class CreateSelfDebitorForPartner extends UseCase<CreateSelfDebitorForPar
         return httpPost("/api/hs/office/debitors", usingJsonBody("""
                 {
                     "debitorRel": {
-                        "anchorUuid": ${partnerPersonUuid},
-                        "holderUuid": ${partnerPersonUuid},
-                        "contactUuid": ${Contact: Test AG - billing department}
+                        "anchor.uuid": ${partnerPersonUuid},
+                        "holder.uuid": ${partnerPersonUuid},
+                        "contact.uuid": ${Contact: Test AG - billing department}
                      },
                     "debitorNumberSuffix": ${debitorNumberSuffix},
                     "billable": ${billable},
@@ -58,7 +58,7 @@ public class CreateSelfDebitorForPartner extends UseCase<CreateSelfDebitorForPar
                     "vatCountryCode": ${vatCountryCode},
                     "vatBusiness": ${vatBusiness},
                     "vatReverseCharge": ${vatReverseCharge},
-                    "refundBankAccountUuid": ${BankAccount: Test AG - refund bank account},
+                    "refundBankAccount.uuid": ${BankAccount: Test AG - refund bank account},
                     "defaultPrefix": ${defaultPrefix}
                 }
                 """))
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSepaMandateForDebitor.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSepaMandateForDebitor.java
index 606e2320..549848f1 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSepaMandateForDebitor.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSepaMandateForDebitor.java
@@ -35,8 +35,8 @@ public class CreateSepaMandateForDebitor extends UseCase<CreateSepaMandateForDeb
 
         return httpPost("/api/hs/office/sepamandates", usingJsonBody("""
                 {
-                   "debitorUuid": ${Debitor: Test AG - main debitor},
-                   "bankAccountUuid": ${BankAccount: Test AG - debit bank account},
+                   "debitor.uuid": ${Debitor: Test AG - main debitor},
+                   "bankAccount.uuid": ${BankAccount: Test AG - debit bank account},
                    "reference": ${mandateReference},
                    "agreement": ${mandateAgreement},
                    "validFrom": ${mandateValidFrom}
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java
index d1b47aec..379bba1e 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java
@@ -18,7 +18,7 @@ public class CreateMembership extends UseCase<CreateMembership> {
     protected HttpResponse run() {
         return httpPost("/api/hs/office/memberships", usingJsonBody("""
                 {
-                   "partnerUuid": ${Partner: Test AG},
+                   "partner.uuid": ${Partner: Test AG},
                    "memberNumberSuffix": ${memberNumberSuffix},
                    "status": "ACTIVE",
                    "validFrom": ${validFrom},
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddOperationsContactToPartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddOperationsContactToPartner.java
index 8cef6e10..f862c782 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddOperationsContactToPartner.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddOperationsContactToPartner.java
@@ -57,9 +57,9 @@ public class AddOperationsContactToPartner extends UseCase<AddOperationsContactT
         return httpPost("/api/hs/office/relations", usingJsonBody("""
                 {
                    "type": "OPERATIONS",
-                   "anchorUuid": ${Person: %{partnerPersonTradeName}},
-                   "holderUuid": ${Person: %{operationsContactGivenName} %{operationsContactFamilyName}},
-                   "contactUuid": ${Contact: %{operationsContactGivenName} %{operationsContactFamilyName}}
+                   "anchor.uuid": ${Person: %{partnerPersonTradeName}},
+                   "holder.uuid": ${Person: %{operationsContactGivenName} %{operationsContactFamilyName}},
+                   "contact.uuid": ${Contact: %{operationsContactGivenName} %{operationsContactFamilyName}}
                 }
                 """))
                 .expecting(CREATED).expecting(JSON);
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddRepresentativeToPartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddRepresentativeToPartner.java
index b90fb532..0e4a28c5 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddRepresentativeToPartner.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddRepresentativeToPartner.java
@@ -60,9 +60,9 @@ public class AddRepresentativeToPartner extends UseCase<AddRepresentativeToPartn
         return httpPost("/api/hs/office/relations", usingJsonBody("""
                 {
                    "type": "REPRESENTATIVE",
-                   "anchorUuid": ${Person: %{partnerPersonTradeName}},
-                   "holderUuid": ${Person: %{representativeGivenName} %{representativeFamilyName}},
-                   "contactUuid": ${Contact: %{representativeGivenName} %{representativeFamilyName}}
+                   "anchor.uuid": ${Person: %{partnerPersonTradeName}},
+                   "holder.uuid": ${Person: %{representativeGivenName} %{representativeFamilyName}},
+                   "contact.uuid": ${Contact: %{representativeGivenName} %{representativeFamilyName}}
                 }
                 """))
                 .expecting(CREATED).expecting(JSON);
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/CreatePartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/CreatePartner.java
index 5809ea96..a3aa727c 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/CreatePartner.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/CreatePartner.java
@@ -62,9 +62,9 @@ public class CreatePartner extends UseCase<CreatePartner> {
                 {
                     "partnerNumber": ${partnerNumber},
                     "partnerRel": {
-                         "anchorUuid": ${Person: Hostsharing eG},
-                         "holderUuid": ${Person: %{%{tradeName???}???%{givenName???} %{familyName???}}},
-                         "contactUuid": ${Contact: %{contactCaption}}
+                         "anchor.uuid": ${Person: Hostsharing eG},
+                         "holder.uuid": ${Person: %{%{tradeName???}???%{givenName???} %{familyName???}}},
+                         "contact.uuid": ${Contact: %{contactCaption}}
                     },
                     "details": {
                         "registrationOffice": "Registergericht Hamburg",
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/SubscribeToMailinglist.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/SubscribeToMailinglist.java
index 3e4ae74b..7cca9ba4 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/SubscribeToMailinglist.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/SubscribeToMailinglist.java
@@ -52,9 +52,9 @@ public class SubscribeToMailinglist extends UseCase<SubscribeToMailinglist> {
                 {
                    "type": "SUBSCRIBER",
                    "mark": ${mailingList},
-                   "anchorUuid": ${Person: %{partnerPersonTradeName}},
-                   "holderUuid": ${Person: %{subscriberGivenName} %{subscriberFamilyName}},
-                   "contactUuid": ${Contact: %{subscriberGivenName} %{subscriberFamilyName}}
+                   "anchor.uuid": ${Person: %{partnerPersonTradeName}},
+                   "holder.uuid": ${Person: %{subscriberGivenName} %{subscriberFamilyName}},
+                   "contact.uuid": ${Contact: %{subscriberGivenName} %{subscriberFamilyName}}
                 }
                 """))
                 .expecting(CREATED).expecting(JSON);