diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
index bb41a7adb089984a5101b1ac2d76c903834a90dd..557f641f1a5f25ef38fdc7d029e016ffbf8a6e68 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
@@ -66,6 +66,7 @@ public abstract class AbstractServer<T extends IServer> extends AbstractServiceW
     // For testing purpose.
     private ISampleTypeSlaveServerPlugin sampleTypeSlaveServerPlugin;
 
+    // For testing purpose.
     private IDataSetTypeSlaveServerPlugin dataSetTypeSlaveServerPlugin;
 
     @Resource(name = ComponentNames.SESSION_MANAGER)
@@ -74,7 +75,8 @@ public abstract class AbstractServer<T extends IServer> extends AbstractServiceW
     @Resource(name = ComponentNames.DAO_FACTORY)
     private IDAOFactory daoFactory;
 
-    @Resource(name = ComponentNames.COMMON_SERVICE)
+    // NOTE: we use the fact that the COMMON_SERVICE configured in XML implements provider interface
+    @Resource(name = ch.systemsx.cisd.openbis.generic.shared.ResourceNames.COMMON_SERVICE)
     protected IDataStoreBaseURLProvider dataStoreBaseURLProvider;
 
     protected AbstractServer()
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ComponentNames.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ComponentNames.java
index 50210f0cae24432ffcca22c4cf57e821b3e72337..5199e057b91adea03e0ed9e07d38defc072c8e57 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ComponentNames.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ComponentNames.java
@@ -36,10 +36,8 @@ public final class ComponentNames
     public static final String LOG_INTERCEPTOR = "log-interceptor";
 
     public static final String DAO_FACTORY = "dao-factory";
-    
+
     public static final String DSS_FACTORY = "dss-factory";
 
     public static final String COMMON_BUSINESS_OBJECT_FACTORY = "common-business-object-factory";
-    
-    public static final String COMMON_SERVICE = "common-service";
 }