diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/impl/DefaultHandler.java b/querydsl-apt/src/main/java/com/mysema/query/apt/impl/DefaultHandler.java
index bfd4cc1f1..2f850c06b 100644
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/impl/DefaultHandler.java
+++ b/querydsl-apt/src/main/java/com/mysema/query/apt/impl/DefaultHandler.java
@@ -15,7 +15,7 @@ import javax.annotation.processing.RoundEnvironment;
 import javax.lang.model.element.Element;
 
 import com.mysema.query.codegen.ClassModel;
-import com.mysema.query.codegen.ClassModelFactory;
+import com.mysema.query.codegen.ClassModelBuilder;
 import com.mysema.query.codegen.Serializer;
 import com.mysema.query.codegen.Serializers;
 import com.mysema.query.util.FileUtils;
@@ -65,7 +65,7 @@ public class DefaultHandler {
 
         } else if (superClass != null && !superClass.equals(Object.class)) {
             // TODO : recursively up ?
-            ClassModel type = ClassModelFactory.createType(superClass);
+            ClassModel type = ClassModelBuilder.createType(superClass);
             // include fields of supertype
             typeDecl.include(type);
         }