DKE-Data · oliverrahner · Apr 6, 2021 · Apr 5, 2021 · Apr 5, 2021 · Apr 5, 2021
diff --git a/README.adoc b/README.adoc
@@ -1,5 +1,5 @@
 
-= agrirouter-api-java
+= agrirouter-sdk-java
 :imagesdir: assets/images
 :toc:
 :toc-title:
@@ -21,14 +21,14 @@ of IT solutions. We also provide professional IT consulting services and trainin
 the whole project during the development in the field of test management and are currently responsible for the development
 support of the platform.
 
-We are active maintainers of the API and are using the API for internal testing purposes as well. Therefore we have a
+We are active maintainers of the SDK and are using the SDK for internal testing purposes as well. Therefore we have a
 high interest in a stable and usable interface to connect to the agrirouter.
 
 Feel free to get in touch by visiting our https://www.lmis.de[website] or contacting us via GitHub.
 
 == The current project you're looking at
 
-This project contains the API for the communication with the agrirouter. Everything you need for the onboarding process, secure communication and much more.
+This project contains the SDK for the communication with the agrirouter. Everything you need for the onboarding process, secure communication and much more.
 
 == Releases
 
@@ -42,11 +42,15 @@ The `api` module contains interfaces, common helper classes and DTOs as well as
 
 === `impl` Module
 
-The `impl` module contains the implementation of the given API defined by the `api` module.
+The `impl` module contains the implementation of the given SDK defined by the `api` module.
 
 === `convenience` Module
 
-The `convenience` module contains common implementations for different problems which are not located within the API. Those could be capability setting, MQTT client creation or other common problems that are normally not part of the API.
+The `convenience` module contains common implementations for different problems which are not located within the SDK. Those could be capability setting, MQTT client creation or other common problems that are normally not part of the SDK.
+
+=== `test` Module
+
+The `test` module contains integration tests not only for the SDK, but also for different scenarios.
 
 === Integration
 
@@ -55,8 +59,8 @@ We are supporting JDK 8 and later, releases are build using a JDK 8 to have comp
 
 == Certificates for the communication
 
-We do not longer maintain the certificates within the API.
-Maintaining them in the API would mean, that we have to release the API with every change of the certificate.
+We do not longer maintain the certificates within the SDK.
+Maintaining them in the SDK would mean, that we have to release the SDK with every change of the certificate.
 Therefore feel free to add the root certificates to a Java Key Store add reference it within your application.
 
 === Adding a certificate to the JKS

diff --git a/agrirouter-api-java-api/pom.xml → agrirouter-sdk-java-api/pom.xml b/agrirouter-api-java-api/pom.xml → agrirouter-sdk-java-api/pom.xml
@@ -4,11 +4,11 @@
 
     <parent>
         <groupId>com.agrirouter.api</groupId>
-        <artifactId>agrirouter-api-java</artifactId>
+        <artifactId>agrirouter-sdk-java</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <name>AGRIROUTER API JAVA - API</name>
-    <artifactId>agrirouter-api-java-api</artifactId>
+    <name>AGRIROUTER SDK JAVA - API</name>
+    <artifactId>agrirouter-sdk-java-api</artifactId>
 
     <dependencies>
         <dependency>

