diff --git a/dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/GraphJoinerTest.java b/dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/GraphJoinerTest.java
deleted file mode 100644
index 1336a1cf7..000000000
--- a/dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/GraphJoinerTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-
-package eu.dnetlib.dhp.oa.provision;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.junit.jupiter.api.BeforeEach;
-
-public class GraphJoinerTest {
-
-	private final ClassLoader cl = getClass().getClassLoader();
-	private Path workingDir;
-	private Path inputDir;
-	private Path outputDir;
-
-	@BeforeEach
-	public void before() throws IOException {
-		workingDir = Files.createTempDirectory("promote_action_set");
-		inputDir = workingDir.resolve("input");
-		outputDir = workingDir.resolve("output");
-	}
-
-	private static void copyFiles(Path source, Path target) throws IOException {
-		Files
-			.list(source)
-			.forEach(
-				f -> {
-					try {
-						if (Files.isDirectory(f)) {
-							Path subTarget = Files.createDirectories(target.resolve(f.getFileName()));
-							copyFiles(f, subTarget);
-						} else {
-							Files.copy(f, target.resolve(f.getFileName()));
-						}
-					} catch (IOException e) {
-						e.printStackTrace();
-						throw new RuntimeException(e);
-					}
-				});
-	}
-}
diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/config-default.xml b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/config-default.xml
index e2953693f..ba7002cff 100644
--- a/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/config-default.xml
+++ b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/config-default.xml
@@ -15,12 +15,12 @@
         <name>oozie.action.sharelib.for.spark</name>
         <value>spark2</value>
     </property>
-     <property>
-        <name>hive_metastore_uris</name>
+    <property>
+        <name>hiveMetastoreUris</name>
         <value>thrift://iis-cdh5-test-m3.ocean.icm.edu.pl:9083</value>
     </property>
     <property>
-        <name>hive_jdbc_url</name>
+        <name>hiveJdbcUrl</name>
         <value>jdbc:hive2://iis-cdh5-test-m3.ocean.icm.edu.pl:10000</value>
     </property>
 	<property>
diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/workflow.xml b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/workflow.xml
index 19f3316d8..6f6389362 100644
--- a/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/workflow.xml
+++ b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/workflow.xml
@@ -14,11 +14,11 @@
             <description>the external stats that should be added since they are not included in the graph database</description>
         </property>
         <property>
-            <name>hive_metastore_uris</name>
+            <name>hiveMetastoreUris</name>
             <description>hive server metastore URIs</description>
         </property>
         <property>
-            <name>hive_jdbc_url</name>
+            <name>hiveJdbcUrl</name>
             <description>hive server jdbc url</description>
         </property>
     </parameters>
@@ -29,7 +29,7 @@
         <configuration>
             <property>
                 <name>hive.metastore.uris</name>
-                <value>${hive_metastore_uris}</value>
+                <value>${hiveMetastoreUris}</value>
             </property>
         </configuration>
     </global>
