diff --git a/gradle.properties b/gradle.properties
index 728f7e65..2c0a32a6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 # x-release-please-start-version
 version=9.1.0
 # x-release-please-end
-iexecCommonsPocoVersion=5.1.0
+iexecCommonsPocoVersion=5.2.0
 
 nexusUser
 nexusPassword
diff --git a/src/main/java/com/iexec/common/utils/IexecEnvUtils.java b/src/main/java/com/iexec/common/utils/IexecEnvUtils.java
index 191a72ed..e9ffa0e6 100644
--- a/src/main/java/com/iexec/common/utils/IexecEnvUtils.java
+++ b/src/main/java/com/iexec/common/utils/IexecEnvUtils.java
@@ -36,8 +36,8 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class IexecEnvUtils {
 
-    // bulk processing
-    public static final String BULK_ENV_VAR_PREFIX = "BULK_DATASET_";
+    // dataset prefix, mostly for bulk processing
+    public static final String IEXEC_DATASET_PREFIX = "IEXEC_DATASET_";
     // input files
     public static final String IEXEC_INPUT_FILE_NAME_PREFIX = "IEXEC_INPUT_FILE_NAME_";
     public static final String IEXEC_INPUT_FILE_URL_PREFIX = "IEXEC_INPUT_FILE_URL_";
@@ -80,8 +80,8 @@ public static Map<String, String> getAllIexecEnv(final TaskDescription taskDescr
      */
     public static Map<String, String> getComputeStageEnvMap(final TaskDescription taskDescription) {
         final Map<String, String> map = new HashMap<>();
-        map.put(DEAL_ID.name(), taskDescription.getChainDealId());
-        map.put(TASK_INDEX.name(), String.valueOf(taskDescription.getBotIndex()));
+        map.put(IEXEC_DEAL_ID.name(), taskDescription.getChainDealId());
+        map.put(IEXEC_TASK_INDEX.name(), String.valueOf(taskDescription.getBotIndex()));
         map.put(IEXEC_TASK_ID.name(), taskDescription.getChainTaskId());
         map.put(IEXEC_IN.name(), IexecFileHelper.SLASH_IEXEC_IN);
         map.put(IEXEC_OUT.name(), IexecFileHelper.SLASH_IEXEC_OUT);
diff --git a/src/main/java/com/iexec/common/worker/tee/TeeSessionEnvironmentVariable.java b/src/main/java/com/iexec/common/worker/tee/TeeSessionEnvironmentVariable.java
index 965a3fb1..6cd70d54 100644
--- a/src/main/java/com/iexec/common/worker/tee/TeeSessionEnvironmentVariable.java
+++ b/src/main/java/com/iexec/common/worker/tee/TeeSessionEnvironmentVariable.java
@@ -18,8 +18,8 @@
 
 public enum TeeSessionEnvironmentVariable {
     // common
-    DEAL_ID,
-    TASK_INDEX,
+    IEXEC_DEAL_ID,
+    IEXEC_TASK_INDEX,
     IEXEC_TASK_ID,
     SIGN_WORKER_ADDRESS,
     SIGN_TEE_CHALLENGE_PRIVATE_KEY,
@@ -38,7 +38,7 @@ public enum TeeSessionEnvironmentVariable {
     IEXEC_INPUT_FILES_NUMBER,
     IEXEC_INPUT_FILES_FOLDER,
     IEXEC_PRE_COMPUTE_OUT,
-    BULK_SIZE,
+    IEXEC_BULK_SLICE_SIZE,
     // post-compute
     RESULT_ENCRYPTION,
     RESULT_ENCRYPTION_PUBLIC_KEY,
diff --git a/src/test/java/com/iexec/common/utils/IexecEnvUtilsTest.java b/src/test/java/com/iexec/common/utils/IexecEnvUtilsTest.java
index d200785c..eae80f08 100644
--- a/src/test/java/com/iexec/common/utils/IexecEnvUtilsTest.java
+++ b/src/test/java/com/iexec/common/utils/IexecEnvUtilsTest.java
@@ -129,8 +129,8 @@ void shouldGetComputeStageEnvList() {
                 .dealParams(dealParams)
                 .build();
         final List<String> expected = List.of(
-                "DEAL_ID=chainDealId",
-                "TASK_INDEX=0",
+                "IEXEC_DEAL_ID=chainDealId",
+                "IEXEC_TASK_INDEX=0",
                 "IEXEC_TASK_ID=chainTaskId",
                 "IEXEC_IN=/iexec_in",
                 "IEXEC_OUT=/iexec_out",
@@ -148,8 +148,8 @@ void shouldGetComputeStageEnvList() {
 
     private Map<String, String> getExpectedComputeStageMapValues(final TaskDescription taskDescription) {
         return Map.of(
-                TeeSessionEnvironmentVariable.DEAL_ID.name(), taskDescription.getChainDealId(),
-                TeeSessionEnvironmentVariable.TASK_INDEX.name(), String.valueOf(taskDescription.getBotIndex()),
+                TeeSessionEnvironmentVariable.IEXEC_DEAL_ID.name(), taskDescription.getChainDealId(),
+                TeeSessionEnvironmentVariable.IEXEC_TASK_INDEX.name(), String.valueOf(taskDescription.getBotIndex()),
                 TeeSessionEnvironmentVariable.IEXEC_TASK_ID.name(), taskDescription.getChainTaskId(),
                 TeeSessionEnvironmentVariable.IEXEC_IN.name(), IexecFileHelper.SLASH_IEXEC_IN,
                 TeeSessionEnvironmentVariable.IEXEC_OUT.name(), IexecFileHelper.SLASH_IEXEC_OUT,