diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberFieldSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberFieldSearchCriteria.java
index 6a803a9a184f79945e381fae29b86da9db966693..df338a400f6b2d8ea994a5c5a3a1649824d3613e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberFieldSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberFieldSearchCriteria.java
@@ -34,23 +34,23 @@ public class NumberFieldSearchCriteria extends AbstractFieldSearchCriteria<Abstr
         setFieldValue(new NumberEqualToValue(number));
     }
     
-    public void thatIsLessTo(Number number)
+    public void thatIsLessThan(Number number)
     {
-        setFieldValue(new NumberLessToValue(number));
+        setFieldValue(new NumberLessThanValue(number));
     }
     
-    public void thatIsLessOrEqualTo(Number number)
+    public void thatIsLessOrEqualThan(Number number)
     {
-        setFieldValue(new NumberLessOrEqualToValue(number));
+        setFieldValue(new NumberLessOrEqualThanValue(number));
     }
 
-    public void thatIsGreaterTo(Number number)
+    public void thatIsGreaterThan(Number number)
     {
-        setFieldValue(new NumberGreaterToValue(number));
+        setFieldValue(new NumberGreaterThanValue(number));
     }
     
-    public void thatIsGreaterOrEqualTo(Number number)
+    public void thatIsGreaterOrEqualThan(Number number)
     {
-        setFieldValue(new NumberGreaterOrEqualToValue(number));
+        setFieldValue(new NumberGreaterOrEqualThanValue(number));
     }
 }
\ No newline at end of file
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterOrEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterOrEqualThanValue.java
similarity index 83%
rename from openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterOrEqualToValue.java
rename to openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterOrEqualThanValue.java
index 6e0d3dffb8e3b6d7c8dea8a46edbb1dcd04a12b6..d2368f6a2b5bf92a30fd41b119a321c3609647c1 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterOrEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterOrEqualThanValue.java
@@ -21,13 +21,13 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
 /**
  * @author juanf
  */
-@JsonObject("dto.search.NumberGreaterOrEqualToValue")
-public class NumberGreaterOrEqualToValue extends AbstractNumberValue
+@JsonObject("dto.search.NumberGreaterOrEqualThanValue")
+public class NumberGreaterOrEqualThanValue extends AbstractNumberValue
 {
 
     private static final long serialVersionUID = 1L;
 
-    public NumberGreaterOrEqualToValue(Number number)
+    public NumberGreaterOrEqualThanValue(Number number)
     {
         super(number);
     }
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterThanValue.java
similarity index 85%
rename from openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterToValue.java
rename to openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterThanValue.java
index c03ff6854327fa3dbe5b0a91d1923c9a9c362a39..0fb1ccedd970d959d3d86eb226995becce434130 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterThanValue.java
@@ -21,13 +21,13 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
 /**
  * @author juanf
  */
-@JsonObject("dto.search.NumberGreaterToValue")
-public class NumberGreaterToValue extends AbstractNumberValue
+@JsonObject("dto.search.NumberGreaterThanValue")
+public class NumberGreaterThanValue extends AbstractNumberValue
 {
 
     private static final long serialVersionUID = 1L;
 
-    public NumberGreaterToValue(Number number)
+    public NumberGreaterThanValue(Number number)
     {
         super(number);
     }
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessOrEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessOrEqualThanValue.java
similarity index 84%
rename from openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessOrEqualToValue.java
rename to openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessOrEqualThanValue.java
index 7c4cb40f3b5b25b2fa851c25ffc8463ed6d3f9bb..3346fb918265510dfc8a2d8ea5c507e7f0020a99 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessOrEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessOrEqualThanValue.java
@@ -21,13 +21,13 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
 /**
  * @author juanf
  */
-@JsonObject("dto.search.NumberLessOrEqualToValue")
-public class NumberLessOrEqualToValue extends AbstractNumberValue
+@JsonObject("dto.search.NumberLessOrEqualThanValue")
+public class NumberLessOrEqualThanValue extends AbstractNumberValue
 {
 
     private static final long serialVersionUID = 1L;
 
-    public NumberLessOrEqualToValue(Number number)
+    public NumberLessOrEqualThanValue(Number number)
     {
         super(number);
     }
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessThanValue.java
similarity index 86%
rename from openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessToValue.java
rename to openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessThanValue.java
index e2d593d8dce6c2bbe5ec0594af800220d4d26b61..d28781a896552bab9049a4bf2eb73764e36cfce4 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessThanValue.java
@@ -21,13 +21,13 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
 /**
  * @author juanf
  */
-@JsonObject("dto.search.NumberLessToValue")
-public class NumberLessToValue extends AbstractNumberValue
+@JsonObject("dto.search.NumberLessThanValue")
+public class NumberLessThanValue extends AbstractNumberValue
 {
 
     private static final long serialVersionUID = 1L;
 
-    public NumberLessToValue(Number number)
+    public NumberLessThanValue(Number number)
     {
         super(number);
     }