--- a/CustomClassQueryTests.st	Wed Oct 08 19:50:10 2014 +0200
+++ b/CustomClassQueryTests.st	Fri Oct 10 16:28:37 2014 +0200
@@ -1,7 +1,7 @@
 "{ Package: 'jn:refactoring_custom' }"
 
 TestCase subclass:#CustomClassQueryTests
-	instanceVariableNames:'classQuery builder mockSuperClass mockClass'
+	instanceVariableNames:'classQuery model mockSuperClass mockClass'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-Refactoring-Custom-Tests'
@@ -12,16 +12,16 @@
 setUp
 
     classQuery := CustomClassQuery new.
-    builder := CustomSourceCodeBuilder new.
-    mockSuperClass := builder createClassImmediate: 'MockSuperClassForTestCase' superClassName: 'Object'.
-    mockClass := builder createClassImmediate: 'MockClassForTestCase' superClassName: (mockSuperClass new className).
+    model := CustomNamespace new.
+    mockSuperClass := model createClassImmediate: 'MockSuperClassForTestCase' superClassName: 'Object'.
+    mockClass := model createClassImmediate: 'MockClassForTestCase' superClassName: (mockSuperClass new className).
 
-    "Modified: / 15-06-2014 / 16:15:49 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
+    "Modified: / 09-10-2014 / 09:33:36 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
 !
 
 tearDown
 
-    builder redoChanges
+    model redoChanges
 
     "Modified: / 15-06-2014 / 16:16:06 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
 ! !
@@ -52,7 +52,7 @@
     self assert: (classQuery methodForSuperclassSelector: 'initialize' class: Object) isNil.
 
     "/ Instance method
-    builder createMethodImmediate: mockSuperClass protocol: 'instance-protocol' source: 'instanceMethod: aParam
+    model createMethodImmediate: mockSuperClass protocol: 'instance-protocol' source: 'instanceMethod: aParam
     self shouldImplement'.
 
     method := classQuery methodForSuperclassSelector: #instanceMethod: class: mockClass.
@@ -61,7 +61,7 @@
     self assert: 'instanceMethod:aParam' = method methodDefinitionTemplate.
 
     "/ Class method
-    builder createMethodImmediate: mockSuperClass class protocol: 'class-protocol' source: 'classMethod: aParam
+    model createMethodImmediate: mockSuperClass class protocol: 'class-protocol' source: 'classMethod: aParam
     self shouldImplement'.
 
     method := classQuery methodForSuperclassSelector: 'classMethod:' class: mockClass class.