diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step15.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step15.sql
index 41d80405d..60b37048b 100644
--- a/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step15.sql
+++ b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step15.sql
@@ -6,28 +6,23 @@
 ------------------------------------------------------
 ------------------------------------------------------
 
--- To be commented out after the following queries are adapted to
--- the new openAIRE graph schema.
--- When it is ready they should be added to the to statistic recalculation
--- for the impala tables and the shadow views
-
 CREATE TABLE IF NOT EXISTS ${stats_db_name}.publication_refereed as
-select substr(r.id, 4) as id, inst.refereed.classsname as refereed
+select substr(r.id, 4) as id, inst.refereed.classname as refereed
 from ${openaire_db_name}.publication r lateral view explode(r.instance) instances as inst
 where r.datainfo.deletedbyinference=false;
 
 CREATE TABLE IF NOT EXISTS ${stats_db_name}.dataset_refereed as
-select substr(r.id, 4) as id, inst.refereed.classsname as refereed
+select substr(r.id, 4) as id, inst.refereed.classname as refereed
 from ${openaire_db_name}.dataset r lateral view explode(r.instance) instances as inst
 where r.datainfo.deletedbyinference=false;
 
 CREATE TABLE IF NOT EXISTS ${stats_db_name}.software_refereed as
-select substr(r.id, 4) as id, inst.refereed.classsname as refereed
+select substr(r.id, 4) as id, inst.refereed.classname as refereed
 from ${openaire_db_name}.software r lateral view explode(r.instance) instances as inst
 where r.datainfo.deletedbyinference=false;
 
 CREATE TABLE IF NOT EXISTS ${stats_db_name}.otherresearchproduct_refereed as
-select substr(r.id, 4) as id, inst.refereed.classsname as refereed
+select substr(r.id, 4) as id, inst.refereed.classname as refereed
 from ${openaire_db_name}.otherresearchproduct r lateral view explode(r.instance) instances as inst
 where r.datainfo.deletedbyinference=false;
 
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 9b0345a32..d7fc0564b 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
@@ -237,7 +237,7 @@
 			<param>stats_db_name=${stats_db_name}</param>
 			<param>stats_db_shadow_name=${stats_db_shadow_name}</param>
         </hive2>
-        <ok to="Step17"/>
+        <ok to="Step18"/>
         <error to="Kill"/>
     </action>