diff --git a/ivette/api/dive/index.ts b/ivette/api/dive/index.ts
index a6bfaf5c218247ccaa94194a6cbf491af91056f5..d7e56288870910fb8025d9f1c47fb8aa88f49df2 100644
--- a/ivette/api/dive/index.ts
+++ b/ivette/api/dive/index.ts
@@ -3,7 +3,7 @@
 /**
    Dive Services
    @packageDocumentation
-   @module frama-c/dive
+   @module api/dive
 */
 
 //@ts-ignore
diff --git a/ivette/api/kernel/ast/index.ts b/ivette/api/kernel/ast/index.ts
index a7c5a9921cba74cb8cee7a84c0c233235be81774..decd0bc05e061a138104625b6fef520c87e857a4 100644
--- a/ivette/api/kernel/ast/index.ts
+++ b/ivette/api/kernel/ast/index.ts
@@ -3,7 +3,7 @@
 /**
    Ast Services
    @packageDocumentation
-   @module frama-c/kernel/ast
+   @module api/kernel/ast
 */
 
 //@ts-ignore
diff --git a/ivette/api/kernel/data/index.ts b/ivette/api/kernel/data/index.ts
index 0199b1c0fef3e13e81b684717a6cfccc5956c4cb..ffd93535e849479a40c0683f83c6bdf65ed6c5fe 100644
--- a/ivette/api/kernel/data/index.ts
+++ b/ivette/api/kernel/data/index.ts
@@ -3,7 +3,7 @@
 /**
    Informations
    @packageDocumentation
-   @module frama-c/kernel/data
+   @module api/kernel/data
 */
 
 //@ts-ignore
@@ -34,19 +34,19 @@ export type text = null | string | text[];
 
 /** Loose decoder for `text` */
 export const jText: Json.Loose<text> =
-  (_x) => Json.jUnion<null | string | text[]>(
-            Json.jNull,
-            Json.jString,
-            Json.jList(jText),
-          )(_x);
+  (_x: any) => Json.jUnion<null | string | text[]>(
+                 Json.jNull,
+                 Json.jString,
+                 Json.jList(jText),
+               )(_x);
 
 /** Safe decoder for `text` */
 export const jTextSafe: Json.Safe<text> =
-  (_x) => Json.jFail(jText,'Text expected')(_x);
+  (_x: any) => Json.jFail(jText,'Text expected')(_x);
 
 /** Natural order for `text` */
 export const byText: Compare.Order<text> =
-  (_x,_y) => Compare.structural(_x,_y);
+  (_x: any, _y: any) => Compare.structural(_x,_y);
 
 /** Enum Tag Description */
 export type tag = { name: string, label: markdown, descr: markdown };
diff --git a/ivette/api/kernel/project/index.ts b/ivette/api/kernel/project/index.ts
index ec7ea0fb8f13ade43b9965e1e463ce573b63f15f..e77efa142f136b794748567e577a8790f4537cdf 100644
--- a/ivette/api/kernel/project/index.ts
+++ b/ivette/api/kernel/project/index.ts
@@ -3,7 +3,7 @@
 /**
    Project Management
    @packageDocumentation
-   @module frama-c/kernel/project
+   @module api/kernel/project
 */
 
 //@ts-ignore
diff --git a/ivette/api/kernel/properties/index.ts b/ivette/api/kernel/properties/index.ts
index 3e336583d5a53057486298606d31e163553eb373..0d415ee563d47eadab03309810a328171220abe2 100644
--- a/ivette/api/kernel/properties/index.ts
+++ b/ivette/api/kernel/properties/index.ts
@@ -3,7 +3,7 @@
 /**
    Property Services
    @packageDocumentation
-   @module frama-c/kernel/properties
+   @module api/kernel/properties
 */
 
 //@ts-ignore
diff --git a/ivette/api/kernel/services/index.ts b/ivette/api/kernel/services/index.ts
index 7da04e4a0aecdd06ad0f69ea83f5219ff28b4a46..87c7626943811ee37f1484de6f305806518aec6f 100644
--- a/ivette/api/kernel/services/index.ts
+++ b/ivette/api/kernel/services/index.ts
@@ -3,7 +3,7 @@
 /**
    Kernel Services
    @packageDocumentation
-   @module frama-c/kernel/services
+   @module api/kernel/services
 */
 
 //@ts-ignore
diff --git a/ivette/api/server_tsc.ml b/ivette/api/server_tsc.ml
index 3df4c37188eb1893a0b0020b50800d5654a96324..77a6f11beb07905513c048b10d15d2e148993028 100644
--- a/ivette/api/server_tsc.ml
+++ b/ivette/api/server_tsc.ml
@@ -258,12 +258,12 @@ let makeOrder ~self ~names fmt js =
 
 let makeRecursive fn fmt js =
   if Pkg.isRecursive js then
-    Format.fprintf fmt "(_x) => %a(_x)" fn js
+    Format.fprintf fmt "(_x: any) => %a(_x)" fn js
   else fn fmt js
 
 let makeRecursive2 fn fmt js =
   if Pkg.isRecursive js then
-    Format.fprintf fmt "(_x,_y) => %a(_x,_y)" fn js
+    Format.fprintf fmt "(_x: any, _y: any) => %a(_x,_y)" fn js
   else fn fmt js
 
 let makeDeclaration fmt names d =
@@ -440,7 +440,7 @@ let makePackage pkg name fmt =
     if pkg.p_descr <> [] then
       Format.fprintf fmt "@\n   @[<hov 0>%a@]@\n@\n" pp_descr pkg.p_descr ;
     Format.fprintf fmt "   @@packageDocumentation@\n" ;
-    Format.fprintf fmt "   @@module frama-c/%s@\n" name ;
+    Format.fprintf fmt "   @@module api/%s@\n" name ;
     Format.fprintf fmt "*/@\n@." ;
     let names = Pkg.resolve ~keywords pkg in
     makeIgnore fmt "import * as Json from 'dome/data/json';@\n" ;
diff --git a/ivette/tsconfig.json b/ivette/tsconfig.json
index 0f43fba3bb9691745bd8fea92f8eb04612102e59..662e4cd16a733b51a4544a219c7f8dd005d7b761 100644
--- a/ivette/tsconfig.json
+++ b/ivette/tsconfig.json
@@ -98,8 +98,8 @@
     "readme": "./README.md",
     "inputFiles": [
       "doc/pages",
-      "src/frama-c",
-      "src/dome/src/renderer"
+      "src/frama-c", "api",
+      "src/dome/src/renderer",
     ]
   }
 }