diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataChannels.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataChannels.java
index adfc9016d4e..dcd7bd12cba 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataChannels.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataChannels.java
@@ -68,8 +68,8 @@ public class DataChannels extends AbstractKapuaResource {
      *
      * @param scopeId
      *         The {@link ScopeId} in which to search results.
-     * @param clientId
-     *         The client id to filter results.
+     * @param clientIds
+     *         The client id(s) to filter results.
      * @param name
      *         The channel name to filter results. It allows '#' wildcard in last channel level
      * @param sortParam
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataClients.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataClients.java
index e5022f0a80e..04cc47abf10 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataClients.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataClients.java
@@ -62,8 +62,8 @@ public class DataClients extends AbstractKapuaResource {
      *
      * @param scopeId
      *         The {@link ScopeId} in which to search results.
-     * @param clientId
-     *         The client id to filter results
+     * @param clientIds
+     *         The client id(s) to filter results.
      * @param offset
      *         The result set offset.
      * @param limit
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessages.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessages.java
index dfa47eb7846..99ca6fb94b2 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessages.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessages.java
@@ -76,8 +76,8 @@ public class DataMessages extends AbstractKapuaResource {
      *
      * @param scopeId
      *         The {@link ScopeId} in which to search results.
-     * @param clientId
-     *         The client id to filter results.
+     * @param clientIds
+     *         The client id(s) to filter results.
      * @param channel
      *         The channel id to filter results. It allows '#' wildcard in last channel level.
      * @param strictChannel
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessagesJson.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessagesJson.java
index 375c6d15e59..e27df7455d7 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessagesJson.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessagesJson.java
@@ -74,8 +74,8 @@ public class DataMessagesJson extends AbstractKapuaResource implements JsonSeria
      *
      * @param scopeId
      *         The {@link ScopeId} in which to search results.
-     * @param clientId
-     *         The client id to filter results.
+     * @param clientIds
+     *         The client id(s) to filter results.
      * @param channel
      *         The channel id to filter results. It allows '#' wildcard in last channel level.
      * @param strictChannel
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMetrics.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMetrics.java
index e6673d17a00..650b0245928 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMetrics.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMetrics.java
@@ -64,8 +64,8 @@ public class DataMetrics extends AbstractKapuaResource {
      *
      * @param scopeId
      *         The {@link ScopeId} in which to search results.
-     * @param clientId
-     *         The client id to filter results.
+     * @param clientIds
+     *         The client id(s) to filter results.
      * @param channel
      *         The channel id to filter results. It allows '#' wildcard in last channel level
      * @param name