diff --git a/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandService.java b/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandService.java
index c2191175fd316c56884efd0cf9e19e34c99d3911..a1f4e512ba5723b7c28c322812a0784bf56473e6 100644
--- a/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandService.java
+++ b/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandService.java
@@ -44,7 +44,7 @@ public class CommandService {
 
 	@Qualifier(ArchiveManagerConfiguration.COMMAND_REMOTE_SERVICE_NAME) // NOSONAR
 	private final CommandRemoteService remoteService;
-	@Qualifier(ArchiveManagerConfiguration.OZGCLOUD_COMMAND_SERVICE_NAME)
+	@Qualifier(ArchiveManagerConfiguration.OZGCLOUD_COMMAND_SERVICE_NAME) // NOSONAR
 	private final OzgCloudCommandService ozgCloudCommandService;
 
 	public Stream<ArchiveManagerCommand> findFinishedCommands(@NonNull String vorgangId) {
diff --git a/archive-manager-server/src/main/java/de/ozgcloud/archive/common/xta/XtaConfiguration.java b/archive-manager-server/src/main/java/de/ozgcloud/archive/common/xta/XtaConfiguration.java
index a58411a47551496e1813c02934e5310ef4c91188..174f5862deb05402b3200b9aedd221f5cdd5e96b 100644
--- a/archive-manager-server/src/main/java/de/ozgcloud/archive/common/xta/XtaConfiguration.java
+++ b/archive-manager-server/src/main/java/de/ozgcloud/archive/common/xta/XtaConfiguration.java
@@ -36,7 +36,7 @@ class XtaConfiguration {
 				.msgBoxServiceUrl(xtaProperties.getMsgBoxServiceUrl())
 				.clientCertKeystore(buildKeystore(xtaProperties.getKeyStore()))
 				.trustStore(buildKeystore(xtaProperties.getTrustStore()))
-				.maxListItems(xtaProperties.getMaxListItems())
+				.maxListItems(xtaProperties.getMaxLoadedMessages())
 				.clientIdentifiers(xtaProperties.getClientIdentifiers())
 				.build();
 	}
diff --git a/archive-manager-server/src/main/java/de/ozgcloud/archive/common/xta/XtaProperties.java b/archive-manager-server/src/main/java/de/ozgcloud/archive/common/xta/XtaProperties.java
index 1ad7ad83dcb3ae888aa95203f17a3ec237230b19..d5409da8ffaf6e8b7d7ecb408f631007a45f9a6d 100644
--- a/archive-manager-server/src/main/java/de/ozgcloud/archive/common/xta/XtaProperties.java
+++ b/archive-manager-server/src/main/java/de/ozgcloud/archive/common/xta/XtaProperties.java
@@ -35,11 +35,11 @@ public class XtaProperties {
 	 */
 	private String managementServiceUrl;
 	/*
-	 * Maximum number of Messages loaded from message box.
+	 * Maximum number of messages loaded from message box.
 	 */
-	private int maxListItems = 50;
+	private int maxLoadedMessages = 50;
 	/*
-	 * Reference to client certifiaction key store.
+	 * Reference to client certification key store.
 	 */
 	private XtaClientKeyStore keyStore;
 	/*
@@ -47,7 +47,7 @@ public class XtaProperties {
 	 */
 	private XtaClientKeyStore trustStore;
 	/*
-	 * Client identifiers used to identify cleint at XTA adapter.
+	 * Client identifiers used to identify client at XTA adapter.
 	 */
 	private List<XtaIdentifier> clientIdentifiers;
 
diff --git a/pom.xml b/pom.xml
index 0dab886bda9ecfa1081cf140e871707faac97992..2f8e05ec7188ed7f0f76945c904d73eb489ab225 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<vorgang-manager.version>2.18.0</vorgang-manager.version>
 		<nachrichten-manager.version>2.15.0</nachrichten-manager.version>
-		<api-lib.version>0.16.0-PR-38-SNAPSHOT</api-lib.version>
+		<api-lib.version>0.16.0-SNAPSHOT</api-lib.version>
 		<find-and-replace-maven-plugin.version>1.2.0</find-and-replace-maven-plugin.version>
 		<protoc-jar-plugin.version>3.11.4</protoc-jar-plugin.version>
 		<ozgcloud-common.version>4.7.0</ozgcloud-common.version>