diff --git a/bds/source/java/ch/systemsx/cisd/bds/DataStructureFactory.java b/bds/source/java/ch/systemsx/cisd/bds/DataStructureFactory.java
index 73b4389c28c2d1a23e9532443127b4f21589f5b6..ed464484ecd46b0a05f0516401f43da5d9765dd0 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/DataStructureFactory.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/DataStructureFactory.java
@@ -28,9 +28,9 @@ import org.apache.commons.lang.ArrayUtils;
 import ch.systemsx.cisd.bds.exception.DataStructureException;
 import ch.systemsx.cisd.bds.storage.IStorage;
 import ch.systemsx.cisd.bds.v1_0.DataStructureV1_0;
-import ch.systemsx.cisd.bds.v1_0.DataStructureV1_0Proxy;
+import ch.systemsx.cisd.bds.v1_0.DataStructureProxyV1_0;
 import ch.systemsx.cisd.bds.v1_1.DataStructureV1_1;
-import ch.systemsx.cisd.bds.v1_1.DataStructureV1_1Proxy;
+import ch.systemsx.cisd.bds.v1_1.DataStructureProxyV1_1;
 import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
 import ch.systemsx.cisd.common.utilities.ClassUtils;
 
@@ -55,8 +55,8 @@ public final class DataStructureFactory
     {
         factory.register(new Version(1, 0), DataStructureV1_0.class);
         factory.register(new Version(1, 1), DataStructureV1_1.class);
-        proxyClasses.put(DataStructureV1_0.class, DataStructureV1_0Proxy.class);
-        proxyClasses.put(DataStructureV1_1.class, DataStructureV1_1Proxy.class);
+        proxyClasses.put(DataStructureV1_0.class, DataStructureProxyV1_0.class);
+        proxyClasses.put(DataStructureV1_1.class, DataStructureProxyV1_1.class);
     }
 
     private DataStructureFactory()
diff --git a/bds/source/java/ch/systemsx/cisd/bds/v1_0/DataStructureV1_0Proxy.java b/bds/source/java/ch/systemsx/cisd/bds/v1_0/DataStructureProxyV1_0.java
similarity index 97%
rename from bds/source/java/ch/systemsx/cisd/bds/v1_0/DataStructureV1_0Proxy.java
rename to bds/source/java/ch/systemsx/cisd/bds/v1_0/DataStructureProxyV1_0.java
index 6beb2cc82abe19655c6b25419384c381c38d001d..01408fa4b70b5f0ce0918b8754a11eeb341994a6 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/v1_0/DataStructureV1_0Proxy.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/v1_0/DataStructureProxyV1_0.java
@@ -39,13 +39,13 @@ import ch.systemsx.cisd.bds.storage.IDirectory;
  * 
  * @author Christian Ribeaud
  */
-public class DataStructureV1_0Proxy implements IDataStructureV1_0
+public class DataStructureProxyV1_0 implements IDataStructureV1_0
 {
     protected final IDataStructureV1_0 dataStructure;
 
     private Mode mode;
 
-    public DataStructureV1_0Proxy(final IDataStructureV1_0 dataStructure)
+    public DataStructureProxyV1_0(final IDataStructureV1_0 dataStructure)
     {
         assert dataStructure != null : "Unspecified proxied data structure.";
         this.dataStructure = dataStructure;
diff --git a/bds/source/java/ch/systemsx/cisd/bds/v1_1/DataStructureV1_1Proxy.java b/bds/source/java/ch/systemsx/cisd/bds/v1_1/DataStructureProxyV1_1.java
similarity index 87%
rename from bds/source/java/ch/systemsx/cisd/bds/v1_1/DataStructureV1_1Proxy.java
rename to bds/source/java/ch/systemsx/cisd/bds/v1_1/DataStructureProxyV1_1.java
index 8d5c5edb044e1af655b6e127b457b5b8f824dd00..be1d10ef05618e2dac06e7928c1e0ade9bda2b0a 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/v1_1/DataStructureV1_1Proxy.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/v1_1/DataStructureProxyV1_1.java
@@ -16,7 +16,7 @@
 
 package ch.systemsx.cisd.bds.v1_1;
 
-import ch.systemsx.cisd.bds.v1_0.DataStructureV1_0Proxy;
+import ch.systemsx.cisd.bds.v1_0.DataStructureProxyV1_0;
 import ch.systemsx.cisd.bds.v1_0.IDataStructureV1_0;
 
 /**
@@ -25,11 +25,11 @@ import ch.systemsx.cisd.bds.v1_0.IDataStructureV1_0;
  * 
  * @author Christian Ribeaud
  */
-public final class DataStructureV1_1Proxy extends DataStructureV1_0Proxy implements
+public final class DataStructureProxyV1_1 extends DataStructureProxyV1_0 implements
         IDataStructureV1_1
 {
 
-    public DataStructureV1_1Proxy(final IDataStructureV1_1 dataStructure)
+    public DataStructureProxyV1_1(final IDataStructureV1_1 dataStructure)
     {
         super(dataStructure);
     }