diff --git a/screening/dist/etc/service.properties b/screening/dist/etc/service.properties
index b2400892d2ac5a98da3cf8b417b115fab9c15c75..cb5fb7967b15d46046b73ba4d8ead547ccab6fc6 100644
--- a/screening/dist/etc/service.properties
+++ b/screening/dist/etc/service.properties
@@ -112,7 +112,7 @@ default-plate-image-analysis.properties-file =
 
 plate-image-analysis-graph.label = Image Analysis Graphs
 plate-image-analysis-graph.dataset-types = HCS_IMAGE_ANALYSIS_DATA, HCS_ANALYSIS_PER_GENE
-plate-image-analysis-graph.class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.ImageAnalysisGraphReportingPlugin
+plate-image-analysis-graph.class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.DatabaseImageAnalysisGraphReportingPlugin
 plate-image-analysis-graph.servlet-path = datastore_server_graph/
 plate-image-analysis-graph.properties-file = etc/tabular-data-graph.properties
 
@@ -128,7 +128,7 @@ screening-image-download-servlet.class = ch.systemsx.cisd.openbis.dss.generic.se
 # URL which will be mapped to this servlet
 screening-image-download-servlet.path = /datastore_server_screening/*
 
-tabular-data-graph-servlet.class = ch.systemsx.cisd.openbis.dss.generic.server.TabularDataGraphServlet
+tabular-data-graph-servlet.class = ch.systemsx.cisd.openbis.dss.generic.server.ImagingDataGraphServlet
 tabular-data-graph-servlet.path = /datastore_server_graph/*
 tabular-data-graph-servlet.properties-file = etc/tabular-data-graph.properties
 
diff --git a/screening/etc/service.properties b/screening/etc/service.properties
index 31c0a913abb6169d322979c35d0b3667db69b74e..e002a253193edaf568ef8fb6d5e1d673a944aa49 100644
--- a/screening/etc/service.properties
+++ b/screening/etc/service.properties
@@ -106,7 +106,7 @@ default-plate-image-analysis.properties-file =
 
 plate-image-analysis-graph.label = Image Analysis Graphs
 plate-image-analysis-graph.dataset-types = HCS_IMAGE_ANALYSIS_DATA, HCS_ANALYSIS_PER_GENE
-plate-image-analysis-graph.class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.ImageAnalysisGraphReportingPlugin
+plate-image-analysis-graph.class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.DatabaseImageAnalysisGraphReportingPlugin
 plate-image-analysis-graph.servlet-path = datastore_server_graph/
 plate-image-analysis-graph.properties-file = etc/tabular-data-graph.properties
 
@@ -122,7 +122,7 @@ screening-image-download-servlet.class = ch.systemsx.cisd.openbis.dss.generic.se
 # URL which will be mapped to this servlet
 screening-image-download-servlet.path = /datastore_server_screening/*
 
-tabular-data-graph-servlet.class = ch.systemsx.cisd.openbis.dss.generic.server.TabularDataGraphServlet
+tabular-data-graph-servlet.class = ch.systemsx.cisd.openbis.dss.generic.server.ImagingDataGraphServlet
 tabular-data-graph-servlet.path = /datastore_server_graph/*
 tabular-data-graph-servlet.properties-file = etc/tabular-data-graph.properties