@@ -42,7 +42,7 @@
 
     <action name="Step1">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step1.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -53,7 +53,7 @@
     
     <action name="Step2_1">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step2_1.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -64,7 +64,7 @@
 
     <action name="Step2_2">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step2_2.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -75,7 +75,7 @@
 
     <action name="Step2_3">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step2_3.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -86,7 +86,7 @@
 
     <action name="Step2_4">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step2_4.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -97,7 +97,7 @@
 
     <action name="Step2_5">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step2_5.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -108,7 +108,7 @@
 
     <action name="Step2_6">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step2_6.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -119,7 +119,7 @@
 
     <action name="Step2_7">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step2_7.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -130,7 +130,7 @@
 
     <action name="Step2_8">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step2_8.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -141,7 +141,7 @@
 
     <action name="Step2_9">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step2_9.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -152,7 +152,7 @@
     
     <action name="Step3">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step3.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -163,7 +163,7 @@
     
     <action name="Step4_1">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step4_1.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -174,7 +174,7 @@
 
     <action name="Step4_2">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step4_2.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -185,7 +185,7 @@
 
     <action name="Step4_3">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step4_3.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -196,7 +196,7 @@
 
     <action name="Step4_4">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step4_4.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -207,7 +207,7 @@
 
     <action name="Step4_5">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step4_5.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -218,7 +218,7 @@
 
     <action name="Step4_6">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step4_6.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -229,7 +229,7 @@
 
     <action name="Step4_7">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step4_7.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -240,7 +240,7 @@
 
     <action name="Step4_8">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step4_8.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -251,7 +251,7 @@
 
     <action name="Step4_9">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step4_9.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -262,7 +262,7 @@
 
     <action name="Step4_10">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step4_10.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -273,7 +273,7 @@
     
     <action name="Step5_1">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step5_1.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -284,7 +284,7 @@
 
 	<action name="Step5_2">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step5_2.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -295,7 +295,7 @@
 
     <action name="Step5_3">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step5_3.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -306,7 +306,7 @@
 
     <action name="Step5_4">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step5_4.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -317,7 +317,7 @@
 
     <action name="Step5_5">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step5_5.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -328,7 +328,7 @@
 
     <action name="Step5_6">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step5_6.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -339,7 +339,7 @@
 
     <action name="Step5_7">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step5_7.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -350,7 +350,7 @@
 
     <action name="Step5_8">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step5_8.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -361,7 +361,7 @@
 
     <action name="Step5_9">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step5_9.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -372,7 +372,7 @@
 
     <action name="Step5_10">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step5_10.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -383,7 +383,7 @@
     
     <action name="Step6_1">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step6_1.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -394,7 +394,7 @@
 
     <action name="Step6_2">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step6_2.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -405,7 +405,7 @@
 
     <action name="Step6_3">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step6_3.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -416,7 +416,7 @@
 
     <action name="Step6_4">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step6_4.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -427,7 +427,7 @@
 
     <action name="Step6_5">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step6_5.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -438,7 +438,7 @@
 
     <action name="Step6_6">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step6_6.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -449,7 +449,7 @@
 
     <action name="Step6_7">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step6_7.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -460,7 +460,7 @@
 
     <action name="Step6_8">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step6_8.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -471,7 +471,7 @@
 
     <action name="Step6_9">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step6_9.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -482,7 +482,7 @@
 
     <action name="Step6_10">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step6_10.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -493,7 +493,7 @@
     
     <action name="Step7_1">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step7_1.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -504,7 +504,7 @@
 
     <action name="Step7_2">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step7_2.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -515,7 +515,7 @@
 
     <action name="Step7_3">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step7_3.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -526,7 +526,7 @@
 
     <action name="Step7_4">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step7_4.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -537,7 +537,7 @@
 
     <action name="Step7_5">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step7_5.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -548,7 +548,7 @@
     
     <action name="Step8_1">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step8_1.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -559,7 +559,7 @@
 
     <action name="Step8_2">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step8_2.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -570,7 +570,7 @@
 
     <action name="Step8_3">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step8_3.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -581,7 +581,7 @@
 
     <action name="Step8_4">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step8_4.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -592,7 +592,7 @@
 
     <action name="Step8_5">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step8_5.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -603,7 +603,7 @@
 
     <action name="Step8_6">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step8_6.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -614,7 +614,7 @@
 
     <action name="Step8_7">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step8_7.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -625,7 +625,7 @@
 
     <action name="Step8_8">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step8_8.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -636,7 +636,7 @@
 
     <action name="Step8_9">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step8_9.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -647,7 +647,7 @@
 
     <action name="Step8_10">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step8_10.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -658,7 +658,7 @@
 
     <action name="Step8_11">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step8_11.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -669,7 +669,7 @@
     
     <action name="Step9_1">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step9_1.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -680,7 +680,7 @@
 
     <action name="Step9_2">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step9_2.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -691,7 +691,7 @@
 
     <action name="Step9_3">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step9_3.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -702,7 +702,7 @@
 
     <action name="Step9_4">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step9_4.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -713,7 +713,7 @@
 
     <action name="Step9_5">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step9_5.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -724,7 +724,7 @@
 
     <action name="Step9_6">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step9_6.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -735,7 +735,7 @@
 
     <action name="Step9_7">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step9_7.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -746,7 +746,7 @@
 
     <action name="Step9_8">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step9_8.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -757,7 +757,7 @@
 
     <action name="Step9_9">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step9_9.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -768,7 +768,7 @@
     
     <action name="Step10_1">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step10_1.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -779,7 +779,7 @@
 
     <action name="Step10_2">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step10_2.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -790,7 +790,7 @@
 
     <action name="Step10_3">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step10_3.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -801,7 +801,7 @@
     
     <action name="Step11">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step11.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -813,7 +813,7 @@
     
     <action name="Step12_1">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step12_1.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -824,7 +824,7 @@
 
     <action name="Step12_2">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step12_2.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -835,7 +835,7 @@
 
     <action name="Step12_3">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step12_3.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -846,7 +846,7 @@
 
     <action name="Step12_4">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step12_4.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -857,7 +857,7 @@
 
     <action name="Step12_5">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step12_5.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -868,7 +868,7 @@
 
     <action name="Step12_6">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step12_6.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -879,7 +879,7 @@
 
     <action name="Step12_7">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step12_7.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -890,7 +890,7 @@
 
     <action name="Step12_8">
     	<hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step12_8.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -901,7 +901,7 @@
     
     <action name="Step13">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step13.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>
@@ -912,7 +912,7 @@
     
     <action name="Step14">
         <hive2 xmlns="uri:oozie:hive2-action:0.1">
-            <jdbc-url>${hive_jdbc_url}</jdbc-url>
+            <jdbc-url>${hiveJdbcUrl}</jdbc-url>
             <script>scripts/step14.sql</script>
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>openaire_db_name=${openaire_db_name}</param>