diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/EBooleanConst.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/EBooleanConst.java
index 8fdaafda3..fa1e4251f 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/EBooleanConst.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/EBooleanConst.java
@@ -20,7 +20,7 @@ public final class EBooleanConst extends EBoolean implements Constant<Boolean>{
     
     public static final EBoolean TRUE = new EBooleanConst(Boolean.TRUE);
     
-    public static final EBoolean create(Boolean b){
+    public static EBoolean create(Boolean b){
         return b.booleanValue() ? TRUE : FALSE;
     }
     
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/ENumberConst.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/ENumberConst.java
index dac09027e..f9ce91301 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/ENumberConst.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/ENumberConst.java
@@ -20,29 +20,29 @@ import com.mysema.util.MathUtils;
 public class ENumberConst<D extends Number & Comparable<?>> extends ENumber<D> implements Constant<D>{
     
     @SuppressWarnings("unchecked")
-    private static final ENumber<Byte>[] bytes = new ENumber[256];
+    private static final ENumber<Byte>[] BYTES = new ENumber[256];
     
     @SuppressWarnings("unchecked")
-    private static final ENumber<Integer>[] ints = new ENumber[256];
+    private static final ENumber<Integer>[] INTEGERS = new ENumber[256];
     
     @SuppressWarnings("unchecked")
-    private static final ENumber<Long>[] longs = new ENumber[256];
+    private static final ENumber<Long>[] LONGS = new ENumber[256];
     
     @SuppressWarnings("unchecked")
-    private static final ENumber<Short>[] shorts = new ENumber[256];
+    private static final ENumber<Short>[] SHORTS = new ENumber[256];
     
     static{
         for (int i = 0; i < 256; i++){
-            ints[i] = new ENumberConst<Integer>(Integer.class, Integer.valueOf(i));
-            shorts[i] = new ENumberConst<Short>(Short.class, Short.valueOf((short)i));
-            bytes[i] = new ENumberConst<Byte>(Byte.class, Byte.valueOf((byte)i));
-            longs[i] = new ENumberConst<Long>(Long.class, Long.valueOf(i));
+            INTEGERS[i] = new ENumberConst<Integer>(Integer.class, Integer.valueOf(i));
+            SHORTS[i] = new ENumberConst<Short>(Short.class, Short.valueOf((short)i));
+            BYTES[i] = new ENumberConst<Byte>(Byte.class, Byte.valueOf((byte)i));
+            LONGS[i] = new ENumberConst<Long>(Long.class, Long.valueOf(i));
         }
     }
         
     public static ENumber<Byte> create(byte i){
         if (i >= 0 && i < 256){
-            return bytes[i];
+            return BYTES[i];
         }else{
             return new ENumberConst<Byte>(Byte.class, Byte.valueOf(i));
         }
@@ -50,7 +50,7 @@ public class ENumberConst<D extends Number & Comparable<?>> extends ENumber<D> i
     
     public static ENumber<Integer> create(int i){
         if (i >= 0 && i < 256){
-            return ints[i];
+            return INTEGERS[i];
         }else{
             return new ENumberConst<Integer>(Integer.class, Integer.valueOf(i));
         }
@@ -58,7 +58,7 @@ public class ENumberConst<D extends Number & Comparable<?>> extends ENumber<D> i
     
     public static ENumber<Long> create(long i){
         if (i >= 0 && i < 256){
-            return longs[(int)i];
+            return LONGS[(int)i];
         }else{
             return new ENumberConst<Long>(Long.class, Long.valueOf(i));
         }
@@ -66,7 +66,7 @@ public class ENumberConst<D extends Number & Comparable<?>> extends ENumber<D> i
     
     public static ENumber<Short> create(short i){
         if (i >= 0 && i < 256){
-            return shorts[i];
+            return SHORTS[i];
         }else{
             return new ENumberConst<Short>(Short.class, Short.valueOf(i));
         }
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/operation/Ops.java b/querydsl-core/src/main/java/com/mysema/query/types/operation/Ops.java
index 62ec60fca..6b1b7961d 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/operation/Ops.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/operation/Ops.java
@@ -21,32 +21,32 @@ import com.mysema.query.types.expr.ENumber;
  */
 public interface Ops {
     
-    static List<Class<?>> Boolean_x_2 = unmodifiableList(Arrays.<Class<?>> asList(Boolean.class, Boolean.class));
+    List<Class<?>> BOOLEAN_X_2 = unmodifiableList(Arrays.<Class<?>> asList(Boolean.class, Boolean.class));
 
-    static List<Class<?>> Comparable_x_2 = unmodifiableList(Arrays.<Class<?>> asList(Comparable.class, Comparable.class));
+    List<Class<?>> COMPARABLE_X_2 = unmodifiableList(Arrays.<Class<?>> asList(Comparable.class, Comparable.class));
 
-    static List<Class<?>> Comparable_x_3 = unmodifiableList(Arrays.<Class<?>> asList(Comparable.class, Comparable.class,Comparable.class));
+    List<Class<?>> COMPARABLE_X_3 = unmodifiableList(Arrays.<Class<?>> asList(Comparable.class, Comparable.class,Comparable.class));
 
-    static List<Class<?>> Object_x_2 = unmodifiableList(Arrays.<Class<?>> asList(Object.class, Object.class));
+    List<Class<?>> OBJECT_X_2 = unmodifiableList(Arrays.<Class<?>> asList(Object.class, Object.class));
 
-    static List<Class<?>> Number_x_2 = unmodifiableList(Arrays.<Class<?>> asList(Number.class, Number.class));
+    List<Class<?>> NUMBER_X_2 = unmodifiableList(Arrays.<Class<?>> asList(Number.class, Number.class));
 
-    static List<Class<?>> String_x_2 = unmodifiableList(Arrays.<Class<?>> asList(String.class, String.class));
+    List<Class<?>> STRING_X_2 = unmodifiableList(Arrays.<Class<?>> asList(String.class, String.class));
 
     // general
-    Operator<Boolean> EQ_PRIMITIVE = new OperatorImpl<Boolean>(Object_x_2);
-    Operator<Boolean> EQ_OBJECT = new OperatorImpl<Boolean>(Object_x_2);
+    Operator<Boolean> EQ_PRIMITIVE = new OperatorImpl<Boolean>(OBJECT_X_2);
+    Operator<Boolean> EQ_OBJECT = new OperatorImpl<Boolean>(OBJECT_X_2);
     Operator<Boolean> IS_NOT_NULL = new OperatorImpl<Boolean>(Object.class);
     Operator<Boolean> IS_NULL = new OperatorImpl<Boolean>(Object.class);
     Operator<Boolean> INSTANCE_OF = new OperatorImpl<Boolean>(Object.class, Class.class);
-    Operator<Boolean> NE_PRIMITIVE = new OperatorImpl<Boolean>(Object_x_2);
-    Operator<Boolean> NE_OBJECT = new OperatorImpl<Boolean>(Object_x_2);
+    Operator<Boolean> NE_PRIMITIVE = new OperatorImpl<Boolean>(OBJECT_X_2);
+    Operator<Boolean> NE_OBJECT = new OperatorImpl<Boolean>(OBJECT_X_2);
     Operator<Number> NUMCAST = new OperatorImpl<Number>(Number.class, Class.class);
     Operator<String> STRING_CAST = new OperatorImpl<String>(Object.class);
     Operator<Object> ALIAS = new OperatorImpl<Object>(Object.class, Object.class);
         
     // collection
-    Operator<Boolean> IN = new OperatorImpl<Boolean>(Object_x_2); // cmp. contains
+    Operator<Boolean> IN = new OperatorImpl<Boolean>(OBJECT_X_2); // cmp. contains
     Operator<Boolean> COL_IS_EMPTY = new OperatorImpl<Boolean>(Object.class);
     Operator<Number> COL_SIZE = new OperatorImpl<Number>(Object.class);
 
@@ -54,59 +54,59 @@ public interface Ops {
     Operator<Number> ARRAY_SIZE = new OperatorImpl<Number>(Object.class);
     
     // map
-    Operator<Boolean> CONTAINS_KEY = new OperatorImpl<Boolean>(Object_x_2);
-    Operator<Boolean> CONTAINS_VALUE = new OperatorImpl<Boolean>(Object_x_2);
+    Operator<Boolean> CONTAINS_KEY = new OperatorImpl<Boolean>(OBJECT_X_2);
+    Operator<Boolean> CONTAINS_VALUE = new OperatorImpl<Boolean>(OBJECT_X_2);
     Operator<Number> MAP_SIZE = new OperatorImpl<Number>(Object.class);
     Operator<Boolean> MAP_ISEMPTY = new OperatorImpl<Boolean>(Object.class);
     
     // Boolean
-    Operator<Boolean> AND = new OperatorImpl<Boolean>(Boolean_x_2);
+    Operator<Boolean> AND = new OperatorImpl<Boolean>(BOOLEAN_X_2);
     Operator<Boolean> NOT = new OperatorImpl<Boolean>(Boolean.class);
-    Operator<Boolean> OR = new OperatorImpl<Boolean>(Boolean_x_2);
-    Operator<Boolean> XNOR = new OperatorImpl<Boolean>(Boolean_x_2);
-    Operator<Boolean> XOR = new OperatorImpl<Boolean>(Boolean_x_2);
+    Operator<Boolean> OR = new OperatorImpl<Boolean>(BOOLEAN_X_2);
+    Operator<Boolean> XNOR = new OperatorImpl<Boolean>(BOOLEAN_X_2);
+    Operator<Boolean> XOR = new OperatorImpl<Boolean>(BOOLEAN_X_2);
     
     // Comparable
-    Operator<Boolean> BETWEEN = new OperatorImpl<Boolean>(Comparable_x_3);
-    Operator<Boolean> GOE = new OperatorImpl<Boolean>(Comparable_x_2);
-    Operator<Boolean> GT = new OperatorImpl<Boolean>(Comparable_x_2);
-    Operator<Boolean> LOE = new OperatorImpl<Boolean>(Comparable_x_2);
-    Operator<Boolean> LT = new OperatorImpl<Boolean>(Comparable_x_2);
+    Operator<Boolean> BETWEEN = new OperatorImpl<Boolean>(COMPARABLE_X_3);
+    Operator<Boolean> GOE = new OperatorImpl<Boolean>(COMPARABLE_X_2);
+    Operator<Boolean> GT = new OperatorImpl<Boolean>(COMPARABLE_X_2);
+    Operator<Boolean> LOE = new OperatorImpl<Boolean>(COMPARABLE_X_2);
+    Operator<Boolean> LT = new OperatorImpl<Boolean>(COMPARABLE_X_2);
     
     // Date / Comparable
-    Operator<Boolean> AFTER = new OperatorImpl<Boolean>(Comparable_x_2);
-    Operator<Boolean> BEFORE = new OperatorImpl<Boolean>(Comparable_x_2);
-    Operator<Boolean> AOE = new OperatorImpl<Boolean>(Comparable_x_2);
-    Operator<Boolean> BOE = new OperatorImpl<Boolean>(Comparable_x_2);
+    Operator<Boolean> AFTER = new OperatorImpl<Boolean>(COMPARABLE_X_2);
+    Operator<Boolean> BEFORE = new OperatorImpl<Boolean>(COMPARABLE_X_2);
+    Operator<Boolean> AOE = new OperatorImpl<Boolean>(COMPARABLE_X_2);
+    Operator<Boolean> BOE = new OperatorImpl<Boolean>(COMPARABLE_X_2);
 
     // Number
-    Operator<Number> ADD = new OperatorImpl<Number>(Number_x_2);
-    Operator<Number> DIV = new OperatorImpl<Number>(Number_x_2);
-    Operator<Number> MULT = new OperatorImpl<Number>(Number_x_2);
-    Operator<Number> SUB = new OperatorImpl<Number>(Number_x_2);
-    Operator<Number> MOD = new OperatorImpl<Number>(Number_x_2);
+    Operator<Number> ADD = new OperatorImpl<Number>(NUMBER_X_2);
+    Operator<Number> DIV = new OperatorImpl<Number>(NUMBER_X_2);
+    Operator<Number> MULT = new OperatorImpl<Number>(NUMBER_X_2);
+    Operator<Number> SUB = new OperatorImpl<Number>(NUMBER_X_2);
+    Operator<Number> MOD = new OperatorImpl<Number>(NUMBER_X_2);
 
     // String
     Operator<Character> CHAR_AT = new OperatorImpl<Character>(String.class, Integer.class);
-    Operator<String> CONCAT = new OperatorImpl<String>(String_x_2);
+    Operator<String> CONCAT = new OperatorImpl<String>(STRING_X_2);
     Operator<String> LOWER = new OperatorImpl<String>(String.class);
     Operator<String> SUBSTR_1ARG = new OperatorImpl<String>(String.class, Integer.class);
     Operator<String> SUBSTR_2ARGS = new OperatorImpl<String>(String.class, Integer.class, Integer.class);
     Operator<String> TRIM = new OperatorImpl<String>(String.class);
     Operator<String> UPPER = new OperatorImpl<String>(String.class);
-    Operator<Boolean> MATCHES = new OperatorImpl<Boolean>(String_x_2);
+    Operator<Boolean> MATCHES = new OperatorImpl<Boolean>(STRING_X_2);
     Operator<Number> STRING_LENGTH = new OperatorImpl<Number>(String.class);
     Operator<Boolean> STRING_IS_EMPTY = new OperatorImpl<Boolean>(String.class);
-    Operator<Boolean> STARTS_WITH = new OperatorImpl<Boolean>(String_x_2);
-    Operator<Boolean> STARTS_WITH_IC = new OperatorImpl<Boolean>(String_x_2);
+    Operator<Boolean> STARTS_WITH = new OperatorImpl<Boolean>(STRING_X_2);
+    Operator<Boolean> STARTS_WITH_IC = new OperatorImpl<Boolean>(STRING_X_2);
     Operator<Number> INDEX_OF_2ARGS = new OperatorImpl<Number>(String.class, String.class, Integer.class);
     Operator<Number> INDEX_OF = new OperatorImpl<Number>(String.class, String.class);
-    Operator<Boolean> EQ_IGNORE_CASE = new OperatorImpl<Boolean>(String_x_2);
-    Operator<Boolean> ENDS_WITH = new OperatorImpl<Boolean>(String_x_2);
-    Operator<Boolean> ENDS_WITH_IC = new OperatorImpl<Boolean>(String_x_2);    
-    Operator<Boolean> STRING_CONTAINS = new OperatorImpl<Boolean>(String_x_2);
-    Operator<Boolean> STRING_CONTAINS_IC = new OperatorImpl<Boolean>(String_x_2);
-    Operator<Boolean> LIKE = new OperatorImpl<Boolean>(String_x_2);
+    Operator<Boolean> EQ_IGNORE_CASE = new OperatorImpl<Boolean>(STRING_X_2);
+    Operator<Boolean> ENDS_WITH = new OperatorImpl<Boolean>(STRING_X_2);
+    Operator<Boolean> ENDS_WITH_IC = new OperatorImpl<Boolean>(STRING_X_2);    
+    Operator<Boolean> STRING_CONTAINS = new OperatorImpl<Boolean>(STRING_X_2);
+    Operator<Boolean> STRING_CONTAINS_IC = new OperatorImpl<Boolean>(STRING_X_2);
+    Operator<Boolean> LIKE = new OperatorImpl<Boolean>(STRING_X_2);
         
     // case
     Operator<Object> CASE = new OperatorImpl<Object>(Object.class);
@@ -178,9 +178,9 @@ public interface Ops {
         Operator<Number> SIN = new OperatorImpl<Number>(Number.class);
         Operator<Number> ROUND = new OperatorImpl<Number>(Number.class);
         Operator<Number> RANDOM = new OperatorImpl<Number>();
-        Operator<Number> POWER = new OperatorImpl<Number>(Number_x_2);
-        Operator<Number> MIN = new OperatorImpl<Number>(Number_x_2);
-        Operator<Number> MAX = new OperatorImpl<Number>(Number_x_2);
+        Operator<Number> POWER = new OperatorImpl<Number>(NUMBER_X_2);
+        Operator<Number> MIN = new OperatorImpl<Number>(NUMBER_X_2);
+        Operator<Number> MAX = new OperatorImpl<Number>(NUMBER_X_2);
         Operator<Number> LOG10 = new OperatorImpl<Number>(Number.class);
         Operator<Number> LOG = new OperatorImpl<Number>(Number.class);
         Operator<Number> FLOOR = new OperatorImpl<Number>(Number.class);        
@@ -194,9 +194,9 @@ public interface Ops {
         Operator<String> LTRIM = new OperatorImpl<String>(String.class);
         Operator<String> RTRIM = new OperatorImpl<String>(String.class);
         Operator<String> SPACE = new OperatorImpl<String>(Integer.class);
-        Operator<String> SPLIT = new OperatorImpl<String>(String_x_2);
+        Operator<String> SPLIT = new OperatorImpl<String>(STRING_X_2);
         Operator<Number> LAST_INDEX_2ARGS = new OperatorImpl<Number>(String.class, String.class, Integer.class);
-        Operator<Number> LAST_INDEX = new OperatorImpl<Number>(String_x_2);
+        Operator<Number> LAST_INDEX = new OperatorImpl<Number>(STRING_X_2);
     }