diff -r 7e8e995065c5 -r 1657c68af062 samples/sidemeanings/test/org/apidesign/sidemeanings/test/MixedTest.java
--- a/samples/sidemeanings/test/org/apidesign/sidemeanings/test/MixedTest.java	Sat Jun 14 18:51:38 2008 +0200
+++ b/samples/sidemeanings/test/org/apidesign/sidemeanings/test/MixedTest.java	Wed Apr 01 18:21:39 2009 +0200
@@ -3,7 +3,8 @@
 
 import org.apidesign.sidemeanings.MixedClass;
 import org.apidesign.sidemeanings.NonMixed;
-import org.apidesign.sidemeanings.NonMixed.Callback;
+import org.apidesign.sidemeanings.NonMixedFactory;
+import org.apidesign.sidemeanings.NonMixedFactory.Callback;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -40,7 +41,7 @@
     
     // BEGIN: sidemeanings.Mixed.Clean.Use
     @Test public void useWithoutMixedMeanings() {
-        class AddFiveMixedCounter implements NonMixed.Provider {
+        class AddFiveMixedCounter implements NonMixedFactory.Provider {
             private Callback callback;
             
             public int toBeImplementedBySubclass() {
@@ -52,7 +53,7 @@
                 callback = c;
             }
         }
-        NonMixed add5 = NonMixed.create(new AddFiveMixedCounter());
+        NonMixed add5 = NonMixedFactory.create(new AddFiveMixedCounter());
         assertEquals("5/1 = 5", 5, add5.apiForClients());
         assertEquals("10/2 = 5", 5, add5.apiForClients());
         assertEquals("15/3 = 5", 5, add5.apiForClients());