diff --git a/...r/api/cancellation/CancellationToken.java → ...r/api/cancellation/CancellationToken.java b/...r/api/cancellation/CancellationToken.java → ...r/api/cancellation/CancellationToken.java
diff --git a/...ancellation/DefaultCancellationToken.java → ...ancellation/DefaultCancellationToken.java b/...ancellation/DefaultCancellationToken.java → ...ancellation/DefaultCancellationToken.java
diff --git a/.../data/agrirouter/api/env/Environment.java → .../data/agrirouter/api/env/Environment.java b/.../data/agrirouter/api/env/Environment.java → .../data/agrirouter/api/env/Environment.java
diff --git a/...e/data/agrirouter/api/env/Production.java → ...e/data/agrirouter/api/env/Production.java b/...e/data/agrirouter/api/env/Production.java → ...e/data/agrirouter/api/env/Production.java
diff --git a/...a/com/dke/data/agrirouter/api/env/QA.java → ...a/com/dke/data/agrirouter/api/env/QA.java b/...a/com/dke/data/agrirouter/api/env/QA.java → ...a/com/dke/data/agrirouter/api/env/QA.java
diff --git a/...rtificationTypeNotSupportedException.java → ...rtificationTypeNotSupportedException.java b/...rtificationTypeNotSupportedException.java → ...rtificationTypeNotSupportedException.java
diff --git a/...uldNotCreateDynamicKeyStoreException.java → ...uldNotCreateDynamicKeyStoreException.java b/...uldNotCreateDynamicKeyStoreException.java → ...uldNotCreateDynamicKeyStoreException.java
diff --git a/...on/CouldNotCreateMqttClientException.java → ...on/CouldNotCreateMqttClientException.java b/...on/CouldNotCreateMqttClientException.java → ...on/CouldNotCreateMqttClientException.java
diff --git a/...on/CouldNotCreateMqttOptionException.java → ...on/CouldNotCreateMqttOptionException.java b/...on/CouldNotCreateMqttOptionException.java → ...on/CouldNotCreateMqttOptionException.java
diff --git a/...on/CouldNotCreatePrivateKeyException.java → ...on/CouldNotCreatePrivateKeyException.java b/...on/CouldNotCreatePrivateKeyException.java → ...on/CouldNotCreatePrivateKeyException.java
diff --git a/...ion/CouldNotCreatePublicKeyException.java → ...ion/CouldNotCreatePublicKeyException.java b/...ion/CouldNotCreatePublicKeyException.java → ...ion/CouldNotCreatePublicKeyException.java
diff --git a/...ion/CouldNotCreateSignatureException.java → ...ion/CouldNotCreateSignatureException.java b/...ion/CouldNotCreateSignatureException.java → ...ion/CouldNotCreateSignatureException.java
diff --git a/...exception/CouldNotDecodeHexException.java → ...exception/CouldNotDecodeHexException.java b/...exception/CouldNotDecodeHexException.java → ...exception/CouldNotDecodeHexException.java
diff --git a/...ption/CouldNotDecodeMessageException.java → ...ption/CouldNotDecodeMessageException.java b/...ption/CouldNotDecodeMessageException.java → ...ption/CouldNotDecodeMessageException.java
diff --git a/...ldNotDecodePushNotificationException.java → ...ldNotDecodePushNotificationException.java b/...ldNotDecodePushNotificationException.java → ...ldNotDecodePushNotificationException.java
diff --git a/...ption/CouldNotEncodeMessageException.java → ...ption/CouldNotEncodeMessageException.java b/...ption/CouldNotEncodeMessageException.java → ...ption/CouldNotEncodeMessageException.java
diff --git a/...eption/CouldNotFetchCookiesException.java → ...eption/CouldNotFetchCookiesException.java b/...eption/CouldNotFetchCookiesException.java → ...eption/CouldNotFetchCookiesException.java
diff --git a/...eption/CouldNotFindTimeZoneException.java → ...eption/CouldNotFindTimeZoneException.java b/...eption/CouldNotFindTimeZoneException.java → ...eption/CouldNotFindTimeZoneException.java
diff --git a/...CouldNotGetRegistrationCodeException.java → ...CouldNotGetRegistrationCodeException.java b/...CouldNotGetRegistrationCodeException.java → ...CouldNotGetRegistrationCodeException.java
diff --git a/...ardVirtualCommunicationUnitException.java → ...ardVirtualCommunicationUnitException.java b/...ardVirtualCommunicationUnitException.java → ...ardVirtualCommunicationUnitException.java
diff --git a/...ardVirtualCommunicationUnitException.java → ...ardVirtualCommunicationUnitException.java b/...ardVirtualCommunicationUnitException.java → ...ardVirtualCommunicationUnitException.java
diff --git a/...ion/CouldNotSendMqttMessageException.java → ...ion/CouldNotSendMqttMessageException.java b/...ion/CouldNotSendMqttMessageException.java → ...ion/CouldNotSendMqttMessageException.java
diff --git a/...ifySecuredOnboardingRequestException.java → ...ifySecuredOnboardingRequestException.java b/...ifySecuredOnboardingRequestException.java → ...ifySecuredOnboardingRequestException.java
diff --git a/...ion/CouldNotVerifySignatureException.java → ...ion/CouldNotVerifySignatureException.java b/...ion/CouldNotVerifySignatureException.java → ...ion/CouldNotVerifySignatureException.java
diff --git a/.../exception/ForbiddenRequestException.java → .../exception/ForbiddenRequestException.java b/.../exception/ForbiddenRequestException.java → .../exception/ForbiddenRequestException.java
diff --git a/.../IllegalParameterDefinitionException.java → .../IllegalParameterDefinitionException.java b/.../IllegalParameterDefinitionException.java → .../IllegalParameterDefinitionException.java
diff --git a/...exception/InvalidHttpStatusException.java → ...exception/InvalidHttpStatusException.java b/...exception/InvalidHttpStatusException.java → ...exception/InvalidHttpStatusException.java
diff --git a/.../exception/InvalidSignatureException.java → .../exception/InvalidSignatureException.java b/.../exception/InvalidSignatureException.java → .../exception/InvalidSignatureException.java
diff --git a/...eption/InvalidUrlForRequestException.java → ...eption/InvalidUrlForRequestException.java b/...eption/InvalidUrlForRequestException.java → ...eption/InvalidUrlForRequestException.java
diff --git a/...er/api/exception/OnboardingException.java → ...er/api/exception/OnboardingException.java b/...er/api/exception/OnboardingException.java → ...er/api/exception/OnboardingException.java
diff --git a/...uter/api/exception/RevokingException.java → ...uter/api/exception/RevokingException.java b/...uter/api/exception/RevokingException.java → ...uter/api/exception/RevokingException.java
diff --git a/...ception/UnauthorizedRequestException.java → ...ception/UnauthorizedRequestException.java b/...ception/UnauthorizedRequestException.java → ...ception/UnauthorizedRequestException.java
diff --git a/...eption/UnexpectedHttpStatusException.java → ...eption/UnexpectedHttpStatusException.java b/...eption/UnexpectedHttpStatusException.java → ...eption/UnexpectedHttpStatusException.java
diff --git a/...er/api/service/LoggingEnabledService.java → ...er/api/service/LoggingEnabledService.java b/...er/api/service/LoggingEnabledService.java → ...er/api/service/LoggingEnabledService.java
diff --git a/...uter/api/service/ParameterValidation.java → ...uter/api/service/ParameterValidation.java b/...uter/api/service/ParameterValidation.java → ...uter/api/service/ParameterValidation.java
diff --git a/...grirouter/api/service/RequestLogging.java → ...grirouter/api/service/RequestLogging.java b/...grirouter/api/service/RequestLogging.java → ...grirouter/api/service/RequestLogging.java
diff --git a/...rirouter/api/service/RevokingService.java → ...rirouter/api/service/RevokingService.java b/...rirouter/api/service/RevokingService.java → ...rirouter/api/service/RevokingService.java
diff --git a/...service/messaging/SendMessageService.java → ...service/messaging/SendMessageService.java b/...service/messaging/SendMessageService.java → ...service/messaging/SendMessageService.java
diff --git a/...saging/encoding/DecodeMessageService.java → ...saging/encoding/DecodeMessageService.java b/...saging/encoding/DecodeMessageService.java → ...saging/encoding/DecodeMessageService.java
diff --git a/...coding/DecodePushNotificationService.java → ...coding/DecodePushNotificationService.java b/...coding/DecodePushNotificationService.java → ...coding/DecodePushNotificationService.java
diff --git a/...saging/encoding/EncodeMessageService.java → ...saging/encoding/EncodeMessageService.java b/...saging/encoding/EncodeMessageService.java → ...saging/encoding/EncodeMessageService.java
diff --git a/...ce/messaging/encoding/MessageDecoder.java → ...ce/messaging/encoding/MessageDecoder.java b/...ce/messaging/encoding/MessageDecoder.java → ...ce/messaging/encoding/MessageDecoder.java
diff --git a/...ssaging/http/CloudOffboardingService.java → ...ssaging/http/CloudOffboardingService.java b/...ssaging/http/CloudOffboardingService.java → ...ssaging/http/CloudOffboardingService.java
diff --git a/...essaging/http/CloudOnboardingService.java → ...essaging/http/CloudOnboardingService.java b/...essaging/http/CloudOnboardingService.java → ...essaging/http/CloudOnboardingService.java
diff --git a/.../messaging/http/DeleteMessageService.java → .../messaging/http/DeleteMessageService.java b/.../messaging/http/DeleteMessageService.java → .../messaging/http/DeleteMessageService.java
diff --git a/...e/messaging/http/FetchMessageService.java → ...e/messaging/http/FetchMessageService.java b/...e/messaging/http/FetchMessageService.java → ...e/messaging/http/FetchMessageService.java
diff --git a/.../messaging/http/ListEndpointsService.java → .../messaging/http/ListEndpointsService.java b/.../messaging/http/ListEndpointsService.java → .../messaging/http/ListEndpointsService.java
diff --git a/...ging/http/MessageConfirmationService.java → ...ging/http/MessageConfirmationService.java b/...ging/http/MessageConfirmationService.java → ...ging/http/MessageConfirmationService.java
diff --git a/...aging/http/MessageHeaderQueryService.java → ...aging/http/MessageHeaderQueryService.java b/...aging/http/MessageHeaderQueryService.java → ...aging/http/MessageHeaderQueryService.java
diff --git a/...e/messaging/http/MessageQueryService.java → ...e/messaging/http/MessageQueryService.java b/...e/messaging/http/MessageQueryService.java → ...e/messaging/http/MessageQueryService.java
diff --git a/...vice/messaging/http/MessagingService.java → ...vice/messaging/http/MessagingService.java b/...vice/messaging/http/MessagingService.java → ...vice/messaging/http/MessagingService.java
diff --git a/.../messaging/http/SetCapabilityService.java → .../messaging/http/SetCapabilityService.java b/.../messaging/http/SetCapabilityService.java → .../messaging/http/SetCapabilityService.java
diff --git a/...essaging/http/SetSubscriptionService.java → ...essaging/http/SetSubscriptionService.java b/...essaging/http/SetSubscriptionService.java → ...essaging/http/SetSubscriptionService.java
diff --git a/...ssaging/mqtt/CloudOffboardingService.java → ...ssaging/mqtt/CloudOffboardingService.java b/...ssaging/mqtt/CloudOffboardingService.java → ...ssaging/mqtt/CloudOffboardingService.java
diff --git a/...essaging/mqtt/CloudOnboardingService.java → ...essaging/mqtt/CloudOnboardingService.java b/...essaging/mqtt/CloudOnboardingService.java → ...essaging/mqtt/CloudOnboardingService.java
diff --git a/.../messaging/mqtt/DeleteMessageService.java → .../messaging/mqtt/DeleteMessageService.java b/.../messaging/mqtt/DeleteMessageService.java → .../messaging/mqtt/DeleteMessageService.java
diff --git a/.../messaging/mqtt/ListEndpointsService.java → .../messaging/mqtt/ListEndpointsService.java b/.../messaging/mqtt/ListEndpointsService.java → .../messaging/mqtt/ListEndpointsService.java
diff --git a/...ging/mqtt/MessageConfirmationService.java → ...ging/mqtt/MessageConfirmationService.java b/...ging/mqtt/MessageConfirmationService.java → ...ging/mqtt/MessageConfirmationService.java
diff --git a/...aging/mqtt/MessageHeaderQueryService.java → ...aging/mqtt/MessageHeaderQueryService.java b/...aging/mqtt/MessageHeaderQueryService.java → ...aging/mqtt/MessageHeaderQueryService.java
diff --git a/...e/messaging/mqtt/MessageQueryService.java → ...e/messaging/mqtt/MessageQueryService.java b/...e/messaging/mqtt/MessageQueryService.java → ...e/messaging/mqtt/MessageQueryService.java
diff --git a/...vice/messaging/mqtt/MessagingService.java → ...vice/messaging/mqtt/MessagingService.java b/...vice/messaging/mqtt/MessagingService.java → ...vice/messaging/mqtt/MessagingService.java
diff --git a/.../messaging/mqtt/SetCapabilityService.java → .../messaging/mqtt/SetCapabilityService.java b/.../messaging/mqtt/SetCapabilityService.java → .../messaging/mqtt/SetCapabilityService.java
diff --git a/...essaging/mqtt/SetSubscriptionService.java → ...essaging/mqtt/SetSubscriptionService.java b/...essaging/mqtt/SetSubscriptionService.java → ...essaging/mqtt/SetSubscriptionService.java
diff --git a/...pi/service/onboard/OnboardingService.java → ...pi/service/onboard/OnboardingService.java b/...pi/service/onboard/OnboardingService.java → ...pi/service/onboard/OnboardingService.java
diff --git a/.../secured/AuthorizationRequestService.java → .../secured/AuthorizationRequestService.java b/.../secured/AuthorizationRequestService.java → .../secured/AuthorizationRequestService.java
diff --git a/...ce/onboard/secured/OnboardingService.java → ...ce/onboard/secured/OnboardingService.java b/...ce/onboard/secured/OnboardingService.java → ...ce/onboard/secured/OnboardingService.java
diff --git a/...api/dto/encoding/DecodeMessageResponse.kt → ...api/dto/encoding/DecodeMessageResponse.kt b/...api/dto/encoding/DecodeMessageResponse.kt → ...api/dto/encoding/DecodeMessageResponse.kt
diff --git a/...router/api/dto/encoding/EncodedMessage.kt → ...router/api/dto/encoding/EncodedMessage.kt b/...router/api/dto/encoding/EncodedMessage.kt → ...router/api/dto/encoding/EncodedMessage.kt
diff --git a/...rirouter/api/dto/encoding/inner/Header.kt → ...rirouter/api/dto/encoding/inner/Header.kt b/...rirouter/api/dto/encoding/inner/Header.kt → ...rirouter/api/dto/encoding/inner/Header.kt
diff --git a/...irouter/api/dto/encoding/inner/Message.kt → ...irouter/api/dto/encoding/inner/Message.kt b/...irouter/api/dto/encoding/inner/Message.kt → ...irouter/api/dto/encoding/inner/Message.kt
diff --git a/...api/dto/messaging/FetchMessageResponse.kt → ...api/dto/messaging/FetchMessageResponse.kt b/...api/dto/messaging/FetchMessageResponse.kt → ...api/dto/messaging/FetchMessageResponse.kt
diff --git a/...o/messaging/MessageConfirmationRequest.kt → ...o/messaging/MessageConfirmationRequest.kt b/...o/messaging/MessageConfirmationRequest.kt → ...o/messaging/MessageConfirmationRequest.kt
diff --git a/...r/api/dto/messaging/SendMessageRequest.kt → ...r/api/dto/messaging/SendMessageRequest.kt b/...r/api/dto/messaging/SendMessageRequest.kt → ...r/api/dto/messaging/SendMessageRequest.kt
diff --git a/...router/api/dto/messaging/inner/Message.kt → ...router/api/dto/messaging/inner/Message.kt b/...router/api/dto/messaging/inner/Message.kt → ...router/api/dto/messaging/inner/Message.kt
diff --git a/...router/api/dto/onboard/OnboardingError.kt → ...router/api/dto/onboard/OnboardingError.kt b/...router/api/dto/onboard/OnboardingError.kt → ...router/api/dto/onboard/OnboardingError.kt
diff --git a/...uter/api/dto/onboard/OnboardingRequest.kt → ...uter/api/dto/onboard/OnboardingRequest.kt b/...uter/api/dto/onboard/OnboardingRequest.kt → ...uter/api/dto/onboard/OnboardingRequest.kt
diff --git a/...ter/api/dto/onboard/OnboardingResponse.kt → ...ter/api/dto/onboard/OnboardingResponse.kt b/...ter/api/dto/onboard/OnboardingResponse.kt → ...ter/api/dto/onboard/OnboardingResponse.kt
diff --git a/...grirouter/api/dto/onboard/RouterDevice.kt → ...grirouter/api/dto/onboard/RouterDevice.kt b/...grirouter/api/dto/onboard/RouterDevice.kt → ...grirouter/api/dto/onboard/RouterDevice.kt
diff --git a/...r/api/dto/onboard/inner/Authentication.kt → ...r/api/dto/onboard/inner/Authentication.kt b/...r/api/dto/onboard/inner/Authentication.kt → ...r/api/dto/onboard/inner/Authentication.kt
diff --git a/...i/dto/onboard/inner/ConnectionCriteria.kt → ...i/dto/onboard/inner/ConnectionCriteria.kt b/...i/dto/onboard/inner/ConnectionCriteria.kt → ...i/dto/onboard/inner/ConnectionCriteria.kt
diff --git a/...trationrequest/RegistrationCodeRequest.kt → ...trationrequest/RegistrationCodeRequest.kt b/...trationrequest/RegistrationCodeRequest.kt → ...trationrequest/RegistrationCodeRequest.kt
diff --git a/...rationrequest/RegistrationCodeResponse.kt → ...rationrequest/RegistrationCodeResponse.kt b/...rationrequest/RegistrationCodeResponse.kt → ...rationrequest/RegistrationCodeResponse.kt
diff --git a/...nrequest/secured/AuthorizationResponse.kt → ...nrequest/secured/AuthorizationResponse.kt b/...nrequest/secured/AuthorizationResponse.kt → ...nrequest/secured/AuthorizationResponse.kt
diff --git a/...est/secured/AuthorizationResponseToken.kt → ...est/secured/AuthorizationResponseToken.kt b/...est/secured/AuthorizationResponseToken.kt → ...est/secured/AuthorizationResponseToken.kt
diff --git a/...grirouter/api/dto/revoke/RevokeRequest.kt → ...grirouter/api/dto/revoke/RevokeRequest.kt b/...grirouter/api/dto/revoke/RevokeRequest.kt → ...grirouter/api/dto/revoke/RevokeRequest.kt
diff --git a/...grirouter/api/dto/revoke/RevokingError.kt → ...grirouter/api/dto/revoke/RevokingError.kt b/...grirouter/api/dto/revoke/RevokingError.kt → ...grirouter/api/dto/revoke/RevokingError.kt
diff --git a/...agrirouter/api/dto/xsuaa/XsuaaResponse.kt → ...agrirouter/api/dto/xsuaa/XsuaaResponse.kt b/...agrirouter/api/dto/xsuaa/XsuaaResponse.kt → ...agrirouter/api/dto/xsuaa/XsuaaResponse.kt
diff --git a/...agrirouter/api/dto/xsuaa/inner/ExtAttr.kt → ...agrirouter/api/dto/xsuaa/inner/ExtAttr.kt b/...agrirouter/api/dto/xsuaa/inner/ExtAttr.kt → ...agrirouter/api/dto/xsuaa/inner/ExtAttr.kt
diff --git a/...a/agrirouter/api/enums/ApplicationType.kt → ...a/agrirouter/api/enums/ApplicationType.kt b/...a/agrirouter/api/enums/ApplicationType.kt → ...a/agrirouter/api/enums/ApplicationType.kt
diff --git a/...agrirouter/api/enums/CertificationType.kt → ...agrirouter/api/enums/CertificationType.kt b/...agrirouter/api/enums/CertificationType.kt → ...agrirouter/api/enums/CertificationType.kt
diff --git a/...ke/data/agrirouter/api/enums/Direction.kt → ...ke/data/agrirouter/api/enums/Direction.kt b/...ke/data/agrirouter/api/enums/Direction.kt → ...ke/data/agrirouter/api/enums/Direction.kt
diff --git a/...data/agrirouter/api/enums/EncodingType.kt → ...data/agrirouter/api/enums/EncodingType.kt b/...data/agrirouter/api/enums/EncodingType.kt → ...data/agrirouter/api/enums/EncodingType.kt
diff --git a/.../dke/data/agrirouter/api/enums/Gateway.kt → .../dke/data/agrirouter/api/enums/Gateway.kt b/.../dke/data/agrirouter/api/enums/Gateway.kt → .../dke/data/agrirouter/api/enums/Gateway.kt
diff --git a/...com/dke/data/agrirouter/api/enums/Mode.kt → ...com/dke/data/agrirouter/api/enums/Mode.kt b/...com/dke/data/agrirouter/api/enums/Mode.kt → ...com/dke/data/agrirouter/api/enums/Mode.kt
diff --git a/...ta/agrirouter/api/enums/RevokeResponse.kt → ...ta/agrirouter/api/enums/RevokeResponse.kt b/...ta/agrirouter/api/enums/RevokeResponse.kt → ...ta/agrirouter/api/enums/RevokeResponse.kt
diff --git a/...pi/enums/SecuredOnboardingResponseType.kt → ...pi/enums/SecuredOnboardingResponseType.kt b/...pi/enums/SecuredOnboardingResponseType.kt → ...pi/enums/SecuredOnboardingResponseType.kt
diff --git a/...irouter/api/enums/TechnicalMessageType.kt → ...irouter/api/enums/TechnicalMessageType.kt b/...irouter/api/enums/TechnicalMessageType.kt → ...irouter/api/enums/TechnicalMessageType.kt
diff --git a/...pi/messaging/AsyncMessageSendingResult.kt → ...pi/messaging/AsyncMessageSendingResult.kt b/...pi/messaging/AsyncMessageSendingResult.kt → ...pi/messaging/AsyncMessageSendingResult.kt
diff --git a/...essaging/HttpAsyncMessageSendingResult.kt → ...essaging/HttpAsyncMessageSendingResult.kt b/...essaging/HttpAsyncMessageSendingResult.kt → ...essaging/HttpAsyncMessageSendingResult.kt
diff --git a/...r/api/messaging/MessageSendingResponse.kt → ...r/api/messaging/MessageSendingResponse.kt b/...r/api/messaging/MessageSendingResponse.kt → ...r/api/messaging/MessageSendingResponse.kt
diff --git a/...ter/api/messaging/MessageSendingResult.kt → ...ter/api/messaging/MessageSendingResult.kt b/...ter/api/messaging/MessageSendingResult.kt → ...ter/api/messaging/MessageSendingResult.kt
diff --git a/...essaging/MqttAsyncMessageSendingResult.kt → ...essaging/MqttAsyncMessageSendingResult.kt b/...essaging/MqttAsyncMessageSendingResult.kt → ...essaging/MqttAsyncMessageSendingResult.kt
diff --git a/...ameters/AuthorizationRequestParameters.kt → ...ameters/AuthorizationRequestParameters.kt b/...ameters/AuthorizationRequestParameters.kt → ...ameters/AuthorizationRequestParameters.kt
diff --git a/.../parameters/CloudOffboardingParameters.kt → .../parameters/CloudOffboardingParameters.kt b/.../parameters/CloudOffboardingParameters.kt → .../parameters/CloudOffboardingParameters.kt
diff --git a/...e/parameters/CloudOnboardingParameters.kt → ...e/parameters/CloudOnboardingParameters.kt b/...e/parameters/CloudOnboardingParameters.kt → ...e/parameters/CloudOnboardingParameters.kt
diff --git a/...ice/parameters/DeleteMessageParameters.kt → ...ice/parameters/DeleteMessageParameters.kt b/...ice/parameters/DeleteMessageParameters.kt → ...ice/parameters/DeleteMessageParameters.kt
diff --git a/...vice/parameters/FetchMessageParameters.kt → ...vice/parameters/FetchMessageParameters.kt b/...vice/parameters/FetchMessageParameters.kt → ...vice/parameters/FetchMessageParameters.kt
diff --git a/...ice/parameters/ListEndpointsParameters.kt → ...ice/parameters/ListEndpointsParameters.kt b/...ice/parameters/ListEndpointsParameters.kt → ...ice/parameters/ListEndpointsParameters.kt
diff --git a/...rmationForAllPendingMessagesParameters.kt → ...rmationForAllPendingMessagesParameters.kt b/...rmationForAllPendingMessagesParameters.kt → ...rmationForAllPendingMessagesParameters.kt
diff --git a/...rameters/MessageConfirmationParameters.kt → ...rameters/MessageConfirmationParameters.kt b/...rameters/MessageConfirmationParameters.kt → ...rameters/MessageConfirmationParameters.kt
diff --git a/...ice/parameters/MessageHeaderParameters.kt → ...ice/parameters/MessageHeaderParameters.kt b/...ice/parameters/MessageHeaderParameters.kt → ...ice/parameters/MessageHeaderParameters.kt
diff --git a/...vice/parameters/MessageQueryParameters.kt → ...vice/parameters/MessageQueryParameters.kt b/...vice/parameters/MessageQueryParameters.kt → ...vice/parameters/MessageQueryParameters.kt
diff --git a/...ervice/parameters/OnboardingParameters.kt → ...ervice/parameters/OnboardingParameters.kt b/...ervice/parameters/OnboardingParameters.kt → ...ervice/parameters/OnboardingParameters.kt
diff --git a/...i/service/parameters/PayloadParameters.kt → ...i/service/parameters/PayloadParameters.kt b/...i/service/parameters/PayloadParameters.kt → ...i/service/parameters/PayloadParameters.kt
diff --git a/...ters/RegistrationCodeRequestParameters.kt → ...ters/RegistrationCodeRequestParameters.kt b/...ters/RegistrationCodeRequestParameters.kt → ...ters/RegistrationCodeRequestParameters.kt
diff --git a/...pi/service/parameters/RevokeParameters.kt → ...pi/service/parameters/RevokeParameters.kt b/...pi/service/parameters/RevokeParameters.kt → ...pi/service/parameters/RevokeParameters.kt
diff --git a/...parameters/SecuredOnboardingParameters.kt → ...parameters/SecuredOnboardingParameters.kt b/...parameters/SecuredOnboardingParameters.kt → ...parameters/SecuredOnboardingParameters.kt
diff --git a/...rvice/parameters/SendMessageParameters.kt → ...rvice/parameters/SendMessageParameters.kt b/...rvice/parameters/SendMessageParameters.kt → ...rvice/parameters/SendMessageParameters.kt
diff --git a/...e/parameters/SetCapabilitiesParameters.kt → ...e/parameters/SetCapabilitiesParameters.kt b/...e/parameters/SetCapabilitiesParameters.kt → ...e/parameters/SetCapabilitiesParameters.kt
diff --git a/...e/parameters/SetSubscriptionParameters.kt → ...e/parameters/SetSubscriptionParameters.kt b/...e/parameters/SetSubscriptionParameters.kt → ...e/parameters/SetSubscriptionParameters.kt
diff --git a/.../parameters/base/AbstractParameterBase.kt → .../parameters/base/AbstractParameterBase.kt b/.../parameters/base/AbstractParameterBase.kt → .../parameters/base/AbstractParameterBase.kt
diff --git a/...rameters/base/DynamicAttributesStorage.kt → ...rameters/base/DynamicAttributesStorage.kt b/...rameters/base/DynamicAttributesStorage.kt → ...rameters/base/DynamicAttributesStorage.kt
diff --git a/...data/agrirouter/api/util/TimestampUtil.kt → ...data/agrirouter/api/util/TimestampUtil.kt b/...data/agrirouter/api/util/TimestampUtil.kt → ...data/agrirouter/api/util/TimestampUtil.kt
diff --git a/agrirouter-api-java-convenience/pom.xml → agrirouter-sdk-java-convenience/pom.xml b/agrirouter-api-java-convenience/pom.xml → agrirouter-sdk-java-convenience/pom.xml
@@ -4,20 +4,20 @@
 
     <parent>
         <groupId>com.agrirouter.api</groupId>
