diff --git a/src/main/java/sh/libre/scim/core/AbstractScimService.java b/src/main/java/sh/libre/scim/core/AbstractScimService.java
index 53a6738b35..1bad0d8cfe 100644
--- a/src/main/java/sh/libre/scim/core/AbstractScimService.java
+++ b/src/main/java/sh/libre/scim/core/AbstractScimService.java
@@ -78,7 +78,7 @@ public abstract class AbstractScimService<RMM extends RoleMapperModel, S extends
             KeycloakId id = getId(roleMapperModel);
             ScimResource scimResource = findById(id).get();
             EntityOnRemoteScimId externalId = scimResource.getExternalIdAsEntityOnRemoteScimId();
-            ResourceNode scimForReplace = toScimForReplace(roleMapperModel, externalId);
+            S scimForReplace = toScimForReplace(roleMapperModel, externalId);
             scimClient.replace(externalId, scimForReplace);
         } catch (NoSuchElementException e) {
             LOGGER.warnf("failed to replace resource %s, scim mapping not found", getId(roleMapperModel));
@@ -87,7 +87,7 @@ public abstract class AbstractScimService<RMM extends RoleMapperModel, S extends
         }
     }
 
-    protected abstract ResourceNode toScimForReplace(RMM roleMapperModel, EntityOnRemoteScimId externalId);
+    protected abstract S toScimForReplace(RMM roleMapperModel, EntityOnRemoteScimId externalId);
 
     public void delete(KeycloakId id) {
         try {
diff --git a/src/main/java/sh/libre/scim/core/ScimDispatcher.java b/src/main/java/sh/libre/scim/core/ScimDispatcher.java
index bf06dbcf30..6804c06554 100644
--- a/src/main/java/sh/libre/scim/core/ScimDispatcher.java
+++ b/src/main/java/sh/libre/scim/core/ScimDispatcher.java
@@ -72,13 +72,13 @@ public class ScimDispatcher {
     public void dispatchUserModificationToAll(Consumer<UserScimService> operationToDispatch) {
         initializeClientsIfNeeded();
         userScimServices.forEach(operationToDispatch);
-        logger.infof("[SCIM] User operation dispatched to %d SCIM clients", userScimServices.size());
+        logger.infof("[SCIM] User operation dispatched to %d SCIM server", userScimServices.size());
     }
 
     public void dispatchGroupModificationToAll(Consumer<GroupScimService> operationToDispatch) {
         initializeClientsIfNeeded();
         groupScimServices.forEach(operationToDispatch);
-        logger.infof("[SCIM] Group operation dispatched to %d SCIM clients", groupScimServices.size());
+        logger.infof("[SCIM] Group operation dispatched to %d SCIM server", groupScimServices.size());
     }
 
     public void dispatchUserModificationToOne(ComponentModel scimServerConfiguration, Consumer<UserScimService> operationToDispatch) {
@@ -87,7 +87,7 @@ public class ScimDispatcher {
         Optional<UserScimService> matchingClient = userScimServices.stream().filter(u -> u.getConfiguration().getId().equals(scimServerConfiguration.getId())).findFirst();
         if (matchingClient.isPresent()) {
             operationToDispatch.accept(matchingClient.get());
-            logger.infof("[SCIM] User operation dispatched to SCIM client %s", matchingClient.get().getConfiguration().getId());
+            logger.infof("[SCIM] User operation dispatched to SCIM server %s", matchingClient.get().getConfiguration().getId());
         } else {
             logger.error("[SCIM] Could not find a Scim Client matching endpoint configuration" + scimServerConfiguration.getId());
         }
@@ -100,7 +100,7 @@ public class ScimDispatcher {
         Optional<GroupScimService> matchingClient = groupScimServices.stream().filter(u -> u.getConfiguration().getId().equals(scimServerConfiguration.getId())).findFirst();
         if (matchingClient.isPresent()) {
             operationToDispatch.accept(matchingClient.get());
-            logger.infof("[SCIM] Group operation dispatched to SCIM client %s", matchingClient.get().getConfiguration().getId());
+            logger.infof("[SCIM] Group operation dispatched to SCIM server %s", matchingClient.get().getConfiguration().getId());
         } else {
             logger.error("[SCIM] Could not find a Scim Client matching endpoint configuration" + scimServerConfiguration.getId());
         }