diff --git a/common/source/java/ch/systemsx/cisd/common/collections/Modifiable.java b/common/source/java/ch/systemsx/cisd/common/collections/IModifiable.java
similarity index 96%
rename from common/source/java/ch/systemsx/cisd/common/collections/Modifiable.java
rename to common/source/java/ch/systemsx/cisd/common/collections/IModifiable.java
index babeb4f1dfdbb371be8ec925b9b9167b175fbe49..b4c67578001a36704d9e5396bf6f8bdbea86d974 100644
--- a/common/source/java/ch/systemsx/cisd/common/collections/Modifiable.java
+++ b/common/source/java/ch/systemsx/cisd/common/collections/IModifiable.java
@@ -21,7 +21,7 @@ package ch.systemsx.cisd.common.collections;
  * 
  * @author pkupczyk
  */
-public interface Modifiable
+public interface IModifiable
 {
 
 }
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilter.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilter.java
index fd147b38a84388e7d6e50b8aee9c59c31969cdd0..02395ede3f2b25e36b37f40d738ec774fd4e5cd5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilter.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilter.java
@@ -26,7 +26,7 @@ import org.apache.log4j.Logger;
 
 import ch.rinn.restrictions.Private;
 import ch.systemsx.cisd.common.collections.FilteredList;
-import ch.systemsx.cisd.common.collections.Modifiable;
+import ch.systemsx.cisd.common.collections.IModifiable;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.utilities.MethodUtils;
@@ -113,7 +113,7 @@ public final class DefaultReturnValueFilter implements IReturnValueFilter
 
         final List<T> list;
 
-        if (returnValue instanceof Modifiable)
+        if (returnValue instanceof IModifiable)
         {
             list = returnValue;
         } else
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningJson.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningJson.java
index ea554c5b384c0a2682788a71aeae6316266457a0..d10b385242d8eb227053cac5cd8fcb43f839f0c0 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningJson.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningJson.java
@@ -22,7 +22,7 @@ import java.util.Collection;
 import java.util.List;
 
 import ch.systemsx.cisd.base.image.IImageTransformerFactory;
-import ch.systemsx.cisd.common.collections.Modifiable;
+import ch.systemsx.cisd.common.collections.IModifiable;
 import ch.systemsx.cisd.openbis.dss.screening.shared.api.v1.IDssServiceRpcScreening;
 import ch.systemsx.cisd.openbis.dss.screening.shared.api.v1.LoadImageConfiguration;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.DatasetImageRepresentationFormats;
@@ -328,7 +328,7 @@ public class DssServiceRpcScreeningJson implements IDssServiceRpcScreening
      */
 
     private static class FeatureInformationList extends ArrayList<FeatureInformation> implements
-            Modifiable
+            IModifiable
     {
         private static final long serialVersionUID = 1L;
 
@@ -339,7 +339,7 @@ public class DssServiceRpcScreeningJson implements IDssServiceRpcScreening
     }
 
     private static class FeatureVectorDatasetList extends ArrayList<FeatureVectorDataset> implements
-            Modifiable
+            IModifiable
     {
         private static final long serialVersionUID = 1L;
 
@@ -350,7 +350,7 @@ public class DssServiceRpcScreeningJson implements IDssServiceRpcScreening
     }
 
     private static class FeatureVectorWithDescriptionList extends
-            ArrayList<FeatureVectorWithDescription> implements Modifiable
+            ArrayList<FeatureVectorWithDescription> implements IModifiable
     {
         private static final long serialVersionUID = 1L;
 
@@ -361,7 +361,7 @@ public class DssServiceRpcScreeningJson implements IDssServiceRpcScreening
     }
 
     private static class PlateImageReferenceList extends ArrayList<PlateImageReference> implements
-            Modifiable
+            IModifiable
     {
         private static final long serialVersionUID = 1L;
 
@@ -372,7 +372,7 @@ public class DssServiceRpcScreeningJson implements IDssServiceRpcScreening
     }
 
     private static class MicroscopyImageReferenceList extends ArrayList<MicroscopyImageReference>
-            implements Modifiable
+            implements IModifiable
     {
         private static final long serialVersionUID = 1L;
 
@@ -383,7 +383,7 @@ public class DssServiceRpcScreeningJson implements IDssServiceRpcScreening
     }
 
     private static class ImageDatasetMetadataList extends ArrayList<ImageDatasetMetadata> implements
-            Modifiable
+            IModifiable
     {
         private static final long serialVersionUID = 1L;
 
@@ -394,7 +394,7 @@ public class DssServiceRpcScreeningJson implements IDssServiceRpcScreening
     }
 
     private static class DatasetImageRepresentationFormatsList extends