-        <artifactId>agrirouter-api-java</artifactId>
+        <artifactId>agrirouter-sdk-java</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <name>AGRIROUTER API JAVA - CONVENIENCE</name>
-    <artifactId>agrirouter-api-java-convenience</artifactId>
+    <name>AGRIROUTER SDK JAVA - CONVENIENCE</name>
+    <artifactId>agrirouter-sdk-java-convenience</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>com.agrirouter.api</groupId>
-            <artifactId>agrirouter-api-java-api</artifactId>
+            <artifactId>agrirouter-sdk-java-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.agrirouter.api</groupId>
-            <artifactId>agrirouter-api-java-impl</artifactId>
+            <artifactId>agrirouter-sdk-java-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.paho</groupId>

diff --git a/...ecodeCloudOnboardingResponsesService.java → ...ecodeCloudOnboardingResponsesService.java b/...ecodeCloudOnboardingResponsesService.java → ...ecodeCloudOnboardingResponsesService.java
diff --git a/...nience/mqtt/client/MqttClientService.java → ...nience/mqtt/client/MqttClientService.java b/...nience/mqtt/client/MqttClientService.java → ...nience/mqtt/client/MqttClientService.java
diff --git a/...nience/mqtt/client/MqttOptionService.java → ...nience/mqtt/client/MqttOptionService.java b/...nience/mqtt/client/MqttOptionService.java → ...nience/mqtt/client/MqttOptionService.java
diff --git a/...saging/ListEndpointsFunctionsService.java → ...saging/ListEndpointsFunctionsService.java b/...saging/ListEndpointsFunctionsService.java → ...saging/ListEndpointsFunctionsService.java
diff --git a/...saging/ListEndpointsFunctionsService.java → ...saging/ListEndpointsFunctionsService.java b/...saging/ListEndpointsFunctionsService.java → ...saging/ListEndpointsFunctionsService.java
diff --git a/.../MessageConfirmationFunctionsService.java → .../MessageConfirmationFunctionsService.java b/.../MessageConfirmationFunctionsService.java → .../MessageConfirmationFunctionsService.java
diff --git a/agrirouter-api-java-impl/pom.xml → agrirouter-sdk-java-impl/pom.xml b/agrirouter-api-java-impl/pom.xml → agrirouter-sdk-java-impl/pom.xml
@@ -5,11 +5,11 @@
 
     <parent>
         <groupId>com.agrirouter.api</groupId>
