Rearranged code. (#33)

src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeTabEntry.java

@@ -30,7 +30,7 @@ public class BunqMeTabEntry extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "BunqMeTabEntry";
+  private static final String OBJECT_TYPE = "BunqMeTab";
 
   /**
    * The uuid of the bunq.me.

src/main/java/com/bunq/sdk/model/generated/endpoint/Card.java

@@ -49,7 +49,7 @@ public class Card extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "Card";
+  private static final String OBJECT_TYPE = "CardDebit";
 
   /**
    * The id of the card.

src/main/java/com/bunq/sdk/model/generated/endpoint/CardName.java

@@ -30,7 +30,7 @@ public class CardName extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "CardName";
+  private static final String OBJECT_TYPE = "CardUserNameArray";
 
   /**
    * All possible variations (of suitable length) of user's legal name for the debit card.

src/main/java/com/bunq/sdk/model/generated/endpoint/CashRegisterQrCode.java

@@ -38,7 +38,7 @@ public class CashRegisterQrCode extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "CashRegisterQrCode";
+  private static final String OBJECT_TYPE = "TokenQrCashRegister";
 
   /**
    * The id of the created QR code. Use this id to get the RAW content of the QR code with:

src/main/java/com/bunq/sdk/model/generated/endpoint/ChatConversationReference.java

@@ -18,7 +18,7 @@ public class ChatConversationReference extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ChatConversationReference";
+  private static final String OBJECT_TYPE = "SupportConversationReference";
 
   /**
    * The id of this conversation.

src/main/java/com/bunq/sdk/model/generated/endpoint/ChatConversationSupportExternal.java

@@ -18,7 +18,7 @@ public class ChatConversationSupportExternal extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ChatConversationSupportExternal";
+  private static final String OBJECT_TYPE = "SupportConversationExternal";
 
   /**
    * The id of this conversation.

src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageAnnouncement.java

@@ -20,7 +20,7 @@ public class ChatMessageAnnouncement extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ChatMessageAnnouncement";
+  private static final String OBJECT_TYPE = "ChatMessageUser";
 
   /**
    * The id of the message.

src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageAttachment.java

@@ -34,7 +34,7 @@ public class ChatMessageAttachment extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ChatMessageAttachment";
+  private static final String OBJECT_TYPE = "Id";
 
   /**
    * The id of the newly created chat message.

src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageStatus.java

@@ -20,7 +20,7 @@ public class ChatMessageStatus extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ChatMessageStatus";
+  private static final String OBJECT_TYPE = "ChatMessageUser";
 
   /**
    * The id of the message.

src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageText.java

@@ -34,7 +34,7 @@ public class ChatMessageText extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ChatMessageText";
+  private static final String OBJECT_TYPE = "Id";
 
   /**
    * The id of the newly created chat message.

src/main/java/com/bunq/sdk/model/generated/endpoint/Device.java

@@ -38,12 +38,6 @@ public class Device extends BunqModel {
    */
   private static final String OBJECT_TYPE = "Device";
 
-  /**
-   */
-  @Expose
-  @SerializedName("DevicePhone")
-  private DevicePhone devicePhone;
-
   /**
    */
   @Expose
@@ -82,16 +76,6 @@ public static BunqResponse<List<Device>> list(ApiContext apiContext, Map<String,
     return fromJsonList(Device.class, responseRaw);
   }
 
-  /**
-   */
-  public DevicePhone getDevicePhone() {
-    return this.devicePhone;
-  }
-
-  public void setDevicePhone(DevicePhone devicePhone) {
-    this.devicePhone = devicePhone;
-  }
-
   /**
    */
   public DeviceServer getDeviceServer() {
@@ -105,10 +89,6 @@ public void setDeviceServer(DeviceServer deviceServer) {
   /**
    */
   public BunqModel getReferencedObject() {
-    if (this.devicePhone != null) {
-      return this.devicePhone;
-    }
-
     if (this.deviceServer != null) {
       return this.deviceServer;
     }

src/main/java/com/bunq/sdk/model/generated/endpoint/InstallationServerPublicKey.java

@@ -29,7 +29,7 @@ public class InstallationServerPublicKey extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "InstallationServerPublicKey";
+  private static final String OBJECT_TYPE = "ServerPublicKey";
 
   /**
    * The server's public key for this Installation.

src/main/java/com/bunq/sdk/model/generated/endpoint/InvoiceByUser.java

@@ -33,7 +33,7 @@ public class InvoiceByUser extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "InvoiceByUser";
+  private static final String OBJECT_TYPE = "Invoice";
 
   /**
    * The id of the invoice object.

src/main/java/com/bunq/sdk/model/generated/endpoint/PaymentChat.java

@@ -35,7 +35,7 @@ public class PaymentChat extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "PaymentChat";
+  private static final String OBJECT_TYPE = "ChatConversationPayment";
 
   /**
    * The id of the chat conversation.

src/main/java/com/bunq/sdk/model/generated/endpoint/ScheduleInstance.java

@@ -38,7 +38,7 @@ public class ScheduleInstance extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ScheduleInstance";
+  private static final String OBJECT_TYPE = "ScheduledInstance";
 
   /**
    * The state of the scheduleInstance. (FINISHED_SUCCESSFULLY, RETRY, FAILED_USER_ERROR)
@@ -95,18 +95,18 @@ public static BunqResponse<ScheduleInstance> get(ApiContext apiContext, Integer
     return fromJson(ScheduleInstance.class, responseRaw, OBJECT_TYPE);
   }
 
-  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer scheduleId, Integer scheduleInstanceId) {
+  public static BunqResponse<ScheduleInstance> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer scheduleId, Integer scheduleInstanceId) {
     return update(apiContext, requestMap, userId, monetaryAccountId, scheduleId, scheduleInstanceId, new HashMap<>());
   }
 
   /**
    */
-  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer scheduleId, Integer scheduleInstanceId, Map<String, String> customHeaders) {
+  public static BunqResponse<ScheduleInstance> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer scheduleId, Integer scheduleInstanceId, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     BunqResponseRaw responseRaw = apiClient.put(String.format(ENDPOINT_URL_UPDATE, userId, monetaryAccountId, scheduleId, scheduleInstanceId), requestBytes, customHeaders);
 
-    return processForId(responseRaw);
+    return fromJson(ScheduleInstance.class, responseRaw, OBJECT_TYPE);
   }
 
   public static BunqResponse<List<ScheduleInstance>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer scheduleId) {

src/main/java/com/bunq/sdk/model/generated/endpoint/SchedulePayment.java

@@ -39,7 +39,7 @@ public class SchedulePayment extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "SchedulePayment";
+  private static final String OBJECT_TYPE = "ScheduledPayment";
 
   /**
    * The payment details.
@@ -112,18 +112,18 @@ public static BunqResponse<List<SchedulePayment>> list(ApiContext apiContext, In
     return fromJsonList(SchedulePayment.class, responseRaw, OBJECT_TYPE);
   }
 
-  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer schedulePaymentId) {
+  public static BunqResponse<SchedulePayment> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer schedulePaymentId) {
     return update(apiContext, requestMap, userId, monetaryAccountId, schedulePaymentId, new HashMap<>());
   }
 
   /**
    */
-  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer schedulePaymentId, Map<String, String> customHeaders) {
+  public static BunqResponse<SchedulePayment> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer schedulePaymentId, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     BunqResponseRaw responseRaw = apiClient.put(String.format(ENDPOINT_URL_UPDATE, userId, monetaryAccountId, schedulePaymentId), requestBytes, customHeaders);
 
-    return processForId(responseRaw);
+    return fromJson(SchedulePayment.class, responseRaw, OBJECT_TYPE);
   }
 
   /**