-            ArrayList<DatasetImageRepresentationFormats> implements Modifiable
+            ArrayList<DatasetImageRepresentationFormats> implements IModifiable
     {
         private static final long serialVersionUID = 1L;
 
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerJson.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerJson.java
index 67659931ed22132144a3d7bd5a561dfb3f862667..a57e8fdeed04ac6f15b6a3574b77204630031ada 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerJson.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerJson.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import ch.systemsx.cisd.common.collections.Modifiable;
+import ch.systemsx.cisd.common.collections.IModifiable;
 import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Sample;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.IScreeningApiServer;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.ExperimentIdentifier;
@@ -206,7 +206,7 @@ public class ScreeningServerJson implements IScreeningApiServer
      */
 
     private static class FeatureVectorDatasetReferenceList extends
-            ArrayList<FeatureVectorDatasetReference> implements Modifiable
+            ArrayList<FeatureVectorDatasetReference> implements IModifiable
     {
         private static final long serialVersionUID = 1L;
 
@@ -217,7 +217,7 @@ public class ScreeningServerJson implements IScreeningApiServer
         }
     }
 
-    private static class PlateList extends ArrayList<Plate> implements Modifiable
+    private static class PlateList extends ArrayList<Plate> implements IModifiable
     {
         private static final long serialVersionUID = 1L;
 
@@ -227,7 +227,7 @@ public class ScreeningServerJson implements IScreeningApiServer
         }
     }
 
-    private static class PlateMetadataList extends ArrayList<PlateMetadata> implements Modifiable
+    private static class PlateMetadataList extends ArrayList<PlateMetadata> implements IModifiable
     {
         private static final long serialVersionUID = 1L;
 
@@ -238,7 +238,7 @@ public class ScreeningServerJson implements IScreeningApiServer
     }
 
     private static class ExperimentIdentifierList extends ArrayList<ExperimentIdentifier> implements
-            Modifiable
+            IModifiable
     {
         private static final long serialVersionUID = 1L;
 
@@ -249,7 +249,7 @@ public class ScreeningServerJson implements IScreeningApiServer
     }
 
     private static class ImageDatasetReferenceList extends ArrayList<ImageDatasetReference>
-            implements Modifiable
+            implements IModifiable
     {
         private static final long serialVersionUID = 1L;
 
@@ -260,7 +260,7 @@ public class ScreeningServerJson implements IScreeningApiServer
     }
 
     private static class IDatasetIdentifierList extends ArrayList<IDatasetIdentifier> implements
-            Modifiable
+            IModifiable
     {
         private static final long serialVersionUID = 1L;
 
@@ -271,7 +271,7 @@ public class ScreeningServerJson implements IScreeningApiServer
     }
 
     private static class PlateWellReferenceWithDatasetsList extends
-            ArrayList<PlateWellReferenceWithDatasets> implements Modifiable
+            ArrayList<PlateWellReferenceWithDatasets> implements IModifiable
     {
         private static final long serialVersionUID = 1L;
 
@@ -282,7 +282,7 @@ public class ScreeningServerJson implements IScreeningApiServer
         }
     }
 
-    private static class WellIdentifierList extends ArrayList<WellIdentifier> implements Modifiable
+    private static class WellIdentifierList extends ArrayList<WellIdentifier> implements IModifiable
     {
         private static final long serialVersionUID = 1L;
 
@@ -293,7 +293,7 @@ public class ScreeningServerJson implements IScreeningApiServer
     }
 
     private static class PlateWellMaterialMappingList extends ArrayList<PlateWellMaterialMapping>
-            implements Modifiable
+            implements IModifiable
     {
         private static final long serialVersionUID = 1L;
 
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/ImageBase64EncodingTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/ImageBase64EncodingTest.java
index d6ca60b8f71e18fab3116916d1d8f33ac525c006..788ab6c59296fca55bd0c041ed350990aadab0be 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/ImageBase64EncodingTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/ImageBase64EncodingTest.java
@@ -40,7 +40,7 @@ import com.googlecode.jsonrpc4j.Base64;
 import com.googlecode.jsonrpc4j.JsonRpcHttpClient;
 import com.googlecode.jsonrpc4j.ProxyUtil;
 
-import ch.systemsx.cisd.common.collections.Modifiable;
+import ch.systemsx.cisd.common.collections.IModifiable;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
 import ch.systemsx.cisd.common.servlet.SpringRequestContextProvider;
 import ch.systemsx.cisd.openbis.dss.screening.shared.api.v1.IDssServiceRpcScreening;
@@ -178,7 +178,7 @@ public class ImageBase64EncodingTest extends AbstractScreeningSystemTestCase
         return 6000;
     }
     
-    private static class PlateImageReferenceList extends ArrayList<PlateImageReference> implements Modifiable
+    private static class PlateImageReferenceList extends ArrayList<PlateImageReference> implements IModifiable
     {
 
         private static final long serialVersionUID = 1845499753563383092L;