diff -r 4384f4ae0574 -r 47cf4bc789aa src/Tools/Code/code_haskell.ML
--- a/src/Tools/Code/code_haskell.ML	Thu Jun 09 17:46:25 2011 +0200
+++ b/src/Tools/Code/code_haskell.ML	Thu Jun 09 17:51:49 2011 +0200
@@ -264,13 +264,12 @@
   let
     fun namify_fun upper base (nsp_fun, nsp_typ) =
       let
-        val (base', nsp_fun') = yield_singleton Name.variants
-          (if upper then first_upper base else base) nsp_fun;
+        val (base', nsp_fun') =
+          Name.variant (if upper then first_upper base else base) nsp_fun;
       in (base', (nsp_fun', nsp_typ)) end;
     fun namify_typ base (nsp_fun, nsp_typ) =
       let
-        val (base', nsp_typ') = yield_singleton Name.variants
-          (first_upper base) nsp_typ
+        val (base', nsp_typ') = Name.variant (first_upper base) nsp_typ;
       in (base', (nsp_fun, nsp_typ')) end;
     fun namify_stmt (Code_Thingol.Fun (_, (_, SOME _))) = pair
       | namify_stmt (Code_Thingol.Fun _) = namify_fun false