diff --git a/proto/domain.thrift b/proto/domain.thrift
index 0511d365..ecda616b 100644
--- a/proto/domain.thrift
+++ b/proto/domain.thrift
@@ -775,8 +775,6 @@ struct PartyContactInfo {
 
 /* Shops */
 
-typedef base.ID ShopID
-
 struct ShopAccount {
     1: required CurrencyRef currency
     2: required AccountID settlement
@@ -2337,11 +2335,9 @@ struct PartyCondition {
     2: optional PartyConditionDefinition definition
 }
 
-typedef base.ID WalletID
-
 union PartyConditionDefinition {
-    1: ShopID shop_is
-    2: WalletID wallet_is
+    1: ShopConfigRef shop_is
+    2: WalletConfigRef wallet_is
 }
 
 struct CriterionRef { 1: required ObjectID id }
diff --git a/proto/merch_stat.thrift b/proto/merch_stat.thrift
index bd18cbd3..833a7b77 100644
--- a/proto/merch_stat.thrift
+++ b/proto/merch_stat.thrift
@@ -15,8 +15,8 @@ namespace erlang dmsl.merchstat
 struct StatPayment {
     1 : required domain.InvoicePaymentID id
     2 : required domain.InvoiceID invoice_id
-    3 : required domain.PartyConfigRef owner_id
-    4 : required domain.ShopConfigRef shop_id
+    3 : required domain.PartyConfigRef party_ref
+    4 : required domain.ShopConfigRef shop_ref
     5 : required base.Timestamp created_at
     6 : required InvoicePaymentStatus status
     7 : required domain.Amount amount
@@ -160,8 +160,8 @@ struct DigitalWallet {
 */
 struct StatInvoice {
     1 : required domain.InvoiceID id
-    2 : required domain.PartyConfigRef owner_id
-    3 : required domain.ShopConfigRef shop_id
+    2 : required domain.PartyConfigRef party_ref
+    3 : required domain.ShopConfigRef shop_ref
     4 : required base.Timestamp created_at
     5 : required InvoiceStatus status
     6 : required string product
@@ -204,8 +204,8 @@ struct StatRefund {
     1 : required domain.InvoicePaymentRefundID id
     2 : required domain.InvoicePaymentID payment_id
     3 : required domain.InvoiceID invoice_id
-    4 : required domain.PartyConfigRef owner_id
-    5 : required domain.ShopConfigRef shop_id
+    4 : required domain.PartyConfigRef party_ref
+    5 : required domain.ShopConfigRef shop_ref
     6 : required InvoicePaymentRefundStatus status
     7 : required base.Timestamp created_at
     8 : required domain.Amount amount
@@ -240,8 +240,8 @@ struct StatChargeback {
     1: required domain.InvoiceID                        invoice_id
     2: required domain.InvoicePaymentID                 payment_id
     3: required domain.InvoicePaymentChargebackID       chargeback_id
-    4: required domain.PartyConfigRef                   party_id
-    5: required domain.ShopConfigRef                    shop_id
+    4: required domain.PartyConfigRef                   party_ref
+    5: required domain.ShopConfigRef                    shop_ref
     6: required domain.InvoicePaymentChargebackStatus   chargeback_status
     7: required base.Timestamp                          created_at
     8: optional domain.InvoicePaymentChargebackReason   chargeback_reason
diff --git a/proto/payment_processing.thrift b/proto/payment_processing.thrift
index 4f39708c..15db75b9 100644
--- a/proto/payment_processing.thrift
+++ b/proto/payment_processing.thrift
@@ -504,8 +504,8 @@ struct EventRange {
 typedef domain.InvoiceMutationParams InvoiceMutationParams
 
 struct InvoiceParams {
-    1: required domain.PartyConfigRef party_id
-    2: required domain.ShopConfigRef shop_id
+    1: required domain.PartyConfigRef party_ref
+    2: required domain.ShopConfigRef shop_ref
     3: required domain.InvoiceDetails details
     4: required base.Timestamp due
     5: required domain.Cash cost
@@ -527,8 +527,8 @@ struct InvoiceWithTemplateParams {
 
 struct InvoiceTemplateCreateParams {
     10: required domain.InvoiceTemplateID      template_id
-    1:  required domain.PartyConfigRef         party_id
-    2:  required domain.ShopConfigRef          shop_id
+    1:  required domain.PartyConfigRef         party_ref
+    2:  required domain.ShopConfigRef          shop_ref
     4:  required domain.LifetimeInterval       invoice_lifetime
     7:  required string                        product # for backward compatibility
     11: optional string                        name
@@ -1487,8 +1487,6 @@ service InvoiceTemplating {
 /* Party management service definitions */
 
 // Types
-
-typedef domain.WalletID WalletID
 typedef domain.PaymentInstitutionRef PaymentInstitutionRef
 
 struct Varset {
@@ -1496,8 +1494,8 @@ struct Varset {
     2: optional domain.CurrencyRef currency
     3: optional domain.Cash amount
     4: optional domain.PaymentMethodRef payment_method
-    5: optional domain.WalletID wallet_id
-    6: optional domain.ShopID shop_id
+    5: optional domain.WalletConfigRef wallet_ref
+    6: optional domain.ShopConfigRef shop_ref
     8: optional domain.PaymentTool payment_tool
     9: optional domain.PartyConfigRef party_ref
     10: optional domain.BinData bin_data
diff --git a/proto/proxy_provider.thrift b/proto/proxy_provider.thrift
index 1502f577..7a44af9a 100644
--- a/proto/proxy_provider.thrift
+++ b/proto/proxy_provider.thrift
@@ -139,7 +139,7 @@ struct PaymentInfo {
 }
 
 struct Shop {
-    1: required domain.ShopID       id
+    1: required base.ID             id
     2: required domain.Category     category
     3: required string              name
     4: optional string              description