diff --git a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
index fcd6509a3181649b3e69656a9291ae1aac28a1d9..a0b60992626da19b489f6320271f2dfd1a290a74 100644
--- a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
+++ b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
@@ -379,7 +379,7 @@ public class AServProtocolManager {
 	}
 	// Translate the query
 	try {
-	    String translation = QueryMediator.rewriteQuery( (String)params.getParameter("query"), al );
+	    String translation = QueryMediator.rewriteSPARQLQuery( (String)params.getParameter("query"), al );
 	    return new TranslatedMessage(newId(),mess,myId,mess.getSender(),translation,(Parameters)null);
 	} catch (AlignmentException e) {
 	    return new ErrorMsg(newId(),mess,myId,mess.getSender(),e.toString(),(Parameters)null);
@@ -559,7 +559,7 @@ public class AServProtocolManager {
 	} catch (Exception e) {
 	    return false;
 	}
-	if ( al.getExtension("fr.inrialpes.exmo.align.service.stored") != null && al.getExtension("fr.inrialpes.exmo.align.service.stored") != "" ) {
+	if ( al.getExtension(CacheImpl.STORED) != null && al.getExtension(CacheImpl.STORED) != "" ) {
 	    return true;
 	} else {
 	    return false;
diff --git a/src/fr/inrialpes/exmo/align/service/CacheImpl.java b/src/fr/inrialpes/exmo/align/service/CacheImpl.java
index 96be7d29008c5196831acc9ae1373dc7c310e3eb..49e8e08064c3c2b7f4a512da079781dbbf3fc0e5 100644
--- a/src/fr/inrialpes/exmo/align/service/CacheImpl.java
+++ b/src/fr/inrialpes/exmo/align/service/CacheImpl.java
@@ -75,10 +75,10 @@ public class CacheImpl implements Cache {
     final int SUCCESS = 2;
     final int INIT_ERROR = 3;
 
-    final String CACHED = "http://exmo.inrialpes.fr/align/service:cached";
-    final String STORED = "http://exmo.inrialpes.fr/align/service:stored";
-    final String OURI1 = "http://exmo.inrialpes.fr/align/service:ouri1";
-    final String OURI2 = "http://exmo.inrialpes.fr/align/service:ouri2";
+    static public final String CACHED = "http://exmo.inrialpes.fr/align/service:cached";
+    static public final String STORED = "http://exmo.inrialpes.fr/align/service:stored";
+    static public final String OURI1 = "http://exmo.inrialpes.fr/align/service:ouri1";
+    static public final String OURI2 = "http://exmo.inrialpes.fr/align/service:ouri2";
 	
     //**********************************************************************
     public CacheImpl( DBService service ) {