diff --git a/src/Makefile b/src/Makefile
index 27691ba..30a88df 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,30 +5,32 @@ include Makefile.conf
 
 all: $(JAR) $(LIBRARY)
 
-$(JAR): org/pEp/jniadapter/pEpException.java org/pEp/jniadapter/AbstractEngine.java org/pEp/jniadapter/Engine.java org/pEp/jniadapter/MimeMessage.java
+$(JAR): org/pEp/jniadapter/pEpException.java org/pEp/jniadapter/AbstractEngine.java  org/pEp/jniadapter/Message.java org/pEp/jniadapter/Engine.java
 	javac org/pEp/jniadapter/*.java
 	jar cf $@ org/pEp/jniadapter/*.class
 
 org_pEp_jniadapter_AbstractEngine.o: org_pEp_jniadapter_AbstractEngine.h org_pEp_jniadapter_AbstractEngine.cc throw_pEp_exception.hh jniutils.hh
 
 org_pEp_jniadapter_AbstractEngine.h: org/pEp/jniadapter/AbstractEngine.java
-	javah org.pEp.jniadapter.AbstractEngine
+	javah $(subst /,.,$(subst .java,,$<))
 
 org_pEp_jniadapter_Engine.h: org/pEp/jniadapter/Engine.java
-	javah org.pEp.jniadapter.Engine
+	javah $(subst /,.,$(subst .java,,$<))
 
-org_pEp_jniadapter_MimeMessage.h: org/pEp/jniadapter/MimeMessage.java
-	javah org.pEp.jniadapter.MimeMessage
+org_pEp_jniadapter_Message.h: org/pEp/jniadapter/Message.java
+	javah $(subst /,.,$(subst .java,,$<))
 
-%.o: %.cc %.h jniutils.hh
+org_pEp_jniadapter_Engine.o: org_pEp_jniadapter_Engine.cc org_pEp_jniadapter_Engine.h
 
-$(LIBRARY): org_pEp_jniadapter_AbstractEngine.o org_pEp_jniadapter_Engine.o org_pEp_jniadapter_MimeMessage.o throw_pEp_exception.o jniutils.o
+org_pEp_jniadapter_Message.o: org_pEp_jniadapter_Message.cc org_pEp_jniadapter_Message.h
+
+$(LIBRARY): org_pEp_jniadapter_AbstractEngine.o org_pEp_jniadapter_Engine.o org_pEp_jniadapter_Message.o throw_pEp_exception.o jniutils.o
 	ar -r $@ *.o
 
 org/pEp/jniadapter/pEpException.java: pEp.yml2 gen_java_exceptions.ysl2
 	yml2proc -y gen_java_exceptions.ysl2 $< -o $@
 
-org/pEp/jniadapter/Engine.java org/pEp/jniadapter/MimeMessage.java : pEp.yml2 gen_java_Message.ysl2 types_java.ysl2
+org/pEp/jniadapter/Engine.java org/pEp/jniadapter/Message.java : pEp.yml2 gen_java_Message.ysl2 types_java.ysl2
 	yml2proc -y gen_java_Message.ysl2 $<
 
 throw_pEp_exception.cc throw_pEp_exception.hh: pEp.yml2 gen_throw_pEp_exception.ysl2 textutils.ysl2
@@ -46,7 +48,7 @@ clean:
 	rm -f org/pEp/jniadapter/*.class
 	rm -f org/pEp/jniadapter/pEp*.java
 	rm -f org/pEp/jniadapter/Engine.java
-	rm -f org/pEp/jniadapter/MimeMessage.java
+	rm -f org/pEp/jniadapter/Message.java
 	rm -f org/pEp/jniadapter/Color.java
 	rm -f throw_pEp_exception.*
 
diff --git a/src/gen_cpp_Message.ysl2 b/src/gen_cpp_Message.ysl2
index 1d602f2..6478de3 100644
--- a/src/gen_cpp_Message.ysl2
+++ b/src/gen_cpp_Message.ysl2
@@ -1,6 +1,10 @@
 include yslt.yml2
 
 tstylesheet {
-    template "/";
+    template "/namespace[@name='pEp']" apply "struct", 0;
+
+    template "struct[@name='message']" {
+        
+    }
 }
 
diff --git a/src/types_java.ysl2 b/src/types_java.ysl2
index 7cd0656..a362d1f 100644
--- a/src/types_java.ysl2
+++ b/src/types_java.ysl2
@@ -6,14 +6,14 @@ function "toJava" {
     choose {
         when "$type='stringlist'" > ArrayList<String>
         when "$type='string'" > String
-        when "$type='message'" > MimeMessage
+        when "$type='message'" > Message
         when "$type='identity'" > Identity
         when "$type='identitylist'" > ArrayList<Identity>
         when "$type='timestamp'" > Date
-        when "$type='EncFormat'" > MimeMessage.EncFormat
+        when "$type='EncFormat'" > Message.EncFormat
         when "$type='bloblist'" > ArrayList<Blob>
         when "$type='stringpairlist'" > Vector<Pair<String, String>>
-        when "$type='message'" > MimeMessage
+        when "$type='message'" > Message
 
         otherwise call "CamelCase" with "text", "$type";
     }