-        <artifactId>agrirouter-api-java</artifactId>
+        <artifactId>agrirouter-sdk-java</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <name>AGRIROUTER API JAVA - IMPL</name>
-    <artifactId>agrirouter-api-java-impl</artifactId>
+    <name>AGRIROUTER SDK JAVA - IMPL</name>
+    <artifactId>agrirouter-sdk-java-impl</artifactId>
 
     <dependencies>
         <dependency>
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>com.agrirouter.api</groupId>
-            <artifactId>agrirouter-api-java-api</artifactId>
+            <artifactId>agrirouter-sdk-java-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/...agrirouter/impl/EnvironmentalService.java → ...agrirouter/impl/EnvironmentalService.java b/...agrirouter/impl/EnvironmentalService.java → ...agrirouter/impl/EnvironmentalService.java
diff --git a/...irouter/impl/NonEnvironmentalService.java → ...irouter/impl/NonEnvironmentalService.java b/...irouter/impl/NonEnvironmentalService.java → ...irouter/impl/NonEnvironmentalService.java
diff --git a/.../data/agrirouter/impl/RequestFactory.java → .../data/agrirouter/impl/RequestFactory.java b/.../data/agrirouter/impl/RequestFactory.java → .../data/agrirouter/impl/RequestFactory.java
diff --git a/...ata/agrirouter/impl/SignatureService.java → ...ata/agrirouter/impl/SignatureService.java b/...ata/agrirouter/impl/SignatureService.java → ...ata/agrirouter/impl/SignatureService.java
diff --git a/...irouter/impl/common/MessageIdService.java → ...irouter/impl/common/MessageIdService.java b/...irouter/impl/common/MessageIdService.java → ...irouter/impl/common/MessageIdService.java
diff --git a/...grirouter/impl/common/StateIdService.java → ...grirouter/impl/common/StateIdService.java b/...grirouter/impl/common/StateIdService.java → ...grirouter/impl/common/StateIdService.java
diff --git a/...grirouter/impl/common/UtcTimeService.java → ...grirouter/impl/common/UtcTimeService.java b/...grirouter/impl/common/UtcTimeService.java → ...grirouter/impl/common/UtcTimeService.java
diff --git a/...n/signing/SecurityKeyCreationService.java → ...n/signing/SecurityKeyCreationService.java b/...n/signing/SecurityKeyCreationService.java → ...n/signing/SecurityKeyCreationService.java
diff --git a/...l/common/ssl/KeyStoreCreationService.java → ...l/common/ssl/KeyStoreCreationService.java b/...l/common/ssl/KeyStoreCreationService.java → ...l/common/ssl/KeyStoreCreationService.java
diff --git a/...irouter/impl/gson/MessageTypeAdapter.java → ...irouter/impl/gson/MessageTypeAdapter.java b/...irouter/impl/gson/MessageTypeAdapter.java → ...irouter/impl/gson/MessageTypeAdapter.java
diff --git a/...er/impl/messaging/MessageBodyCreator.java → ...er/impl/messaging/MessageBodyCreator.java b/...er/impl/messaging/MessageBodyCreator.java → ...er/impl/messaging/MessageBodyCreator.java
diff --git a/...router/impl/messaging/MessageEncoder.java → ...router/impl/messaging/MessageEncoder.java b/...router/impl/messaging/MessageEncoder.java → ...router/impl/messaging/MessageEncoder.java
diff --git a/...grirouter/impl/messaging/MqttService.java → ...grirouter/impl/messaging/MqttService.java b/...grirouter/impl/messaging/MqttService.java → ...grirouter/impl/messaging/MqttService.java
diff --git a/...impl/messaging/SequenceNumberService.java → ...impl/messaging/SequenceNumberService.java b/...impl/messaging/SequenceNumberService.java → ...impl/messaging/SequenceNumberService.java
diff --git a/...ng/encoding/DecodeMessageServiceImpl.java → ...ng/encoding/DecodeMessageServiceImpl.java b/...ng/encoding/DecodeMessageServiceImpl.java → ...ng/encoding/DecodeMessageServiceImpl.java
diff --git a/...ng/DecodePushNotificationServiceImpl.java → ...ng/DecodePushNotificationServiceImpl.java b/...ng/DecodePushNotificationServiceImpl.java → ...ng/DecodePushNotificationServiceImpl.java
diff --git a/...ng/encoding/EncodeMessageServiceImpl.java → ...ng/encoding/EncodeMessageServiceImpl.java b/...ng/encoding/EncodeMessageServiceImpl.java → ...ng/encoding/EncodeMessageServiceImpl.java
diff --git a/...ing/helper/MessageQueryHelperService.java → ...ing/helper/MessageQueryHelperService.java b/...ing/helper/MessageQueryHelperService.java → ...ing/helper/MessageQueryHelperService.java
diff --git a/...elper/mqtt/MessageQueryHelperService.java → ...elper/mqtt/MessageQueryHelperService.java b/...elper/mqtt/MessageQueryHelperService.java → ...elper/mqtt/MessageQueryHelperService.java
diff --git a/...ing/mqtt/CloudOffboardingServiceImpl.java → ...ing/mqtt/CloudOffboardingServiceImpl.java b/...ing/mqtt/CloudOffboardingServiceImpl.java → ...ing/mqtt/CloudOffboardingServiceImpl.java
diff --git a/...ging/mqtt/CloudOnboardingServiceImpl.java → ...ging/mqtt/CloudOnboardingServiceImpl.java b/...ging/mqtt/CloudOnboardingServiceImpl.java → ...ging/mqtt/CloudOnboardingServiceImpl.java
diff --git a/...saging/mqtt/DeleteMessageServiceImpl.java → ...saging/mqtt/DeleteMessageServiceImpl.java b/...saging/mqtt/DeleteMessageServiceImpl.java → ...saging/mqtt/DeleteMessageServiceImpl.java
diff --git a/...saging/mqtt/ListEndpointsServiceImpl.java → ...saging/mqtt/ListEndpointsServiceImpl.java b/...saging/mqtt/ListEndpointsServiceImpl.java → ...saging/mqtt/ListEndpointsServiceImpl.java
diff --git a/.../mqtt/MessageConfirmationServiceImpl.java → .../mqtt/MessageConfirmationServiceImpl.java b/.../mqtt/MessageConfirmationServiceImpl.java → .../mqtt/MessageConfirmationServiceImpl.java
diff --git a/...g/mqtt/MessageHeaderQueryServiceImpl.java → ...g/mqtt/MessageHeaderQueryServiceImpl.java b/...g/mqtt/MessageHeaderQueryServiceImpl.java → ...g/mqtt/MessageHeaderQueryServiceImpl.java
diff --git a/...ssaging/mqtt/MessageQueryServiceImpl.java → ...ssaging/mqtt/MessageQueryServiceImpl.java b/...ssaging/mqtt/MessageQueryServiceImpl.java → ...ssaging/mqtt/MessageQueryServiceImpl.java
diff --git a/...essaging/mqtt/SendMessageServiceImpl.java → ...essaging/mqtt/SendMessageServiceImpl.java b/...essaging/mqtt/SendMessageServiceImpl.java → ...essaging/mqtt/SendMessageServiceImpl.java
diff --git a/...saging/mqtt/SetCapabilityServiceImpl.java → ...saging/mqtt/SetCapabilityServiceImpl.java b/...saging/mqtt/SetCapabilityServiceImpl.java → ...saging/mqtt/SetCapabilityServiceImpl.java
diff --git a/...ging/mqtt/SetSubscriptionServiceImpl.java → ...ging/mqtt/SetSubscriptionServiceImpl.java b/...ging/mqtt/SetSubscriptionServiceImpl.java → ...ging/mqtt/SetSubscriptionServiceImpl.java
diff --git a/...ing/rest/CloudOffboardingServiceImpl.java → ...ing/rest/CloudOffboardingServiceImpl.java b/...ing/rest/CloudOffboardingServiceImpl.java → ...ing/rest/CloudOffboardingServiceImpl.java
diff --git a/...ging/rest/CloudOnboardingServiceImpl.java → ...ging/rest/CloudOnboardingServiceImpl.java b/...ging/rest/CloudOnboardingServiceImpl.java → ...ging/rest/CloudOnboardingServiceImpl.java
diff --git a/...saging/rest/DeleteMessageServiceImpl.java → ...saging/rest/DeleteMessageServiceImpl.java b/...saging/rest/DeleteMessageServiceImpl.java → ...saging/rest/DeleteMessageServiceImpl.java
diff --git a/...ssaging/rest/FetchMessageServiceImpl.java → ...ssaging/rest/FetchMessageServiceImpl.java b/...ssaging/rest/FetchMessageServiceImpl.java → ...ssaging/rest/FetchMessageServiceImpl.java
diff --git a/...saging/rest/ListEndpointsServiceImpl.java → ...saging/rest/ListEndpointsServiceImpl.java b/...saging/rest/ListEndpointsServiceImpl.java → ...saging/rest/ListEndpointsServiceImpl.java
diff --git a/.../rest/MessageConfirmationServiceImpl.java → .../rest/MessageConfirmationServiceImpl.java b/.../rest/MessageConfirmationServiceImpl.java → .../rest/MessageConfirmationServiceImpl.java
diff --git a/...r/impl/messaging/rest/MessageFetcher.java → ...r/impl/messaging/rest/MessageFetcher.java b/...r/impl/messaging/rest/MessageFetcher.java → ...r/impl/messaging/rest/MessageFetcher.java
diff --git a/...g/rest/MessageHeaderQueryServiceImpl.java → ...g/rest/MessageHeaderQueryServiceImpl.java b/...g/rest/MessageHeaderQueryServiceImpl.java → ...g/rest/MessageHeaderQueryServiceImpl.java
diff --git a/...ssaging/rest/MessageQueryServiceImpl.java → ...ssaging/rest/MessageQueryServiceImpl.java b/...ssaging/rest/MessageQueryServiceImpl.java → ...ssaging/rest/MessageQueryServiceImpl.java
diff --git a/...er/impl/messaging/rest/MessageSender.java → ...er/impl/messaging/rest/MessageSender.java b/...er/impl/messaging/rest/MessageSender.java → ...er/impl/messaging/rest/MessageSender.java
diff --git a/...essaging/rest/SendMessageServiceImpl.java → ...essaging/rest/SendMessageServiceImpl.java b/...essaging/rest/SendMessageServiceImpl.java → ...essaging/rest/SendMessageServiceImpl.java
diff --git a/...saging/rest/SetCapabilityServiceImpl.java → ...saging/rest/SetCapabilityServiceImpl.java b/...saging/rest/SetCapabilityServiceImpl.java → ...saging/rest/SetCapabilityServiceImpl.java
diff --git a/...ging/rest/SetSubscriptionServiceImpl.java → ...ging/rest/SetSubscriptionServiceImpl.java b/...ging/rest/SetSubscriptionServiceImpl.java → ...ging/rest/SetSubscriptionServiceImpl.java
diff --git a/...pl/onboard/AbstractOnboardingService.java → ...pl/onboard/AbstractOnboardingService.java b/...pl/onboard/AbstractOnboardingService.java → ...pl/onboard/AbstractOnboardingService.java
diff --git a/...r/impl/onboard/OnboardingServiceImpl.java → ...r/impl/onboard/OnboardingServiceImpl.java b/...r/impl/onboard/OnboardingServiceImpl.java → ...r/impl/onboard/OnboardingServiceImpl.java
diff --git a/...ured/AuthorizationRequestServiceImpl.java → ...ured/AuthorizationRequestServiceImpl.java b/...ured/AuthorizationRequestServiceImpl.java → ...ured/AuthorizationRequestServiceImpl.java
diff --git a/...nboard/secured/OnboardingServiceImpl.java → ...nboard/secured/OnboardingServiceImpl.java b/...nboard/secured/OnboardingServiceImpl.java → ...nboard/secured/OnboardingServiceImpl.java
diff --git a/...uter/impl/revoke/RevokingServiceImpl.java → ...uter/impl/revoke/RevokingServiceImpl.java b/...uter/impl/revoke/RevokingServiceImpl.java → ...uter/impl/revoke/RevokingServiceImpl.java
diff --git a/...er/impl/validation/ResponseValidator.java → ...er/impl/validation/ResponseValidator.java b/...er/impl/validation/ResponseValidator.java → ...er/impl/validation/ResponseValidator.java
diff --git a/...igning/PrivateKeyCreationServiceTest.java → ...igning/PrivateKeyCreationServiceTest.java b/...igning/PrivateKeyCreationServiceTest.java → ...igning/PrivateKeyCreationServiceTest.java
diff --git a/...mmon/ssl/KeyStoreCreationServiceTest.java → ...mmon/ssl/KeyStoreCreationServiceTest.java b/...mmon/ssl/KeyStoreCreationServiceTest.java → ...mmon/ssl/KeyStoreCreationServiceTest.java
diff --git a/.../messaging/SequenceNumberServiceTest.java → .../messaging/SequenceNumberServiceTest.java b/.../messaging/SequenceNumberServiceTest.java → .../messaging/SequenceNumberServiceTest.java
diff --git a/...ncoding/DecodeMessageServiceImplTest.java → ...ncoding/DecodeMessageServiceImplTest.java b/...ncoding/DecodeMessageServiceImplTest.java → ...ncoding/DecodeMessageServiceImplTest.java
diff --git a/...ecodePushNotificationServiceImplTest.java → ...ecodePushNotificationServiceImplTest.java b/...ecodePushNotificationServiceImplTest.java → ...ecodePushNotificationServiceImplTest.java
diff --git a/...ncoding/EncodeMessageServiceImplTest.java → ...ncoding/EncodeMessageServiceImplTest.java b/...ncoding/EncodeMessageServiceImplTest.java → ...ncoding/EncodeMessageServiceImplTest.java
diff --git a/...sponses/farming-software-deactivated.json → ...sponses/farming-software-deactivated.json b/...sponses/farming-software-deactivated.json → ...sponses/farming-software-deactivated.json
diff --git a/...g-responses/farming-software-removed.json → ...g-responses/farming-software-removed.json b/...g-responses/farming-software-removed.json → ...g-responses/farming-software-removed.json
diff --git a/...nboarding-responses/farming-software.json → ...nboarding-responses/farming-software.json b/...nboarding-responses/farming-software.json → ...nboarding-responses/farming-software.json
diff --git a/...onses/telemetry-platform-deactivated.json → ...onses/telemetry-platform-deactivated.json b/...onses/telemetry-platform-deactivated.json → ...onses/telemetry-platform-deactivated.json
diff --git a/...responses/telemetry-platform-removed.json → ...responses/telemetry-platform-removed.json b/...responses/telemetry-platform-removed.json → ...responses/telemetry-platform-removed.json
diff --git a/...oarding-responses/telemetry-platform.json → ...oarding-responses/telemetry-platform.json b/...oarding-responses/telemetry-platform.json → ...oarding-responses/telemetry-platform.json
diff --git a/agrirouter-api-tests/pom.xml → agrirouter-sdk-java-tests/pom.xml b/agrirouter-api-tests/pom.xml → agrirouter-sdk-java-tests/pom.xml
@@ -3,26 +3,26 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>agrirouter-api-java</artifactId>
+        <artifactId>agrirouter-sdk-java</artifactId>
         <groupId>com.agrirouter.api</groupId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <name>AGRIROUTER API JAVA - TESTS</name>
