diff --git a/.classpath b/.classpath
index 3b3d8b5..c7f3081 100644
--- a/.classpath
+++ b/.classpath
@@ -5,6 +5,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/VREMODELERLIBS"/>
 	<classpathentry kind="lib" path="/home/lucio/gCore/lib/MetadataBrokerLibrary.jar"/>
 	<classpathentry kind="lib" path="/home/lucio/gCore/lib/org.gcube.metadatamanagement.metadatabroker.stubs.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/GCORELIB"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/GCORELIBS"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/etc/hsqldb/vdldb.script b/etc/hsqldb/vdldb.script
index 50aa89f..6882087 100644
--- a/etc/hsqldb/vdldb.script
+++ b/etc/hsqldb/vdldb.script
@@ -43,15 +43,12 @@ INSERT INTO FUNCTIONALITY VALUES(13,'Content Watermarking','By selecting this fu
 INSERT INTO FUNCTIONALITY VALUES(14,'Content Encryption','By selecting this function the Virtual Research Environment will be equipped with a feature acting in the background with the goal to guarantee that the Content managed by the Virtual Research Environment is automatically encrypted before its storage as to avoid unauthorised use of it. This feature is not directly perceived by the end-users of the VRE but its operation will contribute to improve the quality of the service of the resulting VRE. This function will transparently apply encryption algorithms to the Information Objects and their constituents before to store them on third party storage services as well as take care of their decoding before their consumption. The activation of this function will lead to an improvement of the content security parameter but also to an augment of the access time, i.e. the time needed to consume the object.',8,0)
 INSERT INTO FUNCTIONALITY VALUES(15,'Information Object Editing','By selecting this function VRE users will be provided with facilities for editing existing Information Objects. In particular, this function provides users with operation to modify existing Information Objects, more specifically their associated metadata.',8,0)
 INSERT INTO SERVICES VALUES(5,'ABE','Annotation')
-INSERT INTO SERVICES VALUES(0,'BooleanResultSetCompareService','Search')
-INSERT INTO SERVICES VALUES(0,'FilterResultSetByXPathOperatorService','Search')
+INSERT INTO SERVICES VALUES(0,'FilterXPathOperator','Search')
 INSERT INTO SERVICES VALUES(0,'JoinInnerOperatorService','Search')
 INSERT INTO SERVICES VALUES(0,'KeepTopOperatorService','Search')
-INSERT INTO SERVICES VALUES(0,'MergeOperatorService','Search')
-INSERT INTO SERVICES VALUES(3,'QueryExtSourceGoogleService','Search')
-INSERT INTO SERVICES VALUES(0,'ResultSetScannerService','Search')
+INSERT INTO SERVICES VALUES(0,'MergeOperator','Search')
+INSERT INTO SERVICES VALUES(3,'GoogleService','Search')
 INSERT INTO SERVICES VALUES(0,'ResultSetService','Search')
-INSERT INTO SERVICES VALUES(0,'SearchManagerService','Search')
-INSERT INTO SERVICES VALUES(0,'SearchMasterService','Search')
+INSERT INTO SERVICES VALUES(0,'SearchMaster','Search')
 INSERT INTO SERVICES VALUES(0,'SortOperatorService','Search')
-INSERT INTO SERVICES VALUES(0,'TransformByXSLTOperatorService','Search')
+INSERT INTO SERVICES VALUES(0,'TransformXsltOperatorService','Search')
diff --git a/src/org/gcube/vremanagement/vremodeler/test/ModelerTest.class b/src/org/gcube/vremanagement/vremodeler/test/ModelerTest.class
deleted file mode 100644
index 97fa360..0000000
Binary files a/src/org/gcube/vremanagement/vremodeler/test/ModelerTest.class and /dev/null differ