diff --git a/MIGRATION-GUIDE.md b/MIGRATION-GUIDE.md
index fc800be94..6976adccd 100644
--- a/MIGRATION-GUIDE.md
+++ b/MIGRATION-GUIDE.md
@@ -190,6 +190,15 @@ Use the new versioned API under `numbers().v1()` to get access to [NumbersServic
 
 #### Deprecated fields
 - Deprecated `MediaMessageBodyDetails.status` field of type `String` is replaced by `MediaMessageBodyDetails.status` of [StatusEnum](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/models/v1/inbounds/MediaMessageBodyDetails.StatusEnum.html) type
+- [BinaryRequest.callbackUrl](https://www.javadoc.io/static/com.sinch.sdk/sinch-sdk-java/1.7.1/com/sinch/sdk/domains/sms/models/v1/batches/request/BinaryRequest.html#getCallbackUrl()) is replaced by [BinaryRequest.eventDestinationTarget](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/models/v1/batches/request/BinaryRequest.html#getEventDestinationTarget())
+- [UpdateBinaryRequest.callbackUrl](https://www.javadoc.io/static/com.sinch.sdk/sinch-sdk-java/1.7.1/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateBinaryRequest.html#getCallbackUrl()) is replaced by [BinaryRequest.eventDestinationTarget](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateBinaryRequest.html#getEventDestinationTarget())
+- [BinaryResponse.callbackUrl](https://www.javadoc.io/static/com.sinch.sdk/sinch-sdk-java/1.7.1/com/sinch/sdk/domains/sms/models/v1/batches/response/BinaryResponse.html#getCallbackUrl()) is replaced by [BinaryResponse.eventDestinationTarget](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/models/v1/batches/response/BinaryResponse.html#getEventDestinationTarget())
+- [MediaRequest.callbackUrl](https://www.javadoc.io/static/com.sinch.sdk/sinch-sdk-java/1.7.1/com/sinch/sdk/domains/sms/models/v1/batches/request/MediaRequest.html#getCallbackUrl()) is replaced by [MediaRequest.eventDestinationTarget](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/models/v1/batches/request/MediaRequest.html#getEventDestinationTarget())
+- [UpdateMediaRequest.callbackUrl](https://www.javadoc.io/static/com.sinch.sdk/sinch-sdk-java/1.7.1/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateMediaRequest.html#getCallbackUrl()) is replaced by [UpdateMediaRequest.eventDestinationTarget](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateMediaRequest.html#getEventDestinationTarget())
+- [MediaResponse.callbackUrl](https://www.javadoc.io/static/com.sinch.sdk/sinch-sdk-java/1.7.1/com/sinch/sdk/domains/sms/models/v1/batches/response/MediaResponse.html#getCallbackUrl()) is replaced by [MediaResponse.eventDestinationTarget](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/models/v1/batches/response/MediaResponse.html#getEventDestinationTarget())
+- [TextRequest.callbackUrl](https://www.javadoc.io/static/com.sinch.sdk/sinch-sdk-java/1.7.1/com/sinch/sdk/domains/sms/models/v1/batches/request/TextRequest.html#getCallbackUrl()) is replaced by [MediaRequest.eventDestinationTarget](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/models/v1/batches/request/TextRequest.html#getEventDestinationTarget())
+- [UpdateTextRequest.callbackUrl](https://www.javadoc.io/static/com.sinch.sdk/sinch-sdk-java/1.7.1/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateTextRequest.html#getCallbackUrl()) is replaced by [UpdateTextRequest.eventDestinationTarget](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateTextRequest.html#getEventDestinationTarget())
+- [TextResponse.callbackUrl](https://www.javadoc.io/static/com.sinch.sdk/sinch-sdk-java/1.7.1/com/sinch/sdk/domains/sms/models/v1/batches/response/TextResponse.html#getCallbackUrl()) is replaced by [TextResponse.eventDestinationTarget](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/models/v1/batches/response/TextResponse.html#getEventDestinationTarget())
 
 #### Replacement models
 
@@ -261,9 +270,10 @@ Use the new versioned API under `numbers().v1()` to get access to [NumbersServic
 | models/responses/InboundsListResponse         | [com.sinch.sdk.domains.sms.models.v1.inbounds.response.ListInboundsResponse](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/models/v1/inbounds/response/ListInboundsResponse.html)                           |
 
 ##### Webhooks
-| Old class                     | New class                                                                                                                                                                          |
-|-------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| 
-| models/webhooks/WebhooksEvent | [com.sinch.sdk.domains.sms.models.v1.webhooks.SmsEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/models/v1/webhooks/SmsEvent.html)  |
+| Old class              | New class                                                                                                                                                     |
+|------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------| 
+| webhooks/WebhooksEvent | [sinchevents.SmsSinchEvent](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/models/v1/sinchevents/SmsSinchEvent.html) |
+| WebHooksService        | [SinchEventsService](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/api/v1/v1/SinchEventsService.html)               |
 
 #### Replacement APIs
 
@@ -275,7 +285,7 @@ Use the new versioned API under `sms().v1()` to get access to [SMSService](https
 | deliveryReports() | [v1().deliveryReports()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/api/v1/DeliveryReportsService.html) |
 | groups()          | [v1().groups()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/api/v1/GroupsService.html)                   |
 | inbounds()        | [v1().inbounds()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/api/v1/InboundsService.html)               |
-| webHooks()        | [v1().webhooks()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/api/v1/WebHooksService.html)               |
+| webHooks()        | [v1().sinchEvent()](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/api/v1/SinchEventsService.html)          |
 
 ### [`Voice`](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/voice/package-summary.html)
 
diff --git a/client/src/main/com/sinch/sdk/domains/sms/api/v1/SMSService.java b/client/src/main/com/sinch/sdk/domains/sms/api/v1/SMSService.java
index 92f06fcce..f2500d985 100644
--- a/client/src/main/com/sinch/sdk/domains/sms/api/v1/SMSService.java
+++ b/client/src/main/com/sinch/sdk/domains/sms/api/v1/SMSService.java
@@ -42,10 +42,10 @@ public interface SMSService {
   GroupsService groups();
 
   /**
-   * WebHooksService Service instance
+   * Sinch Events helpers instance
    *
-   * @return service instance for project
-   * @since 1.5
+   * @return instance service related to Sinch Events helpers
+   * @since 2.0
    */
-  WebHooksService webhooks();
+  SinchEventsService sinchEvents();
 }
diff --git a/client/src/main/com/sinch/sdk/domains/sms/api/v1/WebHooksService.java b/client/src/main/com/sinch/sdk/domains/sms/api/v1/SinchEventsService.java
similarity index 89%
rename from client/src/main/com/sinch/sdk/domains/sms/api/v1/WebHooksService.java
rename to client/src/main/com/sinch/sdk/domains/sms/api/v1/SinchEventsService.java
index 1cf62c36c..a2a595587 100644
--- a/client/src/main/com/sinch/sdk/domains/sms/api/v1/WebHooksService.java
+++ b/client/src/main/com/sinch/sdk/domains/sms/api/v1/SinchEventsService.java
@@ -1,11 +1,11 @@
 package com.sinch.sdk.domains.sms.api.v1;
 
 import com.sinch.sdk.core.exceptions.ApiMappingException;
-import com.sinch.sdk.domains.sms.models.v1.webhooks.SmsEvent;
+import com.sinch.sdk.domains.sms.models.v1.sinchevents.SmsSinchEvent;
 import java.util.Map;
 
 /**
- * SMS WebHooks service
+ * SMS Sinch Events service
  *
  * <p><b>Callbacks</b>
  *
@@ -36,11 +36,11 @@
  *
  * @see <a
  *     href="https://developers.sinch.com/docs/sms/api-reference/sms/tag/Webhooks/">https://developers.sinch.com/docs/sms/api-reference/sms/tag/Webhooks/</a>
- * @since 1.5
+ * @since 2.0
  */
-public interface WebHooksService {
+public interface SinchEventsService {
 
-  SmsEvent parseEvent(String jsonPayload) throws ApiMappingException;
+  SmsSinchEvent parseEvent(String jsonPayload) throws ApiMappingException;
 
   boolean validateAuthenticationHeader(
       String secret, Map<String, String> headers, String jsonPayload);
diff --git a/client/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/SMSService.java b/client/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/SMSService.java
index 2699b0f07..e7c55696e 100644
--- a/client/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/SMSService.java
+++ b/client/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/SMSService.java
@@ -40,7 +40,7 @@ public class SMSService implements com.sinch.sdk.domains.sms.api.v1.SMSService {
   private volatile InboundsService inbounds;
   private volatile DeliveryReportsService deliveryReports;
   private volatile GroupsService groups;
-  private volatile WebHooksService webhooks;
+  private volatile SinchEventsService sinchEvents;
 
   public SMSService(
       UnifiedCredentials credentials,
@@ -124,11 +124,11 @@ public GroupsService groups() {
   }
 
   @Override
-  public WebHooksService webhooks() {
-    if (null == this.webhooks) {
-      this.webhooks = new WebHooksService(new HmacAuthenticationValidation());
+  public SinchEventsService sinchEvents() {
+    if (null == this.sinchEvents) {
+      this.sinchEvents = new SinchEventsService(new HmacAuthenticationValidation());
     }
-    return this.webhooks;
+    return this.sinchEvents;
   }
 
   private void instanceLazyInit() {
diff --git a/client/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/WebHooksService.java b/client/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/SinchEventsService.java
similarity index 64%
rename from client/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/WebHooksService.java
rename to client/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/SinchEventsService.java
index 962b1de71..e97b0b1f9 100644
--- a/client/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/WebHooksService.java
+++ b/client/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/SinchEventsService.java
@@ -4,21 +4,21 @@
 import com.sinch.sdk.auth.HmacAuthenticationValidation;
 import com.sinch.sdk.core.exceptions.ApiMappingException;
 import com.sinch.sdk.core.utils.databind.Mapper;
-import com.sinch.sdk.domains.sms.models.v1.webhooks.SmsEvent;
+import com.sinch.sdk.domains.sms.models.v1.sinchevents.SmsSinchEvent;
 import java.util.Map;
 
-public class WebHooksService implements com.sinch.sdk.domains.sms.api.v1.WebHooksService {
+public class SinchEventsService implements com.sinch.sdk.domains.sms.api.v1.SinchEventsService {
 
   private final HmacAuthenticationValidation authenticationChecker;
 
-  public WebHooksService(HmacAuthenticationValidation authenticationChecker) {
+  public SinchEventsService(HmacAuthenticationValidation authenticationChecker) {
     this.authenticationChecker = authenticationChecker;
   }
 
-  public SmsEvent parseEvent(String jsonPayload) throws ApiMappingException {
+  public SmsSinchEvent parseEvent(String jsonPayload) throws ApiMappingException {
 
     try {
-      return Mapper.getInstance().readValue(jsonPayload, SmsEvent.class);
+      return Mapper.getInstance().readValue(jsonPayload, SmsSinchEvent.class);
     } catch (JsonProcessingException e) {
       throw new RuntimeException(e);
     }
diff --git a/client/src/main/com/sinch/sdk/domains/sms/models/v1/deliveryreports/BatchDeliveryReport.java b/client/src/main/com/sinch/sdk/domains/sms/models/v1/deliveryreports/BatchDeliveryReport.java
index 0bdf1319e..26879da5e 100644
--- a/client/src/main/com/sinch/sdk/domains/sms/models/v1/deliveryreports/BatchDeliveryReport.java
+++ b/client/src/main/com/sinch/sdk/domains/sms/models/v1/deliveryreports/BatchDeliveryReport.java
@@ -1,6 +1,7 @@
 package com.sinch.sdk.domains.sms.models.v1.deliveryreports;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.sinch.sdk.domains.sms.api.v1.SinchEventsService;
 import com.sinch.sdk.domains.sms.models.v1.deliveryreports.internal.BatchDeliveryReportOneOfImpl;
 import com.sinch.sdk.domains.sms.models.v1.deliveryreports.request.BatchDeliveryReportQueryParameters;
 
@@ -9,7 +10,7 @@
  *
  * @see com.sinch.sdk.domains.sms.api.v1.DeliveryReportsService#get(String,
  *     BatchDeliveryReportQueryParameters)
- * @see com.sinch.sdk.domains.sms.api.v1.WebHooksService#parseEvent(String)
+ * @see SinchEventsService#parseEvent(String)
  * @since 1.5
  */
 @JsonDeserialize(using = BatchDeliveryReportOneOfImpl.Deserializer.class)
diff --git a/client/src/main/com/sinch/sdk/domains/sms/models/v1/deliveryreports/DeliveryReport.java b/client/src/main/com/sinch/sdk/domains/sms/models/v1/deliveryreports/DeliveryReport.java
index 75d30610d..c69b40ebb 100644
--- a/client/src/main/com/sinch/sdk/domains/sms/models/v1/deliveryreports/DeliveryReport.java
+++ b/client/src/main/com/sinch/sdk/domains/sms/models/v1/deliveryreports/DeliveryReport.java
@@ -1,11 +1,12 @@
 package com.sinch.sdk.domains.sms.models.v1.deliveryreports;
 
-import com.sinch.sdk.domains.sms.models.v1.webhooks.SmsEvent;
+import com.sinch.sdk.domains.sms.api.v1.SinchEventsService;
+import com.sinch.sdk.domains.sms.models.v1.sinchevents.SmsSinchEvent;
 
 /**
  * Base class for all classes supporting DeliveryReport
  *
- * @see com.sinch.sdk.domains.sms.api.v1.WebHooksService#parseEvent(String)
+ * @see SinchEventsService#parseEvent(String)
  * @since 1.5
  */
-public interface DeliveryReport extends SmsEvent {}
+public interface DeliveryReport extends SmsSinchEvent {}
diff --git a/client/src/main/com/sinch/sdk/domains/sms/models/v1/deliveryreports/RecipientDeliveryReport.java b/client/src/main/com/sinch/sdk/domains/sms/models/v1/deliveryreports/RecipientDeliveryReport.java
index 536cb2204..8f4c25904 100644
--- a/client/src/main/com/sinch/sdk/domains/sms/models/v1/deliveryreports/RecipientDeliveryReport.java
+++ b/client/src/main/com/sinch/sdk/domains/sms/models/v1/deliveryreports/RecipientDeliveryReport.java
@@ -1,6 +1,7 @@
 package com.sinch.sdk.domains.sms.models.v1.deliveryreports;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.sinch.sdk.domains.sms.api.v1.SinchEventsService;
 import com.sinch.sdk.domains.sms.models.v1.deliveryreports.internal.RecipientDeliveryReportOneOfImpl;
 import com.sinch.sdk.domains.sms.models.v1.deliveryreports.request.ListDeliveryReportsQueryParameters;
 
@@ -10,7 +11,7 @@
  * @see com.sinch.sdk.domains.sms.api.v1.DeliveryReportsService#getForNumber(String, String)
  * @see
  *     com.sinch.sdk.domains.sms.api.v1.DeliveryReportsService#list(ListDeliveryReportsQueryParameters)
- * @see com.sinch.sdk.domains.sms.api.v1.WebHooksService#parseEvent(String)
+ * @see SinchEventsService#parseEvent(String)
  * @since 1.5
  */
 @JsonDeserialize(using = RecipientDeliveryReportOneOfImpl.Deserializer.class)
diff --git a/client/src/main/com/sinch/sdk/domains/sms/models/v1/inbounds/InboundMessage.java b/client/src/main/com/sinch/sdk/domains/sms/models/v1/inbounds/InboundMessage.java
index a24878770..420f298d4 100644
--- a/client/src/main/com/sinch/sdk/domains/sms/models/v1/inbounds/InboundMessage.java
+++ b/client/src/main/com/sinch/sdk/domains/sms/models/v1/inbounds/InboundMessage.java
@@ -1,17 +1,18 @@
 package com.sinch.sdk.domains.sms.models.v1.inbounds;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.sinch.sdk.domains.sms.api.v1.SinchEventsService;
 import com.sinch.sdk.domains.sms.models.v1.inbounds.request.ListInboundMessagesQueryParameters;
 import com.sinch.sdk.domains.sms.models.v1.inbounds.response.internal.InboundInternalImpl;
-import com.sinch.sdk.domains.sms.models.v1.webhooks.SmsEvent;
+import com.sinch.sdk.domains.sms.models.v1.sinchevents.SmsSinchEvent;
 
 /**
  * Base class for all classes supporting InBounds
  *
  * @see com.sinch.sdk.domains.sms.api.v1.InboundsService#get(String)
  * @see com.sinch.sdk.domains.sms.api.v1.InboundsService#list(ListInboundMessagesQueryParameters)
- * @see com.sinch.sdk.domains.sms.api.v1.WebHooksService#parseEvent(String)
+ * @see SinchEventsService#parseEvent(String)
  * @since 1.5
  */
 @JsonDeserialize(using = InboundInternalImpl.Deserializer.class)
-public interface InboundMessage extends SmsEvent {}
+public interface InboundMessage extends SmsSinchEvent {}
diff --git a/client/src/main/com/sinch/sdk/domains/sms/models/v1/sinchevents/SmsSinchEvent.java b/client/src/main/com/sinch/sdk/domains/sms/models/v1/sinchevents/SmsSinchEvent.java
new file mode 100644
index 000000000..5e80df4af
--- /dev/null
+++ b/client/src/main/com/sinch/sdk/domains/sms/models/v1/sinchevents/SmsSinchEvent.java
@@ -0,0 +1,14 @@
+package com.sinch.sdk.domains.sms.models.v1.sinchevents;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.sinch.sdk.domains.sms.api.v1.SinchEventsService;
+import com.sinch.sdk.domains.sms.models.v1.sinchevents.internal.SmsSinchEventOneOfImpl;
+
+/**
+ * Base class for all Sinch event's class
+ *
+ * @see SinchEventsService#parseEvent(String)
+ * @since 2.0
+ */
+@JsonDeserialize(using = SmsSinchEventOneOfImpl.Deserializer.class)
+public interface SmsSinchEvent {}
diff --git a/client/src/main/com/sinch/sdk/domains/sms/models/v1/webhooks/package-info.java b/client/src/main/com/sinch/sdk/domains/sms/models/v1/sinchevents/package-info.java
similarity index 82%
rename from client/src/main/com/sinch/sdk/domains/sms/models/v1/webhooks/package-info.java
rename to client/src/main/com/sinch/sdk/domains/sms/models/v1/sinchevents/package-info.java
index f1aa66b4d..4d5f62e7c 100644
--- a/client/src/main/com/sinch/sdk/domains/sms/models/v1/webhooks/package-info.java
+++ b/client/src/main/com/sinch/sdk/domains/sms/models/v1/sinchevents/package-info.java
@@ -1,7 +1,7 @@
 /**
- * SMS API webhooks related models
+ * SMS API Sinch Events related models
  *
- * <h2>Incoming SMS WebHook</h2>
+ * <h2>Incoming SMS Event</h2>
  *
  * <p>An inbound message is a message sent to one of your short codes or long numbers from a mobile
  * phone. To receive inbound message callbacks, a URL needs to be added to your REST API.
@@ -11,26 +11,26 @@
  * <p>See <a
  * href="https://developers.sinch.com/docs/sms/api-reference/sms/tag/Webhooks/#tag/Webhooks/operation/incomingSMS">https://developers.sinch.com/docs/sms/api-reference/sms/tag/Webhooks/#tag/Webhooks/operation/incomingSMS</a>
  *
- * <h2>Delivery Report WebHook</h2>
+ * <h2>Delivery Report Event</h2>
  *
  * <p>A delivery report contains the status and status code for each recipient of a batch. To get a
  * delivery report callback for a message or batch of messages, set the <code>delivery_report
  * </code> field accordingly when creating a batch.
  *
- * <p>The following is provided so you can better understand our webhooks/callbacks. Configuration
- * of both webhooks and the type of delivery report requested happens when sending a batch.
+ * <p>The following is provided so you can better understand our Sinch Events. Configuration of both
+ * sinch events and the type of delivery report requested happens when sending a batch.
  *
  * <p><b>Callback URL</b>
  *
  * <p>The callback URL can either be provided for each batch or provisioned globally for your
  * account in your <a href="https://dashboard.sinch.com/sms/api/rest">Sinch Customer Dashboard</a>.
- * Learn how to configure a webhook/callback <a
+ * Learn how to configure a Sinch Event <a
  * href="https://community.sinch.com/t5/SMS/How-do-I-assign-a-callback-URL-to-an-SMS-service-plan/ta-p/8414">here</a>
  *
  * <p><b>Type</b>
  *
- * <p>The <code>type</code> is the type of delivery report webhook. The response will vary depending
- * on the webhook delivery report you selected when the batch was sent, so choose the appropriate
+ * <p>The <code>type</code> is the type of delivery report event. The response will vary depending
+ * on the event delivery report you selected when the batch was sent, so choose the appropriate
  * selection under "One of".
  *
  * <ul>
@@ -52,6 +52,6 @@
  * See <a
  * href="https://developers.sinch.com/docs/sms/api-reference/sms/tag/Webhooks/#tag/Webhooks/operation/deliveryReport">https://developers.sinch.com/docs/sms/api-reference/sms/tag/Webhooks/#tag/Webhooks/operation/deliveryReport</a>
  *
- * @since 1.5
+ * @since 2.0
  */
-package com.sinch.sdk.domains.sms.models.v1.webhooks;
+package com.sinch.sdk.domains.sms.models.v1.sinchevents;
diff --git a/client/src/main/com/sinch/sdk/domains/sms/models/v1/webhooks/SmsEvent.java b/client/src/main/com/sinch/sdk/domains/sms/models/v1/webhooks/SmsEvent.java
deleted file mode 100644
index 6257897ec..000000000
--- a/client/src/main/com/sinch/sdk/domains/sms/models/v1/webhooks/SmsEvent.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.sinch.sdk.domains.sms.models.v1.webhooks;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.sinch.sdk.domains.sms.models.v1.webhooks.internal.WebhookEventOneOfImpl;
-
-/**
- * Base class for all WebHook event's class
- *
- * @see com.sinch.sdk.domains.sms.api.v1.WebHooksService#parseEvent(String)
- * @since 1.5
- */
-@JsonDeserialize(using = WebhookEventOneOfImpl.Deserializer.class)
-public interface SmsEvent {}
diff --git a/client/src/test/java/com/sinch/sdk/domains/sms/api/v1/adapters/SMSServiceTest.java b/client/src/test/java/com/sinch/sdk/domains/sms/api/v1/adapters/SMSServiceTest.java
index d4b86ec0b..20d0e7021 100644
--- a/client/src/test/java/com/sinch/sdk/domains/sms/api/v1/adapters/SMSServiceTest.java
+++ b/client/src/test/java/com/sinch/sdk/domains/sms/api/v1/adapters/SMSServiceTest.java
@@ -45,7 +45,7 @@ void checkCredentialsGroups() {
 
   @Test
   void checkCredentialsWebhooks() {
-    assertDoesNotThrow(() -> new SMSService(null, null, null, null).webhooks(), "Init passed");
+    assertDoesNotThrow(() -> new SMSService(null, null, null, null).sinchEvents(), "Init passed");
   }
 
   @Test
diff --git a/client/src/test/java/com/sinch/sdk/domains/sms/api/v1/adapters/WebHooksServiceTest.java b/client/src/test/java/com/sinch/sdk/domains/sms/api/v1/adapters/SinchEventsServiceTest.java
similarity index 84%
rename from client/src/test/java/com/sinch/sdk/domains/sms/api/v1/adapters/WebHooksServiceTest.java
rename to client/src/test/java/com/sinch/sdk/domains/sms/api/v1/adapters/SinchEventsServiceTest.java
index d9838badc..624c934c4 100644
--- a/client/src/test/java/com/sinch/sdk/domains/sms/api/v1/adapters/WebHooksServiceTest.java
+++ b/client/src/test/java/com/sinch/sdk/domains/sms/api/v1/adapters/SinchEventsServiceTest.java
@@ -9,11 +9,11 @@
 import com.sinch.sdk.auth.HmacAuthenticationValidation;
 import com.sinch.sdk.core.TestHelpers;
 import com.sinch.sdk.core.exceptions.ApiException;
-import com.sinch.sdk.domains.sms.api.v1.WebHooksService;
+import com.sinch.sdk.domains.sms.api.v1.SinchEventsService;
 import com.sinch.sdk.domains.sms.models.v1.deliveryreports.BatchDeliveryReportDtoTest;
 import com.sinch.sdk.domains.sms.models.v1.deliveryreports.RecipientDeliveryReportDtoTest;
 import com.sinch.sdk.domains.sms.models.v1.inbounds.InboundMessageDtoTest;
-import com.sinch.sdk.domains.sms.models.v1.webhooks.SmsEvent;
+import com.sinch.sdk.domains.sms.models.v1.sinchevents.SmsSinchEvent;
 import com.sinch.sdk.models.Configuration;
 import java.util.AbstractMap;
 import java.util.Map;
@@ -23,7 +23,7 @@
 import org.junit.jupiter.api.Test;
 
 @TestWithResources
-public class WebHooksServiceTest extends BaseTest {
+public class SinchEventsServiceTest extends BaseTest {
 
   @GivenTextResource("/domains/sms/v1/inbounds/InboundBinaryDto.json")
   String loadedInboundBinaryEvent;
@@ -46,7 +46,7 @@ public class WebHooksServiceTest extends BaseTest {
   @GivenTextResource("/domains/sms/v1/deliveryreports/RecipientDeliveryReportMMSDto.json")
   String loadedRecipientDeliveryReportMMSEvent;
 
-  WebHooksService service;
+  SinchEventsService service;
 
   @BeforeEach
   public void setUp() {
@@ -57,7 +57,7 @@ public void setUp() {
             .setKeyId("unused")
             .setKeySecret("unused")
             .build();
-    service = new SinchClient(configuration).sms().v1().webhooks();
+    service = new SinchClient(configuration).sms().v1().sinchEvents();
   }
 
   @Test
@@ -90,7 +90,7 @@ void checkApplicationAuthentication() throws ApiException {
   @Test
   void incomingSMSBinary() throws ApiException {
 
-    SmsEvent response = service.parseEvent(loadedInboundBinaryEvent);
+    SmsSinchEvent response = service.parseEvent(loadedInboundBinaryEvent);
 
     TestHelpers.recursiveEquals(InboundMessageDtoTest.binaryDTO, response);
   }
@@ -98,7 +98,7 @@ void incomingSMSBinary() throws ApiException {
   @Test
   void incomingSMSText() throws ApiException {
 
-    SmsEvent response = service.parseEvent(loadedInboundTextEvent);
+    SmsSinchEvent response = service.parseEvent(loadedInboundTextEvent);
 
     TestHelpers.recursiveEquals(InboundMessageDtoTest.textDTO, response);
   }
@@ -106,7 +106,7 @@ void incomingSMSText() throws ApiException {
   @Test
   void incomingSMSMedia() throws ApiException {
 
-    SmsEvent response = service.parseEvent(loadedInboundMediaEvent);
+    SmsSinchEvent response = service.parseEvent(loadedInboundMediaEvent);
 
     TestHelpers.recursiveEquals(InboundMessageDtoTest.mediaDTO, response);
   }
@@ -114,7 +114,7 @@ void incomingSMSMedia() throws ApiException {
   @Test
   void deliveryReportRecipientDeliveryReportSms() throws ApiException {
 
-    SmsEvent response = service.parseEvent(loadedRecipientDeliveryReportSMSEvent);
+    SmsSinchEvent response = service.parseEvent(loadedRecipientDeliveryReportSMSEvent);
 
     TestHelpers.recursiveEquals(
         RecipientDeliveryReportDtoTest.deliveryReportRecipientSMS, response);
@@ -123,7 +123,7 @@ void deliveryReportRecipientDeliveryReportSms() throws ApiException {
   @Test
   void deliveryReportRecipientDeliveryReportMms() throws ApiException {
 
-    SmsEvent response = service.parseEvent(loadedRecipientDeliveryReportMMSEvent);
+    SmsSinchEvent response = service.parseEvent(loadedRecipientDeliveryReportMMSEvent);
 
     TestHelpers.recursiveEquals(
         RecipientDeliveryReportDtoTest.deliveryReportRecipientMMS, response);
@@ -132,7 +132,7 @@ void deliveryReportRecipientDeliveryReportMms() throws ApiException {
   @Test
   void deliveryReportBatchDeliveryReportSms() throws ApiException {
 
-    SmsEvent response = service.parseEvent(loadedBatchDeliveryReportSMSEvent);
+    SmsSinchEvent response = service.parseEvent(loadedBatchDeliveryReportSMSEvent);
 
     TestHelpers.recursiveEquals(BatchDeliveryReportDtoTest.deliveryReportBatchSMS, response);
   }
@@ -140,7 +140,7 @@ void deliveryReportBatchDeliveryReportSms() throws ApiException {
   @Test
   void deliveryReportBatchDeliveryReportMms() throws ApiException {
 
-    SmsEvent response = service.parseEvent(loadedBatchDeliveryReportMMSEvent);
+    SmsSinchEvent response = service.parseEvent(loadedBatchDeliveryReportMMSEvent);
 
     TestHelpers.recursiveEquals(BatchDeliveryReportDtoTest.deliveryReportBatchMMS, response);
   }
diff --git a/client/src/test/java/com/sinch/sdk/e2e/domains/sms/v1/WebhooksSteps.java b/client/src/test/java/com/sinch/sdk/e2e/domains/sms/v1/WebhooksSteps.java
index 8a51eb504..33890e169 100644
--- a/client/src/test/java/com/sinch/sdk/e2e/domains/sms/v1/WebhooksSteps.java
+++ b/client/src/test/java/com/sinch/sdk/e2e/domains/sms/v1/WebhooksSteps.java
@@ -1,14 +1,14 @@
 package com.sinch.sdk.e2e.domains.sms.v1;
 
 import com.sinch.sdk.core.TestHelpers;
-import com.sinch.sdk.domains.sms.api.v1.WebHooksService;
+import com.sinch.sdk.domains.sms.api.v1.SinchEventsService;
 import com.sinch.sdk.domains.sms.models.v1.deliveryreports.BatchDeliveryReportSMS;
 import com.sinch.sdk.domains.sms.models.v1.deliveryreports.DeliveryReceiptStatusCode;
 import com.sinch.sdk.domains.sms.models.v1.deliveryreports.DeliveryStatus;
 import com.sinch.sdk.domains.sms.models.v1.deliveryreports.MessageDeliveryStatus;
 import com.sinch.sdk.domains.sms.models.v1.deliveryreports.RecipientDeliveryReportSMS;
 import com.sinch.sdk.domains.sms.models.v1.inbounds.TextMessage;
-import com.sinch.sdk.domains.sms.models.v1.webhooks.SmsEvent;
+import com.sinch.sdk.domains.sms.models.v1.sinchevents.SmsSinchEvent;
 import com.sinch.sdk.e2e.Config;
 import com.sinch.sdk.e2e.domains.WebhooksHelper;
 import io.cucumber.java.en.Given;
@@ -28,16 +28,16 @@ public class WebhooksSteps {
 
   static final String SECRET = "KayakingTheSwell";
 
-  WebHooksService service;
-  WebhooksHelper.Response<SmsEvent> incoming;
-  WebhooksHelper.Response<SmsEvent> deliveryReport;
-  WebhooksHelper.Response<SmsEvent> deliveryReportRecipientDelivered;
-  WebhooksHelper.Response<SmsEvent> deliveryReportRecipientAborted;
+  SinchEventsService service;
+  WebhooksHelper.Response<SmsSinchEvent> incoming;
+  WebhooksHelper.Response<SmsSinchEvent> deliveryReport;
+  WebhooksHelper.Response<SmsSinchEvent> deliveryReportRecipientDelivered;
+  WebhooksHelper.Response<SmsSinchEvent> deliveryReportRecipientAborted;
 
   @Given("^the SMS Webhooks handler is available")
   public void serviceAvailable() {
 
-    service = Config.getSinchClient().sms().v1().webhooks();
+    service = Config.getSinchClient().sms().v1().sinchEvents();
   }
 
   @When("^I send a request to trigger an \"incoming SMS\" event")
@@ -76,7 +76,7 @@ public void deliveryReportRecipientAborted() throws IOException {
 
   @Then("the SMS event describes an \"incoming SMS\" event")
   public void incomingResult() {
-    SmsEvent expected =
+    SmsSinchEvent expected =
         TextMessage.builder()
             .setBody("Hello John! 👋")
             .setFrom("12015555555")
@@ -91,7 +91,7 @@ public void incomingResult() {
 
   @Then("the SMS event describes an \"SMS delivery report\" event")
   public void deliveryReportResult() {
-    SmsEvent expected =
+    SmsSinchEvent expected =
         BatchDeliveryReportSMS.builder()
             .setBatchId("01W4FFL35P4NC4K35SMSBATCH8")
             .setClientReference("client-ref")
@@ -113,7 +113,7 @@ public void deliveryReportResult() {
       "the SMS event describes an SMS recipient delivery report event with the status"
           + " \"Delivered\"")
   public void deliveryReportRecipientDeliveredResult() {
-    SmsEvent expected =
+    SmsSinchEvent expected =
         RecipientDeliveryReportSMS.builder()
             .setCreatedAt(Instant.parse("2024-06-06T08:17:19.210Z"))
             .setBatchId("01W4FFL35P4NC4K35SMSBATCH9")
@@ -130,7 +130,7 @@ public void deliveryReportRecipientDeliveredResult() {
   @Then(
       "the SMS event describes an SMS recipient delivery report event with the status \"Aborted\"")
   public void deliveryReportRecipientAbortedResult() {
-    SmsEvent expected =
+    SmsSinchEvent expected =
         RecipientDeliveryReportSMS.builder()
             .setCreatedAt(Instant.parse("2024-06-06T08:17:15.603Z"))
             .setBatchId("01W4FFL35P4NC4K35SMSBATCH9")
@@ -146,7 +146,7 @@ public void deliveryReportRecipientAbortedResult() {
   @Then("the header of the event {string} contains a valid signature")
   public void validateHeader(String event) {
 
-    WebhooksHelper.Response<SmsEvent> response = null;
+    WebhooksHelper.Response<SmsSinchEvent> response = null;
     if (event.equals("IncomingSMS")) {
       response = incoming;
     } else if (event.equals("DeliveryReport")) {
@@ -161,7 +161,7 @@ public void validateHeader(String event) {
   @Then("the header of the event {string} with the status {string} contains a valid signature")
   public void validateHeader(String _unused, String status) {
 
-    WebhooksHelper.Response<SmsEvent> response = null;
+    WebhooksHelper.Response<SmsSinchEvent> response = null;
     if (status.equals("Delivered")) {
       response = deliveryReportRecipientDelivered;
     } else if (status.equals("Aborted")) {
diff --git a/examples/getting-started/sms/respond-to-incoming-message/src/main/java/com/mycompany/app/sms/Controller.java b/examples/getting-started/sms/respond-to-incoming-message/src/main/java/com/mycompany/app/sms/Controller.java
index 0892d9399..c4b615291 100644
--- a/examples/getting-started/sms/respond-to-incoming-message/src/main/java/com/mycompany/app/sms/Controller.java
+++ b/examples/getting-started/sms/respond-to-incoming-message/src/main/java/com/mycompany/app/sms/Controller.java
@@ -1,9 +1,9 @@
 package com.mycompany.app.sms;
 
 import com.sinch.sdk.SinchClient;
-import com.sinch.sdk.domains.sms.api.v1.WebHooksService;
+import com.sinch.sdk.domains.sms.api.v1.SinchEventsService;
 import com.sinch.sdk.domains.sms.models.v1.inbounds.TextMessage;
-import com.sinch.sdk.domains.sms.models.v1.webhooks.SmsEvent;
+import com.sinch.sdk.domains.sms.models.v1.sinchevents.SmsSinchEvent;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -20,25 +20,25 @@
 public class Controller {
 
   private final SinchClient sinchClient;
-  private final ServerBusinessLogic webhooksBusinessLogic;
+  private final ServerBusinessLogic serverBusinessLogic;
 
-  @Value("${sms.webhooks.secret: }")
-  private String webhooksSecret;
+  @Value("${sms.sinchevents.secret: }")
+  private String sinchEventsSecret;
 
   @Autowired
-  public Controller(SinchClient sinchClient, ServerBusinessLogic webhooksBusinessLogic) {
+  public Controller(SinchClient sinchClient, ServerBusinessLogic serverBusinessLogic) {
     this.sinchClient = sinchClient;
-    this.webhooksBusinessLogic = webhooksBusinessLogic;
+    this.serverBusinessLogic = serverBusinessLogic;
   }
 
   @PostMapping(
-      value = "/SmsEvent",
+      value = "/SmsSinchEvent",
       consumes = MediaType.APPLICATION_JSON_VALUE,
       produces = MediaType.APPLICATION_JSON_VALUE)
   public ResponseEntity<Void> smsDeliveryEvent(
       @RequestHeader Map<String, String> headers, @RequestBody String body) {
 
-    WebHooksService webhooks = sinchClient.sms().v1().webhooks();
+    SinchEventsService sinchEvents = sinchClient.sms().v1().sinchEvents();
 
     // ensure valid authentication to handle request
     // See
@@ -48,8 +48,8 @@ public ResponseEntity<Void> smsDeliveryEvent(
     boolean ensureValidAuthentication = false;
     if (ensureValidAuthentication) {
       var validAuth =
-          webhooks.validateAuthenticationHeader(
-              webhooksSecret,
+          sinchEvents.validateAuthenticationHeader(
+              sinchEventsSecret,
               // request headers
               headers,
               // request payload body
@@ -62,11 +62,11 @@ public ResponseEntity<Void> smsDeliveryEvent(
     }
 
     // decode the request payload
-    SmsEvent event = webhooks.parseEvent(body);
+    SmsSinchEvent event = sinchEvents.parseEvent(body);
 
     // let business layer process the request
     switch (event) {
-      case TextMessage e -> webhooksBusinessLogic.processInboundEvent(e);
+      case TextMessage e -> serverBusinessLogic.processInboundEvent(e);
       default -> throw new IllegalStateException("Unexpected value: " + event);
     }
 
diff --git a/examples/getting-started/sms/respond-to-incoming-message/src/main/resources/application.yaml b/examples/getting-started/sms/respond-to-incoming-message/src/main/resources/application.yaml
index e23d1fa40..1f0f10a58 100644
--- a/examples/getting-started/sms/respond-to-incoming-message/src/main/resources/application.yaml
+++ b/examples/getting-started/sms/respond-to-incoming-message/src/main/resources/application.yaml
@@ -19,7 +19,7 @@ sms:
   # valid values are "us" and "eu"
   # See https://github.com/sinch/sinch-sdk-java/blob/main/client/src/main/com/sinch/sdk/models/SMSRegion.java for full list of supported values but with servicePlanID
   #region:
-  webhooks:
+  sinchevents:
     # Used when "ensureValidAuthentication" within [Controller.java](../java/com/mycompany/app/sms/Controller.java) is set to true
     secret:
 
diff --git a/examples/webhooks/src/main/java/com/mycompany/app/sms/Controller.java b/examples/webhooks/src/main/java/com/mycompany/app/sms/Controller.java
index 5b58c8150..2291ce5a0 100644
--- a/examples/webhooks/src/main/java/com/mycompany/app/sms/Controller.java
+++ b/examples/webhooks/src/main/java/com/mycompany/app/sms/Controller.java
@@ -1,10 +1,10 @@
 package com.mycompany.app.sms;
 
 import com.sinch.sdk.SinchClient;
-import com.sinch.sdk.domains.sms.api.v1.WebHooksService;
+import com.sinch.sdk.domains.sms.api.v1.SinchEventsService;
 import com.sinch.sdk.domains.sms.models.v1.deliveryreports.DeliveryReport;
 import com.sinch.sdk.domains.sms.models.v1.inbounds.InboundMessage;
-import com.sinch.sdk.domains.sms.models.v1.webhooks.SmsEvent;
+import com.sinch.sdk.domains.sms.models.v1.sinchevents.SmsSinchEvent;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -21,25 +21,25 @@
 public class Controller {
 
   private final SinchClient sinchClient;
-  private final ServerBusinessLogic webhooksBusinessLogic;
+  private final ServerBusinessLogic serverBusinessLogic;
 
-  @Value("${sms.webhooks.secret: }")
-  private String webhooksSecret;
+  @Value("${sms.sinchevents.secret: }")
+  private String sincheventsSecret;
 
   @Autowired
-  public Controller(SinchClient sinchClient, ServerBusinessLogic webhooksBusinessLogic) {
+  public Controller(SinchClient sinchClient, ServerBusinessLogic serverBusinessLogic) {
     this.sinchClient = sinchClient;
-    this.webhooksBusinessLogic = webhooksBusinessLogic;
+    this.serverBusinessLogic = serverBusinessLogic;
   }
 
   @PostMapping(
-      value = "/SmsEvent",
+      value = "/SmsSinchEvent",
       consumes = MediaType.APPLICATION_JSON_VALUE,
       produces = MediaType.APPLICATION_JSON_VALUE)
   public ResponseEntity<Void> smsEvent(
       @RequestHeader Map<String, String> headers, @RequestBody String body) {
 
-    WebHooksService webhooks = sinchClient.sms().v1().webhooks();
+    SinchEventsService sinchEvents = sinchClient.sms().v1().sinchEvents();
 
     // ensure valid authentication to handle request
     // See
@@ -52,8 +52,8 @@ public ResponseEntity<Void> smsEvent(
     boolean ensureValidAuthentication = false;
     if (ensureValidAuthentication) {
       var validAuth =
-          webhooks.validateAuthenticationHeader(
-              webhooksSecret,
+          sinchEvents.validateAuthenticationHeader(
+              sincheventsSecret,
               // request headers
               headers,
               // request payload body
@@ -66,12 +66,12 @@ public ResponseEntity<Void> smsEvent(
     }
 
     // decode the request payload
-    SmsEvent event = webhooks.parseEvent(body);
+    SmsSinchEvent event = sinchEvents.parseEvent(body);
 
     // let business layer process the request
     switch (event) {
-      case InboundMessage e -> webhooksBusinessLogic.processInboundEvent(e);
-      case DeliveryReport e -> webhooksBusinessLogic.processDeliveryReportEvent(e);
+      case InboundMessage e -> serverBusinessLogic.processInboundEvent(e);
+      case DeliveryReport e -> serverBusinessLogic.processDeliveryReportEvent(e);
       default -> throw new IllegalStateException("Unexpected value: " + event);
     }
 
diff --git a/examples/webhooks/src/main/java/com/mycompany/app/sms/ServerBusinessLogic.java b/examples/webhooks/src/main/java/com/mycompany/app/sms/ServerBusinessLogic.java
index a8dd2c9b2..69d07b786 100644
--- a/examples/webhooks/src/main/java/com/mycompany/app/sms/ServerBusinessLogic.java
+++ b/examples/webhooks/src/main/java/com/mycompany/app/sms/ServerBusinessLogic.java
@@ -2,7 +2,7 @@
 
 import com.sinch.sdk.domains.sms.models.v1.deliveryreports.DeliveryReport;
 import com.sinch.sdk.domains.sms.models.v1.inbounds.InboundMessage;
-import com.sinch.sdk.domains.sms.models.v1.webhooks.SmsEvent;
+import com.sinch.sdk.domains.sms.models.v1.sinchevents.SmsSinchEvent;
 import java.util.logging.Logger;
 import org.springframework.stereotype.Component;
 
@@ -19,7 +19,7 @@ public void processDeliveryReportEvent(DeliveryReport event) {
     trace(event);
   }
 
-  private void trace(SmsEvent event) {
+  private void trace(SmsSinchEvent event) {
     LOGGER.info("Handle event: " + event);
   }
 }
diff --git a/examples/webhooks/src/main/resources/application.yaml b/examples/webhooks/src/main/resources/application.yaml
index 493ab739d..62785d0bc 100644
--- a/examples/webhooks/src/main/resources/application.yaml
+++ b/examples/webhooks/src/main/resources/application.yaml
@@ -43,7 +43,7 @@ sms:
   # valid values are "us" and "eu"
   # See https://github.com/sinch/sinch-sdk-java/blob/main/client/src/main/com/sinch/sdk/models/SMSRegion.java for full list of supported values but with servicePlanID
   region:
-  webhooks:
-    # Secret value set for Sms webhooks calls validation
+  sinchevents:
+    # Secret value set for Sms Sinch Events calls validation
     # Used when "ensureValidAuthentication" within [Controller.java](../java/com/mycompany/app/sms/Controller.java) is set to true
     secret:
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/BinaryRequest.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/BinaryRequest.java
index 22112f175..d26bda691 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/BinaryRequest.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/BinaryRequest.java
@@ -118,9 +118,9 @@ public static String valueOf(TypeEnum e) {
    * set a default callback URL <a
    * href="https://community.sinch.com/t5/SMS/How-do-I-assign-a-callback-URL-to-an-SMS-service-plan/ta-p/8414">here</a>.
    *
-   * @return callbackUrl
+   * @return eventDestinationTarget
    */
-  String getCallbackUrl();
+  String getEventDestinationTarget();
 
   /**
    * The client identifier of a batch message. If set, the identifier will be added in the delivery
@@ -235,11 +235,11 @@ interface Builder {
     /**
      * see getter
      *
-     * @param callbackUrl see getter
+     * @param eventDestinationTarget see getter
      * @return Current builder
-     * @see #getCallbackUrl
+     * @see #getEventDestinationTarget
      */
-    Builder setCallbackUrl(String callbackUrl);
+    Builder setEventDestinationTarget(String eventDestinationTarget);
 
     /**
      * see getter
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/BinaryRequestImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/BinaryRequestImpl.java
index a88cfa917..73be455da 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/BinaryRequestImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/BinaryRequestImpl.java
@@ -66,7 +66,7 @@ public class BinaryRequestImpl implements BinaryRequest, BatchRequest {
 
   public static final String JSON_PROPERTY_CALLBACK_URL = "callback_url";
 
-  private OptionalValue<String> callbackUrl;
+  private OptionalValue<String> eventDestinationTarget;
 
   public static final String JSON_PROPERTY_CLIENT_REFERENCE = "client_reference";
 
@@ -95,7 +95,7 @@ protected BinaryRequestImpl(
       OptionalValue<DeliveryReportType> deliveryReport,
       OptionalValue<Instant> sendAt,
       OptionalValue<Instant> expireAt,
-      OptionalValue<String> callbackUrl,
+      OptionalValue<String> eventDestinationTarget,
       OptionalValue<String> clientReference,
       OptionalValue<Boolean> feedbackEnabled,
       OptionalValue<Integer> fromTon,
@@ -108,7 +108,7 @@ protected BinaryRequestImpl(
     this.deliveryReport = deliveryReport;
     this.sendAt = sendAt;
     this.expireAt = expireAt;
-    this.callbackUrl = callbackUrl;
+    this.eventDestinationTarget = eventDestinationTarget;
     this.clientReference = clientReference;
     this.feedbackEnabled = feedbackEnabled;
     this.fromTon = fromTon;
@@ -204,14 +204,14 @@ public OptionalValue<Instant> expireAt() {
   }
 
   @JsonIgnore
-  public String getCallbackUrl() {
-    return callbackUrl.orElse(null);
+  public String getEventDestinationTarget() {
+    return eventDestinationTarget.orElse(null);
   }
 
   @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public OptionalValue<String> callbackUrl() {
-    return callbackUrl;
+  public OptionalValue<String> eventDestinationTarget() {
+    return eventDestinationTarget;
   }
 
   @JsonIgnore
@@ -276,7 +276,7 @@ public boolean equals(Object o) {
         && Objects.equals(this.deliveryReport, binary.deliveryReport)
         && Objects.equals(this.sendAt, binary.sendAt)
         && Objects.equals(this.expireAt, binary.expireAt)
-        && Objects.equals(this.callbackUrl, binary.callbackUrl)
+        && Objects.equals(this.eventDestinationTarget, binary.eventDestinationTarget)
         && Objects.equals(this.clientReference, binary.clientReference)
         && Objects.equals(this.feedbackEnabled, binary.feedbackEnabled)
         && Objects.equals(this.fromTon, binary.fromTon)
@@ -294,7 +294,7 @@ public int hashCode() {
         deliveryReport,
         sendAt,
         expireAt,
-        callbackUrl,
+        eventDestinationTarget,
         clientReference,
         feedbackEnabled,
         fromTon,
@@ -313,7 +313,9 @@ public String toString() {
     sb.append("    deliveryReport: ").append(toIndentedString(deliveryReport)).append("\n");
     sb.append("    sendAt: ").append(toIndentedString(sendAt)).append("\n");
     sb.append("    expireAt: ").append(toIndentedString(expireAt)).append("\n");
-    sb.append("    callbackUrl: ").append(toIndentedString(callbackUrl)).append("\n");
+    sb.append("    eventDestinationTarget: ")
+        .append(toIndentedString(eventDestinationTarget))
+        .append("\n");
     sb.append("    clientReference: ").append(toIndentedString(clientReference)).append("\n");
     sb.append("    feedbackEnabled: ").append(toIndentedString(feedbackEnabled)).append("\n");
     sb.append("    fromTon: ").append(toIndentedString(fromTon)).append("\n");
@@ -342,7 +344,7 @@ static class Builder implements BinaryRequest.Builder {
     OptionalValue<DeliveryReportType> deliveryReport = OptionalValue.empty();
     OptionalValue<Instant> sendAt = OptionalValue.empty();
     OptionalValue<Instant> expireAt = OptionalValue.empty();
-    OptionalValue<String> callbackUrl = OptionalValue.empty();
+    OptionalValue<String> eventDestinationTarget = OptionalValue.empty();
     OptionalValue<String> clientReference = OptionalValue.empty();
     OptionalValue<Boolean> feedbackEnabled = OptionalValue.empty();
     OptionalValue<Integer> fromTon = OptionalValue.empty();
@@ -400,8 +402,8 @@ public Builder setExpireAt(Instant expireAt) {
     }
 
     @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
-    public Builder setCallbackUrl(String callbackUrl) {
-      this.callbackUrl = OptionalValue.of(callbackUrl);
+    public Builder setEventDestinationTarget(String eventDestinationTarget) {
+      this.eventDestinationTarget = OptionalValue.of(eventDestinationTarget);
       return this;
     }
 
@@ -439,7 +441,7 @@ public BinaryRequest build() {
           deliveryReport,
           sendAt,
           expireAt,
-          callbackUrl,
+          eventDestinationTarget,
           clientReference,
           feedbackEnabled,
           fromTon,
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/MediaRequest.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/MediaRequest.java
index 86c8033c4..2227153f4 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/MediaRequest.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/MediaRequest.java
@@ -115,9 +115,9 @@ public static String valueOf(TypeEnum e) {
   /**
    * Override the default callback URL for this batch. Must be valid URL.
    *
-   * @return callbackUrl
+   * @return eventDestinationTarget
    */
-  String getCallbackUrl();
+  String getEventDestinationTarget();
 
   /**
    * The client identifier of a batch message. If set, the identifier will be added in the delivery
@@ -224,11 +224,11 @@ interface Builder {
     /**
      * see getter
      *
-     * @param callbackUrl see getter
+     * @param eventDestinationTarget see getter
      * @return Current builder
-     * @see #getCallbackUrl
+     * @see #getEventDestinationTarget
      */
-    Builder setCallbackUrl(String callbackUrl);
+    Builder setEventDestinationTarget(String eventDestinationTarget);
 
     /**
      * see getter
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/MediaRequestImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/MediaRequestImpl.java
index ce08f29b2..33ebec12b 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/MediaRequestImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/MediaRequestImpl.java
@@ -67,7 +67,7 @@ public class MediaRequestImpl implements MediaRequest, BatchRequest {
 
   public static final String JSON_PROPERTY_CALLBACK_URL = "callback_url";
 
-  private OptionalValue<String> callbackUrl;
+  private OptionalValue<String> eventDestinationTarget;
 
   public static final String JSON_PROPERTY_CLIENT_REFERENCE = "client_reference";
 
@@ -92,7 +92,7 @@ protected MediaRequestImpl(
       OptionalValue<DeliveryReportType> deliveryReport,
       OptionalValue<Instant> sendAt,
       OptionalValue<Instant> expireAt,
-      OptionalValue<String> callbackUrl,
+      OptionalValue<String> eventDestinationTarget,
       OptionalValue<String> clientReference,
       OptionalValue<Boolean> feedbackEnabled,
       OptionalValue<Boolean> strictValidation) {
@@ -104,7 +104,7 @@ protected MediaRequestImpl(
     this.deliveryReport = deliveryReport;
     this.sendAt = sendAt;
     this.expireAt = expireAt;
-    this.callbackUrl = callbackUrl;
+    this.eventDestinationTarget = eventDestinationTarget;
     this.clientReference = clientReference;
     this.feedbackEnabled = feedbackEnabled;
     this.strictValidation = strictValidation;
@@ -199,14 +199,14 @@ public OptionalValue<Instant> expireAt() {
   }
 
   @JsonIgnore
-  public String getCallbackUrl() {
-    return callbackUrl.orElse(null);
+  public String getEventDestinationTarget() {
+    return eventDestinationTarget.orElse(null);
   }
 
   @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public OptionalValue<String> callbackUrl() {
-    return callbackUrl;
+  public OptionalValue<String> eventDestinationTarget() {
+    return eventDestinationTarget;
   }
 
   @JsonIgnore
@@ -260,7 +260,7 @@ public boolean equals(Object o) {
         && Objects.equals(this.deliveryReport, media.deliveryReport)
         && Objects.equals(this.sendAt, media.sendAt)
         && Objects.equals(this.expireAt, media.expireAt)
-        && Objects.equals(this.callbackUrl, media.callbackUrl)
+        && Objects.equals(this.eventDestinationTarget, media.eventDestinationTarget)
         && Objects.equals(this.clientReference, media.clientReference)
         && Objects.equals(this.feedbackEnabled, media.feedbackEnabled)
         && Objects.equals(this.strictValidation, media.strictValidation);
@@ -277,7 +277,7 @@ public int hashCode() {
         deliveryReport,
         sendAt,
         expireAt,
-        callbackUrl,
+        eventDestinationTarget,
         clientReference,
         feedbackEnabled,
         strictValidation);
@@ -295,7 +295,9 @@ public String toString() {
     sb.append("    deliveryReport: ").append(toIndentedString(deliveryReport)).append("\n");
     sb.append("    sendAt: ").append(toIndentedString(sendAt)).append("\n");
     sb.append("    expireAt: ").append(toIndentedString(expireAt)).append("\n");
-    sb.append("    callbackUrl: ").append(toIndentedString(callbackUrl)).append("\n");
+    sb.append("    eventDestinationTarget: ")
+        .append(toIndentedString(eventDestinationTarget))
+        .append("\n");
     sb.append("    clientReference: ").append(toIndentedString(clientReference)).append("\n");
     sb.append("    feedbackEnabled: ").append(toIndentedString(feedbackEnabled)).append("\n");
     sb.append("    strictValidation: ").append(toIndentedString(strictValidation)).append("\n");
@@ -323,7 +325,7 @@ static class Builder implements MediaRequest.Builder {
     OptionalValue<DeliveryReportType> deliveryReport = OptionalValue.empty();
     OptionalValue<Instant> sendAt = OptionalValue.empty();
     OptionalValue<Instant> expireAt = OptionalValue.empty();
-    OptionalValue<String> callbackUrl = OptionalValue.empty();
+    OptionalValue<String> eventDestinationTarget = OptionalValue.empty();
     OptionalValue<String> clientReference = OptionalValue.empty();
     OptionalValue<Boolean> feedbackEnabled = OptionalValue.empty();
     OptionalValue<Boolean> strictValidation = OptionalValue.empty();
@@ -380,8 +382,8 @@ public Builder setExpireAt(Instant expireAt) {
     }
 
     @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
-    public Builder setCallbackUrl(String callbackUrl) {
-      this.callbackUrl = OptionalValue.of(callbackUrl);
+    public Builder setEventDestinationTarget(String eventDestinationTarget) {
+      this.eventDestinationTarget = OptionalValue.of(eventDestinationTarget);
       return this;
     }
 
@@ -413,7 +415,7 @@ public MediaRequest build() {
           deliveryReport,
           sendAt,
           expireAt,
-          callbackUrl,
+          eventDestinationTarget,
           clientReference,
           feedbackEnabled,
           strictValidation);
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/TextRequest.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/TextRequest.java
index 223a92681..cf64b30fd 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/TextRequest.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/TextRequest.java
@@ -116,9 +116,9 @@ public static String valueOf(TypeEnum e) {
    * set a default callback URL <a
    * href="https://community.sinch.com/t5/SMS/How-do-I-assign-a-callback-URL-to-an-SMS-service-plan/ta-p/8414">here</a>.
    *
-   * @return callbackUrl
+   * @return eventDestinationTarget
    */
-  String getCallbackUrl();
+  String getEventDestinationTarget();
 
   /**
    * The client identifier of a batch message. If set, the identifier will be added in the delivery
@@ -257,11 +257,11 @@ interface Builder {
     /**
      * see getter
      *
-     * @param callbackUrl see getter
+     * @param eventDestinationTarget see getter
      * @return Current builder
-     * @see #getCallbackUrl
+     * @see #getEventDestinationTarget
      */
-    Builder setCallbackUrl(String callbackUrl);
+    Builder setEventDestinationTarget(String eventDestinationTarget);
 
     /**
      * see getter
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/TextRequestImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/TextRequestImpl.java
index 7e23e742a..b252e28db 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/TextRequestImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/TextRequestImpl.java
@@ -70,7 +70,7 @@ public class TextRequestImpl implements TextRequest, BatchRequest {
 
   public static final String JSON_PROPERTY_CALLBACK_URL = "callback_url";
 
-  private OptionalValue<String> callbackUrl;
+  private OptionalValue<String> eventDestinationTarget;
 
   public static final String JSON_PROPERTY_CLIENT_REFERENCE = "client_reference";
 
@@ -112,7 +112,7 @@ protected TextRequestImpl(
       OptionalValue<DeliveryReportType> deliveryReport,
       OptionalValue<Instant> sendAt,
       OptionalValue<Instant> expireAt,
-      OptionalValue<String> callbackUrl,
+      OptionalValue<String> eventDestinationTarget,
       OptionalValue<String> clientReference,
       OptionalValue<Boolean> feedbackEnabled,
       OptionalValue<Boolean> flashMessage,
@@ -128,7 +128,7 @@ protected TextRequestImpl(
     this.deliveryReport = deliveryReport;
     this.sendAt = sendAt;
     this.expireAt = expireAt;
-    this.callbackUrl = callbackUrl;
+    this.eventDestinationTarget = eventDestinationTarget;
     this.clientReference = clientReference;
     this.feedbackEnabled = feedbackEnabled;
     this.flashMessage = flashMessage;
@@ -227,14 +227,14 @@ public OptionalValue<Instant> expireAt() {
   }
 
   @JsonIgnore
-  public String getCallbackUrl() {
-    return callbackUrl.orElse(null);
+  public String getEventDestinationTarget() {
+    return eventDestinationTarget.orElse(null);
   }
 
   @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public OptionalValue<String> callbackUrl() {
-    return callbackUrl;
+  public OptionalValue<String> eventDestinationTarget() {
+    return eventDestinationTarget;
   }
 
   @JsonIgnore
@@ -332,7 +332,7 @@ public boolean equals(Object o) {
         && Objects.equals(this.deliveryReport, text.deliveryReport)
         && Objects.equals(this.sendAt, text.sendAt)
         && Objects.equals(this.expireAt, text.expireAt)
-        && Objects.equals(this.callbackUrl, text.callbackUrl)
+        && Objects.equals(this.eventDestinationTarget, text.eventDestinationTarget)
         && Objects.equals(this.clientReference, text.clientReference)
         && Objects.equals(this.feedbackEnabled, text.feedbackEnabled)
         && Objects.equals(this.flashMessage, text.flashMessage)
@@ -353,7 +353,7 @@ public int hashCode() {
         deliveryReport,
         sendAt,
         expireAt,
-        callbackUrl,
+        eventDestinationTarget,
         clientReference,
         feedbackEnabled,
         flashMessage,
@@ -375,7 +375,9 @@ public String toString() {
     sb.append("    deliveryReport: ").append(toIndentedString(deliveryReport)).append("\n");
     sb.append("    sendAt: ").append(toIndentedString(sendAt)).append("\n");
     sb.append("    expireAt: ").append(toIndentedString(expireAt)).append("\n");
-    sb.append("    callbackUrl: ").append(toIndentedString(callbackUrl)).append("\n");
+    sb.append("    eventDestinationTarget: ")
+        .append(toIndentedString(eventDestinationTarget))
+        .append("\n");
     sb.append("    clientReference: ").append(toIndentedString(clientReference)).append("\n");
     sb.append("    feedbackEnabled: ").append(toIndentedString(feedbackEnabled)).append("\n");
     sb.append("    flashMessage: ").append(toIndentedString(flashMessage)).append("\n");
@@ -409,7 +411,7 @@ static class Builder implements TextRequest.Builder {
     OptionalValue<DeliveryReportType> deliveryReport = OptionalValue.empty();
     OptionalValue<Instant> sendAt = OptionalValue.empty();
     OptionalValue<Instant> expireAt = OptionalValue.empty();
-    OptionalValue<String> callbackUrl = OptionalValue.empty();
+    OptionalValue<String> eventDestinationTarget = OptionalValue.empty();
     OptionalValue<String> clientReference = OptionalValue.empty();
     OptionalValue<Boolean> feedbackEnabled = OptionalValue.empty();
     OptionalValue<Boolean> flashMessage = OptionalValue.empty();
@@ -470,8 +472,8 @@ public Builder setExpireAt(Instant expireAt) {
     }
 
     @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
-    public Builder setCallbackUrl(String callbackUrl) {
-      this.callbackUrl = OptionalValue.of(callbackUrl);
+    public Builder setEventDestinationTarget(String eventDestinationTarget) {
+      this.eventDestinationTarget = OptionalValue.of(eventDestinationTarget);
       return this;
     }
 
@@ -527,7 +529,7 @@ public TextRequest build() {
           deliveryReport,
           sendAt,
           expireAt,
-          callbackUrl,
+          eventDestinationTarget,
           clientReference,
           feedbackEnabled,
           flashMessage,
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateBinaryRequest.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateBinaryRequest.java
index 719460738..e3c1a9774 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateBinaryRequest.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateBinaryRequest.java
@@ -99,9 +99,9 @@ public static String valueOf(TypeEnum e) {
   /**
    * Override the default callback URL for this batch. Constraints: Must be valid URL.
    *
-   * @return callbackUrl
+   * @return eventDestinationTarget
    */
-  String getCallbackUrl();
+  String getEventDestinationTarget();
 
   /**
    * The client identifier of a batch message. If set, the identifier will be added in the delivery
@@ -223,11 +223,11 @@ interface Builder {
     /**
      * see getter
      *
-     * @param callbackUrl see getter
+     * @param eventDestinationTarget see getter
      * @return Current builder
-     * @see #getCallbackUrl
+     * @see #getEventDestinationTarget
      */
-    Builder setCallbackUrl(String callbackUrl);
+    Builder setEventDestinationTarget(String eventDestinationTarget);
 
     /**
      * see getter
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateBinaryRequestImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateBinaryRequestImpl.java
index a9413ef4e..9c3ac94ee 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateBinaryRequestImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateBinaryRequestImpl.java
@@ -63,7 +63,7 @@ public class UpdateBinaryRequestImpl implements UpdateBinaryRequest, UpdateBatch
 
   public static final String JSON_PROPERTY_CALLBACK_URL = "callback_url";
 
-  private OptionalValue<String> callbackUrl;
+  private OptionalValue<String> eventDestinationTarget;
 
   public static final String JSON_PROPERTY_CLIENT_REFERENCE = "client_reference";
 
@@ -99,7 +99,7 @@ protected UpdateBinaryRequestImpl(
       OptionalValue<DeliveryReportType> deliveryReport,
       OptionalValue<Instant> sendAt,
       OptionalValue<Instant> expireAt,
-      OptionalValue<String> callbackUrl,
+      OptionalValue<String> eventDestinationTarget,
       OptionalValue<String> clientReference,
       OptionalValue<Boolean> feedbackEnabled,
       OptionalValue<String> body,
@@ -113,7 +113,7 @@ protected UpdateBinaryRequestImpl(
     this.deliveryReport = deliveryReport;
     this.sendAt = sendAt;
     this.expireAt = expireAt;
-    this.callbackUrl = callbackUrl;
+    this.eventDestinationTarget = eventDestinationTarget;
     this.clientReference = clientReference;
     this.feedbackEnabled = feedbackEnabled;
     this.body = body;
@@ -200,14 +200,14 @@ public OptionalValue<Instant> expireAt() {
   }
 
   @JsonIgnore
-  public String getCallbackUrl() {
-    return callbackUrl.orElse(null);
+  public String getEventDestinationTarget() {
+    return eventDestinationTarget.orElse(null);
   }
 
   @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public OptionalValue<String> callbackUrl() {
-    return callbackUrl;
+  public OptionalValue<String> eventDestinationTarget() {
+    return eventDestinationTarget;
   }
 
   @JsonIgnore
@@ -293,7 +293,7 @@ public boolean equals(Object o) {
         && Objects.equals(this.deliveryReport, updateBinaryMessage.deliveryReport)
         && Objects.equals(this.sendAt, updateBinaryMessage.sendAt)
         && Objects.equals(this.expireAt, updateBinaryMessage.expireAt)
-        && Objects.equals(this.callbackUrl, updateBinaryMessage.callbackUrl)
+        && Objects.equals(this.eventDestinationTarget, updateBinaryMessage.eventDestinationTarget)
         && Objects.equals(this.clientReference, updateBinaryMessage.clientReference)
         && Objects.equals(this.feedbackEnabled, updateBinaryMessage.feedbackEnabled)
         && Objects.equals(this.body, updateBinaryMessage.body)
@@ -312,7 +312,7 @@ public int hashCode() {
         deliveryReport,
         sendAt,
         expireAt,
-        callbackUrl,
+        eventDestinationTarget,
         clientReference,
         feedbackEnabled,
         body,
@@ -332,7 +332,9 @@ public String toString() {
     sb.append("    deliveryReport: ").append(toIndentedString(deliveryReport)).append("\n");
     sb.append("    sendAt: ").append(toIndentedString(sendAt)).append("\n");
     sb.append("    expireAt: ").append(toIndentedString(expireAt)).append("\n");
-    sb.append("    callbackUrl: ").append(toIndentedString(callbackUrl)).append("\n");
+    sb.append("    eventDestinationTarget: ")
+        .append(toIndentedString(eventDestinationTarget))
+        .append("\n");
     sb.append("    clientReference: ").append(toIndentedString(clientReference)).append("\n");
     sb.append("    feedbackEnabled: ").append(toIndentedString(feedbackEnabled)).append("\n");
     sb.append("    body: ").append(toIndentedString(body)).append("\n");
@@ -362,7 +364,7 @@ static class Builder implements UpdateBinaryRequest.Builder {
     OptionalValue<DeliveryReportType> deliveryReport = OptionalValue.empty();
     OptionalValue<Instant> sendAt = OptionalValue.empty();
     OptionalValue<Instant> expireAt = OptionalValue.empty();
-    OptionalValue<String> callbackUrl = OptionalValue.empty();
+    OptionalValue<String> eventDestinationTarget = OptionalValue.empty();
     OptionalValue<String> clientReference = OptionalValue.empty();
     OptionalValue<Boolean> feedbackEnabled = OptionalValue.empty();
     OptionalValue<String> body = OptionalValue.empty();
@@ -416,8 +418,8 @@ public Builder setExpireAt(Instant expireAt) {
     }
 
     @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
-    public Builder setCallbackUrl(String callbackUrl) {
-      this.callbackUrl = OptionalValue.of(callbackUrl);
+    public Builder setEventDestinationTarget(String eventDestinationTarget) {
+      this.eventDestinationTarget = OptionalValue.of(eventDestinationTarget);
       return this;
     }
 
@@ -466,7 +468,7 @@ public UpdateBinaryRequest build() {
           deliveryReport,
           sendAt,
           expireAt,
-          callbackUrl,
+          eventDestinationTarget,
           clientReference,
           feedbackEnabled,
           body,
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateMediaRequest.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateMediaRequest.java
index b6f447246..cc9fbdd4f 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateMediaRequest.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateMediaRequest.java
@@ -98,9 +98,9 @@ public static String valueOf(TypeEnum e) {
   /**
    * Override the default callback URL for this batch. Constraints: Must be valid URL.
    *
-   * @return callbackUrl
+   * @return eventDestinationTarget
    */
-  String getCallbackUrl();
+  String getEventDestinationTarget();
 
   /**
    * The client identifier of a batch message. If set, the identifier will be added in the delivery
@@ -214,11 +214,11 @@ interface Builder {
     /**
      * see getter
      *
-     * @param callbackUrl see getter
+     * @param eventDestinationTarget see getter
      * @return Current builder
-     * @see #getCallbackUrl
+     * @see #getEventDestinationTarget
      */
-    Builder setCallbackUrl(String callbackUrl);
+    Builder setEventDestinationTarget(String eventDestinationTarget);
 
     /**
      * see getter
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateMediaRequestImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateMediaRequestImpl.java
index 8b61d26ef..623a1f064 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateMediaRequestImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateMediaRequestImpl.java
@@ -64,7 +64,7 @@ public class UpdateMediaRequestImpl implements UpdateMediaRequest, UpdateBatchRe
 
   public static final String JSON_PROPERTY_CALLBACK_URL = "callback_url";
 
-  private OptionalValue<String> callbackUrl;
+  private OptionalValue<String> eventDestinationTarget;
 
   public static final String JSON_PROPERTY_CLIENT_REFERENCE = "client_reference";
 
@@ -96,7 +96,7 @@ protected UpdateMediaRequestImpl(
       OptionalValue<DeliveryReportType> deliveryReport,
       OptionalValue<Instant> sendAt,
       OptionalValue<Instant> expireAt,
-      OptionalValue<String> callbackUrl,
+      OptionalValue<String> eventDestinationTarget,
       OptionalValue<String> clientReference,
       OptionalValue<Boolean> feedbackEnabled,
       OptionalValue<MediaBody> body,
@@ -109,7 +109,7 @@ protected UpdateMediaRequestImpl(
     this.deliveryReport = deliveryReport;
     this.sendAt = sendAt;
     this.expireAt = expireAt;
-    this.callbackUrl = callbackUrl;
+    this.eventDestinationTarget = eventDestinationTarget;
     this.clientReference = clientReference;
     this.feedbackEnabled = feedbackEnabled;
     this.body = body;
@@ -195,14 +195,14 @@ public OptionalValue<Instant> expireAt() {
   }
 
   @JsonIgnore
-  public String getCallbackUrl() {
-    return callbackUrl.orElse(null);
+  public String getEventDestinationTarget() {
+    return eventDestinationTarget.orElse(null);
   }
 
   @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public OptionalValue<String> callbackUrl() {
-    return callbackUrl;
+  public OptionalValue<String> eventDestinationTarget() {
+    return eventDestinationTarget;
   }
 
   @JsonIgnore
@@ -277,7 +277,7 @@ public boolean equals(Object o) {
         && Objects.equals(this.deliveryReport, updateMediaMessage.deliveryReport)
         && Objects.equals(this.sendAt, updateMediaMessage.sendAt)
         && Objects.equals(this.expireAt, updateMediaMessage.expireAt)
-        && Objects.equals(this.callbackUrl, updateMediaMessage.callbackUrl)
+        && Objects.equals(this.eventDestinationTarget, updateMediaMessage.eventDestinationTarget)
         && Objects.equals(this.clientReference, updateMediaMessage.clientReference)
         && Objects.equals(this.feedbackEnabled, updateMediaMessage.feedbackEnabled)
         && Objects.equals(this.body, updateMediaMessage.body)
@@ -295,7 +295,7 @@ public int hashCode() {
         deliveryReport,
         sendAt,
         expireAt,
-        callbackUrl,
+        eventDestinationTarget,
         clientReference,
         feedbackEnabled,
         body,
@@ -314,7 +314,9 @@ public String toString() {
     sb.append("    deliveryReport: ").append(toIndentedString(deliveryReport)).append("\n");
     sb.append("    sendAt: ").append(toIndentedString(sendAt)).append("\n");
     sb.append("    expireAt: ").append(toIndentedString(expireAt)).append("\n");
-    sb.append("    callbackUrl: ").append(toIndentedString(callbackUrl)).append("\n");
+    sb.append("    eventDestinationTarget: ")
+        .append(toIndentedString(eventDestinationTarget))
+        .append("\n");
     sb.append("    clientReference: ").append(toIndentedString(clientReference)).append("\n");
     sb.append("    feedbackEnabled: ").append(toIndentedString(feedbackEnabled)).append("\n");
     sb.append("    body: ").append(toIndentedString(body)).append("\n");
@@ -343,7 +345,7 @@ static class Builder implements UpdateMediaRequest.Builder {
     OptionalValue<DeliveryReportType> deliveryReport = OptionalValue.empty();
     OptionalValue<Instant> sendAt = OptionalValue.empty();
     OptionalValue<Instant> expireAt = OptionalValue.empty();
-    OptionalValue<String> callbackUrl = OptionalValue.empty();
+    OptionalValue<String> eventDestinationTarget = OptionalValue.empty();
     OptionalValue<String> clientReference = OptionalValue.empty();
     OptionalValue<Boolean> feedbackEnabled = OptionalValue.empty();
     OptionalValue<MediaBody> body = OptionalValue.empty();
@@ -396,8 +398,8 @@ public Builder setExpireAt(Instant expireAt) {
     }
 
     @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
-    public Builder setCallbackUrl(String callbackUrl) {
-      this.callbackUrl = OptionalValue.of(callbackUrl);
+    public Builder setEventDestinationTarget(String eventDestinationTarget) {
+      this.eventDestinationTarget = OptionalValue.of(eventDestinationTarget);
       return this;
     }
 
@@ -440,7 +442,7 @@ public UpdateMediaRequest build() {
           deliveryReport,
           sendAt,
           expireAt,
-          callbackUrl,
+          eventDestinationTarget,
           clientReference,
           feedbackEnabled,
           body,
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateTextRequest.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateTextRequest.java
index c45ec05a2..97203f1a4 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateTextRequest.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateTextRequest.java
@@ -97,9 +97,9 @@ public static String valueOf(TypeEnum e) {
   /**
    * Override the default callback URL for this batch. Constraints: Must be valid URL.
    *
-   * @return callbackUrl
+   * @return eventDestinationTarget
    */
-  String getCallbackUrl();
+  String getEventDestinationTarget();
 
   /**
    * The client identifier of a batch message. If set, the identifier will be added in the delivery
@@ -245,11 +245,11 @@ interface Builder {
     /**
      * see getter
      *
-     * @param callbackUrl see getter
+     * @param eventDestinationTarget see getter
      * @return Current builder
-     * @see #getCallbackUrl
+     * @see #getEventDestinationTarget
      */
-    Builder setCallbackUrl(String callbackUrl);
+    Builder setEventDestinationTarget(String eventDestinationTarget);
 
     /**
      * see getter
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateTextRequestImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateTextRequestImpl.java
index 45660cbe6..1357451ef 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateTextRequestImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateTextRequestImpl.java
@@ -67,7 +67,7 @@ public class UpdateTextRequestImpl implements UpdateTextRequest, UpdateBatchRequ
 
   public static final String JSON_PROPERTY_CALLBACK_URL = "callback_url";
 
-  private OptionalValue<String> callbackUrl;
+  private OptionalValue<String> eventDestinationTarget;
 
   public static final String JSON_PROPERTY_CLIENT_REFERENCE = "client_reference";
 
@@ -116,7 +116,7 @@ protected UpdateTextRequestImpl(
       OptionalValue<DeliveryReportType> deliveryReport,
       OptionalValue<Instant> sendAt,
       OptionalValue<Instant> expireAt,
-      OptionalValue<String> callbackUrl,
+      OptionalValue<String> eventDestinationTarget,
       OptionalValue<String> clientReference,
       OptionalValue<Boolean> feedbackEnabled,
       OptionalValue<Map<String, Map<String, String>>> parameters,
@@ -133,7 +133,7 @@ protected UpdateTextRequestImpl(
     this.deliveryReport = deliveryReport;
     this.sendAt = sendAt;
     this.expireAt = expireAt;
-    this.callbackUrl = callbackUrl;
+    this.eventDestinationTarget = eventDestinationTarget;
     this.clientReference = clientReference;
     this.feedbackEnabled = feedbackEnabled;
     this.parameters = parameters;
@@ -223,14 +223,14 @@ public OptionalValue<Instant> expireAt() {
   }
 
   @JsonIgnore
-  public String getCallbackUrl() {
-    return callbackUrl.orElse(null);
+  public String getEventDestinationTarget() {
+    return eventDestinationTarget.orElse(null);
   }
 
   @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public OptionalValue<String> callbackUrl() {
-    return callbackUrl;
+  public OptionalValue<String> eventDestinationTarget() {
+    return eventDestinationTarget;
   }
 
   @JsonIgnore
@@ -349,7 +349,7 @@ public boolean equals(Object o) {
         && Objects.equals(this.deliveryReport, updateTextMessage.deliveryReport)
         && Objects.equals(this.sendAt, updateTextMessage.sendAt)
         && Objects.equals(this.expireAt, updateTextMessage.expireAt)
-        && Objects.equals(this.callbackUrl, updateTextMessage.callbackUrl)
+        && Objects.equals(this.eventDestinationTarget, updateTextMessage.eventDestinationTarget)
         && Objects.equals(this.clientReference, updateTextMessage.clientReference)
         && Objects.equals(this.feedbackEnabled, updateTextMessage.feedbackEnabled)
         && Objects.equals(this.parameters, updateTextMessage.parameters)
@@ -371,7 +371,7 @@ public int hashCode() {
         deliveryReport,
         sendAt,
         expireAt,
-        callbackUrl,
+        eventDestinationTarget,
         clientReference,
         feedbackEnabled,
         parameters,
@@ -394,7 +394,9 @@ public String toString() {
     sb.append("    deliveryReport: ").append(toIndentedString(deliveryReport)).append("\n");
     sb.append("    sendAt: ").append(toIndentedString(sendAt)).append("\n");
     sb.append("    expireAt: ").append(toIndentedString(expireAt)).append("\n");
-    sb.append("    callbackUrl: ").append(toIndentedString(callbackUrl)).append("\n");
+    sb.append("    eventDestinationTarget: ")
+        .append(toIndentedString(eventDestinationTarget))
+        .append("\n");
     sb.append("    clientReference: ").append(toIndentedString(clientReference)).append("\n");
     sb.append("    feedbackEnabled: ").append(toIndentedString(feedbackEnabled)).append("\n");
     sb.append("    parameters: ").append(toIndentedString(parameters)).append("\n");
@@ -429,7 +431,7 @@ static class Builder implements UpdateTextRequest.Builder {
     OptionalValue<DeliveryReportType> deliveryReport = OptionalValue.empty();
     OptionalValue<Instant> sendAt = OptionalValue.empty();
     OptionalValue<Instant> expireAt = OptionalValue.empty();
-    OptionalValue<String> callbackUrl = OptionalValue.empty();
+    OptionalValue<String> eventDestinationTarget = OptionalValue.empty();
     OptionalValue<String> clientReference = OptionalValue.empty();
     OptionalValue<Boolean> feedbackEnabled = OptionalValue.empty();
     OptionalValue<Map<String, Map<String, String>>> parameters = OptionalValue.empty();
@@ -486,8 +488,8 @@ public Builder setExpireAt(Instant expireAt) {
     }
 
     @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
-    public Builder setCallbackUrl(String callbackUrl) {
-      this.callbackUrl = OptionalValue.of(callbackUrl);
+    public Builder setEventDestinationTarget(String eventDestinationTarget) {
+      this.eventDestinationTarget = OptionalValue.of(eventDestinationTarget);
       return this;
     }
 
@@ -554,7 +556,7 @@ public UpdateTextRequest build() {
           deliveryReport,
           sendAt,
           expireAt,
-          callbackUrl,
+          eventDestinationTarget,
           clientReference,
           feedbackEnabled,
           parameters,
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/BinaryResponse.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/BinaryResponse.java
index f8416bfa1..71e942cf4 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/BinaryResponse.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/BinaryResponse.java
@@ -145,9 +145,9 @@ public static String valueOf(TypeEnum e) {
   /**
    * The callback URL provided in the request.
    *
-   * @return callbackUrl
+   * @return eventDestinationTarget
    */
-  String getCallbackUrl();
+  String getEventDestinationTarget();
 
   /**
    * The string input to identify this batch message. If set, the identifier will be added in the
@@ -302,11 +302,11 @@ interface Builder {
     /**
      * see getter
      *
-     * @param callbackUrl see getter
+     * @param eventDestinationTarget see getter
      * @return Current builder
-     * @see #getCallbackUrl
+     * @see #getEventDestinationTarget
      */
-    Builder setCallbackUrl(String callbackUrl);
+    Builder setEventDestinationTarget(String eventDestinationTarget);
 
     /**
      * see getter
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/BinaryResponseImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/BinaryResponseImpl.java
index 37baeadfb..a9b9394d0 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/BinaryResponseImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/BinaryResponseImpl.java
@@ -86,7 +86,7 @@ public class BinaryResponseImpl implements BinaryResponse, BatchResponse {
 
   public static final String JSON_PROPERTY_CALLBACK_URL = "callback_url";
 
-  private OptionalValue<String> callbackUrl;
+  private OptionalValue<String> eventDestinationTarget;
 
   public static final String JSON_PROPERTY_CLIENT_REFERENCE = "client_reference";
 
@@ -119,7 +119,7 @@ protected BinaryResponseImpl(
       OptionalValue<DeliveryReportType> deliveryReport,
       OptionalValue<Instant> sendAt,
       OptionalValue<Instant> expireAt,
-      OptionalValue<String> callbackUrl,
+      OptionalValue<String> eventDestinationTarget,
       OptionalValue<String> clientReference,
       OptionalValue<Boolean> feedbackEnabled,
       OptionalValue<Integer> fromTon,
@@ -136,7 +136,7 @@ protected BinaryResponseImpl(
     this.deliveryReport = deliveryReport;
     this.sendAt = sendAt;
     this.expireAt = expireAt;
-    this.callbackUrl = callbackUrl;
+    this.eventDestinationTarget = eventDestinationTarget;
     this.clientReference = clientReference;
     this.feedbackEnabled = feedbackEnabled;
     this.fromTon = fromTon;
@@ -272,14 +272,14 @@ public OptionalValue<Instant> expireAt() {
   }
 
   @JsonIgnore
-  public String getCallbackUrl() {
-    return callbackUrl.orElse(null);
+  public String getEventDestinationTarget() {
+    return eventDestinationTarget.orElse(null);
   }
 
   @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public OptionalValue<String> callbackUrl() {
-    return callbackUrl;
+  public OptionalValue<String> eventDestinationTarget() {
+    return eventDestinationTarget;
   }
 
   @JsonIgnore
@@ -348,7 +348,7 @@ public boolean equals(Object o) {
         && Objects.equals(this.deliveryReport, binaryResponse.deliveryReport)
         && Objects.equals(this.sendAt, binaryResponse.sendAt)
         && Objects.equals(this.expireAt, binaryResponse.expireAt)
-        && Objects.equals(this.callbackUrl, binaryResponse.callbackUrl)
+        && Objects.equals(this.eventDestinationTarget, binaryResponse.eventDestinationTarget)
         && Objects.equals(this.clientReference, binaryResponse.clientReference)
         && Objects.equals(this.feedbackEnabled, binaryResponse.feedbackEnabled)
         && Objects.equals(this.fromTon, binaryResponse.fromTon)
@@ -370,7 +370,7 @@ public int hashCode() {
         deliveryReport,
         sendAt,
         expireAt,
-        callbackUrl,
+        eventDestinationTarget,
         clientReference,
         feedbackEnabled,
         fromTon,
@@ -393,7 +393,9 @@ public String toString() {
     sb.append("    deliveryReport: ").append(toIndentedString(deliveryReport)).append("\n");
     sb.append("    sendAt: ").append(toIndentedString(sendAt)).append("\n");
     sb.append("    expireAt: ").append(toIndentedString(expireAt)).append("\n");
-    sb.append("    callbackUrl: ").append(toIndentedString(callbackUrl)).append("\n");
+    sb.append("    eventDestinationTarget: ")
+        .append(toIndentedString(eventDestinationTarget))
+        .append("\n");
     sb.append("    clientReference: ").append(toIndentedString(clientReference)).append("\n");
     sb.append("    feedbackEnabled: ").append(toIndentedString(feedbackEnabled)).append("\n");
     sb.append("    fromTon: ").append(toIndentedString(fromTon)).append("\n");
@@ -426,7 +428,7 @@ static class Builder implements BinaryResponse.Builder {
     OptionalValue<DeliveryReportType> deliveryReport = OptionalValue.empty();
     OptionalValue<Instant> sendAt = OptionalValue.empty();
     OptionalValue<Instant> expireAt = OptionalValue.empty();
-    OptionalValue<String> callbackUrl = OptionalValue.empty();
+    OptionalValue<String> eventDestinationTarget = OptionalValue.empty();
     OptionalValue<String> clientReference = OptionalValue.empty();
     OptionalValue<Boolean> feedbackEnabled = OptionalValue.empty();
     OptionalValue<Integer> fromTon = OptionalValue.empty();
@@ -508,8 +510,8 @@ public Builder setExpireAt(Instant expireAt) {
     }
 
     @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
-    public Builder setCallbackUrl(String callbackUrl) {
-      this.callbackUrl = OptionalValue.of(callbackUrl);
+    public Builder setEventDestinationTarget(String eventDestinationTarget) {
+      this.eventDestinationTarget = OptionalValue.of(eventDestinationTarget);
       return this;
     }
 
@@ -551,7 +553,7 @@ public BinaryResponse build() {
           deliveryReport,
           sendAt,
           expireAt,
-          callbackUrl,
+          eventDestinationTarget,
           clientReference,
           feedbackEnabled,
           fromTon,
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/MediaResponse.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/MediaResponse.java
index a3fbcc56d..23076274b 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/MediaResponse.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/MediaResponse.java
@@ -139,9 +139,9 @@ public static String valueOf(TypeEnum e) {
   /**
    * Override the default callback URL for this batch. Must be valid URL.
    *
-   * @return callbackUrl
+   * @return eventDestinationTarget
    */
-  String getCallbackUrl();
+  String getEventDestinationTarget();
 
   /**
    * The client identifier of a batch message. If set, the identifier will be added in the delivery
@@ -288,11 +288,11 @@ interface Builder {
     /**
      * see getter
      *
-     * @param callbackUrl see getter
+     * @param eventDestinationTarget see getter
      * @return Current builder
-     * @see #getCallbackUrl
+     * @see #getEventDestinationTarget
      */
-    Builder setCallbackUrl(String callbackUrl);
+    Builder setEventDestinationTarget(String eventDestinationTarget);
 
     /**
      * see getter
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/MediaResponseImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/MediaResponseImpl.java
index eb22db7f7..7365be453 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/MediaResponseImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/MediaResponseImpl.java
@@ -87,7 +87,7 @@ public class MediaResponseImpl implements MediaResponse, BatchResponse {
 
   public static final String JSON_PROPERTY_CALLBACK_URL = "callback_url";
 
-  private OptionalValue<String> callbackUrl;
+  private OptionalValue<String> eventDestinationTarget;
 
   public static final String JSON_PROPERTY_CLIENT_REFERENCE = "client_reference";
 
@@ -116,7 +116,7 @@ protected MediaResponseImpl(
       OptionalValue<DeliveryReportType> deliveryReport,
       OptionalValue<Instant> sendAt,
       OptionalValue<Instant> expireAt,
-      OptionalValue<String> callbackUrl,
+      OptionalValue<String> eventDestinationTarget,
       OptionalValue<String> clientReference,
       OptionalValue<Boolean> feedbackEnabled,
       OptionalValue<Boolean> strictValidation) {
@@ -132,7 +132,7 @@ protected MediaResponseImpl(
     this.deliveryReport = deliveryReport;
     this.sendAt = sendAt;
     this.expireAt = expireAt;
-    this.callbackUrl = callbackUrl;
+    this.eventDestinationTarget = eventDestinationTarget;
     this.clientReference = clientReference;
     this.feedbackEnabled = feedbackEnabled;
     this.strictValidation = strictValidation;
@@ -266,14 +266,14 @@ public OptionalValue<Instant> expireAt() {
   }
 
   @JsonIgnore
-  public String getCallbackUrl() {
-    return callbackUrl.orElse(null);
+  public String getEventDestinationTarget() {
+    return eventDestinationTarget.orElse(null);
   }
 
   @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public OptionalValue<String> callbackUrl() {
-    return callbackUrl;
+  public OptionalValue<String> eventDestinationTarget() {
+    return eventDestinationTarget;
   }
 
   @JsonIgnore
@@ -331,7 +331,7 @@ public boolean equals(Object o) {
         && Objects.equals(this.deliveryReport, mediaResponse.deliveryReport)
         && Objects.equals(this.sendAt, mediaResponse.sendAt)
         && Objects.equals(this.expireAt, mediaResponse.expireAt)
-        && Objects.equals(this.callbackUrl, mediaResponse.callbackUrl)
+        && Objects.equals(this.eventDestinationTarget, mediaResponse.eventDestinationTarget)
         && Objects.equals(this.clientReference, mediaResponse.clientReference)
         && Objects.equals(this.feedbackEnabled, mediaResponse.feedbackEnabled)
         && Objects.equals(this.strictValidation, mediaResponse.strictValidation);
@@ -352,7 +352,7 @@ public int hashCode() {
         deliveryReport,
         sendAt,
         expireAt,
-        callbackUrl,
+        eventDestinationTarget,
         clientReference,
         feedbackEnabled,
         strictValidation);
@@ -374,7 +374,9 @@ public String toString() {
     sb.append("    deliveryReport: ").append(toIndentedString(deliveryReport)).append("\n");
     sb.append("    sendAt: ").append(toIndentedString(sendAt)).append("\n");
     sb.append("    expireAt: ").append(toIndentedString(expireAt)).append("\n");
-    sb.append("    callbackUrl: ").append(toIndentedString(callbackUrl)).append("\n");
+    sb.append("    eventDestinationTarget: ")
+        .append(toIndentedString(eventDestinationTarget))
+        .append("\n");
     sb.append("    clientReference: ").append(toIndentedString(clientReference)).append("\n");
     sb.append("    feedbackEnabled: ").append(toIndentedString(feedbackEnabled)).append("\n");
     sb.append("    strictValidation: ").append(toIndentedString(strictValidation)).append("\n");
@@ -406,7 +408,7 @@ static class Builder implements MediaResponse.Builder {
     OptionalValue<DeliveryReportType> deliveryReport = OptionalValue.empty();
     OptionalValue<Instant> sendAt = OptionalValue.empty();
     OptionalValue<Instant> expireAt = OptionalValue.empty();
-    OptionalValue<String> callbackUrl = OptionalValue.empty();
+    OptionalValue<String> eventDestinationTarget = OptionalValue.empty();
     OptionalValue<String> clientReference = OptionalValue.empty();
     OptionalValue<Boolean> feedbackEnabled = OptionalValue.empty();
     OptionalValue<Boolean> strictValidation = OptionalValue.empty();
@@ -487,8 +489,8 @@ public Builder setExpireAt(Instant expireAt) {
     }
 
     @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
-    public Builder setCallbackUrl(String callbackUrl) {
-      this.callbackUrl = OptionalValue.of(callbackUrl);
+    public Builder setEventDestinationTarget(String eventDestinationTarget) {
+      this.eventDestinationTarget = OptionalValue.of(eventDestinationTarget);
       return this;
     }
 
@@ -524,7 +526,7 @@ public MediaResponse build() {
           deliveryReport,
           sendAt,
           expireAt,
-          callbackUrl,
+          eventDestinationTarget,
           clientReference,
           feedbackEnabled,
           strictValidation);
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/TextResponse.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/TextResponse.java
index c65297da8..312ac1852 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/TextResponse.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/TextResponse.java
@@ -146,9 +146,9 @@ public static String valueOf(TypeEnum e) {
   /**
    * Override the default callback URL for this batch. Must be valid URL.
    *
-   * @return callbackUrl
+   * @return eventDestinationTarget
    */
-  String getCallbackUrl();
+  String getEventDestinationTarget();
 
   /**
    * The client identifier of a batch message. If set, the identifier will be added in the delivery
@@ -327,11 +327,11 @@ interface Builder {
     /**
      * see getter
      *
-     * @param callbackUrl see getter
+     * @param eventDestinationTarget see getter
      * @return Current builder
-     * @see #getCallbackUrl
+     * @see #getEventDestinationTarget
      */
-    Builder setCallbackUrl(String callbackUrl);
+    Builder setEventDestinationTarget(String eventDestinationTarget);
 
     /**
      * see getter
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/TextResponseImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/TextResponseImpl.java
index f17528209..fb56581e2 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/TextResponseImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/batches/response/TextResponseImpl.java
@@ -90,7 +90,7 @@ public class TextResponseImpl implements TextResponse, BatchResponse {
 
   public static final String JSON_PROPERTY_CALLBACK_URL = "callback_url";
 
-  private OptionalValue<String> callbackUrl;
+  private OptionalValue<String> eventDestinationTarget;
 
   public static final String JSON_PROPERTY_CLIENT_REFERENCE = "client_reference";
 
@@ -136,7 +136,7 @@ protected TextResponseImpl(
       OptionalValue<DeliveryReportType> deliveryReport,
       OptionalValue<Instant> sendAt,
       OptionalValue<Instant> expireAt,
-      OptionalValue<String> callbackUrl,
+      OptionalValue<String> eventDestinationTarget,
       OptionalValue<String> clientReference,
       OptionalValue<Boolean> feedbackEnabled,
       OptionalValue<Boolean> flashMessage,
@@ -156,7 +156,7 @@ protected TextResponseImpl(
     this.deliveryReport = deliveryReport;
     this.sendAt = sendAt;
     this.expireAt = expireAt;
-    this.callbackUrl = callbackUrl;
+    this.eventDestinationTarget = eventDestinationTarget;
     this.clientReference = clientReference;
     this.feedbackEnabled = feedbackEnabled;
     this.flashMessage = flashMessage;
@@ -294,14 +294,14 @@ public OptionalValue<Instant> expireAt() {
   }
 
   @JsonIgnore
-  public String getCallbackUrl() {
-    return callbackUrl.orElse(null);
+  public String getEventDestinationTarget() {
+    return eventDestinationTarget.orElse(null);
   }
 
   @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public OptionalValue<String> callbackUrl() {
-    return callbackUrl;
+  public OptionalValue<String> eventDestinationTarget() {
+    return eventDestinationTarget;
   }
 
   @JsonIgnore
@@ -403,7 +403,7 @@ public boolean equals(Object o) {
         && Objects.equals(this.deliveryReport, textResponse.deliveryReport)
         && Objects.equals(this.sendAt, textResponse.sendAt)
         && Objects.equals(this.expireAt, textResponse.expireAt)
-        && Objects.equals(this.callbackUrl, textResponse.callbackUrl)
+        && Objects.equals(this.eventDestinationTarget, textResponse.eventDestinationTarget)
         && Objects.equals(this.clientReference, textResponse.clientReference)
         && Objects.equals(this.feedbackEnabled, textResponse.feedbackEnabled)
         && Objects.equals(this.flashMessage, textResponse.flashMessage)
@@ -428,7 +428,7 @@ public int hashCode() {
         deliveryReport,
         sendAt,
         expireAt,
-        callbackUrl,
+        eventDestinationTarget,
         clientReference,
         feedbackEnabled,
         flashMessage,
@@ -454,7 +454,9 @@ public String toString() {
     sb.append("    deliveryReport: ").append(toIndentedString(deliveryReport)).append("\n");
     sb.append("    sendAt: ").append(toIndentedString(sendAt)).append("\n");
     sb.append("    expireAt: ").append(toIndentedString(expireAt)).append("\n");
-    sb.append("    callbackUrl: ").append(toIndentedString(callbackUrl)).append("\n");
+    sb.append("    eventDestinationTarget: ")
+        .append(toIndentedString(eventDestinationTarget))
+        .append("\n");
     sb.append("    clientReference: ").append(toIndentedString(clientReference)).append("\n");
     sb.append("    feedbackEnabled: ").append(toIndentedString(feedbackEnabled)).append("\n");
     sb.append("    flashMessage: ").append(toIndentedString(flashMessage)).append("\n");
@@ -492,7 +494,7 @@ static class Builder implements TextResponse.Builder {
     OptionalValue<DeliveryReportType> deliveryReport = OptionalValue.empty();
     OptionalValue<Instant> sendAt = OptionalValue.empty();
     OptionalValue<Instant> expireAt = OptionalValue.empty();
-    OptionalValue<String> callbackUrl = OptionalValue.empty();
+    OptionalValue<String> eventDestinationTarget = OptionalValue.empty();
     OptionalValue<String> clientReference = OptionalValue.empty();
     OptionalValue<Boolean> feedbackEnabled = OptionalValue.empty();
     OptionalValue<Boolean> flashMessage = OptionalValue.empty();
@@ -577,8 +579,8 @@ public Builder setExpireAt(Instant expireAt) {
     }
 
     @JsonProperty(JSON_PROPERTY_CALLBACK_URL)
-    public Builder setCallbackUrl(String callbackUrl) {
-      this.callbackUrl = OptionalValue.of(callbackUrl);
+    public Builder setEventDestinationTarget(String eventDestinationTarget) {
+      this.eventDestinationTarget = OptionalValue.of(eventDestinationTarget);
       return this;
     }
 
@@ -638,7 +640,7 @@ public TextResponse build() {
           deliveryReport,
           sendAt,
           expireAt,
-          callbackUrl,
+          eventDestinationTarget,
           clientReference,
           feedbackEnabled,
           flashMessage,
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/webhooks/internal/WebhookEventOneOf.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/sinchevents/internal/SmsSinchEventOneOf.java
similarity index 60%
rename from openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/webhooks/internal/WebhookEventOneOf.java
rename to openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/sinchevents/internal/SmsSinchEventOneOf.java
index dbbef701f..506f943a8 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/webhooks/internal/WebhookEventOneOf.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/sinchevents/internal/SmsSinchEventOneOf.java
@@ -8,9 +8,9 @@
  * Do not edit the class manually.
  */
 
-package com.sinch.sdk.domains.sms.models.v1.webhooks.internal;
+package com.sinch.sdk.domains.sms.models.v1.sinchevents.internal;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
-@JsonDeserialize(using = WebhookEventOneOfImpl.WebhookEventOneOfImplDeserializer.class)
-public interface WebhookEventOneOf {}
+@JsonDeserialize(using = SmsSinchEventOneOfImpl.SmsSinchEventOneOfImplDeserializer.class)
+public interface SmsSinchEventOneOf {}
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/webhooks/internal/WebhookEventOneOfImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/sinchevents/internal/SmsSinchEventOneOfImpl.java
similarity index 88%
rename from openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/webhooks/internal/WebhookEventOneOfImpl.java
rename to openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/sinchevents/internal/SmsSinchEventOneOfImpl.java
index 24cb61bec..62cb60bd5 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/webhooks/internal/WebhookEventOneOfImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/models/v1/sinchevents/internal/SmsSinchEventOneOfImpl.java
@@ -1,4 +1,4 @@
-package com.sinch.sdk.domains.sms.models.v1.webhooks.internal;
+package com.sinch.sdk.domains.sms.models.v1.sinchevents.internal;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
@@ -31,89 +31,89 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-@JsonDeserialize(using = WebhookEventOneOfImpl.WebhookEventOneOfImplDeserializer.class)
-@JsonSerialize(using = WebhookEventOneOfImpl.WebhookEventOneOfImplSerializer.class)
-public class WebhookEventOneOfImpl extends AbstractOpenApiSchema implements WebhookEventOneOf {
-  private static final Logger log = Logger.getLogger(WebhookEventOneOfImpl.class.getName());
+@JsonDeserialize(using = SmsSinchEventOneOfImpl.SmsSinchEventOneOfImplDeserializer.class)
+@JsonSerialize(using = SmsSinchEventOneOfImpl.SmsSinchEventOneOfImplSerializer.class)
+public class SmsSinchEventOneOfImpl extends AbstractOpenApiSchema implements SmsSinchEventOneOf {
+  private static final Logger log = Logger.getLogger(SmsSinchEventOneOfImpl.class.getName());
 
-  public static final class WebhookEventOneOfImplSerializer
-      extends StdSerializer<WebhookEventOneOfImpl> {
+  public static final class SmsSinchEventOneOfImplSerializer
+      extends StdSerializer<SmsSinchEventOneOfImpl> {
     private static final long serialVersionUID = 1L;
 
-    public WebhookEventOneOfImplSerializer(Class<WebhookEventOneOfImpl> t) {
+    public SmsSinchEventOneOfImplSerializer(Class<SmsSinchEventOneOfImpl> t) {
       super(t);
     }
 
-    public WebhookEventOneOfImplSerializer() {
+    public SmsSinchEventOneOfImplSerializer() {
       this(null);
     }
 
     @Override
     public void serialize(
-        WebhookEventOneOfImpl value, JsonGenerator jgen, SerializerProvider provider)
+        SmsSinchEventOneOfImpl value, JsonGenerator jgen, SerializerProvider provider)
         throws IOException, JsonProcessingException {
       jgen.writeObject(value.getActualInstance());
     }
   }
 
-  public static final class WebhookEventOneOfImplDeserializer
-      extends StdDeserializer<WebhookEventOneOfImpl> {
+  public static final class SmsSinchEventOneOfImplDeserializer
+      extends StdDeserializer<SmsSinchEventOneOfImpl> {
 
     private static final long serialVersionUID = 1L;
 
-    public WebhookEventOneOfImplDeserializer() {
-      this(WebhookEventOneOfImpl.class);
+    public SmsSinchEventOneOfImplDeserializer() {
+      this(SmsSinchEventOneOfImpl.class);
     }
 
-    public WebhookEventOneOfImplDeserializer(Class<?> vc) {
+    public SmsSinchEventOneOfImplDeserializer(Class<?> vc) {
       super(vc);
     }
 
     @Override
-    public WebhookEventOneOfImpl deserialize(JsonParser jp, DeserializationContext ctxt)
+    public SmsSinchEventOneOfImpl deserialize(JsonParser jp, DeserializationContext ctxt)
         throws IOException, JsonProcessingException {
       JsonNode tree = jp.readValueAsTree();
       Object deserialized = null;
-      WebhookEventOneOfImpl newWebhookEventOneOfImpl = new WebhookEventOneOfImpl();
+      SmsSinchEventOneOfImpl newSmsSinchEventOneOfImpl = new SmsSinchEventOneOfImpl();
       Map<String, Object> result2 =
           tree.traverse(jp.getCodec()).readValueAs(new TypeReference<Map<String, Object>>() {});
       String discriminatorValue = (String) result2.get("type");
       switch (discriminatorValue) {
         case "delivery_report_mms":
           deserialized = tree.traverse(jp.getCodec()).readValueAs(BatchDeliveryReportMMSImpl.class);
-          newWebhookEventOneOfImpl.setActualInstance(deserialized);
-          return newWebhookEventOneOfImpl;
+          newSmsSinchEventOneOfImpl.setActualInstance(deserialized);
+          return newSmsSinchEventOneOfImpl;
         case "delivery_report_sms":
           deserialized = tree.traverse(jp.getCodec()).readValueAs(BatchDeliveryReportSMSImpl.class);
-          newWebhookEventOneOfImpl.setActualInstance(deserialized);
-          return newWebhookEventOneOfImpl;
+          newSmsSinchEventOneOfImpl.setActualInstance(deserialized);
+          return newSmsSinchEventOneOfImpl;
         case "mo_binary":
           deserialized = tree.traverse(jp.getCodec()).readValueAs(BinaryMessageImpl.class);
-          newWebhookEventOneOfImpl.setActualInstance(deserialized);
-          return newWebhookEventOneOfImpl;
+          newSmsSinchEventOneOfImpl.setActualInstance(deserialized);
+          return newSmsSinchEventOneOfImpl;
         case "mo_media":
           deserialized = tree.traverse(jp.getCodec()).readValueAs(MediaMessageImpl.class);
-          newWebhookEventOneOfImpl.setActualInstance(deserialized);
-          return newWebhookEventOneOfImpl;
+          newSmsSinchEventOneOfImpl.setActualInstance(deserialized);
+          return newSmsSinchEventOneOfImpl;
         case "mo_text":
           deserialized = tree.traverse(jp.getCodec()).readValueAs(TextMessageImpl.class);
-          newWebhookEventOneOfImpl.setActualInstance(deserialized);
-          return newWebhookEventOneOfImpl;
+          newSmsSinchEventOneOfImpl.setActualInstance(deserialized);
+          return newSmsSinchEventOneOfImpl;
         case "recipient_delivery_report_mms":
           deserialized =
               tree.traverse(jp.getCodec()).readValueAs(RecipientDeliveryReportMMSImpl.class);
-          newWebhookEventOneOfImpl.setActualInstance(deserialized);
-          return newWebhookEventOneOfImpl;
+          newSmsSinchEventOneOfImpl.setActualInstance(deserialized);
+          return newSmsSinchEventOneOfImpl;
         case "recipient_delivery_report_sms":
           deserialized =
               tree.traverse(jp.getCodec()).readValueAs(RecipientDeliveryReportSMSImpl.class);
-          newWebhookEventOneOfImpl.setActualInstance(deserialized);
-          return newWebhookEventOneOfImpl;
+          newSmsSinchEventOneOfImpl.setActualInstance(deserialized);
+          return newSmsSinchEventOneOfImpl;
         default:
           log.log(
               Level.WARNING,
               String.format(
-                  "Failed to lookup discriminator value `%s` for WebhookEventOneOfImpl. Possible"
+                  "Failed to lookup discriminator value `%s` for SmsSinchEventOneOfImpl. Possible"
                       + " values: delivery_report_mms delivery_report_sms mo_binary mo_media"
                       + " mo_text recipient_delivery_report_mms recipient_delivery_report_sms",
                   discriminatorValue));
@@ -411,63 +411,63 @@ public WebhookEventOneOfImpl deserialize(JsonParser jp, DeserializationContext c
       }
 
       if (match == 1) {
-        WebhookEventOneOfImpl ret = new WebhookEventOneOfImpl();
+        SmsSinchEventOneOfImpl ret = new SmsSinchEventOneOfImpl();
         ret.setActualInstance(deserialized);
         return ret;
       }
       throw new IOException(
           String.format(
-              "Failed deserialization for WebhookEventOneOfImpl: %d classes match result, expected"
+              "Failed deserialization for SmsSinchEventOneOfImpl: %d classes match result, expected"
                   + " 1",
               match));
     }
 
     /** Handle deserialization of the 'null' value. */
     @Override
-    public WebhookEventOneOfImpl getNullValue(DeserializationContext ctxt)
+    public SmsSinchEventOneOfImpl getNullValue(DeserializationContext ctxt)
         throws JsonMappingException {
-      throw new JsonMappingException(ctxt.getParser(), "WebhookEventOneOfImpl cannot be null");
+      throw new JsonMappingException(ctxt.getParser(), "SmsSinchEventOneOfImpl cannot be null");
     }
   }
 
   // store a list of schema names defined in oneOf
   public static final Map<String, Class<?>> schemas = new HashMap<>();
 
-  public WebhookEventOneOfImpl() {
+  public SmsSinchEventOneOfImpl() {
     super("oneOf", Boolean.FALSE);
   }
 
-  public WebhookEventOneOfImpl(BatchDeliveryReportMMSImpl o) {
+  public SmsSinchEventOneOfImpl(BatchDeliveryReportMMSImpl o) {
     super("oneOf", Boolean.FALSE);
     setActualInstance(o);
   }
 
-  public WebhookEventOneOfImpl(BatchDeliveryReportSMSImpl o) {
+  public SmsSinchEventOneOfImpl(BatchDeliveryReportSMSImpl o) {
     super("oneOf", Boolean.FALSE);
     setActualInstance(o);
   }
 
-  public WebhookEventOneOfImpl(BinaryMessageImpl o) {
+  public SmsSinchEventOneOfImpl(BinaryMessageImpl o) {
     super("oneOf", Boolean.FALSE);
     setActualInstance(o);
   }
 
-  public WebhookEventOneOfImpl(MediaMessageImpl o) {
+  public SmsSinchEventOneOfImpl(MediaMessageImpl o) {
     super("oneOf", Boolean.FALSE);
     setActualInstance(o);
   }
 
-  public WebhookEventOneOfImpl(RecipientDeliveryReportMMSImpl o) {
+  public SmsSinchEventOneOfImpl(RecipientDeliveryReportMMSImpl o) {
     super("oneOf", Boolean.FALSE);
     setActualInstance(o);
   }
 
-  public WebhookEventOneOfImpl(RecipientDeliveryReportSMSImpl o) {
+  public SmsSinchEventOneOfImpl(RecipientDeliveryReportSMSImpl o) {
     super("oneOf", Boolean.FALSE);
     setActualInstance(o);
   }
 
-  public WebhookEventOneOfImpl(TextMessageImpl o) {
+  public SmsSinchEventOneOfImpl(TextMessageImpl o) {
     super("oneOf", Boolean.FALSE);
     setActualInstance(o);
   }
@@ -481,7 +481,7 @@ public WebhookEventOneOfImpl(TextMessageImpl o) {
     schemas.put("RecipientDeliveryReportSMSImpl", RecipientDeliveryReportSMSImpl.class);
     schemas.put("TextMessageImpl", TextMessageImpl.class);
     JSONNavigator.registerDescendants(
-        WebhookEventOneOfImpl.class, Collections.unmodifiableMap(schemas));
+        SmsSinchEventOneOfImpl.class, Collections.unmodifiableMap(schemas));
     // Initialize and register the discriminator mappings.
     Map<String, Class<?>> mappings = new HashMap<String, Class<?>>();
     mappings.put("delivery_report_mms", BatchDeliveryReportMMSImpl.class);
@@ -491,13 +491,13 @@ public WebhookEventOneOfImpl(TextMessageImpl o) {
     mappings.put("mo_text", TextMessageImpl.class);
     mappings.put("recipient_delivery_report_mms", RecipientDeliveryReportMMSImpl.class);
     mappings.put("recipient_delivery_report_sms", RecipientDeliveryReportSMSImpl.class);
-    mappings.put("WebhookEventOneOf", WebhookEventOneOfImpl.class);
-    JSONNavigator.registerDiscriminator(WebhookEventOneOfImpl.class, "type", mappings);
+    mappings.put("WebhookEventOneOf", SmsSinchEventOneOfImpl.class);
+    JSONNavigator.registerDiscriminator(SmsSinchEventOneOfImpl.class, "type", mappings);
   }
 
   @Override
   public Map<String, Class<?>> getSchemas() {
-    return WebhookEventOneOfImpl.schemas;
+    return SmsSinchEventOneOfImpl.schemas;
   }
 
   /**
@@ -650,30 +650,31 @@ public TextMessageImpl getTextMessageImpl() throws ClassCastException {
   }
 
   public static class Deserializer
-      extends StdDeserializer<com.sinch.sdk.domains.sms.models.v1.webhooks.SmsEvent> {
+      extends StdDeserializer<com.sinch.sdk.domains.sms.models.v1.sinchevents.SmsSinchEvent> {
 
     public Deserializer() {
       this(null);
     }
 
-    public Deserializer(Class<com.sinch.sdk.domains.sms.models.v1.webhooks.SmsEvent> vc) {
+    public Deserializer(Class<com.sinch.sdk.domains.sms.models.v1.sinchevents.SmsSinchEvent> vc) {
       super(vc);
     }
 
     @Override
-    public com.sinch.sdk.domains.sms.models.v1.webhooks.SmsEvent deserialize(
+    public com.sinch.sdk.domains.sms.models.v1.sinchevents.SmsSinchEvent deserialize(
         JsonParser jp, DeserializationContext ctxt) throws IOException {
 
-      Object deserialized = jp.readValueAs(WebhookEventOneOfImpl.class).getActualInstance();
+      Object deserialized = jp.readValueAs(SmsSinchEventOneOfImpl.class).getActualInstance();
       if (null == deserialized) {
         return null;
       }
-      if (!(deserialized instanceof com.sinch.sdk.domains.sms.models.v1.webhooks.SmsEvent)) {
+      if (!(deserialized
+          instanceof com.sinch.sdk.domains.sms.models.v1.sinchevents.SmsSinchEvent)) {
         log.log(Level.SEVERE, "Input data does not match schema ", deserialized);
         return null;
       }
 
-      return (com.sinch.sdk.domains.sms.models.v1.webhooks.SmsEvent) deserialized;
+      return (com.sinch.sdk.domains.sms.models.v1.sinchevents.SmsSinchEvent) deserialized;
     }
   }
 }
diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/batches/request/SendRequestDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/batches/request/SendRequestDtoTest.java
index a614f0693..1d956fbe7 100644
--- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/batches/request/SendRequestDtoTest.java
+++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/batches/request/SendRequestDtoTest.java
@@ -39,7 +39,7 @@ void serializeBinaryRequestDto() throws JsonProcessingException, JSONException {
             .setDeliveryReport(DeliveryReportType.NONE)
             .setSendAt(Instant.parse("2019-08-24T14:19:22Z"))
             .setExpireAt(Instant.parse("2019-08-24T14:21:22Z"))
-            .setCallbackUrl("callback url")
+            .setEventDestinationTarget("callback url")
             .setClientReference("myReference")
             .setFeedbackEnabled(false)
             .setFromTon(6)
@@ -81,7 +81,7 @@ void serializeTextRequestDto() throws JsonProcessingException, JSONException {
             .setDeliveryReport(DeliveryReportType.NONE)
             .setSendAt(Instant.parse("2019-08-24T14:19:22Z"))
             .setExpireAt(Instant.parse("2019-08-24T14:21:22Z"))
-            .setCallbackUrl("callback url")
+            .setEventDestinationTarget("callback url")
             .setClientReference("myReference")
             .setFeedbackEnabled(false)
             .setFlashMessage(true)
@@ -127,7 +127,7 @@ void serializeMediaRequestDto() throws JsonProcessingException, JSONException {
             .setDeliveryReport(DeliveryReportType.SUMMARY)
             .setSendAt(Instant.parse("2019-08-24T14:16:22Z"))
             .setExpireAt(Instant.parse("2019-08-24T14:17:22Z"))
-            .setCallbackUrl("callback url")
+            .setEventDestinationTarget("callback url")
             .setClientReference("client reference")
             .setFeedbackEnabled(false)
             .setStrictValidation(true)
diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateRequestDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateRequestDtoTest.java
index 71c3be634..2aa276616 100644
--- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateRequestDtoTest.java
+++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/batches/request/UpdateRequestDtoTest.java
@@ -57,7 +57,7 @@ void serializeBinaryRequestDto() throws JsonProcessingException, JSONException {
             .setDeliveryReport(DeliveryReportType.FULL)
             .setSendAt(Instant.parse("2019-08-24T14:19:22Z"))
             .setExpireAt(Instant.parse("2019-08-24T14:21:22Z"))
-            .setCallbackUrl("callback url")
+            .setEventDestinationTarget("callback url")
             .setClientReference("a client reference")
             .setFeedbackEnabled(true)
             .setBody("Hi ${name} ({an identifier}) ! How are you?")
@@ -82,7 +82,7 @@ void serializeTextRequestDto() throws JsonProcessingException, JSONException {
             .setDeliveryReport(DeliveryReportType.NONE)
             .setSendAt(Instant.parse("2019-08-24T14:19:22Z"))
             .setExpireAt(Instant.parse("2019-08-24T14:21:22Z"))
-            .setCallbackUrl("callback url")
+            .setEventDestinationTarget("callback url")
             .setClientReference("a client reference")
             .setFeedbackEnabled(true)
             .setParameters(parameters)
@@ -110,7 +110,7 @@ void serializeMediaRequestDto() throws JsonProcessingException, JSONException {
             .setDeliveryReport(DeliveryReportType.SUMMARY)
             .setSendAt(Instant.parse("2019-08-24T14:16:22Z"))
             .setExpireAt(Instant.parse("2019-08-24T14:17:22Z"))
-            .setCallbackUrl("callback url")
+            .setEventDestinationTarget("callback url")
             .setClientReference("a client reference")
             .setFeedbackEnabled(true)
             .setBody(
diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/batches/response/SendResponseDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/batches/response/SendResponseDtoTest.java
index c40474adc..c44311811 100644
--- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/batches/response/SendResponseDtoTest.java
+++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/batches/response/SendResponseDtoTest.java
@@ -28,7 +28,7 @@ class SendResponseDtoTest extends BaseTest {
   BinaryResponse binaryResponseDto =
       BinaryResponse.builder()
           .setBody("Hi ${name} ({an identifier}) ! How are you?")
-          .setCallbackUrl("callback url")
+          .setEventDestinationTarget("callback url")
           .setClientReference("myReference")
           .setDeliveryReport(DeliveryReportType.NONE)
           .setExpireAt(Instant.parse("2019-08-24T14:21:22Z"))
@@ -70,7 +70,7 @@ class SendResponseDtoTest extends BaseTest {
           .setCanceled(false)
           .setModifiedAt(Instant.parse("2019-08-24T14:17:22Z"))
           .setBody("Hi ${name} ({an identifier}) ! How are you?")
-          .setCallbackUrl("callback url")
+          .setEventDestinationTarget("callback url")
           .setClientReference("myReference")
           .setDeliveryReport(DeliveryReportType.NONE)
           .setExpireAt(Instant.parse("2019-08-24T14:21:22Z"))
@@ -93,7 +93,7 @@ class SendResponseDtoTest extends BaseTest {
           .setCreatedAt(Instant.parse("2019-08-24T14:14:22Z"))
           .setModifiedAt(Instant.parse("2019-08-24T14:15:22Z"))
           .setBody(MediaBodyDtoTest.mediaBodyDto)
-          .setCallbackUrl("callback url")
+          .setEventDestinationTarget("callback url")
           .setClientReference("client reference")
           .setDeliveryReport(DeliveryReportType.SUMMARY)
           .setExpireAt(Instant.parse("2019-08-24T14:17:22Z"))
diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/webhooks/WebhookEventDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/sinchevents/SinchEventsDtoTest.java
similarity index 83%
rename from openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/webhooks/WebhookEventDtoTest.java
rename to openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/sinchevents/SinchEventsDtoTest.java
index 9450e2f18..ece8876c2 100644
--- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/webhooks/WebhookEventDtoTest.java
+++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/v1/sinchevents/SinchEventsDtoTest.java
@@ -1,4 +1,4 @@
-package com.sinch.sdk.domains.sms.models.v1.webhooks;
+package com.sinch.sdk.domains.sms.models.v1.sinchevents;
 
 import com.adelean.inject.resources.junit.jupiter.GivenJsonResource;
 import com.adelean.inject.resources.junit.jupiter.TestWithResources;
@@ -10,28 +10,28 @@
 import org.junit.jupiter.api.Test;
 
 @TestWithResources
-public class WebhookEventDtoTest extends BaseTest {
+public class SinchEventsDtoTest extends BaseTest {
 
   @GivenJsonResource("/domains/sms/v1/inbounds/InboundBinaryDto.json")
-  SmsEvent loadedInboundBinaryEvent;
+  SmsSinchEvent loadedInboundBinaryEvent;
 
   @GivenJsonResource("/domains/sms/v1/inbounds/InboundTextDto.json")
-  SmsEvent loadedInboundTextEvent;
+  SmsSinchEvent loadedInboundTextEvent;
 
   @GivenJsonResource("/domains/sms/v1/inbounds/InboundMediaDto.json")
-  SmsEvent loadedInboundMediaEvent;
+  SmsSinchEvent loadedInboundMediaEvent;
 
   @GivenJsonResource("/domains/sms/v1/deliveryreports/BatchDeliveryReportSMSDto.json")
-  SmsEvent loadedBatchDeliveryReportSMSEvent;
+  SmsSinchEvent loadedBatchDeliveryReportSMSEvent;
 
   @GivenJsonResource("/domains/sms/v1/deliveryreports/BatchDeliveryReportMMSDto.json")
-  SmsEvent loadedBatchDeliveryReportMMSEvent;
+  SmsSinchEvent loadedBatchDeliveryReportMMSEvent;
 
   @GivenJsonResource("/domains/sms/v1/deliveryreports/RecipientDeliveryReportSMSDto.json")
-  SmsEvent loadedRecipientDeliveryReportSMSEvent;
+  SmsSinchEvent loadedRecipientDeliveryReportSMSEvent;
 
   @GivenJsonResource("/domains/sms/v1/deliveryreports/RecipientDeliveryReportMMSDto.json")
-  SmsEvent loadedRecipientDeliveryReportMMSEvent;
+  SmsSinchEvent loadedRecipientDeliveryReportMMSEvent;
 
   @Test
   void deserializeBinaryMessage() {