diff --git a/src/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java b/src/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
index b05dd0ee0..71985334e 100644
--- a/src/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
+++ b/src/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
@@ -208,7 +208,7 @@ public class UnifyTypeFactory {
     }
 
     public static RefTypeOrTPHOrWildcardOrGeneric convert(FunNType t, Map<String,TypePlaceholder> tphs) {
-        RefType ret = new RefType(new JavaClassName(t.getName()), convert(t.getTypeParams(), tphs), new NullToken());
+        RefType ret = new RefType(new JavaClassName(t.getName()+"$$"), convert(t.getTypeParams(), tphs), new NullToken());
         return ret;
     }
 
diff --git a/target/JavaTXcompiler-0.1-jar-with-dependencies.jar b/target/JavaTXcompiler-0.1-jar-with-dependencies.jar
index 3e795901c..7b9d301bd 100644
Binary files a/target/JavaTXcompiler-0.1-jar-with-dependencies.jar and b/target/JavaTXcompiler-0.1-jar-with-dependencies.jar differ
diff --git a/test/bytecode/javFiles/Faculty.jav b/test/bytecode/javFiles/Faculty.jav
index a5c649b88..dae93abe7 100644
--- a/test/bytecode/javFiles/Faculty.jav
+++ b/test/bytecode/javFiles/Faculty.jav
@@ -5,12 +5,12 @@ class Faculty {
   m () {
 	  
    var fact = (Integer x) -> {
-   	  if (x == 1) {
+   	  //if (x == 1) {
         return x;
-      }
-      else {
-        return x * fact.apply(x-1);
-      }
+      //}
+      //else {
+        //return x * (fact.apply(x-1));
+      //}
    };
    return fact;
   }
diff --git a/test/bytecode/javFiles/Lambda.jav b/test/bytecode/javFiles/Lambda.jav
index de4342719..3aeded259 100644
--- a/test/bytecode/javFiles/Lambda.jav
+++ b/test/bytecode/javFiles/Lambda.jav
@@ -6,6 +6,6 @@ public class Lambda {
    var lam1 = (Integer x) -> {
         return x;
    };
-   return lam1.apply(1);
+   return lam1;
   }
 }
diff --git a/test/bytecode/javFiles/OL.jav b/test/bytecode/javFiles/OL.jav
index 5adf291cd..89c3d3d04 100644
--- a/test/bytecode/javFiles/OL.jav
+++ b/test/bytecode/javFiles/OL.jav
@@ -12,7 +12,7 @@ class OL     {
          
 class OLMain   {
 
-	java.lang.Integer main(x) { 
+	main(x) { 
 		var ol;
 		ol = new OL(); 
 		return ol.m(x); 
diff --git a/test/javFiles/Lambda.jav b/test/javFiles/Lambda.jav
index 02e8b51bf..a2feb8ee1 100644
--- a/test/javFiles/Lambda.jav
+++ b/test/javFiles/Lambda.jav
@@ -4,7 +4,7 @@ import java.lang.Number;
 public class Lambda {
 
   m () {
-   var lam1 = (x) -> {
+   var lam1 = (Integer x) -> {
         return x;
    };
    return lam1.apply(1);