+    <name>AGRIROUTER SDK JAVA - TESTS</name>
     <artifactId>agrirouter-api-tests</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>com.agrirouter.api</groupId>
-            <artifactId>agrirouter-api-java-api</artifactId>
+            <artifactId>agrirouter-sdk-java-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.agrirouter.api</groupId>
-            <artifactId>agrirouter-api-java-impl</artifactId>
+            <artifactId>agrirouter-sdk-java-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>com.agrirouter.api</groupId>
-            <artifactId>agrirouter-api-java-convenience</artifactId>
+            <artifactId>agrirouter-sdk-java-convenience</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/...irouter/test/AbstractIntegrationTest.java → ...irouter/test/AbstractIntegrationTest.java b/...irouter/test/AbstractIntegrationTest.java → ...irouter/test/AbstractIntegrationTest.java
diff --git a/.../dke/data/agrirouter/test/Assertions.java → .../dke/data/agrirouter/test/Assertions.java b/.../dke/data/agrirouter/test/Assertions.java → .../dke/data/agrirouter/test/Assertions.java
diff --git a/...er/test/OnboardingResponseRepository.java → ...er/test/OnboardingResponseRepository.java b/...er/test/OnboardingResponseRepository.java → ...er/test/OnboardingResponseRepository.java
diff --git a/.../test/fixture/FarmingSoftwareFixture.java → .../test/fixture/FarmingSoftwareFixture.java b/.../test/fixture/FarmingSoftwareFixture.java → .../test/fixture/FarmingSoftwareFixture.java
diff --git a/...est/fixture/TelemetryPlatformFixture.java → ...est/fixture/TelemetryPlatformFixture.java b/...est/fixture/TelemetryPlatformFixture.java → ...est/fixture/TelemetryPlatformFixture.java
diff --git a/...ng/rest/CancellationTokenPollingTest.java → ...ng/rest/CancellationTokenPollingTest.java b/...ng/rest/CancellationTokenPollingTest.java → ...ng/rest/CancellationTokenPollingTest.java
diff --git a/...ing/rest/CloudOffboardingServiceTest.java → ...ing/rest/CloudOffboardingServiceTest.java b/...ing/rest/CloudOffboardingServiceTest.java → ...ing/rest/CloudOffboardingServiceTest.java
diff --git a/...ging/rest/CloudOnboardingServiceTest.java → ...ging/rest/CloudOnboardingServiceTest.java b/...ging/rest/CloudOnboardingServiceTest.java → ...ging/rest/CloudOnboardingServiceTest.java
diff --git a/...HealthCheckForEndpointsByPollingTest.java → ...HealthCheckForEndpointsByPollingTest.java b/...HealthCheckForEndpointsByPollingTest.java → ...HealthCheckForEndpointsByPollingTest.java
diff --git a/...saging/rest/SetCapabilityServiceTest.java → ...saging/rest/SetCapabilityServiceTest.java b/...saging/rest/SetCapabilityServiceTest.java → ...saging/rest/SetCapabilityServiceTest.java
diff --git a/...ging/rest/SetSubscriptionServiceTest.java → ...ging/rest/SetSubscriptionServiceTest.java b/...ging/rest/SetSubscriptionServiceTest.java → ...ging/rest/SetSubscriptionServiceTest.java
diff --git a/...ding/AuthorizationRequestServiceTest.java → ...ding/AuthorizationRequestServiceTest.java b/...ding/AuthorizationRequestServiceTest.java → ...ding/AuthorizationRequestServiceTest.java
diff --git a/...rding/OnboardingWithErrorMessageTest.java → ...rding/OnboardingWithErrorMessageTest.java b/...rding/OnboardingWithErrorMessageTest.java → ...rding/OnboardingWithErrorMessageTest.java
diff --git a/...oarding/SecuredOnboardingServiceTest.java → ...oarding/SecuredOnboardingServiceTest.java b/...oarding/SecuredOnboardingServiceTest.java → ...oarding/SecuredOnboardingServiceTest.java
diff --git a/pom.xml b/pom.xml
@@ -4,12 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.agrirouter.api</groupId>
-    <artifactId>agrirouter-api-java</artifactId>
+    <artifactId>agrirouter-sdk-java</artifactId>
     <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>AGRIROUTER API JAVA</name>
