diff --git a/src/main/scala/leon/codegen/CodeGeneration.scala b/src/main/scala/leon/codegen/CodeGeneration.scala
index 866c3ce096d3f53fd0a81d533fd64e50ff3b0a0e..960e57ff8179e4d3f96667bf0c73842754f91781 100644
--- a/src/main/scala/leon/codegen/CodeGeneration.scala
+++ b/src/main/scala/leon/codegen/CodeGeneration.scala
@@ -245,7 +245,8 @@ trait CodeGeneration {
       ((if (tparams.nonEmpty) Seq(tpsID -> "[I") else Seq.empty) ++ closuresWithoutMonitor)
 
     val afName = lambdaToClass.getOrElse(nl, {
-      val afName = "Leon$CodeGen$Lambda$" + lambdaCounter.nextGlobal
+      val afId = FreshIdentifier("Leon$CodeGen$Lambda$")
+      val afName = afId.uniqueName
       lambdaToClass += nl -> afName
       classToLambda += afName -> nl
 
diff --git a/src/main/scala/leon/codegen/CompilationUnit.scala b/src/main/scala/leon/codegen/CompilationUnit.scala
index cd6bad57e5b374c6a7088931989c87a0d782068f..e8bd40eb2302fd9ced5fc44d6c18848c4461b867 100644
--- a/src/main/scala/leon/codegen/CompilationUnit.scala
+++ b/src/main/scala/leon/codegen/CompilationUnit.scala
@@ -582,6 +582,5 @@ class CompilationUnit(val ctx: LeonContext,
 }
 
 private [codegen] object exprCounter extends UniqueCounter[Unit]
-private [codegen] object lambdaCounter extends UniqueCounter[Unit]
 private [codegen] object forallCounter extends UniqueCounter[Unit]