diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/dynamic/BasicPropertyAdaptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/BasicPropertyAdaptor.java
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/dynamic/BasicPropertyAdaptor.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/BasicPropertyAdaptor.java
index 66bb8014adf12d56676ba987d2a46f8d7ee09dd8..f55503ee6ba36cf91f175001d6b1097f0f8d371b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/dynamic/BasicPropertyAdaptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/BasicPropertyAdaptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.dynamic;
+package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.EntityPropertyPE;
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/dynamic/DynamicPropertyCalculator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/DynamicPropertyCalculator.java
similarity index 97%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/dynamic/DynamicPropertyCalculator.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/DynamicPropertyCalculator.java
index 2a2b3001d934f679cf0922b83d45c07b4fe41595..44d4e8331399ab5f07f0eed2864365b931492dd6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/dynamic/DynamicPropertyCalculator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/DynamicPropertyCalculator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.dynamic;
+package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property;
 
 /**
  * @author Piotr Buczek
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/dynamic/IEntityAdaptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/IEntityAdaptor.java
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/dynamic/IEntityAdaptor.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/IEntityAdaptor.java
index 16dc7e074857eda5b345227564c885b928fa2c8a..26403cdba77d2dafd87dd9bd9f9494d1103dde4f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/dynamic/IEntityAdaptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/IEntityAdaptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.dynamic;
+package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property;
 
 import java.util.Collection;
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/dynamic/IEntityPropertyAdaptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/IEntityPropertyAdaptor.java
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/dynamic/IEntityPropertyAdaptor.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/IEntityPropertyAdaptor.java
index 7f597d19641b3ead92da9c98c55c48ebad536584..3d2202c30bca3aeb082862ce895fd7369da41ba0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/dynamic/IEntityPropertyAdaptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/IEntityPropertyAdaptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.dynamic;
+package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property;
 
 /**
  * Interface implemented by all entity properties
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/dynamic/SampleAdaptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/SampleAdaptor.java
similarity index 99%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/dynamic/SampleAdaptor.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/SampleAdaptor.java
index c992780ee15b2d06fff8963fb6ca00041bf3555b..fbaf4bac7bcd7884400debb13f6352679e0a0aa4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/dynamic/SampleAdaptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/SampleAdaptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.dynamic;
+package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property;
 
 import java.util.Collection;
 import java.util.HashMap;