diff --git a/www/common/application_config_internal.js b/www/common/application_config_internal.js
index 4bfe1383a..09f1604f3 100644
--- a/www/common/application_config_internal.js
+++ b/www/common/application_config_internal.js
@@ -11,7 +11,7 @@ define(function() {
      * redirected to the drive.
      * You should never remove the drive from this list.
      */
-    config.availablePadTypes = ['drive', 'team', 'pad', 'sheet', 'code', 'slide', 'poll', 'kanban', 'whiteboard',
+    config.availablePadTypes = ['drive', 'teams', 'pad', 'sheet', 'code', 'slide', 'poll', 'kanban', 'whiteboard',
                                 /*'oodoc', 'ooslide',*/ 'file', 'todo', 'contacts'];
     /* The registered only types are apps restricted to registered users.
      * You should never remove apps from this list unless you know what you're doing. The apps
@@ -20,7 +20,7 @@ define(function() {
      * users and these users will be redirected to the login page if they still try to access
      * the app
      */
-    config.registeredOnlyTypes = ['team', 'file', 'contacts', 'oodoc', 'ooslide', 'sheet', 'notifications'];
+    config.registeredOnlyTypes = ['teams', 'file', 'contacts', 'oodoc', 'ooslide', 'sheet', 'notifications'];
 
     /* CryptPad is available is multiple languages, but only English and French are maintained
      * by the developers. The other languages may be outdated, and any missing string for a langauge
diff --git a/www/team/app-team.less b/www/teams/app-team.less
similarity index 100%
rename from www/team/app-team.less
rename to www/teams/app-team.less
diff --git a/www/team/index.html b/www/teams/index.html
similarity index 100%
rename from www/team/index.html
rename to www/teams/index.html
diff --git a/www/team/inner.html b/www/teams/inner.html
similarity index 85%
rename from www/team/inner.html
rename to www/teams/inner.html
index e053dd789..243a74edf 100644
--- a/www/team/inner.html
+++ b/www/teams/inner.html
@@ -2,7 +2,7 @@
 <html class="cp-app-noscroll">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/team/inner.js" data-main="/common/sframe-boot.js?ver=1.6" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/teams/inner.js" data-main="/common/sframe-boot.js?ver=1.6" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
     <style>
         .loading-hidden { display: none; }
         #editor1 { display: none; }
diff --git a/www/team/inner.js b/www/teams/inner.js
similarity index 99%
rename from www/team/inner.js
rename to www/teams/inner.js
index eac2e3687..99853f415 100644
--- a/www/team/inner.js
+++ b/www/teams/inner.js
@@ -16,7 +16,7 @@ define([
 
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
     'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
-    'less!/team/app-team.less',
+    'less!/teams/app-team.less',
 ], function (
     $,
     Toolbar,
diff --git a/www/team/main.js b/www/teams/main.js
similarity index 98%
rename from www/team/main.js
rename to www/teams/main.js
index cbaec4672..5c66c573e 100644
--- a/www/team/main.js
+++ b/www/teams/main.js
@@ -20,7 +20,7 @@ define([
         window.rc = requireConfig;
         window.apiconf = ApiConfig;
         document.getElementById('sbox-iframe').setAttribute('src',
-            ApiConfig.httpSafeOrigin + '/team/inner.html?' + requireConfig.urlArgs +
+            ApiConfig.httpSafeOrigin + '/teams/inner.html?' + requireConfig.urlArgs +
                 '#' + encodeURIComponent(JSON.stringify(req)));
 
         // This is a cheap trick to avoid loading sframe-channel in parallel with the