-    <url>https://github.com/DKE-Data/agrirouter-api-java</url>
+    <name>AGRIROUTER SDK JAVA</name>
+    <url>https://github.com/DKE-Data/agrirouter-sdk-java</url>
     <licenses>
         <license>
             <name>Apache License Version 2.0</name>
@@ -25,17 +25,17 @@
     </developers>
 
     <scm>
-        <connection>scm:git:git:github.com/DKE-Data/agrirouter-api-java.git</connection>
-        <developerConnection>scm:git:git@github.com:DKE-Data/agrirouter-api-java.git
+        <connection>scm:git:git:github.com/DKE-Data/agrirouter-sdk-java.git</connection>
+        <developerConnection>scm:git:git@github.com:DKE-Data/agrirouter-sdk-java.git
         </developerConnection>
-        <url>https://github.com/DKE-Data/agrirouter-api-java</url>
+        <url>https://github.com/DKE-Data/agrirouter-sdk-java</url>
     </scm>
 
     <distributionManagement>
         <repository>
             <id>github</id>
             <name>GitHub DKE-Data Apache Maven Packages</name>
-            <url>https://maven.pkg.github.com/DKE-Data/agrirouter-api-java</url>
+            <url>https://maven.pkg.github.com/DKE-Data/agrirouter-sdk-java</url>
         </repository>
     </distributionManagement>
 
@@ -58,10 +58,10 @@
     </repositories>
 
     <modules>
-        <module>agrirouter-api-java-api</module>
-        <module>agrirouter-api-java-impl</module>
-        <module>agrirouter-api-java-convenience</module>
-        <module>agrirouter-api-tests</module>
+        <module>agrirouter-sdk-java-api</module>
+        <module>agrirouter-sdk-java-impl</module>
+        <module>agrirouter-sdk-java-convenience</module>
+        <module>agrirouter-sdk-java-tests</module>
     </modules>
 
     <properties>
@@ -108,17 +108,17 @@
             <!-- INTERNAL -->
             <dependency>
                 <groupId>com.agrirouter.api</groupId>
-                <artifactId>agrirouter-api-java-api</artifactId>
+                <artifactId>agrirouter-sdk-java-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.agrirouter.api</groupId>
-                <artifactId>agrirouter-api-java-impl</artifactId>
+                <artifactId>agrirouter-sdk-java-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.agrirouter.api</groupId>
-                <artifactId>agrirouter-api-java-convenience</artifactId>
+                <artifactId>agrirouter-sdk-java-convenience</artifactId>
                 <version>${project.version}</version>
             </dependency>