diff --git a/Documentation/UserManual/Foxx.md b/Documentation/UserManual/Foxx.md
index 229522b998..91c933041e 100644
--- a/Documentation/UserManual/Foxx.md
+++ b/Documentation/UserManual/Foxx.md
@@ -51,7 +51,7 @@ following content:
       "name": "my_app",
       "version": "0.0.1",
       "author": "me and myself",
-      "apps": {
+      "controllers": {
         "/": "app.js"
       }
     }
@@ -381,7 +381,7 @@ The content is a JSON object with the following keys:
 * `repository`: An object with information about where you can find the repository: `type` and `url`
 * `keywords`: An array of keywords to help people find your Foxx app
 * `engines`: Should be an object with `arangodb` set to the ArangoDB version your Foxx app is compatible with.
-* `apps`: Map routes to FoxxControllers
+* `controllers`: Map routes to FoxxControllers
 * `lib`: Base path for all required modules
 * `files`: Deliver files
 * `assets`: Deliver pre-processed files
@@ -431,7 +431,7 @@ script to create all collections your application needs and fill them with
 initial data if you want to. Use the `teardown` script to remove all 
 collections you have created.
 
-`apps` is an object that matches routes to files
+`controllers` is an object that matches routes to files
 ------------------------------------------------
 
 * The `key` is the route you want to mount at
diff --git a/js/apps/aardvark/manifest.json b/js/apps/aardvark/manifest.json
index 562c45c6bb..9494396bf3 100644
--- a/js/apps/aardvark/manifest.json
+++ b/js/apps/aardvark/manifest.json
@@ -5,7 +5,7 @@
   "version": "1.0",
   "isSystem": true,
 
-  "apps": {
+  "controllers": {
     "/": "aardvark.js"
   },
 
diff --git a/js/server/modules/org/arangodb/foxx-manager.js b/js/server/modules/org/arangodb/foxx-manager.js
index 6e7639daef..90490f966a 100644
--- a/js/server/modules/org/arangodb/foxx-manager.js
+++ b/js/server/modules/org/arangodb/foxx-manager.js
@@ -503,11 +503,11 @@ function routingAalApp (app, mount, options) {
     });
 
     // mount all applications
-    var apps = app._manifest.apps;
+    var controllers = app._manifest.controllers;
 
-    for (i in apps) {
-      if (apps.hasOwnProperty(i)) {
-        var file = apps[i];
+    for (i in controllers) {
+      if (controllers.hasOwnProperty(i)) {
+        var file = controllers[i];
         var devel = false;
         var root;