diff --git a/src/main/java/com/mysema/codegen/ScalaWriter.java b/src/main/java/com/mysema/codegen/ScalaWriter.java
index bc5c22a37..d72f1e985 100644
--- a/src/main/java/com/mysema/codegen/ScalaWriter.java
+++ b/src/main/java/com/mysema/codegen/ScalaWriter.java
@@ -283,7 +283,7 @@ public class ScalaWriter extends AbstractCodeWriter<ScalaWriter>{
         String fullName = type.getFullName();
         String packageName = type.getPackageName();
         String rv = fullName;
-        if (packages.contains(packageName) || "java.lang".equals(packageName) || classes.contains(fullName)){
+        if (packages.contains(packageName) || classes.contains(fullName)){
             if (packageName.length() > 0){
                 rv = fullName.substring(packageName.length()+1);    
             }  
diff --git a/src/main/java/com/mysema/codegen/model/ClassType.java b/src/main/java/com/mysema/codegen/model/ClassType.java
index bdc553f7a..3eb9e0e86 100644
--- a/src/main/java/com/mysema/codegen/model/ClassType.java
+++ b/src/main/java/com/mysema/codegen/model/ClassType.java
@@ -111,7 +111,7 @@ public class ClassType implements Type {
 
     @Override
     public String getGenericName(boolean asArgType) {
-        return getGenericName(asArgType, Collections.<String>emptySet(), Collections.<String>emptySet());
+        return getGenericName(asArgType, Collections.singleton("java.lang"), Collections.<String>emptySet());
     }
 
     @Override
diff --git a/src/main/java/com/mysema/codegen/model/SimpleType.java b/src/main/java/com/mysema/codegen/model/SimpleType.java
index f3f8ba932..53dd365de 100644
--- a/src/main/java/com/mysema/codegen/model/SimpleType.java
+++ b/src/main/java/com/mysema/codegen/model/SimpleType.java
@@ -127,7 +127,7 @@ public class SimpleType implements Type {
 
     @Override
     public String getGenericName(boolean asArgType) {
-        return getGenericName(asArgType, Collections.<String>emptySet(), Collections.<String>emptySet());
+        return getGenericName(asArgType, Collections.singleton("java.lang"), Collections.<String>emptySet());
     }
 
     @Override
@@ -172,7 +172,7 @@ public class SimpleType implements Type {
 
     @Override
     public String getRawName(Set<String> packages, Set<String> classes) {
-        if (packages.contains(packageName) || "java.lang".equals(packageName) || classes.contains(fullName)){
+        if (packages.contains(packageName) || classes.contains(fullName)){
             return localName;
         }else{
             return fullName;
diff --git a/src/main/java/com/mysema/codegen/support/ClassUtils.java b/src/main/java/com/mysema/codegen/support/ClassUtils.java
index 092834637..be0cab66f 100644
--- a/src/main/java/com/mysema/codegen/support/ClassUtils.java
+++ b/src/main/java/com/mysema/codegen/support/ClassUtils.java
@@ -24,8 +24,7 @@ public final class ClassUtils {
     public static String getName(Class<?> cl, Set<String> packages, Set<String> classes) {
         if (cl.isArray()) {
             return getName(cl.getComponentType(), packages, classes) + "[]";
-        } else if (cl.getPackage() == null 
-                || cl.getPackage().getName().equals("java.lang") 
+        } else if (cl.getPackage() == null  
                 || packages.contains(cl.getPackage().getName()) 
                 || classes.contains(cl.getName())) {
             if (cl.getPackage() != null){
diff --git a/src/test/java/com/mysema/codegen/model/TypeTest.java b/src/test/java/com/mysema/codegen/model/TypeTest.java
index 44ca93972..35d8aed79 100644
--- a/src/test/java/com/mysema/codegen/model/TypeTest.java
+++ b/src/test/java/com/mysema/codegen/model/TypeTest.java
@@ -20,7 +20,9 @@ import org.junit.Test;
 
 public class TypeTest {
 
-    private Set<String> emptyStrings = Collections.<String>emptySet();
+    private Set<String> packages = Collections.singleton("java.lang");
+    
+    private Set<String> classes = Collections.emptySet();
         
     private ClassType locale = new ClassType(TypeCategory.SIMPLE,Locale.class);
     
@@ -72,21 +74,21 @@ public class TypeTest {
 
     @Test
     public void testGetRawName() {
-        assertEquals("java.util.Locale",locale.getRawName(emptyStrings,emptyStrings));
-        assertEquals("java.util.Locale",locale2.getRawName(emptyStrings,emptyStrings));
-        assertEquals("java.util.List",stringList.getRawName(emptyStrings,emptyStrings));
-        assertEquals("java.util.List",stringList2.getRawName(emptyStrings,emptyStrings));
+        assertEquals("java.util.Locale",locale.getRawName(packages, classes));
+        assertEquals("java.util.Locale",locale2.getRawName(packages, classes));
+        assertEquals("java.util.List",stringList.getRawName(packages, classes));
+        assertEquals("java.util.List",stringList2.getRawName(packages, classes));
         
-        assertEquals("String", string.getRawName(emptyStrings, emptyStrings));
-        assertEquals("String", string2.getRawName(emptyStrings, emptyStrings));
+        assertEquals("String", string.getRawName(packages, classes));
+        assertEquals("String", string2.getRawName(packages, classes));
     }
 
     @Test
     public void testGetGenericNameBooleanSetOfStringSetOfString() {
-        assertEquals("java.util.Locale",locale.getGenericName(true, emptyStrings, emptyStrings));
-        assertEquals("java.util.Locale",locale2.getGenericName(true, emptyStrings, emptyStrings));
-        assertEquals("java.util.List<String>",stringList.getGenericName(true,emptyStrings,emptyStrings));
-        assertEquals("java.util.List<String>",stringList2.getGenericName(true,emptyStrings,emptyStrings));
+        assertEquals("java.util.Locale",locale.getGenericName(true, packages, classes));
+        assertEquals("java.util.Locale",locale2.getGenericName(true, packages, classes));
+        assertEquals("java.util.List<String>",stringList.getGenericName(true,packages, classes));
+        assertEquals("java.util.List<String>",stringList2.getGenericName(true,packages, classes));
     }
 
     @Test