diff --git a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/createunresolvedentities/PrepareBipFinder.java b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/createunresolvedentities/PrepareBipFinder.java
index 48e1cd8ca9..40d420ec4c 100644
--- a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/createunresolvedentities/PrepareBipFinder.java
+++ b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/createunresolvedentities/PrepareBipFinder.java
@@ -10,6 +10,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import eu.dnetlib.dhp.utils.DHPUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.hdfs.client.HdfsUtils;
 import org.apache.spark.SparkConf;
@@ -93,7 +94,7 @@ public class PrepareBipFinder implements Serializable {
 			.map((MapFunction<BipScore, Result>) v -> {
 				Result r = new Result();
 
-				r.setId(getUnresolvedDoiIndentifier(v.getId()));
+				r.setId(DHPUtils.generateUnresolvedIdentifier(v.getId(), "doi"));
 				r.setMeasures(getMeasure(v));
 				return r;
 			}, Encoders.bean(Result.class))
diff --git a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/createunresolvedentities/PrepareFOSSparkJob.java b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/createunresolvedentities/PrepareFOSSparkJob.java
index 839df13d05..d77fb38bc7 100644
--- a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/createunresolvedentities/PrepareFOSSparkJob.java
+++ b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/createunresolvedentities/PrepareFOSSparkJob.java
@@ -8,6 +8,7 @@ import java.io.Serializable;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import eu.dnetlib.dhp.utils.DHPUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.spark.SparkConf;
 import org.apache.spark.api.java.function.FlatMapFunction;
@@ -78,7 +79,7 @@ public class PrepareFOSSparkJob implements Serializable {
 		}, Encoders.bean(FOSDataModel.class))
 			.map((MapFunction<FOSDataModel, Result>) value -> {
 				Result r = new Result();
-				r.setId(getUnresolvedDoiIndentifier(value.getDoi()));
+				r.setId(DHPUtils.generateUnresolvedIdentifier(value.getDoi(), "doi"));
 				r.setSubject(getSubjects(value));
 				return r;
 			}, Encoders.bean(Result.class))