diff --git a/src/gen_java_Message.ysl2 b/src/gen_java_Message.ysl2
index 7b5fec2..34d235c 100644
--- a/src/gen_java_Message.ysl2
+++ b/src/gen_java_Message.ysl2
@@ -4,7 +4,7 @@ tstylesheet {
     include ./textutils.ysl2
     include ./types_java.ysl2
 
-    template "/namespace[@name='pEp']" apply "struct|enum", 0;
+    template "/namespace[@name='pEp']" apply "struct|enum|exception", 0;
 
     template "struct" {
         const "cname" call "toJava" with "type", "@name";
@@ -45,7 +45,7 @@ tstylesheet {
             ||
     }
 
-    template "enum" {
+    template "enum|exception" {
         const "jname" call "toJava" with "type", "@name";
         document("org/pEp/jniadapter/{$jname}.java", "text")
             ||
@@ -57,7 +57,7 @@ tstylesheet {
             ||
     }
 
-    template "enum", mode=inner {
+    template "enum|exception", mode=inner {
         const "jname" call "CamelCase" with "text", "@name";
         ||
         public enum «$jname» {
diff --git a/src/pEp.yml2 b/src/pEp.yml2
index 938710a..08e73c7 100644
--- a/src/pEp.yml2
+++ b/src/pEp.yml2
@@ -7,7 +7,7 @@ decl struct @name;
 decl basic @type @name;
 
 namespace pEp {
-    exception pEp_status {
+    exception Status {
         pEp_status_ok									> 0
 
         pEp_init_cannot_load_gpgme						> 0x0110