diff --git a/twake/.gitignore b/twake/.gitignore
index 0ad1d088..1f785e57 100644
--- a/twake/.gitignore
+++ b/twake/.gitignore
@@ -125,7 +125,7 @@ docker-compose.yml
 /docker-data/*
 /docker/data/*
 
-### Twake specific ###
+### Tdrive specific ###
 /build/
 /vendor/
 /app/Ressources/DatabaseEncryption/.HaliteEncryptor.key
diff --git a/twake/backend/node/README.md b/twake/backend/node/README.md
index fe33933d..e92e7480 100644
--- a/twake/backend/node/README.md
+++ b/twake/backend/node/README.md
@@ -1,4 +1,4 @@
-# Twake backend
+# Tdrive backend
 
 ## Developer guide
 
@@ -7,8 +7,8 @@
 1. Clone and install dependencies (assumes that you have Node.js 12 and npm installed. If not, we suggest to use [nvm](https://github.com/nvm-sh/nvm/)):
 
 ```sh
-git clone git@github.com:Twake/Twake.git
-cd Twake/Twake/backend/node
+git clone git@github.com:Tdrive/Tdrive.git
+cd Tdrive/Tdrive/backend/node
 npm install
 ```
 
@@ -38,15 +38,15 @@ will run unit tests only (`test:unit`). For possible tests to run, check the `pa
 
 ### Command Line Interface (CLI)
  
-The Twake backend CLI provides a set of commands to manage/use/develop Twake from the `twake-cli` binary.
-Before to use the CLI, you must `compile` Twake with `npm run build`. Once done, you can get help on on any command with the `--help` flag like `./bin/twake-cli console --help`.
+The Tdrive backend CLI provides a set of commands to manage/use/develop Tdrive from the `tdrive-cli` binary.
+Before to use the CLI, you must `compile` Tdrive with `npm run build`. Once done, you can get help on on any command with the `--help` flag like `./bin/tdrive-cli console --help`.
 
 #### The 'console merge' command
 
-This command allows to connect to the database configured in the `./config/default.json` file and to "merge" the Twake users and companies into the "Twake Console".
+This command allows to connect to the database configured in the `./config/default.json` file and to "merge" the Tdrive users and companies into the "Tdrive Console".
 
 ```sh
-./bin/twake-cli console merge --url http://console.twake.app --client twake-app --secret supersecret
+./bin/tdrive-cli console merge --url http://console.tdrive.app --client tdrive-app --secret supersecret
 ```
 
 The simplified console workflow is like (some parts are done in parallel):
@@ -90,10 +90,10 @@ In order to illustrate how to create a component, let's create a fake Notificati
 
 ```js
 // File src/services/notification/index.ts
-import { TwakeService } from "../../core/platform/framework";
+import { TdriveService } from "../../core/platform/framework";
 import NotificationServiceAPI from "./api.ts";
 
-export default class NotificationService extends TwakeService<NotificationServiceAPI> {
+export default class NotificationService extends TdriveService<NotificationServiceAPI> {
   version = "1";
   name = "notification";
   service: NotificationServiceAPI;
@@ -104,14 +104,14 @@ export default class NotificationService extends TwakeService<NotificationServic
 }
 ```
 
-3. Our `NotificationService` class extends the generic `TwakeService` class and we defined the `NotificationServiceAPI` as its generic type parameter. It means that in the platform, the other components will be able to retrieve the component from its name and then consume the API defined in the `NotificationServiceAPI` interface and exposed by the `api` method.
-   We need to create this `NotificationServiceAPI` interface which must extend the `TwakeServiceProvider` from the platform like:
+3. Our `NotificationService` class extends the generic `TdriveService` class and we defined the `NotificationServiceAPI` as its generic type parameter. It means that in the platform, the other components will be able to retrieve the component from its name and then consume the API defined in the `NotificationServiceAPI` interface and exposed by the `api` method.
+   We need to create this `NotificationServiceAPI` interface which must extend the `TdriveServiceProvider` from the platform like:
 
 ```js
 // File src/services/notification/api.ts
-import { TwakeServiceProvider } from "../../core/platform/framework/api";
+import { TdriveServiceProvider } from "../../core/platform/framework/api";
 
-export default interface NotificationServiceAPI extends TwakeServiceProvider {
+export default interface NotificationServiceAPI extends TdriveServiceProvider {
 
   /**
    * Send a message to a list of recipients
@@ -135,18 +135,18 @@ export class NotificationServiceImpl implements NotificationServiceAPI {
 }
 ```
 
-5. `NotificationServiceImpl` now needs to be instanciated from the `NotificationService` class since this is where we choose to keep its reference and expose it. There are several places which can be used to instanciate it, in the constructor itself, or in one of the `TwakeService` lifecycle hooks. The `TwakeService` abstract class has several lifecycle hooks which can be extended by the service implementation for customization pusposes:
+5. `NotificationServiceImpl` now needs to be instanciated from the `NotificationService` class since this is where we choose to keep its reference and expose it. There are several places which can be used to instanciate it, in the constructor itself, or in one of the `TdriveService` lifecycle hooks. The `TdriveService` abstract class has several lifecycle hooks which can be extended by the service implementation for customization pusposes:
 
 - `public async doInit(): Promise<this>;` Customize the `init` step of the component. This is generally the place where services are instanciated. From this step, you can retrieve services consumed by the current component which have been already initialized by the platform.
 - `public async doStart(): Promise<this>;` Customize the `start` step of the component. You have access to all other services which are already started.
 
 ```js
 // File src/services/notification/index.ts
-import { TwakeService } from "../../core/platform/framework";
+import { TdriveService } from "../../core/platform/framework";
 import NotificationServiceAPI from "./api.ts";
 import NotificationServiceImpl from "./services/api.ts";
 
-export default class NotificationService extends TwakeService<NotificationServiceAPI> {
+export default class NotificationService extends TdriveService<NotificationServiceAPI> {
   version = "1";
   name = "notification";
   service: NotificationServiceAPI;
@@ -166,12 +166,12 @@ export default class NotificationService extends TwakeService<NotificationServic
 6. Now that the service is fully created, we can consume it from any other service in the platform. To do this, we rely on Typescript decorators to define the links between components. For example, let's say that the a `MessageService` needs to call the `NotificationServiceAPI`, we can create the link with the help of the `@Consumes` decorator and get a reference to the `NotificationServiceAPI` by calling the `getProvider` on the component context like:
 
 ```js
-import { TwakeService, Consumes } from "../../core/platform/framework";
+import { TdriveService, Consumes } from "../../core/platform/framework";
 import MessageServiceAPI from "./providapier";
 import NotificationServiceAPI from "../notification/api";
 
 @Consumes(["notification"])
-export default class MessageService extends TwakeService<MessageServiceAPI> {
+export default class MessageService extends TdriveService<MessageServiceAPI> {
 
   public async doInit(): Promise<this> {
     const notificationService = this.context.getProvider<NotificationServiceAPI>("notification");
@@ -214,7 +214,7 @@ Then each service can have its own configuration block which is accessible from
 On the component class side, the configuration object is directly accessible from the `configuration` property like:
 
 ```js
-export default class WebSocket extends TwakeService<WebSocketAPI> {
+export default class WebSocket extends TdriveService<WebSocketAPI> {
   async doInit(): Promise<this> {
     // get the "path" value, defaults to "/socket" if not defined
     const path = this.configuration.get < string > ("path", "/socket");
@@ -232,7 +232,7 @@ interface AdaptersConfiguration {
 
 ### Platform
 
-The Twake Platform is built using the component framework described just before and so, is composed of several technical services on which business services can rely on to provide a micro-services based platform.
+The Tdrive Platform is built using the component framework described just before and so, is composed of several technical services on which business services can rely on to provide a micro-services based platform.
 
 The current chapter describes the technical services of the plaform, how to use them, how to build business services on top of them...
 
@@ -256,12 +256,12 @@ Supported databases are currently [MongoDB](https://www.mongodb.com/) and [Cassa
     "type": "cassandra",
     "mongodb": {
       "uri": "mongodb://localhost:27017",
-      "database": "twake"
+      "database": "tdrive"
     },
     "cassandra": {
       "contactPoints": ["localhost:9042"],
       "localDataCenter": "datacenter1",
-      "keyspace": "twake"
+      "keyspace": "tdrive"
     }
   }
 }
@@ -273,7 +273,7 @@ In the example above, the `type` is set to `cassandra`, so the `database.cassand
 
 In order to use Cassandra, we will have to:
 
-1. Create a keyspace. From the configuration above, the keyspace is `twake`
+1. Create a keyspace. From the configuration above, the keyspace is `tdrive`
 2. Create all the required tables
 
 To achieve these steps, you have to use [cqlsh](https://cassandra.apache.org/doc/latest/tools/cqlsh.html) from a terminal then:
@@ -281,13 +281,13 @@ To achieve these steps, you have to use [cqlsh](https://cassandra.apache.org/doc
 1. Create the keyspace:
 
 ```sh
-CREATE KEYSPACE twake WITH replication = {'class': 'NetworkTopologyStrategy', 'datacenter1': '2'} AND durable_writes = true;
+CREATE KEYSPACE tdrive WITH replication = {'class': 'NetworkTopologyStrategy', 'datacenter1': '2'} AND durable_writes = true;
 ```
 
 2. Create the required tables
 
 ```sh
-USE twake;
+USE tdrive;
 
 CREATE TABLE channels(company_id uuid, workspace_id uuid, id uuid, archivation_date date, archived boolean, channel_group text, description text, icon text, is_default boolean, name text, owner uuid, visibility text, PRIMARY KEY ((company_id, workspace_id), id));
 ```
@@ -391,7 +391,7 @@ Services annotated as described above automatically publish events to WebSockets
 ```js
 const io = require("socket.io-client");
 
-// Get a JWT token from the Twake API first
+// Get a JWT token from the Tdrive API first
 const token =
   "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJfaWQiOjEsImlhdCI6MTYwMzE5ODkzMn0.NvQoV9KeWuTNzRvzqbJ5uZCQ8Nmi2rCYQzcKk-WsJJ8";
 const socket = io.connect("http://localhost:3000", { path: "/socket" });
@@ -433,7 +433,7 @@ socket.on("connect", () => {
     .emit("authenticate", { token })
     .on("authenticated", () => {
       // join the /channels room
-      socket.emit("realtime:join", { name: "/channels", token: "twake" });
+      socket.emit("realtime:join", { name: "/channels", token: "tdrive" });
       socket.on("realtime:join:error", message => {
         // will fire when join does not provide a valid token
         console.log("Error on join", message);
@@ -514,7 +514,7 @@ socket.on("connect", () => {
     .emit("authenticate", { token })
     .on("authenticated", () => {
       // join the "/channels" room
-      socket.emit("realtime:join", { name: "/channels", token: "twake" });
+      socket.emit("realtime:join", { name: "/channels", token: "tdrive" });
 
       // will only occur when an action occured on a resource
       // and if and only if the client joined the room
diff --git a/twake/backend/node/config/default.json b/twake/backend/node/config/default.json
index 986258b2..27622995 100644
--- a/twake/backend/node/config/default.json
+++ b/twake/backend/node/config/default.json
@@ -2,11 +2,11 @@
   "general": {
     "help_url": false,
     "pricing_plan_url": "",
-    "app_download_url": "https://twake.app/download",
+    "app_download_url": "https://tdrive.app/download",
     "mobile": {
-      "mobile_redirect": "mobile.twake.app",
-      "mobile_appstore": "https://apps.apple.com/fr/app/twake/id1588764852?l=en",
-      "mobile_googleplay": "https://play.google.com/store/apps/details?id=com.twake.twake&gl=FR"
+      "mobile_redirect": "mobile.tdrive.app",
+      "mobile_appstore": "https://apps.apple.com/fr/app/tdrive/id1588764852?l=en",
+      "mobile_googleplay": "https://play.google.com/store/apps/details?id=com.tdrive.tdrive&gl=FR"
     },
     "app_grid": [
       {
@@ -15,9 +15,9 @@
         "url": "https://tmail.linagora.com/"
       },
       {
-        "name": "Twake",
-        "logo": "/public/img/grid/twake.png",
-        "url": "https://twake.app/"
+        "name": "Tdrive",
+        "logo": "/public/img/grid/tdrive.png",
+        "url": "https://tdrive.app/"
       }
     ],
     "accounts": {
@@ -28,14 +28,14 @@
       },
       "remote": {
         "authority": "http://auth.example.com/",
-        "client_id": "twakeweb",
+        "client_id": "tdriveweb",
         "client_secret": "",
         "issuer": "",
         "audience": "",
         "redirect_uris": [""],
-        "account_management_url": "http://web.twake-console.local/profile?company-code={company_id}",
-        "collaborators_management_url": "http://web.twake-console.local/compaies/{company_id}/users?company-code={company_id}",
-        "company_management_url": "http://web.twake-console.local/companies?company-code={company_id}"
+        "account_management_url": "http://web.tdrive-console.local/profile?company-code={company_id}",
+        "collaborators_management_url": "http://web.tdrive-console.local/compaies/{company_id}/users?company-code={company_id}",
+        "company_management_url": "http://web.tdrive-console.local/companies?company-code={company_id}"
       }
     }
   },
@@ -93,12 +93,12 @@
     "type": "cassandra",
     "mongodb": {
       "uri": "mongodb://mongo:27017",
-      "database": "twake"
+      "database": "tdrive"
     },
     "cassandra": {
       "contactPoints": ["scylladb:9042"],
       "localDataCenter": "datacenter1",
-      "keyspace": "twake",
+      "keyspace": "tdrive",
       "wait": false,
       "retries": 10,
       "delay": 200
@@ -151,7 +151,7 @@
   "email-pusher": {
     "endpoint": "https://api.smtp2go.com/v3/email/send",
     "api_key": "secret",
-    "sender": "noreply@twake.app"
+    "sender": "noreply@tdrive.app"
   },
   "services": [
     "auth",
@@ -168,15 +168,11 @@
     "tracker",
     "general",
     "user",
-    "applications-api",
-    "applications",
     "channels",
     "notifications",
-    "messages",
     "files",
     "workspaces",
     "console",
-    "previews",
     "counter",
     "statistics",
     "cron",
diff --git a/twake/backend/node/package-lock.json b/twake/backend/node/package-lock.json
index 7bc522c7..b0f67c4f 100644
--- a/twake/backend/node/package-lock.json
+++ b/twake/backend/node/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "@twake/twake-backend",
+  "name": "@tdrive/tdrive-backend",
   "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
diff --git a/twake/backend/node/package.json b/twake/backend/node/package.json
index ec5e3b36..2a448719 100644
--- a/twake/backend/node/package.json
+++ b/twake/backend/node/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "@twake/twake-backend",
+  "name": "@tdrive/tdrive-backend",
   "version": "1.0.0",
-  "description": "Twake backend",
+  "description": "Tdrive backend",
   "scripts": {
     "build": "npm run build:clean && npm run build:ts && npm run build:copy-assets",
     "build:ts": "tsc",
@@ -44,16 +44,16 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Twake/twake-backend.git"
+    "url": "git+https://github.com/Tdrive/tdrive-backend.git"
   },
-  "author": "Twake",
+  "author": "Tdrive",
   "license": "ISC",
   "bugs": {
-    "url": "https://github.com/Twake/twake-backend/issues"
+    "url": "https://github.com/Tdrive/tdrive-backend/issues"
   },
-  "homepage": "https://github.com/Twake/twake-backend#readme",
+  "homepage": "https://github.com/Tdrive/tdrive-backend#readme",
   "bin": {
-    "twake-cli": "bin/twake-cli"
+    "tdrive-cli": "bin/tdrive-cli"
   },
   "devDependencies": {
     "@babel/core": "^7.11.6",
diff --git a/twake/backend/node/public/index.html b/twake/backend/node/public/index.html
index f2d2dbd4..360441c3 100644
--- a/twake/backend/node/public/index.html
+++ b/twake/backend/node/public/index.html
@@ -1,4 +1,4 @@
-Twake frontend is not here, please do one of the following:<br/>
+Tdrive frontend is not here, please do one of the following:<br/>
 - use the nginx container as a separate process<br/>
 - attach the built frontend to this container and use the STATIC_ROOT env variable<br/>
 - use the production container
\ No newline at end of file
diff --git a/twake/backend/node/src/cli/cmds/applications.ts b/twake/backend/node/src/cli/cmds/applications.ts
index e7acd332..b389590d 100644
--- a/twake/backend/node/src/cli/cmds/applications.ts
+++ b/twake/backend/node/src/cli/cmds/applications.ts
@@ -1,7 +1,7 @@
 import { CommandModule } from "yargs";
 
 const command: CommandModule = {
-  describe: "Manage Twake Applications",
+  describe: "Manage Tdrive Applications",
   command: "applications <command>",
   builder: yargs =>
     yargs.commandDir("applications_cmds", {
diff --git a/twake/backend/node/src/cli/cmds/export.ts b/twake/backend/node/src/cli/cmds/export.ts
index 97f88aa6..37e12334 100644
--- a/twake/backend/node/src/cli/cmds/export.ts
+++ b/twake/backend/node/src/cli/cmds/export.ts
@@ -1,7 +1,7 @@
 import { CommandModule } from "yargs";
 
 const command: CommandModule = {
-  describe: "Export Twake data",
+  describe: "Export Tdrive data",
   command: "export <command>",
   builder: yargs =>
     yargs.commandDir("export_cmds", {
diff --git a/twake/backend/node/src/cli/cmds/export_cmds/export_company.ts b/twake/backend/node/src/cli/cmds/export_cmds/export_company.ts
index 8c8b26b2..6615a102 100644
--- a/twake/backend/node/src/cli/cmds/export_cmds/export_company.ts
+++ b/twake/backend/node/src/cli/cmds/export_cmds/export_company.ts
@@ -1,5 +1,5 @@
 import yargs from "yargs";
-import twake from "../../../twake";
+import tdrive from "../../../tdrive";
 import { mkdirSync, writeFileSync } from "fs";
 import { Pagination } from "../../../core/platform/framework/api/crud-service";
 import WorkspaceUser from "../../../services/workspaces/entities/workspace_user";
@@ -52,7 +52,7 @@ const command: yargs.CommandModule<unknown, CLIArgs> = {
     },
   },
   handler: async argv => {
-    const platform = await twake.run(services);
+    const platform = await tdrive.run(services);
     await gr.doInit(platform);
 
     const company = await gr.services.companies.getCompany({ id: argv.id });
diff --git a/twake/backend/node/src/cli/cmds/generate.ts b/twake/backend/node/src/cli/cmds/generate.ts
index c71ca84d..cea700d2 100644
--- a/twake/backend/node/src/cli/cmds/generate.ts
+++ b/twake/backend/node/src/cli/cmds/generate.ts
@@ -1,7 +1,7 @@
 import { CommandModule } from "yargs";
 
 const command: CommandModule = {
-  describe: "Generate Twake data",
+  describe: "Generate Tdrive data",
   command: "generate <command>",
   builder: yargs =>
     yargs.commandDir("generate_cmds", {
diff --git a/twake/backend/node/src/cli/cmds/generate_cmds/users-and-companies.ts b/twake/backend/node/src/cli/cmds/generate_cmds/users-and-companies.ts
index a4d1e77c..9865ec09 100644
--- a/twake/backend/node/src/cli/cmds/generate_cmds/users-and-companies.ts
+++ b/twake/backend/node/src/cli/cmds/generate_cmds/users-and-companies.ts
@@ -8,7 +8,7 @@ import Company, {
   getInstance as getCompanyInstance,
 } from "../../../services/user/entities/company";
 import CompanyUser from "../../../services/user/entities/company_user";
-import twake from "../../../twake";
+import tdrive from "../../../tdrive";
 import User, { getInstance as getUserInstance } from "../../../services/user/entities/user";
 import gr from "../../../services/global-resolver";
 
@@ -63,7 +63,7 @@ const command: yargs.CommandModule<{}, CLIArgs> = {
     const concurrentTasks = argv.concurrent;
     const nbUsersPerCompany = argv.user;
     const nbCompanies = argv.company;
-    const platform = await twake.run(services);
+    const platform = await tdrive.run(services);
     await gr.doInit(platform);
     const companies = getCompanies(nbCompanies);
     const createUser = async (userInCompany: {
@@ -114,8 +114,8 @@ const getCompanies = (size: number = 10): Company[] => {
   return [...Array(size).keys()].map(i =>
     getCompanyInstance({
       id: uuid(),
-      name: `twake${i}.app`,
-      displayName: `My Twake Company #${i}`,
+      name: `tdrive${i}.app`,
+      displayName: `My Tdrive Company #${i}`,
     }),
   );
 };
diff --git a/twake/backend/node/src/cli/cmds/search_cmds/index_all.ts b/twake/backend/node/src/cli/cmds/search_cmds/index_all.ts
index 54ee745c..4de1a6b2 100644
--- a/twake/backend/node/src/cli/cmds/search_cmds/index_all.ts
+++ b/twake/backend/node/src/cli/cmds/search_cmds/index_all.ts
@@ -1,7 +1,7 @@
 import yargs from "yargs";
-import twake from "../../../twake";
+import tdrive from "../../../tdrive";
 import ora from "ora";
-import { TwakePlatform } from "../../../core/platform/platform";
+import { TdrivePlatform } from "../../../core/platform/platform";
 import { DatabaseServiceAPI } from "../../../core/platform/services/database/api";
 import { Pagination } from "../../../core/platform/framework/api/crud-service";
 
@@ -21,7 +21,7 @@ class SearchIndexAll {
   database: DatabaseServiceAPI;
   search: SearchServiceAPI;
 
-  constructor(readonly platform: TwakePlatform) {
+  constructor(readonly platform: TdrivePlatform) {
     this.database = this.platform.getProvider<DatabaseServiceAPI>("database");
     this.search = this.platform.getProvider<SearchServiceAPI>("search");
   }
@@ -122,7 +122,7 @@ const command: yargs.CommandModule<unknown, unknown> = {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   handler: async argv => {
     const spinner = ora({ text: "Reindex repository - " }).start();
-    const platform = await twake.run(services);
+    const platform = await tdrive.run(services);
     await gr.doInit(platform);
     const migrator = new SearchIndexAll(platform);
 
diff --git a/twake/backend/node/src/cli/cmds/users.ts b/twake/backend/node/src/cli/cmds/users.ts
index 02fb151d..d92c61af 100644
--- a/twake/backend/node/src/cli/cmds/users.ts
+++ b/twake/backend/node/src/cli/cmds/users.ts
@@ -1,7 +1,7 @@
 import { CommandModule } from "yargs";
 
 const command: CommandModule = {
-  describe: "Manage Twake Users",
+  describe: "Manage Tdrive Users",
   command: "users <command>",
   builder: yargs =>
     yargs.commandDir("users_cmds", {
diff --git a/twake/backend/node/src/cli/cmds/users_cmds/remove.ts b/twake/backend/node/src/cli/cmds/users_cmds/remove.ts
index f9304309..3ab9afab 100644
--- a/twake/backend/node/src/cli/cmds/users_cmds/remove.ts
+++ b/twake/backend/node/src/cli/cmds/users_cmds/remove.ts
@@ -1,6 +1,6 @@
 import yargs from "yargs";
 import ora from "ora";
-import twake from "../../../twake";
+import tdrive from "../../../tdrive";
 import Table from "cli-table";
 import { exit } from "process";
 import gr from "../../../services/global-resolver";
@@ -49,7 +49,7 @@ const command: yargs.CommandModule<unknown, CLIArgs> = {
     });
     const spinner = ora({ text: "Retrieving user" }).start();
 
-    const platform = await twake.run(services);
+    const platform = await tdrive.run(services);
     await gr.doInit(platform);
 
     const user = await gr.services.users.get({ id: argv.id });
diff --git a/twake/backend/node/src/cli/cmds/workspace.ts b/twake/backend/node/src/cli/cmds/workspace.ts
index 9eb9bd8b..95686ec5 100644
--- a/twake/backend/node/src/cli/cmds/workspace.ts
+++ b/twake/backend/node/src/cli/cmds/workspace.ts
@@ -1,7 +1,7 @@
 import { CommandModule } from "yargs";
 
 const command: CommandModule = {
-  describe: "Manage Twake Workspaces",
+  describe: "Manage Tdrive Workspaces",
   command: "workspace <command>",
   builder: yargs =>
     yargs.commandDir("workspace_cmds", {
diff --git a/twake/backend/node/src/cli/cmds/workspace_cmds/list.ts b/twake/backend/node/src/cli/cmds/workspace_cmds/list.ts
index 910f1f4c..d11e9e18 100644
--- a/twake/backend/node/src/cli/cmds/workspace_cmds/list.ts
+++ b/twake/backend/node/src/cli/cmds/workspace_cmds/list.ts
@@ -1,7 +1,7 @@
 import yargs from "yargs";
 import ora from "ora";
 import Table from "cli-table";
-import twake from "../../../twake";
+import tdrive from "../../../tdrive";
 import gr from "../../../services/global-resolver";
 /**
  * Merge command parameters. Check the builder definition below for more details.
@@ -23,7 +23,7 @@ const services = [
 
 const command: yargs.CommandModule<ListParams, ListParams> = {
   command: "list",
-  describe: "List Twake workspaces",
+  describe: "List Tdrive workspaces",
   builder: {
     size: {
       default: "50",
@@ -33,8 +33,8 @@ const command: yargs.CommandModule<ListParams, ListParams> = {
   },
   handler: async argv => {
     const table = new Table({ head: ["ID", "Name"], colWidths: [40, 50] });
-    const spinner = ora({ text: "List Twake workspaces" }).start();
-    const platform = await twake.run(services);
+    const spinner = ora({ text: "List Tdrive workspaces" }).start();
+    const platform = await tdrive.run(services);
     await gr.doInit(platform);
     const workspaces = await gr.services.workspaces.list({ limitStr: argv.size });
 
diff --git a/twake/backend/node/src/cli/cmds/workspace_cmds/user.ts b/twake/backend/node/src/cli/cmds/workspace_cmds/user.ts
index bc5b139b..3388e5ff 100644
--- a/twake/backend/node/src/cli/cmds/workspace_cmds/user.ts
+++ b/twake/backend/node/src/cli/cmds/workspace_cmds/user.ts
@@ -1,7 +1,7 @@
 import yargs from "yargs";
 import ora from "ora";
 import Table from "cli-table";
-import twake from "../../../twake";
+import tdrive from "../../../tdrive";
 import gr from "../../../services/global-resolver";
 /**
  * Merge command parameters. Check the builder definition below for more details.
@@ -34,7 +34,7 @@ const command: yargs.CommandModule<ListParams, ListParams> = {
   handler: async argv => {
     const table = new Table({ head: ["user ID", "Date Added"], colWidths: [40, 40] });
     const spinner = ora({ text: "Retrieving workspace users" }).start();
-    const platform = await twake.run(services);
+    const platform = await tdrive.run(services);
     await gr.doInit(platform);
     const users = await gr.services.workspaces.getUsers({ workspaceId: argv.id });
 
diff --git a/twake/backend/node/src/cli/index.ts b/twake/backend/node/src/cli/index.ts
index c1350f05..848b708b 100644
--- a/twake/backend/node/src/cli/index.ts
+++ b/twake/backend/node/src/cli/index.ts
@@ -24,5 +24,5 @@ yargs
   .alias("help", "h")
   .help("help")
   .version()
-  .epilogue("for more information, go to https://twake.app")
+  .epilogue("for more information, go to https://tdrive.app")
   .example("$0 <command> --help", "show help of the issue command").argv;
diff --git a/twake/backend/node/src/cli/utils/copy-cluster/index.js b/twake/backend/node/src/cli/utils/copy-cluster/index.js
index e478433c..1c4d5716 100644
--- a/twake/backend/node/src/cli/utils/copy-cluster/index.js
+++ b/twake/backend/node/src/cli/utils/copy-cluster/index.js
@@ -3,18 +3,18 @@ var cassandra = require("cassandra-driver");
 
 var fromAuthProvider = new cassandra.auth.PlainTextAuthProvider("", "");
 var fromContactPoints = [""];
-var fromKeyspace = "twake";
+var fromKeyspace = "tdrive";
 
 var toAuthProvider = new cassandra.auth.PlainTextAuthProvider("", "");
 var toContactPoints = [""];
-var toKeyspace = "twake";
+var toKeyspace = "tdrive";
 
 var forceUpdateAll = false;
 var ignoreTables = ["notification"];
 var countersTables = ["statistics", "stats_counter", "channel_counters", "scheduled_queue_counter"];
 
 var specialConversions = {
-  "twake.group_user.date_added": value => {
+  "tdrive.group_user.date_added": value => {
     return new Date(value).getTime();
   },
 };
diff --git a/twake/backend/node/src/cli/utils/copy-messages/index.js b/twake/backend/node/src/cli/utils/copy-messages/index.js
index ddaf0d75..e9edf081 100644
--- a/twake/backend/node/src/cli/utils/copy-messages/index.js
+++ b/twake/backend/node/src/cli/utils/copy-messages/index.js
@@ -13,14 +13,14 @@ var fromClient = new cassandra.Client({
   localDataCenter: "datacenter1",
   contactPoints: fromContactPoints,
   authProvider: fromAuthProvider,
-  keyspace: "twake",
+  keyspace: "tdrive",
 });
 
 var toClient = new cassandra.Client({
   localDataCenter: "datacenter1",
   contactPoints: toContactPoints,
   authProvider: toAuthProvider,
-  keyspace: "twake",
+  keyspace: "tdrive",
   queryOptions: {
     consistency: cassandra.types.consistencies.quorum,
   },
@@ -48,7 +48,7 @@ let copiedThreads = 0;
 (async () => {
   await new Promise(r => {
     fromClient.eachRow(
-      "SELECT id from twake.threads",
+      "SELECT id from tdrive.threads",
       [],
       { prepare: true, fetchSize: 50 },
       async function (n, row) {
@@ -60,7 +60,7 @@ let copiedThreads = 0;
 
         await new Promise(r2 => {
           fromClient.eachRow(
-            "SELECT JSON * from twake.messages where thread_id = ? order by id desc",
+            "SELECT JSON * from tdrive.messages where thread_id = ? order by id desc",
             [threadId],
             { prepare: true, fetchSize: 1000 },
             async function (n, row) {
@@ -69,7 +69,7 @@ let copiedThreads = 0;
               copiedMessages++;
 
               await toClient.execute(
-                "INSERT INTO twake.messages JSON '" + message.replace(/'/g, "'$&") + "'",
+                "INSERT INTO tdrive.messages JSON '" + message.replace(/'/g, "'$&") + "'",
                 [],
                 { prepare: true },
               );
diff --git a/twake/backend/node/src/cli/utils/copy-table/index.js b/twake/backend/node/src/cli/utils/copy-table/index.js
index 112abdae..50ed0db1 100644
--- a/twake/backend/node/src/cli/utils/copy-table/index.js
+++ b/twake/backend/node/src/cli/utils/copy-table/index.js
@@ -10,7 +10,7 @@ var client = new cassandra.Client({
   localDataCenter: "datacenter1",
   contactPoints: contactPoints,
   authProvider: authProvider,
-  keyspace: "twake",
+  keyspace: "tdrive",
 });
 
 //Copy object to other table
diff --git a/twake/backend/node/src/cli/utils/repair-threads/index.js b/twake/backend/node/src/cli/utils/repair-threads/index.js
index 87a00d5a..7eeb9a4d 100644
--- a/twake/backend/node/src/cli/utils/repair-threads/index.js
+++ b/twake/backend/node/src/cli/utils/repair-threads/index.js
@@ -8,7 +8,7 @@ var client = new cassandra.Client({
   localDataCenter: "datacenter1",
   contactPoints: contactPoints,
   authProvider: authProvider,
-  keyspace: "twake",
+  keyspace: "tdrive",
 });
 
 var threadsTable = "threads";
diff --git a/twake/backend/node/src/core/crypto/legacy.ts b/twake/backend/node/src/core/crypto/legacy.ts
index f18479e0..96718875 100644
--- a/twake/backend/node/src/core/crypto/legacy.ts
+++ b/twake/backend/node/src/core/crypto/legacy.ts
@@ -2,7 +2,6 @@ import { createDecipheriv } from "crypto";
 import { CryptoResult } from ".";
 
 const PREFIX = "encrypted_";
-const DEFAULT_IV = "twake_constantiv";
 
 export default {
   decrypt,
@@ -25,9 +24,10 @@ function decrypt(data: string, encryptionKey: string): CryptoResult {
   const salt = encryptedArray[1]
     ? Buffer.from(encryptedArray[1], "utf-8")
     : Buffer.from("", "utf-8");
-  const iv = encryptedArray[2]
-    ? Buffer.from(encryptedArray[2], "base64")
-    : Buffer.from(DEFAULT_IV, "utf-8");
+  const iv =
+    encryptedArray.length >= 3
+      ? Buffer.from(encryptedArray[2], "base64")
+      : Buffer.from("twake_constantiv", "utf-8");
   const password = Buffer.concat([Buffer.from(encryptionKey, "hex"), salt], 32);
   const decipher = createDecipheriv("AES-256-CBC", password, iv);
 
diff --git a/twake/backend/node/src/core/platform/framework/api/application-configuration.ts b/twake/backend/node/src/core/platform/framework/api/application-configuration.ts
index ae678c5f..cd9453c3 100644
--- a/twake/backend/node/src/core/platform/framework/api/application-configuration.ts
+++ b/twake/backend/node/src/core/platform/framework/api/application-configuration.ts
@@ -1,7 +1,7 @@
-import { TwakeServiceOptions } from "./service-options";
-import { TwakeServiceConfiguration } from "./service-configuration";
+import { TdriveServiceOptions } from "./service-options";
+import { TdriveServiceConfiguration } from "./service-configuration";
 
-export class TwakeAppConfiguration extends TwakeServiceOptions<TwakeServiceConfiguration> {
+export class TdriveAppConfiguration extends TdriveServiceOptions<TdriveServiceConfiguration> {
   services: Array<string>;
   servicesPath: string;
 }
diff --git a/twake/backend/node/src/core/platform/framework/api/component.ts b/twake/backend/node/src/core/platform/framework/api/component.ts
index 7a982410..dfa12085 100644
--- a/twake/backend/node/src/core/platform/framework/api/component.ts
+++ b/twake/backend/node/src/core/platform/framework/api/component.ts
@@ -1,13 +1,13 @@
 import { BehaviorSubject } from "rxjs";
-import { TwakeService } from "./service";
-import { TwakeServiceProvider } from "./service-provider";
+import { TdriveService } from "./service";
+import { TdriveServiceProvider } from "./service-provider";
 import { ServiceDefinition } from "./service-definition";
-import { TwakeServiceState } from "./service-state";
+import { TdriveServiceState } from "./service-state";
 import { logger } from "../logger";
 
-export class TwakeComponent {
-  instance: TwakeService<TwakeServiceProvider>;
-  components: Array<TwakeComponent> = new Array<TwakeComponent>();
+export class TdriveComponent {
+  instance: TdriveService<TdriveServiceProvider>;
+  components: Array<TdriveComponent> = new Array<TdriveComponent>();
 
   constructor(public name: string, private serviceDefinition: ServiceDefinition) {}
 
@@ -15,15 +15,15 @@ export class TwakeComponent {
     return this.serviceDefinition;
   }
 
-  setServiceInstance(instance: TwakeService<TwakeServiceProvider>): void {
+  setServiceInstance(instance: TdriveService<TdriveServiceProvider>): void {
     this.instance = instance;
   }
 
-  getServiceInstance(): TwakeService<TwakeServiceProvider> {
+  getServiceInstance(): TdriveService<TdriveServiceProvider> {
     return this.instance;
   }
 
-  addDependency(component: TwakeComponent): void {
+  addDependency(component: TdriveComponent): void {
     this.components.push(component);
   }
 
@@ -34,7 +34,7 @@ export class TwakeComponent {
   }
 
   async switchToState(
-    state: TwakeServiceState.Initialized | TwakeServiceState.Started | TwakeServiceState.Stopped,
+    state: TdriveServiceState.Initialized | TdriveServiceState.Started | TdriveServiceState.Stopped,
     recursionDepth?: number,
   ): Promise<void> {
     if (recursionDepth > 10) {
@@ -42,7 +42,7 @@ export class TwakeComponent {
       process.exit(1);
     }
 
-    const states: BehaviorSubject<TwakeServiceState>[] = this.components.map(
+    const states: BehaviorSubject<TdriveServiceState>[] = this.components.map(
       component => component.instance.state,
     );
 
@@ -57,10 +57,10 @@ export class TwakeComponent {
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    async function _switchServiceToState(service: TwakeService<any>) {
-      state === TwakeServiceState.Initialized && (await service.init());
-      state === TwakeServiceState.Started && (await service.start());
-      state === TwakeServiceState.Stopped && (await service.stop());
+    async function _switchServiceToState(service: TdriveService<any>) {
+      state === TdriveServiceState.Initialized && (await service.init());
+      state === TdriveServiceState.Started && (await service.start());
+      state === TdriveServiceState.Stopped && (await service.stop());
     }
     await _switchServiceToState(this.instance);
   }
diff --git a/twake/backend/node/src/core/platform/framework/api/container.ts b/twake/backend/node/src/core/platform/framework/api/container.ts
index c374a9ee..ba340d2f 100644
--- a/twake/backend/node/src/core/platform/framework/api/container.ts
+++ b/twake/backend/node/src/core/platform/framework/api/container.ts
@@ -1,30 +1,30 @@
-import { TwakeAppConfiguration } from "./application-configuration";
-import { TwakeComponent } from "./component";
-import { TwakeContext } from "./context";
-import { TwakeServiceProvider } from "./service-provider";
-import { TwakeService } from "./service";
-import { TwakeServiceState } from "./service-state";
+import { TdriveAppConfiguration } from "./application-configuration";
+import { TdriveComponent } from "./component";
+import { TdriveContext } from "./context";
+import { TdriveServiceProvider } from "./service-provider";
+import { TdriveService } from "./service";
+import { TdriveServiceState } from "./service-state";
 import * as ComponentUtils from "../utils/component-utils";
 
 /**
  * A container contains components. It provides methods to manage and to retrieve them.
  */
-export abstract class TwakeContainer
-  extends TwakeService<TwakeServiceProvider>
-  implements TwakeContext
+export abstract class TdriveContainer
+  extends TdriveService<TdriveServiceProvider>
+  implements TdriveContext
 {
-  private components: Map<string, TwakeComponent>;
-  name = "TwakeContainer";
+  private components: Map<string, TdriveComponent>;
+  name = "TdriveContainer";
 
-  constructor(protected options?: TwakeAppConfiguration) {
+  constructor(protected options?: TdriveAppConfiguration) {
     super(options);
   }
 
-  abstract loadComponents(): Promise<Map<string, TwakeComponent>>;
+  abstract loadComponents(): Promise<Map<string, TdriveComponent>>;
 
-  abstract loadComponent(name: string): Promise<TwakeComponent>;
+  abstract loadComponent(name: string): Promise<TdriveComponent>;
 
-  getProvider<T extends TwakeServiceProvider>(name: string): T {
+  getProvider<T extends TdriveServiceProvider>(name: string): T {
     const service = this.components.get(name)?.getServiceInstance();
 
     if (!service) {
@@ -48,25 +48,25 @@ export abstract class TwakeContainer
   }
 
   protected async launchInit(): Promise<this> {
-    await this.switchToState(TwakeServiceState.Initialized);
+    await this.switchToState(TdriveServiceState.Initialized);
 
     return this;
   }
 
   async doStart(): Promise<this> {
-    await this.switchToState(TwakeServiceState.Started);
+    await this.switchToState(TdriveServiceState.Started);
 
     return this;
   }
 
   async doStop(): Promise<this> {
-    await this.switchToState(TwakeServiceState.Stopped);
+    await this.switchToState(TdriveServiceState.Stopped);
 
     return this;
   }
 
   protected async switchToState(
-    state: TwakeServiceState.Started | TwakeServiceState.Initialized | TwakeServiceState.Stopped,
+    state: TdriveServiceState.Started | TdriveServiceState.Initialized | TdriveServiceState.Stopped,
   ): Promise<void> {
     await ComponentUtils.switchComponentsToState(this.components, state);
   }
diff --git a/twake/backend/node/src/core/platform/framework/api/context.ts b/twake/backend/node/src/core/platform/framework/api/context.ts
index f9ac36e4..c26eb400 100644
--- a/twake/backend/node/src/core/platform/framework/api/context.ts
+++ b/twake/backend/node/src/core/platform/framework/api/context.ts
@@ -1,5 +1,5 @@
-import { TwakeServiceProvider } from "./service-provider";
+import { TdriveServiceProvider } from "./service-provider";
 
-export interface TwakeContext {
-  getProvider<T extends TwakeServiceProvider>(name: string): T;
+export interface TdriveContext {
+  getProvider<T extends TdriveServiceProvider>(name: string): T;
 }
diff --git a/twake/backend/node/src/core/platform/framework/api/lifecycle.ts b/twake/backend/node/src/core/platform/framework/api/lifecycle.ts
index eb938efe..6b9a0188 100644
--- a/twake/backend/node/src/core/platform/framework/api/lifecycle.ts
+++ b/twake/backend/node/src/core/platform/framework/api/lifecycle.ts
@@ -1,6 +1,6 @@
-import { TwakeContext } from "./context";
+import { TdriveContext } from "./context";
 
 export interface Initializable {
   // TODO: Flag to tell if a service which fails to initialize must break all
-  init?(context?: TwakeContext): Promise<this>;
+  init?(context?: TdriveContext): Promise<this>;
 }
diff --git a/twake/backend/node/src/core/platform/framework/api/service-configuration.ts b/twake/backend/node/src/core/platform/framework/api/service-configuration.ts
index 4cf6816b..c7285d8b 100644
--- a/twake/backend/node/src/core/platform/framework/api/service-configuration.ts
+++ b/twake/backend/node/src/core/platform/framework/api/service-configuration.ts
@@ -1,3 +1,3 @@
-export interface TwakeServiceConfiguration {
+export interface TdriveServiceConfiguration {
   get<T>(name?: string, defaultValue?: T): T;
 }
diff --git a/twake/backend/node/src/core/platform/framework/api/service-interface.ts b/twake/backend/node/src/core/platform/framework/api/service-interface.ts
index 4bec93b9..45dff4f8 100644
--- a/twake/backend/node/src/core/platform/framework/api/service-interface.ts
+++ b/twake/backend/node/src/core/platform/framework/api/service-interface.ts
@@ -1,6 +1,6 @@
-import { TwakeServiceProvider } from "./service-provider";
+import { TdriveServiceProvider } from "./service-provider";
 
-export interface TwakeServiceInterface<T extends TwakeServiceProvider> {
+export interface TdriveServiceInterface<T extends TdriveServiceProvider> {
   doInit(): Promise<this>;
   doStart(): Promise<this>;
   doStop(): Promise<this>;
diff --git a/twake/backend/node/src/core/platform/framework/api/service-options.ts b/twake/backend/node/src/core/platform/framework/api/service-options.ts
index 86bb44fd..e107735a 100644
--- a/twake/backend/node/src/core/platform/framework/api/service-options.ts
+++ b/twake/backend/node/src/core/platform/framework/api/service-options.ts
@@ -1,5 +1,5 @@
-export class TwakeServiceOptions<TwakeServiceConfiguration> {
+export class TdriveServiceOptions<TdriveServiceConfiguration> {
   name?: string;
   // TODO: configuration is abstract and comes from all others
-  configuration?: TwakeServiceConfiguration;
+  configuration?: TdriveServiceConfiguration;
 }
diff --git a/twake/backend/node/src/core/platform/framework/api/service-provider.ts b/twake/backend/node/src/core/platform/framework/api/service-provider.ts
index 5d247a91..0b48b970 100644
--- a/twake/backend/node/src/core/platform/framework/api/service-provider.ts
+++ b/twake/backend/node/src/core/platform/framework/api/service-provider.ts
@@ -1,3 +1,3 @@
-export interface TwakeServiceProvider {
+export interface TdriveServiceProvider {
   version: string;
 }
diff --git a/twake/backend/node/src/core/platform/framework/api/service-state.ts b/twake/backend/node/src/core/platform/framework/api/service-state.ts
index 35b9e9c1..26e5bdf7 100644
--- a/twake/backend/node/src/core/platform/framework/api/service-state.ts
+++ b/twake/backend/node/src/core/platform/framework/api/service-state.ts
@@ -1,4 +1,4 @@
-export enum TwakeServiceState {
+export enum TdriveServiceState {
   Ready = "READY",
   Initializing = "INITIALIZING",
   Initialized = "INITIALIZED",
diff --git a/twake/backend/node/src/core/platform/framework/api/service.ts b/twake/backend/node/src/core/platform/framework/api/service.ts
index 9e9ab643..801f0151 100644
--- a/twake/backend/node/src/core/platform/framework/api/service.ts
+++ b/twake/backend/node/src/core/platform/framework/api/service.ts
@@ -1,27 +1,27 @@
 import { BehaviorSubject } from "rxjs";
-import { TwakeServiceInterface } from "./service-interface";
-import { TwakeServiceProvider } from "./service-provider";
-import { TwakeServiceState } from "./service-state";
-import { TwakeServiceConfiguration } from "./service-configuration";
-import { TwakeContext } from "./context";
-import { TwakeServiceOptions } from "./service-options";
+import { TdriveServiceInterface } from "./service-interface";
+import { TdriveServiceProvider } from "./service-provider";
+import { TdriveServiceState } from "./service-state";
+import { TdriveServiceConfiguration } from "./service-configuration";
+import { TdriveContext } from "./context";
+import { TdriveServiceOptions } from "./service-options";
 import { CONSUMES_METADATA, PREFIX_METADATA } from "./constants";
 import { getLogger, logger } from "../logger";
-import { TwakeLogger } from "..";
+import { TdriveLogger } from "..";
 
 const pendingServices: any = {};
 
-export abstract class TwakeService<T extends TwakeServiceProvider>
-  implements TwakeServiceInterface<TwakeServiceProvider>
+export abstract class TdriveService<T extends TdriveServiceProvider>
+  implements TdriveServiceInterface<TdriveServiceProvider>
 {
-  state: BehaviorSubject<TwakeServiceState>;
+  state: BehaviorSubject<TdriveServiceState>;
   readonly name: string;
-  protected readonly configuration: TwakeServiceConfiguration;
-  context: TwakeContext;
-  logger: TwakeLogger;
+  protected readonly configuration: TdriveServiceConfiguration;
+  context: TdriveContext;
+  logger: TdriveLogger;
 
-  constructor(protected options?: TwakeServiceOptions<TwakeServiceConfiguration>) {
-    this.state = new BehaviorSubject<TwakeServiceState>(TwakeServiceState.Ready);
+  constructor(protected options?: TdriveServiceOptions<TdriveServiceConfiguration>) {
+    this.state = new BehaviorSubject<TdriveServiceState>(TdriveServiceState.Ready);
     // REMOVE ME, we should import config from framework folder instead
     this.configuration = options?.configuration;
     this.logger = getLogger(`core.platform.services.${this.name}Service`);
@@ -38,7 +38,7 @@ export abstract class TwakeService<T extends TwakeServiceProvider>
   }
 
   async init(): Promise<this> {
-    if (this.state.value !== TwakeServiceState.Ready) {
+    if (this.state.value !== TdriveServiceState.Ready) {
       logger.info("Service %s is already initialized", this.name);
       return this;
     }
@@ -46,9 +46,9 @@ export abstract class TwakeService<T extends TwakeServiceProvider>
     try {
       logger.info("Initializing service %s", this.name);
       pendingServices[this.name] = true;
-      this.state.next(TwakeServiceState.Initializing);
+      this.state.next(TdriveServiceState.Initializing);
       await this.doInit();
-      this.state.next(TwakeServiceState.Initialized);
+      this.state.next(TdriveServiceState.Initialized);
       logger.info("Service %s is initialized", this.name);
       delete pendingServices[this.name];
       logger.info("Pending services: %s", JSON.stringify(Object.keys(pendingServices)));
@@ -72,8 +72,8 @@ export abstract class TwakeService<T extends TwakeServiceProvider>
 
   async start(): Promise<this> {
     if (
-      this.state.value === TwakeServiceState.Starting ||
-      this.state.value === TwakeServiceState.Started
+      this.state.value === TdriveServiceState.Starting ||
+      this.state.value === TdriveServiceState.Started
     ) {
       logger.info("Service %s is already started", this.name);
       return this;
@@ -81,9 +81,9 @@ export abstract class TwakeService<T extends TwakeServiceProvider>
 
     try {
       logger.info("Starting service %s", this.name);
-      this.state.next(TwakeServiceState.Starting);
+      this.state.next(TdriveServiceState.Starting);
       await this.doStart();
-      this.state.next(TwakeServiceState.Started);
+      this.state.next(TdriveServiceState.Started);
       logger.info("Service %s is started", this.name);
 
       return this;
@@ -98,23 +98,23 @@ export abstract class TwakeService<T extends TwakeServiceProvider>
 
   async stop(): Promise<this> {
     if (
-      this.state.value === TwakeServiceState.Stopping ||
-      this.state.value === TwakeServiceState.Stopped
+      this.state.value === TdriveServiceState.Stopping ||
+      this.state.value === TdriveServiceState.Stopped
     ) {
       logger.info("Service %s is already stopped", this.name);
       return this;
     }
 
-    if (this.state.value !== TwakeServiceState.Started) {
+    if (this.state.value !== TdriveServiceState.Started) {
       logger.info("Service %s can not be stopped until started", this.name);
       return this;
     }
 
     try {
       logger.info("Stopping service %s", this.name);
-      this.state.next(TwakeServiceState.Stopping);
+      this.state.next(TdriveServiceState.Stopping);
       await this.doStop();
-      this.state.next(TwakeServiceState.Stopped);
+      this.state.next(TdriveServiceState.Stopped);
       logger.info("Service %s is stopped", this.name);
 
       return this;
diff --git a/twake/backend/node/src/core/platform/framework/configuration.ts b/twake/backend/node/src/core/platform/framework/configuration.ts
index cf77e855..50fc4c3d 100644
--- a/twake/backend/node/src/core/platform/framework/configuration.ts
+++ b/twake/backend/node/src/core/platform/framework/configuration.ts
@@ -1,7 +1,7 @@
 import { IConfig } from "config";
 import configuration from "../../config";
-import { TwakeServiceConfiguration } from "./api";
-export class Configuration implements TwakeServiceConfiguration {
+import { TdriveServiceConfiguration } from "./api";
+export class Configuration implements TdriveServiceConfiguration {
   configuration: IConfig;
   serviceConfiguration: IConfig;
 
diff --git a/twake/backend/node/src/core/platform/framework/event-bus.ts b/twake/backend/node/src/core/platform/framework/event-bus.ts
index 361ea4ce..2b285832 100644
--- a/twake/backend/node/src/core/platform/framework/event-bus.ts
+++ b/twake/backend/node/src/core/platform/framework/event-bus.ts
@@ -3,7 +3,7 @@ import { logger as rootLogger } from "./logger";
 import { ExecutionContext } from "./api/crud-service";
 
 const logger = rootLogger.child({
-  component: "twake.core.platform.framework.event-bus",
+  component: "tdrive.core.platform.framework.event-bus",
 });
 
 /**
diff --git a/twake/backend/node/src/core/platform/framework/factory.ts b/twake/backend/node/src/core/platform/framework/factory.ts
index 315c13f8..c5e4ec00 100644
--- a/twake/backend/node/src/core/platform/framework/factory.ts
+++ b/twake/backend/node/src/core/platform/framework/factory.ts
@@ -1,18 +1,18 @@
 import {
-  TwakeContext,
-  TwakeService,
-  TwakeServiceConfiguration,
-  TwakeServiceOptions,
-  TwakeServiceProvider,
+  TdriveContext,
+  TdriveService,
+  TdriveServiceConfiguration,
+  TdriveServiceOptions,
+  TdriveServiceProvider,
 } from "./api";
 import { Configuration } from "./configuration";
 
-class StaticTwakeServiceFactory {
+class StaticTdriveServiceFactory {
   public async create<
-    T extends TwakeService<TwakeServiceProvider> = TwakeService<TwakeServiceProvider>,
+    T extends TdriveService<TdriveServiceProvider> = TdriveService<TdriveServiceProvider>,
   >(
-    module: { new (options?: TwakeServiceOptions<TwakeServiceConfiguration>): T },
-    context: TwakeContext,
+    module: { new (options?: TdriveServiceOptions<TdriveServiceConfiguration>): T },
+    context: TdriveContext,
     configuration?: string,
   ): Promise<T> {
     let config;
@@ -29,4 +29,4 @@ class StaticTwakeServiceFactory {
   }
 }
 
-export const TwakeServiceFactory = new StaticTwakeServiceFactory();
+export const TdriveServiceFactory = new StaticTdriveServiceFactory();
diff --git a/twake/backend/node/src/core/platform/framework/logger.ts b/twake/backend/node/src/core/platform/framework/logger.ts
index 8c0aa335..41faa757 100644
--- a/twake/backend/node/src/core/platform/framework/logger.ts
+++ b/twake/backend/node/src/core/platform/framework/logger.ts
@@ -3,19 +3,13 @@ import { Configuration } from "./configuration";
 
 const config = new Configuration("logger");
 
-export type TwakeLogger = pino.Logger;
+export type TdriveLogger = pino.Logger;
 
 export const logger = pino({
-  name: "TwakeApp",
+  name: "TdriveApp",
   level: config.get("level", "info") || "info",
-  prettyPrint:
-    process.env.NODE_ENV?.indexOf("test") > -1
-      ? {
-          translateTime: "HH:MM:ss Z",
-          ignore: "pid,hostname,name",
-        }
-      : false,
+  prettyPrint: false,
 });
 
-export const getLogger = (name?: string): TwakeLogger =>
-  logger.child({ name: `twake${name ? "." + name : ""}` });
+export const getLogger = (name?: string): TdriveLogger =>
+  logger.child({ name: `tdrive${name ? "." + name : ""}` });
diff --git a/twake/backend/node/src/core/platform/framework/utils/component-utils.ts b/twake/backend/node/src/core/platform/framework/utils/component-utils.ts
index f74697e6..99775cf9 100644
--- a/twake/backend/node/src/core/platform/framework/utils/component-utils.ts
+++ b/twake/backend/node/src/core/platform/framework/utils/component-utils.ts
@@ -1,15 +1,15 @@
 /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types */
 import {
   logger,
-  TwakeComponent,
-  TwakeContext,
-  TwakeServiceFactory,
-  TwakeServiceState,
+  TdriveComponent,
+  TdriveContext,
+  TdriveServiceFactory,
+  TdriveServiceState,
 } from "../index";
 import { Loader } from "./loader";
 
 export async function buildDependenciesTree(
-  components: Map<string, TwakeComponent>,
+  components: Map<string, TdriveComponent>,
   loadComponent: (name: string) => any,
 ): Promise<void> {
   for (const [name, component] of components) {
@@ -62,15 +62,15 @@ export async function buildDependenciesTree(
 export async function loadComponents(
   paths: string[],
   names: string[] = [],
-  context: TwakeContext,
-): Promise<Map<string, TwakeComponent>> {
-  const result = new Map<string, TwakeComponent>();
+  context: TdriveContext,
+): Promise<Map<string, TdriveComponent>> {
+  const result = new Map<string, TdriveComponent>();
   const loader = new Loader(paths);
 
-  const components: TwakeComponent[] = await Promise.all(
+  const components: TdriveComponent[] = await Promise.all(
     names.map(async name => {
       const clazz = await loader.load(name);
-      const component = new TwakeComponent(name, { clazz, name });
+      const component = new TdriveComponent(name, { clazz, name });
       result.set(name, component);
 
       return component;
@@ -79,7 +79,7 @@ export async function loadComponents(
 
   await Promise.all(
     components.map(async component => {
-      const service = await TwakeServiceFactory.create(
+      const service = await TdriveServiceFactory.create(
         component.getServiceDefinition().clazz,
         context,
         component.getServiceDefinition().name,
@@ -93,8 +93,8 @@ export async function loadComponents(
 }
 
 export async function switchComponentsToState(
-  components: Map<string, TwakeComponent>,
-  state: TwakeServiceState.Initialized | TwakeServiceState.Started | TwakeServiceState.Stopped,
+  components: Map<string, TdriveComponent>,
+  state: TdriveServiceState.Initialized | TdriveServiceState.Started | TdriveServiceState.Stopped,
 ): Promise<void> {
   const states = [];
 
diff --git a/twake/backend/node/src/core/platform/platform.ts b/twake/backend/node/src/core/platform/platform.ts
index 689703f1..02467239 100644
--- a/twake/backend/node/src/core/platform/platform.ts
+++ b/twake/backend/node/src/core/platform/platform.ts
@@ -1,17 +1,17 @@
-import { TwakeContainer, TwakeServiceProvider, TwakeComponent } from "./framework";
+import { TdriveContainer, TdriveServiceProvider, TdriveComponent } from "./framework";
 import * as ComponentUtils from "./framework/utils/component-utils";
 import path from "path";
 
-export class TwakePlatform extends TwakeContainer {
-  constructor(protected options: TwakePlatformConfiguration) {
+export class TdrivePlatform extends TdriveContainer {
+  constructor(protected options: TdrivePlatformConfiguration) {
     super();
   }
 
-  api(): TwakeServiceProvider {
+  api(): TdriveServiceProvider {
     return null;
   }
 
-  async loadComponents(): Promise<Map<string, TwakeComponent>> {
+  async loadComponents(): Promise<Map<string, TdriveComponent>> {
     return await ComponentUtils.loadComponents(
       [this.options.servicesPath, path.resolve(__dirname, "./services/")],
       this.options.services,
@@ -21,7 +21,7 @@ export class TwakePlatform extends TwakeContainer {
     );
   }
 
-  async loadComponent(name: string): Promise<TwakeComponent> {
+  async loadComponent(name: string): Promise<TdriveComponent> {
     return (
       await ComponentUtils.loadComponents(
         [this.options.servicesPath, path.resolve(__dirname, "./services/")],
@@ -34,7 +34,7 @@ export class TwakePlatform extends TwakeContainer {
   }
 }
 
-export class TwakePlatformConfiguration {
+export class TdrivePlatformConfiguration {
   /**
    * The services to load in the container
    */
diff --git a/twake/backend/node/src/core/platform/services/auth/index.ts b/twake/backend/node/src/core/platform/services/auth/index.ts
index a1f0c028..e21fd8a9 100644
--- a/twake/backend/node/src/core/platform/services/auth/index.ts
+++ b/twake/backend/node/src/core/platform/services/auth/index.ts
@@ -1,4 +1,4 @@
-import { TwakeService, Consumes, Prefix, ServiceName } from "../../framework";
+import { TdriveService, Consumes, Prefix, ServiceName } from "../../framework";
 import web from "./web/index";
 import AuthServiceAPI, { JwtConfiguration } from "./provider";
 import { AuthService as AuthServiceImpl } from "./service";
@@ -7,7 +7,7 @@ import WebServerAPI from "../webserver/provider";
 @Prefix("/api/auth")
 @Consumes(["webserver"])
 @ServiceName("auth")
-export default class AuthService extends TwakeService<AuthServiceAPI> {
+export default class AuthService extends TdriveService<AuthServiceAPI> {
   name = "auth";
   service: AuthServiceAPI;
 
diff --git a/twake/backend/node/src/core/platform/services/auth/provider.ts b/twake/backend/node/src/core/platform/services/auth/provider.ts
index 264430d1..6dc4b902 100644
--- a/twake/backend/node/src/core/platform/services/auth/provider.ts
+++ b/twake/backend/node/src/core/platform/services/auth/provider.ts
@@ -1,7 +1,7 @@
-import { TwakeServiceProvider } from "../../framework/api";
+import { TdriveServiceProvider } from "../../framework/api";
 import { AccessToken, JWTObject, uuid } from "../../../../utils/types";
 
-export default interface AuthServiceAPI extends TwakeServiceProvider {
+export default interface AuthServiceAPI extends TdriveServiceProvider {
   /**
    * Get the authentication types
    */
diff --git a/twake/backend/node/src/core/platform/services/counter/index.ts b/twake/backend/node/src/core/platform/services/counter/index.ts
index 3e14ec8d..62446556 100644
--- a/twake/backend/node/src/core/platform/services/counter/index.ts
+++ b/twake/backend/node/src/core/platform/services/counter/index.ts
@@ -1,9 +1,9 @@
-import { TwakeService } from "../../framework";
+import { TdriveService } from "../../framework";
 import { CounterProvider } from "./provider";
 import { CounterAPI } from "./types";
 import Repository from "../database/services/orm/repository/repository";
 
-export default class CounterService extends TwakeService<CounterAPI> implements CounterAPI {
+export default class CounterService extends TdriveService<CounterAPI> implements CounterAPI {
   name = "counter";
   version = "1";
 
diff --git a/twake/backend/node/src/core/platform/services/counter/types.ts b/twake/backend/node/src/core/platform/services/counter/types.ts
index c3b83ff6..7eaacfb5 100644
--- a/twake/backend/node/src/core/platform/services/counter/types.ts
+++ b/twake/backend/node/src/core/platform/services/counter/types.ts
@@ -1,7 +1,7 @@
-import { TwakeServiceProvider } from "../../framework";
+import { TdriveServiceProvider } from "../../framework";
 import Repository from "../database/services/orm/repository/repository";
 import { CounterProvider } from "./provider";
 
-export interface CounterAPI extends TwakeServiceProvider {
+export interface CounterAPI extends TdriveServiceProvider {
   getCounter<T>(repository: Repository<T>): CounterProvider<T>;
 }
diff --git a/twake/backend/node/src/core/platform/services/cron/api.ts b/twake/backend/node/src/core/platform/services/cron/api.ts
index 2d495b77..9df091c1 100644
--- a/twake/backend/node/src/core/platform/services/cron/api.ts
+++ b/twake/backend/node/src/core/platform/services/cron/api.ts
@@ -1,5 +1,5 @@
 import { ScheduledTask } from "node-cron";
-import { TwakeServiceProvider } from "../../framework";
+import { TdriveServiceProvider } from "../../framework";
 
 export type CronJob = () => void;
 
@@ -18,7 +18,7 @@ export type CronTask = {
   stop: () => void;
 };
 
-export interface CronAPI extends TwakeServiceProvider {
+export interface CronAPI extends TdriveServiceProvider {
   /**
    * Schedule a Job
    *
diff --git a/twake/backend/node/src/core/platform/services/cron/index.ts b/twake/backend/node/src/core/platform/services/cron/index.ts
index b2e09283..ee120f80 100644
--- a/twake/backend/node/src/core/platform/services/cron/index.ts
+++ b/twake/backend/node/src/core/platform/services/cron/index.ts
@@ -1,10 +1,10 @@
 import * as cron from "node-cron";
 import uuid from "node-uuid";
 
-import { TwakeService } from "../../framework";
+import { TdriveService } from "../../framework";
 import { CronAPI, CronJob, CronExpression, CronTask } from "./api";
 
-export default class CronService extends TwakeService<CronAPI> implements CronAPI {
+export default class CronService extends TdriveService<CronAPI> implements CronAPI {
   name = "cron";
   version = "1";
   private tasks = new Array<CronTask>();
diff --git a/twake/backend/node/src/core/platform/services/database/api.ts b/twake/backend/node/src/core/platform/services/database/api.ts
index b5312f70..105ce97d 100644
--- a/twake/backend/node/src/core/platform/services/database/api.ts
+++ b/twake/backend/node/src/core/platform/services/database/api.ts
@@ -1,10 +1,10 @@
-import { TwakeServiceProvider } from "../../framework";
+import { TdriveServiceProvider } from "../../framework";
 import { Connector } from "./services/orm/connectors";
 import Manager from "./services/orm/manager";
 import Repository from "./services/orm/repository/repository";
 import { EntityTarget } from "./services/orm/types";
 
-export interface DatabaseServiceAPI extends TwakeServiceProvider {
+export interface DatabaseServiceAPI extends TdriveServiceProvider {
   /**
    * Get the database connector
    */
diff --git a/twake/backend/node/src/core/platform/services/database/index.ts b/twake/backend/node/src/core/platform/services/database/index.ts
index a2ec8261..2f662c24 100644
--- a/twake/backend/node/src/core/platform/services/database/index.ts
+++ b/twake/backend/node/src/core/platform/services/database/index.ts
@@ -1,11 +1,11 @@
-import { TwakeService, logger, ServiceName } from "../../framework";
+import { TdriveService, logger, ServiceName } from "../../framework";
 import { DatabaseServiceAPI } from "./api";
 import DatabaseService from "./services";
 import { DatabaseType } from "./services";
 import { ConnectionOptions } from "./services/orm/connectors";
 
 @ServiceName("database")
-export default class Database extends TwakeService<DatabaseServiceAPI> {
+export default class Database extends TdriveService<DatabaseServiceAPI> {
   version = "1";
   name = "database";
   service: DatabaseService;
diff --git a/twake/backend/node/src/core/platform/services/database/services/orm/connectors/cassandra/query-builder.ts b/twake/backend/node/src/core/platform/services/database/services/orm/connectors/cassandra/query-builder.ts
index 192c1573..553cac5f 100644
--- a/twake/backend/node/src/core/platform/services/database/services/orm/connectors/cassandra/query-builder.ts
+++ b/twake/backend/node/src/core/platform/services/database/services/orm/connectors/cassandra/query-builder.ts
@@ -12,7 +12,7 @@ export function buildSelectQuery<Entity>(
     keyspace: string;
   } = {
     secret: "",
-    keyspace: "twake",
+    keyspace: "tdrive",
   },
 ): string {
   const instance = new (entityType as any)();
diff --git a/twake/backend/node/src/core/platform/services/database/services/orm/connectors/cassandra/typeTransforms.ts b/twake/backend/node/src/core/platform/services/database/services/orm/connectors/cassandra/typeTransforms.ts
index 230420c0..2213ef8d 100644
--- a/twake/backend/node/src/core/platform/services/database/services/orm/connectors/cassandra/typeTransforms.ts
+++ b/twake/backend/node/src/core/platform/services/database/services/orm/connectors/cassandra/typeTransforms.ts
@@ -19,9 +19,9 @@ export const cassandraType = {
   boolean: "BOOLEAN",
 
   // backward compatibility
-  twake_boolean: "TINYINT",
-  twake_int: "INT", //Depreciated
-  twake_datetime: "TIMESTAMP", //Depreciated
+  tdrive_boolean: "TINYINT",
+  tdrive_int: "INT", //Depreciated
+  tdrive_datetime: "TIMESTAMP", //Depreciated
 };
 
 type TransformOptions = {
@@ -36,14 +36,14 @@ export const transformValueToDbString = (
   type: ColumnType,
   options: TransformOptions = {},
 ): string => {
-  if (type === "twake_datetime") {
+  if (type === "tdrive_datetime") {
     if (isNaN(v) || isNull(v)) {
       return "null";
     }
     return `${v}`;
   }
 
-  if (type === "number" || type === "twake_int") {
+  if (type === "number" || type === "tdrive_int") {
     if (isNull(v)) {
       return "null";
     }
@@ -67,7 +67,7 @@ export const transformValueToDbString = (
     }
     return `${!!v}`;
   }
-  if (type === "twake_boolean") {
+  if (type === "tdrive_boolean") {
     if (!isBoolean(v)) {
       throw new Error(`'${v}' is not a ${type}`);
     }
@@ -111,7 +111,7 @@ export const transformValueFromDbString = (
 ): any => {
   logger.trace(`Transform value %o of type ${type}`, v);
 
-  if (type === "twake_datetime") {
+  if (type === "tdrive_datetime") {
     return new Date(`${v}`).getTime();
   }
 
@@ -146,7 +146,7 @@ export const transformValueFromDbString = (
     return decryptedValue;
   }
 
-  if (type === "twake_boolean" || type === "boolean") {
+  if (type === "tdrive_boolean" || type === "boolean") {
     return Boolean(v).valueOf();
   }
 
diff --git a/twake/backend/node/src/core/platform/services/database/services/orm/connectors/mongodb/query-builder.ts b/twake/backend/node/src/core/platform/services/database/services/orm/connectors/mongodb/query-builder.ts
index c99e103f..decb7391 100644
--- a/twake/backend/node/src/core/platform/services/database/services/orm/connectors/mongodb/query-builder.ts
+++ b/twake/backend/node/src/core/platform/services/database/services/orm/connectors/mongodb/query-builder.ts
@@ -12,7 +12,7 @@ export function buildSelectQuery<Entity>(
     keyspace: string;
   } = {
     secret: "",
-    keyspace: "twake",
+    keyspace: "tdrive",
   },
 ): any {
   const instance = new (entityType as any)();
diff --git a/twake/backend/node/src/core/platform/services/database/services/orm/connectors/mongodb/typeTransforms.ts b/twake/backend/node/src/core/platform/services/database/services/orm/connectors/mongodb/typeTransforms.ts
index 933039da..4b6c45df 100644
--- a/twake/backend/node/src/core/platform/services/database/services/orm/connectors/mongodb/typeTransforms.ts
+++ b/twake/backend/node/src/core/platform/services/database/services/orm/connectors/mongodb/typeTransforms.ts
@@ -54,7 +54,7 @@ export const transformValueToDbString = (
     return v;
   }
 
-  if (type === "twake_boolean") {
+  if (type === "tdrive_boolean") {
     return Boolean(v);
   }
 
@@ -91,7 +91,7 @@ export const transformValueFromDbString = (v: any, type: string, options: any =
       return null;
     }
   }
-  if (type === "twake_boolean" || type === "boolean") {
+  if (type === "tdrive_boolean" || type === "boolean") {
     return Boolean(v).valueOf();
   }
   if (type === "number") {
diff --git a/twake/backend/node/src/core/platform/services/database/services/orm/types.ts b/twake/backend/node/src/core/platform/services/database/services/orm/types.ts
index 6888dd8e..3d04efad 100644
--- a/twake/backend/node/src/core/platform/services/database/services/orm/types.ts
+++ b/twake/backend/node/src/core/platform/services/database/services/orm/types.ts
@@ -39,9 +39,9 @@ export type ColumnType =
   | "blob"
   | "boolean"
   // backward compatibility
-  | "twake_boolean"
-  | "twake_int"
-  | "twake_datetime";
+  | "tdrive_boolean"
+  | "tdrive_int"
+  | "tdrive_datetime";
 
 export type EntityTarget<Entity> = ObjectType<Entity>;
 
diff --git a/twake/backend/node/src/core/platform/services/database/services/orm/utils.ts b/twake/backend/node/src/core/platform/services/database/services/orm/utils.ts
index bf4db2ae..91abd369 100644
--- a/twake/backend/node/src/core/platform/services/database/services/orm/utils.ts
+++ b/twake/backend/node/src/core/platform/services/database/services/orm/utils.ts
@@ -41,7 +41,7 @@ export function secureOperators<Entity>(
     keyspace: string;
   } = {
     secret: "",
-    keyspace: "twake",
+    keyspace: "tdrive",
   },
 ): FindOptions {
   const instance = new (entityType as any)();
diff --git a/twake/backend/node/src/core/platform/services/email-pusher/index.ts b/twake/backend/node/src/core/platform/services/email-pusher/index.ts
index d47a594d..a6b61127 100644
--- a/twake/backend/node/src/core/platform/services/email-pusher/index.ts
+++ b/twake/backend/node/src/core/platform/services/email-pusher/index.ts
@@ -1,4 +1,4 @@
-import { getLogger, TwakeLogger, TwakeService } from "../../framework";
+import { getLogger, TdriveLogger, TdriveService } from "../../framework";
 import EmailPusherAPI from "./provider";
 import {
   EmailBuilderDataPayload,
@@ -15,12 +15,12 @@ import { existsSync } from "fs";
 import axios from "axios";
 
 export default class EmailPusherClass
-  extends TwakeService<EmailPusherAPI>
+  extends TdriveService<EmailPusherAPI>
   implements EmailPusherAPI
 {
   readonly name = "email-pusher";
   readonly version: "1.0.0";
-  logger: TwakeLogger = getLogger("email-pusher-service");
+  logger: TdriveLogger = getLogger("email-pusher-service");
   apiKey: string;
   apiUrl: string;
   sender: string;
diff --git a/twake/backend/node/src/core/platform/services/email-pusher/provider.ts b/twake/backend/node/src/core/platform/services/email-pusher/provider.ts
index fc6c5817..f81edd2e 100644
--- a/twake/backend/node/src/core/platform/services/email-pusher/provider.ts
+++ b/twake/backend/node/src/core/platform/services/email-pusher/provider.ts
@@ -1,4 +1,4 @@
-import { TwakeServiceProvider } from "../../framework";
+import { TdriveServiceProvider } from "../../framework";
 import {
   EmailBuilderDataPayload,
   EmailBuilderRenderedResult,
@@ -6,7 +6,7 @@ import {
   EmailPusherPayload,
 } from "./types";
 
-export default interface EmailPusherAPI extends TwakeServiceProvider {
+export default interface EmailPusherAPI extends TdriveServiceProvider {
   build(
     template: EmailBuilderTemplateName,
     language: string,
diff --git a/twake/backend/node/src/core/platform/services/email-pusher/templates/common/_title.eta b/twake/backend/node/src/core/platform/services/email-pusher/templates/common/_title.eta
index d1797518..2448daa6 100644
--- a/twake/backend/node/src/core/platform/services/email-pusher/templates/common/_title.eta
+++ b/twake/backend/node/src/core/platform/services/email-pusher/templates/common/_title.eta
@@ -32,7 +32,7 @@ role="presentation" style="vertical-align:top;" width="100%"
                 >
                 <div
                 style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"
-                ><span>romaric.mollard@gmail.com has invited you to use Twake 
+                ><span>romaric.mollard@gmail.com has invited you to use Tdrive 
                 on</span>
                 <span style="color: #007AFF">Crayon Company</span>.
                 </div>
diff --git a/twake/backend/node/src/core/platform/services/email-pusher/templates/en/_structure.eta b/twake/backend/node/src/core/platform/services/email-pusher/templates/en/_structure.eta
index 0695e651..d7e393cb 100644
--- a/twake/backend/node/src/core/platform/services/email-pusher/templates/en/_structure.eta
+++ b/twake/backend/node/src/core/platform/services/email-pusher/templates/en/_structure.eta
@@ -5,8 +5,8 @@
    privacy: "Privacy Policy",
    terms: "Terms of Service",
    links: {
-       help: "https://twake.app/",
-       privacy: "https://twake.app/en/privacy-policy/",
-       terms: "https://twake.app/en/terms-of-service/"
+       help: "https://tdrive.app/",
+       privacy: "https://tdrive.app/en/privacy-policy/",
+       terms: "https://tdrive.app/en/terms-of-service/"
    }
 })) %>
\ No newline at end of file
diff --git a/twake/backend/node/src/core/platform/services/email-pusher/templates/en/notification-digest.eta b/twake/backend/node/src/core/platform/services/email-pusher/templates/en/notification-digest.eta
index db7f25d9..8c74a8f4 100644
--- a/twake/backend/node/src/core/platform/services/email-pusher/templates/en/notification-digest.eta
+++ b/twake/backend/node/src/core/platform/services/email-pusher/templates/en/notification-digest.eta
@@ -34,8 +34,8 @@
   ),
   `
   <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;">
-    <a class="main-button" href="https://web.twake.app/">
-    ${it.notifications.length>1 ? `See all ${it.notifications.length} messages` : `See on Twake`}
+    <a class="main-button" href="https://web.tdrive.app/">
+    ${it.notifications.length>1 ? `See all ${it.notifications.length} messages` : `See on Tdrive`}
     </a>
   </div>
   `
diff --git a/twake/backend/node/src/core/platform/services/email-pusher/templates/en/notification-digest/notification.eta b/twake/backend/node/src/core/platform/services/email-pusher/templates/en/notification-digest/notification.eta
index bee47338..f8758e94 100644
--- a/twake/backend/node/src/core/platform/services/email-pusher/templates/en/notification-digest/notification.eta
+++ b/twake/backend/node/src/core/platform/services/email-pusher/templates/en/notification-digest/notification.eta
@@ -1,6 +1,6 @@
 <div style="margin-bottom:16px;display:flex;flex-direction:row;">
     <div style="width:60px;align-items:end;padding:0;display:flex">
-        <img style="width:48px;height:48px;border-radius:24px;" src="<%= it.message.user.picture || 'https://staging-web.twake.app/public/identicon/47.png' %>" alt="<%= it.message.user.first_name %>" />
+        <img style="width:48px;height:48px;border-radius:24px;" src="<%= it.message.user.picture || 'https://staging-web.tdrive.app/public/identicon/47.png' %>" alt="<%= it.message.user.first_name %>" />
     </div>
     <div style="flex:1;position:realtive;border-radius:18px;padding:0 12px;background:#F6F6F6;">
         <div style="padding:12px 0">
diff --git a/twake/backend/node/src/core/platform/services/email-pusher/templates/fr/_structure.eta b/twake/backend/node/src/core/platform/services/email-pusher/templates/fr/_structure.eta
index d0fa48b4..c6dc00dd 100644
--- a/twake/backend/node/src/core/platform/services/email-pusher/templates/fr/_structure.eta
+++ b/twake/backend/node/src/core/platform/services/email-pusher/templates/fr/_structure.eta
@@ -5,8 +5,8 @@
    privacy: "Confidentialité",
    terms: "CGU",
    links: {
-       help: "https://twake.app/",
-       privacy: "https://twake.app/fr/privacy-policy/",
-       terms: "https://twake.app/fr/terms-of-service/"
+       help: "https://tdrive.app/",
+       privacy: "https://tdrive.app/fr/privacy-policy/",
+       terms: "https://tdrive.app/fr/terms-of-service/"
    }
 })) %>
\ No newline at end of file
diff --git a/twake/backend/node/src/core/platform/services/email-pusher/templates/fr/notification-digest.eta b/twake/backend/node/src/core/platform/services/email-pusher/templates/fr/notification-digest.eta
index 00c4aea7..01b6a4e1 100644
--- a/twake/backend/node/src/core/platform/services/email-pusher/templates/fr/notification-digest.eta
+++ b/twake/backend/node/src/core/platform/services/email-pusher/templates/fr/notification-digest.eta
@@ -36,8 +36,8 @@
   ,
   `
   <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;">
-    <a class="main-button" href="https://web.twake.app/">
-    ${it.notifications.length>1 ? `Voir les ${it.notifications.length} messages` : `Voir sur Twake`}
+    <a class="main-button" href="https://web.tdrive.app/">
+    ${it.notifications.length>1 ? `Voir les ${it.notifications.length} messages` : `Voir sur Tdrive`}
     </a>
   </div>
   `
diff --git a/twake/backend/node/src/core/platform/services/email-pusher/templates/fr/notification-digest/notification.eta b/twake/backend/node/src/core/platform/services/email-pusher/templates/fr/notification-digest/notification.eta
index bee47338..f8758e94 100644
--- a/twake/backend/node/src/core/platform/services/email-pusher/templates/fr/notification-digest/notification.eta
+++ b/twake/backend/node/src/core/platform/services/email-pusher/templates/fr/notification-digest/notification.eta
@@ -1,6 +1,6 @@
 <div style="margin-bottom:16px;display:flex;flex-direction:row;">
     <div style="width:60px;align-items:end;padding:0;display:flex">
-        <img style="width:48px;height:48px;border-radius:24px;" src="<%= it.message.user.picture || 'https://staging-web.twake.app/public/identicon/47.png' %>" alt="<%= it.message.user.first_name %>" />
+        <img style="width:48px;height:48px;border-radius:24px;" src="<%= it.message.user.picture || 'https://staging-web.tdrive.app/public/identicon/47.png' %>" alt="<%= it.message.user.first_name %>" />
     </div>
     <div style="flex:1;position:realtive;border-radius:18px;padding:0 12px;background:#F6F6F6;">
         <div style="padding:12px 0">
diff --git a/twake/backend/node/src/core/platform/services/knowledge-graph/api-client.ts b/twake/backend/node/src/core/platform/services/knowledge-graph/api-client.ts
index f958655c..5734293e 100644
--- a/twake/backend/node/src/core/platform/services/knowledge-graph/api-client.ts
+++ b/twake/backend/node/src/core/platform/services/knowledge-graph/api-client.ts
@@ -8,13 +8,13 @@ import gr from "../../../../services/global-resolver";
 import Company from "../../../../services/user/entities/company";
 import User from "../../../../services/user/entities/user";
 import Workspace from "../../../../services/workspaces/entities/workspace";
-import { getLogger, TwakeLogger } from "../../framework";
+import { getLogger, TdriveLogger } from "../../framework";
 
 export default class KnowledgeGraphAPIClient {
   protected readonly version = "1.0.0";
   protected readonly axiosInstance: AxiosInstance = axios.create();
   readonly apiUrl: string;
-  readonly logger: TwakeLogger = getLogger("knowledge-graph-api-client");
+  readonly logger: TdriveLogger = getLogger("knowledge-graph-api-client");
 
   constructor(apiUrl: string) {
     this.apiUrl = apiUrl;
@@ -141,7 +141,7 @@ export default class KnowledgeGraphAPIClient {
   private async send(data: any) {
     return await this.axiosInstance.post<
       KnowledgeGraphCreateBodyRequest<KnowledgeGraphCreateMessageObjectData[]>
-    >(`${this.apiUrl}/topics/twake`, data, {
+    >(`${this.apiUrl}/topics/tdrive`, data, {
       headers: {
         "Content-Type": "application/vnd.kafka.json.v2+json",
         Accept: "application/vnd.kafka.v2+json",
diff --git a/twake/backend/node/src/core/platform/services/knowledge-graph/index.ts b/twake/backend/node/src/core/platform/services/knowledge-graph/index.ts
index 154a7611..579bbcf2 100644
--- a/twake/backend/node/src/core/platform/services/knowledge-graph/index.ts
+++ b/twake/backend/node/src/core/platform/services/knowledge-graph/index.ts
@@ -1,4 +1,4 @@
-import { Configuration, Consumes, getLogger, TwakeLogger, TwakeService } from "../../framework";
+import { Configuration, Consumes, getLogger, TdriveLogger, TdriveService } from "../../framework";
 import { localEventBus } from "../../framework/event-bus";
 import KnowledgeGraphAPI from "./provider";
 import Workspace from "../../../../services/workspaces/entities/workspace";
@@ -15,13 +15,13 @@ import gr from "../../../../services/global-resolver";
 
 @Consumes([])
 export default class KnowledgeGraphService
-  extends TwakeService<KnowledgeGraphAPI>
+  extends TdriveService<KnowledgeGraphAPI>
   implements KnowledgeGraphAPI
 {
   readonly name = "knowledge-graph";
   readonly version = "1.0.0";
   protected kgAPIClient: KnowledgeGraphAPIClient = this.getKnowledgeGraphApiClient();
-  logger: TwakeLogger = getLogger("knowledge-graph-service");
+  logger: TdriveLogger = getLogger("knowledge-graph-service");
 
   async doInit(): Promise<this> {
     const use = this.getConfigurationEntry<boolean>("use");
diff --git a/twake/backend/node/src/core/platform/services/knowledge-graph/provider.ts b/twake/backend/node/src/core/platform/services/knowledge-graph/provider.ts
index 46eecd0c..612fd0f9 100644
--- a/twake/backend/node/src/core/platform/services/knowledge-graph/provider.ts
+++ b/twake/backend/node/src/core/platform/services/knowledge-graph/provider.ts
@@ -1,11 +1,11 @@
 import Company from "../../../../services/user/entities/company";
 import { Channel } from "../../../../services/channels/entities";
-import { TwakeServiceProvider } from "../../framework";
+import { TdriveServiceProvider } from "../../framework";
 import { KnowledgeGraphGenericEventPayload } from "./types";
 import Workspace from "../../../../services/workspaces/entities/workspace";
 import User from "../../../../services/user/entities/user";
 
-export default interface KnowledgeGraphAPI extends TwakeServiceProvider {
+export default interface KnowledgeGraphAPI extends TdriveServiceProvider {
   onCompanyCreated(data: KnowledgeGraphGenericEventPayload<Company>): void;
   onWorkspaceCreated(data: KnowledgeGraphGenericEventPayload<Workspace>): void;
   onChannelCreated(data: KnowledgeGraphGenericEventPayload<Channel>): void;
diff --git a/twake/backend/node/src/core/platform/services/message-queue/amqp/index.ts b/twake/backend/node/src/core/platform/services/message-queue/amqp/index.ts
index 4c14a20d..dcc7e22f 100644
--- a/twake/backend/node/src/core/platform/services/message-queue/amqp/index.ts
+++ b/twake/backend/node/src/core/platform/services/message-queue/amqp/index.ts
@@ -12,7 +12,7 @@ import { AMQPMessageQueueManager } from "./manager";
 import { SkipCLI } from "../../../framework/decorators/skip";
 
 const logger = rootLogger.child({
-  component: "twake.core.platform.services.message-queue.amqp",
+  component: "tdrive.core.platform.services.message-queue.amqp",
 });
 
 export class AMQPMessageQueueService implements MessageQueueAdapter {
diff --git a/twake/backend/node/src/core/platform/services/message-queue/amqp/manager.ts b/twake/backend/node/src/core/platform/services/message-queue/amqp/manager.ts
index 276671a8..f17eb704 100644
--- a/twake/backend/node/src/core/platform/services/message-queue/amqp/manager.ts
+++ b/twake/backend/node/src/core/platform/services/message-queue/amqp/manager.ts
@@ -56,7 +56,7 @@ export class AMQPMessageQueueManager implements MessageQueueClientManager {
 
   private create(connection: AmqpConnectionManager): Promise<AmqpMessageQueueClient> {
     logger.info(`${LOG_PREFIX} Creating AMQP Channel`);
-    const channel = connection.createChannel({ name: "Twake" });
+    const channel = connection.createChannel({ name: "Tdrive" });
 
     channel.on("close", () => {
       logger.info(`${LOG_PREFIX} Channel is closed`);
diff --git a/twake/backend/node/src/core/platform/services/message-queue/api.ts b/twake/backend/node/src/core/platform/services/message-queue/api.ts
index 3df4475c..8eb68deb 100644
--- a/twake/backend/node/src/core/platform/services/message-queue/api.ts
+++ b/twake/backend/node/src/core/platform/services/message-queue/api.ts
@@ -1,6 +1,6 @@
 import { Subject } from "rxjs";
 import { v4 as uuidv4 } from "uuid";
-import { Initializable, logger, TwakeServiceProvider } from "../../framework";
+import { Initializable, logger, TdriveServiceProvider } from "../../framework";
 import { Processor } from "./processor";
 import { ExecutionContext } from "../../framework/api/crud-service";
 
@@ -60,7 +60,7 @@ export type MessageQueueSubscriptionOptions = {
 
 export type MessageQueueListener<T> = (message: IncomingMessageQueueMessage<T>) => void;
 
-export interface MessageQueueServiceAPI extends TwakeServiceProvider {
+export interface MessageQueueServiceAPI extends TdriveServiceProvider {
   /**
    * Publish a message to a given topic
    * @param topic The topic to publish the message to
diff --git a/twake/backend/node/src/core/platform/services/message-queue/factory.ts b/twake/backend/node/src/core/platform/services/message-queue/factory.ts
index fbf39f9a..46ef31c5 100644
--- a/twake/backend/node/src/core/platform/services/message-queue/factory.ts
+++ b/twake/backend/node/src/core/platform/services/message-queue/factory.ts
@@ -1,17 +1,17 @@
 import { MessageQueueAdapter, MessageQueueType } from "./api";
 import { AMQPMessageQueueService } from "./amqp";
 import { LocalMessageQueueService } from "./local";
-import { TwakeServiceConfiguration, logger as rootLogger } from "../../framework";
+import { TdriveServiceConfiguration, logger as rootLogger } from "../../framework";
 
 const logger = rootLogger.child({
-  component: "twake.core.platform.services.message-queue.factory",
+  component: "tdrive.core.platform.services.message-queue.factory",
 });
 
 const DEFAULT_AMQP_URL = "amqp://guest:guest@localhost:5672";
 const DEFAULT_ADAPTER = "amqp";
 
 export class MessageQueueAdapterFactory {
-  public create(configuration: TwakeServiceConfiguration): MessageQueueAdapter {
+  public create(configuration: TdriveServiceConfiguration): MessageQueueAdapter {
     const type: MessageQueueType = configuration.get<MessageQueueType>("type", DEFAULT_ADAPTER);
 
     logger.info("Building Adapter %o", type);
diff --git a/twake/backend/node/src/core/platform/services/message-queue/index.ts b/twake/backend/node/src/core/platform/services/message-queue/index.ts
index cb5393e3..b2baf214 100644
--- a/twake/backend/node/src/core/platform/services/message-queue/index.ts
+++ b/twake/backend/node/src/core/platform/services/message-queue/index.ts
@@ -1,4 +1,4 @@
-import { TwakeService, ServiceName, logger as rootLogger } from "../../framework";
+import { TdriveService, ServiceName, logger as rootLogger } from "../../framework";
 import {
   MessageQueueAdapter,
   MessageQueueListener,
@@ -13,10 +13,10 @@ import { SkipCLI } from "../../framework/decorators/skip";
 import config from "../../../../core/config";
 
 const logger = rootLogger.child({
-  component: "twake.core.platform.services.message-queue",
+  component: "tdrive.core.platform.services.message-queue",
 });
 @ServiceName("message-queue")
-export default class MessageQueue extends TwakeService<MessageQueueServiceAPI> {
+export default class MessageQueue extends TdriveService<MessageQueueServiceAPI> {
   version = "1";
   name = "message-queue";
   service: MessageQueueService;
diff --git a/twake/backend/node/src/core/platform/services/message-queue/local/index.ts b/twake/backend/node/src/core/platform/services/message-queue/local/index.ts
index 1eb4cdfd..fe67fa27 100644
--- a/twake/backend/node/src/core/platform/services/message-queue/local/index.ts
+++ b/twake/backend/node/src/core/platform/services/message-queue/local/index.ts
@@ -10,7 +10,7 @@ import {
 import MessageQueueProxy from "../proxy";
 
 const logger = rootLogger.child({
-  component: "twake.core.platform.services.message-queue.local",
+  component: "tdrive.core.platform.services.message-queue.local",
 });
 
 /**
diff --git a/twake/backend/node/src/core/platform/services/phpnode/index.ts b/twake/backend/node/src/core/platform/services/phpnode/index.ts
index ae5c098f..36eda3e6 100644
--- a/twake/backend/node/src/core/platform/services/phpnode/index.ts
+++ b/twake/backend/node/src/core/platform/services/phpnode/index.ts
@@ -10,7 +10,7 @@ import {
   ChannelParameters,
   CreateChannelBody,
 } from "../../../../services/channels/web/types";
-import { Consumes, TwakeService } from "../../framework";
+import { Consumes, TdriveService } from "../../framework";
 import WebServerAPI from "../webserver/provider";
 import WebSocketAPI from "../websocket/provider";
 import PhpNodeAPI from "./provider";
@@ -18,7 +18,7 @@ import { RealtimeServiceAPI } from "../realtime/api";
 import gr from "../../../../services/global-resolver";
 
 @Consumes(["webserver", "websocket", "user", "channels"])
-export default class PhpNodeService extends TwakeService<PhpNodeAPI> implements PhpNodeAPI {
+export default class PhpNodeService extends TdriveService<PhpNodeAPI> implements PhpNodeAPI {
   name = "phpnode";
   version = "1";
   private server: FastifyInstance<Server, IncomingMessage, ServerResponse>;
diff --git a/twake/backend/node/src/core/platform/services/phpnode/provider.ts b/twake/backend/node/src/core/platform/services/phpnode/provider.ts
index d9686c0a..1a8a2f7a 100644
--- a/twake/backend/node/src/core/platform/services/phpnode/provider.ts
+++ b/twake/backend/node/src/core/platform/services/phpnode/provider.ts
@@ -1,8 +1,8 @@
 import { FastifyInstance, FastifyRequest, RouteHandlerMethod } from "fastify";
 import { IncomingMessage, ServerResponse, Server } from "http";
-import { TwakeServiceProvider } from "../../framework";
+import { TdriveServiceProvider } from "../../framework";
 
-export default interface PhpNodeAPI extends TwakeServiceProvider {
+export default interface PhpNodeAPI extends TdriveServiceProvider {
   accessControl(
     request: FastifyRequest,
     server: FastifyInstance<Server, IncomingMessage, ServerResponse>,
diff --git a/twake/backend/node/src/core/platform/services/push/api.ts b/twake/backend/node/src/core/platform/services/push/api.ts
index 08d52134..ac69bbe2 100644
--- a/twake/backend/node/src/core/platform/services/push/api.ts
+++ b/twake/backend/node/src/core/platform/services/push/api.ts
@@ -1,7 +1,7 @@
-import { TwakeServiceProvider } from "../../framework";
+import { TdriveServiceProvider } from "../../framework";
 import { PushMessageNotification, PushMessageOptions } from "./types";
 
-export interface PushServiceAPI extends TwakeServiceProvider {
+export interface PushServiceAPI extends TdriveServiceProvider {
   push(
     devices: string[],
     notification: PushMessageNotification,
diff --git a/twake/backend/node/src/core/platform/services/push/index.ts b/twake/backend/node/src/core/platform/services/push/index.ts
index c0550bec..15844f5d 100644
--- a/twake/backend/node/src/core/platform/services/push/index.ts
+++ b/twake/backend/node/src/core/platform/services/push/index.ts
@@ -1,11 +1,11 @@
-import { TwakeService, logger, ServiceName } from "../../framework";
+import { TdriveService, logger, ServiceName } from "../../framework";
 import { PushServiceAPI } from "./api";
 import { PushConnector } from "./connectors/connector";
 import FcmPushConnector from "./connectors/fcm/service";
 import { PushConfiguration, PushMessageNotification, PushMessageOptions } from "./types";
 
 @ServiceName("push")
-export default class Push extends TwakeService<PushServiceAPI> {
+export default class Push extends TdriveService<PushServiceAPI> {
   version = "1";
   name = "push";
   service: PushConnector;
diff --git a/twake/backend/node/src/core/platform/services/realtime/api.ts b/twake/backend/node/src/core/platform/services/realtime/api.ts
index 9b3c4a96..e2ae08d4 100644
--- a/twake/backend/node/src/core/platform/services/realtime/api.ts
+++ b/twake/backend/node/src/core/platform/services/realtime/api.ts
@@ -1,9 +1,9 @@
-import { TwakeServiceProvider } from "../../framework";
+import { TdriveServiceProvider } from "../../framework";
 import { WebSocketUser, WebSocket } from "../../services/websocket/types";
 import RealtimeEntityManager from "./services/entity-manager";
 import { RealtimeEntityEvent } from "./types";
 
-export interface RealtimeServiceAPI extends TwakeServiceProvider {
+export interface RealtimeServiceAPI extends TdriveServiceProvider {
   /**
    * Get the realtime event bus instance
    */
diff --git a/twake/backend/node/src/core/platform/services/realtime/index.ts b/twake/backend/node/src/core/platform/services/realtime/index.ts
index 9cc94ee5..c6208068 100644
--- a/twake/backend/node/src/core/platform/services/realtime/index.ts
+++ b/twake/backend/node/src/core/platform/services/realtime/index.ts
@@ -1,4 +1,4 @@
-import { Consumes, ServiceName, TwakeService } from "../../framework";
+import { Consumes, ServiceName, TdriveService } from "../../framework";
 import { SkipCLI } from "../../framework/decorators/skip";
 import { localEventBus } from "../../framework/event-bus";
 import WebSocketAPI from "../../services/websocket/provider";
@@ -12,7 +12,7 @@ import { RealtimeBaseBusEvent, RealtimeLocalBusEvent } from "./types";
 @Consumes(["websocket", "auth"])
 @ServiceName("realtime")
 export default class RealtimeService
-  extends TwakeService<RealtimeServiceAPI>
+  extends TdriveService<RealtimeServiceAPI>
   implements RealtimeServiceAPI
 {
   private roomManager: RoomManagerImpl;
diff --git a/twake/backend/node/src/core/platform/services/realtime/services/room-manager.ts b/twake/backend/node/src/core/platform/services/realtime/services/room-manager.ts
index c8cdb0ed..2df14689 100644
--- a/twake/backend/node/src/core/platform/services/realtime/services/room-manager.ts
+++ b/twake/backend/node/src/core/platform/services/realtime/services/room-manager.ts
@@ -88,7 +88,7 @@ export default class RoomManager implements RealtimeRoomManager {
       }
 
       //Retro-compatibility for mobile up to february 2021 (to remove after this date)
-      if (joinEvent.token === "twake") return true;
+      if (joinEvent.token === "tdrive") return true;
 
       const signature = this.auth.verifyTokenObject<WebsocketRoomSignature>(joinEvent.token);
 
diff --git a/twake/backend/node/src/core/platform/services/search/api.ts b/twake/backend/node/src/core/platform/services/search/api.ts
index 87f03fde..e64d574d 100644
--- a/twake/backend/node/src/core/platform/services/search/api.ts
+++ b/twake/backend/node/src/core/platform/services/search/api.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types */
-import { TwakeServiceProvider } from "../../framework";
+import { TdriveServiceProvider } from "../../framework";
 import { ListResult } from "../../framework/api/crud-service";
 import {
   FindFilter as OrmFindFilter,
@@ -57,7 +57,7 @@ export interface SearchAdapterInterface {
   ): Promise<ListResult<IndexedEntity>>;
 }
 
-export interface SearchServiceAPI extends TwakeServiceProvider {
+export interface SearchServiceAPI extends TdriveServiceProvider {
   getRepository<Entity>(table: string, entityType: EntityTarget<Entity>): SearchRepository<Entity>;
   upsert(entities: any[]): Promise<void>;
   remove(entities: any[]): Promise<void>;
diff --git a/twake/backend/node/src/core/platform/services/search/index.ts b/twake/backend/node/src/core/platform/services/search/index.ts
index c339b72a..f9a90d3e 100644
--- a/twake/backend/node/src/core/platform/services/search/index.ts
+++ b/twake/backend/node/src/core/platform/services/search/index.ts
@@ -1,4 +1,4 @@
-import { TwakeService, logger, ServiceName, Consumes } from "../../framework";
+import { TdriveService, logger, ServiceName, Consumes } from "../../framework";
 import {
   DatabaseEntitiesRemovedEvent,
   DatabaseEntitiesSavedEvent,
@@ -15,7 +15,7 @@ import SearchRepository from "./repository";
 
 @ServiceName("search")
 @Consumes(["database"])
-export default class Search extends TwakeService<SearchServiceAPI> {
+export default class Search extends TdriveService<SearchServiceAPI> {
   version = "1";
   name = "search";
   service: SearchAdapterInterface;
diff --git a/twake/backend/node/src/core/platform/services/storage/index.ts b/twake/backend/node/src/core/platform/services/storage/index.ts
index ffc96e47..9fe35a2a 100644
--- a/twake/backend/node/src/core/platform/services/storage/index.ts
+++ b/twake/backend/node/src/core/platform/services/storage/index.ts
@@ -1,7 +1,7 @@
 import { createCipheriv, createDecipheriv, Decipher } from "crypto";
 import { Stream, Readable } from "stream";
 import Multistream from "multistream";
-import { Consumes, logger, TwakeService } from "../../framework";
+import { Consumes, logger, TdriveService } from "../../framework";
 import LocalConnectorService, { LocalConfiguration } from "./connectors/local/service";
 import S3ConnectorService, { S3Configuration } from "./connectors/S3/service";
 import StorageAPI, {
@@ -17,7 +17,7 @@ type EncryptionConfiguration = {
   iv: string | null;
 };
 @Consumes([])
-export default class StorageService extends TwakeService<StorageAPI> implements StorageAPI {
+export default class StorageService extends TdriveService<StorageAPI> implements StorageAPI {
   name = "storage";
   version = "1";
 
diff --git a/twake/backend/node/src/core/platform/services/storage/provider.ts b/twake/backend/node/src/core/platform/services/storage/provider.ts
index f6149853..8a9c1d48 100644
--- a/twake/backend/node/src/core/platform/services/storage/provider.ts
+++ b/twake/backend/node/src/core/platform/services/storage/provider.ts
@@ -1,5 +1,5 @@
 import { Stream, Readable } from "stream";
-import { TwakeServiceProvider } from "../../framework";
+import { TdriveServiceProvider } from "../../framework";
 import { ExecutionContext } from "../../framework/api/crud-service";
 
 export type WriteMetadata = {
@@ -51,7 +51,7 @@ export interface StorageConnectorAPI {
   remove(path: string, options?: DeleteOptions, context?: ExecutionContext): Promise<boolean>;
 }
 
-export default interface StorageAPI extends TwakeServiceProvider, StorageConnectorAPI {
+export default interface StorageAPI extends TdriveServiceProvider, StorageConnectorAPI {
   getConnector(): StorageConnectorAPI;
   getConnectorType(): string;
 }
diff --git a/twake/backend/node/src/core/platform/services/tracker/index.ts b/twake/backend/node/src/core/platform/services/tracker/index.ts
index ea8852cf..cc4cf493 100644
--- a/twake/backend/node/src/core/platform/services/tracker/index.ts
+++ b/twake/backend/node/src/core/platform/services/tracker/index.ts
@@ -1,6 +1,6 @@
 import Segment from "./adapters/segment";
 import { Analytics } from "./adapters/types";
-import { Consumes, TwakeService, logger } from "../../framework";
+import { Consumes, TdriveService, logger } from "../../framework";
 import TrackerAPI from "./provider";
 import { localEventBus } from "../../framework/event-bus";
 import { IdentifyObjectType, TrackedEventType, TrackerConfiguration } from "./types";
@@ -8,7 +8,7 @@ import { ResourceEventsPayload } from "../../../../utils/types";
 import { md5 } from "../../../../core/crypto";
 
 @Consumes([])
-export default class Tracker extends TwakeService<TrackerAPI> implements TrackerAPI {
+export default class Tracker extends TdriveService<TrackerAPI> implements TrackerAPI {
   name = "tracker";
   version = "1";
   analytics: Analytics;
@@ -121,14 +121,14 @@ export default class Tracker extends TwakeService<TrackerAPI> implements Tracker
 
     // Fixme: For now we have zero users allowing to track (value false by default and not asked during sign up)
     // As soon as we clearly define a way for users to choose this option we will enable this code again.
-    // Right now we need stats to move forward with Twake.
+    // Right now we need stats to move forward with Tdrive.
     // Note that the user that create the event will be anonymised here
     // if (!event.user?.allow_tracking) return;
 
     const analytics = await this.getAnalytics();
 
     if (analytics && event) {
-      event.event = `twake:${event.event}`;
+      event.event = `tdrive:${event.event}`;
       analytics.track(
         {
           userId: event.user?.allow_tracking
diff --git a/twake/backend/node/src/core/platform/services/tracker/provider.ts b/twake/backend/node/src/core/platform/services/tracker/provider.ts
index b8a98765..d295cebe 100644
--- a/twake/backend/node/src/core/platform/services/tracker/provider.ts
+++ b/twake/backend/node/src/core/platform/services/tracker/provider.ts
@@ -1,7 +1,7 @@
-import { TwakeServiceProvider } from "../../framework";
+import { TdriveServiceProvider } from "../../framework";
 import { IdentifyObjectType, TrackedEventType } from "./types";
 
-export default interface TrackerAPI extends TwakeServiceProvider {
+export default interface TrackerAPI extends TdriveServiceProvider {
   identify(identity: IdentifyObjectType, callback?: (err: Error) => void): Promise<void>;
   remove(identity: IdentifyObjectType, callback?: (err: Error) => void): Promise<void>;
   track(tracker: TrackedEventType, callback?: (err: Error) => void): Promise<void>;
diff --git a/twake/backend/node/src/core/platform/services/tracker/types.ts b/twake/backend/node/src/core/platform/services/tracker/types.ts
index 7256ced3..119e63ec 100644
--- a/twake/backend/node/src/core/platform/services/tracker/types.ts
+++ b/twake/backend/node/src/core/platform/services/tracker/types.ts
@@ -9,7 +9,7 @@ export type IdentifyObjectType = IdentityType & {
 };
 
 export type TrackedEventType = IdentityType & {
-  // event starts with prefix `twake:`
+  // event starts with prefix `tdrive:`
   event: string;
   properties?: { [key: string]: unknown };
   timestamp?: Date;
diff --git a/twake/backend/node/src/core/platform/services/webserver/index.ts b/twake/backend/node/src/core/platform/services/webserver/index.ts
index f639675a..6613c5fd 100644
--- a/twake/backend/node/src/core/platform/services/webserver/index.ts
+++ b/twake/backend/node/src/core/platform/services/webserver/index.ts
@@ -1,4 +1,4 @@
-import { logger, TwakeService } from "../../framework";
+import { logger, TdriveService } from "../../framework";
 import { Server, IncomingMessage, ServerResponse } from "http";
 import { FastifyInstance, fastify } from "fastify";
 import sensible from "fastify-sensible";
@@ -14,7 +14,7 @@ import swaggerPlugin from "fastify-swagger";
 import { SkipCLI } from "../../framework/decorators/skip";
 import fs from "fs";
 // import { throws } from "assert";
-export default class WebServerService extends TwakeService<WebServerAPI> implements WebServerAPI {
+export default class WebServerService extends TdriveService<WebServerAPI> implements WebServerAPI {
   name = "webserver";
   version = "1";
   private server: FastifyInstance<Server, IncomingMessage, ServerResponse>;
@@ -73,12 +73,12 @@ export default class WebServerService extends TwakeService<WebServerAPI> impleme
       routePrefix: "/internal/docs",
       swagger: {
         info: {
-          title: "Twake Swagger",
-          description: "Automatically generate Twake Swagger API",
+          title: "Tdrive Swagger",
+          description: "Automatically generate Tdrive Swagger API",
           version: "0.1.0",
         },
         externalDocs: {
-          url: "http://linagora.github.io/Twake",
+          url: "http://linagora.github.io/Tdrive",
           description: "Find more info here",
         },
         host: "localhost",
diff --git a/twake/backend/node/src/core/platform/services/webserver/provider.ts b/twake/backend/node/src/core/platform/services/webserver/provider.ts
index aa7d8b4f..b5294e80 100644
--- a/twake/backend/node/src/core/platform/services/webserver/provider.ts
+++ b/twake/backend/node/src/core/platform/services/webserver/provider.ts
@@ -1,8 +1,8 @@
 import { Server, IncomingMessage, ServerResponse } from "http";
 import { FastifyInstance } from "fastify";
-import { TwakeServiceProvider } from "../../framework/api";
+import { TdriveServiceProvider } from "../../framework/api";
 
-export default interface WebServerAPI extends TwakeServiceProvider {
+export default interface WebServerAPI extends TdriveServiceProvider {
   /**
    * Get the fastify webserver instance
    */
diff --git a/twake/backend/node/src/core/platform/services/websocket/index.ts b/twake/backend/node/src/core/platform/services/websocket/index.ts
index d039796f..5cce9045 100644
--- a/twake/backend/node/src/core/platform/services/websocket/index.ts
+++ b/twake/backend/node/src/core/platform/services/websocket/index.ts
@@ -1,4 +1,4 @@
-import { Consumes, ServiceName, TwakeService } from "../../framework";
+import { Consumes, ServiceName, TdriveService } from "../../framework";
 import WebServerAPI from "../webserver/provider";
 import WebSocketAPI from "./provider";
 import { WebSocketService } from "./services";
@@ -7,7 +7,7 @@ import FastifyIO from "fastify-socket.io";
 
 @Consumes(["webserver"])
 @ServiceName("websocket")
-export default class WebSocket extends TwakeService<WebSocketAPI> {
+export default class WebSocket extends TdriveService<WebSocketAPI> {
   private service: WebSocketService;
   name = "websocket";
   version = "1";
diff --git a/twake/backend/node/src/core/platform/services/websocket/provider.ts b/twake/backend/node/src/core/platform/services/websocket/provider.ts
index 1306c742..0d790dfc 100644
--- a/twake/backend/node/src/core/platform/services/websocket/provider.ts
+++ b/twake/backend/node/src/core/platform/services/websocket/provider.ts
@@ -1,10 +1,10 @@
 import { EventEmitter } from "events";
 import socketIO from "socket.io";
-import { TwakeServiceProvider } from "../../framework";
+import { TdriveServiceProvider } from "../../framework";
 import { User } from "../../../../utils/types";
 import { WebsocketUserEvent, WebSocket, WebSocketUser } from "./types";
 
-export default interface WebSocketAPI extends TwakeServiceProvider, EventEmitter {
+export default interface WebSocketAPI extends TdriveServiceProvider, EventEmitter {
   getIo(): socketIO.Server;
 
   isConnected(user: User): boolean;
diff --git a/twake/backend/node/src/server.ts b/twake/backend/node/src/server.ts
index ef38dee7..91a9c64c 100644
--- a/twake/backend/node/src/server.ts
+++ b/twake/backend/node/src/server.ts
@@ -1,7 +1,7 @@
 import * as Sentry from "@sentry/node";
-import { TwakePlatform } from "./core/platform/platform";
+import { TdrivePlatform } from "./core/platform/platform";
 import config from "./core/config";
-import twake from "./twake";
+import tdrive from "./tdrive";
 
 if (config.get("sentry.dsn")) {
   Sentry.init({
@@ -10,7 +10,7 @@ if (config.get("sentry.dsn")) {
   });
 }
 
-const launch = async (): Promise<TwakePlatform> => twake.run(config.get("services"));
+const launch = async (): Promise<TdrivePlatform> => tdrive.run(config.get("services"));
 
 // noinspection JSIgnoredPromiseFromCall
 launch();
diff --git a/twake/backend/node/src/services/applications/entities/application.search.ts b/twake/backend/node/src/services/applications/entities/application.search.ts
new file mode 100644
index 00000000..669e0245
--- /dev/null
+++ b/twake/backend/node/src/services/applications/entities/application.search.ts
@@ -0,0 +1,33 @@
+import Application, { TYPE } from "./application";
+
+export default {
+  index: TYPE,
+  source: (entity: Application) => {
+    return {
+      company_id: entity.company_id,
+      name: entity.identity.name,
+      description: entity.identity.description,
+      categories: entity.identity.categories,
+      compatibility: entity.identity.compatibility,
+      published: entity.publication.published,
+      created_at: entity.stats.created_at,
+    };
+  },
+  mongoMapping: {
+    text: {
+      name: "text",
+      description: "text",
+    },
+  },
+  esMapping: {
+    properties: {
+      company_id: { type: "keyword" },
+      name: { type: "text", index_prefixes: { min_chars: 1 } },
+      description: { type: "text" },
+      categories: { type: "keyword" },
+      compatibility: { type: "keyword" },
+      published: { type: "boolean" },
+      created_at: { type: "number" },
+    },
+  },
+};
diff --git a/twake/backend/node/src/services/applications/entities/application.ts b/twake/backend/node/src/services/applications/entities/application.ts
new file mode 100644
index 00000000..1cd1c793
--- /dev/null
+++ b/twake/backend/node/src/services/applications/entities/application.ts
@@ -0,0 +1,212 @@
+import { Type } from "class-transformer";
+import _, { merge } from "lodash";
+import { Column, Entity } from "../../../core/platform/services/database/services/orm/decorators";
+import search from "./application.search";
+
+export const TYPE = "applications";
+
+@Entity(TYPE, {
+  primaryKey: ["id"],
+  type: TYPE,
+  search,
+})
+export default class Application {
+  @Type(() => String)
+  @Column("id", "timeuuid", { generator: "timeuuid" })
+  id: string;
+
+  @Type(() => String)
+  @Column("group_id", "timeuuid")
+  company_id: string;
+
+  @Column("is_default", "boolean")
+  is_default: boolean;
+
+  @Column("identity", "json")
+  identity: ApplicationIdentity;
+
+  //This information is private to the application, make sure not to disclose it
+  @Column("api", "encoded_json")
+  api: ApplicationApi;
+
+  @Column("access", "json")
+  access: ApplicationAccess;
+
+  @Column("display", "json")
+  display: ApplicationDisplay;
+
+  @Column("publication", "json")
+  publication: ApplicationPublication;
+
+  @Column("stats", "json")
+  stats: ApplicationStatistics;
+
+  getPublicObject(): PublicApplicationObject {
+    const i = _.pick(
+      this,
+      "id",
+      "company_id",
+      "is_default",
+      "identity",
+      "access",
+      "display",
+      "publication",
+      "stats",
+    );
+
+    i.is_default = !!i.is_default;
+    return i;
+  }
+
+  getApplicationObject(): ApplicationObject {
+    const i = _.pick(
+      this,
+      "id",
+      "company_id",
+      "is_default",
+      "identity",
+      "access",
+      "display",
+      "publication",
+      "stats",
+      "api",
+    );
+
+    i.is_default = !!i.is_default;
+    return i;
+  }
+}
+
+export type PublicApplicationObject = Pick<
+  Application,
+  "id" | "company_id" | "is_default" | "identity" | "access" | "display" | "publication" | "stats"
+>;
+
+export type ApplicationObject = Pick<
+  Application,
+  | "id"
+  | "company_id"
+  | "is_default"
+  | "identity"
+  | "access"
+  | "display"
+  | "publication"
+  | "stats"
+  | "api"
+>;
+
+export type ApplicationPrimaryKey = { id: string };
+
+export function getInstance(message: Application): Application {
+  return merge(new Application(), message);
+}
+
+export type ApplicationIdentity = {
+  code: string;
+  name: string;
+  icon: string;
+  description: string;
+  website: string;
+  categories: string[];
+  compatibility: "tdrive"[];
+  repository?: string;
+};
+
+export type ApplicationPublication = {
+  published: boolean; //Publication accepted // RO
+  requested: boolean; //Publication requested
+};
+
+export type ApplicationStatistics = {
+  created_at: number; // RO
+  updated_at: number; // RO
+  version: number; // RO
+};
+
+export type ApplicationApi = {
+  hooks_url: string;
+  allowed_ips: string;
+  private_key: string; // RO
+};
+
+type ApplicationScopes =
+  | "files"
+  | "applications"
+  | "workspaces"
+  | "users"
+  | "messages"
+  | "channels";
+
+export type ApplicationAccess = {
+  read: ApplicationScopes[];
+  write: ApplicationScopes[];
+  delete: ApplicationScopes[];
+  hooks: ApplicationScopes[];
+};
+
+export type ApplicationDisplay = {
+  tdrive: {
+    files?: {
+      editor?: {
+        preview_url: string; //Open a preview inline (iframe)
+        edition_url: string; //Url to edit the file (full screen)
+        extensions?: string[]; //Main extensions app can read
+        // if file was created by the app, then the app is able to edit with or without extension
+        empty_files?: {
+          url: string; // "https://[...]/empty.docx";
+          filename: string; // "Untitled.docx";
+          name: string; // "Word Document";
+        }[];
+      };
+      actions?: //List of action that can apply on a file
+      {
+        name: string;
+        id: string;
+      }[];
+    };
+
+    //Chat plugin
+    chat?: {
+      input?:
+        | true
+        | {
+            icon?: string; //If defined replace original icon url of your app
+            type?: "file" | "call"; //To add in existing apps folder / default icon
+          };
+      commands?: {
+        command: string; // my_app mycommand
+        description: string;
+      }[];
+      actions?: //List of action that can apply on a message
+      {
+        name: string;
+        id: string;
+      }[];
+    };
+
+    //Allow app to appear as a bot user in direct chat
+    direct?:
+      | true
+      | {
+          name?: string;
+          icon?: string; //If defined replace original icon url of your app
+        };
+
+    //Display app as a standalone application in a tab
+    tab?:
+      | {
+          url: string;
+        }
+      | true;
+
+    //Display app as a standalone application on the left bar
+    standalone?:
+      | {
+          url: string;
+        }
+      | true;
+
+    //Define where the app can be configured from
+    configuration?: ("global" | "channel")[];
+  };
+};
diff --git a/twake/backend/node/src/services/applications/entities/company-application.ts b/twake/backend/node/src/services/applications/entities/company-application.ts
new file mode 100644
index 00000000..e3d85e55
--- /dev/null
+++ b/twake/backend/node/src/services/applications/entities/company-application.ts
@@ -0,0 +1,40 @@
+import { Type } from "class-transformer";
+import { Column, Entity } from "../../../core/platform/services/database/services/orm/decorators";
+import { PublicApplicationObject } from "./application";
+
+export const TYPE = "group_app";
+
+@Entity(TYPE, {
+  primaryKey: [["group_id"], "app_id", "id"],
+  type: TYPE,
+})
+export default class CompanyApplication {
+  @Type(() => String)
+  @Column("group_id", "timeuuid")
+  company_id: string;
+
+  @Type(() => String)
+  @Column("app_id", "timeuuid")
+  application_id: string;
+
+  @Type(() => String)
+  @Column("id", "timeuuid", { generator: "timeuuid" })
+  id: string;
+
+  @Column("created_at", "number")
+  created_at: number;
+
+  @Type(() => String)
+  @Column("created_by", "string")
+  created_by: string; //Will be the default delegated user when doing actions on Tdrive
+}
+
+export type CompanyApplicationPrimaryKey = Pick<
+  CompanyApplication,
+  "company_id" | "application_id" | "id"
+>;
+
+export class CompanyApplicationWithApplication extends CompanyApplication {
+  //Not in database but attached to this object
+  application?: PublicApplicationObject;
+}
diff --git a/twake/backend/node/src/services/applications/index.ts b/twake/backend/node/src/services/applications/index.ts
new file mode 100644
index 00000000..fd52feb1
--- /dev/null
+++ b/twake/backend/node/src/services/applications/index.ts
@@ -0,0 +1,24 @@
+import { Prefix, TdriveService } from "../../core/platform/framework";
+import WebServerAPI from "../../core/platform/services/webserver/provider";
+import web from "./web";
+
+@Prefix("/internal/services/applications/v1")
+export default class ApplicationsService extends TdriveService<undefined> {
+  version = "1";
+  name = "applications";
+
+  public async doInit(): Promise<this> {
+    const fastify = this.context.getProvider<WebServerAPI>("webserver").getServer();
+    fastify.register((instance, _opts, next) => {
+      web(instance, { prefix: this.prefix });
+      next();
+    });
+
+    return this;
+  }
+
+  // TODO: remove
+  api(): undefined {
+    return undefined;
+  }
+}
diff --git a/twake/backend/node/src/services/applications/realtime.ts b/twake/backend/node/src/services/applications/realtime.ts
new file mode 100644
index 00000000..074f8a3e
--- /dev/null
+++ b/twake/backend/node/src/services/applications/realtime.ts
@@ -0,0 +1,13 @@
+import { WebsocketMetadata } from "../../utils/types";
+
+export function getCompanyApplicationRooms(companyId: string): WebsocketMetadata[] {
+  return [
+    {
+      room: getCompanyApplicationRoom(companyId),
+    },
+  ];
+}
+
+export function getCompanyApplicationRoom(companyApplicationId: string): string {
+  return `/company-application/${companyApplicationId}`;
+}
diff --git a/twake/backend/node/src/services/applications/services/applications.ts b/twake/backend/node/src/services/applications/services/applications.ts
new file mode 100644
index 00000000..b480fd4f
--- /dev/null
+++ b/twake/backend/node/src/services/applications/services/applications.ts
@@ -0,0 +1,140 @@
+import Application, {
+  ApplicationPrimaryKey,
+  getInstance as getApplicationInstance,
+  PublicApplicationObject,
+  TYPE,
+} from "../entities/application";
+import Repository from "../../../core/platform/services/database/services/orm/repository/repository";
+import { Initializable, logger, TdriveServiceProvider } from "../../../core/platform/framework";
+import {
+  DeleteResult,
+  ExecutionContext,
+  ListResult,
+  OperationType,
+  Pagination,
+  SaveResult,
+} from "../../../core/platform/framework/api/crud-service";
+import SearchRepository from "../../../core/platform/services/search/repository";
+import assert from "assert";
+
+import gr from "../../global-resolver";
+
+export class ApplicationServiceImpl implements TdriveServiceProvider, Initializable {
+  version: "1";
+  repository: Repository<Application>;
+  searchRepository: SearchRepository<Application>;
+
+  async init(): Promise<this> {
+    try {
+      this.searchRepository = gr.platformServices.search.getRepository<Application>(
+        TYPE,
+        Application,
+      );
+      this.repository = await gr.database.getRepository<Application>(TYPE, Application);
+    } catch (err) {
+      console.log(err);
+      logger.error("Error while initializing applications service");
+    }
+
+    return this;
+  }
+
+  async get(pk: ApplicationPrimaryKey, context: ExecutionContext): Promise<Application> {
+    return await this.repository.findOne(pk, {}, context);
+  }
+
+  async list(
+    pagination: Pagination,
+    options?: { search?: string },
+    context?: ExecutionContext,
+  ): Promise<ListResult<PublicApplicationObject>> {
+    let entities: ListResult<Application>;
+    if (options.search) {
+      entities = await this.searchRepository.search(
+        {},
+        {
+          pagination,
+          $text: {
+            $search: options.search,
+          },
+        },
+        context,
+      );
+    } else {
+      entities = await this.repository.find({}, { pagination }, context);
+    }
+    entities.filterEntities(app => app.publication.published);
+
+    const applications = entities
+      .getEntities()
+      .filter(app => app)
+      .map(app => app.getPublicObject());
+    return new ListResult(entities.type, applications, entities.nextPage);
+  }
+
+  async listUnpublished(context: ExecutionContext): Promise<Application[]> {
+    const entities = await this.repository.find({}, {}, context);
+    entities.filterEntities(app => !app.publication.published);
+    return entities.getEntities();
+  }
+
+  async listDefaults(context: ExecutionContext): Promise<ListResult<PublicApplicationObject>> {
+    const entities = [];
+
+    let page: Pagination = { limitStr: "100" };
+    do {
+      const applicationListResult = await this.repository.find({}, { pagination: page }, context);
+      page = applicationListResult.nextPage as Pagination;
+      applicationListResult.filterEntities(app => app.publication.published && app.is_default);
+
+      for (const application of applicationListResult.getEntities()) {
+        if (application) entities.push(application.getPublicObject());
+      }
+    } while (page.page_token);
+
+    return new ListResult(TYPE, entities);
+  }
+
+  async save<SaveOptions>(
+    item: Application,
+    options?: SaveOptions,
+    context?: ExecutionContext,
+  ): Promise<SaveResult<Application>> {
+    assert(item.company_id, "company_id is not defined");
+
+    try {
+      const entity = getApplicationInstance(item);
+      await this.repository.save(entity, context);
+      return new SaveResult<Application>("application", entity, OperationType.UPDATE);
+    } catch (e) {
+      throw e;
+    }
+  }
+
+  async delete(
+    pk: ApplicationPrimaryKey,
+    context?: ExecutionContext,
+  ): Promise<DeleteResult<Application>> {
+    const entity = await this.get(pk, context);
+    await this.repository.remove(entity, context);
+    return new DeleteResult<Application>("application", entity, true);
+  }
+
+  async publish(pk: ApplicationPrimaryKey, context: ExecutionContext): Promise<void> {
+    const entity = await this.get(pk, context);
+    if (!entity) {
+      throw new Error("Entity not found");
+    }
+    entity.publication.published = true;
+    await this.repository.save(entity, context);
+  }
+
+  async unpublish(pk: ApplicationPrimaryKey, context: ExecutionContext): Promise<void> {
+    const entity = await this.get(pk, context);
+    if (!entity) {
+      throw new Error("Entity not found");
+    }
+    entity.publication.published = false;
+    await this.repository.save(entity, context);
+  }
+}
diff --git a/twake/backend/node/src/services/applications/services/company-applications.ts b/twake/backend/node/src/services/applications/services/company-applications.ts
new file mode 100644
index 00000000..4df059ec
--- /dev/null
+++ b/twake/backend/node/src/services/applications/services/company-applications.ts
@@ -0,0 +1,188 @@
+import CompanyApplication, {
+  CompanyApplicationPrimaryKey,
+  CompanyApplicationWithApplication,
+  TYPE,
+} from "../entities/company-application";
+import Repository from "../../../core/platform/services/database/services/orm/repository/repository";
+import {
+  Initializable,
+  logger,
+  RealtimeDeleted,
+  RealtimeSaved,
+  TdriveServiceProvider,
+} from "../../../core/platform/framework";
+import {
+  DeleteResult,
+  ListResult,
+  OperationType,
+  Paginable,
+  Pagination,
+  SaveResult,
+} from "../../../core/platform/framework/api/crud-service";
+import { CompanyExecutionContext } from "../web/types";
+import { getCompanyApplicationRoom } from "../realtime";
+import gr from "../../global-resolver";
+
+export class CompanyApplicationServiceImpl implements TdriveServiceProvider, Initializable {
+  version: "1";
+  repository: Repository<CompanyApplication>;
+
+  async init(): Promise<this> {
+    try {
+      this.repository = await gr.database.getRepository<CompanyApplication>(
+        TYPE,
+        CompanyApplication,
+      );
+    } catch (err) {
+      console.log(err);
+      logger.error("Error while initializing applications service");
+    }
+    return this;
+  }
+
+  // TODO: remove logic from context
+  async get(
+    pk: Pick<CompanyApplicationPrimaryKey, "company_id" | "application_id"> & { id?: string },
+    context?: CompanyExecutionContext,
+  ): Promise<CompanyApplicationWithApplication> {
+    const companyApplication = await this.repository.findOne(
+      {
+        group_id: context ? context.company.id : pk.company_id,
+        app_id: pk.application_id,
+      },
+      {},
+      context,
+    );
+
+    const application = await gr.services.applications.marketplaceApps.get(
+      {
+        id: pk.application_id,
+      },
+      context,
+    );
+
+    return {
+      ...companyApplication,
+      application: application,
+    };
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  @RealtimeSaved<CompanyApplication>((companyApplication, _context) => {
+    return [
+      {
+        room: getCompanyApplicationRoom(companyApplication.id),
+        resource: companyApplication,
+      },
+    ];
+  })
+  async save<SaveOptions>(
+    item: Pick<CompanyApplicationPrimaryKey, "company_id" | "application_id">,
+    _?: SaveOptions,
+    context?: CompanyExecutionContext,
+  ): Promise<SaveResult<CompanyApplication>> {
+    if (!context?.user?.id && !context?.user?.server_request) {
+      throw new Error("Only an user of a company can add an application to a company.");
+    }
+
+    let operation = OperationType.UPDATE;
+    let companyApplication = await this.repository.findOne(
+      {
+        group_id: context?.company.id,
+        app_id: item.application_id,
+      },
+      {},
+      context,
+    );
+    if (!companyApplication) {
+      operation = OperationType.CREATE;
+
+      companyApplication = new CompanyApplication();
+      companyApplication.company_id = context.company.id;
+      companyApplication.application_id = item.application_id;
+      companyApplication.created_at = new Date().getTime();
+      companyApplication.created_by = context?.user?.id || "";
+
+      await this.repository.save(companyApplication, context);
+    }
+
+    return new SaveResult(TYPE, companyApplication, operation);
+  }
+
+  async initWithDefaultApplications(
+    companyId: string,
+    context: CompanyExecutionContext,
+  ): Promise<void> {
+    const defaultApps = await gr.services.applications.marketplaceApps.listDefaults(context);
+    for (const defaultApp of defaultApps.getEntities()) {
+      await this.save({ company_id: companyId, application_id: defaultApp.id }, {}, context);
+    }
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  @RealtimeDeleted<CompanyApplication>((companyApplication, _context) => {
+    return [
+      {
+        room: getCompanyApplicationRoom(companyApplication.id),
+        resource: companyApplication,
+      },
+    ];
+  })
+  async delete(
+    pk: CompanyApplicationPrimaryKey,
+    context?: CompanyExecutionContext,
+  ): Promise<DeleteResult<CompanyApplication>> {
+    const companyApplication = await this.repository.findOne(
+      {
+        group_id: context.company.id,
+        app_id: pk.application_id,
+      },
+      {},
+      context,
+    );
+
+    let deleted = false;
+    if (companyApplication) {
+      this.repository.remove(companyApplication, context);
+      deleted = true;
+    }
+
+    return new DeleteResult(TYPE, companyApplication, deleted);
+  }
+
+  async list<ListOptions>(
+    pagination: Paginable,
+    options?: ListOptions,
+    context?: CompanyExecutionContext,
+  ): Promise<ListResult<CompanyApplicationWithApplication>> {
+    const companyApplications = await this.repository.find(
+      {
+        group_id: context.company.id,
+      },
+      { pagination: Pagination.fromPaginable(pagination) },
+      context,
+    );
+
+    const applications = [];
+
+    for (const companyApplication of companyApplications.getEntities()) {
+      const application = await gr.services.applications.marketplaceApps.get(
+        {
+          id: companyApplication.application_id,
+        },
+        context,
+      );
+      if (application)
+        applications.push({
+          ...companyApplication,
+          application: application,
+        });
+    }
+
+    return new ListResult<CompanyApplicationWithApplication>(
+      TYPE,
+      applications,
+      companyApplications.nextPage,
+    );
+  }
+}
diff --git a/twake/backend/node/src/services/applications/services/hooks.ts b/twake/backend/node/src/services/applications/services/hooks.ts
new file mode 100644
index 00000000..036d7157
--- /dev/null
+++ b/twake/backend/node/src/services/applications/services/hooks.ts
@@ -0,0 +1,96 @@
+import Application from "../entities/application";
+import Repository from "../../../core/platform/services/database/services/orm/repository/repository";
+import {
+  Initializable,
+  logger as log,
+  TdriveServiceProvider,
+} from "../../../core/platform/framework";
+import { CrudException, ExecutionContext } from "../../../core/platform/framework/api/crud-service";
+import SearchRepository from "../../../core/platform/services/search/repository";
+import axios from "axios";
+import * as crypto from "crypto";
+import { isObject } from "lodash";
+import gr from "../../global-resolver";
+
+export class ApplicationHooksService implements TdriveServiceProvider, Initializable {
+  version: "1";
+  repository: Repository<Application>;
+  searchRepository: SearchRepository<Application>;
+
+  async init() {
+    return this;
+  }
+
+  async notifyApp(
+    application_id: string,
+    connection_id: string,
+    user_id: string,
+    type: string,
+    name: string,
+    content: any,
+    company_id: string,
+    workspace_id: string,
+    context: ExecutionContext,
+  ): Promise<void> {
+    const app = await gr.services.applications.marketplaceApps.get({ id: application_id }, context);
+    if (!app) {
+      throw CrudException.notFound("Application not found");
+    }
+
+    if (!app.api.hooks_url) {
+      throw CrudException.badRequest("Application hooks_url is not defined");
+    }
+
+    const payload = {
+      type,
+      name,
+      content,
+      connection_id: connection_id,
+      user_id: user_id,
+      company_id,
+      workspace_id,
+    };
+
+    const signature = crypto
+      .createHmac("sha256", app.api.private_key)
+      .update(JSON.stringify(payload))
+      .digest("hex");
+
+    return await axios
+      .post(app.api.hooks_url, payload, {
+        headers: {
+          "Content-Type": "application/json",
+          "X-Tdrive-Signature": signature,
+        },
+      })
+
+      .then(({ data }) => data)
+      .catch(e => {
+        log.error(e.message);
+        const r = e.response;
+
+        if (!r) {
+          throw CrudException.badGateway("Can't connect remote application");
+        }
+
+        let msg = r.data;
+
+        if (isObject(msg)) {
+          // parse typical responses
+          if (r.data.message) {
+            msg = r.data.message;
+          } else if (r.data.error) {
+            msg = r.data.error;
+          } else {
+            msg = JSON.stringify(r.data);
+          }
+        }
+
+        if (r.status == 403) {
+          throw CrudException.forbidden(msg);
+        } else {
+          throw CrudException.badRequest(msg);
+        }
+      });
+  }
+}
diff --git a/twake/backend/node/src/services/applications/web/controllers/applications.ts b/twake/backend/node/src/services/applications/web/controllers/applications.ts
new file mode 100644
index 00000000..11cbaa2d
--- /dev/null
+++ b/twake/backend/node/src/services/applications/web/controllers/applications.ts
@@ -0,0 +1,296 @@
+import { FastifyReply, FastifyRequest } from "fastify";
+import { CrudController } from "../../../../core/platform/services/webserver/types";
+import {
+  PaginationQueryParameters,
+  ResourceCreateResponse,
+  ResourceDeleteResponse,
+  ResourceGetResponse,
+  ResourceListResponse,
+  ResourceUpdateResponse,
+} from "../../../../utils/types";
+import Application, {
+  ApplicationObject,
+  PublicApplicationObject,
+} from "../../entities/application";
+import {
+  CrudException,
+  ExecutionContext,
+  Pagination,
+} from "../../../../core/platform/framework/api/crud-service";
+import _ from "lodash";
+import { randomBytes } from "crypto";
+import { ApplicationEventRequestBody } from "../types";
+import { logger as log } from "../../../../core/platform/framework";
+import { hasCompanyAdminLevel } from "../../../../utils/company";
+import gr from "../../../global-resolver";
+import config from "../../../../core/config";
+import axios from "axios";
+
+export class ApplicationController
+  implements
+    CrudController<
+      ResourceGetResponse<PublicApplicationObject>,
+      ResourceUpdateResponse<PublicApplicationObject>,
+      ResourceListResponse<PublicApplicationObject>,
+      ResourceDeleteResponse
+    >
+{
+  async get(
+    request: FastifyRequest<{ Params: { application_id: string } }>,
+  ): Promise<ResourceGetResponse<ApplicationObject | PublicApplicationObject>> {
+    const context = getExecutionContext(request);
+
+    const entity = await gr.services.applications.marketplaceApps.get(
+      {
+        id: request.params.application_id,
+      },
+      context,
+    );
+
+    const companyUser = await gr.services.companies.getCompanyUser(
+      { id: entity.company_id },
+      { id: context.user.id },
+    );
+
+    const isAdmin = companyUser && companyUser.role == "admin";
+
+    return {
+      resource: isAdmin ? entity.getApplicationObject() : entity.getPublicObject(),
+    };
+  }
+
+  async list(
+    request: FastifyRequest<{
+      Querystring: PaginationQueryParameters & { search: string };
+    }>,
+  ): Promise<ResourceListResponse<PublicApplicationObject>> {
+    const entities = await gr.services.applications.marketplaceApps.list(new Pagination(), {
+      search: request.query.search,
+    });
+    return {
+      resources: entities.getEntities(),
+      next_page_token: entities.nextPage.page_token,
+    };
+  }
+
+  async save(
+    request: FastifyRequest<{
+      Params: { application_id: string };
+      Body: { resource: Application };
+    }>,
+    _reply: FastifyReply,
+  ): Promise<ResourceGetResponse<ApplicationObject | PublicApplicationObject>> {
+    const context = getExecutionContext(request);
+
+    try {
+      const app = request.body.resource;
+      const now = new Date().getTime();
+      const pluginsEndpoint = config.get("plugins.api");
+
+      let entity: Application;
+
+      if (request.params.application_id) {
+        entity = await gr.services.applications.marketplaceApps.get(
+          {
+            id: request.params.application_id,
+          },
+          context,
+        );
+
+        if (!entity) {
+          throw CrudException.notFound("Application not found");
+        }
+
+        entity.publication.requested = app.publication.requested;
+        if (app.publication.requested === false) {
+          entity.publication.published = false;
+        }
+
+        if (entity.publication.published) {
+          if (
+            !_.isEqual(
+              _.pick(entity, "identity", "api", "access", "display"),
+              _.pick(app, "identity", "api", "access", "display"),
+            )
+          ) {
+            throw CrudException.badRequest(
+              "You can't update applications details while it published",
+            );
+          }
+        }
+
+        entity.identity = app.identity;
+        entity.api.hooks_url = app.api.hooks_url;
+        entity.api.allowed_ips = app.api.allowed_ips;
+        entity.access = app.access;
+        entity.display = app.display;
+
+        entity.stats.updated_at = now;
+        entity.stats.version++;
+
+        const res = await gr.services.applications.marketplaceApps.save(entity);
+        entity = res.entity;
+      } else {
+        // INSERT
+
+        app.is_default = false;
+        app.publication.published = false;
+        app.api.private_key = randomBytes(32).toString("base64");
+
+        app.stats = {
+          created_at: now,
+          updated_at: now,
+          version: 0,
+        };
+
+        const res = await gr.services.applications.marketplaceApps.save(app);
+        entity = res.entity;
+      }
+
+      // SYNC PLUGINS
+      if (app.identity.repository) {
+        try {
+          axios
+            .post(
+              `${pluginsEndpoint}/add`,
+              {
+                gitRepo: app.identity.repository,
+                pluginId: entity.getApplicationObject().id,
+                pluginSecret: entity.getApplicationObject().api.private_key,
+              },
+              {
+                headers: {
+                  "Content-Type": "application/json",
+                },
+              },
+            )
+            .then(response => {
+              log.info(response.data);
+            })
+            .catch(error => {
+              log.error(error);
+            });
+        } catch (error) {
+          console.error(error);
+        }
+      }
+
+      return {
+        resource: entity.getApplicationObject(),
+      };
+    } catch (e) {
+      log.error(e);
+      throw e;
+    }
+  }
+
+  async delete(
+    request: FastifyRequest<{ Params: { application_id: string } }>,
+    reply: FastifyReply,
+  ): Promise<ResourceDeleteResponse> {
+    const context = getExecutionContext(request);
+
+    const application = await gr.services.applications.marketplaceApps.get(
+      {
+        id: request.params.application_id,
+      },
+      context,
+    );
+
+    const compUser = await gr.services.companies.getCompanyUser(
+      { id: application.company_id },
+      { id: context.user.id },
+    );
+    if (!compUser || !hasCompanyAdminLevel(compUser.role)) {
+      throw CrudException.forbidden("You don't have the rights to delete this application");
+    }
+
+    const deleteResult = await gr.services.applications.marketplaceApps.delete(
+      {
+        id: request.params.application_id,
+      },
+      context,
+    );
+
+    if (deleteResult.deleted) {
+      reply.code(204);
+
+      return {
+        status: "success",
+      };
+    }
+
+    return {
+      status: "error",
+    };
+  }
+
+  async event(
+    request: FastifyRequest<{
+      Body: ApplicationEventRequestBody;
+      Params: { application_id: string };
+    }>,
+    _reply: FastifyReply,
+  ): Promise<ResourceCreateResponse<any>> {
+    const context = getExecutionContext(request);
+
+    const content = request.body.data;
+
+    const applicationEntity = await gr.services.applications.marketplaceApps.get(
+      {
+        id: request.params.application_id,
+      },
+      context,
+    );
+
+    if (!applicationEntity) {
+      throw CrudException.notFound("Application not found");
+    }
+
+    const companyUser = gr.services.companies.getCompanyUser(
+      { id: request.body.company_id },
+      { id: context.user.id },
+    );
+
+    if (!companyUser) {
+      throw CrudException.badRequest(
+        "You cannot send event to an application from another company",
+      );
+    }
+
+    const applicationInCompany = await gr.services.applications.companyApps.get({
+      company_id: request.body.company_id,
+      application_id: request.params.application_id,
+      id: undefined,
+    });
+
+    if (!applicationInCompany) {
+      throw CrudException.badRequest("Application isn't installed in this company");
+    }
+
+    const hookResponse = await gr.services.applications.hooks.notifyApp(
+      request.params.application_id,
+      request.body.connection_id,
+      context.user.id,
+      request.body.type,
+      request.body.name,
+      content,
+      request.body.company_id,
+      request.body.workspace_id,
+      context,
+    );
+
+    return {
+      resource: hookResponse,
+    };
+  }
+}
+
+function getExecutionContext(request: FastifyRequest): ExecutionContext {
+  return {
+    user: request.currentUser,
+    url: request.url,
+    method: request.routerMethod,
+    transport: "http",
+  };
+}
diff --git a/twake/backend/node/src/services/applications/web/controllers/company-applications.ts b/twake/backend/node/src/services/applications/web/controllers/company-applications.ts
new file mode 100644
index 00000000..26542e39
--- /dev/null
+++ b/twake/backend/node/src/services/applications/web/controllers/company-applications.ts
@@ -0,0 +1,119 @@
+import { FastifyReply, FastifyRequest } from "fastify";
+
+import {
+  PaginationQueryParameters,
+  ResourceDeleteResponse,
+  ResourceGetResponse,
+  ResourceListResponse,
+  ResourceUpdateResponse,
+} from "../../../../utils/types";
+import { PublicApplicationObject } from "../../entities/application";
+import { CompanyExecutionContext } from "../types";
+import { CrudController } from "../../../../core/platform/services/webserver/types";
+import { getCompanyApplicationRooms } from "../../realtime";
+import gr from "../../../global-resolver";
+
+export class CompanyApplicationController
+  implements
+    CrudController<
+      ResourceGetResponse<PublicApplicationObject>,
+      ResourceUpdateResponse<PublicApplicationObject>,
+      ResourceListResponse<PublicApplicationObject>,
+      ResourceDeleteResponse
+    >
+{
+  async get(
+    request: FastifyRequest<{ Params: { company_id: string; application_id: string } }>,
+  ): Promise<ResourceGetResponse<PublicApplicationObject>> {
+    const context = getCompanyExecutionContext(request);
+    const resource = await gr.services.applications.companyApps.get(
+      {
+        application_id: request.params.application_id,
+        company_id: context.company.id,
+        id: undefined,
+      },
+      context,
+    );
+    return {
+      resource: resource?.application,
+    };
+  }
+
+  async list(
+    request: FastifyRequest<{
+      Params: { company_id: string };
+      Querystring: PaginationQueryParameters & { search: string };
+    }>,
+  ): Promise<ResourceListResponse<PublicApplicationObject>> {
+    const context = getCompanyExecutionContext(request);
+    const resources = await gr.services.applications.companyApps.list(
+      request.query,
+      { search: request.query.search },
+      context,
+    );
+
+    return {
+      resources: resources.getEntities().map(ca => ca.application),
+      next_page_token: resources.nextPage.page_token,
+      websockets:
+        gr.platformServices.realtime.sign(
+          getCompanyApplicationRooms(request.params.company_id),
+          context.user.id,
+        ) || [],
+    };
+  }
+
+  async save(
+    request: FastifyRequest<{
+      Params: { company_id: string; application_id: string };
+      Body: PublicApplicationObject;
+    }>,
+  ): Promise<ResourceGetResponse<PublicApplicationObject>> {
+    const context = getCompanyExecutionContext(request);
+
+    const resource = await gr.services.applications.companyApps.save(
+      { application_id: request.params.application_id, company_id: context.company.id },
+      {},
+      context,
+    );
+
+    const app = await gr.services.applications.companyApps.get(resource.entity);
+
+    return {
+      resource: app.application,
+    };
+  }
+
+  async delete(
+    request: FastifyRequest<{ Params: { company_id: string; application_id: string } }>,
+    _reply: FastifyReply,
+  ): Promise<ResourceDeleteResponse> {
+    const context = getCompanyExecutionContext(request);
+    const resource = await gr.services.applications.companyApps.delete(
+      {
+        application_id: request.params.application_id,
+        company_id: context.company.id,
+        id: undefined,
+      },
+      context,
+    );
+    return {
+      status: resource.deleted ? "success" : "error",
+    };
+  }
+}
+
+function getCompanyExecutionContext(
+  request: FastifyRequest<{
+    Params: { company_id: string };
+  }>,
+): CompanyExecutionContext {
+  return {
+    user: request.currentUser,
+    company: { id: request.params.company_id },
+    url: request.url,
+    method: request.routerMethod,
+    reqId: request.id,
+    transport: "http",
+  };
+}
diff --git a/twake/backend/node/src/services/applications/web/controllers/index.ts b/twake/backend/node/src/services/applications/web/controllers/index.ts
new file mode 100644
index 00000000..ef52722d
--- /dev/null
+++ b/twake/backend/node/src/services/applications/web/controllers/index.ts
@@ -0,0 +1 @@
+export * from "./applications";
diff --git a/twake/backend/node/src/services/applications/web/index.ts b/twake/backend/node/src/services/applications/web/index.ts
new file mode 100644
index 00000000..3c2df979
--- /dev/null
+++ b/twake/backend/node/src/services/applications/web/index.ts
@@ -0,0 +1,12 @@
+import { FastifyInstance, FastifyRegisterOptions } from "fastify";
+import routes from "./routes";
+
+export default (
+  fastify: FastifyInstance,
+  options: FastifyRegisterOptions<{
+    prefix: string;
+  }>,
+): void => {
+  fastify.log.debug("Configuring /internal/services/applications/v1 routes");
+  fastify.register(routes, options);
+};
diff --git a/twake/backend/node/src/services/applications/web/routes.ts b/twake/backend/node/src/services/applications/web/routes.ts
new file mode 100644
index 00000000..3d5835c7
--- /dev/null
+++ b/twake/backend/node/src/services/applications/web/routes.ts
@@ -0,0 +1,161 @@
+import { FastifyInstance, FastifyPluginCallback, FastifyRequest } from "fastify";
+import { ApplicationController } from "./controllers/applications";
+import { CompanyApplicationController } from "./controllers/company-applications";
+
+import Application from "../entities/application";
+import { applicationEventHookSchema, applicationPostSchema } from "./schemas";
+import { logger as log } from "../../../core/platform/framework";
+import { checkUserBelongsToCompany, hasCompanyAdminLevel } from "../../../utils/company";
+import gr from "../../global-resolver";
+
+const applicationsUrl = "/applications";
+const companyApplicationsUrl = "/companies/:company_id/applications";
+
+const routes: FastifyPluginCallback = (fastify: FastifyInstance, options, next) => {
+  const applicationController = new ApplicationController();
+  const companyApplicationController = new CompanyApplicationController();
+
+  const adminCheck = async (
+    request: FastifyRequest<{
+      Body: { resource: Application };
+      Params: { application_id: string };
+    }>,
+  ) => {
+    try {
+      let companyId: string = request.body?.resource?.company_id;
+
+      if (request.params.application_id) {
+        const application = await gr.services.applications.marketplaceApps.get(
+          {
+            id: request.params.application_id,
+          },
+          undefined,
+        );
+
+        if (!application) {
+          throw fastify.httpErrors.notFound("Application is not defined");
+        }
+
+        companyId = application.company_id;
+      }
+
+      const userId = request.currentUser.id;
+
+      if (!companyId) {
+        throw fastify.httpErrors.forbidden(`Company ${companyId} not found`);
+      }
+
+      const companyUser = await checkUserBelongsToCompany(userId, companyId);
+
+      if (!hasCompanyAdminLevel(companyUser.role)) {
+        throw fastify.httpErrors.forbidden("You must be an admin of this company");
+      }
+    } catch (e) {
+      log.error(e);
+      throw e;
+    }
+  };
+
+  /**
+   * Applications collection
+   * Marketplace of applications
+   */
+
+  //Get and search list of applications in the marketplace
+  fastify.route({
+    method: "GET",
+    url: `${applicationsUrl}`,
+    preValidation: [fastify.authenticate],
+    // schema: applicationGetSchema,
+    handler: applicationController.list.bind(applicationController),
+  });
+
+  //Get a single application in the marketplace
+  fastify.route({
+    method: "GET",
+    url: `${applicationsUrl}/:application_id`,
+    preValidation: [fastify.authenticate],
+    // schema: applicationGetSchema,
+    handler: applicationController.get.bind(applicationController),
+  });
+
+  //Create application (must be my company application and I must be company admin)
+  fastify.route({
+    method: "POST",
+    url: `${applicationsUrl}`,
+    preHandler: [adminCheck],
+    preValidation: [fastify.authenticate],
+    schema: applicationPostSchema,
+    handler: applicationController.save.bind(applicationController),
+  });
+
+  //Edit application (must be my company application and I must be company admin)
+  fastify.route({
+    method: "POST",
+    url: `${applicationsUrl}/:application_id`,
+    preHandler: [adminCheck],
+    preValidation: [fastify.authenticate],
+    schema: applicationPostSchema,
+    handler: applicationController.save.bind(applicationController),
+  });
+
+  // Delete application (must be my company application and I must be company admin)
+  fastify.route({
+    method: "DELETE",
+    url: `${applicationsUrl}/:application_id`,
+    preHandler: [adminCheck],
+    preValidation: [fastify.authenticate],
+    handler: applicationController.delete.bind(applicationController),
+  });
+
+  /**
+   * Company applications collection
+   * Company-wide available applications
+   * (must be my company application and I must be company admin)
+   */
+
+  //Get list of applications for a company
+  fastify.route({
+    method: "GET",
+    url: `${companyApplicationsUrl}`,
+    preValidation: [fastify.authenticate],
+    handler: companyApplicationController.list.bind(companyApplicationController),
+  });
+
+  //Get one application of a company
+  fastify.route({
+    method: "GET",
+    url: `${companyApplicationsUrl}/:application_id`,
+    preValidation: [fastify.authenticate],
+    handler: companyApplicationController.get.bind(companyApplicationController),
+  });
+
+  //Remove an application from a company
+  fastify.route({
+    method: "DELETE",
+    url: `${companyApplicationsUrl}/:application_id`,
+    preValidation: [fastify.authenticate],
+    handler: companyApplicationController.delete.bind(companyApplicationController),
+  });
+
+  //Add an application to the company
+  fastify.route({
+    method: "POST",
+    url: `${companyApplicationsUrl}/:application_id`,
+    preValidation: [fastify.authenticate],
+    handler: companyApplicationController.save.bind(companyApplicationController),
+  });
+
+  //Application event triggered by a user
+  fastify.route({
+    method: "POST",
+    url: `${applicationsUrl}/:application_id/event`,
+    preValidation: [fastify.authenticate],
+    schema: applicationEventHookSchema,
+    handler: applicationController.event.bind(applicationController),
+  });
+
+  next();
+};
+
+export default routes;
diff --git a/twake/backend/node/src/services/applications/web/schemas.ts b/twake/backend/node/src/services/applications/web/schemas.ts
new file mode 100644
index 00000000..996cea70
--- /dev/null
+++ b/twake/backend/node/src/services/applications/web/schemas.ts
@@ -0,0 +1,129 @@
+export const applicationsSchema = {
+  type: "object",
+  properties: {},
+};
+
+const applicationIdentity = {
+  type: "object",
+  properties: {
+    code: { type: "string" },
+    name: { type: "string" },
+    icon: { type: "string" },
+    description: { type: "string" },
+    website: { type: "string" },
+    categories: { type: "array", items: { type: "string" } },
+    compatibility: { type: "array", items: { type: "string" } },
+  },
+  required: ["code", "name", "icon", "description", "website", "categories", "compatibility"],
+};
+
+const applicationAccess = {
+  type: "object",
+  properties: {
+    read: { type: "array", items: { type: "string" } },
+    write: { type: "array", items: { type: "string" } },
+    delete: { type: "array", items: { type: "string" } },
+    hooks: { type: "array", items: { type: "string" } },
+  },
+  required: ["read", "write", "delete", "hooks"],
+};
+
+const requestApplicationPublication = {
+  type: "object",
+  properties: {
+    requested: { type: "boolean" },
+  },
+  required: ["requested"],
+};
+
+const responseApplicationPublication = {
+  type: "object",
+  properties: {
+    published: { type: "boolean" },
+    requested: { type: "boolean" },
+  },
+  required: ["requested", "published"],
+};
+
+const applicationStats = {
+  type: "object",
+  properties: {
+    created_at: { type: "number" },
+    updated_at: { type: "number" },
+    version: { type: "number" },
+  },
+  required: ["created_at", "updated_at", "version"],
+};
+
+const apiObject = {
+  type: "object",
+  properties: {
+    hooks_url: { type: "string" },
+    allowed_ips: { type: "string" },
+    private_key: { type: "string" },
+  },
+  required: ["hooks_url", "allowed_ips"],
+};
+
+const requestApplicationObject = {
+  type: "object",
+  properties: {
+    company_id: { type: "string" },
+    identity: applicationIdentity,
+    access: applicationAccess,
+    display: {},
+    api: apiObject,
+    publication: requestApplicationPublication,
+  },
+  required: ["company_id", "identity", "access", "display", "api", "publication"],
+  additionalProperties: false,
+};
+
+const responseApplicationObject = {
+  type: "object",
+  properties: {
+    id: { type: "string" },
+    is_default: { type: "boolean" },
+    company_id: { type: "string" },
+    identity: applicationIdentity,
+    access: applicationAccess,
+    display: {},
+    publication: responseApplicationPublication,
+    api: apiObject,
+    stats: applicationStats,
+  },
+  required: [
+    "id",
+    "is_default",
+    "company_id",
+    "identity",
+    "access",
+    "display",
+    "publication",
+    "stats",
+  ],
+  additionalProperties: false,
+};
+
+export const applicationPostSchema = {
+  body: { type: "object", properties: { resource: requestApplicationObject } },
+  response: {
+    "2xx": {
+      resource: responseApplicationObject,
+    },
+  },
+};
+
+export const applicationEventHookSchema = {
+  body: {
+    type: "object",
+    properties: {
+      company_id: { type: "string" },
+      workspace_id: { type: "string" },
+      type: { type: "string" },
+      name: { type: "string" },
+      content: {},
+    },
+    required: ["company_id", "workspace_id", "type", "content"],
+  },
+};
diff --git a/twake/backend/node/src/services/applications/web/types.ts b/twake/backend/node/src/services/applications/web/types.ts
new file mode 100644
index 00000000..5a60f3b3
--- /dev/null
+++ b/twake/backend/node/src/services/applications/web/types.ts
@@ -0,0 +1,15 @@
+import { ExecutionContext } from "../../../core/platform/framework/api/crud-service";
+
+export interface CompanyExecutionContext extends ExecutionContext {
+  company: { id: string };
+}
+
+export interface ApplicationEventRequestBody {
+  company_id: string;
+  workspace_id: string;
+  connection_id: string;
+  type: string;
+  name?: string;
+  content: any;
+  data: any;
+}
diff --git a/twake/backend/node/src/services/channels/index.ts b/twake/backend/node/src/services/channels/index.ts
index 1aec35f8..e9ad5571 100644
--- a/twake/backend/node/src/services/channels/index.ts
+++ b/twake/backend/node/src/services/channels/index.ts
@@ -1,9 +1,9 @@
-import { Prefix, TwakeService } from "../../core/platform/framework";
+import { Prefix, TdriveService } from "../../core/platform/framework";
 import WebServerAPI from "../../core/platform/services/webserver/provider";
 import web from "./web";
 
 @Prefix("/internal/services/channels/v1")
-export default class ChannelService extends TwakeService<undefined> {
+export default class ChannelService extends TdriveService<undefined> {
   version = "1";
   name = "channels";
 
diff --git a/twake/backend/node/src/services/channels/services/member/service.ts b/twake/backend/node/src/services/channels/services/member/service.ts
index 014f19ce..f16aadbd 100644
--- a/twake/backend/node/src/services/channels/services/member/service.ts
+++ b/twake/backend/node/src/services/channels/services/member/service.ts
@@ -26,7 +26,6 @@ import {
   ChannelMemberType,
   ChannelVisibility,
   WorkspaceExecutionContext,
-  CompanyExecutionContext,
 } from "../../types";
 import { Channel, ResourceEventsPayload, User } from "../../../../utils/types";
 import { cloneDeep, isNil, omitBy } from "lodash";
@@ -53,7 +52,7 @@ import { WorkspacePrimaryKey } from "../../../workspaces/entities/workspace";
 import gr from "../../../global-resolver";
 import uuidTime from "uuid-time";
 import { ChannelObject } from "../channel/types";
-
+import { CompanyExecutionContext } from "../../../applications/web/types";
 const USER_CHANNEL_KEYS = [
   "id",
   "company_id",
diff --git a/twake/backend/node/src/services/channels/types.ts b/twake/backend/node/src/services/channels/types.ts
index 0b9e4a28..20894579 100644
--- a/twake/backend/node/src/services/channels/types.ts
+++ b/twake/backend/node/src/services/channels/types.ts
@@ -52,7 +52,3 @@ export type ChannelActivityNotification = {
   sender_name: string;
   body: string;
 };
-
-export interface CompanyExecutionContext extends ExecutionContext {
-  company: { id: string };
-}
diff --git a/twake/backend/node/src/services/console/client-interface.ts b/twake/backend/node/src/services/console/client-interface.ts
index af2d4eae..440147b3 100644
--- a/twake/backend/node/src/services/console/client-interface.ts
+++ b/twake/backend/node/src/services/console/client-interface.ts
@@ -31,11 +31,11 @@ export interface ConsoleServiceClient {
   addUserToCompany(company: ConsoleCompany, user: CreateConsoleUser): Promise<CreatedConsoleUser>;
 
   /**
-   * Add user to twake in general (for non-console version)
+   * Add user to tdrive in general (for non-console version)
    *
    * @param user
    */
-  addUserToTwake(user: CreateInternalUser): Promise<User>;
+  addUserToTdrive(user: CreateInternalUser): Promise<User>;
 
   /**
    * Update user role
diff --git a/twake/backend/node/src/services/console/clients/internal.ts b/twake/backend/node/src/services/console/clients/internal.ts
index ade2763d..ccbbfed9 100644
--- a/twake/backend/node/src/services/console/clients/internal.ts
+++ b/twake/backend/node/src/services/console/clients/internal.ts
@@ -49,8 +49,8 @@ export class ConsoleInternalClient implements ConsoleServiceClient {
     throw Error("ConsoleInternalClient.createCompany is not implemented");
   }
 
-  async addUserToTwake(user: CreateConsoleUser): Promise<User> {
-    logger.info("Internal: addUserToTwake");
+  async addUserToTdrive(user: CreateConsoleUser): Promise<User> {
+    logger.info("Internal: addUserToTdrive");
     const userToCreate = getUserInstance({
       id: uuidv1(),
       email_canonical: user.email,
diff --git a/twake/backend/node/src/services/console/clients/remote.ts b/twake/backend/node/src/services/console/clients/remote.ts
index 78db34b1..79e715cf 100644
--- a/twake/backend/node/src/services/console/clients/remote.ts
+++ b/twake/backend/node/src/services/console/clients/remote.ts
@@ -37,16 +37,17 @@ export class ConsoleRemoteClient implements ConsoleServiceClient {
       issuer: this.infos.issuer?.replace(/\/+$/, ""),
       jwksUri: this.infos.jwks_uri,
       // For local deployment create a https agent that ignore self signed certificate
+      // eslint-disable-next-line @typescript-eslint/no-var-requires
       requestAgent: new (require("https").Agent)({
         rejectUnauthorized: this.infos.issuer.includes("example.com") ? false : true,
       }),
     });
   }
   fetchCompanyInfo(consoleCompanyCode: string): Promise<ConsoleHookCompany> {
-    throw new Error("Method not implemented.");
+    throw new Error(`Method not implemented, ${consoleCompanyCode}.`);
   }
   resendVerificationEmail(email: string): Promise<void> {
-    throw new Error("Method not implemented.");
+    throw new Error(`Method not implemented, ${email}.`);
   }
 
   private auth() {
@@ -57,6 +58,7 @@ export class ConsoleRemoteClient implements ConsoleServiceClient {
     company: ConsoleCompany,
     user: CreateConsoleUser,
   ): Promise<CreatedConsoleUser> {
+    logger.info(`Method not implemented, ${company.id}, ${user.id}.`);
     return null;
   }
 
@@ -65,22 +67,25 @@ export class ConsoleRemoteClient implements ConsoleServiceClient {
     user: UpdateConsoleUserRole,
   ): Promise<UpdatedConsoleUserRole> {
     logger.info("Remote: updateUserRole");
+    logger.info(`Method not implemented, ${company.id}, ${user.id}.`);
     return null;
   }
 
   async createCompany(company: CreateConsoleCompany): Promise<CreatedConsoleCompany> {
     logger.info("Remote: createCompany");
+    logger.info(`Method not implemented, ${company}.`);
     return null;
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  addUserToTwake(user: CreateConsoleUser): Promise<User> {
-    logger.info("Remote: addUserToTwake");
+  addUserToTdrive(user: CreateConsoleUser): Promise<User> {
+    logger.info("Remote: addUserToTdrive");
     //should do noting for real console
     return Promise.resolve(undefined);
   }
 
   async updateLocalCompanyFromConsole(partialCompanyDTO: ConsoleHookCompany): Promise<Company> {
+    logger.info(`Method not implemented, ${partialCompanyDTO}.`);
     return null;
   }
 
@@ -92,9 +97,12 @@ export class ConsoleRemoteClient implements ConsoleServiceClient {
     }
 
     const roles = userDTO.roles.filter(
-      role => role.applications === undefined || role.applications.find(a => a.code === "twake"),
+      role => role.applications === undefined || role.applications.find(a => a.code === "tdrive"),
     );
 
+    //REMOVE LATER
+    logger.info(`Roles are: ${roles}.`);
+
     let user = await gr.services.users.getByConsoleId(userDTO.email);
 
     if (!user) {
@@ -153,7 +161,7 @@ export class ConsoleRemoteClient implements ConsoleServiceClient {
       company = await gr.services.companies.createCompany(
         getCompanyInstance({
           id: "00000000-0000-4000-0000-000000000000",
-          name: "Twake",
+          name: "Tdrive",
           plan: { name: "Local", limits: undefined, features: undefined },
         }),
       );
@@ -182,7 +190,7 @@ export class ConsoleRemoteClient implements ConsoleServiceClient {
     const user = await gr.services.users.getByConsoleId(consoleUserId);
 
     if (!user) {
-      throw new Error("User does not exists on Twake.");
+      throw new Error("User does not exists on Tdrive.");
     }
 
     await gr.services.users.anonymizeAndDelete(
diff --git a/twake/backend/node/src/services/console/index.ts b/twake/backend/node/src/services/console/index.ts
index 43eac0d2..84ee1c14 100644
--- a/twake/backend/node/src/services/console/index.ts
+++ b/twake/backend/node/src/services/console/index.ts
@@ -1,9 +1,9 @@
-import { Prefix, TwakeService } from "../../core/platform/framework";
+import { Prefix, TdriveService } from "../../core/platform/framework";
 import WebServerAPI from "../../core/platform/services/webserver/provider";
 import web from "./web";
 
 @Prefix("/internal/services/console/v1")
-export default class ConsoleService extends TwakeService<undefined> {
+export default class ConsoleService extends TdriveService<undefined> {
   version = "1";
   name = "console";
 
diff --git a/twake/backend/node/src/services/console/service.ts b/twake/backend/node/src/services/console/service.ts
index afd60e08..c8c9342a 100644
--- a/twake/backend/node/src/services/console/service.ts
+++ b/twake/backend/node/src/services/console/service.ts
@@ -4,11 +4,11 @@ import { ConsoleServiceClient } from "./client-interface";
 import { ConsoleClientFactory } from "./client-factory";
 import User from "../user/entities/user";
 import gr from "../global-resolver";
-import { Configuration, TwakeServiceProvider } from "../../core/platform/framework";
+import { Configuration, TdriveServiceProvider } from "../../core/platform/framework";
 import assert from "assert";
 import { ExecutionContext } from "../../core/platform/framework/api/crud-service";
 
-export class ConsoleServiceImpl implements TwakeServiceProvider {
+export class ConsoleServiceImpl implements TdriveServiceProvider {
   version: "1";
 
   consoleType: ConsoleType;
diff --git a/twake/backend/node/src/services/console/types.ts b/twake/backend/node/src/services/console/types.ts
index 59ff0bd6..310fe281 100644
--- a/twake/backend/node/src/services/console/types.ts
+++ b/twake/backend/node/src/services/console/types.ts
@@ -22,7 +22,7 @@ export interface CreateConsoleCompany {
   limits?: {
     members?: number; //Old console version
     guests?: number; //Old console version
-    twake: {
+    tdrive: {
       members: number;
       guests: number;
       storage: number;
@@ -141,7 +141,7 @@ export type ConsoleHookCompany = {
   limits: {
     members?: number; //Old console version
     guests?: number; //Old console version
-    twake: {
+    tdrive: {
       members: number;
       guests: number;
       storage: number;
@@ -169,7 +169,7 @@ export type ConsoleHookUser = {
       roleCode: CompanyUserRole;
       status: "active" | "deactivated";
       applications: {
-        code: "twake";
+        code: "tdrive";
       }[];
     },
   ];
diff --git a/twake/backend/node/src/services/console/web/controller.ts b/twake/backend/node/src/services/console/web/controller.ts
index 2fdbc35b..3ba492e6 100644
--- a/twake/backend/node/src/services/console/web/controller.ts
+++ b/twake/backend/node/src/services/console/web/controller.ts
@@ -80,7 +80,7 @@ export class ConsoleController {
         let company = companies.getEntities()?.[0];
         if (!company) {
           const newCompany = getCompanyInstance({
-            name: "Twake",
+            name: "Tdrive",
             plan: { name: "Local", limits: undefined, features: undefined },
           });
           company = await gr.services.companies.createCompany(newCompany);
@@ -238,7 +238,7 @@ export class ConsoleController {
 
   private async userUpdated(code: string) {
     //Not implemented yet
-    throw CrudException.notImplemented("Unimplemented");
+    throw CrudException.notImplemented(`Method not implemented, ${code}.`);
   }
 
   private async companyRemoved(content: ConsoleHookCompanyDeletedContent) {
diff --git a/twake/backend/node/src/services/console/web/routes.ts b/twake/backend/node/src/services/console/web/routes.ts
index 6fc96220..7edcd1b2 100644
--- a/twake/backend/node/src/services/console/web/routes.ts
+++ b/twake/backend/node/src/services/console/web/routes.ts
@@ -12,7 +12,7 @@ const routes: FastifyPluginCallback = (fastify: FastifyInstance, options, next)
   const accessControl = async (
     request: FastifyRequest<{ Body: ConsoleHookBody; Querystring: ConsoleHookQueryString }>,
   ) => {
-    throw fastify.httpErrors.notImplemented("Hook service doesn't exist anymore");
+    throw fastify.httpErrors.notImplemented(`Hook service doesn't exist anymore, ${request}.`);
   };
 
   fastify.route({
diff --git a/twake/backend/node/src/services/documents/entities/drive-twake-tab.ts b/twake/backend/node/src/services/documents/entities/drive-tdrive-tab.ts
similarity index 89%
rename from twake/backend/node/src/services/documents/entities/drive-twake-tab.ts
rename to twake/backend/node/src/services/documents/entities/drive-tdrive-tab.ts
index ca8fb6cb..d1fb5dd9 100644
--- a/twake/backend/node/src/services/documents/entities/drive-twake-tab.ts
+++ b/twake/backend/node/src/services/documents/entities/drive-tdrive-tab.ts
@@ -1,13 +1,13 @@
 import { Type } from "class-transformer";
 import { Column, Entity } from "../../../core/platform/services/database/services/orm/decorators";
 
-export const TYPE = "drive_twake_tab";
+export const TYPE = "drive_tdrive_tab";
 
 @Entity(TYPE, {
   primaryKey: [["company_id"], "tab_id"],
   type: TYPE,
 })
-export class DriveTwakeTab {
+export class DriveTdriveTab {
   @Type(() => String)
   @Column("company_id", "string")
   company_id: string;
diff --git a/twake/backend/node/src/services/documents/index.ts b/twake/backend/node/src/services/documents/index.ts
index 0b93f379..2512558c 100644
--- a/twake/backend/node/src/services/documents/index.ts
+++ b/twake/backend/node/src/services/documents/index.ts
@@ -1,9 +1,9 @@
-import { Prefix, TwakeService } from "../../core/platform/framework";
+import { Prefix, TdriveService } from "../../core/platform/framework";
 import WebServerAPI from "../../core/platform/services/webserver/provider";
 import web from "./web";
 
 @Prefix("/internal/services/documents/v1")
-export default class DocumentsService extends TwakeService<undefined> {
+export default class DocumentsService extends TdriveService<undefined> {
   version = "1";
   name = "documents";
 
diff --git a/twake/backend/node/src/services/documents/services/index.ts b/twake/backend/node/src/services/documents/services/index.ts
index 6dc760b8..39a07910 100644
--- a/twake/backend/node/src/services/documents/services/index.ts
+++ b/twake/backend/node/src/services/documents/services/index.ts
@@ -1,5 +1,5 @@
 import SearchRepository from "../../../core/platform/services/search/repository";
-import { getLogger, logger, TwakeLogger } from "../../../core/platform/framework";
+import { getLogger, logger, TdriveLogger } from "../../../core/platform/framework";
 import { CrudException, ListResult } from "../../../core/platform/framework/api/crud-service";
 import Repository from "../../../core/platform/services/database/services/orm/repository/repository";
 import { PublicFile } from "../../../services/files/entities/file";
@@ -9,9 +9,9 @@ import gr from "../../global-resolver";
 import { DriveFile, TYPE } from "../entities/drive-file";
 import { FileVersion, TYPE as FileVersionType } from "../entities/file-version";
 import {
-  DriveTwakeTab as DriveTwakeTabEntity,
-  TYPE as DriveTwakeTabRepoType,
-} from "../entities/drive-twake-tab";
+  DriveTdriveTab as DriveTdriveTabEntity,
+  TYPE as DriveTdriveTabRepoType,
+} from "../entities/drive-tdrive-tab";
 import {
   DriveExecutionContext,
   DocumentsMessageQueueRequest,
@@ -20,7 +20,7 @@ import {
   SearchDocumentsOptions,
   TrashType,
   CompanyExecutionContext,
-  DriveTwakeTab,
+  DriveTdriveTab,
 } from "../types";
 import {
   addDriveItemToArchive,
@@ -51,10 +51,10 @@ export class DocumentsService {
   repository: Repository<DriveFile>;
   searchRepository: SearchRepository<DriveFile>;
   fileVersionRepository: Repository<FileVersion>;
-  driveTwakeTabRepository: Repository<DriveTwakeTabEntity>;
+  driveTdriveTabRepository: Repository<DriveTdriveTabEntity>;
   ROOT: RootType = "root";
   TRASH: TrashType = "trash";
-  logger: TwakeLogger = getLogger("Documents Service");
+  logger: TdriveLogger = getLogger("Documents Service");
 
   async init(): Promise<this> {
     try {
@@ -67,10 +67,10 @@ export class DocumentsService {
         FileVersionType,
         FileVersion,
       );
-      this.driveTwakeTabRepository =
-        await globalResolver.database.getRepository<DriveTwakeTabEntity>(
-          DriveTwakeTabRepoType,
-          DriveTwakeTabEntity,
+      this.driveTdriveTabRepository =
+        await globalResolver.database.getRepository<DriveTdriveTabEntity>(
+          DriveTdriveTabRepoType,
+          DriveTdriveTabEntity,
         );
     } catch (error) {
       logger.error("Error while initializing Documents Service", error);
@@ -769,8 +769,8 @@ export class DocumentsService {
     return new ListResult(result.type, filteredResult, result.nextPage);
   };
 
-  getTab = async (tabId: string, context: CompanyExecutionContext): Promise<DriveTwakeTab> => {
-    const tab = await this.driveTwakeTabRepository.findOne(
+  getTab = async (tabId: string, context: CompanyExecutionContext): Promise<DriveTdriveTab> => {
+    const tab = await this.driveTdriveTabRepository.findOne(
       { company_id: context.company.id, tab_id: tabId },
       {},
       context,
@@ -784,7 +784,7 @@ export class DocumentsService {
     itemId: string,
     level: "read" | "write",
     context: CompanyExecutionContext,
-  ): Promise<DriveTwakeTab> => {
+  ): Promise<DriveTdriveTab> => {
     const hasAccess = await checkAccess(itemId, null, "manage", this.repository, context);
 
     if (!hasAccess) {
@@ -801,8 +801,8 @@ export class DocumentsService {
       context,
     );
 
-    await this.driveTwakeTabRepository.save(
-      Object.assign(new DriveTwakeTabEntity(), {
+    await this.driveTdriveTabRepository.save(
+      Object.assign(new DriveTdriveTabEntity(), {
         company_id: context.company.id,
         tab_id: tabId,
         channel_id: channelId,
diff --git a/twake/backend/node/src/services/documents/types.ts b/twake/backend/node/src/services/documents/types.ts
index 79d5f360..2d77c6bc 100644
--- a/twake/backend/node/src/services/documents/types.ts
+++ b/twake/backend/node/src/services/documents/types.ts
@@ -66,7 +66,7 @@ export type exportKeywordPayload = {
   company_id: string;
 };
 
-export type DriveTwakeTab = {
+export type DriveTdriveTab = {
   company_id: string;
   tab_id: string;
   channel_id: string;
diff --git a/twake/backend/node/src/services/documents/utils.ts b/twake/backend/node/src/services/documents/utils.ts
index 31f847bf..221f7d4f 100644
--- a/twake/backend/node/src/services/documents/utils.ts
+++ b/twake/backend/node/src/services/documents/utils.ts
@@ -318,7 +318,7 @@ export const checkAccess = async (
   item: DriveFile | null,
   level: DriveFileAccessLevel,
   repository: Repository<DriveFile>,
-  context: CompanyExecutionContext & { public_token?: string; twake_tab_token?: string },
+  context: CompanyExecutionContext & { public_token?: string; tdrive_tab_token?: string },
 ): Promise<boolean> => {
   if (context.user?.server_request) {
     return true;
@@ -346,7 +346,7 @@ export const getAccessLevel = async (
   id: string,
   item: DriveFile | null,
   repository: Repository<DriveFile>,
-  context: CompanyExecutionContext & { public_token?: string; twake_tab_token?: string },
+  context: CompanyExecutionContext & { public_token?: string; tdrive_tab_token?: string },
 ): Promise<DriveFileAccessLevel | "none"> => {
   if (!id || id === "root")
     return !context?.user?.id ? "none" : (await isCompanyGuest(context)) ? "read" : "manage";
@@ -393,9 +393,9 @@ export const getAccessLevel = async (
       if (matchingUser) return matchingUser.level;
 
       //Channels
-      if (context.twake_tab_token) {
+      if (context.tdrive_tab_token) {
         try {
-          const [channelId] = context.twake_tab_token.split("+"); //First item will be the channel id
+          const [channelId] = context.tdrive_tab_token.split("+"); //First item will be the channel id
           const matchingChannel = accessEntities.find(
             a => a.type === "channel" && a.id === channelId,
           );
diff --git a/twake/backend/node/src/services/documents/web/controllers/documents.ts b/twake/backend/node/src/services/documents/web/controllers/documents.ts
index c5e4cdfe..3253a21c 100644
--- a/twake/backend/node/src/services/documents/web/controllers/documents.ts
+++ b/twake/backend/node/src/services/documents/web/controllers/documents.ts
@@ -11,7 +11,7 @@ import {
   CompanyExecutionContext,
   DriveExecutionContext,
   DriveItemDetails,
-  DriveTwakeTab,
+  DriveTdriveTab,
   ItemRequestParams,
   RequestParams,
   SearchDocumentsBody,
@@ -338,7 +338,7 @@ export class DocumentsController {
     request: FastifyRequest<{
       Params: { tab_id: string; company_id: string };
     }>,
-  ): Promise<DriveTwakeTab> => {
+  ): Promise<DriveTdriveTab> => {
     const context = getCompanyExecutionContext(request);
     const { tab_id } = request.params;
 
@@ -348,9 +348,9 @@ export class DocumentsController {
   setTab = async (
     request: FastifyRequest<{
       Params: { tab_id: string; company_id: string };
-      Body: DriveTwakeTab;
+      Body: DriveTdriveTab;
     }>,
-  ): Promise<DriveTwakeTab> => {
+  ): Promise<DriveTdriveTab> => {
     const context = getCompanyExecutionContext(request);
     const { tab_id } = request.params;
 
diff --git a/twake/backend/node/src/services/files/index.ts b/twake/backend/node/src/services/files/index.ts
index da5bab3d..b80f28f5 100644
--- a/twake/backend/node/src/services/files/index.ts
+++ b/twake/backend/node/src/services/files/index.ts
@@ -1,9 +1,9 @@
-import { Prefix, TwakeService } from "../../core/platform/framework";
+import { Prefix, TdriveService } from "../../core/platform/framework";
 import WebServerAPI from "../../core/platform/services/webserver/provider";
 import web from "./web";
 
 @Prefix("/internal/services/files/v1")
-export default class FilesService extends TwakeService<undefined> {
+export default class FilesService extends TdriveService<undefined> {
   version = "1";
   name = "files";
 
diff --git a/twake/backend/node/src/services/files/services/index.ts b/twake/backend/node/src/services/files/services/index.ts
index efa1cdaa..e8ff1ac8 100644
--- a/twake/backend/node/src/services/files/services/index.ts
+++ b/twake/backend/node/src/services/files/services/index.ts
@@ -227,5 +227,5 @@ export class FileServiceImpl {
 }
 
 function getFilePath(entity: File): string {
-  return `/twake/files/${entity.company_id}/${entity.user_id || "anonymous"}/${entity.id}`;
+  return `/tdrive/files/${entity.company_id}/${entity.user_id || "anonymous"}/${entity.id}`;
 }
diff --git a/twake/backend/node/src/services/general/api.ts b/twake/backend/node/src/services/general/api.ts
index 00fc56fc..371bbb7b 100644
--- a/twake/backend/node/src/services/general/api.ts
+++ b/twake/backend/node/src/services/general/api.ts
@@ -1,3 +1,3 @@
-import { Initializable, TwakeServiceProvider } from "../../core/platform/framework/api";
+import { Initializable, TdriveServiceProvider } from "../../core/platform/framework/api";
 
-export interface GeneralServiceAPI extends TwakeServiceProvider, Initializable {}
+export interface GeneralServiceAPI extends TdriveServiceProvider, Initializable {}
diff --git a/twake/backend/node/src/services/general/index.ts b/twake/backend/node/src/services/general/index.ts
index e0396478..28da91c3 100644
--- a/twake/backend/node/src/services/general/index.ts
+++ b/twake/backend/node/src/services/general/index.ts
@@ -1,12 +1,12 @@
 import WebServerAPI from "../../core/platform/services/webserver/provider";
-import { Consumes, Prefix, TwakeService } from "../../core/platform/framework";
+import { Consumes, Prefix, TdriveService } from "../../core/platform/framework";
 import { GeneralServiceAPI } from "./api";
 import web from "./web/index";
 import { ServerConfiguration } from "./types";
 
 @Prefix("/internal/services/general/v1")
 @Consumes(["webserver"])
-export default class GeneralService extends TwakeService<GeneralServiceAPI> {
+export default class GeneralService extends TdriveService<GeneralServiceAPI> {
   version = "1";
   name = "general";
   service: GeneralServiceAPI;
diff --git a/twake/backend/node/src/services/global-resolver.ts b/twake/backend/node/src/services/global-resolver.ts
index a7f111ed..bc8b519f 100644
--- a/twake/backend/node/src/services/global-resolver.ts
+++ b/twake/backend/node/src/services/global-resolver.ts
@@ -1,7 +1,7 @@
 import { FastifyInstance } from "fastify";
 import { IncomingMessage, Server, ServerResponse } from "http";
 
-import { TwakePlatform } from "../core/platform/platform";
+import { TdrivePlatform } from "../core/platform/platform";
 import { RealtimeServiceAPI } from "../core/platform/services/realtime/api";
 import WebServerAPI from "../core/platform/services/webserver/provider";
 import { SearchServiceAPI } from "../core/platform/services/search/api";
@@ -25,6 +25,8 @@ import { UserExternalLinksServiceImpl } from "./user/services/external_links";
 import { UserNotificationBadgeService } from "./notifications/services/bages";
 import { NotificationPreferencesService } from "./notifications/services/preferences";
 import { UserServiceImpl } from "./user/services/users/service";
+import { CompanyApplicationServiceImpl } from "./applications/services/company-applications";
+import { ApplicationServiceImpl } from "./applications/services/applications";
 import { FileServiceImpl } from "./files/services";
 import { ChannelServiceImpl } from "./channels/services/channel/service";
 import { MemberServiceImpl } from "./channels/services/member/service";
@@ -36,6 +38,7 @@ import { NotificationEngine } from "./notifications/services/engine";
 import { MobilePushService } from "./notifications/services/mobile-push";
 import { ChannelMemberPreferencesServiceImpl } from "./notifications/services/channel-preferences";
 import { ChannelThreadUsersServiceImpl } from "./notifications/services/channel-thread-users";
+import { ApplicationHooksService } from "./applications/services/hooks";
 import OnlineServiceImpl from "./online/service";
 import { ChannelsMessageQueueListener } from "./channels/services/pubsub";
 import { UserNotificationDigestService } from "./notifications/services/digest";
@@ -59,7 +62,7 @@ type PlatformServices = {
   emailPusher: EmailPusherAPI;
 };
 
-type TwakeServices = {
+type TdriveServices = {
   workspaces: WorkspaceServiceImpl;
   companies: CompanyServiceImpl;
   users: UserServiceImpl;
@@ -75,6 +78,11 @@ type TwakeServices = {
     mobilePush: MobilePushService;
     digest: UserNotificationDigestService;
   };
+  applications: {
+    marketplaceApps: ApplicationServiceImpl;
+    companyApps: CompanyApplicationServiceImpl;
+    hooks: ApplicationHooksService;
+  };
   files: FileServiceImpl;
   channels: {
     channels: ChannelServiceImpl;
@@ -92,7 +100,7 @@ type TwakeServices = {
 };
 
 class GlobalResolver {
-  public services: TwakeServices;
+  public services: TdriveServices;
   public platformServices: PlatformServices;
   public database: DatabaseServiceAPI;
 
@@ -100,7 +108,7 @@ class GlobalResolver {
 
   private alreadyInitialized = false;
 
-  async doInit(platform: TwakePlatform) {
+  async doInit(platform: TdrivePlatform) {
     if (this.alreadyInitialized) {
       return;
     }
@@ -145,6 +153,11 @@ class GlobalResolver {
         mobilePush: await new MobilePushService().init(),
         digest: await new UserNotificationDigestService().init(),
       },
+      applications: {
+        marketplaceApps: await new ApplicationServiceImpl().init(),
+        companyApps: await new CompanyApplicationServiceImpl().init(),
+        hooks: await new ApplicationHooksService().init(),
+      },
       files: await new FileServiceImpl().init(),
       channels: {
         channels: await new ChannelServiceImpl().init(),
@@ -161,7 +174,7 @@ class GlobalResolver {
       tags: await new TagsService().init(),
     };
 
-    Object.keys(this.services).forEach((key: keyof TwakeServices) => {
+    Object.keys(this.services).forEach((key: keyof TdriveServices) => {
       assert(this.services[key], `Service ${key} was not initialized`);
       if (this.services[key].constructor.name == "Object") {
         const subs = this.services[key] as any;
diff --git a/twake/backend/node/src/services/knowledge-graph-web/index.ts b/twake/backend/node/src/services/knowledge-graph-web/index.ts
index 6a6d601b..24e77a28 100644
--- a/twake/backend/node/src/services/knowledge-graph-web/index.ts
+++ b/twake/backend/node/src/services/knowledge-graph-web/index.ts
@@ -1,10 +1,10 @@
-import { Consumes, Prefix, TwakeService } from "../../core/platform/framework";
+import { Consumes, Prefix, TdriveService } from "../../core/platform/framework";
 import WebServerAPI from "../../core/platform/services/webserver/provider";
 import web from "./web/index";
 
 @Prefix("/internal/services/knowledge-graph/v1")
 @Consumes(["webserver"])
-export default class MessageService extends TwakeService<undefined> {
+export default class MessageService extends TdriveService<undefined> {
   version = "1";
   name = "knowledge-graph";
 
diff --git a/twake/backend/node/src/services/notifications/index.ts b/twake/backend/node/src/services/notifications/index.ts
index 10cbb157..eff45ed0 100644
--- a/twake/backend/node/src/services/notifications/index.ts
+++ b/twake/backend/node/src/services/notifications/index.ts
@@ -1,9 +1,9 @@
-import { Prefix, TwakeService } from "../../core/platform/framework";
+import { Prefix, TdriveService } from "../../core/platform/framework";
 import WebServerAPI from "../../core/platform/services/webserver/provider";
 import web from "./web";
 
 @Prefix("/internal/services/notifications/v1")
-export default class NotificationService extends TwakeService<undefined> {
+export default class NotificationService extends TdriveService<undefined> {
   version = "1";
   name = "notifications";
 
diff --git a/twake/backend/node/src/services/notifications/services/bages.ts b/twake/backend/node/src/services/notifications/services/bages.ts
index 4c73b5bd..572c7264 100644
--- a/twake/backend/node/src/services/notifications/services/bages.ts
+++ b/twake/backend/node/src/services/notifications/services/bages.ts
@@ -3,8 +3,8 @@ import {
   Initializable,
   RealtimeDeleted,
   RealtimeSaved,
-  TwakeContext,
-  TwakeServiceProvider,
+  TdriveContext,
+  TdriveServiceProvider,
 } from "../../../core/platform/framework";
 import { ResourcePath } from "../../../core/platform/services/realtime/types";
 import {
@@ -28,11 +28,11 @@ import Repository from "../../../core/platform/services/database/services/orm/re
 import gr from "../../global-resolver";
 import _, { pick, uniq } from "lodash";
 
-export class UserNotificationBadgeService implements TwakeServiceProvider, Initializable {
+export class UserNotificationBadgeService implements TdriveServiceProvider, Initializable {
   version: "1";
   repository: Repository<UserNotificationBadge>;
 
-  async init(context: TwakeContext): Promise<this> {
+  async init(context: TdriveContext): Promise<this> {
     this.repository = await gr.database.getRepository<UserNotificationBadge>(
       UserNotificationBadgeType,
       UserNotificationBadge,
diff --git a/twake/backend/node/src/services/notifications/services/channel-preferences.ts b/twake/backend/node/src/services/notifications/services/channel-preferences.ts
index 8fa21c3f..e876b3ba 100644
--- a/twake/backend/node/src/services/notifications/services/channel-preferences.ts
+++ b/twake/backend/node/src/services/notifications/services/channel-preferences.ts
@@ -11,12 +11,12 @@ import {
   ChannelMemberNotificationPreferencePrimaryKey,
 } from "../entities";
 import Repository from "../../../core/platform/services/database/services/orm/repository/repository";
-import { Initializable, logger, TwakeServiceProvider } from "../../../core/platform/framework";
+import { Initializable, logger, TdriveServiceProvider } from "../../../core/platform/framework";
 import gr from "../../global-resolver";
 
 const TYPE = "channel_members_notification_preferences";
 
-export class ChannelMemberPreferencesServiceImpl implements TwakeServiceProvider, Initializable {
+export class ChannelMemberPreferencesServiceImpl implements TdriveServiceProvider, Initializable {
   version: "1";
   repository: Repository<ChannelMemberNotificationPreference>;
 
diff --git a/twake/backend/node/src/services/notifications/services/channel-thread-users.ts b/twake/backend/node/src/services/notifications/services/channel-thread-users.ts
index 2c490bfc..a96918ec 100644
--- a/twake/backend/node/src/services/notifications/services/channel-thread-users.ts
+++ b/twake/backend/node/src/services/notifications/services/channel-thread-users.ts
@@ -12,9 +12,9 @@ import {
 } from "../entities";
 import Repository from "../../../core/platform/services/database/services/orm/repository/repository";
 import gr from "../../global-resolver";
-import { Initializable, TwakeServiceProvider } from "../../../core/platform/framework";
+import { Initializable, TdriveServiceProvider } from "../../../core/platform/framework";
 
-export class ChannelThreadUsersServiceImpl implements TwakeServiceProvider, Initializable {
+export class ChannelThreadUsersServiceImpl implements TdriveServiceProvider, Initializable {
   version: "1";
   repository: Repository<ChannelThreadUsers>;
 
diff --git a/twake/backend/node/src/services/notifications/services/digest.ts b/twake/backend/node/src/services/notifications/services/digest.ts
index 62926306..b6e01bf7 100644
--- a/twake/backend/node/src/services/notifications/services/digest.ts
+++ b/twake/backend/node/src/services/notifications/services/digest.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { Initializable, TwakeServiceProvider } from "../../../core/platform/framework";
+import { Initializable, TdriveServiceProvider } from "../../../core/platform/framework";
 import { Paginable, Pagination } from "../../../core/platform/framework/api/crud-service";
 import Repository from "../../../core/platform/services/database/services/orm/repository/repository";
 import { Channel } from "../../../services/channels/entities";
@@ -8,7 +8,7 @@ import gr from "../../global-resolver";
 import { UserNotificationBadge } from "../entities";
 import { getInstance, TYPE, UserNotificationDigest } from "../entities/user-notification-digest";
 
-export class UserNotificationDigestService implements TwakeServiceProvider, Initializable {
+export class UserNotificationDigestService implements TdriveServiceProvider, Initializable {
   version: "1";
   repository: Repository<UserNotificationDigest>;
 
diff --git a/twake/backend/node/src/services/notifications/services/engine/processors/reaction-notification.ts b/twake/backend/node/src/services/notifications/services/engine/processors/reaction-notification.ts
index 7b0d7527..a231b60a 100644
--- a/twake/backend/node/src/services/notifications/services/engine/processors/reaction-notification.ts
+++ b/twake/backend/node/src/services/notifications/services/engine/processors/reaction-notification.ts
@@ -105,7 +105,7 @@ export class PushReactionNotification
 
     const companyName = company?.name || "";
     const workspaceName = workspace_id === "direct" ? "Direct" : workspace?.name || "";
-    const userName = this.getUserName(user) || "Twake";
+    const userName = this.getUserName(user) || "Tdrive";
 
     if (Channel.isDirectChannel(channel)) {
       title = `${userName} in ${companyName}`;
diff --git a/twake/backend/node/src/services/notifications/services/preferences.ts b/twake/backend/node/src/services/notifications/services/preferences.ts
index 7314e30b..2002b121 100644
--- a/twake/backend/node/src/services/notifications/services/preferences.ts
+++ b/twake/backend/node/src/services/notifications/services/preferences.ts
@@ -1,5 +1,5 @@
 import _ from "lodash";
-import { Initializable, TwakeServiceProvider } from "../../../core/platform/framework";
+import { Initializable, TdriveServiceProvider } from "../../../core/platform/framework";
 import {
   CrudException,
   DeleteResult,
@@ -18,7 +18,7 @@ type UserNotificationPreferencesPrimaryKey = {
   user_id: string;
 };
 
-export class NotificationPreferencesService implements TwakeServiceProvider, Initializable {
+export class NotificationPreferencesService implements TdriveServiceProvider, Initializable {
   version: "1";
   repository: Repository<UserNotificationPreferences>;
 
@@ -59,7 +59,7 @@ export class NotificationPreferencesService implements TwakeServiceProvider, Ini
     );
   }
 
-  /** We can define preferences for specifically a workspace or for all a company or all Twake
+  /** We can define preferences for specifically a workspace or for all a company or all Tdrive
    * This function will ensure we get all with inherit and all
    */
   async getMerged(
diff --git a/twake/backend/node/src/services/online/api.ts b/twake/backend/node/src/services/online/api.ts
index ca78f8ed..66341b1d 100644
--- a/twake/backend/node/src/services/online/api.ts
+++ b/twake/backend/node/src/services/online/api.ts
@@ -1,4 +1,4 @@
-import { TwakeServiceProvider } from "../../core/platform/framework";
+import { TdriveServiceProvider } from "../../core/platform/framework";
 import UserOnline, { UserOnlinePrimaryKey } from "./entities/user-online";
 
 export type OnlineEvent = {
@@ -18,7 +18,7 @@ export type OnlineGetResponse = {
   data: Array<[string, boolean]>;
 };
 
-export interface OnlineServiceAPI extends TwakeServiceProvider {
+export interface OnlineServiceAPI extends TdriveServiceProvider {
   isOnline(userId: string): Promise<boolean>;
   setLastSeenOnline(userIds: Array<string>, lastSeen: number, is_connected: boolean): Promise<void>;
   get(userId: UserOnlinePrimaryKey): Promise<UserOnline>;
diff --git a/twake/backend/node/src/services/online/index.ts b/twake/backend/node/src/services/online/index.ts
index 9c9f9f02..a6d815cb 100644
--- a/twake/backend/node/src/services/online/index.ts
+++ b/twake/backend/node/src/services/online/index.ts
@@ -1,7 +1,7 @@
-import { Prefix, TwakeService } from "../../core/platform/framework";
+import { Prefix, TdriveService } from "../../core/platform/framework";
 
 @Prefix("/internal/services/online/v1")
-export default class OnlineService extends TwakeService<undefined> {
+export default class OnlineService extends TdriveService<undefined> {
   version = "1";
   name = "online";
 
diff --git a/twake/backend/node/src/services/online/pubsub/index.ts b/twake/backend/node/src/services/online/pubsub/index.ts
index 44ac7680..44f14b1c 100644
--- a/twake/backend/node/src/services/online/pubsub/index.ts
+++ b/twake/backend/node/src/services/online/pubsub/index.ts
@@ -1,11 +1,11 @@
-import { getLogger, Initializable, TwakeLogger } from "../../../core/platform/framework";
+import { getLogger, Initializable, TdriveLogger } from "../../../core/platform/framework";
 import { UsersOnlineMessage } from "../api";
 import { ONLINE_TOPIC } from "../constants";
 import { UserOnlineProcessor } from "./processor";
 import gr from "../../global-resolver";
 
 export class OnlinePubsubService implements Initializable {
-  private logger: TwakeLogger;
+  private logger: TdriveLogger;
   constructor() {
     this.logger = getLogger("online.pubsub.OnlinePubsubService");
   }
diff --git a/twake/backend/node/src/services/online/pubsub/processor.ts b/twake/backend/node/src/services/online/pubsub/processor.ts
index a73e48f9..8f898df9 100644
--- a/twake/backend/node/src/services/online/pubsub/processor.ts
+++ b/twake/backend/node/src/services/online/pubsub/processor.ts
@@ -1,5 +1,5 @@
 import _ from "lodash";
-import { getLogger, TwakeLogger } from "../../../core/platform/framework";
+import { getLogger, TdriveLogger } from "../../../core/platform/framework";
 import { MessageQueueHandler } from "../../../core/platform/services/message-queue/api";
 import { websocketEventBus } from "../../../core/platform/services/realtime/bus";
 import {
@@ -10,7 +10,7 @@ import { UsersOnlineMessage } from "../api";
 import { ONLINE_TOPIC } from "../constants";
 
 export class UserOnlineProcessor implements MessageQueueHandler<UsersOnlineMessage, void> {
-  private logger: TwakeLogger;
+  private logger: TdriveLogger;
   readonly topics = {
     in: ONLINE_TOPIC,
   };
diff --git a/twake/backend/node/src/services/online/service/index.ts b/twake/backend/node/src/services/online/service/index.ts
index 98e6a360..e5d7e1e1 100644
--- a/twake/backend/node/src/services/online/service/index.ts
+++ b/twake/backend/node/src/services/online/service/index.ts
@@ -9,18 +9,18 @@ import UserOnline, {
   UserOnlinePrimaryKey,
 } from "../entities/user-online";
 import gr from "../../global-resolver";
-import { getLogger, TwakeLogger, TwakeServiceProvider } from "../../../core/platform/framework";
+import { getLogger, TdriveLogger, TdriveServiceProvider } from "../../../core/platform/framework";
 import { getUserRoom } from "../../../services/user/realtime";
 import User from "../../../services/user/entities/user";
 import { WebsocketUserEvent } from "../../../core/platform/services/websocket/types";
 import { ExecutionContext } from "../../../core/platform/framework/api/crud-service";
 
-export default class OnlineServiceImpl implements TwakeServiceProvider {
+export default class OnlineServiceImpl implements TdriveServiceProvider {
   version = "1";
   service: OnlineServiceAPI;
   private pubsubService: OnlinePubsubService;
   onlineRepository: Repository<UserOnline>;
-  private logger: TwakeLogger;
+  private logger: TdriveLogger;
 
   constructor() {
     this.logger = getLogger("online.service");
@@ -130,7 +130,7 @@ export default class OnlineServiceImpl implements TwakeServiceProvider {
     context?: ExecutionContext,
   ): Promise<Array<[string, boolean]>> {
     const users = [];
-    //This foreach is needed for $in operators https://github.com/linagora/Twake/issues/1246
+    //This foreach is needed for $in operators https://github.com/linagora/Tdrive/issues/1246
     for (let i = 0; i < ids.length; i += 100) {
       users.push(
         ...(
diff --git a/twake/backend/node/src/services/statistics/index.ts b/twake/backend/node/src/services/statistics/index.ts
index 78479bdd..64e5cabe 100644
--- a/twake/backend/node/src/services/statistics/index.ts
+++ b/twake/backend/node/src/services/statistics/index.ts
@@ -1,6 +1,6 @@
-import { TwakeService } from "../../core/platform/framework";
+import { TdriveService } from "../../core/platform/framework";
 
-export default class StatisticService extends TwakeService<undefined> {
+export default class StatisticService extends TdriveService<undefined> {
   version = "1";
   name = "statistics";
 
diff --git a/twake/backend/node/src/services/statistics/service/index.ts b/twake/backend/node/src/services/statistics/service/index.ts
index f1048c6e..f350c68f 100644
--- a/twake/backend/node/src/services/statistics/service/index.ts
+++ b/twake/backend/node/src/services/statistics/service/index.ts
@@ -5,10 +5,10 @@ import StatisticsEntity, {
 } from "../entities/statistics";
 import Repository from "../../../core/platform/services/database/services/orm/repository/repository";
 import gr from "../../global-resolver";
-import { Initializable, TwakeServiceProvider } from "../../../core/platform/framework";
+import { Initializable, TdriveServiceProvider } from "../../../core/platform/framework";
 import { ExecutionContext } from "../../../core/platform/framework/api/crud-service";
 
-export class StatisticsServiceImpl implements TwakeServiceProvider, Initializable {
+export class StatisticsServiceImpl implements TdriveServiceProvider, Initializable {
   version: "1";
   private repository: Repository<StatisticsEntity>;
 
diff --git a/twake/backend/node/src/services/statistics/types.ts b/twake/backend/node/src/services/statistics/types.ts
index 493236eb..b6f7949b 100644
--- a/twake/backend/node/src/services/statistics/types.ts
+++ b/twake/backend/node/src/services/statistics/types.ts
@@ -1,6 +1,6 @@
-import { Initializable, TwakeServiceProvider } from "../../core/platform/framework";
+import { Initializable, TdriveServiceProvider } from "../../core/platform/framework";
 
-export interface StatisticsAPI extends TwakeServiceProvider, Initializable {
+export interface StatisticsAPI extends TdriveServiceProvider, Initializable {
   increase(companyId: string, eventName: string, value?: number): Promise<void>;
   get(companyId: string | null, eventName: string): Promise<number>;
 }
diff --git a/twake/backend/node/src/services/tags/index.ts b/twake/backend/node/src/services/tags/index.ts
index 0993400c..f542fab8 100644
--- a/twake/backend/node/src/services/tags/index.ts
+++ b/twake/backend/node/src/services/tags/index.ts
@@ -1,9 +1,9 @@
 import WebServerAPI from "../../core/platform/services/webserver/provider";
-import { Prefix, TwakeService } from "../../core/platform/framework";
+import { Prefix, TdriveService } from "../../core/platform/framework";
 import web from "./web";
 
 @Prefix("/internal/services/tags/v1")
-export default class TagsService extends TwakeService<undefined> {
+export default class TagsService extends TdriveService<undefined> {
   version = "1";
   name = "tags";
 
diff --git a/twake/backend/node/src/services/tags/services/tags.ts b/twake/backend/node/src/services/tags/services/tags.ts
index f5a2baf9..debb1a7f 100644
--- a/twake/backend/node/src/services/tags/services/tags.ts
+++ b/twake/backend/node/src/services/tags/services/tags.ts
@@ -1,4 +1,4 @@
-import { TwakeServiceProvider, Initializable } from "src/core/platform/framework/api";
+import { TdriveServiceProvider, Initializable } from "src/core/platform/framework/api";
 import Repository from "src/core/platform/services/database/services/orm/repository/repository";
 import { Tag, TagsType, TagsPrimaryKey } from "../entities";
 import gr from "../../global-resolver";
@@ -13,7 +13,7 @@ import { plainToClass } from "class-transformer";
 import { createTagEntity, TYPE } from "../entities/tags";
 import { logger } from "../../../core/platform/framework";
 
-export class TagsService implements TwakeServiceProvider, Initializable {
+export class TagsService implements TdriveServiceProvider, Initializable {
   version: "1";
   repository: Repository<Tag>;
 
diff --git a/twake/backend/node/src/services/user/entities/company_user.ts b/twake/backend/node/src/services/user/entities/company_user.ts
index 3d9c1a52..65ba0a96 100644
--- a/twake/backend/node/src/services/user/entities/company_user.ts
+++ b/twake/backend/node/src/services/user/entities/company_user.ts
@@ -44,10 +44,10 @@ export default class CompanyUser {
   @Column("level", "number")
   level: number; //Depreciated
 
-  @Column("is_externe", "twake_boolean")
+  @Column("is_externe", "tdrive_boolean")
   isExterne: boolean; //Depreciated
 
-  @Column("did_connect_today", "twake_boolean")
+  @Column("did_connect_today", "tdrive_boolean")
   didConnectToday: boolean; //Depreciated
 
   @Column("app_used_today", "json")
diff --git a/twake/backend/node/src/services/user/entities/user.ts b/twake/backend/node/src/services/user/entities/user.ts
index aa7987bf..0be7e75b 100644
--- a/twake/backend/node/src/services/user/entities/user.ts
+++ b/twake/backend/node/src/services/user/entities/user.ts
@@ -47,7 +47,7 @@ export default class User {
   @Column("last_activity", "number")
   last_activity: number;
 
-  @Column("creation_date", "twake_datetime")
+  @Column("creation_date", "tdrive_datetime")
   creation_date: number;
 
   @Column("notification_preference", "encoded_json")
@@ -74,10 +74,10 @@ export default class User {
   @Column("password", "string")
   password: string;
 
-  @Column("deleted", "twake_boolean")
+  @Column("deleted", "tdrive_boolean")
   deleted: boolean;
 
-  @Column("mail_verified", "twake_boolean")
+  @Column("mail_verified", "tdrive_boolean")
   mail_verified: boolean;
 
   @Column("phone", "string")
diff --git a/twake/backend/node/src/services/user/index.ts b/twake/backend/node/src/services/user/index.ts
index 90bbd4d9..cb96dfaf 100644
--- a/twake/backend/node/src/services/user/index.ts
+++ b/twake/backend/node/src/services/user/index.ts
@@ -1,9 +1,9 @@
-import { Prefix, TwakeService } from "../../core/platform/framework";
+import { Prefix, TdriveService } from "../../core/platform/framework";
 import WebServerAPI from "../../core/platform/services/webserver/provider";
 import web from "./web";
 
 @Prefix("/internal/services/users/v1")
-export default class UserService extends TwakeService<undefined> {
+export default class UserService extends TdriveService<undefined> {
   version = "1";
   name = "user";
 
diff --git a/twake/backend/node/src/services/user/services/users/service.ts b/twake/backend/node/src/services/user/services/users/service.ts
index cd8c6041..2faba390 100644
--- a/twake/backend/node/src/services/user/services/users/service.ts
+++ b/twake/backend/node/src/services/user/services/users/service.ts
@@ -63,7 +63,7 @@ export class UserServiceImpl {
 
     this.cache = new NodeCache({ stdTTL: 0.2, checkperiod: 120 });
 
-    //If user deleted from Twake, remove it from all companies
+    //If user deleted from Tdrive, remove it from all companies
     localEventBus.subscribe<ResourceEventsPayload>("user:deleted", async data => {
       if (data?.user?.id) gr.services.companies.ensureDeletedUserNotInCompanies(data.user);
     });
@@ -161,7 +161,7 @@ export class UserServiceImpl {
       const partialId = user.id.toString().split("-")[0];
 
       user.username_canonical = `deleted-user-${partialId}`;
-      user.email_canonical = `${partialId}@twake.removed`;
+      user.email_canonical = `${partialId}@tdrive.removed`;
       user.first_name = "";
       user.last_name = "";
       user.phone = "";
diff --git a/twake/backend/node/src/services/user/utils.ts b/twake/backend/node/src/services/user/utils.ts
index a66ce095..a345be49 100644
--- a/twake/backend/node/src/services/user/utils.ts
+++ b/twake/backend/node/src/services/user/utils.ts
@@ -22,7 +22,7 @@ export function formatCompany(
   };
 
   if (companyUserObject) {
-    res.status = "active"; // FIXME: Deactivated console user are removed from company on twake side
+    res.status = "active"; // FIXME: Deactivated console user are removed from company on tdrive side
     res.role = companyUserObject.role;
   }
 
diff --git a/twake/backend/node/src/services/workspaces/entities/workspace_user.ts b/twake/backend/node/src/services/workspaces/entities/workspace_user.ts
index 49144725..00258975 100644
--- a/twake/backend/node/src/services/workspaces/entities/workspace_user.ts
+++ b/twake/backend/node/src/services/workspaces/entities/workspace_user.ts
@@ -30,7 +30,7 @@ export default class WorkspaceUser {
   @Column("last_access", "number")
   lastAccess: number;
 
-  @Column("is_externe", "twake_boolean")
+  @Column("is_externe", "tdrive_boolean")
   isExternal: boolean; //Depreciated
 }
 
diff --git a/twake/backend/node/src/services/workspaces/index.ts b/twake/backend/node/src/services/workspaces/index.ts
index 4b940982..2b72865b 100644
--- a/twake/backend/node/src/services/workspaces/index.ts
+++ b/twake/backend/node/src/services/workspaces/index.ts
@@ -1,10 +1,10 @@
-import { Prefix, TwakeService } from "../../core/platform/framework";
+import { Prefix, TdriveService } from "../../core/platform/framework";
 import WebServerAPI from "../../core/platform/services/webserver/provider";
 import web from "./web";
 import { WorkspaceServiceImpl } from "./services/workspace";
 
 @Prefix("/internal/services/workspaces/v1")
-export default class Service extends TwakeService<WorkspaceServiceImpl> {
+export default class Service extends TdriveService<WorkspaceServiceImpl> {
   version = "1";
   name = "workspaces";
 
diff --git a/twake/backend/node/src/services/workspaces/services/workspace.ts b/twake/backend/node/src/services/workspaces/services/workspace.ts
index 87f6ff6e..78cbaf16 100644
--- a/twake/backend/node/src/services/workspaces/services/workspace.ts
+++ b/twake/backend/node/src/services/workspaces/services/workspace.ts
@@ -44,7 +44,7 @@ import { countRepositoryItems } from "../../../utils/counters";
 import {
   Initializable,
   RealtimeSaved,
-  TwakeServiceProvider,
+  TdriveServiceProvider,
 } from "../../../core/platform/framework";
 import { ResourcePath } from "../../../core/platform/services/realtime/types";
 import { getRoomName, getWorkspacePath } from "../realtime";
@@ -69,7 +69,7 @@ import WorkspaceInviteDomain, {
   getInstance as getWorkspaceInviteDomainInstance,
 } from "../entities/workspace_invite_domain";
 
-export class WorkspaceServiceImpl implements TwakeServiceProvider, Initializable {
+export class WorkspaceServiceImpl implements TdriveServiceProvider, Initializable {
   version: "1";
   private workspaceUserRepository: Repository<WorkspaceUser>;
   private workspaceRepository: Repository<Workspace>;
diff --git a/twake/backend/node/src/services/workspaces/web/controllers/workspace-users.ts b/twake/backend/node/src/services/workspaces/web/controllers/workspace-users.ts
index d6cc88d6..5c7b14f6 100644
--- a/twake/backend/node/src/services/workspaces/web/controllers/workspace-users.ts
+++ b/twake/backend/node/src/services/workspaces/web/controllers/workspace-users.ts
@@ -388,7 +388,7 @@ export class WorkspaceUsersCrudController
   ): Promise<WorkspaceUserInvitationResponse> {
     const context = getExecutionContext(request);
 
-    const usersInTwake: Map<string, User> = new Map(
+    const usersInTdrive: Map<string, User> = new Map(
       await gr.services.users
         .getByEmails(request.body.invitations.map(a => a.email))
         .then(users => users.map(user => [user.email_canonical, user])),
@@ -443,8 +443,8 @@ export class WorkspaceUsersCrudController
 
       const consoleClient = gr.services.console.getClient();
 
-      if (usersInTwake.has(invitation.email)) {
-        user = usersInTwake.get(invitation.email);
+      if (usersInTdrive.has(invitation.email)) {
+        user = usersInTdrive.get(invitation.email);
         usersToProcessImmediately.push(user);
 
         if (user) {
@@ -453,7 +453,7 @@ export class WorkspaceUsersCrudController
           );
         }
       } else {
-        user = await consoleClient.addUserToTwake({
+        user = await consoleClient.addUserToTdrive({
           email: invitation.email,
           password: invitation.password,
         });
diff --git a/twake/backend/node/src/services/workspaces/web/controllers/workspaces.ts b/twake/backend/node/src/services/workspaces/web/controllers/workspaces.ts
index 3a4446d0..4f1f29e0 100644
--- a/twake/backend/node/src/services/workspaces/web/controllers/workspaces.ts
+++ b/twake/backend/node/src/services/workspaces/web/controllers/workspaces.ts
@@ -26,7 +26,7 @@ import {
 } from "../../../../core/platform/framework/api/crud-service";
 import CompanyUser from "../../../user/entities/company_user";
 import gr from "../../../global-resolver";
-import { getLogger, TwakeLogger } from "../../../../core/platform/framework";
+import { getLogger, TdriveLogger } from "../../../../core/platform/framework";
 
 export class WorkspacesCrudController
   implements
@@ -37,7 +37,7 @@ export class WorkspacesCrudController
       ResourceDeleteResponse
     >
 {
-  private logger: TwakeLogger;
+  private logger: TdriveLogger;
   private getCompanyUserRole(companyId: string, userId: string, context?: ExecutionContext) {
     return gr.services.companies
       .getCompanyUser({ id: companyId }, { id: userId }, context)
diff --git a/twake/backend/node/src/twake.ts b/twake/backend/node/src/tdrive.ts
similarity index 69%
rename from twake/backend/node/src/twake.ts
rename to twake/backend/node/src/tdrive.ts
index b07a221e..8bb509ed 100644
--- a/twake/backend/node/src/twake.ts
+++ b/twake/backend/node/src/tdrive.ts
@@ -1,21 +1,21 @@
 import path from "path";
-import { TwakePlatform, TwakePlatformConfiguration } from "./core/platform/platform";
+import { TdrivePlatform, TdrivePlatformConfiguration } from "./core/platform/platform";
 
 import globalResolver from "./services/global-resolver";
 
 /**
- * Instantiate and start a new TwakePlatform with the given services.
+ * Instantiate and start a new TdrivePlatform with the given services.
  */
-async function run(services: string[] = []): Promise<TwakePlatform> {
-  let platform: TwakePlatform;
+async function run(services: string[] = []): Promise<TdrivePlatform> {
+  let platform: TdrivePlatform;
 
-  const start = async (): Promise<TwakePlatform> => {
+  const start = async (): Promise<TdrivePlatform> => {
     try {
-      const configuration: TwakePlatformConfiguration = {
+      const configuration: TdrivePlatformConfiguration = {
         services,
         servicesPath: path.resolve(__dirname, "./services/"),
       };
-      platform = new TwakePlatform(configuration);
+      platform = new TdrivePlatform(configuration);
       await platform.init();
       await platform.start();
       await globalResolver.doInit(platform);
diff --git a/twake/backend/node/src/utils/users.ts b/twake/backend/node/src/utils/users.ts
index 2b6d4c20..2d360350 100644
--- a/twake/backend/node/src/utils/users.ts
+++ b/twake/backend/node/src/utils/users.ts
@@ -74,7 +74,7 @@ export async function formatUser(
       companies,
     };
 
-    // Fixme: this is for retro compatibility, should be deleted after march 2022 if mobile did implement it https://github.com/linagora/Twake-Mobile/issues/1265
+    // Fixme: this is for retro compatibility, should be deleted after march 2022 if mobile did implement it https://github.com/linagora/Tdrive-Mobile/issues/1265
     resUser.preference = resUser.preferences;
 
     let name: string = resUser?.username;
diff --git a/twake/backend/node/test/e2e/counters.spec.ts b/twake/backend/node/test/e2e/counters.spec.ts
deleted file mode 100644
index d26a3cc5..00000000
--- a/twake/backend/node/test/e2e/counters.spec.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
-import { beforeAll, describe, expect, it } from "@jest/globals";
-import { init, TestPlatform } from "./setup";
-import { v1 as uuidv1 } from "uuid";
-import { CounterAPI } from "../../src/core/platform/services/counter/types";
-import {
-  WorkspaceCounterEntity,
-  WorkspaceCounterPrimaryKey,
-  WorkspaceCounterType,
-} from "../../src/services/workspaces/entities/workspace_counters";
-import { CounterProvider } from "../../src/core/platform/services/counter/provider";
-import WorkspaceUser, {
-  getInstance as getWorkspaceUserInstance,
-  TYPE as WorkspaceUserEntityType,
-} from "../../src/services/workspaces/entities/workspace_user";
-
-import { countRepositoryItems } from "../../src/utils/counters";
-import { TestDbService } from "./utils.prepare.db";
-import {
-  ChannelCounterEntity,
-  ChannelCounterPrimaryKey,
-  ChannelUserCounterType,
-} from "../../src/services/channels/entities/channel-counters";
-import { ChannelMemberType } from "../../src/services/channels/types";
-import { getMemberOfChannelInstance, MemberOfChannel } from "../../src/services/channels/entities";
-import gr from "../../src/services/global-resolver";
-
-describe("Counters implementation", () => {
-  let platform: TestPlatform;
-  // let database: DatabaseServiceAPI;
-  let counterApi: CounterAPI;
-  let testDbService: TestDbService;
-
-  beforeAll(async ends => {
-    platform = await init();
-
-    testDbService = new TestDbService(platform);
-
-    await gr.database.getConnector().drop();
-
-    counterApi = platform.platform.getProvider<CounterAPI>("counter");
-    expect(counterApi).toBeTruthy();
-
-    ends();
-  });
-
-  afterAll(done => {
-    platform.tearDown().then(done);
-  });
-
-  const getCounter = async (type, entity) => {
-    return counterApi.getCounter<entity>(await testDbService.getRepository<entity>(type, entity));
-  };
-
-  describe("Workspace counters", () => {
-    let counter: CounterProvider;
-    const counterPk = { id: uuidv1(), counter_type: WorkspaceCounterType.MEMBERS };
-
-    beforeAll(async ends => {
-      counter = await getCounter("workspace_counters", WorkspaceCounterEntity);
-
-      const workspaceUserRepository = await testDbService.getRepository(
-        WorkspaceUserEntityType,
-        WorkspaceUser,
-      );
-
-      await workspaceUserRepository.save(
-        getWorkspaceUserInstance({
-          workspaceId: counterPk.id,
-          userId: uuidv1(),
-          id: uuidv1(),
-        }),
-      );
-
-      expect(counter).toBeTruthy();
-
-      ends();
-    });
-
-    it("Initializing empty value", async done => {
-      await counter.increase(counterPk, 0);
-      const val = await counter.get(counterPk);
-      expect(val).toEqual(0);
-      done();
-    });
-
-    it("Adding value", async done => {
-      // adding 1
-
-      await counter.increase(counterPk, 1);
-      let val = await counter.get(counterPk);
-      expect(val).toEqual(1);
-
-      // adding 2
-
-      await counter.increase(counterPk, 2);
-      val = await counter.get(counterPk);
-      expect(val).toEqual(3);
-
-      done();
-    });
-
-    it("Subtracting value", async done => {
-      // Subtracting 2
-
-      await counter.increase(counterPk, -2);
-      let val = await counter.get(counterPk);
-      expect(val).toEqual(1);
-
-      // Subtracting 10
-
-      await counter.increase(counterPk, -10);
-      val = await counter.get(counterPk);
-      expect(val).toEqual(-9);
-
-      done();
-    });
-
-    it("Revising counter", async done => {
-      // Subtracting 2
-
-      const workspaceUserRepository = await testDbService.getRepository(
-        WorkspaceUserEntityType,
-        WorkspaceUser,
-      );
-
-      counter.setReviseCallback(async (pk: WorkspaceCounterPrimaryKey) => {
-        if (pk.counter_type == "members") {
-          return countRepositoryItems(workspaceUserRepository, { workspace_id: pk.id });
-        }
-      }, 4);
-
-      await counter.increase(counterPk, 1);
-      const val = await counter.get(counterPk);
-      expect(val).toEqual(1);
-
-      done();
-    });
-  });
-
-  describe("Channel counters", () => {
-    let counter: CounterProvider;
-    let counterPk: ChannelCounterPrimaryKey;
-
-    beforeAll(async ends => {
-      counterPk = {
-        id: uuidv1(),
-        company_id: uuidv1(),
-        workspace_id: uuidv1(),
-        counter_type: ChannelUserCounterType.MEMBERS,
-      };
-
-      counter = await getCounter("channel_counters", ChannelCounterEntity);
-
-      const memberOfChannelRepository = await testDbService.getRepository(
-        "channel_members",
-        MemberOfChannel,
-      );
-
-      await memberOfChannelRepository.save(
-        getMemberOfChannelInstance({
-          company_id: counterPk.company_id,
-          workspace_id: counterPk.workspace_id,
-          channel_id: counterPk.id,
-          user_id: uuidv1(),
-        }),
-      );
-
-      expect(counter).toBeTruthy();
-
-      ends();
-    });
-
-    it("Initializing empty value", async done => {
-      await counter.increase(counterPk, 0);
-      const val = await counter.get(counterPk);
-      expect(val).toEqual(0);
-      done();
-    });
-
-    it("Adding value", async done => {
-      // adding 1
-
-      await counter.increase(counterPk, 1);
-      let val = await counter.get(counterPk);
-      expect(val).toEqual(1);
-
-      // adding 2
-
-      await counter.increase(counterPk, 2);
-      val = await counter.get(counterPk);
-      expect(val).toEqual(3);
-
-      done();
-    });
-
-    it("Subtracting value", async done => {
-      // Subtracting 2
-
-      await counter.increase(counterPk, -2);
-      let val = await counter.get(counterPk);
-      expect(val).toEqual(1);
-
-      // Subtracting 10
-
-      await counter.increase(counterPk, -10);
-      val = await counter.get(counterPk);
-      expect(val).toEqual(-9);
-
-      done();
-    });
-
-    it("Revising counter", async done => {
-      // Subtracting 2
-
-      const memberOfChannelRepository = await testDbService.getRepository(
-        "channel_members",
-        MemberOfChannel,
-      );
-
-      counter.setReviseCallback(async (pk: ChannelCounterPrimaryKey) => {
-        if (pk.counter_type == ChannelUserCounterType.MEMBERS) {
-          return countRepositoryItems(
-            memberOfChannelRepository,
-            { channel_id: pk.id, company_id: pk.company_id, workspace_id: pk.workspace_id },
-            { type: ChannelMemberType.MEMBER },
-          );
-        }
-      }, 4);
-
-      await counter.increase(counterPk, 1);
-      const val = await counter.get(counterPk);
-      expect(val).toEqual(1);
-
-      done();
-    });
-  });
-});
diff --git a/twake/backend/node/test/e2e/documents/documents-tab.spec.ts b/twake/backend/node/test/e2e/documents/documents-tab.spec.ts
index e9d6c84e..d1baca6e 100644
--- a/twake/backend/node/test/e2e/documents/documents-tab.spec.ts
+++ b/twake/backend/node/test/e2e/documents/documents-tab.spec.ts
@@ -7,7 +7,7 @@ import { e2e_createDocument, e2e_getDocument } from "./utils";
 
 const url = "/internal/services/documents/v1";
 
-describe("the Drive Twake tabs feature", () => {
+describe("the Drive Tdrive tabs feature", () => {
   let platform: TestPlatform;
 
   class DriveFileMockClass {
diff --git a/twake/backend/node/test/e2e/run-all.js b/twake/backend/node/test/e2e/run-all.js
index 78d09aac..22619b89 100644
--- a/twake/backend/node/test/e2e/run-all.js
+++ b/twake/backend/node/test/e2e/run-all.js
@@ -1,9 +1,9 @@
 /**
  * To run all tests in local development mode:
- * cd twake/; docker-compose -f docker-compose.dev.tests.mongo.yml run -e NODE_OPTIONS=--unhandled-rejections=warn -e SEARCH_DRIVER=mongodb -e DB_DRIVER=mongodb -e PUBSUB_TYPE=local node npm run test:e2e
+ * cd tdrive/; docker-compose -f docker-compose.dev.tests.mongo.yml run -e NODE_OPTIONS=--unhandled-rejections=warn -e SEARCH_DRIVER=mongodb -e DB_DRIVER=mongodb -e PUBSUB_TYPE=local node npm run test:e2e
  *
  * To run only specific tests:
- * cd twake/; docker-compose -f docker-compose.dev.tests.mongo.yml run -e NODE_OPTIONS=--unhandled-rejections=warn -e SEARCH_DRIVER=mongodb -e DB_DRIVER=mongodb -e PUBSUB_TYPE=local node npm run test:e2e -- test/e2e/application/app-create-update.spec.ts  test/e2e/application/application-events.spec.ts
+ * cd tdrive/; docker-compose -f docker-compose.dev.tests.mongo.yml run -e NODE_OPTIONS=--unhandled-rejections=warn -e SEARCH_DRIVER=mongodb -e DB_DRIVER=mongodb -e PUBSUB_TYPE=local node npm run test:e2e -- test/e2e/application/app-create-update.spec.ts  test/e2e/application/application-events.spec.ts
  */
 
 const fs = require("fs");
diff --git a/twake/backend/node/test/e2e/setup/index.ts b/twake/backend/node/test/e2e/setup/index.ts
index 54026c35..10d17e61 100644
--- a/twake/backend/node/test/e2e/setup/index.ts
+++ b/twake/backend/node/test/e2e/setup/index.ts
@@ -1,7 +1,7 @@
 import { resolve as pathResolve } from "path";
 import { v1 as uuidv1 } from "uuid";
 import { FastifyInstance } from "fastify";
-import { TwakePlatform, TwakePlatformConfiguration } from "../../../src/core/platform/platform";
+import { TdrivePlatform, TdrivePlatformConfiguration } from "../../../src/core/platform/platform";
 import WebServerAPI from "../../../src/core/platform/services/webserver/provider";
 import { DatabaseServiceAPI } from "../../../src/core/platform/services/database/api";
 import AuthServiceAPI from "../../../src/core/platform/services/auth/provider";
@@ -28,7 +28,7 @@ type User = {
 
 export interface TestPlatform {
   currentUser: User;
-  platform: TwakePlatform;
+  platform: TdrivePlatform;
   workspace: Workspace;
   app: FastifyInstance;
   database: DatabaseServiceAPI;
@@ -51,11 +51,11 @@ export async function init(
   prePlatformStartCallback?: (fastify: FastifyInstance) => void,
 ): Promise<TestPlatform> {
   if (!testPlatform) {
-    const configuration: TwakePlatformConfiguration = {
+    const configuration: TdrivePlatformConfiguration = {
       services: config.get("services"),
       servicesPath: pathResolve(__dirname, "../../../src/services/"),
     };
-    const platform = new TwakePlatform(configuration);
+    const platform = new TdrivePlatform(configuration);
     await platform.init();
     await globalResolver.doInit(platform);
 
diff --git a/twake/backend/node/test/e2e/statistics.spec.ts b/twake/backend/node/test/e2e/statistics.spec.ts
deleted file mode 100644
index 4d70b35f..00000000
--- a/twake/backend/node/test/e2e/statistics.spec.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import { afterAll, beforeAll, beforeEach, describe, expect, it } from "@jest/globals";
-import { init, TestPlatform } from "./setup";
-
-import { v1 as uuidv1 } from "uuid";
-import {
-  createMessage,
-  createParticipant,
-  e2e_createMessage,
-  e2e_createThread,
-} from "./messages/utils";
-import { Thread } from "../../src/services/messages/entities/threads";
-import { deserialize } from "class-transformer";
-import { WorkspaceExecutionContext } from "../../src/services/channels/types";
-import { ChannelUtils, get as getChannelUtils } from "./channels/utils";
-import { ResourceUpdateResponse, User } from "../../src/utils/types";
-import gr from "../../src/services/global-resolver";
-
-describe("Statistics implementation", () => {
-  let platform: TestPlatform;
-  // let database: DatabaseServiceAPI;
-  let channelUtils: ChannelUtils;
-
-  beforeAll(async ends => {
-    platform = await init({
-      services: ["database", "statistics", "webserver", "auth"],
-    });
-
-    expect(gr.services.statistics).toBeTruthy();
-
-    ends();
-    channelUtils = getChannelUtils(platform);
-  });
-
-  beforeEach(async ends => {
-    await platform.database.getConnector().drop();
-    ends();
-  });
-
-  afterAll(async done => {
-    await platform.tearDown();
-    done();
-  });
-
-  it("Check statistics counters", async done => {
-    console.log(await gr.services.statistics.get(undefined, "counter-test"));
-
-    expect(await gr.services.statistics.get(undefined, "counter-test")).toEqual(0);
-
-    await gr.services.statistics.increase(platform.workspace.company_id, "counter-test");
-    await gr.services.statistics.increase(platform.workspace.company_id, "counter-test");
-    const secondCompanyId = uuidv1();
-    await gr.services.statistics.increase(secondCompanyId, "counter-test");
-    await gr.services.statistics.increase(secondCompanyId, "counter-test");
-    await gr.services.statistics.increase(platform.workspace.company_id, "counter-test2");
-
-    expect(await gr.services.statistics.get(platform.workspace.company_id, "counter-test")).toEqual(
-      2,
-    );
-    expect(await gr.services.statistics.get(secondCompanyId, "counter-test")).toEqual(2);
-    expect(await gr.services.statistics.get(undefined, "counter-test")).toEqual(4);
-
-    expect(
-      await gr.services.statistics.get(platform.workspace.company_id, "counter-test2"),
-    ).toEqual(1);
-    expect(await gr.services.statistics.get(secondCompanyId, "counter-test2")).toEqual(0);
-    expect(await gr.services.statistics.get(undefined, "counter-test2")).toEqual(1);
-
-    done();
-  });
-
-  function getContext(user?: User): WorkspaceExecutionContext {
-    return {
-      workspace: platform.workspace,
-      user: user || platform.currentUser,
-    };
-  }
-
-  async function sleep(timeout = 0) {
-    return new Promise(r => setTimeout(r, timeout));
-  }
-
-  describe("On user use messages in channel view", () => {
-    it("should create a message and retrieve it in channel view", async () => {
-      const channel = channelUtils.getChannel();
-      await gr.services.channels.channels.save(channel, {}, getContext());
-      const channelId = channel.id;
-
-      //Reset global value because messages could have been created somewhere else
-      const value = await gr.services.statistics.get(undefined, "messages");
-      await gr.services.statistics.increase(undefined, "messages", -value);
-
-      const response = await e2e_createThread(
-        platform,
-        [
-          createParticipant(
-            {
-              type: "channel",
-              id: channelId,
-            },
-            platform,
-          ),
-        ],
-        createMessage({ text: "Initial thread 1 message" }),
-      );
-
-      await sleep();
-
-      const result: ResourceUpdateResponse<Thread> = deserialize(
-        ResourceUpdateResponse,
-        response.body,
-      );
-      const threadId = result.resource.id;
-
-      await e2e_createMessage(platform, threadId, createMessage({ text: "Reply 1" }));
-
-      await e2e_createMessage(platform, threadId, createMessage({ text: "Reply 2" }));
-      await e2e_createThread(
-        platform,
-        [
-          createParticipant(
-            {
-              type: "channel",
-              id: channelId,
-            },
-            platform,
-          ),
-        ],
-        createMessage({ text: "Initial thread 2 message" }),
-      );
-
-      await e2e_createMessage(platform, threadId, createMessage({ text: "Reply 3" }));
-
-      await e2e_createThread(
-        platform,
-        [
-          createParticipant(
-            {
-              type: "channel",
-              id: channelId,
-            },
-            platform,
-          ),
-        ],
-        createMessage({ text: "Initial thread 3 message" }),
-      );
-
-      await new Promise(r => setTimeout(r, 5000));
-
-      expect(await gr.services.statistics.get(undefined, "messages")).toEqual(6);
-      expect(await gr.services.statistics.get(platform.workspace.company_id, "messages")).toEqual(
-        6,
-      );
-    });
-  });
-});
diff --git a/twake/backend/node/test/e2e/tags/tags.spec.ts b/twake/backend/node/test/e2e/tags/tags.spec.ts
deleted file mode 100644
index bdb6129d..00000000
--- a/twake/backend/node/test/e2e/tags/tags.spec.ts
+++ /dev/null
@@ -1,308 +0,0 @@
-import "reflect-metadata";
-import { afterAll, beforeAll, describe, expect, it } from "@jest/globals";
-import { init, TestPlatform } from "../setup";
-import { TestDbService } from "../utils.prepare.db";
-import { Tags } from "../../../src/services/tags/entities/tags";
-import { deserialize } from "class-transformer";
-import {
-  ResourceCreateResponse,
-  ResourceGetResponse,
-  ResourceListResponse,
-} from "../../../src/utils/types";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-
-describe("The Tags feature", () => {
-  const url = "/internal/services/tags/v1";
-  let platform: TestPlatform;
-  let testDbService: TestDbService;
-  const tagIds: string[] = [];
-
-  beforeAll(async ends => {
-    platform = await init({
-      services: ["webserver", "database", "storage", "message-queue", "tags"],
-    });
-    testDbService = await TestDbService.getInstance(platform, true);
-    ends();
-  });
-
-  afterAll(async done => {
-    for (let i = 0; i < tagIds.length; i++) {
-      for (let j = 0; j < tagIds.length; j++) {
-        if (tagIds[j] === tagIds[i] && j !== i) {
-          throw new Error("Tag are not unique");
-        }
-      }
-    }
-    await platform?.tearDown();
-    platform = null;
-    done();
-  });
-
-  describe("Create tag", () => {
-    it("should 201 if creator is a company admin", async done => {
-      const user = await testDbService.createUser([testDbService.defaultWorkspace()], {
-        companyRole: "admin",
-      });
-
-      const jwtToken = await platform.auth.getJWTToken({ sub: user.id });
-
-      for (let i = 0; i < 3; i++) {
-        const createTag = await platform.app.inject({
-          method: "POST",
-          url: `${url}/companies/${platform.workspace.company_id}/tags`,
-          headers: {
-            authorization: `Bearer ${jwtToken}`,
-          },
-          payload: {
-            name: `test${i}`,
-            colour: `#00000${i}`,
-          },
-        });
-
-        const tagResult: ResourceCreateResponse<Tags> = deserialize(
-          ResourceCreateResponse,
-          createTag.body,
-        );
-        expect(createTag.statusCode).toBe(201);
-        expect(tagResult.resource).toBeDefined();
-        expect(tagResult.resource.name).toBe(`test${i}`);
-        expect(tagResult.resource.colour).toBe(`#00000${i}`);
-        expect(tagResult.resource.company_id).toBe(platform.workspace.company_id);
-        expect(tagResult.resource.tag_id).toBe(`test${i}`);
-
-        const getTag = await platform.app.inject({
-          method: "GET",
-          url: `${url}/companies/${platform.workspace.company_id}/tags/${tagResult.resource.tag_id}`,
-          headers: {
-            authorization: `Bearer ${jwtToken}`,
-          },
-        });
-        expect(getTag.statusCode).toBe(200);
-
-        tagIds.push(tagResult.resource.tag_id);
-      }
-      done();
-    });
-
-    it("should 401 if creator is not a company admin", async done => {
-      const user = await testDbService.createUser([testDbService.defaultWorkspace()], {
-        companyRole: "member",
-      });
-      const jwtToken = await platform.auth.getJWTToken({ sub: user.id });
-      const createTag = await platform.app.inject({
-        method: "POST",
-        url: `${url}/companies/${platform.workspace.company_id}/tags`,
-        headers: {
-          authorization: `Bearer ${jwtToken}`,
-        },
-        payload: {
-          name: "testNotAdmin",
-          colour: "#000000",
-        },
-      });
-      expect(createTag.statusCode).toBe(401);
-
-      const tagResult: ResourceCreateResponse<Tags> = deserialize(
-        ResourceCreateResponse,
-        createTag.body,
-      );
-      expect(tagResult.resource).toBe(undefined);
-      done();
-    });
-  });
-
-  describe("Get tag", () => {
-    it("should 200 get a tag", async done => {
-      const user = await testDbService.createUser([testDbService.defaultWorkspace()], {
-        companyRole: "member",
-      });
-      const jwtToken = await platform.auth.getJWTToken({ sub: user.id });
-      const getTag = await platform.app.inject({
-        method: "GET",
-        url: `${url}/companies/${platform.workspace.company_id}/tags/${tagIds[0]}`,
-        headers: {
-          authorization: `Bearer ${jwtToken}`,
-        },
-      });
-      expect(getTag.statusCode).toBe(200);
-
-      const getResult: ResourceGetResponse<Tags> = deserialize(ResourceGetResponse, getTag.body);
-      expect(getResult.resource).toBeDefined();
-      expect(getResult.resource.name).toBe("test0");
-      expect(getResult.resource.colour).toBe("#000000");
-      expect(getResult.resource.company_id).toBe(platform.workspace.company_id);
-
-      done();
-    });
-
-    it("should 200 tag does not exist", async done => {
-      const user = await testDbService.createUser([testDbService.defaultWorkspace()], {
-        companyRole: "member",
-      });
-      const jwtToken = await platform.auth.getJWTToken({ sub: user.id });
-      const getTag = await platform.app.inject({
-        method: "GET",
-        url: `${url}/companies/${platform.workspace.company_id}/tags/NonExistingTag`,
-        headers: {
-          authorization: `Bearer ${jwtToken}`,
-        },
-      });
-      expect(getTag.statusCode).toBe(200);
-
-      const getResult: ResourceGetResponse<Tags> = deserialize(ResourceGetResponse, getTag.body);
-      expect(getResult.resource).toBe(null);
-
-      done();
-    });
-  });
-
-  describe("Update tag", () => {
-    it("Should 204 if user is admin", async done => {
-      const user = await testDbService.createUser([testDbService.defaultWorkspace()], {
-        companyRole: "admin",
-      });
-      const jwtToken = await platform.auth.getJWTToken({ sub: user.id });
-      const updateTag = await platform.app.inject({
-        method: "POST",
-        url: `${url}/companies/${platform.workspace.company_id}/tags`,
-        headers: {
-          authorization: `Bearer ${jwtToken}`,
-        },
-        payload: {
-          name: "test1",
-          colour: "#000003",
-        },
-      });
-      expect(updateTag.statusCode).toBe(201);
-
-      const tagUpdatedResult: ResourceCreateResponse<Tags> = deserialize(
-        ResourceCreateResponse,
-        updateTag.body,
-      );
-      expect(tagUpdatedResult.resource).toBeDefined();
-      expect(tagUpdatedResult.resource.name).toBe("test1");
-      expect(tagUpdatedResult.resource.colour).toBe("#000003");
-      expect(tagUpdatedResult.resource.company_id).toBe(platform.workspace.company_id);
-      expect(tagUpdatedResult.resource.tag_id).toBe("test1");
-
-      const getUpdatedTag = await platform.app.inject({
-        method: "GET",
-        url: `${url}/companies/${platform.workspace.company_id}/tags/${tagUpdatedResult.resource.tag_id}`,
-        headers: {
-          authorization: `Bearer ${jwtToken}`,
-        },
-      });
-      expect(getUpdatedTag.statusCode).toBe(200);
-
-      done();
-    });
-
-    it("should 401 if creator is not a company admin", async done => {
-      const user = await testDbService.createUser([testDbService.defaultWorkspace()], {
-        companyRole: "member",
-      });
-      const jwtToken = await platform.auth.getJWTToken({ sub: user.id });
-      const createTag = await platform.app.inject({
-        method: "POST",
-        url: `${url}/companies/${platform.workspace.company_id}/tags/testNotAdmin`,
-        headers: {
-          authorization: `Bearer ${jwtToken}`,
-        },
-        payload: {
-          name: "testNotAdmin",
-          colour: "#000000",
-        },
-      });
-      expect(createTag.statusCode).toBe(401);
-
-      const tagResult: ResourceCreateResponse<Tags> = deserialize(
-        ResourceCreateResponse,
-        createTag.body,
-      );
-      console.log("tagResult2", tagResult, jwtToken);
-      expect(tagResult.resource).toBe(undefined);
-
-      done();
-    });
-  });
-
-  describe("List tags", () => {
-    it("should 200 list a tag", async done => {
-      const user = await testDbService.createUser([testDbService.defaultWorkspace()], {
-        companyRole: "member",
-      });
-      const jwtToken = await platform.auth.getJWTToken({ sub: user.id });
-      const listTag = await platform.app.inject({
-        method: "GET",
-        url: `${url}/companies/${platform.workspace.company_id}/tags`,
-        headers: {
-          authorization: `Bearer ${jwtToken}`,
-        },
-      });
-      expect(listTag.statusCode).toBe(200);
-
-      const tagResult: ResourceListResponse<Tags> = deserialize(ResourceListResponse, listTag.body);
-      expect(tagResult.resources).toBeDefined();
-      for (const tag of tagResult.resources) {
-        expect(tag.name).toBeDefined();
-        expect(tag.colour).toBeDefined();
-        expect(tag.company_id).toBe(platform.workspace.company_id);
-        expect(tag.tag_id).toBeDefined();
-      }
-
-      done();
-    });
-  });
-
-  describe("Delete tag", () => {
-    it("should 200 if admin delete a tag", async done => {
-      const user = await testDbService.createUser([testDbService.defaultWorkspace()], {
-        companyRole: "admin",
-      });
-      const jwtToken = await platform.auth.getJWTToken({ sub: user.id });
-      const deleteTag = await platform.app.inject({
-        method: "DELETE",
-        url: `${url}/companies/${platform.workspace.company_id}/tags/${tagIds[0]}`,
-        headers: {
-          authorization: `Bearer ${jwtToken}`,
-        },
-      });
-      expect(deleteTag.statusCode).toBe(200);
-
-      done();
-    });
-
-    it("should 200 if tag does not exist", async done => {
-      const user = await testDbService.createUser([testDbService.defaultWorkspace()], {
-        companyRole: "admin",
-      });
-      const jwtToken = await platform.auth.getJWTToken({ sub: user.id });
-      const deleteTag = await platform.app.inject({
-        method: "DELETE",
-        url: `${url}/companies/${platform.workspace.company_id}/tags/NonExistingTag`,
-        headers: {
-          authorization: `Bearer ${jwtToken}`,
-        },
-      });
-      expect(deleteTag.statusCode).toBe(200);
-      done();
-    });
-
-    it("should 401 if not admin", async done => {
-      const user = await testDbService.createUser([testDbService.defaultWorkspace()], {
-        companyRole: "member",
-      });
-      const jwtToken = await platform.auth.getJWTToken({ sub: user.id });
-      const deleteTag = await platform.app.inject({
-        method: "DELETE",
-        url: `${url}/companies/${platform.workspace.company_id}/tags/${tagIds[0]}`,
-        headers: {
-          authorization: `Bearer ${jwtToken}`,
-        },
-      });
-      expect(deleteTag.statusCode).toBe(401);
-      done();
-    });
-  });
-});
diff --git a/twake/backend/node/test/e2e/users/users.search.spec.ts b/twake/backend/node/test/e2e/users/users.search.spec.ts
index b95d1320..e096e02a 100644
--- a/twake/backend/node/test/e2e/users/users.search.spec.ts
+++ b/twake/backend/node/test/e2e/users/users.search.spec.ts
@@ -52,32 +52,32 @@ describe("The /users API", () => {
       await testDbService.createUser([workspacePk], {
         firstName: "Ha",
         lastName: "Nguyen",
-        email: "hnguyen@twake.app",
+        email: "hnguyen@tdrive.app",
       });
       await testDbService.createUser([workspacePk], {
         firstName: "Harold",
         lastName: "Georges",
-        email: "hgeorges@twake.app",
+        email: "hgeorges@tdrive.app",
       });
       await testDbService.createUser([workspacePk], {
         firstName: "Bob",
         lastName: "Smith",
-        email: "bob@twake.app",
+        email: "bob@tdrive.app",
       });
       await testDbService.createUser([workspacePk], {
         firstName: "Bob",
         lastName: "Rabiot",
-        email: "rabiot.b@twake.app",
+        email: "rabiot.b@tdrive.app",
       });
       await testDbService.createUser([workspacePk, workspacePk2], {
         firstName: "Bob",
         lastName: "Smith-Rabiot",
-        email: "rbs@twake.app",
+        email: "rbs@tdrive.app",
       });
       await testDbService.createUser([workspacePk], {
         firstName: "Alexïs",
         lastName: "Goélâns",
-        email: "alexis.goelans@twake.app",
+        email: "alexis.goelans@tdrive.app",
       });
 
       //Wait for indexation to happen
@@ -88,38 +88,38 @@ describe("The /users API", () => {
 
       resources = await search("bob rabiot");
 
-      expect(resources.map(e => e.email).includes("rabiot.b@twake.app")).toBe(true);
-      expect(resources.map(e => e.email).includes("rbs@twake.app")).toBe(true);
-      expect(resources.map(e => e.email).includes("bob@twake.app")).toBe(true);
+      expect(resources.map(e => e.email).includes("rabiot.b@tdrive.app")).toBe(true);
+      expect(resources.map(e => e.email).includes("rbs@tdrive.app")).toBe(true);
+      expect(resources.map(e => e.email).includes("bob@tdrive.app")).toBe(true);
 
       resources = await search("alexis");
-      expect(resources[0].email).toBe("alexis.goelans@twake.app");
+      expect(resources[0].email).toBe("alexis.goelans@tdrive.app");
 
       resources = await search("ALEXIS");
-      expect(resources[0].email).toBe("alexis.goelans@twake.app");
+      expect(resources[0].email).toBe("alexis.goelans@tdrive.app");
 
       resources = await search("AleXis");
-      expect(resources[0].email).toBe("alexis.goelans@twake.app");
+      expect(resources[0].email).toBe("alexis.goelans@tdrive.app");
 
       resources = await search("alex");
-      expect(resources[0].email).toBe("alexis.goelans@twake.app");
+      expect(resources[0].email).toBe("alexis.goelans@tdrive.app");
 
       resources = await search("àlèXïs");
-      expect(resources[0].email).toBe("alexis.goelans@twake.app");
+      expect(resources[0].email).toBe("alexis.goelans@tdrive.app");
 
       resources = await search("rbs");
-      expect(resources[0].email).toBe("rbs@twake.app");
+      expect(resources[0].email).toBe("rbs@tdrive.app");
 
-      resources = await search("rbs@twake.app");
-      expect(resources[0].email).toBe("rbs@twake.app");
+      resources = await search("rbs@tdrive.app");
+      expect(resources[0].email).toBe("rbs@tdrive.app");
 
       resources = await search("bob", workspacePk2.company_id);
       expect(resources.length).toBe(1);
 
-      resources = await search("rbs@twake.app", workspacePk.company_id);
-      expect(resources[0].email).toBe("rbs@twake.app");
+      resources = await search("rbs@tdrive.app", workspacePk.company_id);
+      expect(resources[0].email).toBe("rbs@tdrive.app");
 
-      resources = await search("rbs@twake.app", uuidv1());
+      resources = await search("rbs@tdrive.app", uuidv1());
       expect(resources.length).toBe(0);
 
       done();
diff --git a/twake/backend/node/test/e2e/users/users.spec.ts b/twake/backend/node/test/e2e/users/users.spec.ts
index a8c03130..742d6cf8 100644
--- a/twake/backend/node/test/e2e/users/users.spec.ts
+++ b/twake/backend/node/test/e2e/users/users.spec.ts
@@ -2,14 +2,7 @@ import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it } from
 import { init, TestPlatform } from "../setup";
 import { TestDbService } from "../utils.prepare.db";
 import { v1 as uuidv1 } from "uuid";
-import { CompanyLimitsEnum, UserObject } from "../../../src/services/user/web/types";
-import { ChannelVisibility } from "../../../src/services/channels/types";
-import gr from "../../../src/services/global-resolver";
-import { ResourceListResponse, Workspace } from "../../../src/utils/types";
-import { ChannelSaveOptions } from "../../../src/services/channels/web/types";
-import { createMessage, e2e_createThread } from "../messages/utils";
-import { deserialize } from "class-transformer";
-import { get as getChannelUtils } from "../channels/utils";
+import { CompanyLimitsEnum } from "../../../src/services/user/web/types";
 
 describe("The /users API", () => {
   const url = "/internal/services/users/v1";
@@ -557,89 +550,4 @@ describe("The /users API", () => {
       });
     });
   });
-
-  describe("Recent contacts", () => {
-    it("should return list of recent contacts of user", async done => {
-      // api = new Api(platform);
-      const channelUtils = getChannelUtils(platform);
-
-      await testDbService.createDefault(platform);
-
-      const channels = [];
-
-      for (let i = 0; i < 5; i++) {
-        // const channel = channelUtils.getChannel();
-        const directChannelIn = channelUtils.getDirectChannel();
-
-        const nextUser = await testDbService.createUser(
-          [{ id: platform.workspace.workspace_id, company_id: platform.workspace.company_id }],
-          { firstName: "FirstName" + i, lastName: "LastName" + i },
-        );
-
-        const members = [platform.currentUser.id, nextUser.id];
-        const directWorkspace: Workspace = {
-          company_id: platform.workspace.company_id,
-          workspace_id: ChannelVisibility.DIRECT,
-        };
-        await Promise.all([
-          // gr.services.channels.channels.save(channel, {}, getContext()),
-          gr.services.channels.channels.save<ChannelSaveOptions>(
-            directChannelIn,
-            {
-              members,
-            },
-            {
-              ...{
-                workspace: platform.workspace,
-                user: platform.currentUser,
-              },
-              ...{ workspace: directWorkspace },
-            },
-          ),
-        ]);
-        channels.push(directChannelIn);
-      }
-
-      await new Promise(resolve => setTimeout(resolve, 1000));
-
-      await e2e_createThread(
-        platform,
-        [
-          {
-            company_id: platform.workspace.company_id,
-            created_at: 0,
-            created_by: "",
-            id: channels[2].id,
-            type: "channel",
-            workspace_id: "direct",
-          },
-        ],
-        createMessage({ text: "Some message" }),
-      );
-
-      await new Promise(resolve => setTimeout(resolve, 1000));
-
-      const jwtToken = await platform.auth.getJWTToken();
-
-      const response = await platform.app.inject({
-        method: "GET",
-        url: `${url}/companies/${platform.workspace.company_id}/users/recent`,
-        headers: {
-          authorization: `Bearer ${jwtToken}`,
-        },
-      });
-
-      expect(response.statusCode).toBe(200);
-
-      const result: ResourceListResponse<UserObject> = deserialize(
-        ResourceListResponse,
-        response.body,
-      );
-
-      expect(result.resources.length).toEqual(5);
-      expect(result.resources[0].first_name).toEqual("FirstName2");
-
-      done();
-    });
-  });
 });
diff --git a/twake/backend/node/test/e2e/utils.prepare.db.ts b/twake/backend/node/test/e2e/utils.prepare.db.ts
index b8cdfa3c..f91d6bdf 100644
--- a/twake/backend/node/test/e2e/utils.prepare.db.ts
+++ b/twake/backend/node/test/e2e/utils.prepare.db.ts
@@ -15,8 +15,6 @@ import Repository from "../../src/core/platform/services/database/services/orm/r
 import Device from "../../src/services/user/entities/device";
 
 import gr from "../../src/services/global-resolver";
-import { Channel } from "../../src/services/channels/entities";
-import { get as getChannelUtils } from "./channels/utils";
 
 export type uuid = string;
 
@@ -73,7 +71,7 @@ export class TestDbService {
 
   async createCompany(id?: uuid, name?: string): Promise<Company> {
     if (!name) {
-      name = `TwakeAutotests-test-company-${this.rand()}`;
+      name = `TdriveAutotests-test-company-${this.rand()}`;
     }
     this.company = await gr.services.companies.createCompany(
       getCompanyInstance({
@@ -88,7 +86,7 @@ export class TestDbService {
 
   async createWorkspace(
     workspacePk: WorkspacePrimaryKey,
-    name = `TwakeAutotests-test-workspace-${this.rand()}`,
+    name = `TdriveAutotests-test-workspace-${this.rand()}`,
   ): Promise<Workspace> {
     if (!workspacePk.company_id) throw new Error("company_id is not defined for workspace");
 
@@ -139,7 +137,7 @@ export class TestDbService {
     user.username_canonical = options.username || `test${random}`;
     user.first_name = options.firstName || `test${random}_first_name`;
     user.last_name = options.lastName || `test${random}_last_name`;
-    user.email_canonical = options.email || `test${random}@twake.app`;
+    user.email_canonical = options.email || `test${random}@tdrive.app`;
     user.identity_provider_id = user.id;
     user.cache = options.cache || user.cache || { companies: [] };
 
@@ -259,15 +257,4 @@ export class TestDbService {
   defaultWorkspace() {
     return this.workspaces[0].workspace;
   }
-
-  async createChannel(userId): Promise<Channel> {
-    const channelUtils = getChannelUtils(this.testPlatform);
-    const channel = channelUtils.getChannel(userId);
-    const creationResult = await gr.services.channels.channels.save(
-      channel,
-      {},
-      channelUtils.getContext({ id: userId }),
-    );
-    return creationResult.entity;
-  }
 }
diff --git a/twake/backend/node/test/e2e/websocket/auth.spec.ts b/twake/backend/node/test/e2e/websocket/auth.spec.ts
deleted file mode 100644
index 2326101c..00000000
--- a/twake/backend/node/test/e2e/websocket/auth.spec.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { afterEach, beforeEach, describe, it } from "@jest/globals";
-import { init, TestPlatform } from "../setup";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import io from "socket.io-client";
-
-describe("The Websocket authentication", () => {
-  let platform: TestPlatform;
-  let socket: SocketIOClient.Socket;
-
-  beforeEach(async ends => {
-    platform = await init({
-      services: [
-        "webserver",
-        "database",
-        "search",
-        "storage",
-        "message-queue",
-        "user",
-        "websocket",
-        "webserver",
-        "applications",
-        "auth",
-        "realtime",
-        "channels" /* FIXME: platform is not started if a business service is not in dependencies */,
-        "counter",
-        "statistics",
-        "platform-services",
-      ],
-    });
-
-    socket = io.connect("http://localhost:3000", { path: "/socket" });
-
-    ends();
-  });
-
-  afterEach(async ends => {
-    platform && (await platform.tearDown());
-    platform = null;
-    socket && socket.close();
-    socket = null;
-    ends();
-  });
-
-  describe("JWT-based Authentication", () => {
-    it("should not be able to connect without a JWT token", done => {
-      socket.connect();
-      socket.on("connect", () => {
-        socket
-          .emit("authenticate", {})
-          .on("authenticated", () => {
-            done(new Error("Should not occur"));
-          })
-          .on("unauthorized", (msg: any) => {
-            done();
-          });
-      });
-    });
-
-    it("should not be able to connect with something which is not a JWT token", done => {
-      socket.connect();
-      socket.on("connect", () => {
-        socket
-          .emit("authenticate", { token: "Not a JWT token" })
-          .on("authenticated", () => {
-            done(new Error("Should not occur"));
-          })
-          .on("unauthorized", (msg: any) => {
-            done();
-          });
-      });
-    });
-
-    it("should be able to connect with a JWT token", async done => {
-      const token = await platform.auth.getJWTToken();
-
-      socket.connect();
-      socket.on("connect", () => {
-        socket
-          .emit("authenticate", { token })
-          .on("authenticated", () => {
-            done();
-          })
-          .on("unauthorized", () => {
-            done(new Error("Should not occur"));
-          });
-      });
-    });
-  });
-});
diff --git a/twake/backend/node/test/e2e/websocket/realtime.spec.ts b/twake/backend/node/test/e2e/websocket/realtime.spec.ts
deleted file mode 100644
index d5199328..00000000
--- a/twake/backend/node/test/e2e/websocket/realtime.spec.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it } from "@jest/globals";
-import { init, TestPlatform } from "../setup";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import io from "socket.io-client";
-
-describe("The Realtime API", () => {
-  let platform: TestPlatform;
-  let socket: SocketIOClient.Socket;
-
-  beforeEach(async ends => {
-    platform = await init({
-      services: [
-        "webserver",
-        "database",
-        "search",
-        "storage",
-        "message-queue",
-        "applications",
-        "user",
-        "auth",
-        "websocket",
-        "realtime",
-        "channels" /* FIXME: platform is not started if a business service is not in dependencies */,
-        "counter",
-        "statistics",
-        "platform-services",
-      ],
-    });
-
-    socket = io.connect("http://localhost:3000", { path: "/socket" });
-
-    ends();
-  });
-
-  afterEach(async ends => {
-    await platform.tearDown();
-    platform = null;
-    socket && socket.close();
-    socket = null;
-
-    ends();
-  });
-
-  describe("Joining rooms", () => {
-    it("should fail when token is not defined", async done => {
-      const token = await platform.auth.getJWTToken();
-      const name = "/ping";
-
-      socket.on("connect", () => {
-        socket
-          .emit("authenticate", { token })
-          .on("authenticated", () => {
-            socket.emit("realtime:join", { name });
-            socket.on("realtime:join:error", (event: any) => {
-              expect(event.name).toEqual(name);
-              done();
-            });
-            socket.on("realtime:join:success", () => done(new Error("Should not occur")));
-          })
-          .on("unauthorized", () => {
-            done(new Error("Should not occur"));
-          });
-      });
-    });
-
-    it("should fail when token is not valid", async done => {
-      const token = await platform.auth.getJWTToken();
-      const name = "/ping";
-      const roomToken = "invalid token";
-
-      socket.on("connect", () => {
-        socket
-          .emit("authenticate", { token })
-          .on("authenticated", () => {
-            socket.emit("realtime:join", { name, token: roomToken });
-            socket.on("realtime:join:error", (event: any) => {
-              expect(event.name).toEqual(name);
-              done();
-            });
-            socket.on("realtime:join:success", () => done(new Error("Should not occur")));
-          })
-          .on("unauthorized", () => {
-            done(new Error("Should not occur"));
-          });
-      });
-    });
-
-    it("should receive a realtime:join:success when token is valid and room has been joined", async done => {
-      const token = await platform.auth.getJWTToken();
-      const name = "test";
-      const roomToken = "twake";
-
-      socket.on("connect", () => {
-        socket
-          .emit("authenticate", { token })
-          .on("authenticated", () => {
-            socket.emit("realtime:join", { name, token: roomToken });
-            socket.on("realtime:join:error", () => done(new Error("Should not occur")));
-            socket.on("realtime:join:success", (event: any) => {
-              expect(event.name).toEqual(name);
-              done();
-            });
-          })
-          .on("unauthorized", () => {
-            done(new Error("Should not occur"));
-          });
-      });
-    });
-  });
-
-  describe("Leaving rooms", () => {
-    it("should not fail when room has not been joined first", async done => {
-      const token = await platform.auth.getJWTToken();
-      const name = "roomtest";
-
-      socket.on("connect", () => {
-        socket
-          .emit("authenticate", { token })
-          .on("authenticated", () => {
-            socket.emit("realtime:leave", { name });
-            socket.on("realtime:leave:error", () => done(new Error("should not fail")));
-            socket.on("realtime:leave:success", (event: any) => {
-              expect(event.name).toEqual(name);
-              done();
-            });
-          })
-          .on("unauthorized", () => {
-            done(new Error("Should not occur"));
-          });
-      });
-    });
-
-    it("should send success when room has been joined first", async done => {
-      const token = await platform.auth.getJWTToken();
-      const roomToken = "twake";
-      const name = "roomtest";
-
-      socket.on("connect", () => {
-        socket
-          .emit("authenticate", { token })
-          .on("authenticated", () => {
-            socket.emit("realtime:join", { name, token: roomToken });
-            socket.emit("realtime:leave", { name });
-            socket.on("realtime:leave:error", () => done(new Error("should not fail")));
-            socket.on("realtime:leave:success", (event: any) => {
-              expect(event.name).toEqual(name);
-              done();
-            });
-          })
-          .on("unauthorized", () => {
-            done(new Error("Should not occur"));
-          });
-      });
-    });
-  });
-});
diff --git a/twake/backend/node/test/e2e/workspaces/workspace-users.spec.ts b/twake/backend/node/test/e2e/workspaces/workspace-users.spec.ts
new file mode 100644
index 00000000..c70f2e83
--- /dev/null
+++ b/twake/backend/node/test/e2e/workspaces/workspace-users.spec.ts
@@ -0,0 +1,469 @@
+import { afterAll, beforeAll, describe, expect, it } from "@jest/globals";
+import { init, TestPlatform } from "../setup";
+import { TestDbService, uuid } from "../utils.prepare.db";
+import { v1 as uuidv1 } from "uuid";
+
+describe("The /workspace users API", () => {
+  const url = "/internal/services/workspaces/v1";
+  let platform: TestPlatform;
+
+  let testDbService: TestDbService;
+
+  const nonExistentId = uuidv1();
+  let companyId = "";
+
+  const checkUserObject = (resource: any) => {
+    expect(resource).toMatchObject({
+      id: expect.any(String),
+      company_id: expect.any(String),
+      workspace_id: expect.any(String),
+      user_id: expect.any(String),
+      created_at: expect.any(Number),
+      role: expect.stringMatching(/moderator|member/),
+      user: {
+        id: expect.any(String),
+        provider: expect.any(String),
+        provider_id: expect.any(String),
+        email: expect.any(String),
+        is_verified: expect.any(Boolean),
+        picture: expect.any(String),
+        first_name: expect.any(String),
+        last_name: expect.any(String),
+        created_at: expect.any(Number),
+        deleted: expect.any(Boolean),
+        status: expect.any(String),
+        last_activity: expect.any(Number),
+      },
+    });
+  };
+
+  beforeAll(async ends => {
+    platform = await init({
+      services: [
+        "database",
+        "message-queue",
+        "search",
+        "webserver",
+        "user",
+        "workspaces",
+        "applications",
+        "auth",
+        "console",
+        "counter",
+        "storage",
+        "statistics",
+        "platform-services",
+      ],
+    });
+
+    companyId = platform.workspace.company_id;
+
+    await platform.database.getConnector().init();
+    testDbService = new TestDbService(platform);
+    await testDbService.createCompany(companyId);
+    const ws0pk = { id: uuidv1(), company_id: companyId };
+    const ws1pk = { id: uuidv1(), company_id: companyId };
+    const ws2pk = { id: uuidv1(), company_id: companyId };
+    const ws3pk = { id: uuidv1(), company_id: companyId };
+    await testDbService.createWorkspace(ws0pk);
+    await testDbService.createWorkspace(ws1pk);
+    await testDbService.createWorkspace(ws2pk);
+    await testDbService.createWorkspace(ws3pk);
+    await testDbService.createUser([ws0pk, ws1pk]);
+    await testDbService.createUser([ws2pk], { companyRole: "admin" });
+    await testDbService.createUser([ws2pk], { workspaceRole: "moderator" });
+    await testDbService.createUser([ws2pk], { workspaceRole: "member" });
+    await testDbService.createUser([ws2pk], { workspaceRole: "member" });
+    await testDbService.createUser([], { companyRole: "member" });
+    await testDbService.createUser([ws3pk], { companyRole: "guest", workspaceRole: "member" });
+    ends();
+  });
+
+  afterAll(async ends => {
+    await platform.tearDown();
+    ends();
+  });
+
+  describe("The GET /workspaces/users route", () => {
+    it("should 401 when not authenticated", async done => {
+      const companyId = testDbService.company.id;
+
+      const response = await platform.app.inject({
+        method: "GET",
+        url: `${url}/companies/${companyId}/workspaces/${nonExistentId}/users`,
+      });
+      expect(response.statusCode).toBe(401);
+      done();
+    });
+
+    it("should 404 when workspace not found", async done => {
+      const userId = testDbService.users[0].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+
+      const response = await platform.app.inject({
+        method: "GET",
+        url: `${url}/companies/${companyId}/workspaces/${nonExistentId}/users`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+      });
+      expect(response.statusCode).toBe(404);
+      done();
+    });
+
+    it("should 200 when ok", async done => {
+      const companyId = testDbService.company.id;
+      const workspaceId = testDbService.workspaces[2].workspace.id;
+      const userId = testDbService.workspaces[2].users[0].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+      const response = await platform.app.inject({
+        method: "GET",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}/users`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+      });
+      expect(response.statusCode).toBe(200);
+
+      const resources = response.json()["resources"];
+
+      expect(resources.length).toBeGreaterThan(0);
+
+      for (const resource of resources) {
+        checkUserObject(resource);
+      }
+
+      done();
+    });
+  });
+
+  describe("The GET /workspaces/users/:user_id route", () => {
+    it("should 401 when not authenticated", async done => {
+      const companyId = testDbService.company.id;
+      const userId = testDbService.users[0].id;
+
+      const response = await platform.app.inject({
+        method: "GET",
+        url: `${url}/companies/${companyId}/workspaces/${nonExistentId}/users/${userId}`,
+      });
+      expect(response.statusCode).toBe(401);
+      done();
+    });
+
+    it("should 404 when workspace not found", async done => {
+      const userId = testDbService.users[0].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+
+      const response = await platform.app.inject({
+        method: "GET",
+        url: `${url}/companies/${companyId}/workspaces/${nonExistentId}/users/${userId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+      });
+      expect(response.statusCode).toBe(404);
+      done();
+    });
+
+    it("should 200 when ok", async done => {
+      const companyId = testDbService.company.id;
+      const workspaceId = testDbService.workspaces[0].workspace.id;
+      const userId = testDbService.workspaces[0].users[0].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+      const response = await platform.app.inject({
+        method: "GET",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}/users/${userId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+      });
+      expect(response.statusCode).toBe(200);
+
+      const resource = response.json()["resource"];
+      checkUserObject(resource);
+      done();
+    });
+  });
+
+  describe("The POST /workspaces/users route (add)", () => {
+    it("should 401 when not authenticated", async done => {
+      const companyId = testDbService.company.id;
+
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces/${nonExistentId}/users`,
+      });
+      expect(response.statusCode).toBe(401);
+      done();
+    });
+
+    it("should 403 user is not workspace moderator", async done => {
+      const userId = testDbService.users[0].id;
+      const anotherUserId = testDbService.users[1].id;
+      const workspaceId = testDbService.workspaces[0].workspace.id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}/users`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+        payload: {
+          resource: {
+            user_id: anotherUserId,
+            role: "moderator",
+          },
+        },
+      });
+      expect(response.statusCode).toBe(403);
+      done();
+    });
+
+    it("should 400 when requested user not in company", async done => {
+      const companyId = testDbService.company.id;
+      const workspaceId = testDbService.workspaces[2].workspace.id;
+      const userId = testDbService.workspaces[2].users[1].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}/users`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+        payload: {
+          resource: {
+            user_id: nonExistentId,
+            role: "moderator",
+          },
+        },
+      });
+      expect(response.statusCode).toBe(400);
+      done();
+    });
+
+    it("should 201 when requested already in workspace (ignore)", async done => {
+      const companyId = testDbService.company.id;
+      const workspaceId = testDbService.workspaces[2].workspace.id;
+      const userId = testDbService.workspaces[2].users[1].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}/users`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+        payload: {
+          resource: {
+            user_id: userId,
+            role: "moderator",
+          },
+        },
+      });
+      expect(response.statusCode).toBe(201);
+      done();
+    });
+
+    it("should 200 when ok", async done => {
+      const companyId = testDbService.company.id;
+      const workspaceId = testDbService.workspaces[2].workspace.id;
+      const userId = testDbService.workspaces[2].users[1].id;
+      const anotherUserId = testDbService.workspaces[0].users[0].id;
+
+      let workspaceUsersCount = await testDbService.getWorkspaceUsersCountFromDb(workspaceId);
+      let companyUsersCount = await testDbService.getCompanyUsersCountFromDb(companyId);
+
+      console.log(testDbService.workspaces[2].users);
+      console.log(workspaceUsersCount);
+
+      expect(workspaceUsersCount).toBe(4);
+      // expect(companyUsersCount).toBe(6);
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}/users`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+        payload: {
+          resource: {
+            user_id: anotherUserId,
+            role: "moderator",
+          },
+        },
+      });
+
+      expect(response.statusCode).toBe(201);
+      const resource = response.json()["resource"];
+      checkUserObject(resource);
+
+      workspaceUsersCount = await testDbService.getWorkspaceUsersCountFromDb(workspaceId);
+      companyUsersCount = await testDbService.getCompanyUsersCountFromDb(companyId);
+      expect(workspaceUsersCount).toBe(5);
+      // expect(companyUsersCount).toBe(6);
+
+      done();
+    });
+  });
+
+  describe("The POST /workspaces/users/:user_id route (update)", () => {
+    it("should 401 when not authenticated", async done => {
+      const companyId = testDbService.company.id;
+      const userId = testDbService.users[0].id;
+
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces/${nonExistentId}/users/${userId}`,
+      });
+      expect(response.statusCode).toBe(401);
+      done();
+    });
+
+    it("should 403 user is not workspace moderator", async done => {
+      const userId = testDbService.users[0].id;
+      const anotherUserId = testDbService.users[1].id;
+      const workspaceId = testDbService.workspaces[0].workspace.id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}/users/${userId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+        payload: {
+          resource: {
+            user_id: anotherUserId,
+            role: "moderator",
+          },
+        },
+      });
+      expect(response.statusCode).toBe(403);
+      done();
+    });
+
+    it("should 404 when user not found in workspace", async done => {
+      const workspaceId = testDbService.workspaces[2].workspace.id;
+      const userId = testDbService.workspaces[2].users[1].id;
+      const anotherWorkspaceUserId = testDbService.workspaces[3].users[0].id;
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}/users/${anotherWorkspaceUserId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+        payload: {
+          resource: {
+            role: "moderator",
+          },
+        },
+      });
+
+      expect(response.statusCode).toBe(404);
+      done();
+    });
+
+    it("should 200 when ok", async done => {
+      const companyId = testDbService.company.id;
+      const workspaceId = testDbService.workspaces[2].workspace.id;
+      const userId = testDbService.workspaces[2].users[1].id;
+      const anotherUserId = testDbService.workspaces[2].users[2].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}/users/${anotherUserId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+        payload: {
+          resource: {
+            role: "moderator",
+          },
+        },
+      });
+
+      expect(response.statusCode).toBe(201);
+      const resource = response.json()["resource"];
+      checkUserObject(resource);
+
+      expect(resource["role"]).toBe("moderator");
+
+      const usersCount = await testDbService.getWorkspaceUsersCountFromDb(workspaceId);
+      expect(usersCount).toBe(5);
+
+      done();
+    });
+  });
+
+  describe("The DELETE /workspaces/users/:user_id route", () => {
+    it("should 401 when not authenticated", async done => {
+      const companyId = testDbService.company.id;
+      const anotherUserId = testDbService.users[1].id;
+
+      const response = await platform.app.inject({
+        method: "DELETE",
+        url: `${url}/companies/${companyId}/workspaces/${nonExistentId}/users/${anotherUserId}`,
+      });
+      expect(response.statusCode).toBe(401);
+      done();
+    });
+
+    it("should 403 user is not workspace moderator", async done => {
+      const companyId = testDbService.company.id;
+      const workspaceId = testDbService.workspaces[2].workspace.id;
+      const userId = testDbService.workspaces[2].users[3].id;
+      const anotherUserId = testDbService.workspaces[2].users[1].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+
+      const response = await platform.app.inject({
+        method: "DELETE",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}/users/${anotherUserId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+      });
+
+      console.log(response.body);
+
+      expect(response.statusCode).toBe(403);
+      done();
+    });
+
+    it("should 404 when user not found in workspace", async done => {
+      const companyId = testDbService.company.id;
+      const workspaceId = testDbService.workspaces[2].workspace.id;
+      const userId = testDbService.workspaces[2].users[1].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+      const response = await platform.app.inject({
+        method: "DELETE",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}/users/${nonExistentId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+      });
+
+      expect(response.statusCode).toBe(404);
+
+      done();
+    });
+
+    it("should 200 when ok", async done => {
+      const companyId = testDbService.company.id;
+      const workspaceId = testDbService.workspaces[2].workspace.id;
+      const userId = testDbService.workspaces[2].users[1].id;
+      const anotherUserId = testDbService.workspaces[2].users[2].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+      let response = await platform.app.inject({
+        method: "DELETE",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}/users/${anotherUserId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+      });
+
+      expect(response.statusCode).toBe(204);
+
+      response = await platform.app.inject({
+        method: "GET",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}/users`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+      });
+
+      expect(response.statusCode).toBe(200);
+      const resources = response.json()["resources"];
+      expect(resources.find((a: { user_id: uuid }) => a.user_id === anotherUserId)).toBeUndefined();
+
+      const usersCount = await testDbService.getWorkspaceUsersCountFromDb(workspaceId);
+      expect(usersCount).toBe(4);
+
+      done();
+    });
+  });
+});
diff --git a/twake/backend/node/test/e2e/workspaces/workspaces.spec.ts b/twake/backend/node/test/e2e/workspaces/workspaces.spec.ts
new file mode 100644
index 00000000..d251e304
--- /dev/null
+++ b/twake/backend/node/test/e2e/workspaces/workspaces.spec.ts
@@ -0,0 +1,513 @@
+import { afterAll, beforeAll, describe, expect, it } from "@jest/globals";
+import { init, TestPlatform } from "../setup";
+import { TestDbService } from "../utils.prepare.db";
+import { v1 as uuidv1 } from "uuid";
+
+describe("The /workspaces API", () => {
+  const url = "/internal/services/workspaces/v1";
+  let platform: TestPlatform;
+
+  let testDbService: TestDbService;
+
+  const nonExistentId = uuidv1();
+  let companyId = "";
+
+  beforeAll(async ends => {
+    platform = await init({
+      services: [
+        "database",
+        "message-queue",
+        "webserver",
+        "user",
+        "search",
+        "workspaces",
+        "auth",
+        "console",
+        "counter",
+        "storage",
+        "applications",
+        "statistics",
+        "platform-services",
+      ],
+    });
+
+    companyId = platform.workspace.company_id;
+
+    await platform.database.getConnector().init();
+    testDbService = new TestDbService(platform);
+    await testDbService.createCompany(companyId);
+    const ws0pk = { id: uuidv1(), company_id: companyId };
+    const ws1pk = { id: uuidv1(), company_id: companyId };
+    const ws2pk = { id: uuidv1(), company_id: companyId };
+    await testDbService.createWorkspace(ws0pk);
+    await testDbService.createWorkspace(ws1pk);
+    await testDbService.createWorkspace(ws2pk);
+    await testDbService.createUser([ws0pk, ws1pk]);
+    await testDbService.createUser([ws2pk], { companyRole: "admin" });
+    await testDbService.createUser([ws2pk], { companyRole: undefined, workspaceRole: "moderator" });
+    await testDbService.createUser([], { companyRole: "guest" });
+    ends();
+  });
+
+  afterAll(async ends => {
+    await platform.tearDown();
+    ends();
+  });
+
+  describe("The GET /workspaces/ route", () => {
+    it("should 401 when not authenticated", async done => {
+      const response = await platform.app.inject({
+        method: "GET",
+        url: `${url}/companies/${nonExistentId}/workspaces`,
+      });
+      expect(response.statusCode).toBe(401);
+      done();
+    });
+
+    it("should 404 when company not found", async done => {
+      const userId = testDbService.workspaces[0].users[0].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+
+      const response = await platform.app.inject({
+        method: "GET",
+        url: `${url}/companies/${nonExistentId}/workspaces`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+      });
+      expect(response.statusCode).toBe(404);
+      done();
+    });
+
+    it("should 200 when company belongs to user", async done => {
+      const userId = testDbService.workspaces[0].users[0].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+      const companyId = testDbService.company.id;
+      const response = await platform.app.inject({
+        method: "GET",
+        url: `${url}/companies/${companyId}/workspaces`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+      });
+      expect(response.statusCode).toBe(200);
+
+      const resources = response.json()["resources"];
+
+      expect(resources.length).toBe(2);
+
+      for (const resource of resources) {
+        expect(resource).toMatchObject({
+          id: expect.any(String),
+          company_id: expect.any(String),
+          name: expect.any(String),
+          logo: expect.any(String),
+          default: expect.any(Boolean),
+          archived: expect.any(Boolean),
+          role: expect.stringMatching(/moderator|member/),
+        });
+
+        if (resource.stats) {
+          expect(resource.stats).toMatchObject({
+            created_at: expect.any(Number),
+            total_members: 1,
+          });
+        }
+      }
+
+      done();
+    });
+  });
+
+  describe("The GET /workspaces/:workspace_id route", () => {
+    it("should 401 when not authenticated", async done => {
+      const workspaceId = testDbService.workspaces[0].workspace.id;
+
+      const response = await platform.app.inject({
+        method: "GET",
+        url: `${url}/companies/${nonExistentId}/workspaces/${workspaceId}`,
+      });
+      expect(response.statusCode).toBe(401);
+      done();
+    });
+
+    it("should 404 when workspace not found", async done => {
+      const userId = testDbService.workspaces[0].users[0].id;
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+
+      const response = await platform.app.inject({
+        method: "GET",
+        url: `${url}/companies/${companyId}/workspaces/${uuidv1()}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+      });
+      expect(response.statusCode).toBe(404);
+      done();
+    });
+
+    it("should 403 when user not belong to workspace and not company_admin", async done => {
+      const workspaceId = testDbService.workspaces[2].workspace.id;
+      const userIdFromAnotherWorkspace = testDbService.workspaces[0].users[0].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userIdFromAnotherWorkspace });
+
+      const response = await platform.app.inject({
+        method: "GET",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+      });
+      expect(response.statusCode).toBe(403);
+
+      expect(response.json()).toEqual({
+        error: "Forbidden",
+        message: `You are not belong to workspace ${workspaceId}`,
+        statusCode: 403,
+      });
+
+      done();
+    });
+
+    it("should 200 when user is company_admin", async done => {
+      const workspaceId = testDbService.workspaces[0].workspace.id;
+      const userIdFromAnotherWorkspace = testDbService.workspaces[2].users[0].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userIdFromAnotherWorkspace });
+
+      const response = await platform.app.inject({
+        method: "GET",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+      });
+      expect(response.statusCode).toBe(200);
+
+      const resource = response.json()["resource"];
+
+      expect(resource).toMatchObject({
+        id: expect.any(String),
+        company_id: expect.any(String),
+        name: expect.any(String),
+        logo: expect.any(String),
+        default: expect.any(Boolean),
+        archived: expect.any(Boolean),
+      });
+
+      if (resource.stats) {
+        expect(resource.stats).toMatchObject({
+          created_at: expect.any(Number),
+          total_members: 1,
+        });
+      }
+
+      done();
+    });
+
+    it("should 200 when user is belong to workspace", async done => {
+      const workspaceId = testDbService.workspaces[0].workspace.id;
+      const userIdFromThisWorkspace = testDbService.workspaces[0].users[0].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userIdFromThisWorkspace });
+
+      const response = await platform.app.inject({
+        method: "GET",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+      });
+      expect(response.statusCode).toBe(200);
+
+      const resource = response.json()["resource"];
+
+      expect(resource).toMatchObject({
+        id: expect.any(String),
+        company_id: expect.any(String),
+        name: expect.any(String),
+        logo: expect.any(String),
+        default: expect.any(Boolean),
+        archived: expect.any(Boolean),
+        role: expect.stringMatching(/moderator|member/),
+      });
+
+      if (resource.stats) {
+        expect(resource.stats).toMatchObject({
+          created_at: expect.any(Number),
+          total_members: 1,
+        });
+      }
+
+      done();
+    });
+  });
+
+  // create
+
+  describe("The POST /workspaces route (creating workspace)", () => {
+    it("should 401 when not authenticated", async done => {
+      const companyId = testDbService.company.id;
+
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces/${nonExistentId}`,
+      });
+      expect(response.statusCode).toBe(401);
+      done();
+    });
+
+    it("should 403 when user is not (company member or company admin) ", async done => {
+      const companyId = testDbService.company.id;
+      const userId = testDbService.users[3].id;
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+        payload: {
+          resource: {
+            name: "Some channel name",
+            logo: "",
+            default: false,
+          },
+        },
+      });
+
+      expect(response.statusCode).toBe(403);
+      done();
+    });
+
+    it("should 201 when workspace created well", async done => {
+      const companyId = testDbService.company.id;
+      const userId = testDbService.users[0].id;
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+        payload: {
+          resource: {
+            name: "Random channel name",
+            logo: "logo",
+            default: false,
+          },
+        },
+      });
+
+      expect(response.statusCode).toBe(201);
+
+      const resource = response.json()["resource"];
+
+      expect(resource).toMatchObject({
+        id: expect.any(String),
+        company_id: expect.any(String),
+        name: expect.any(String),
+        logo: expect.any(String),
+        default: expect.any(Boolean),
+        archived: expect.any(Boolean),
+        role: expect.stringMatching(/moderator/),
+      });
+
+      done();
+    });
+  });
+
+  // update
+
+  describe("The POST /workspaces/:workspace_id route (updating workspace)", () => {
+    it("should 401 when not authenticated", async done => {
+      const companyId = testDbService.company.id;
+
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces/${nonExistentId}`,
+        payload: { resource: {} },
+      });
+      expect(response.statusCode).toBe(401);
+      done();
+    });
+
+    it("should 403 when not workspace not found", async done => {
+      const companyId = testDbService.company.id;
+      const userId = testDbService.workspaces[0].users[0].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces/${nonExistentId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+        payload: { resource: {} },
+      });
+
+      expect(response.statusCode).toBe(403);
+
+      done();
+    });
+
+    it("should 403 when not belong to workspace", async done => {
+      const companyId = testDbService.company.id;
+      const workspaceId = testDbService.workspaces[1].workspace.id;
+      const userId = testDbService.workspaces[0].users[0].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+        payload: { resource: {} },
+      });
+
+      expect(response.statusCode).toBe(403);
+
+      done();
+    });
+
+    it("should 403 when not workspace moderator", async done => {
+      const companyId = testDbService.company.id;
+      const workspaceId = testDbService.workspaces[1].workspace.id;
+      const userId = testDbService.workspaces[0].users[0].id;
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+        payload: { resource: {} },
+      });
+
+      expect(response.statusCode).toBe(403);
+
+      done();
+    });
+
+    it("should 200 when admin of company (full update)", async done => {
+      const companyId = testDbService.company.id;
+      const workspaceId = testDbService.workspaces[2].workspace.id;
+      const userId = testDbService.workspaces[2].users[0].id; // company owner
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+        payload: {
+          resource: {
+            name: "Another workspace name",
+            logo: "logo",
+            default: false,
+            archived: false,
+          },
+        },
+      });
+
+      expect(response.statusCode).toBe(200);
+
+      const resource = response.json()["resource"];
+
+      expect(resource).toMatchObject({
+        id: workspaceId,
+        company_id: companyId,
+        name: "Another workspace name",
+        logo: expect.any(String),
+        default: false,
+        archived: false,
+        role: "moderator", //Company admin is a moderator
+      });
+
+      done();
+    });
+
+    it("should 200 when moderator of workspace (partial update)", async done => {
+      const companyId = testDbService.company.id;
+      const workspaceId = testDbService.workspaces[2].workspace.id;
+      const userId = testDbService.workspaces[2].users[1].id; // workspace admin
+
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+
+      const response = await platform.app.inject({
+        method: "POST",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+        payload: {
+          resource: {
+            name: "My awesome workspace",
+            default: true,
+            logo: "",
+          },
+        },
+      });
+
+      expect(response.statusCode).toBe(200);
+
+      const resource = response.json()["resource"];
+
+      expect(resource).toMatchObject({
+        id: workspaceId,
+        company_id: companyId,
+        name: "My awesome workspace",
+        logo: expect.any(String),
+        default: true,
+        archived: false,
+        role: "moderator",
+      });
+
+      done();
+    });
+  });
+
+  // delete
+
+  describe("The DELETE /workspaces route", () => {
+    it("should 401 when not authenticated", async done => {
+      const companyId = testDbService.company.id;
+
+      const response = await platform.app.inject({
+        method: "DELETE",
+        url: `${url}/companies/${companyId}/workspaces/${nonExistentId}`,
+      });
+      expect(response.statusCode).toBe(401);
+      done();
+    });
+
+    it("should 403 when user is not (company member or company admin) ", async done => {
+      const companyId = testDbService.company.id;
+      const userId = testDbService.users[3].id;
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+      const workspaceId = testDbService.workspaces[0].workspace.id;
+
+      const response = await platform.app.inject({
+        method: "DELETE",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+      });
+
+      expect(response.statusCode).toBe(403);
+      done();
+    });
+
+    it("should 204 when workspace deleted", async done => {
+      const companyId = testDbService.company.id;
+      const workspaceId = testDbService.workspaces[2].workspace.id;
+      const userId = testDbService.workspaces[2].users[0].id;
+      const jwtToken = await platform.auth.getJWTToken({ sub: userId });
+
+      const response = await platform.app.inject({
+        method: "DELETE",
+        url: `${url}/companies/${companyId}/workspaces/${workspaceId}`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+      });
+
+      expect(response.statusCode).toBe(204);
+
+      const checkResponse = await platform.app.inject({
+        method: "GET",
+        url: `${url}/companies/${companyId}/workspaces`,
+        headers: { authorization: `Bearer ${jwtToken}` },
+      });
+
+      const checkResponseJson = checkResponse.json();
+
+      expect(checkResponseJson.resources.find((a: any) => a.id === workspaceId)).toBe(undefined);
+
+      done();
+    });
+  });
+});
diff --git a/twake/backend/node/test/http/channel-as-read.http b/twake/backend/node/test/http/channel-as-read.http
index 880d90d2..2ee7cdc0 100644
--- a/twake/backend/node/test/http/channel-as-read.http
+++ b/twake/backend/node/test/http/channel-as-read.http
@@ -22,9 +22,9 @@ Authorization: Bearer {{authToken}}
 {
   "resource": {
     "name": "My channel",
-    "icon": "twake logo",
-    "description": "This channel allow twake's team to chat easily",
-    "channel_group": "twake",
+    "icon": "tdrive logo",
+    "description": "This channel allow tdrive's team to chat easily",
+    "channel_group": "tdrive",
     "visibility": "public",
     "is_default": true,
     "archived": false
diff --git a/twake/backend/node/test/http/channels.http b/twake/backend/node/test/http/channels.http
index 29eb21bf..c665d84c 100644
--- a/twake/backend/node/test/http/channels.http
+++ b/twake/backend/node/test/http/channels.http
@@ -35,9 +35,9 @@ Authorization: Bearer {{authToken}}
 {
   "resource": {
     "name": "My channel",
-    "icon": "twake logo",
-    "description": "This channel allow twake's team to chat easily",
-    "channel_group": "twake",
+    "icon": "tdrive logo",
+    "description": "This channel allow tdrive's team to chat easily",
+    "channel_group": "tdrive",
     "visibility": "public",
     "is_default": true,
     "archived": false
diff --git a/twake/backend/node/test/http/direct-channels.http b/twake/backend/node/test/http/direct-channels.http
index ee436a2e..c3bbe15d 100644
--- a/twake/backend/node/test/http/direct-channels.http
+++ b/twake/backend/node/test/http/direct-channels.http
@@ -45,7 +45,7 @@ Authorization: Bearer {{authToken1}}
   "resource": {
     "icon": "hello",
     "description": "A direct channel",
-    "channel_group": "twake",
+    "channel_group": "tdrive",
     "is_default": false,
     "archived": false
   }
diff --git a/twake/backend/node/test/http/private-channels-membership.http b/twake/backend/node/test/http/private-channels-membership.http
index 12c75b2d..5b1fc3f1 100644
--- a/twake/backend/node/test/http/private-channels-membership.http
+++ b/twake/backend/node/test/http/private-channels-membership.http
@@ -30,9 +30,9 @@ Authorization: Bearer {{authTokenUser1}}
 {
   "resource": {
     "name": "My private channel",
-    "icon": "twake logo",
-    "description": "This channel allow twake's team to chat easily",
-    "channel_group": "twake",
+    "icon": "tdrive logo",
+    "description": "This channel allow tdrive's team to chat easily",
+    "channel_group": "tdrive",
     "visibility": "private",
     "is_default": true,
     "archived": false
diff --git a/twake/backend/node/test/http/private-channels.http b/twake/backend/node/test/http/private-channels.http
index 35dc682e..cbfecc4a 100644
--- a/twake/backend/node/test/http/private-channels.http
+++ b/twake/backend/node/test/http/private-channels.http
@@ -35,9 +35,9 @@ Authorization: Bearer {{authToken}}
 {
   "resource": {
     "name": "My private channel",
-    "icon": "twake logo",
+    "icon": "tdrive logo",
     "description": "A private channel",
-    "channel_group": "twake",
+    "channel_group": "tdrive",
     "visibility": "private",
     "is_default": true,
     "archived": false
diff --git a/twake/backend/node/test/http/public-channels-membership.http b/twake/backend/node/test/http/public-channels-membership.http
index ed8447f5..04123337 100644
--- a/twake/backend/node/test/http/public-channels-membership.http
+++ b/twake/backend/node/test/http/public-channels-membership.http
@@ -30,9 +30,9 @@ Authorization: Bearer {{authTokenUser1}}
 {
   "resource": {
     "name": "A public channel",
-    "icon": "twake logo",
-    "description": "This channel allow twake's team to chat easily",
-    "channel_group": "twake",
+    "icon": "tdrive logo",
+    "description": "This channel allow tdrive's team to chat easily",
+    "channel_group": "tdrive",
     "visibility": "public",
     "is_default": true,
     "archived": false
diff --git a/twake/backend/node/test/http/tabs.http b/twake/backend/node/test/http/tabs.http
index 1306d705..fcd432b4 100644
--- a/twake/backend/node/test/http/tabs.http
+++ b/twake/backend/node/test/http/tabs.http
@@ -29,9 +29,9 @@ Authorization: Bearer {{authToken}}
 {
   "resource": {
     "name": "My channel",
-    "icon": "twake logo",
-    "description": "This channel allow twake's team to chat easily",
-    "channel_group": "twake",
+    "icon": "tdrive logo",
+    "description": "This channel allow tdrive's team to chat easily",
+    "channel_group": "tdrive",
     "visibility": "public",
     "is_default": true,
     "archived": false
diff --git a/twake/backend/node/test/unit/core/services/database/services/orm/connectors/cassandra/query-builder.test.ts b/twake/backend/node/test/unit/core/services/database/services/orm/connectors/cassandra/query-builder.test.ts
index 62f111d6..d365e899 100644
--- a/twake/backend/node/test/unit/core/services/database/services/orm/connectors/cassandra/query-builder.test.ts
+++ b/twake/backend/node/test/unit/core/services/database/services/orm/connectors/cassandra/query-builder.test.ts
@@ -18,11 +18,11 @@ describe("The QueryBuilder module", () => {
         ChannelMemberNotificationPreference,
         filters,
         {},
-        { keyspace: "twake" },
+        { keyspace: "tdrive" },
       );
 
       expect(result).toEqual(
-        "SELECT * FROM twake.channel_members_notification_preferences WHERE company_id = comp1 AND channel_id = chan1;",
+        "SELECT * FROM tdrive.channel_members_notification_preferences WHERE company_id = comp1 AND channel_id = chan1;",
       );
     });
 
@@ -37,11 +37,11 @@ describe("The QueryBuilder module", () => {
         {
           $lt: [["last_read", 1000]],
         },
-        { keyspace: "twake" },
+        { keyspace: "tdrive" },
       );
 
       expect(result).toEqual(
-        "SELECT * FROM twake.channel_members_notification_preferences WHERE company_id = comp1 AND channel_id = chan1 AND last_read < 1000;",
+        "SELECT * FROM tdrive.channel_members_notification_preferences WHERE company_id = comp1 AND channel_id = chan1 AND last_read < 1000;",
       );
     });
 
@@ -55,11 +55,11 @@ describe("The QueryBuilder module", () => {
         ChannelMemberNotificationPreference,
         filters,
         {},
-        { keyspace: "twake" },
+        { keyspace: "tdrive" },
       );
 
       expect(result).toEqual(
-        "SELECT * FROM twake.channel_members_notification_preferences WHERE company_id = comp1 AND channel_id = chan1 AND user_id IN (u1,u2,u3);",
+        "SELECT * FROM tdrive.channel_members_notification_preferences WHERE company_id = comp1 AND channel_id = chan1 AND user_id IN (u1,u2,u3);",
       );
     });
 
@@ -73,11 +73,11 @@ describe("The QueryBuilder module", () => {
         ChannelMemberNotificationPreference,
         filters,
         {},
-        { keyspace: "twake" },
+        { keyspace: "tdrive" },
       );
 
       expect(result).toEqual(
-        "SELECT * FROM twake.channel_members_notification_preferences WHERE company_id = comp1 AND channel_id = chan1;",
+        "SELECT * FROM tdrive.channel_members_notification_preferences WHERE company_id = comp1 AND channel_id = chan1;",
       );
     });
   });
diff --git a/twake/default-configuration/backend-node/production.json b/twake/default-configuration/backend-node/production.json
index 0b421da1..e80f9365 100644
--- a/twake/default-configuration/backend-node/production.json
+++ b/twake/default-configuration/backend-node/production.json
@@ -24,7 +24,7 @@
     "cassandra": {
       "contactPoints": ["scylladb:9042"],
       "localDataCenter": "datacenter1",
-      "keyspace": "twake",
+      "keyspace": "tdrive",
       "wait": false,
       "retries": 10,
       "delay": 200
diff --git a/twake/default-configuration/backend-node/production.json.template b/twake/default-configuration/backend-node/production.json.template
index 34e9d24d..d5583fe0 100644
--- a/twake/default-configuration/backend-node/production.json.template
+++ b/twake/default-configuration/backend-node/production.json.template
@@ -26,7 +26,7 @@
         "scylladb:9042"
       ],
       "localDataCenter": "datacenter1",
-      "keyspace": "twake",
+      "keyspace": "tdrive",
       "wait": false,
       "retries": 10,
       "delay": 200
diff --git a/twake/default-configuration/backend/Parameters.php b/twake/default-configuration/backend/Parameters.php
index 24692b18..890ffef0 100644
--- a/twake/default-configuration/backend/Parameters.php
+++ b/twake/default-configuration/backend/Parameters.php
@@ -33,7 +33,7 @@ class Parameters extends \Common\Configuration
                 "driver" => "pdo_cassandra",
                 "host" => "scylladb",
                 "port" => 9042,
-                "dbname" => "twake",
+                "dbname" => "tdrive",
                 "user" => "root",
                 "password" => "root",
                 "encryption_key" => "ab63bb3e90c0271c9a1c06651a7c0967eab8851a7a897766",
@@ -113,11 +113,11 @@ class Parameters extends \Common\Configuration
                     "password" => "",
                     "auth_mode" => "plain"
                 ],
-                "template_dir" => "/src/Twake/Core/Resources/views/",
-                "twake_domain_url" => "https://twakeapp.com/",
-                "from" => "noreply@twakeapp.com",
-                "from_name" => "Twake",
-                "twake_address" => "Twake, 54000 Nancy, France",
+                "template_dir" => "/src/Tdrive/Core/Resources/views/",
+                "tdrive_domain_url" => "https://tdriveapp.com/",
+                "from" => "noreply@tdriveapp.com",
+                "from_name" => "Tdrive",
+                "tdrive_address" => "Tdrive, 54000 Nancy, France",
                 "dkim" => [
                     "private_key" => "",
                     "domain_name" => '',
@@ -136,9 +136,9 @@ class Parameters extends \Common\Configuration
             //Defaults values for all clients but editable in database
             "defaults" => [
               "applications" => [
-                "twake_drive" => [ "default" => true ], //False to not install
-                "twake_calendar" => [ "default" => true ],
-                "twake_tasks" => [ "default" => true ],
+                "tdrive_drive" => [ "default" => true ], //False to not install
+                "tdrive_calendar" => [ "default" => true ],
+                "tdrive_tasks" => [ "default" => true ],
                 "connectors" => [
                   "jitsi" => [ "default" => true ],
                 ]
@@ -146,7 +146,7 @@ class Parameters extends \Common\Configuration
               "connectors" => [
               ],
               "branding" => [
-                "name" => "Twake",
+                "name" => "Tdrive",
                 "enable_newsletter" => false,
                 /*
                 "header" => [
diff --git a/twake/docker-compose.dev.tests.cassandra.yml b/twake/docker-compose.dev.tests.cassandra.yml
index 0c9bd3b9..9147f31f 100644
--- a/twake/docker-compose.dev.tests.cassandra.yml
+++ b/twake/docker-compose.dev.tests.cassandra.yml
@@ -45,6 +45,6 @@ services:
         soft: -1
         hard: -1
     volumes:
-      - ./docker-data/es_twake:/usr/share/elasticsearch/data
+      - ./docker-data/es_tdrive:/usr/share/elasticsearch/data
     ports:
       - 9200:9200
diff --git a/twake/docker-compose.dev.yml b/twake/docker-compose.dev.yml
index 627d80c6..e8754a3d 100644
--- a/twake/docker-compose.dev.yml
+++ b/twake/docker-compose.dev.yml
@@ -19,7 +19,7 @@ services:
       - DEV=dev
       - DB_DRIVER=cassandra
       - DB_CASSANDRA_URI=scylladb:9042
-      - DB_CASSANDRA_KEYSPACE=twake
+      - DB_CASSANDRA_KEYSPACE=tdrive
       - PUBSUB_URLS=amqp://guest:guest@rabbitmq:5672
     build:
       context: .
@@ -65,6 +65,6 @@ services:
     volumes:
       - ./docker-data/logs/nginx/:/var/log/nginx
       - ./docker-data/letsencrypt/:/etc/letsencrypt/
-      - ./frontend/:/twake-react/
-      - ./docker-data/drive-preview/:/twake-core/web/medias/
-      - ./docker-data/uploads/:/twake-core/web/upload/
+      - ./frontend/:/tdrive-react/
+      - ./docker-data/drive-preview/:/tdrive-core/web/medias/
+      - ./docker-data/uploads/:/tdrive-core/web/upload/
diff --git a/twake/docker-compose.onpremise.yml b/twake/docker-compose.onpremise.yml
index 7daf78fe..0de55b51 100644
--- a/twake/docker-compose.onpremise.yml
+++ b/twake/docker-compose.onpremise.yml
@@ -55,6 +55,6 @@ services:
     volumes:
       - ./docker-data/logs/nginx/:/var/log/nginx
       - ./docker-data/letsencrypt/:/etc/letsencrypt/
-      - ./docker-data/drive-preview/:/twake-core/web/medias/
-      - ./docker-data/uploads/:/twake-core/web/upload/
+      - ./docker-data/drive-preview/:/tdrive-core/web/medias/
+      - ./docker-data/uploads/:/tdrive-core/web/upload/
       - ./docker-data/ssl:/etc/nginx/ssl
diff --git a/twake/docker-compose.tests.yml b/twake/docker-compose.tests.yml
index f598face..09c4eaf2 100644
--- a/twake/docker-compose.tests.yml
+++ b/twake/docker-compose.tests.yml
@@ -69,4 +69,4 @@ services:
     volumes:
       - ./docker-data/logs/nginx/:/var/log/nginx
       - ./docker-data/letsencrypt/:/etc/letsencrypt/
-      - ./frontend/:/twake-react/
\ No newline at end of file
+      - ./frontend/:/tdrive-react/
\ No newline at end of file
diff --git a/twake/docker/tdrive-frontend/Dockerfile b/twake/docker/tdrive-frontend/Dockerfile
index ebcb2136..496be1ae 100755
--- a/twake/docker/tdrive-frontend/Dockerfile
+++ b/twake/docker/tdrive-frontend/Dockerfile
@@ -2,15 +2,15 @@
 FROM node:lts AS build
 
 RUN yarn global add webpack webpack-cli
-COPY frontend /twake-react/
+COPY frontend /tdrive-react/
 
-WORKDIR /twake-react/
+WORKDIR /tdrive-react/
 
 ENV GENERATE_SOURCEMAP=false
-RUN cp /twake-react/src/app/environment/environment.ts.dist /twake-react/src/app/environment/environment.ts && \
+RUN cp /tdrive-react/src/app/environment/environment.ts.dist /tdrive-react/src/app/environment/environment.ts && \
     yarn install --network-timeout 1000000000 && \
-    # cat /twake-react/src/app/environment/environment.ts.dist && \
-    # cat /twake-react/src/app/environment/environment.ts && \
+    # cat /tdrive-react/src/app/environment/environment.ts.dist && \
+    # cat /tdrive-react/src/app/environment/environment.ts && \
     yarn build && \
     rm -rf node_modules
 
@@ -21,7 +21,7 @@ COPY docker/tdrive-frontend/site.conf /etc/nginx/sites-available/site.template
 COPY docker/tdrive-frontend/redirect.conf /etc/nginx/sites-available/redirect
 COPY docker/tdrive-frontend/entrypoint.sh /
 COPY docker/tdrive-frontend/self-signed.sh /usr/local/bin/
-COPY --from=build /twake-react /twake-react
+COPY --from=build /tdrive-react /tdrive-react
 
 RUN chmod +x /entrypoint.sh && rm /etc/nginx/conf.d/default.conf
 
diff --git a/twake/docker/tdrive-frontend/entrypoint.sh b/twake/docker/tdrive-frontend/entrypoint.sh
index 2d7ee37c..14c894ae 100755
--- a/twake/docker/tdrive-frontend/entrypoint.sh
+++ b/twake/docker/tdrive-frontend/entrypoint.sh
@@ -2,16 +2,16 @@
 
 if [ "$1" = "dev" ]
 then
-  if test -f "/twake-react/src/app/environment/environment.ts"; then
+  if test -f "/tdrive-react/src/app/environment/environment.ts"; then
     echo "Configuration exists, doing nothing."
   else
-    cp /twake-react/src/app/environment/environment.ts.dist.dev /twake-react/src/app/environment/environment.ts
+    cp /tdrive-react/src/app/environment/environment.ts.dist.dev /tdrive-react/src/app/environment/environment.ts
   fi
 else
   if test -f "/configuration/environment.ts"; then
-    cp /configuration/environment.ts /twake-react/src/app/environment/environment.ts
+    cp /configuration/environment.ts /tdrive-react/src/app/environment/environment.ts
   else
-    cp /twake-react/src/app/environment/environment.ts.dist /twake-react/src/app/environment/environment.ts
+    cp /tdrive-react/src/app/environment/environment.ts.dist /tdrive-react/src/app/environment/environment.ts
   fi
 fi
 
diff --git a/twake/docker/tdrive-frontend/self-signed.sh b/twake/docker/tdrive-frontend/self-signed.sh
index b4412342..a5d33e66 100755
--- a/twake/docker/tdrive-frontend/self-signed.sh
+++ b/twake/docker/tdrive-frontend/self-signed.sh
@@ -19,7 +19,7 @@ SSL_SUBJ_COUNTRY="${SSL_SUBJ_COUNTRY:-FR}"
 SSL_SUBJ_STATE="${SSL_SUBJ_STATE:-Hauts-de-France}"
 SSL_SUBJ_LOCALITY="${SSL_SUBJ_LOCALITY:-Paris}"
 SSL_SUBJ_ORG="${SSL_SUBJ_ORG:-Linagora}"
-SSL_SUBJ_ORG_UNIT="${SSL_SUBJ_ORG_UNIT:- Twake}"
+SSL_SUBJ_ORG_UNIT="${SSL_SUBJ_ORG_UNIT:- Tdrive}"
 SSL_SUBJ_CN="${SSL_SUBJ_CN:-localhost}"
 SSL_SUBJECT="/C=${SSL_SUBJ_COUNTRY}/ST=${SSL_SUBJ_STATE}/L=${SSL_SUBJ_LOCALITY}/O=${SSL_SUBJ_ORG}/OU=${SSL_SUBJ_ORG_UNIT}/CN=${SSL_SUBJ_CN}"
 SSL_KEY_LENGTH=${SSL_KEY_LENGTH:-2048}
diff --git a/twake/docker/tdrive-frontend/site.conf b/twake/docker/tdrive-frontend/site.conf
index 12740940..6d742227 100644
--- a/twake/docker/tdrive-frontend/site.conf
+++ b/twake/docker/tdrive-frontend/site.conf
@@ -5,12 +5,12 @@ server {
   ssl_certificate_key /etc/nginx/ssl/selfsigned.key;
 
   server_name localhost;
-  root /twake-core/web;
+  root /tdrive-core/web;
 
   add_header Strict-Transport-Security "max-age=31536000";
 
   location /.well-known {
-      alias /twake-react/build/.well-known/;
+      alias /tdrive-react/build/.well-known/;
 
       gzip on;
       gzip_disable "msie6";
@@ -53,7 +53,7 @@ server {
           application/xml
           application/rss+xml
           image/svg+xml;
-      alias /twake-react/build/;
+      alias /tdrive-react/build/;
       allow all;
       try_files $uri /index.html;
   }
diff --git a/twake/frontend/package-lock.json b/twake/frontend/package-lock.json
index 5b6b2e91..0ce7eeed 100644
--- a/twake/frontend/package-lock.json
+++ b/twake/frontend/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "twake",
+  "name": "tdrive",
   "version": "2020.3.107",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "twake",
+      "name": "tdrive",
       "version": "2020.3.107",
       "license": "AGPL-3.0",
       "dependencies": {
diff --git a/twake/frontend/package.json b/twake/frontend/package.json
index 16d0d19d..daa9d873 100644
--- a/twake/frontend/package.json
+++ b/twake/frontend/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "twake",
+  "name": "tdrive",
   "version": "2020.3.107",
-  "repository": "https://github.com/Twake/Twake",
+  "repository": "https://github.com/Tdrive/Tdrive",
   "license": "AGPL-3.0",
   "scripts": {
     "dev:frontend": "craco start",
diff --git a/twake/frontend/public/.well-known/apple-app-site-association b/twake/frontend/public/.well-known/apple-app-site-association
index 180b1ea6..daeaab1c 100644
--- a/twake/frontend/public/.well-known/apple-app-site-association
+++ b/twake/frontend/public/.well-known/apple-app-site-association
@@ -3,7 +3,7 @@
     "apps": [],
     "details": [
       {
-        "appID": "KUT463DS29.com.linagora.ios.twake",
+        "appID": "KUT463DS29.com.linagora.ios.tdrive",
         "paths": [
           "*"
         ]
diff --git a/twake/frontend/public/.well-known/assetlinks.json b/twake/frontend/public/.well-known/assetlinks.json
index e25c80ab..8b7b83a2 100644
--- a/twake/frontend/public/.well-known/assetlinks.json
+++ b/twake/frontend/public/.well-known/assetlinks.json
@@ -1 +1 @@
-[{"relation":["delegate_permission/common.handle_all_urls"],"target":{"namespace":"android_app","package_name":"com.twake.twake","sha256_cert_fingerprints":["E5:26:98:12:06:5D:7A:82:55:FA:19:0B:64:1D:EE:AC:7D:F8:BD:97:18:42:58:48:AB:E9:91:75:88:32:5C:03","3F:A6:0E:29:87:A4:0E:EA:12:02:16:8F:DA:76:86:22:F0:64:EB:2D:14:3D:6F:92:D6:F4:16:CB:DA:69:53:2C"]}}]
+[{"relation":["delegate_permission/common.handle_all_urls"],"target":{"namespace":"android_app","package_name":"com.tdrive.tdrive","sha256_cert_fingerprints":["E5:26:98:12:06:5D:7A:82:55:FA:19:0B:64:1D:EE:AC:7D:F8:BD:97:18:42:58:48:AB:E9:91:75:88:32:5C:03","3F:A6:0E:29:87:A4:0E:EA:12:02:16:8F:DA:76:86:22:F0:64:EB:2D:14:3D:6F:92:D6:F4:16:CB:DA:69:53:2C"]}}]
diff --git a/twake/frontend/public/index.html b/twake/frontend/public/index.html
index 26e3785c..fff039d0 100644
--- a/twake/frontend/public/index.html
+++ b/twake/frontend/public/index.html
@@ -131,7 +131,7 @@
     </script>
     <script async src="https://cdn.headwayapp.co/widget.js"></script>
     <script>
-      if(location.origin.indexOf("twake.app") >= 0){
+      if(location.origin.indexOf("tdrive.app") >= 0){
         !function(){var analytics=window.analytics=window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on","addSourceMiddleware","addIntegrationMiddleware","setAnonymousId","addDestinationMiddleware"];analytics.factory=function(e){return function(){var t=Array.prototype.slice.call(arguments);t.unshift(e);analytics.push(t);return analytics}};for(var e=0;e<analytics.methods.length;e++){var key=analytics.methods[e];analytics[key]=analytics.factory(key)}analytics.load=function(key,e){var t=document.createElement("script");t.type="text/javascript";t.async=!0;t.src="https://cdn.segment.com/analytics.js/v1/" + key + "/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(t,n);analytics._loadOptions=e};analytics.SNIPPET_VERSION="4.13.1";
         analytics.load("Vl5xpgcpGRe4BmSYp9xPlAeQdqLP5lLe");
         analytics.page();
@@ -139,7 +139,7 @@
       }
     </script>
     <script>
-      if(location.origin.indexOf("canary.twake.app") >= 0){
+      if(location.origin.indexOf("canary.tdrive.app") >= 0){
         const canaryTag = document.createElement("div");
         canaryTag.id = "canary_tag";
         document.body.appendChild(canaryTag);
diff --git a/twake/frontend/public/locales/de.json b/twake/frontend/public/locales/de.json
index d7a88914..e4edfb63 100644
--- a/twake/frontend/public/locales/de.json
+++ b/twake/frontend/public/locales/de.json
@@ -136,7 +136,7 @@
     "scenes.apps.tasks.list_modal.modify_list": "Liste bearbeiten",
     "scenes.apps.tasks.list_modal.new_list": "Neue Liste",
     "scenes.apps.tasks.list_modal.remove": "Liste und Aufgaben löschen",
-    "scenes.login.footer.go_to_twake": "Auf twakeapp.com gehen",
+    "scenes.login.footer.go_to_tdrive": "Auf tdriveapp.com gehen",
     "scenes.login.create_account.title": "Neues Konto einrichten",
     "scenes.login.create_account.email": "E-Mail-Adresse",
     "scenes.login.create_account.email_used": "Diese E-Mail-Adresse wird bereits verwendet.",
@@ -194,7 +194,7 @@
     "scenes.app.workspaces.welcome_page.ready_to_work": "Sie können jetzt arbeiten.",
     "scenes.app.workspaces.welcome_page.see_you_soon": "Wir sehen uns!",
     "scenes.app.workspaces.welcome_page.try_again": "Versuchen Sie es nochmal",
-    "scenes.app.workspaces.welcome_page.twake_team": "Tdrive",
+    "scenes.app.workspaces.welcome_page.tdrive_team": "Tdrive",
     "scenes.app.workspaces.welcome_page.welcome_header": "Willkommen bei Tdrive!",
     "scenes.app.workspaces.welcome_page.add_secondary_emails_comment": "Sie können mehrere E-Mail-Adressen mit Ihrem Konto verknüpfen, es wird nur eine Adresse verwendet, um Ihnen Benachrichtigungen zu senden.",
     "scenes.app.workspaces.welcome_page.main_mail_title": "Hauptadresse",
@@ -215,9 +215,9 @@
     "general.open": "Offen",
     "scenes.apps.account.thumbnail.max_weight": "Maximales Gewicht 5 mo",
     "scenes.apps.account.account.email_add_modal.confirm": "Diese E-Mail bestätigen",
-    "app.name.twake_tasks": "Aufgaben",
-    "app.name.twake_calendar": "Kalender",
-    "app.name.twake_drive": "Dokumente",
+    "app.name.tdrive_tasks": "Aufgaben",
+    "app.name.tdrive_calendar": "Kalender",
+    "app.name.tdrive_drive": "Dokumente",
     "components.calendar.repetition.after": "Für",
     "components.calendar.repetition.annually_on": "Jedes Jahr am {{$1}}",
     "components.calendar.repetition.custom": "Benutzerdefiniert …",
@@ -321,7 +321,7 @@
     "scenes.app.popup.appsparameters.pages.grp_section_name-error": "Dieser Name wird bereits von einer anderen Anwendung verwendet. Bitte wählen Sie einen anderen aus.",
     "scenes.app.popup.appsparameters.pages.grp_section_surname_label": "Vereinfachter Name",
     "scenes.app.popup.appsparameters.pages.installation": "Instal.",
-    "scenes.app.popup.appsparameters.pages.instruction_message_twakecode": "Beginnen Sie, indem Sie Ihre Nachricht im JSON-Format schreiben.",
+    "scenes.app.popup.appsparameters.pages.instruction_message_tdrivecode": "Beginnen Sie, indem Sie Ihre Nachricht im JSON-Format schreiben.",
     "scenes.app.popup.appsparameters.pages.interne_availability_application": "Interne Anwendung",
     "scenes.app.popup.appsparameters.pages.json_configuration_information": "Rufen Sie die Dokumentation auf, um Ihre Konfiguration im JSON-Format zu generieren.",
     "scenes.app.popup.appsparameters.pages.loading": "Wird geladen...",
@@ -495,7 +495,7 @@
     "scenes.apps.messages.messageslist.get_writing_users": "schreiben...",
     "scenes.apps.messages.messageslist.go_last_message_button": "Gehe zum letzten Beitrag",
     "scenes.apps.messages.messageslist.go_last_message_button.new_messages": "Neue Nachrichten",
-    "scenes.error_on_twake": "\"Houston, wir haben ein Problem\"",
+    "scenes.error_on_tdrive": "\"Houston, wir haben ein Problem\"",
     "scenes.help_us": "Wenn Sie uns jedoch bei der Behebung dieses Fehlers helfen möchten, senden Sie uns die folgende Nachricht: ",
     "scenes.login.verifymail.alert": "Wir überprüfen Ihre E-Mail !",
     "scenes.login.verifymail.error_message": "Ein Fehler ist aufgetreten",
@@ -656,7 +656,7 @@
     "components.newversion.new_version_component.link": "Hier klicken um neu zu laden",
     "components.newversion.new_version_component.row.part_2": "Wir schlagen vor, die App neu zu laden und die neuen Features zu nutzen!",
     "components.newversion.new_version_component.row.part_1": "Sie benutzen eine veraltete Version von Tdrive",
-    "scenes.app.popup.adduserfromtwakeconsole.current_users_state": "{{$1}} E-Mail(s) werden hinzugefügt",
+    "scenes.app.popup.adduserfromtdriveconsole.current_users_state": "{{$1}} E-Mail(s) werden hinzugefügt",
     "scenes.app.channelsbar.hide_discussion_leaving.menu": "Diskussion verbergen",
     "scenes.client.channelbar.channelmemberslist.no_members": "Es gibt keine Benutzer in diesem Kanal, Sie können durch Klick auf \"Benutzer hinzufügen\" welche hinzufügen.",
     "scenes.client.mainview.tabs.tabstemplateeditor.select_placeholder": "Anwendung",
@@ -692,7 +692,7 @@
     "scenes.apps.drive.remove_attachs": "Anhänge entfernen",
     "components.attachmentpicker.remove_attach": "Anhang entfernen",
     "components.attachmentpicker.file": "Datei",
-    "components.attachmentpicker.from_twake": "Aus Tdrive Dokumenten",
+    "components.attachmentpicker.from_tdrive": "Aus Tdrive Dokumenten",
     "components.attachmentpicker.from_computer": "Vom Gerät",
     "scenes.apps.drive.move_text2": "Verschieben",
     "components.calendar.calendarselector.from": "Von",
@@ -804,7 +804,7 @@
     "scenes.app.popup.workspaceparameter.pages.workspace_partner_tabs.members.table.tags": "Rolle",
     "scenes.app.popup.workspaceparameter.pages.error_workspace_member": "Sie müssen die einzige Person im Arbeitsbereich sein, um ihn entfernen zu können. Entfernen Sie alle Mitglieder und versuchen Sie es erneut.",
     "general.retry": "Wiederholen",
-    "components.locked_features.locked_only_office_popup.text": "Hoppla!! Es sieht so aus, als wollten Sie die Datei in twake bearbeiten. Wenn Sie Office-Dateien bearbeiten möchten, müssen Sie ein Upgrade Ihres Tarifs durchführen. Informieren Sie sich über unsere Preisoptionen und wählen Sie die beste Option für Ihre Anforderungen an die Zusammenarbeit im Team.",
+    "components.locked_features.locked_only_office_popup.text": "Hoppla!! Es sieht so aus, als wollten Sie die Datei in tdrive bearbeiten. Wenn Sie Office-Dateien bearbeiten möchten, müssen Sie ein Upgrade Ihres Tarifs durchführen. Informieren Sie sich über unsere Preisoptionen und wählen Sie die beste Option für Ihre Anforderungen an die Zusammenarbeit im Team.",
     "components.locked_features.locked_only_office_popup.subtitle": "Onlyoffice ist in der freien Version nicht verfügbar.",
     "components.locked_features.locked_only_office_popup.title": "Sie können diese Datei nicht bearbeiten",
     "application.load.longer": "Der Server braucht länger zum Antworten als erwartet, bitte warten Sie oder laden Sie die Seite erneut …",
@@ -840,7 +840,7 @@
     "scenes.join.wrong_link_title": "Dieser Link ist nicht mehr verfügbar",
     "scenes.join.wrong_link_description": "Bitten Sie die Person, die Sie eingeladen hat, diesem Unternehmen beizutreten, um einen neuen Link oder gründen Sie Ihr eigenes Unternehmen",
     "scenes.join.join_workspace_from_company": "Treten Sie {{$1}} von {{$2}} bei!",
-    "scenes.join.twake_description": "Tdrive ist ein digitaler quelloffener Arbeitsbereich, der die Produktivität Ihres Teams verbessert",
+    "scenes.join.tdrive_description": "Tdrive ist ein digitaler quelloffener Arbeitsbereich, der die Produktivität Ihres Teams verbessert",
     "scenes.join.login_first_button": "Melden Sie sich an oder erstellen Sie zunächst ein Konto",
     "scenes.join.join_the_team_button": "Treten Sie dem Team bei",
     "scenes.join.create_the_company_button": "Das Unternehmen erstellen",
@@ -875,8 +875,8 @@
     "scenes.app.popup.appsparameters.pages.amazing_app_description": "Beschreiben Sie Ihre Bewerbung in wenigen Worten",
     "scenes.app.popup.appsparameters.pages.application_creator.title": "Neue Integration",
     "scenes.app.popup.appsparameters.pages.application_creator.checkbox": "Mir ist bekannt, dass der Inhaber und die Verwalter dieses Unternehmens diesen Antrag ändern und veröffentlichen können.",
-    "twake.application.access.title": "Wählen Sie die richtigen Bereiche für Ihre Anwendung.",
-    "twake.application.access.no_default_scopes_available'": "Diese Integration hat keinen Zugang zu {{$1}}",
+    "tdrive.application.access.title": "Wählen Sie die richtigen Bereiche für Ihre Anwendung.",
+    "tdrive.application.access.no_default_scopes_available'": "Diese Integration hat keinen Zugang zu {{$1}}",
     "scenes.app.popup.appsparameters.pages.application_editor.help_link": "die Tdrive-API-Dokumentation",
     "scenes.app.popup.appsparameters.pages.application_editor.help_text": "Wenn Sie nicht wissen, wie Sie diese ausfüllen sollen, gehen Sie zu ",
     "scenes.app.popup.appsparameters.pages.app.private_key": "Privat Schlüssel",
diff --git a/twake/frontend/public/locales/en.json b/twake/frontend/public/locales/en.json
index eea2f2ba..651c16a5 100644
--- a/twake/frontend/public/locales/en.json
+++ b/twake/frontend/public/locales/en.json
@@ -172,7 +172,7 @@
     "scenes.apps.tasks.list_modal.predefined_participants": "Predefined participants",
     "scenes.apps.tasks.list_modal.archive_all_tasks": "Archive all tasks",
     "scenes.apps.tasks.list_modal.remove_archived_tasks": "Remove archived tasks ({{$1}})",
-    "scenes.login.footer.go_to_twake": "Go to twakeapp.com",
+    "scenes.login.footer.go_to_tdrive": "Go to tdriveapp.com",
     "scenes.login.footer.branding": "You are on a {{$1}} ({{$2}}) private Tdrive server. ",
     "scenes.login.create_account.title": "Create a new account",
     "scenes.login.create_account.email": "E-mail",
@@ -228,7 +228,7 @@
     "scenes.app.workspaces.welcome_page.ready_to_work": "You're ready to work now.",
     "scenes.app.workspaces.welcome_page.see_you_soon": "See you soon!",
     "scenes.app.workspaces.welcome_page.try_again": "Try again",
-    "scenes.app.workspaces.welcome_page.twake_team": "Tdrive",
+    "scenes.app.workspaces.welcome_page.tdrive_team": "Tdrive",
     "scenes.app.workspaces.welcome_page.welcome_header": "Welcome to Tdrive!",
     "scenes.app.workspaces.welcome_page.add_secondary_emails_comment": "You can link multiple e-mail addresses to your account; only one address will be used to send you notifications.",
     "scenes.app.workspaces.welcome_page.main_mail_title": "Main address",
@@ -249,9 +249,9 @@
     "general.open": "Open",
     "scenes.apps.account.thumbnail.max_weight": "Maximum size 5 MB",
     "scenes.apps.account.account.email_add_modal.confirm": "Confirm this e-mail",
-    "app.name.twake_calendar": "Calendar",
-    "app.name.twake_drive": "Documents",
-    "app.name.twake_tasks": "Tasks",
+    "app.name.tdrive_calendar": "Calendar",
+    "app.name.tdrive_drive": "Documents",
+    "app.name.tdrive_tasks": "Tasks",
     "components.calendar.repetition.everyday": "Daily",
     "components.calendar.repetition.does_not_repeat": "Does not repeat",
     "components.calendar.repetition.weekly_on": "Weekly on {{$1}}",
@@ -386,7 +386,7 @@
     "scenes.app.popup.appsparameters.pages.grp_section_name-error": "This name is already in use by another application. Please choose another one.",
     "scenes.app.popup.appsparameters.pages.grp_section_surname_label": "Simpified name",
     "scenes.app.popup.appsparameters.pages.installation": "Instal.",
-    "scenes.app.popup.appsparameters.pages.instruction_message_twakecode": "Start by writing your message in JSON format.",
+    "scenes.app.popup.appsparameters.pages.instruction_message_tdrivecode": "Start by writing your message in JSON format.",
     "scenes.app.popup.appsparameters.pages.interne_availability_application": "Internal application",
     "scenes.app.popup.appsparameters.pages.json_configuration_information": "Go to the documentation to generate your configuration in JSON format.",
     "scenes.app.popup.appsparameters.pages.loading": "Loading...",
@@ -590,7 +590,7 @@
     "scenes.apps.messages.messageslist.get_writing_users": "are writing...",
     "scenes.apps.messages.messageslist.go_last_message_button": "Go to last message",
     "scenes.apps.messages.messageslist.go_last_message_button.new_messages": "New messages",
-    "scenes.error_on_twake": "“Houston we have a problem“",
+    "scenes.error_on_tdrive": "“Houston we have a problem“",
     "scenes.help_us": "However, if you would like to help us fix this error, send us a message below: ",
     "scenes.login.verifymail.alert": "We are checking your e-mail!",
     "scenes.login.verifymail.error_message": "An error occurred",
@@ -728,7 +728,7 @@
     "components.calendar.calendarselector.from": "From",
     "scenes.apps.drive.move_text2": "Move",
     "components.attachmentpicker.from_computer": "From your device",
-    "components.attachmentpicker.from_twake": "From Tdrive Documents",
+    "components.attachmentpicker.from_tdrive": "From Tdrive Documents",
     "components.attachmentpicker.file": "File",
     "components.attachmentpicker.remove_attach": "Remove attachment",
     "scenes.apps.drive.remove_attachs": "Remove attachments",
@@ -776,7 +776,7 @@
     "scenes.client.mainview.tabs.tabstemplateeditor.select_placeholder": "Application",
     "scenes.client.channelbar.channelmemberslist.no_members": "There is no user in this channel, you can invite them by clicking on Add users.",
     "scenes.app.channelsbar.hide_discussion_leaving.menu": "Hide discussion",
-    "scenes.app.popup.adduserfromtwakeconsole.current_users_state": "{{$1}} email(s) will be added",
+    "scenes.app.popup.adduserfromtdriveconsole.current_users_state": "{{$1}} email(s) will be added",
     "components.newversion.new_version_component.row.part_1": "You are running an outdated Tdrive version",
     "components.newversion.new_version_component.row.part_2": "we suggest you to reload the app and enjoy our new features!",
     "components.newversion.new_version_component.link": "Click here to reload",
@@ -938,7 +938,7 @@
     "scenes.join.wrong_link_description": "Ask the person who invited you to join this company for a new link or create your own company",
     "scenes.join.create_the_company_button": "Create the company",
     "scenes.join.join_workspace_from_company": "Join {{$1}} from {{$2}}!",
-    "scenes.join.twake_description": "Tdrive is an open-source digital workspace built to improve your team productivity",
+    "scenes.join.tdrive_description": "Tdrive is an open-source digital workspace built to improve your team productivity",
     "scenes.join.login_first_button": "Log in or create an account first",
     "scenes.join.join_the_team_button": "Join the team",
     "scenes.app.channelsbar.currentuser.reset": "Reset",
@@ -958,8 +958,8 @@
     "scenes.app.popup.appsparameters.pages.amazing_app_description": "Describe your application in a few words",
     "scenes.app.popup.appsparameters.pages.application_creator.title": "New integration",
     "scenes.app.popup.appsparameters.pages.application_creator.checkbox": "I understand that the owner and administrators of this company will be able to modify and publish this application.",
-    "twake.application.access.title": "Select the right scopes for your application.",
-    "twake.application.access.no_default_scopes_available'": "This integration doesn't have any {{$1}} access",
+    "tdrive.application.access.title": "Select the right scopes for your application.",
+    "tdrive.application.access.no_default_scopes_available'": "This integration doesn't have any {{$1}} access",
     "scenes.app.popup.appsparameters.pages.application_editor.help_link": "the Tdrive API documentation",
     "scenes.app.popup.appsparameters.pages.application_editor.help_text": "If you do not know how to fill these, go to ",
     "scenes.app.popup.appsparameters.pages.app.private_key": "Private key",
diff --git a/twake/frontend/public/locales/eo.json b/twake/frontend/public/locales/eo.json
index 2f438b47..766f627c 100644
--- a/twake/frontend/public/locales/eo.json
+++ b/twake/frontend/public/locales/eo.json
@@ -43,7 +43,7 @@
     "scenes.login.create_account.step_3_mail_sent": "Ni sendis al vi aktivigan ligilon retpoŝte.",
     "scenes.login.create_account.step_3_subtitle": "Lasta paŝo — ni devas kontroli, ke vi ne estas roboto!",
     "scenes.app.workspaces.welcome_page.try_again": "Provu denove",
-    "scenes.app.workspaces.welcome_page.twake_team": "Tdrive",
+    "scenes.app.workspaces.welcome_page.tdrive_team": "Tdrive",
     "scenes.app.workspaces.welcome_page.welcome_header": "Bonvenon al Tdrive!",
     "scenes.app.workspaces.welcome_page.other_mail_title": "Malĉefaj adresoj",
     "components.calendar.repetition.everyday": "Ĉiutage",
@@ -74,7 +74,7 @@
     "scenes.app.popup.appsparameters.pages.autorised_ip_adresses_label": "Permesitaj IP-adresoj",
     "scenes.app.popup.appsparameters.pages.available_publication_alert": "La publikigo de via aplikaĵo nuntempe atendas validigon de la teamo de Tdrive.",
     "scenes.app.popup.appsparameters.pages.go_back": "Reen",
-    "scenes.app.popup.appsparameters.pages.instruction_message_twakecode": "Komencu skribante vian mesaĝon en formato JSON.",
+    "scenes.app.popup.appsparameters.pages.instruction_message_tdrivecode": "Komencu skribante vian mesaĝon en formato JSON.",
     "scenes.app.popup.appsparameters.pages.interne_availability_application": "Interna aplikaĵo",
     "scenes.app.popup.appsparameters.pages.json_configuration_information": "Iru al la dokumentado por generi vian agordon en formato JSON.",
     "scenes.app.popup.appsparameters.pages.loading": "Ŝargante…",
@@ -102,7 +102,7 @@
     "components.drive.navigators.directory_not_found": "Dosierujo ne trovita.",
     "components.upload.drop_files": "Forigu viajn dosierojn ĉi tie",
     "components.channelworkspacelist.title": "Kanaloj",
-    "scenes.app.popup.adduserfromtwakeconsole.current_users_state": "{{$1}} retpoŝto(j) estos aldonitaj",
+    "scenes.app.popup.adduserfromtdriveconsole.current_users_state": "{{$1}} retpoŝto(j) estos aldonitaj",
     "components.newversion.new_version_component.row.part_1": "Vi funkcias malmodernan Tdrive-version",
     "components.newversion.new_version_component.row.part_2": "ni sugestas vin reŝargi la apon kaj ĝui niajn novajn funkciojn!",
     "components.newversion.new_version_component.link": "Klaku ĉi tie por reŝargi",
@@ -267,7 +267,7 @@
     "scenes.apps.tasks.list_modal.predefined_participants": "Antaŭdifinitaj partoprenantoj",
     "scenes.apps.tasks.list_modal.archive_all_tasks": "Arkivu ĉiujn taskojn",
     "scenes.apps.tasks.list_modal.remove_archived_tasks": "Forigi arkivitajn taskojn ({{$1}})",
-    "scenes.login.footer.go_to_twake": "Iru al twakeapp.com",
+    "scenes.login.footer.go_to_tdrive": "Iru al tdriveapp.com",
     "scenes.login.footer.branding": "Vi estas sur {{$1}} ({{$2}}) privata Tdrive-servilo. ",
     "scenes.login.create_account.title": "Kreu novan konton",
     "scenes.login.create_account.email": "Retpoŝto",
@@ -324,9 +324,9 @@
     "general.open": "Malfermi",
     "scenes.apps.account.thumbnail.max_weight": "Maksimuma grandeco 5 MB",
     "scenes.apps.account.account.email_add_modal.confirm": "Konfirmu ĉi tiun retmesaĝon",
-    "app.name.twake_calendar": "Kalendaro",
-    "app.name.twake_drive": "Dokumentoj",
-    "app.name.twake_tasks": "Taskoj",
+    "app.name.tdrive_calendar": "Kalendaro",
+    "app.name.tdrive_drive": "Dokumentoj",
+    "app.name.tdrive_tasks": "Taskoj",
     "components.calendar.repetition.repeat": "Ripetu ĉiun",
     "components.calendar.repetition.ends": "Finiĝas",
     "components.calendar.repetition.never": "Neniam",
@@ -587,7 +587,7 @@
     "scenes.apps.messages.messageslist.get_writing_users": "skribas...",
     "scenes.apps.messages.messageslist.go_last_message_button": "Iru al la lasta mesaĝo",
     "scenes.apps.messages.messageslist.go_last_message_button.new_messages": "Novaj mesaĝoj",
-    "scenes.error_on_twake": "\"Houston ni havas problemon\"",
+    "scenes.error_on_tdrive": "\"Houston ni havas problemon\"",
     "scenes.help_us": "Tamen, se vi ŝatus helpi nin ripari ĉi tiun eraron, sendu al ni mesaĝon sube: ",
     "scenes.login.verifymail.alert": "Ni kontrolas vian retpoŝton!",
     "scenes.login.verifymail.verification_waiting": "Atendante konfirmon...",
@@ -693,7 +693,7 @@
     "components.calendar.calendarselector.from": "De",
     "scenes.apps.drive.move_text2": "Movi",
     "components.attachmentpicker.from_computer": "De via aparato",
-    "components.attachmentpicker.from_twake": "De Tdrive Dokumentoj",
+    "components.attachmentpicker.from_tdrive": "De Tdrive Dokumentoj",
     "components.attachmentpicker.file": "Dosiero",
     "components.attachmentpicker.remove_attach": "Forigi aldonaĵon",
     "scenes.apps.drive.remove_attachs": "Forigi aldonaĵojn",
@@ -856,7 +856,7 @@
     "scenes.app.popup.workspaceparameter.pages.workspace_identity.toaster.error.prefix": "Eraro",
     "scenes.join.create_the_company_button": "Kreu la kompanion",
     "scenes.join.join_workspace_from_company": "Aliĝu al {{$1}} de {{$2}}!",
-    "scenes.join.twake_description": "Tdrive estas malfermfonta cifereca laborejo konstruita por plibonigi vian teaman produktivecon",
+    "scenes.join.tdrive_description": "Tdrive estas malfermfonta cifereca laborejo konstruita por plibonigi vian teaman produktivecon",
     "scenes.join.login_first_button": "Ensalutu aŭ kreu konton unue",
     "scenes.join.join_the_team_button": "Aliĝu al la teamo",
     "scenes.app.channelsbar.currentuser.reset": "Restarigi",
@@ -875,8 +875,8 @@
     "scenes.app.popup.appsparameters.pages.amazing_app_description": "Priskribu vian aplikaĵon per kelkaj vortoj",
     "scenes.app.popup.appsparameters.pages.application_creator.title": "Nova integriĝo",
     "scenes.app.popup.appsparameters.pages.application_creator.checkbox": "Mi komprenas, ke la posedanto kaj administrantoj de ĉi tiu kompanio povos modifi kaj publikigi ĉi tiun aplikaĵon.",
-    "twake.application.access.title": "Elektu la ĝustajn mediojn por via aplikaĵo.",
-    "twake.application.access.no_default_scopes_available'": "Ĉi tiu integriĝo ne havas aliron {{$1}}.",
+    "tdrive.application.access.title": "Elektu la ĝustajn mediojn por via aplikaĵo.",
+    "tdrive.application.access.no_default_scopes_available'": "Ĉi tiu integriĝo ne havas aliron {{$1}}.",
     "scenes.app.popup.appsparameters.pages.application_editor.help_link": "la Tdrive API-dokumentado",
     "scenes.app.popup.appsparameters.pages.application_editor.help_text": "Se vi ne scias kiel plenigi ĉi tiujn, iru al ",
     "scenes.app.popup.appsparameters.pages.app.private_key": "Privata ŝlosilo",
diff --git a/twake/frontend/public/locales/es.json b/twake/frontend/public/locales/es.json
index 75e4fc6f..5f359663 100644
--- a/twake/frontend/public/locales/es.json
+++ b/twake/frontend/public/locales/es.json
@@ -79,7 +79,7 @@
     "scenes.apps.parameters.workspace_sections.members.pending": "Correos electrónicos pendientes",
     "scenes.apps.parameters.workspace_sections.members.invite": "Invita nuevos miembros",
     "scenes.apps.parameters.workspace_sections.members.invite_btn": "Añadir miembros",
-    "scenes.login.footer.go_to_twake": "Ir a twakeapp.com",
+    "scenes.login.footer.go_to_tdrive": "Ir a tdriveapp.com",
     "scenes.login.create_account.title": "Crea una cuenta nueva",
     "scenes.login.create_account.email": "E-mail",
     "scenes.login.create_account.email_used": "Este correo electrónico ya está usado.",
@@ -175,9 +175,9 @@
     "components.calendar.repetition.weekly_on": "Semanalmente en {{$1}}",
     "components.calendar.repetition.does_not_repeat": "No se repite",
     "components.calendar.repetition.everyday": "Diariamente",
-    "app.name.twake_tasks": "Tareas",
-    "app.name.twake_drive": "Documentos",
-    "app.name.twake_calendar": "Calendario",
+    "app.name.tdrive_tasks": "Tareas",
+    "app.name.tdrive_drive": "Documentos",
+    "app.name.tdrive_calendar": "Calendario",
     "scenes.apps.account.account.email_add_modal.confirm": "Confirme este correo electrónico",
     "scenes.apps.account.thumbnail.max_weight": "Tamaño máximo 5 MB",
     "general.open": "Abrir",
@@ -198,7 +198,7 @@
     "scenes.app.workspaces.welcome_page.main_mail_title": "Dirección principal",
     "scenes.app.workspaces.welcome_page.add_secondary_emails_comment": "Puede vincular varias direcciones de correo electrónico a su cuenta; sólo se utilizará una dirección para enviarle notificaciones.",
     "scenes.app.workspaces.welcome_page.welcome_header": "¡Bienvenido a Tdrive!",
-    "scenes.app.workspaces.welcome_page.twake_team": "Tdrive",
+    "scenes.app.workspaces.welcome_page.tdrive_team": "Tdrive",
     "scenes.app.workspaces.welcome_page.try_again": "Inténtalo de nuevo",
     "scenes.app.workspaces.welcome_page.see_you_soon": "¡Hasta pronto!",
     "scenes.app.workspaces.welcome_page.ready_to_work": "Ya estás listo para trabajar.",
@@ -340,7 +340,7 @@
     "scenes.app.popup.appsparameters.pages.loading": "Cargando...",
     "scenes.app.popup.appsparameters.pages.json_configuration_information": "Vaya a la documentación para generar su configuración en formato JSON.",
     "scenes.app.popup.appsparameters.pages.interne_availability_application": "Aplicación interna",
-    "scenes.app.popup.appsparameters.pages.instruction_message_twakecode": "Empiece por escribir su mensaje en formato JSON.",
+    "scenes.app.popup.appsparameters.pages.instruction_message_tdrivecode": "Empiece por escribir su mensaje en formato JSON.",
     "scenes.app.popup.appsparameters.pages.installation": "Install.",
     "scenes.app.popup.appsparameters.pages.grp_section_surname_label": "Nombre simplificado",
     "scenes.app.popup.appsparameters.pages.grp_section_name-error": "Este nombre ya está siendo utilizado por otra aplicación. Por favor, elija otro.",
@@ -647,7 +647,7 @@
     "scenes.apps.tasks.modals.attachments": "Archivos adjuntos",
     "components.calendar.calendarselector.from": "De",
     "components.attachmentpicker.from_computer": "Desde su dispositivo",
-    "components.attachmentpicker.from_twake": "De los documentos de Tdrive",
+    "components.attachmentpicker.from_tdrive": "De los documentos de Tdrive",
     "components.attachmentpicker.file": "Archivo",
     "components.attachmentpicker.remove_attach": "Eliminar archivo adjunto",
     "scenes.apps.drive.remove_attachs": "Eliminar archivos adjuntos",
@@ -656,7 +656,7 @@
     "components.notifications.hidden_notifications_button.children": "Mensajes nuevos",
     "scenes.client.mainview.tabs.tabstemplateeditor.select_placeholder": "Aplicación",
     "scenes.client.channelbar.channelmemberslist.no_members": "No hay ningún usuario en este canal, puede invitarlos haciendo clic en Agregar usuarios.",
-    "scenes.app.popup.adduserfromtwakeconsole.current_users_state": "Se agregarán correos electrónicos {{$1}}",
+    "scenes.app.popup.adduserfromtdriveconsole.current_users_state": "Se agregarán correos electrónicos {{$1}}",
     "components.newversion.new_version_component.row.part_1": "Está ejecutando una versión obsoleta de Tdrive",
     "components.newversion.new_version_component.row.part_2": "¡Te sugerimos que vuelvas a cargar la aplicación y disfrutes de nuestras nuevas funciones!",
     "components.newversion.new_version_component.link": "Haga clic aquí para recargar",
@@ -687,7 +687,7 @@
     "scenes.apps.messages.messageslist.get_writing_users": "están escribiendo...",
     "scenes.login.verifymail.error_message": "Ocurrió un error",
     "scenes.login.verifymail.signin_button": "Iniciar sesión",
-    "scenes.error_on_twake": "\"Houston, tenemos un problema\"",
+    "scenes.error_on_tdrive": "\"Houston, tenemos un problema\"",
     "scenes.help_us": "Sin embargo, si quieres ayudarnos a solucionar este error, envíanos un mensaje a continuación: ",
     "scenes.login.verifymail.verification_waiting": "Esperando verificación ...",
     "scenes.no_panic": "¡Que no cunda el pánico! Simplemente vuelva a cargar esta página para arreglar Tdrive.",
@@ -844,7 +844,7 @@
     "scenes.join.wrong_link_description": "Pídale a la persona que lo invitó a unirse a esta empresa un nuevo enlace o cree su propia empresa",
     "scenes.join.create_the_company_button": "Crea la empresa",
     "scenes.join.join_workspace_from_company": "¡Únase a {{$1}} desde {{$2}}!",
-    "scenes.join.twake_description": "Tdrive es un espacio de trabajo digital de código abierto creado para mejorar la productividad de su equipo",
+    "scenes.join.tdrive_description": "Tdrive es un espacio de trabajo digital de código abierto creado para mejorar la productividad de su equipo",
     "scenes.app.channelsbar.currentuser.company_messages_counter_header": "Número de mensajes",
     "scenes.app.channelsbar.currentuser.company_messages_counter_info": "En la versión gratuita de Tdrive, no puede acceder a más mensajes que {{$1}} más recientes.",
     "scenes.app.channelsbar.currentuser.company_messages_counter_link": "Mostrar más planes",
@@ -874,8 +874,8 @@
     "scenes.app.popup.appsparameters.pages.amazing_app_description": "¡Describa su aplicación en pocas palabras",
     "scenes.app.popup.appsparameters.pages.application_creator.title": "Nueva integración",
     "scenes.app.popup.appsparameters.pages.application_creator.checkbox": "Entiendo que el propietario y los administradores de esta empresa podrán modificar y publicar esta aplicación.",
-    "twake.application.access.title": "Seleccione los alcances adecuados para su aplicación.",
-    "twake.application.access.no_default_scopes_available'": "Esta integración no tiene ningún acceso {{$1}}",
+    "tdrive.application.access.title": "Seleccione los alcances adecuados para su aplicación.",
+    "tdrive.application.access.no_default_scopes_available'": "Esta integración no tiene ningún acceso {{$1}}",
     "\"": "\"",
     "scenes.app.popup.appsparameters.pages.application_editor.help_link": "la documentación de la API de Tdrive",
     "scenes.app.popup.appsparameters.pages.application_editor.help_text": "Si no sabe cómo llenarlos, vaya a ",
diff --git a/twake/frontend/public/locales/eu.json b/twake/frontend/public/locales/eu.json
index 92edaa98..ea105b8d 100644
--- a/twake/frontend/public/locales/eu.json
+++ b/twake/frontend/public/locales/eu.json
@@ -71,7 +71,7 @@
     "components.reminder.notification": "Jakinarazpena",
     "components.reminder.hours_bef": "orduak lehenago",
     "scenes.app.mainview.discussion": "Eztabaida",
-    "components.attachmentpicker.from_twake": "Tdrive Documents-etik",
+    "components.attachmentpicker.from_tdrive": "Tdrive Documents-etik",
     "components.attachmentpicker.remove_attach": "Kendu eranskina",
     "scenes.apps.drive.remove_attachs": "Kendu eranskinak",
     "components.drive.elements.see": "Ikusi",
@@ -83,7 +83,7 @@
     "scenes.client.mainview.tabs.tabstemplateeditor.select_placeholder": "Aplikazio",
     "scenes.client.channelbar.channelmemberslist.no_members": "Kanal honetan ez dago erabiltzailerik, Gehitu erabiltzaileak sakatuta gonbida ditzakezu.",
     "scenes.app.channelsbar.hide_discussion_leaving.menu": "Ezkutatu eztabaida",
-    "scenes.app.popup.adduserfromtwakeconsole.current_users_state": "{{$1}} mezu elektronikoak gehituko dira",
+    "scenes.app.popup.adduserfromtdriveconsole.current_users_state": "{{$1}} mezu elektronikoak gehituko dira",
     "components.newversion.new_version_component.row.part_1": "Tdrive bertsio zaharkitua exekutatzen ari zara",
     "components.newversion.new_version_component.row.part_2": "aplikazioa berriro kargatzea eta gure funtzio berriez gozatzea gomendatzen dizugu!",
     "components.newversion.new_version_component.link": "Egin klik hemen berriro kargatzeko",
@@ -278,7 +278,7 @@
     "scenes.apps.tasks.list_modal.remove": "Kendu zerrenda eta zereginak",
     "scenes.apps.tasks.list_modal.predefined_participants": "Aurrez zehaztutako parte-hartzaileak",
     "scenes.apps.tasks.list_modal.remove_archived_tasks": "Kendu artxibatutako zereginak ({{$1}})",
-    "scenes.login.footer.go_to_twake": "Joan twakeapp.com helbidera",
+    "scenes.login.footer.go_to_tdrive": "Joan tdriveapp.com helbidera",
     "scenes.login.footer.branding": "{{$1}} ({{$2}}) Tdrive zerbitzari pribatu batean zaude. ",
     "scenes.login.create_account.title": "Sortu kontu berri bat",
     "scenes.login.create_account.email": "Posta elektronikoa",
@@ -341,9 +341,9 @@
     "general.open": "Ireki",
     "scenes.apps.account.thumbnail.max_weight": "Gehienezko tamaina 5 MB",
     "scenes.apps.account.account.email_add_modal.confirm": "Berretsi e-mail hau",
-    "app.name.twake_calendar": "Egutegia",
-    "app.name.twake_drive": "Dokumentuak",
-    "app.name.twake_tasks": "Zereginak",
+    "app.name.tdrive_calendar": "Egutegia",
+    "app.name.tdrive_drive": "Dokumentuak",
+    "app.name.tdrive_tasks": "Zereginak",
     "components.calendar.repetition.everyday": "Egunero",
     "components.calendar.repetition.does_not_repeat": "Ez da errepikatzen",
     "components.calendar.repetition.weekly_on": "Astero {{$1}}",
@@ -398,7 +398,7 @@
     "scenes.app.popup.appsparameters.pages.grp_section_name-error": "Izen hau beste aplikazio batek erabiltzen du dagoeneko. Mesedez, aukeratu beste bat.",
     "scenes.app.popup.appsparameters.pages.grp_section_surname_label": "Izen sinplifikatua",
     "scenes.app.popup.appsparameters.pages.installation": "Instalatu.",
-    "scenes.app.popup.appsparameters.pages.instruction_message_twakecode": "Hasi zure mezua JSON formatuan idazten.",
+    "scenes.app.popup.appsparameters.pages.instruction_message_tdrivecode": "Hasi zure mezua JSON formatuan idazten.",
     "scenes.app.popup.appsparameters.pages.interne_availability_application": "Barne aplikazioa",
     "scenes.app.popup.appsparameters.pages.loading": "Kargatzen...",
     "scenes.app.popup.appsparameters.pages.modify_public_data": "Editatu zure aplikazioaren datu publikoak.",
@@ -544,7 +544,7 @@
     "scenes.app.popup.appsparameters.pages.error_app_simple_name_message": "Zure aplikazioaren izen sinplifikatua beste aplikazio batek erabiltzen du dagoeneko. Mesedez, aldatu.",
     "scenes.app.workspaces.welcome_page.see_you_soon": "Laster arte!",
     "scenes.app.workspaces.welcome_page.try_again": "Saiatu berriro",
-    "scenes.app.workspaces.welcome_page.twake_team": "Esnatu",
+    "scenes.app.workspaces.welcome_page.tdrive_team": "Esnatu",
     "scenes.app.workspaces.welcome_page.welcome_header": "Ongi etorri Tdrive-ra!",
     "scenes.app.popup.userparameter.pages.private_message_content.hide": "Ezkutatu mezu pribatuen edukia",
     "scenes.no_panic": "Ez zaitez izutu! Besterik gabe, kargatu orri hau Tdrive konpontzeko.",
@@ -561,7 +561,7 @@
     "scenes.join.wrong_link_description": "Eskatu enpresa honetan sartzera gonbidatu zaituenari esteka berri bat edo sortu zure enpresa",
     "scenes.join.create_the_company_button": "Sortu enpresa",
     "scenes.join.join_workspace_from_company": "Sartu {{$1}} {{$2}}-tik!",
-    "scenes.join.twake_description": "Tdrive zure taldearen produktibitatea hobetzeko kode irekiko lan-espazio digitala da",
+    "scenes.join.tdrive_description": "Tdrive zure taldearen produktibitatea hobetzeko kode irekiko lan-espazio digitala da",
     "scenes.join.login_first_button": "Hasi saioa edo sortu kontu bat lehenik",
     "scenes.join.join_the_team_button": "Sartu taldean",
     "scenes.apps.tasks.connectors_menu": "Konektoreak...",
@@ -733,7 +733,7 @@
     "scenes.apps.messages.messageslist.get_writing_user": "idazten ari da...",
     "scenes.apps.messages.messageslist.get_writing_users": "idazten ari dira...",
     "scenes.apps.messages.messageslist.go_last_message_button.new_messages": "Mezu berriak",
-    "scenes.error_on_twake": "\"Houston arazo bat dugu\"",
+    "scenes.error_on_tdrive": "\"Houston arazo bat dugu\"",
     "scenes.help_us": "Hala ere, errore hau konpontzen lagundu nahi badiguzu, bidali mezu bat behean: ",
     "scenes.login.verifymail.alert": "Zure e-maila egiaztatzen ari gara!",
     "scenes.login.verifymail.error_message": "Akats bat gertatu da",
@@ -875,8 +875,8 @@
     "scenes.app.popup.appsparameters.pages.amazing_app_description": "Deskribatu zure aplikazioa hitz gutxitan",
     "scenes.app.popup.appsparameters.pages.application_creator.title": "Integrazio berria",
     "scenes.app.popup.appsparameters.pages.application_creator.checkbox": "Ulertzen dut enpresa honen jabeak eta administratzaileak aplikazio hau aldatu eta argitaratu ahal izango dutela.",
-    "twake.application.access.title": "Hautatu zure aplikaziorako esparru egokiak.",
-    "twake.application.access.no_default_scopes_available'": "Integrazio honek ez du {{$1}} sarbiderik",
+    "tdrive.application.access.title": "Hautatu zure aplikaziorako esparru egokiak.",
+    "tdrive.application.access.no_default_scopes_available'": "Integrazio honek ez du {{$1}} sarbiderik",
     "scenes.app.popup.appsparameters.pages.application_editor.help_link": "Tdrive APIaren dokumentazioa",
     "scenes.app.popup.appsparameters.pages.application_editor.help_text": "Hauek nola bete ez badakizu, joan hona ",
     "scenes.app.popup.appsparameters.pages.app.private_key": "Gako pribatua",
diff --git a/twake/frontend/public/locales/fi.json b/twake/frontend/public/locales/fi.json
index a1ce7e75..81b36af4 100644
--- a/twake/frontend/public/locales/fi.json
+++ b/twake/frontend/public/locales/fi.json
@@ -81,7 +81,7 @@
     "scenes.app.workspaces.welcome_page.add_secondary_emails": "Lisää toissijainen sähköpostiosoite",
     "scenes.app.workspaces.welcome_page.see_you_soon": "Nähdään pian!",
     "scenes.app.workspaces.welcome_page.try_again": "Yritä uudelleen",
-    "scenes.app.workspaces.welcome_page.twake_team": "Tdrive",
+    "scenes.app.workspaces.welcome_page.tdrive_team": "Tdrive",
     "scenes.app.workspaces.welcome_page.welcome_header": "Tervetuloa, tämä on Tdrive!",
     "scenes.app.workspaces.welcome_page.add_secondary_emails_comment": "Voit linkittää useita sähköpostiosoitteita tiliisi; vain yhtä osoitetta käytetään ilmoitusten välittämiseen.",
     "scenes.app.workspaces.welcome_page.main_mail_title": "Ensisijainen osoite",
@@ -95,9 +95,9 @@
     "scenes.apps.account.preference": "Asetukset",
     "general.open": "Avaa",
     "scenes.apps.account.account.email_add_modal.confirm": "Vahvista tämä sähköpostiosoite",
-    "app.name.twake_calendar": "Kalenteri",
-    "app.name.twake_drive": "Asiakirjat",
-    "app.name.twake_tasks": "Tehtävät",
+    "app.name.tdrive_calendar": "Kalenteri",
+    "app.name.tdrive_drive": "Asiakirjat",
+    "app.name.tdrive_tasks": "Tehtävät",
     "components.calendar.repetition.everyday": "Päivittäin",
     "components.calendar.repetition.custom": "Mukautettu...",
     "components.calendar.repetition.ends": "Päättyy",
@@ -502,7 +502,7 @@
     "scenes.join.wrong_link_description": "Pyydä henkilöltä, joka kutsui sinut tähän yritykseen, uusi linkki tai luo oma yritys",
     "scenes.join.create_the_company_button": "Luo yritys",
     "scenes.join.join_workspace_from_company": "Liity {{$1}}:ään {{$2}}:stä!",
-    "scenes.join.twake_description": "Tdrive on avoimen lähdekoodin digitaalinen työtila, joka on suunniteltu parantamaan tiimisi tuottavuutta",
+    "scenes.join.tdrive_description": "Tdrive on avoimen lähdekoodin digitaalinen työtila, joka on suunniteltu parantamaan tiimisi tuottavuutta",
     "scenes.join.login_first_button": "Kirjaudu sisään tai luo ensin tili",
     "scenes.join.join_the_team_button": "Liity joukkueeseen",
     "general.archive": "Arkisto",
@@ -546,7 +546,7 @@
     "scenes.apps.tasks.task_status.done": "Tehty",
     "scenes.apps.tasks.task.assignees": "Valtuutetut",
     "scenes.apps.tasks.task.edit.dates": "Päivämäärät",
-    "scenes.login.footer.go_to_twake": "Siirry osoitteeseen twakeapp.com",
+    "scenes.login.footer.go_to_tdrive": "Siirry osoitteeseen tdriveapp.com",
     "scenes.login.footer.branding": "Olet {{$1}} ({{$2}}) yksityisellä Tdrive-palvelimella. ",
     "scenes.login.create_account.fill_in_email": "Sinun tulee täyttää sähköpostisi oikealla sähköpostiosoitteella",
     "scenes.login.forgot_password.text2": "Saat 9-numeroisen koodin. Kirjoita se alla olevaan kenttään jatkaaksesi.",
@@ -593,7 +593,7 @@
     "scenes.app.popup.appsparameters.pages.button_force": "Voimia koko yrityksessä",
     "scenes.app.popup.appsparameters.pages.call_event_handlers": "Tapahtuman tyyppi {{$1}} ja tunnus {{$2}} passiivisilla merkinnöillä {{$3}}",
     "scenes.app.popup.appsparameters.pages.installation": "Asentaa.",
-    "scenes.app.popup.appsparameters.pages.instruction_message_twakecode": "Aloita kirjoittamalla viestisi JSON-muodossa.",
+    "scenes.app.popup.appsparameters.pages.instruction_message_tdrivecode": "Aloita kirjoittamalla viestisi JSON-muodossa.",
     "scenes.app.popup.appsparameters.pages.interne_availability_application": "Sisäinen sovellus",
     "scenes.app.popup.appsparameters.pages.json_configuration_information": "Siirry dokumentaatioon luodaksesi määritykset JSON-muodossa.",
     "scenes.app.popup.appsparameters.pages.message_data_next_event": "Passiivinen data, joka lähetetään seuraavassa tapahtumassa",
@@ -632,7 +632,7 @@
     "scenes.apps.messages.messageslist.get_writing_users": "kirjoittavat...",
     "scenes.apps.messages.messageslist.go_last_message_button": "Siirry viimeiseen viestiin",
     "scenes.apps.messages.messageslist.go_last_message_button.new_messages": "Uusia viestejä",
-    "scenes.error_on_twake": "\"Houston, meillä on ongelma\"",
+    "scenes.error_on_tdrive": "\"Houston, meillä on ongelma\"",
     "scenes.help_us": "Jos kuitenkin haluat auttaa meitä korjaamaan tämän virheen, lähetä meille viesti alla: ",
     "scenes.login.verifymail.alert": "Tarkistamme sähköpostisi!",
     "scenes.no_panic": "Älä panikoi! Korjaa Tdrive lataamalla tämä sivu uudelleen.",
@@ -665,7 +665,7 @@
     "scenes.app.popup.appsparameters.pages.icon": "Kuvake",
     "scenes.app.popup.appsparameters.pages.title_informations": "Perustiedot",
     "scenes.app.popup.appsparameters.pages.subtitle_informations": "Sovellusten hallintaan liittyvät tiedot",
-    "scenes.app.popup.adduserfromtwakeconsole.current_users_state": "{{$1}} sähköpostiosoitetta lisätään",
+    "scenes.app.popup.adduserfromtdriveconsole.current_users_state": "{{$1}} sähköpostiosoitetta lisätään",
     "components.newversion.new_version_component.row.part_2": "Suosittelemme lataamaan sovelluksen uudelleen ja nauttimaan uusista ominaisuuksistamme!",
     "components.newversion.new_version_component.link": "Napsauta tätä ladataksesi uudelleen",
     "components.inputs.input_with_select.select.placeholder": "Osion nimi",
@@ -761,7 +761,7 @@
     "components.calendar.calendarselector.from": "From",
     "scenes.apps.drive.move_text2": "Liikkua",
     "components.attachmentpicker.from_computer": "laitteestasi",
-    "components.attachmentpicker.from_twake": "Tdrive Documentsista",
+    "components.attachmentpicker.from_tdrive": "Tdrive Documentsista",
     "components.attachmentpicker.file": "Tiedosto",
     "components.attachmentpicker.remove_attach": "Poista liite",
     "scenes.app.popup.appsparameters.pages.smalltext_user_id": "Nykyinen käyttäjätunnus",
@@ -879,8 +879,8 @@
     "scenes.app.popup.appsparameters.pages.amazing_app_description": "Kuvaile hakemustasi muutamalla sanalla",
     "scenes.app.popup.appsparameters.pages.application_creator.title": "Uusi integraatio",
     "scenes.app.popup.appsparameters.pages.application_creator.checkbox": "Ymmärrän, että tämän yrityksen omistaja ja järjestelmänvalvojat voivat muokata ja julkaista tätä sovellusta.",
-    "twake.application.access.title": "Valitse sovelluksellesi oikeat laajuudet.",
-    "twake.application.access.no_default_scopes_available'": "Tällä integraatiolla ei ole {{$1}}-käyttöoikeutta",
+    "tdrive.application.access.title": "Valitse sovelluksellesi oikeat laajuudet.",
+    "tdrive.application.access.no_default_scopes_available'": "Tällä integraatiolla ei ole {{$1}}-käyttöoikeutta",
     "scenes.app.popup.appsparameters.pages.application_editor.help_link": "Tdrive API -dokumentaatio",
     "scenes.app.popup.appsparameters.pages.application_editor.application_published": "{{$1}} -sovellus onnistui!",
     "scenes.app.integrations_parameters.add_application": "Uusi integraatio",
diff --git a/twake/frontend/public/locales/fr.json b/twake/frontend/public/locales/fr.json
index cb5c6031..a9ae2ad4 100644
--- a/twake/frontend/public/locales/fr.json
+++ b/twake/frontend/public/locales/fr.json
@@ -166,7 +166,7 @@
     "scenes.apps.tasks.list_modal.predefined_participants": "Participants prédéfinis",
     "scenes.apps.tasks.list_modal.archive_all_tasks": "Archiver toutes les tâches",
     "scenes.apps.tasks.list_modal.remove_archived_tasks": "Supprimer les archivées ({{$1}})",
-    "scenes.login.footer.go_to_twake": "Aller à twakeapp.com",
+    "scenes.login.footer.go_to_tdrive": "Aller à tdriveapp.com",
     "scenes.login.footer.branding": "Vous êtes sur un serveur privé Tdrive appartenant à {{$1}} ({{$2}}). ",
     "scenes.login.create_account.title": "Créer un nouveau compte",
     "scenes.login.create_account.email": "E-mail",
@@ -222,7 +222,7 @@
     "scenes.app.workspaces.welcome_page.ready_to_work": "Vous êtes prêt à travailler maintenant.",
     "scenes.app.workspaces.welcome_page.see_you_soon": "À très bientôt !",
     "scenes.app.workspaces.welcome_page.try_again": "Réessayer",
-    "scenes.app.workspaces.welcome_page.twake_team": "L'équipe Tdrive",
+    "scenes.app.workspaces.welcome_page.tdrive_team": "L'équipe Tdrive",
     "scenes.app.workspaces.welcome_page.welcome_header": "Bienvenue sur Tdrive !",
     "scenes.app.workspaces.welcome_page.add_secondary_emails_comment": "Vous pouvez lier plusieurs adresse e-mail à votre compte, seule une adresse sera utilisée pour vous envoyer des notifications.",
     "scenes.app.workspaces.welcome_page.main_mail_title": "Adresse principale",
@@ -243,9 +243,9 @@
     "general.open": "Ouvrir",
     "scenes.apps.account.thumbnail.max_weight": "Poids maximum 5 mo",
     "scenes.apps.account.account.email_add_modal.confirm": "Confirmer cet email",
-    "app.name.twake_calendar": "Calendrier",
-    "app.name.twake_drive": "Documents",
-    "app.name.twake_tasks": "Tâches",
+    "app.name.tdrive_calendar": "Calendrier",
+    "app.name.tdrive_drive": "Documents",
+    "app.name.tdrive_tasks": "Tâches",
     "components.calendar.repetition.everyday": "Tous les jours",
     "components.calendar.repetition.does_not_repeat": "Une seule fois",
     "components.calendar.repetition.weekly_on": "Toutes les semaines le {{$1}}",
@@ -351,7 +351,7 @@
     "scenes.app.popup.appsparameters.pages.grp_section_name-error": "Ce nom est déjà utilisé par une autre application, veuillez en choisir un autre.",
     "scenes.app.popup.appsparameters.pages.grp_section_surname_label": "Nom simplifié",
     "scenes.app.popup.appsparameters.pages.installation": "Instal.",
-    "scenes.app.popup.appsparameters.pages.instruction_message_twakecode": "Commencez par écrire votre message sous le format JSON.",
+    "scenes.app.popup.appsparameters.pages.instruction_message_tdrivecode": "Commencez par écrire votre message sous le format JSON.",
     "scenes.app.popup.appsparameters.pages.interne_availability_application": "Application interne",
     "scenes.app.popup.appsparameters.pages.json_configuration_information": "Rendez-vous sur la documentation afin de générer votre configuration au format JSON.",
     "scenes.app.popup.appsparameters.pages.loading": "Chargement...",
@@ -550,7 +550,7 @@
     "scenes.apps.messages.messageslist.get_writing_users": "sont en train d'écrire...",
     "scenes.apps.messages.messageslist.go_last_message_button": "Aller au dernier message",
     "scenes.apps.messages.messageslist.go_last_message_button.new_messages": "Nouveaux messages",
-    "scenes.error_on_twake": "“Houston nous avons un problème“",
+    "scenes.error_on_tdrive": "“Houston nous avons un problème“",
     "scenes.help_us": "Cependant, si vous souhaitez nous aider à réparer cette erreur, envoyez nous le message ci-dessous : ",
     "scenes.login.verifymail.alert": "Nous vérifions votre e-mail !",
     "scenes.login.verifymail.error_message": "Une erreur s'est produite",
@@ -663,7 +663,7 @@
     "components.calendar.calendarselector.from": "Depuis",
     "scenes.apps.drive.move_text2": "Déplacer",
     "components.attachmentpicker.from_computer": "Depuis l'ordinateur",
-    "components.attachmentpicker.from_twake": "Depuis les Documents Tdrive",
+    "components.attachmentpicker.from_tdrive": "Depuis les Documents Tdrive",
     "components.attachmentpicker.file": "Fichier",
     "components.attachmentpicker.remove_attach": "Enlever la pièce-jointe",
     "scenes.apps.drive.remove_attachs": "Enlever les pièces-jointes",
@@ -702,7 +702,7 @@
     "scenes.client.mainview.tabs.tabstemplateeditor.select_placeholder": "Application",
     "scenes.client.channelbar.channelmemberslist.no_members": "Il n'y a aucun utilisateur dans cette chaîne, vous pouvez les inviter en cliquant sur Ajouter des utilisateurs.",
     "scenes.app.channelsbar.hide_discussion_leaving.menu": "Masquer la discussion",
-    "scenes.app.popup.adduserfromtwakeconsole.current_users_state": "{{$1}} email(s) seront ajoutés",
+    "scenes.app.popup.adduserfromtdriveconsole.current_users_state": "{{$1}} email(s) seront ajoutés",
     "components.newversion.new_version_component.row.part_1": "Vous utilisez une version obsolète de Tdrive",
     "components.newversion.new_version_component.row.part_2": "nous vous suggérons de recharger l'application et de profiter de nos nouvelles fonctionnalités !",
     "components.newversion.new_version_component.link": "Cliquez ici pour recharger",
@@ -869,7 +869,7 @@
     "components.rich_text_editor.plugins.suggestions.default_message.no_command_found": "Aucune commande trouvé",
     "scenes.join.loading": "Chargement…",
     "scenes.join.wrong_link_title": "Ce lien n'est plus disponible",
-    "scenes.join.twake_description": "Tdrive est un espace de travail numérique à code ouvert conçu pour améliorer la productivité de votre équipe",
+    "scenes.join.tdrive_description": "Tdrive est un espace de travail numérique à code ouvert conçu pour améliorer la productivité de votre équipe",
     "scenes.join.login_first_button": "Connectez-vous ou créez d'abord un compte",
     "scenes.join.wrong_link_description": "Demandez à la personne qui vous a invité(e) de rejoindre cette entreprise par un nouveau lien ou créez votre propre entreprise",
     "scenes.join.join_the_team_button": "Rejoindre l'équipe",
@@ -890,8 +890,8 @@
     "scenes.app.popup.appsparameters.pages.amazing_app_description": "Décrivez votre application en quelques mots",
     "scenes.app.popup.appsparameters.pages.application_creator.title": "Nouvelle intégration",
     "scenes.app.popup.appsparameters.pages.application_creator.checkbox": "Je comprends que le propriétaire et les administrateurs de cette entreprise pourront modifier et publier cette application.",
-    "twake.application.access.title": "Sélectionnez les portées adaptées à votre application.",
-    "twake.application.access.no_default_scopes_available'": "Cette intégration n'a pas d'accès {{$1}}.",
+    "tdrive.application.access.title": "Sélectionnez les portées adaptées à votre application.",
+    "tdrive.application.access.no_default_scopes_available'": "Cette intégration n'a pas d'accès {{$1}}.",
     "scenes.app.popup.appsparameters.pages.application_editor.help_link": "la documentation de l'API Tdrive.",
     "scenes.app.popup.appsparameters.pages.application_editor.help_text": "Si vous ne savez pas comment les remplir, consultez ",
     "scenes.app.popup.appsparameters.pages.app.private_key": "Clé privée",
diff --git a/twake/frontend/public/locales/it.json b/twake/frontend/public/locales/it.json
index 5fc0b513..dc16eb17 100644
--- a/twake/frontend/public/locales/it.json
+++ b/twake/frontend/public/locales/it.json
@@ -12,7 +12,7 @@
     "scenes.login.home.title": "Accedi a Tdrive",
     "scenes.login.create_account.step_1_subtitle": "Non potrebbe essere più semplice: abbiamo solo bisogno di alcune informazioni.",
     "scenes.login.create_account.step_2_subtitle_a": "Aggiungi il tuo nome completo per consentire agli altri utenti di riconoscerti.",
-    "scenes.app.workspaces.welcome_page.twake_team": "Tdrive",
+    "scenes.app.workspaces.welcome_page.tdrive_team": "Tdrive",
     "scenes.app.workspaces.welcome_page.welcome_header": "Benvenuto a Tdrive!",
     "scenes.app.workspaces.welcome_page.add_secondary_emails_comment": "Puoi collegare più indirizzi e-mail al tuo account; verrà utilizzato un solo indirizzo per inviarti le notifiche.",
     "scenes.app.workspaces.welcome_page.main_mail_title": "Indirizzo principale",
@@ -32,7 +32,7 @@
     "scenes.app.popup.appsparameters.pages.grp_section_name-error": "Questo nome è già utilizzato da un'altra applicazione. Si prega di sceglierne un altro.",
     "scenes.app.popup.appsparameters.pages.grp_section_surname_label": "Nome semplificato",
     "scenes.app.popup.appsparameters.pages.installation": "Installare.",
-    "scenes.app.popup.appsparameters.pages.instruction_message_twakecode": "Inizia scrivendo il tuo messaggio in formato JSON.",
+    "scenes.app.popup.appsparameters.pages.instruction_message_tdrivecode": "Inizia scrivendo il tuo messaggio in formato JSON.",
     "scenes.app.popup.appsparameters.pages.interne_availability_application": "Applicazione interna",
     "scenes.app.popup.appsparameters.pages.json_configuration_information": "Vai alla documentazione per generare la tua configurazione in formato JSON.",
     "scenes.app.popup.appsparameters.pages.loading": "Caricamento in corso...",
@@ -82,7 +82,7 @@
     "scenes.client.mainview.tabs.tabstemplateeditor.select_placeholder": "Applicazione",
     "scenes.client.channelbar.channelmemberslist.no_members": "Non ci sono utenti in questo canale, puoi invitarli facendo clic su Aggiungi utenti.",
     "scenes.app.channelsbar.hide_discussion_leaving.menu": "Nascondi discussione",
-    "scenes.app.popup.adduserfromtwakeconsole.current_users_state": "{{$1}} email verranno aggiunte",
+    "scenes.app.popup.adduserfromtdriveconsole.current_users_state": "{{$1}} email verranno aggiunte",
     "components.newversion.new_version_component.row.part_2": "ti consigliamo di ricaricare l'app e goderti le nostre nuove funzionalità!",
     "components.newversion.new_version_component.link": "Clicca qui per ricaricare",
     "components.newversion.new_version_modal.title": "Nuovo aggiornamento disponibile !",
@@ -123,7 +123,7 @@
     "scenes.join.wrong_link_description": "Chiedi alla persona che ti ha invitato a entrare a far parte di questa azienda un nuovo collegamento o crea la tua azienda",
     "scenes.join.create_the_company_button": "Crea l'azienda",
     "scenes.join.join_workspace_from_company": "Unisciti a {{$1}} da {{$2}}!",
-    "scenes.join.twake_description": "Tdrive è uno spazio di lavoro digitale open source creato per migliorare la produttività del tuo team",
+    "scenes.join.tdrive_description": "Tdrive è uno spazio di lavoro digitale open source creato per migliorare la produttività del tuo team",
     "scenes.join.login_first_button": "Accedi o crea un account prima",
     "scenes.join.join_the_team_button": "Unisciti alla squadra",
     "general.close": "Vicino",
@@ -290,7 +290,7 @@
     "scenes.apps.tasks.list_modal.predefined_participants": "Partecipanti predefiniti",
     "scenes.apps.tasks.list_modal.archive_all_tasks": "Archivia tutti i compiti",
     "scenes.apps.tasks.list_modal.remove_archived_tasks": "Rimuovi i compiti archiviati ({{$1}})",
-    "scenes.login.footer.go_to_twake": "Vai su twakeapp.com",
+    "scenes.login.footer.go_to_tdrive": "Vai su tdriveapp.com",
     "scenes.login.footer.branding": "Sei su un server Tdrive privato {{$1}} ({{$2}}). ",
     "scenes.login.create_account.title": "Crea un nuovo account",
     "scenes.login.create_account.email": "Posta elettronica",
@@ -348,9 +348,9 @@
     "scenes.apps.account.preference": "Preferenze",
     "scenes.apps.account.thumbnail.max_weight": "Dimensione massima 5 MB",
     "scenes.apps.account.account.email_add_modal.confirm": "Conferma questa e-mail",
-    "app.name.twake_calendar": "Calendario",
-    "app.name.twake_drive": "Documenti",
-    "app.name.twake_tasks": "Compiti",
+    "app.name.tdrive_calendar": "Calendario",
+    "app.name.tdrive_drive": "Documenti",
+    "app.name.tdrive_tasks": "Compiti",
     "components.calendar.repetition.everyday": "Quotidiano",
     "components.calendar.repetition.does_not_repeat": "Non si ripete",
     "components.calendar.repetition.weekly_on": "Settimanale il {{$1}}",
@@ -614,7 +614,7 @@
     "scenes.apps.messages.messageslist.get_writing_users": "stanno scrivendo...",
     "scenes.apps.messages.messageslist.go_last_message_button": "Vai all'ultimo messaggio",
     "scenes.apps.messages.messageslist.go_last_message_button.new_messages": "Nuovo messaggio",
-    "scenes.error_on_twake": "\"Houston abbiamo un problema\"",
+    "scenes.error_on_tdrive": "\"Houston abbiamo un problema\"",
     "scenes.help_us": "Tuttavia, se desideri aiutarci a correggere questo errore, inviaci un messaggio di seguito: ",
     "scenes.login.verifymail.alert": "Stiamo controllando la tua posta elettronica!",
     "scenes.login.verifymail.error_message": "Si è verificato un errore",
@@ -713,7 +713,7 @@
     "components.calendar.calendarselector.from": "A partire dal",
     "scenes.apps.drive.move_text2": "Mossa",
     "components.attachmentpicker.from_computer": "Dal tuo dispositivo",
-    "components.attachmentpicker.from_twake": "Dai documenti Twak",
+    "components.attachmentpicker.from_tdrive": "Dai documenti Twak",
     "components.attachmentpicker.file": "File",
     "components.attachmentpicker.remove_attach": "Rimuovi allegato",
     "scenes.apps.drive.remove_attachs": "Rimuovi allegati",
@@ -875,9 +875,9 @@
     "scenes.app.popup.appsparameters.pages.amazing_app_description": "Descrivi la tua candidatura in poche parole",
     "scenes.app.popup.appsparameters.pages.application_creator.title": "Nuova integrazione",
     "scenes.app.popup.appsparameters.pages.application_creator.checkbox": "Comprendo che il proprietario e gli amministratori di questa azienda potranno modificare e pubblicare questa applicazione.",
-    "twake.application.access.title": "Seleziona gli ambiti giusti per la tua applicazione.",
+    "tdrive.application.access.title": "Seleziona gli ambiti giusti per la tua applicazione.",
     "scenes.app.integrations_parameters.company_applications_table.more_menu.developer_settings": "Impostazioni dello sviluppatore",
-    "twake.application.access.no_default_scopes_available'": "Questa integrazione non ha alcun accesso {{$1}}",
+    "tdrive.application.access.no_default_scopes_available'": "Questa integrazione non ha alcun accesso {{$1}}",
     "scenes.app.popup.appsparameters.pages.application_editor.help_link": "la documentazione dell'API Tdrive",
     "scenes.app.popup.appsparameters.pages.application_editor.help_text": "Se non sai come riempirli, vai a ",
     "scenes.app.popup.appsparameters.pages.app.private_key": "Chiave privata",
diff --git a/twake/frontend/public/locales/ja.json b/twake/frontend/public/locales/ja.json
index 0c31dd52..4796c6a4 100644
--- a/twake/frontend/public/locales/ja.json
+++ b/twake/frontend/public/locales/ja.json
@@ -76,7 +76,7 @@
     "scenes.apps.parameters.workspace_sections.members.pending": "保留中のメンバー",
     "scenes.apps.parameters.workspace_sections.members.invite": "新しいメンバーを招待する",
     "scenes.apps.parameters.workspace_sections.members.invite_btn": "メンバーを追加",
-    "scenes.login.footer.go_to_twake": "twakeapp.comにアクセス",
+    "scenes.login.footer.go_to_tdrive": "tdriveapp.comにアクセス",
     "scenes.login.create_account.title": "新しいアカウントを作成する",
     "scenes.login.create_account.email": "Eメール",
     "scenes.login.create_account.email_used": "この電子メールは既に使用されています。",
@@ -319,7 +319,7 @@
     "scenes.app.workspaces.welcome_page.no_company_subtitle": "ああ、まあ...まだ誰もあなたをワークスペースに招待していないようです。",
     "scenes.app.workspaces.welcome_page.ready_to_work": "これで作業する準備が整いました。",
     "scenes.app.workspaces.welcome_page.try_again": "再試行",
-    "scenes.app.workspaces.welcome_page.twake_team": "トウェイク",
+    "scenes.app.workspaces.welcome_page.tdrive_team": "トウェイク",
     "scenes.app.workspaces.welcome_page.welcome_header": "Tdriveへようこそ！",
     "scenes.app.workspaces.welcome_page.add_secondary_emails_comment": "複数の電子メールアドレスをアカウントにリンクできます。通知の送信に使用されるアドレスは1つだけです。",
     "scenes.app.workspaces.welcome_page.main_mail_title": "メインアドレス",
@@ -336,9 +336,9 @@
     "general.open": "開ける",
     "scenes.apps.account.thumbnail.max_weight": "最大サイズ5MB",
     "scenes.apps.account.account.email_add_modal.confirm": "このメールを確認してください",
-    "app.name.twake_calendar": "カレンダー",
-    "app.name.twake_drive": "ドキュメント",
-    "app.name.twake_tasks": "タスク",
+    "app.name.tdrive_calendar": "カレンダー",
+    "app.name.tdrive_drive": "ドキュメント",
+    "app.name.tdrive_tasks": "タスク",
     "components.calendar.repetition.everyday": "毎日",
     "components.calendar.repetition.does_not_repeat": "繰り返さない",
     "components.calendar.repetition.weekly_on": "毎週{{$1}}",
@@ -404,7 +404,7 @@
     "scenes.app.popup.appsparameters.pages.app_modification_right": "この会社のすべてのマネージャーは、このアプリケーションを編集できます。",
     "scenes.app.popup.appsparameters.pages.filter_information": "このフィルターは、APIキーの使用をコネクター内のサーバーのみに制限します。",
     "scenes.app.popup.appsparameters.pages.installation": "インストール。",
-    "scenes.app.popup.appsparameters.pages.instruction_message_twakecode": "まず、メッセージをJSON形式で記述します。",
+    "scenes.app.popup.appsparameters.pages.instruction_message_tdrivecode": "まず、メッセージをJSON形式で記述します。",
     "scenes.app.popup.appsparameters.pages.interne_availability_application": "内部アプリケーション",
     "scenes.app.popup.appsparameters.pages.loading": "読み込んでいます...",
     "scenes.app.popup.appsparameters.pages.modify_public_data": "アプリケーションの公開データを編集します。",
@@ -478,7 +478,7 @@
     "scenes.join.wrong_link_description": "あなたをこの会社に招待した人に新しいリンクを求めるか、あなた自身の会社を作りましょう",
     "scenes.join.create_the_company_button": "会社を作る",
     "scenes.join.join_workspace_from_company": "{{$2}}から{{$1}}に参加しましょう！",
-    "scenes.join.twake_description": "Tdriveは、チームの生産性を向上させるために構築されたオープンソースのデジタルワークスペースです。",
+    "scenes.join.tdrive_description": "Tdriveは、チームの生産性を向上させるために構築されたオープンソースのデジタルワークスペースです。",
     "scenes.app.workspaces.create_company.company_name.title_1": "始める、",
     "scenes.apps.account.account.make_main": "メインを設定",
     "components.verify_mail.button": "ユーザーを追加する",
@@ -668,7 +668,7 @@
     "scenes.apps.messages.messageslist.get_writing_user": "書いています...",
     "scenes.apps.messages.messageslist.go_last_message_button": "最後のメッセージに移動",
     "scenes.apps.messages.messageslist.go_last_message_button.new_messages": "新しいメッセージ",
-    "scenes.error_on_twake": "「ヒューストン、私たちは問題を抱えています」",
+    "scenes.error_on_tdrive": "「ヒューストン、私たちは問題を抱えています」",
     "scenes.help_us": "ただし、このエラーの修正を支援したい場合は、以下のメッセージを送信してください。 ",
     "scenes.login.verifymail.alert": "私たちはあなたの電子メールをチェックしています！",
     "scenes.login.verifymail.error_message": "エラーが発生しました",
@@ -754,7 +754,7 @@
     "components.calendar.calendarselector.from": "から",
     "scenes.apps.drive.move_text2": "動く",
     "components.attachmentpicker.from_computer": "お使いのデバイスから",
-    "components.attachmentpicker.from_twake": "Tdriveドキュメントから",
+    "components.attachmentpicker.from_tdrive": "Tdriveドキュメントから",
     "components.attachmentpicker.file": "ファイル",
     "components.attachmentpicker.remove_attach": "添付ファイルを削除します",
     "scenes.apps.drive.remove_attachs": "添付ファイルを削除します",
@@ -789,7 +789,7 @@
     "scenes.client.mainview.tabs.tabstemplateeditor.select_placeholder": "応用",
     "scenes.client.channelbar.channelmemberslist.no_members": "このチャネルにはユーザーがいません。[ユーザーの追加]をクリックして招待できます。",
     "scenes.app.channelsbar.hide_discussion_leaving.menu": "ディスカッションを非表示",
-    "scenes.app.popup.adduserfromtwakeconsole.current_users_state": "{{$1}}メールが追加されます",
+    "scenes.app.popup.adduserfromtdriveconsole.current_users_state": "{{$1}}メールが追加されます",
     "components.newversion.new_version_component.row.part_1": "古いバージョンのTdriveを実行しています",
     "components.newversion.new_version_component.row.part_2": "アプリをリロードして、新機能をお楽しみください。",
     "components.newversion.new_version_component.link": "リロードするには、ここをクリックしてください",
@@ -875,8 +875,8 @@
     "scenes.app.popup.appsparameters.pages.amazing_app_description": "アプリケーションを簡単に説明してください",
     "scenes.app.popup.appsparameters.pages.application_creator.checkbox": "この会社の所有者と管理者がこのアプリケーションを変更して公開できることを理解しています。",
     "scenes.app.popup.appsparameters.pages.application_creator.title": "新しい統合",
-    "twake.application.access.title": "アプリケーションに適したスコープを選択してください。",
-    "twake.application.access.no_default_scopes_available'": "この統合には{{$1}}アクセスはありません",
+    "tdrive.application.access.title": "アプリケーションに適したスコープを選択してください。",
+    "tdrive.application.access.no_default_scopes_available'": "この統合には{{$1}}アクセスはありません",
     "scenes.app.popup.appsparameters.pages.application_editor.help_link": "TdriveAPIドキュメント",
     "scenes.app.popup.appsparameters.pages.application_editor.help_text": "これらを埋める方法がわからない場合は、 ",
     "scenes.app.popup.appsparameters.pages.app.private_key": "秘密鍵",
diff --git a/twake/frontend/public/locales/nb_NO.json b/twake/frontend/public/locales/nb_NO.json
index 6ae436bc..fda3b9f4 100644
--- a/twake/frontend/public/locales/nb_NO.json
+++ b/twake/frontend/public/locales/nb_NO.json
@@ -96,7 +96,7 @@
     "scenes.apps.calendar.modals.details_title": "Detaljer",
     "scenes.apps.board.new_task": "+ Ny oppgave",
     "scenes.app.popup.workspace.edit_temp": "Rediger midlertidig konto",
-    "scenes.app.popup.adduserfromtwakeconsole.current_users_state": "{{$1}} e-post(er) vil bli lagt til",
+    "scenes.app.popup.adduserfromtdriveconsole.current_users_state": "{{$1}} e-post(er) vil bli lagt til",
     "components.newversion.new_version_component.row.part_1": "Du kjører en utdatert Tdrive-versjon",
     "scenes.apps.messages.message.activity_message.a_updated_channel_name": "{{$1}} ga nytt navn til kanalen til {{$2}}",
     "scenes.apps.messages.message.activity_message.a_created_channel_tab": "{{$1}} la til en ny {{$2}}-fane {{$3}}",
@@ -240,7 +240,7 @@
     "scenes.apps.tasks.list_modal.predefined_participants": "Forhåndsdefinerte deltakere",
     "scenes.apps.tasks.list_modal.archive_all_tasks": "Arkiver alle oppgaver",
     "scenes.apps.tasks.list_modal.remove_archived_tasks": "Fjern arkiverte oppgaver ({{$1}})",
-    "scenes.login.footer.go_to_twake": "Gå til twakeapp.com",
+    "scenes.login.footer.go_to_tdrive": "Gå til tdriveapp.com",
     "scenes.login.footer.branding": "Du er på en {{$1}} ({{$2}}) privat Tdrive-server. ",
     "scenes.login.create_account.title": "Lag en ny bruker",
     "scenes.login.create_account.email": "E-post",
@@ -294,7 +294,7 @@
     "scenes.app.workspaces.welcome_page.ready_to_work": "Du er klar til å jobbe nå.",
     "scenes.app.workspaces.welcome_page.see_you_soon": "Ser deg snart!",
     "scenes.app.workspaces.welcome_page.try_again": "Prøv igjen",
-    "scenes.app.workspaces.welcome_page.twake_team": "Tdrive",
+    "scenes.app.workspaces.welcome_page.tdrive_team": "Tdrive",
     "scenes.app.workspaces.welcome_page.welcome_header": "Velkommen til Tdrive!",
     "scenes.app.workspaces.welcome_page.add_secondary_emails_comment": "Du kan koble flere e-postadresser til kontoen din; kun én adresse vil bli brukt til å sende deg varsler.",
     "scenes.app.workspaces.welcome_page.main_mail_title": "Hovedadresse",
@@ -314,9 +314,9 @@
     "scenes.apps.account.preference": "Preferanser",
     "scenes.apps.account.thumbnail.max_weight": "Maksimal størrelse 5 MB",
     "scenes.apps.account.account.email_add_modal.confirm": "Bekreft denne e-posten",
-    "app.name.twake_calendar": "Kalender",
-    "app.name.twake_drive": "Dokumenter",
-    "app.name.twake_tasks": "Oppgaver",
+    "app.name.tdrive_calendar": "Kalender",
+    "app.name.tdrive_drive": "Dokumenter",
+    "app.name.tdrive_tasks": "Oppgaver",
     "components.calendar.repetition.everyday": "Daglig",
     "components.calendar.repetition.does_not_repeat": "Gjentas ikke",
     "components.calendar.repetition.weekly_on": "Ukentlig på {{$1}}",
@@ -414,7 +414,7 @@
     "scenes.join.wrong_link_description": "Be personen som inviterte deg til å bli med i dette selskapet om en ny lenke eller opprette ditt eget selskap",
     "scenes.join.create_the_company_button": "Opprett selskapet",
     "scenes.join.join_workspace_from_company": "Bli med {{$1}} fra {{$2}}!",
-    "scenes.join.twake_description": "Tdrive er et digitalt arbeidsområde med åpen kildekode bygget for å forbedre teamets produktivitet",
+    "scenes.join.tdrive_description": "Tdrive er et digitalt arbeidsområde med åpen kildekode bygget for å forbedre teamets produktivitet",
     "general.unarchive": "Avarkiver",
     "scenes.apps.calendar.event_view.article_until": "til",
     "scenes.apps.messages.left_bar.stream_modal.placeholder_name": "Navn",
@@ -439,7 +439,7 @@
     "scenes.apps.drive.no_storage_app_alert": "Du har ingen applikasjoner som lar deg legge til ekstern lagring.",
     "scenes.apps.drive.remove_definitely_menu": "Slett permanent",
     "scenes.apps.drive.restore_menu": "Restaurere",
-    "scenes.error_on_twake": "\"Houston vi har et problem\"",
+    "scenes.error_on_tdrive": "\"Houston vi har et problem\"",
     "scenes.app.workspaces.components.skip": "Hopp over",
     "scenes.client.channelbar.channelmemberslist.menu.option_2": "Fjern fra kanalen",
     "components.leftbar.channel.workspaceschannels.menu.option_1": "Lag en kanal",
@@ -530,7 +530,7 @@
     "components.calendar.calendarselector.from": "Fra",
     "scenes.apps.drive.move_text2": "Bevege seg",
     "components.attachmentpicker.from_computer": "Fra enheten din",
-    "components.attachmentpicker.from_twake": "Fra Tdrive Documents",
+    "components.attachmentpicker.from_tdrive": "Fra Tdrive Documents",
     "components.attachmentpicker.file": "Fil",
     "components.attachmentpicker.remove_attach": "Fjern vedlegg",
     "scenes.apps.drive.remove_attachs": "Fjern vedlegg",
@@ -727,7 +727,7 @@
     "scenes.app.popup.appsparameters.pages.grp_section_name-error": "Dette navnet er allerede i bruk av en annen applikasjon. Vennligst velg en annen.",
     "scenes.app.popup.appsparameters.pages.grp_section_surname_label": "Forenklet navn",
     "scenes.app.popup.appsparameters.pages.installation": "Installer.",
-    "scenes.app.popup.appsparameters.pages.instruction_message_twakecode": "Start med å skrive meldingen i JSON-format.",
+    "scenes.app.popup.appsparameters.pages.instruction_message_tdrivecode": "Start med å skrive meldingen i JSON-format.",
     "scenes.app.popup.appsparameters.pages.interne_availability_application": "Intern søknad",
     "scenes.app.popup.appsparameters.pages.modify_public_data": "Rediger de offentlige dataene til applikasjonen din.",
     "scenes.app.popup.appsparameters.pages.new_app_title": "Ny søknad",
@@ -882,8 +882,8 @@
     "scenes.app.popup.appsparameters.pages.amazing_app_description": "Beskriv søknaden din med noen få ord",
     "scenes.app.popup.appsparameters.pages.application_creator.title": "Ny integrasjon",
     "scenes.app.popup.appsparameters.pages.application_creator.checkbox": "Jeg forstår at eieren og administratorene av dette selskapet vil kunne endre og publisere denne applikasjonen.",
-    "twake.application.access.title": "Velg de riktige omfangene for applikasjonen din.",
-    "twake.application.access.no_default_scopes_available'": "Denne integrasjonen har ingen {{$1}}-tilgang",
+    "tdrive.application.access.title": "Velg de riktige omfangene for applikasjonen din.",
+    "tdrive.application.access.no_default_scopes_available'": "Denne integrasjonen har ingen {{$1}}-tilgang",
     "scenes.app.popup.appsparameters.pages.application_editor.help_text": "Hvis du ikke vet hvordan du fyller disse, gå til ",
     "components.rich_text_editor.plugins.suggestions.loading": "Ser etter mer",
     "components.open_desktop_popup.subtitle": "åpnet i Tdrive-appen",
diff --git a/twake/frontend/public/locales/pt.json b/twake/frontend/public/locales/pt.json
index 77d9bfcb..9c1a0975 100644
--- a/twake/frontend/public/locales/pt.json
+++ b/twake/frontend/public/locales/pt.json
@@ -90,7 +90,7 @@
     "scenes.app.popup.appsparameters.pages.grp_section_name-error": "Este nome já está em uso por outro aplicativo. Por favor escolha outro.",
     "scenes.app.popup.appsparameters.pages.grp_section_surname_label": "Nome simplificado",
     "scenes.app.popup.appsparameters.pages.installation": "Instalar.",
-    "scenes.app.popup.appsparameters.pages.instruction_message_twakecode": "Comece escrevendo sua mensagem no formato JSON.",
+    "scenes.app.popup.appsparameters.pages.instruction_message_tdrivecode": "Comece escrevendo sua mensagem no formato JSON.",
     "scenes.app.popup.appsparameters.pages.interne_availability_application": "Aplicativo interno",
     "scenes.app.popup.appsparameters.pages.json_configuration_information": "Acesse a documentação para gerar sua configuração no formato JSON.",
     "scenes.app.popup.appsparameters.pages.loading": "Carregando...",
@@ -282,7 +282,7 @@
     "scenes.apps.messages.messageslist.get_writing_users": "estão escrevendo...",
     "scenes.apps.messages.messageslist.go_last_message_button": "Ir para a última mensagem",
     "scenes.apps.messages.messageslist.go_last_message_button.new_messages": "Novas mensagens",
-    "scenes.error_on_twake": "\"Houston, nós temos um problema\"",
+    "scenes.error_on_tdrive": "\"Houston, nós temos um problema\"",
     "scenes.help_us": "No entanto, se você quiser nos ajudar a corrigir esse erro, envie-nos uma mensagem abaixo: ",
     "scenes.login.verifymail.alert": "Estamos verificando seu e-mail!",
     "scenes.login.verifymail.error_message": "Um erro ocorreu",
@@ -414,7 +414,7 @@
     "components.calendar.calendarselector.from": "A partir de",
     "scenes.apps.drive.move_text2": "Jogada",
     "components.attachmentpicker.from_computer": "Do seu dispositivo",
-    "components.attachmentpicker.from_twake": "De documentos Tdrive",
+    "components.attachmentpicker.from_tdrive": "De documentos Tdrive",
     "components.attachmentpicker.file": "Arquivo",
     "components.attachmentpicker.remove_attach": "Remover anexo",
     "scenes.apps.drive.remove_attachs": "Remover anexos",
@@ -458,7 +458,7 @@
     "scenes.client.mainview.tabs.tabstemplateeditor.select_placeholder": "Inscrição",
     "scenes.client.channelbar.channelmemberslist.no_members": "Não há usuários neste canal, você pode convidá-los clicando em Adicionar usuários.",
     "scenes.app.channelsbar.hide_discussion_leaving.menu": "Ocultar discussão",
-    "scenes.app.popup.adduserfromtwakeconsole.current_users_state": "{{$1}} e-mail(s) serão adicionados",
+    "scenes.app.popup.adduserfromtdriveconsole.current_users_state": "{{$1}} e-mail(s) serão adicionados",
     "components.newversion.new_version_component.row.part_1": "Você está executando uma versão desatualizada do Tdrive",
     "components.newversion.new_version_component.row.part_2": "sugerimos que você recarregue o aplicativo e aproveite nossos novos recursos!",
     "components.newversion.new_version_component.link": "Clique aqui para recarregar",
@@ -611,7 +611,7 @@
     "scenes.join.wrong_link_description": "Peça à pessoa que o convidou para se juntar a esta empresa para um novo link ou crie sua própria empresa",
     "scenes.join.create_the_company_button": "Crie a empresa",
     "scenes.join.join_workspace_from_company": "Junte-se a {{$1}} de {{$2}}!",
-    "scenes.join.twake_description": "Tdrive é um espaço de trabalho digital de código aberto criado para melhorar a produtividade da sua equipe",
+    "scenes.join.tdrive_description": "Tdrive é um espaço de trabalho digital de código aberto criado para melhorar a produtividade da sua equipe",
     "scenes.join.login_first_button": "Faça login ou crie uma conta primeiro",
     "scenes.join.join_the_team_button": "Junte-se à equipe",
     "scenes.app.channelsbar.currentuser.reset": "Redefinir",
@@ -630,8 +630,8 @@
     "views.client.popup.workspace_parameter.pages.workspace_members.link_to_console": "Ver todos os membros da minha empresa no console",
     "scenes.app.popup.appsparameters.pages.amazing_app_description": "Descreva sua aplicação em poucas palavras",
     "scenes.app.popup.appsparameters.pages.application_creator.checkbox": "Entendo que o proprietário e os administradores desta empresa poderão modificar e publicar este aplicativo.",
-    "twake.application.access.title": "Selecione os escopos certos para seu aplicativo.",
-    "twake.application.access.no_default_scopes_available'": "Esta integração não tem acesso {{$1}}",
+    "tdrive.application.access.title": "Selecione os escopos certos para seu aplicativo.",
+    "tdrive.application.access.no_default_scopes_available'": "Esta integração não tem acesso {{$1}}",
     "scenes.app.popup.appsparameters.pages.application_editor.help_link": "a documentação da API Tdrive",
     "scenes.app.popup.appsparameters.pages.application_editor.help_text": "Se você não sabe como preenchê-los, vá para ",
     "scenes.app.popup.appsparameters.pages.application_editor.application_removed": "Aplicativo removido com sucesso {{$1}} !",
@@ -810,7 +810,7 @@
     "scenes.apps.tasks.list_modal.predefined_participants": "Participantes predefinidos",
     "scenes.apps.tasks.list_modal.archive_all_tasks": "Arquivar todas as tarefas",
     "scenes.apps.tasks.list_modal.remove_archived_tasks": "Remover tarefas arquivadas ({{$1}})",
-    "scenes.login.footer.go_to_twake": "Acesse twakeapp.com",
+    "scenes.login.footer.go_to_tdrive": "Acesse tdriveapp.com",
     "scenes.login.footer.branding": "Você está em um servidor Tdrive privado {{$1}} ({{$2}}). ",
     "scenes.login.create_account.title": "Criar uma nova conta",
     "scenes.login.create_account.email": "Email",
@@ -862,7 +862,7 @@
     "scenes.app.workspaces.welcome_page.ready_to_work": "Você está pronto para trabalhar agora.",
     "scenes.app.workspaces.welcome_page.see_you_soon": "Até breve!",
     "scenes.app.workspaces.welcome_page.try_again": "Tente novamente",
-    "scenes.app.workspaces.welcome_page.twake_team": "Tdrive",
+    "scenes.app.workspaces.welcome_page.tdrive_team": "Tdrive",
     "scenes.app.workspaces.welcome_page.welcome_header": "Bem-vindo ao Tdrive!",
     "scenes.app.workspaces.welcome_page.add_secondary_emails_comment": "Você pode vincular vários endereços de email à sua conta; apenas um endereço será usado para enviar notificações.",
     "scenes.app.workspaces.welcome_page.main_mail_title": "Endereço principal",
@@ -883,9 +883,9 @@
     "general.open": "Abrir",
     "scenes.apps.account.thumbnail.max_weight": "Tamanho máximo 5 MB",
     "scenes.apps.account.account.email_add_modal.confirm": "Confirme este email",
-    "app.name.twake_calendar": "Calendário",
-    "app.name.twake_drive": "Documentos",
-    "app.name.twake_tasks": "Tarefas",
+    "app.name.tdrive_calendar": "Calendário",
+    "app.name.tdrive_drive": "Documentos",
+    "app.name.tdrive_tasks": "Tarefas",
     "components.calendar.repetition.everyday": "Diário",
     "components.calendar.repetition.does_not_repeat": "Não se repete",
     "components.calendar.repetition.weekly_on": "Semanalmente em {{$1}}",
diff --git a/twake/frontend/public/locales/ru.json b/twake/frontend/public/locales/ru.json
index 50c8b5d7..2fbcf01f 100644
--- a/twake/frontend/public/locales/ru.json
+++ b/twake/frontend/public/locales/ru.json
@@ -161,7 +161,7 @@
     "scenes.apps.tasks.list_modal.predefined_participants": "Предполагаемые участники",
     "scenes.apps.tasks.list_modal.archive_all_tasks": "Архивировать все задачи",
     "scenes.apps.tasks.list_modal.remove_archived_tasks": "Удалить заархивированные задачи ({{$1}})",
-    "scenes.login.footer.go_to_twake": "Перейти к twakeapp.com",
+    "scenes.login.footer.go_to_tdrive": "Перейти к tdriveapp.com",
     "scenes.login.footer.branding": "Вы находитесь на частном сервере, принадлежащем {{$1}} ({{$2}}). ",
     "scenes.login.create_account.title": "Создать новый аккаунт",
     "scenes.login.create_account.email": "Электронная почта",
@@ -216,7 +216,7 @@
     "scenes.app.workspaces.welcome_page.ready_to_work": "Все готово для работы.",
     "scenes.app.workspaces.welcome_page.see_you_soon": "До скорого!",
     "scenes.app.workspaces.welcome_page.try_again": "Попробуйте еще раз",
-    "scenes.app.workspaces.welcome_page.twake_team": "Tdrive",
+    "scenes.app.workspaces.welcome_page.tdrive_team": "Tdrive",
     "scenes.app.workspaces.welcome_page.welcome_header": "Добро пожаловать в Tdrive!",
     "scenes.app.workspaces.welcome_page.add_secondary_emails_comment": "Вы можете связать несколько адресов электронной почты с вашим аккаунтом, только один из них будет использоваться для отправки вам уведомлений.",
     "scenes.app.workspaces.welcome_page.main_mail_title": "Основной адрес",
@@ -237,9 +237,9 @@
     "general.open": "Открыть",
     "scenes.apps.account.thumbnail.max_weight": "Максимальный размер - 5 Мб",
     "scenes.apps.account.account.email_add_modal.confirm": "Подтвердить данную электронную почту",
-    "app.name.twake_calendar": "Календарь",
-    "app.name.twake_drive": "Документы",
-    "app.name.twake_tasks": "Задачи",
+    "app.name.tdrive_calendar": "Календарь",
+    "app.name.tdrive_drive": "Документы",
+    "app.name.tdrive_tasks": "Задачи",
     "components.calendar.repetition.everyday": "Ежедневно",
     "components.calendar.repetition.does_not_repeat": "Однократно",
     "components.calendar.repetition.weekly_on": "Еженедельно {{$1}}",
@@ -344,7 +344,7 @@
     "scenes.app.popup.appsparameters.pages.grp_section_name-error": "Это имя уже используется другим приложением, пожалуйста, выберите другое.",
     "scenes.app.popup.appsparameters.pages.grp_section_surname_label": "Упрощенное имя",
     "scenes.app.popup.appsparameters.pages.installation": "Установить.",
-    "scenes.app.popup.appsparameters.pages.instruction_message_twakecode": "Начните с написания сообщения в формате JSON.",
+    "scenes.app.popup.appsparameters.pages.instruction_message_tdrivecode": "Начните с написания сообщения в формате JSON.",
     "scenes.app.popup.appsparameters.pages.interne_availability_application": "Внутреннее приложение",
     "scenes.app.popup.appsparameters.pages.json_configuration_information": "Перейдите в документацию, чтобы сгенерировать вашу конфигурацию в формате JSON.",
     "scenes.app.popup.appsparameters.pages.loading": "Загрузка...",
@@ -527,7 +527,7 @@
     "scenes.apps.messages.messageslist.get_writing_users": "печатают...",
     "scenes.apps.messages.messageslist.go_last_message_button": "Перейти к последнему сообщению",
     "scenes.apps.messages.messageslist.go_last_message_button.new_messages": "Новые сообщения",
-    "scenes.error_on_twake": "“Хьюстон, у нас проблема“",
+    "scenes.error_on_tdrive": "“Хьюстон, у нас проблема“",
     "scenes.help_us": "Если вы хотите помочь нам исправить эту ошибку, отправьте сообщение ниже: ",
     "scenes.login.verifymail.alert": "Мы проверяем вашу электронную почту!",
     "scenes.login.verifymail.error_message": "Произошла ошибка",
@@ -635,7 +635,7 @@
     "components.calendar.calendarselector.from": "C",
     "scenes.apps.drive.move_text2": "Переместить",
     "components.attachmentpicker.from_computer": "С компьютера",
-    "components.attachmentpicker.from_twake": "Из Tdrive Documents",
+    "components.attachmentpicker.from_tdrive": "Из Tdrive Documents",
     "components.attachmentpicker.file": "Файл",
     "components.attachmentpicker.remove_attach": "Удалить вложение",
     "scenes.apps.drive.remove_attachs": "Удалить вложения",
@@ -752,7 +752,7 @@
     "scenes.app.popup.workspaceparameter.pages.workspace_partner_tabs.members.table.tags": "Роль",
     "general.email": "Эл. адрес",
     "scenes.join.join_workspace_from_company": "Присоединяйтесь к {{$1}} с {{$2}}!",
-    "scenes.join.twake_description": "Tdrive - это цифровая рабочая среда с открытым исходным кодом, созданная для повышения продуктивности вашей команды",
+    "scenes.join.tdrive_description": "Tdrive - это цифровая рабочая среда с открытым исходным кодом, созданная для повышения продуктивности вашей команды",
     "scenes.join.login_first_button": "Войти или создать учетную запись",
     "scenes.join.join_the_team_button": "Присоединиться к команде",
     "general.verify": "Проверить",
@@ -834,7 +834,7 @@
     "scenes.client.mainview.tabs.tabstemplateeditor.select_placeholder": "Заявка",
     "scenes.client.channelbar.channelmemberslist.no_members": "На этом канале нет пользователей. Вы можете пригласить их, нажав \"Добавить пользователей\".",
     "scenes.app.channelsbar.hide_discussion_leaving.menu": "Скрыть обсуждение",
-    "scenes.app.popup.adduserfromtwakeconsole.current_users_state": "{{$1}} адрес(а) электронной почты будет(ут) добавлен(ы)",
+    "scenes.app.popup.adduserfromtdriveconsole.current_users_state": "{{$1}} адрес(а) электронной почты будет(ут) добавлен(ы)",
     "components.newversion.new_version_component.row.part_1": "Ваша версия Tdrive устарела",
     "components.newversion.new_version_component.row.part_2": "предлагаем вам обновить приложение и попробовать наши новые функции!",
     "components.newversion.new_version_component.link": "Нажмите сюда, чтобы обновить",
@@ -876,8 +876,8 @@
     "scenes.app.popup.appsparameters.pages.amazing_app_description": "Опишите ваше приложение в нескольких словах",
     "scenes.app.popup.appsparameters.pages.application_creator.title": "Новая интеграция",
     "scenes.app.popup.appsparameters.pages.application_creator.checkbox": "Я понимаю, что владелец и администраторы этой компании смогут изменять и публиковать это приложение.",
-    "twake.application.access.title": "Выберите правильные области для вашего приложения.",
-    "twake.application.access.no_default_scopes_available'": "У этой интеграции нет доступа {{$1}}",
+    "tdrive.application.access.title": "Выберите правильные области для вашего приложения.",
+    "tdrive.application.access.no_default_scopes_available'": "У этой интеграции нет доступа {{$1}}",
     "scenes.app.popup.appsparameters.pages.application_editor.help_link": "документация по API Tdrive",
     "scenes.app.popup.appsparameters.pages.application_editor.help_text": "Если вы не знаете, как их заполнить, перейдите на ",
     "scenes.app.popup.appsparameters.pages.app.private_key": "Закрытый ключ",
diff --git a/twake/frontend/public/locales/si.json b/twake/frontend/public/locales/si.json
index 8d889500..8ced8652 100644
--- a/twake/frontend/public/locales/si.json
+++ b/twake/frontend/public/locales/si.json
@@ -105,7 +105,7 @@
     "scenes.apps.tasks.connectors_menu": "සම්බන්ධක...",
     "scenes.apps.tasks.task_status.current": "වත්මන්",
     "scenes.apps.tasks.task.edit.dates": "දින",
-    "scenes.login.footer.go_to_twake": "twakeapp.com වෙත යන්න",
+    "scenes.login.footer.go_to_tdrive": "tdriveapp.com වෙත යන්න",
     "scenes.login.footer.branding": "ඔබ සිටින්නේ {{$1}} ({{$2}}) පෞද්ගලික ට්වේක් සේවාදායකයක ය. ",
     "scenes.login.create_account.title": "නව ගිණුමක් සාදන්න",
     "scenes.login.forgot_password.title": "මුරපදය අමතක වුණා ද?",
@@ -130,7 +130,7 @@
     "scenes.app.popup.appsparameters.pages.apps_connectors_small_text": "ඔබගේ යෙදුම් සහ සම්බන්ධක කළමනාකරණය කරන්න.",
     "scenes.app.popup.workspaceparameter.pages.apps_company_small_text": "ඔබගේ සමාගමේ යෙදුම්",
     "scenes.app.popup.workspaceparameter.pages.company_name_description": "මෙම සමාගමේ නම වෙනස් කරන්න",
-    "app.name.twake_drive": "ලේඛන",
+    "app.name.tdrive_drive": "ලේඛන",
     "components.calendar.repetition.everyday": "දිනපතා",
     "components.calendar.repetition.weeks": "සති(ය)",
     "scenes.app.channelsbar.modify_channel_menu": "නාලිකාව සංස්කරණය",
@@ -139,10 +139,10 @@
     "scenes.app.channelsbar.private_channel_label": "පෞද්ගලික",
     "scenes.app.mainview.tabs.rename": "යළි නම් කරන්න",
     "scenes.app.workspaces.welcome_page.ready_to_work": "ඔබ දැන් වැඩ කිරීමට සූදානම්.",
-    "scenes.app.workspaces.welcome_page.twake_team": "ට්වේක්",
+    "scenes.app.workspaces.welcome_page.tdrive_team": "ට්වේක්",
     "scenes.app.workspaces.welcome_page.main_mail_title": "ප්‍රධාන ලිපිනය",
     "scenes.app.workspaces.welcome_page.other_mail_title": "ද්විතීයික ලිපින",
-    "app.name.twake_calendar": "දින දසුන",
+    "app.name.tdrive_calendar": "දින දසුන",
     "scenes.app.channelsbar.currentuser.title": "ගිණුමේ සැකසුම්",
     "components.locked_features.locked_only_office_popup.subtitle": "ඔබට නොමිලේ අනුවාදයෙහි ඔන්ලිඔෆිස් භාවිතා කළ නොහැකිය.",
     "components.locked_features.locked_drive_popup.subtitle": "නොමිලේ අනුවාදයෙහි ඔබට ගි.බ. GB ක් ගබඩා කළ හැකිය.",
@@ -252,7 +252,7 @@
     "components.userlistmanager.no_users": "පරිශීලකයින් නැත.",
     "components.reminder.by_email": "වි-තැපෑල",
     "scenes.app.mainview.discussion": "සාකච්ඡා",
-    "components.attachmentpicker.from_twake": "ට්වේක් ලේඛන වෙතින්",
+    "components.attachmentpicker.from_tdrive": "ට්වේක් ලේඛන වෙතින්",
     "components.attachmentpicker.file": "ගොනුව",
     "scenes.apps.drive.remove_attachs": "ඇමුණුම් ඉවත්කරන්න",
     "components.drive.elements.manage_version": "අනුවාද කළමණාකරනය",
@@ -296,7 +296,7 @@
     "scenes.apps.drive.folder_subtitle": "බහාලුම්",
     "scenes.client.channels_bar.modals.guest_management.title": "{{$1}} හි අමුත්තන් කළමණාකරනය",
     "scenes.app.popup.workspaceparameter.pages.company_developped_apps_subtitle": "සමාගම විසින් සංවර්ධනය කළ යෙදුම්",
-    "scenes.error_on_twake": "\"කමල්, අපිට ප්‍රශ්නයක් තියෙනවා\"",
+    "scenes.error_on_tdrive": "\"කමල්, අපිට ප්‍රශ්නයක් තියෙනවා\"",
     "scenes.client.channelsbar.modals.workspace_channel_list.workspace_channel_row.tag": "ඔබ සාමාජිකයෙකු නොවේ",
     "scenes.app.popup.workspaceparameter.pages.company_identity_title": "සමාගමේ අනන්යතාවය",
     "components.drive.new_versions": "නව අනුවාදයක් එකතු කරන්න",
@@ -493,7 +493,7 @@
     "scenes.app.integrations_parameters.company_applications_table.more_menu.remove_application": "සමාගමෙන් ඉවත් කරන්න",
     "scenes.join.wrong_link_description": "ඔබට මෙම සමාගමට එක්වීමට ආරාධනා කළ පුද්ගලයාගෙන් නව සබැඳියක් විමසන්න හෝ ඔබගේම සමාගමක් සාදන්න",
     "app.state.recoil.hooks.use_current_company_applications.toaster_add": "ඔබගේ සමාගමට {{$1}} සාර්ථකව එක් කෙරිණි",
-    "scenes.join.twake_description": "ට්වේක් යනු ඔබගේ කණ්ඩායම් ඵලදායිතාව වැඩිදියුණු කිරීම සඳහා ගොඩනගා ඇති විවෘත මූලාශ්‍ර සංඛ්‍යාංක වැඩබිමකි",
+    "scenes.join.tdrive_description": "ට්වේක් යනු ඔබගේ කණ්ඩායම් ඵලදායිතාව වැඩිදියුණු කිරීම සඳහා ගොඩනගා ඇති විවෘත මූලාශ්‍ර සංඛ්‍යාංක වැඩබිමකි",
     "scenes.apps.messages.input.replied_to": "වෙත පිළිතුරු දුණි ",
     "components.searchpopup.tasks": "කාර්යයන්",
     "scenes.join.loading": "පූරණය වෙමින්…",
@@ -548,7 +548,7 @@
     "scenes.app.workspaces.welcome_page.done": "මම අහවරයි",
     "scenes.apps.account.account.description_main": "ට්වේක් දැනුම්දීම් යවන්නේ ඔබගේ ප්‍රධාන ලිපිනයටය. භාවිතා කරන වැඩබිම් වෙත ස්වයංක්‍රීයව ආරාධනා ලැබීමට ද්විතීයික ලිපින ඉඩ සලසයි.",
     "scenes.app.channelsbar.currentuser.logout": "වරන්න",
-    "app.name.twake_tasks": "කාර්යය",
+    "app.name.tdrive_tasks": "කාර්යය",
     "components.calendar.repetition.never": "කවදාවත්",
     "components.calendar.repetition.years": "අවුරුදු",
     "components.calendar.repetition.days": "දවස්",
@@ -591,7 +591,7 @@
     "scenes.app.popup.appsparameters.pages.displayed_parameters_label": "දර්ශන සැකසුම්",
     "scenes.app.popup.appsparameters.pages.event_subtitle": "සිදුවීම්",
     "scenes.app.popup.appsparameters.pages.current_informations_apps_connectors": "ඔබ තවමත් යෙදුමක් සාදා නැත. යෙදුමක් හෝ සම්බන්ධකයක් සෑදීමට පෙර එය දැනටමත් යෙදුම් වෙළඳපොළෙහි නැති බව සහතික කරගන්න.",
-    "scenes.app.popup.appsparameters.pages.instruction_message_twakecode": "ඔබගේ පණිවිඩය JSON ආකෘතියෙන් ලිවීමට අරඹන්න.",
+    "scenes.app.popup.appsparameters.pages.instruction_message_tdrivecode": "ඔබගේ පණිවිඩය JSON ආකෘතියෙන් ලිවීමට අරඹන්න.",
     "scenes.app.popup.appsparameters.pages.description_label": "වැණුම",
     "scenes.app.popup.createworkspacepage.create_new_workspace": "නව වැඩබිමක් සාදන්න",
     "scenes.app.popup.appsparameters.pages.error_app_update_message": "යෙදුම යාවත්කාල වීමේදී දෝෂයක් සිදුවිණි.",
@@ -811,7 +811,7 @@
     "scenes.apps.account.account.send_info": "මෙම අක්තපත්‍ර තොරතුරු ඔබේ පරිශීලකයාට යවන්න.",
     "components.drive.elements.configurate_mod": "මැදිහත්කරු වින්‍යාසගත කරන්න...",
     "scenes.client.mainview.tabs.tabstemplateeditor.title_tab_creation": "නව ටැබ් එකක් සාදන්න",
-    "scenes.app.popup.adduserfromtwakeconsole.current_users_state": "{{$1}} ඊමේල්(ය) එකතු වනු ඇත",
+    "scenes.app.popup.adduserfromtdriveconsole.current_users_state": "{{$1}} ඊමේල්(ය) එකතු වනු ඇත",
     "scenes.apps.messages.message.activity_message.a_added_b_to_the_channel": "{{$1}} නාලිකාවට {{$2}} එක් කළේය",
     "scenes.apps.messages.message.activity_message.a_removed_b_from_the_channel": "{{$1}} {{$2}} නාලිකාවෙන් ඉවත් කරන ලදී",
     "scenes.apps.messages.message.activity_message.a_created_channel_tab": "{{$1}} නව {{$2}} ටැබයක් {{$3}} එක් කරන ලදී",
@@ -874,8 +874,8 @@
     "views.client.popup.workspace_parameter.pages.workspace_members.link_to_console": "කොන්සෝලය මත මගේ සියලුම සමාගම් සාමාජිකයින් බලන්න",
     "scenes.app.popup.appsparameters.pages.application_creator.title": "නව ඒකාබද්ධ කිරීම",
     "scenes.app.popup.appsparameters.pages.application_creator.checkbox": "මෙම සමාගමේ හිමිකරුට සහ පරිපාලකයින්ට මෙම යෙදුම වෙනස් කිරීමට සහ ප්‍රකාශ කිරීමට හැකි වනු ඇති බව මට වැටහේ.",
-    "twake.application.access.title": "ඔබගේ යෙදුම සඳහා නිවැරදි විෂය පථයන් තෝරන්න.",
-    "twake.application.access.no_default_scopes_available'": "මෙම අනුකලනයට කිසිදු {{$1}} ප්‍රවේශයක් නොමැත",
+    "tdrive.application.access.title": "ඔබගේ යෙදුම සඳහා නිවැරදි විෂය පථයන් තෝරන්න.",
+    "tdrive.application.access.no_default_scopes_available'": "මෙම අනුකලනයට කිසිදු {{$1}} ප්‍රවේශයක් නොමැත",
     "scenes.app.popup.appsparameters.pages.application_editor.help_link": "Tdrive API ලේඛනගත කිරීම",
     "scenes.app.popup.appsparameters.pages.application_editor.help_text": "ඔබ මේවා පුරවන්නේ කෙසේදැයි නොදන්නේ නම්, යන්න ",
     "scenes.app.popup.appsparameters.pages.application_editor.application_removed": "යෙදුම සාර්ථකව ඉවත් කරන ලදී {{$1}} !",
diff --git a/twake/frontend/public/locales/tr.json b/twake/frontend/public/locales/tr.json
index 81a55052..3b37b401 100644
--- a/twake/frontend/public/locales/tr.json
+++ b/twake/frontend/public/locales/tr.json
@@ -178,7 +178,7 @@
     "scenes.apps.tasks.list_modal.predefined_participants": "Önceden tanımlanmış katılımcılar",
     "scenes.apps.tasks.list_modal.archive_all_tasks": "Tüm görevleri arşivle",
     "scenes.apps.tasks.list_modal.remove_archived_tasks": "Arşivlenmiş görevleri kaldırın ({{$1}})",
-    "scenes.login.footer.go_to_twake": "twakeapp.com'a gidin",
+    "scenes.login.footer.go_to_tdrive": "tdriveapp.com'a gidin",
     "scenes.login.footer.branding": "Bir {{$1}} ({{$2}}) özel Tdrive sunucusundasınız. ",
     "scenes.login.create_account.title": "Yeni bir hesap oluştur",
     "scenes.login.create_account.email": "e-posta",
@@ -281,7 +281,7 @@
     "scenes.app.workspaces.welcome_page.ready_to_work": "Artık çalışmaya hazırsınız.",
     "scenes.app.workspaces.welcome_page.see_you_soon": "Yakında görüşürüz!",
     "scenes.app.workspaces.welcome_page.try_again": "Tekrar deneyin",
-    "scenes.app.workspaces.welcome_page.twake_team": "Uyandırmak",
+    "scenes.app.workspaces.welcome_page.tdrive_team": "Uyandırmak",
     "scenes.app.workspaces.welcome_page.welcome_header": "Tdrive'e hoş geldiniz!",
     "scenes.app.workspaces.welcome_page.add_secondary_emails_comment": "Hesabınıza birden fazla e-posta adresi bağlayabilirsiniz; size bildirim göndermek için yalnızca bir adres kullanılacaktır.",
     "scenes.app.workspaces.welcome_page.main_mail_title": "ana adres",
@@ -301,9 +301,9 @@
     "scenes.apps.account.preference": "tercihler",
     "scenes.apps.account.thumbnail.max_weight": "Maksimum boyut 5 MB",
     "scenes.apps.account.account.email_add_modal.confirm": "Bu e-postayı onaylayın",
-    "app.name.twake_calendar": "Takvim",
-    "app.name.twake_drive": "Belgeler",
-    "app.name.twake_tasks": "Görevler",
+    "app.name.tdrive_calendar": "Takvim",
+    "app.name.tdrive_drive": "Belgeler",
+    "app.name.tdrive_tasks": "Görevler",
     "components.calendar.repetition.everyday": "Günlük",
     "components.calendar.repetition.does_not_repeat": "tekrar etmez",
     "components.calendar.repetition.weekly_on": "Haftalık {{$1}}",
@@ -342,7 +342,7 @@
     "scenes.app.popup.appsparameters.pages.grp_section_name-error": "Bu ad zaten başka bir uygulama tarafından kullanılıyor. Lütfen başka birini seçiniz.",
     "scenes.app.popup.appsparameters.pages.grp_section_surname_label": "basitleştirilmiş ad",
     "scenes.app.popup.appsparameters.pages.installation": "yükleyin.",
-    "scenes.app.popup.appsparameters.pages.instruction_message_twakecode": "Mesajınızı JSON formatında yazarak başlayın.",
+    "scenes.app.popup.appsparameters.pages.instruction_message_tdrivecode": "Mesajınızı JSON formatında yazarak başlayın.",
     "scenes.app.popup.appsparameters.pages.interne_availability_application": "Dahili uygulama",
     "scenes.app.popup.appsparameters.pages.json_configuration_information": "Yapılandırmanızı JSON biçiminde oluşturmak için belgelere gidin.",
     "scenes.app.popup.appsparameters.pages.loading": "Yükleniyor...",
@@ -491,14 +491,14 @@
     "components.calendar.calendarselector.from": "İtibaren",
     "scenes.apps.drive.move_text2": "Hareket",
     "components.attachmentpicker.from_computer": "cihazınızdan",
-    "components.attachmentpicker.from_twake": "Tdrive Belgelerinden",
+    "components.attachmentpicker.from_tdrive": "Tdrive Belgelerinden",
     "components.attachmentpicker.file": "Dosya",
     "components.attachmentpicker.remove_attach": "Eki kaldır",
     "scenes.apps.drive.remove_attachs": "Ekleri kaldır",
     "components.drive.elements.see": "Görmek",
     "components.drive.elements.current_name": "Şu anki ismi: ",
     "scenes.app.channelsbar.hide_discussion_leaving.menu": "Tartışmayı gizle",
-    "scenes.app.popup.adduserfromtwakeconsole.current_users_state": "{{$1}} e-posta(lar)ı eklenecek",
+    "scenes.app.popup.adduserfromtdriveconsole.current_users_state": "{{$1}} e-posta(lar)ı eklenecek",
     "components.newversion.new_version_component.row.part_1": "Eski bir Tdrive sürümü çalıştırıyorsunuz",
     "components.newversion.new_version_component.row.part_2": "Uygulamayı yeniden yüklemenizi ve yeni özelliklerimizin keyfini çıkarmanızı öneririz!",
     "components.newversion.new_version_component.link": "Yeniden yüklemek için burayı tıklayın",
@@ -619,7 +619,7 @@
     "scenes.join.wrong_link_description": "Sizi bu şirkete katılmaya davet eden kişiden yeni bir bağlantı isteyin veya kendi şirketinizi oluşturun",
     "scenes.join.create_the_company_button": "şirket oluştur",
     "scenes.join.join_workspace_from_company": "{{$2}}'ten {{$1}}'e katılın!",
-    "scenes.join.twake_description": "Tdrive, ekip üretkenliğinizi artırmak için oluşturulmuş açık kaynaklı bir dijital çalışma alanıdır.",
+    "scenes.join.tdrive_description": "Tdrive, ekip üretkenliğinizi artırmak için oluşturulmuş açık kaynaklı bir dijital çalışma alanıdır.",
     "components.user_picker.modal_no_result": "Sonuç bulunamadı",
     "components.users_picker.add_me": "beni ekle",
     "scenes.app.workspaces.create_company.invitations.title": "Çalışma alanınızı yapılandırın.",
@@ -712,7 +712,7 @@
     "scenes.app.popup.workspaceparameter.pages.quit_workspace_menu": "Bu çalışma alanından ayrıl",
     "scenes.apps.calendar.modals.event_adresse_placeholder": "Adres",
     "scenes.apps.drive.no_file_alert": "Dosya oluşturmanıza izin veren uygulamanız yok.",
-    "scenes.error_on_twake": "\"Bir problemimiz var Houston\"",
+    "scenes.error_on_tdrive": "\"Bir problemimiz var Houston\"",
     "scenes.help_us": "Ancak, bu hatayı düzeltmemize yardımcı olmak isterseniz, bize aşağıdan bir mesaj gönderin: ",
     "scenes.login.verifymail.alert": "E-postanızı kontrol ediyoruz!",
     "scenes.login.verifymail.error_message": "Bir hata oluştu",
@@ -876,8 +876,8 @@
     "scenes.app.popup.appsparameters.pages.amazing_app_description": "Uygulamanızı birkaç kelimeyle tanımlayın",
     "scenes.app.popup.appsparameters.pages.application_creator.title": "Yeni entegrasyon",
     "scenes.app.popup.appsparameters.pages.application_creator.checkbox": "Bu şirketin sahibi ve yöneticilerinin bu uygulamayı değiştirebileceğini ve yayınlayabileceğini anlıyorum.",
-    "twake.application.access.title": "Uygulamanız için doğru kapsamları seçin.",
-    "twake.application.access.no_default_scopes_available'": "Bu entegrasyon herhangi bir {{$1}} erişimine sahip değil",
+    "tdrive.application.access.title": "Uygulamanız için doğru kapsamları seçin.",
+    "tdrive.application.access.no_default_scopes_available'": "Bu entegrasyon herhangi bir {{$1}} erişimine sahip değil",
     "scenes.app.popup.appsparameters.pages.application_editor.help_link": "Tdrive API belgeleri",
     "scenes.app.popup.appsparameters.pages.application_editor.help_text": "Bunları nasıl dolduracağınızı bilmiyorsanız, adresine gidin. ",
     "scenes.app.popup.appsparameters.pages.application_editor.application_removed": "{{$1}} uygulaması başarıyla kaldırıldı!",
diff --git a/twake/frontend/public/locales/vi.json b/twake/frontend/public/locales/vi.json
index d44674a5..678829b1 100644
--- a/twake/frontend/public/locales/vi.json
+++ b/twake/frontend/public/locales/vi.json
@@ -105,9 +105,9 @@
     "scenes.app.workspaces.welcome_page.add_new_email": "Thêm thư",
     "scenes.app.workspaces.welcome_page.done": "Tôi đã xong",
     "scenes.app.workspaces.welcome_page.try_again": "Thử lại",
-    "scenes.app.workspaces.welcome_page.twake_team": "Tdrive",
+    "scenes.app.workspaces.welcome_page.tdrive_team": "Tdrive",
     "scenes.app.workspaces.welcome_page.code_verification": "Mã xác nhận",
-    "app.name.twake_tasks": "Công việc",
+    "app.name.tdrive_tasks": "Công việc",
     "components.calendar.repetition.everyday": "Hàng ngày",
     "scenes.apps.account.thumbnail.max_weight": "Lớn nhất là 5MB",
     "components.calendar.repetition.weeks": "tuần",
@@ -135,7 +135,7 @@
     "components.emoji_picker.input_search_placeholder": "Tìm kiếm",
     "scenes.apps.parameters.workspace_sections.members.pending": "Thư đang đợi",
     "scenes.login.create_account.lastname": "Họ",
-    "app.name.twake_drive": "Tài liệu",
+    "app.name.tdrive_drive": "Tài liệu",
     "scenes.login.forgot_password.password": "Mật khẩu",
     "scenes.apps.account.account.emails.description": "Quản lý các thư điện tử khác nhau.",
     "scenes.apps.tasks.new_board.edit_title": "Chỉnh sửa bảng",
@@ -205,7 +205,7 @@
     "scenes.apps.account.account.description_main": "Thư chính sẽ được gửi thông báo từ Tdrive. Thư phụ được tự động mời vào không gian làm việc khi bạn dùng.",
     "scenes.apps.account.identity": "Danh tính",
     "general.open": "Mở",
-    "app.name.twake_calendar": "Lịch",
+    "app.name.tdrive_calendar": "Lịch",
     "components.calendar.repetition.monthly_on": "Hàng tháng vào {{$1}} {{$2}}",
     "components.calendar.repetition.repeat": "Lặp lại mỗi",
     "components.calendar.repetition.ends": "Kết thúc vào",
@@ -280,7 +280,7 @@
     "scenes.apps.tasks.list_modal.new_list": "Danh sách mới",
     "scenes.apps.tasks.list_modal.predefined_participants": "Danh sách người tham dự sẵn có",
     "scenes.apps.tasks.list_modal.archive_all_tasks": "Ẩn toàn bộ công việc",
-    "scenes.login.footer.go_to_twake": "Đi tới twakeapp.com",
+    "scenes.login.footer.go_to_tdrive": "Đi tới tdriveapp.com",
     "scenes.login.create_account.title": "Tạo tài khoản mới",
     "scenes.login.create_account.username_already_exist": "Tên ngời dùng đã tồn tại",
     "scenes.login.create_account.newsletter": "Nhận thông tin về Tdrive",
@@ -374,7 +374,7 @@
     "scenes.app.popup.appsparameters.pages.error_message": "Tên này đã dùng cho một ứng dụng khác; chọn tên khác.",
     "scenes.app.popup.appsparameters.pages.error_user_code": "lỗi",
     "scenes.app.popup.appsparameters.pages.installation": "Cài đặt.",
-    "scenes.app.popup.appsparameters.pages.instruction_message_twakecode": "Bắt đầu bằng việc viết tin nhắn với định dạng JSON.",
+    "scenes.app.popup.appsparameters.pages.instruction_message_tdrivecode": "Bắt đầu bằng việc viết tin nhắn với định dạng JSON.",
     "scenes.app.popup.appsparameters.pages.loading": "Đang tải...",
     "scenes.app.popup.appsparameters.pages.message_data_next_event": "Dữ liệu bị động sẽ được gửi trong sự kiện tiếp theo",
     "scenes.app.popup.appsparameters.pages.modify_public_data": "Chỉnh sửa dữ liệu công cộng ứng dụng của ban.",
@@ -558,7 +558,7 @@
     "components.connectorslistmanager.add_connectors": "Thêm kết nối",
     "scenes.client.mainview.tabs.tabstemplateeditor.select_placeholder": "Ứng dụng",
     "scenes.client.channelbar.channelmemberslist.no_members": "Không có người dùng nào trong kênh, bạn có thể mời thêm bằng việc nhấn vào nút Thêm người dùng.",
-    "scenes.app.popup.adduserfromtwakeconsole.current_users_state": "{{$1}} thư sẽ được thêm",
+    "scenes.app.popup.adduserfromtdriveconsole.current_users_state": "{{$1}} thư sẽ được thêm",
     "scenes.apps.messages.message.activity_message.a_updated_channel_description": "{{$1}} thay đổi mô tả",
     "scenes.apps.messages.message.activity_message.a_updated_channel_name": "{{$1}} đã đổi tên kênh sang {{$2}}",
     "scenes.apps.messages.message.activity_message.a_created_channel_tab": "{{$1}} đã thêm {{$2}} tab {{$3}}",
@@ -650,7 +650,7 @@
     "components.searchpopup.loading": "Tải thêm kết quả",
     "scenes.apps.drive.go_trash_menu": "Đi đến thùng rác",
     "components.locked_features.locked_workspace_popup.subtitle": "Khi ở gói miễn phí, bạn chỉ có thể tạo một không gian làm việc.",
-    "scenes.error_on_twake": "\"Houston chúng tôi đang gặp một vấn đề\"",
+    "scenes.error_on_tdrive": "\"Houston chúng tôi đang gặp một vấn đề\"",
     "scenes.login.verifymail.alert": "Chúng tôi đang kiểm tra email của bạn!",
     "scenes.no_panic": "Đừng lo! Chỉ cần tải lại trang để sửa lỗi.",
     "scenes.apps.calendar.unconfigured_tab": "Tab này chưa được cấu hình.",
@@ -801,7 +801,7 @@
     "scenes.apps.tasks.modals.attachments": "Tập tin đính kèm",
     "components.calendar.calendarselector.from": "Từ",
     "components.attachmentpicker.from_computer": "Từ thiết bị của bạn",
-    "components.attachmentpicker.from_twake": "Từ tài liệu Tdrive",
+    "components.attachmentpicker.from_tdrive": "Từ tài liệu Tdrive",
     "components.attachmentpicker.file": "Tập tin",
     "components.attachmentpicker.remove_attach": "Xóa tệp đính kèm",
     "components.drive.elements.see": "Nhìn thấy",
@@ -821,7 +821,7 @@
     "scenes.join.wrong_link_description": "Yêu cầu người đã mời bạn tham gia công ty này để có liên kết mới hoặc tạo công ty của riêng bạn",
     "scenes.join.create_the_company_button": "Tạo công ty",
     "scenes.join.join_workspace_from_company": "Tham gia {{$1}} từ {{$2}}!",
-    "scenes.join.twake_description": "Tdrive là một không gian làm việc kỹ thuật số mã nguồn mở được xây dựng để cải thiện năng suất nhóm của bạn",
+    "scenes.join.tdrive_description": "Tdrive là một không gian làm việc kỹ thuật số mã nguồn mở được xây dựng để cải thiện năng suất nhóm của bạn",
     "scenes.join.login_first_button": "Đăng nhập hoặc tạo tài khoản trước",
     "scenes.join.join_the_team_button": "Tham gia nhóm",
     "scenes.apps.drive.move_text2": "Di chuyển",
@@ -882,13 +882,13 @@
     "scenes.app.integrations_parameters.add_application": "Tích hợp mới",
     "scenes.app.integrations_parameters.company_applications_table.more_menu.developer_settings": "Cài đặt nhà phát triển",
     "scenes.app.popup.appsparameters.pages.application_creator.checkbox": "Tôi hiểu rằng chủ sở hữu và quản trị viên của công ty này sẽ có thể sửa đổi và xuất bản ứng dụng này.",
-    "twake.application.access.title": "Chọn phạm vi phù hợp cho ứng dụng của bạn.",
-    "twake.application.access.no_default_scopes_available'": "Tích hợp này không có bất kỳ quyền truy cập {{$1}} nào",
+    "tdrive.application.access.title": "Chọn phạm vi phù hợp cho ứng dụng của bạn.",
+    "tdrive.application.access.no_default_scopes_available'": "Tích hợp này không có bất kỳ quyền truy cập {{$1}} nào",
     "scenes.app.popup.appsparameters.pages.application_editor.help_link": "tài liệu API Tdrive",
     "components.rich_text_editor.plugins.suggestions.loading": "Tìm kiếm thêm",
     "components.open_desktop_popup.subtitle": "được mở trong ứng dụng Tdrive",
     "components.open_desktop_popup.open_here_link": "Thay vào đó hãy mở ở đây",
-    "molecules.download_banner.title": "Tận dụng tối đa twake, tải xuống ứng dụng dành cho máy tính để bàn ngay bây giờ",
+    "molecules.download_banner.title": "Tận dụng tối đa tdrive, tải xuống ứng dụng dành cho máy tính để bàn ngay bây giờ",
     "molecules.download_banner.download_button": "Tải xuống ứng dụng dành cho máy tính để bàn",
     "scenes.app.channelsbar.channel_copy_link": "Sao chép liên kết kênh",
     "scenes.app.popup.workspaceparameter.pages.workspace_identity.toaster.success.update": "Cập nhật thành công",
diff --git a/twake/frontend/public/locales/zh_Hans.json b/twake/frontend/public/locales/zh_Hans.json
index f6e78b65..9f4156fd 100644
--- a/twake/frontend/public/locales/zh_Hans.json
+++ b/twake/frontend/public/locales/zh_Hans.json
@@ -154,7 +154,7 @@
     "scenes.join.wrong_link_description": "向邀请您加入该公司的人询问新链接或创建您自己的公司",
     "scenes.join.create_the_company_button": "创建公司",
     "scenes.join.join_workspace_from_company": "从{{$2}}加入{{$1}}！",
-    "scenes.join.twake_description": "Tdrive 是一个开源数字工作区，旨在提高您的团队生产力",
+    "scenes.join.tdrive_description": "Tdrive 是一个开源数字工作区，旨在提高您的团队生产力",
     "scenes.join.login_first_button": "首先登录或创建一个帐户",
     "scenes.join.join_the_team_button": "加入团队",
     "general.unarchive": "取消存档",
@@ -244,7 +244,7 @@
     "scenes.apps.tasks.task.assignees": "受让人",
     "scenes.apps.tasks.task.edit.dates": "日期",
     "scenes.apps.tasks.list_modal.remove_archived_tasks": "删除归档任务 ({{$1}})",
-    "scenes.login.footer.go_to_twake": "去 twakeapp.com",
+    "scenes.login.footer.go_to_tdrive": "去 tdriveapp.com",
     "scenes.login.footer.branding": "您在 {{$1}} ({{$2}}) 私人 Tdrive 服务器上。 ",
     "scenes.login.create_account.title": "创建一个新账户",
     "scenes.login.create_account.email": "电子邮件",
@@ -354,7 +354,7 @@
     "components.upload.drop_files": "将您的文件放在这里",
     "components.workspace.list_manager.no_workspace": "没有工作区",
     "components.attachmentpicker.from_computer": "从您的设备",
-    "components.attachmentpicker.from_twake": "从调整文件",
+    "components.attachmentpicker.from_tdrive": "从调整文件",
     "components.attachmentpicker.file": "文件",
     "components.attachmentpicker.remove_attach": "删除附件",
     "scenes.apps.drive.remove_attachs": "删除附件",
@@ -368,7 +368,7 @@
     "scenes.client.mainview.tabs.tabstemplateeditor.select_placeholder": "应用",
     "scenes.client.channelbar.channelmemberslist.no_members": "此频道中没有用户，您可以通过单击添加用户来邀请他们。",
     "scenes.app.channelsbar.hide_discussion_leaving.menu": "隐藏讨论",
-    "scenes.app.popup.adduserfromtwakeconsole.current_users_state": "{{$1}} 电子邮件将被添加",
+    "scenes.app.popup.adduserfromtdriveconsole.current_users_state": "{{$1}} 电子邮件将被添加",
     "components.newversion.new_version_component.row.part_1": "您运行的是过时的 Tdrive 版本",
     "general.re_send": "重发",
     "components.account_verication_status_blocked": "锁定",
@@ -396,7 +396,7 @@
     "scenes.app.workspaces.welcome_page.ready_to_work": "您现在可以开始工作了。",
     "scenes.app.workspaces.welcome_page.see_you_soon": "再见！",
     "scenes.app.workspaces.welcome_page.try_again": "再试一次",
-    "scenes.app.workspaces.welcome_page.twake_team": "调整",
+    "scenes.app.workspaces.welcome_page.tdrive_team": "调整",
     "scenes.app.workspaces.welcome_page.welcome_header": "欢迎来到特瓦克！",
     "scenes.app.workspaces.welcome_page.add_secondary_emails_comment": "您可以将多个电子邮件地址链接到您的帐户；只有一个地址将用于向您发送通知。",
     "scenes.app.workspaces.welcome_page.main_mail_title": "主要地址",
@@ -416,7 +416,7 @@
     "scenes.apps.account.preference": "喜好",
     "scenes.apps.account.thumbnail.max_weight": "最大大小 5 MB",
     "scenes.apps.account.account.email_add_modal.confirm": "确认此电子邮件",
-    "app.name.twake_calendar": "日历",
+    "app.name.tdrive_calendar": "日历",
     "general.verify": "核实",
     "scenes.app.workspaces.create_company.group_data.title": "我们很快——我们只需要一些统计信息。",
     "scenes.app.channelsbar.currentuser.company_messages_counter_header": "留言号码",
@@ -469,7 +469,7 @@
     "scenes.app.popup.appsparameters.pages.grp_section_name-error": "此名称已被另一个应用程序使用。请选择另一个。",
     "scenes.app.popup.appsparameters.pages.grp_section_surname_label": "简化名称",
     "scenes.app.popup.appsparameters.pages.installation": "安装。",
-    "scenes.app.popup.appsparameters.pages.instruction_message_twakecode": "首先以 JSON 格式编写消息。",
+    "scenes.app.popup.appsparameters.pages.instruction_message_tdrivecode": "首先以 JSON 格式编写消息。",
     "scenes.app.popup.appsparameters.pages.interne_availability_application": "内部应用",
     "scenes.app.popup.appsparameters.pages.json_configuration_information": "转到文档以生成 JSON 格式的配置。",
     "scenes.app.popup.appsparameters.pages.loading": "正在加载...",
@@ -759,7 +759,7 @@
     "scenes.apps.drive.trash": "垃圾",
     "scenes.tell_us": "请告诉我们你在做什么：",
     "scenes.apps.drive.viewer.download_desktop": "下载 Tdrive Desktop 以在应用程序中进行预览",
-    "app.name.twake_drive": "文件",
+    "app.name.tdrive_drive": "文件",
     "scenes.login.forgot_password.email_to_recover": "要恢复的电子邮件",
     "scenes.login.forgot_password.mail_doesnt_exist": "此邮箱不存在",
     "scenes.login.home.lost_password": "忘记密码？",
@@ -768,7 +768,7 @@
     "scenes.login.create_account.step_1_subtitle": "再简单不过了——我们只需要一些信息。",
     "scenes.login.create_account.step_2_subtitle_a": "添加您的全名以便其他用户识别您。",
     "scenes.login.create_account.step_2_subtitle_b": "您的电话号码保持私密。",
-    "app.name.twake_tasks": "任务",
+    "app.name.tdrive_tasks": "任务",
     "components.calendar.repetition.everyday": "日常的",
     "components.calendar.repetition.does_not_repeat": "不重复",
     "components.calendar.repetition.weekly_on": "每周 {{$1}}",
@@ -803,7 +803,7 @@
     "scenes.apps.messages.messageslist.get_writing_users": "在写...",
     "scenes.apps.messages.messageslist.go_last_message_button": "转到最后一条消息",
     "scenes.apps.messages.messageslist.go_last_message_button.new_messages": "新消息",
-    "scenes.error_on_twake": "“休斯顿，我们有一个问题”",
+    "scenes.error_on_tdrive": "“休斯顿，我们有一个问题”",
     "scenes.help_us": "但是，如果您想帮助我们解决此错误，请在下面给我们发送消息： ",
     "scenes.apps.account.message_temporary": "临时帐户的工作方式与普通的 Tdrive 帐户类似，但您创建了密码，并且可以在必要时重置它。",
     "scenes.apps.account.message_user_signin": "您的用户可以随时使用同一电子邮件登录并将临时帐户更改为普通帐户。",
@@ -872,8 +872,8 @@
     "components.locked_features_components.locked_invite_alert.message_part_1": "贵公司已达到 {{$1}} 成员的最大限制。请 ",
     "components.locked_features_components.locked_invite_alert.message_part_2": " 邀请更多成员。",
     "views.client.popup.workspace_parameter.pages.workspace_members.link_to_console": "在控制台上查看我的所有公司成员",
-    "twake.application.access.title": "为您的应用选择正确的范围。",
-    "twake.application.access.no_default_scopes_available'": "此集成没有任何 {{$1}} 访问权限",
+    "tdrive.application.access.title": "为您的应用选择正确的范围。",
+    "tdrive.application.access.no_default_scopes_available'": "此集成没有任何 {{$1}} 访问权限",
     "scenes.app.popup.appsparameters.pages.application_editor.application_published": "{{$1}}申请成功！",
     "scenes.app.integrations_parameters.add_application": "新整合",
     "scenes.app.integrations_parameters.company_applications_table.more_menu.developer_settings": "开发者设置",
@@ -888,7 +888,7 @@
     "components.rich_text_editor.plugins.suggestions.loading": "寻找更多",
     "components.open_desktop_popup.subtitle": "在 Tdrive 應用中打開",
     "components.open_desktop_popup.open_here_link": "改為在此處打開",
-    "molecules.download_banner.title": "充分利用 twake，立即下载桌面应用程序",
+    "molecules.download_banner.title": "充分利用 tdrive，立即下载桌面应用程序",
     "molecules.download_banner.download_button": "下载桌面应用程序",
     "scenes.app.channelsbar.channel_copy_link": "复制频道链接",
     "scenes.app.popup.workspaceparameter.pages.workspace_identity.toaster.success.update": "成功更新",
diff --git a/twake/frontend/public/manifest.json b/twake/frontend/public/manifest.json
index 4b59cdf8..92fd19cc 100644
--- a/twake/frontend/public/manifest.json
+++ b/twake/frontend/public/manifest.json
@@ -1,4 +1,4 @@
 {
-  "name": "Twake",
-  "short_name": "Twake"
+  "name": "Tdrive",
+  "short_name": "Tdrive"
 }
diff --git a/twake/frontend/public/public/font/fontastic.css b/twake/frontend/public/public/font/fontastic.css
index a73c9744..5b6eebca 100755
--- a/twake/frontend/public/public/font/fontastic.css
+++ b/twake/frontend/public/public/font/fontastic.css
@@ -1,18 +1,18 @@
 @charset "UTF-8";
 
 @font-face {
-  font-family: 'twake-fontastic';
-  src: url('fontastic/twake-fontastic.eot');
-  src: url('fontastic/twake-fontastic.eot?#iefix') format('embedded-opentype'),
-    url('fontastic/twake-fontastic.woff') format('woff'),
-    url('fontastic/twake-fontastic.ttf') format('truetype'),
-    url('fontastic/twake-fontastic.svg#twake-fontastic') format('svg');
+  font-family: 'tdrive-fontastic';
+  src: url('fontastic/tdrive-fontastic.eot');
+  src: url('fontastic/tdrive-fontastic.eot?#iefix') format('embedded-opentype'),
+    url('fontastic/tdrive-fontastic.woff') format('woff'),
+    url('fontastic/tdrive-fontastic.ttf') format('truetype'),
+    url('fontastic/tdrive-fontastic.svg#tdrive-fontastic') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 
 [data-icon]:before {
-  font-family: 'twake-fontastic' !important;
+  font-family: 'tdrive-fontastic' !important;
   content: attr(data-icon);
   font-style: normal !important;
   font-weight: normal !important;
@@ -26,7 +26,7 @@
 
 [class^='icon-']:before,
 [class*=' icon-']:before {
-  font-family: 'twake-fontastic' !important;
+  font-family: 'tdrive-fontastic' !important;
   font-style: normal !important;
   font-weight: normal !important;
   font-variant: normal !important;
diff --git a/twake/frontend/public/public/font/fontastic/twake-fontastic.eot b/twake/frontend/public/public/font/fontastic/tdrive-fontastic.eot
similarity index 100%
rename from twake/frontend/public/public/font/fontastic/twake-fontastic.eot
rename to twake/frontend/public/public/font/fontastic/tdrive-fontastic.eot
diff --git a/twake/frontend/public/public/font/fontastic/twake-fontastic.svg b/twake/frontend/public/public/font/fontastic/tdrive-fontastic.svg
similarity index 99%
rename from twake/frontend/public/public/font/fontastic/twake-fontastic.svg
rename to twake/frontend/public/public/font/fontastic/tdrive-fontastic.svg
index b19b4162..46cbafbe 100755
--- a/twake/frontend/public/public/font/fontastic/twake-fontastic.svg
+++ b/twake/frontend/public/public/font/fontastic/tdrive-fontastic.svg
@@ -3,8 +3,8 @@
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>Generated by Fontastic.me</metadata>
 <defs>
-<font id="twake-fontastic" horiz-adv-x="512">
-<font-face font-family="twake-fontastic" units-per-em="512" ascent="480" descent="-32"/>
+<font id="tdrive-fontastic" horiz-adv-x="512">
+<font-face font-family="tdrive-fontastic" units-per-em="512" ascent="480" descent="-32"/>
 <missing-glyph horiz-adv-x="512" />
 
 <glyph glyph-name="add-circle" unicode="&#97;" d="M256 512c-141 0-256-115-256-256 0-141 115-256 256-256 141 0 256 115 256 256 0 141-115 256-256 256z m156-412c-21-20-44-36-70-47-27-11-56-17-86-17-30 0-58 6-86 17-26 11-49 27-70 47-20 21-36 44-47 70-11 27-17 56-17 86 0 30 6 58 17 86 11 26 27 49 47 70 21 20 44 36 70 47 28 11 56 17 86 17 30 0 59-6 86-17 26-11 49-27 70-47 20-21 36-44 47-70 11-28 17-56 17-86 0-30-6-59-17-86-11-26-27-49-47-70z m-46 174l-92 0 0 91c0 10-8 18-18 18-10 0-18-8-18-18l0-91-92 0c-10 0-18-8-18-18 0-10 8-18 18-18l92 0 0-92c0-9 8-18 18-18 10 0 18 9 18 18l0 92 92 0c10 0 18 8 18 18 0 10-8 18-18 18z"/>
diff --git a/twake/frontend/public/public/font/fontastic/twake-fontastic.ttf b/twake/frontend/public/public/font/fontastic/tdrive-fontastic.ttf
similarity index 100%
rename from twake/frontend/public/public/font/fontastic/twake-fontastic.ttf
rename to twake/frontend/public/public/font/fontastic/tdrive-fontastic.ttf
diff --git a/twake/frontend/public/public/font/fontastic/twake-fontastic.woff b/twake/frontend/public/public/font/fontastic/tdrive-fontastic.woff
similarity index 100%
rename from twake/frontend/public/public/font/fontastic/twake-fontastic.woff
rename to twake/frontend/public/public/font/fontastic/tdrive-fontastic.woff
diff --git a/twake/frontend/public/public/viewer/PDFViewer/viewer.html b/twake/frontend/public/public/viewer/PDFViewer/viewer.html
index 0cfc1ebd..88e28511 100755
--- a/twake/frontend/public/public/viewer/PDFViewer/viewer.html
+++ b/twake/frontend/public/public/viewer/PDFViewer/viewer.html
@@ -552,11 +552,11 @@
   	}
 
   	function initPdf() {
-  		Twake.call(
+  		Tdrive.call(
   			"/drive/autoopen",
   			undefined,
   			function (file) {
-  				Twake.call(
+  				Tdrive.call(
   					"/self/title",
   					{title: file.name},
   					function () {
@@ -594,7 +594,7 @@
     }
 
   	function openFile() {
-  		Twake.call("/drive/explorer", {mode: "open", directoryId: 0, extensions: ["pdf"]}, (res) => openPdf(res));
+  		Tdrive.call("/drive/explorer", {mode: "open", directoryId: 0, extensions: ["pdf"]}, (res) => openPdf(res));
   	}
 
     function getUrlParameter(name) {
diff --git a/twake/frontend/src/app/atoms/logo/index.tsx b/twake/frontend/src/app/atoms/logo/index.tsx
index cc1086f8..056fa119 100644
--- a/twake/frontend/src/app/atoms/logo/index.tsx
+++ b/twake/frontend/src/app/atoms/logo/index.tsx
@@ -16,7 +16,7 @@ export const Logo = (props: PropsType): React.ReactElement => {
       <img
         className="mx-auto w-auto"
         src={`/public/img/logo/${size}x${size}.png`}
-        alt="Twake logo"
+        alt="Tdrive logo"
       />
     </div>
   );
diff --git a/twake/frontend/src/app/components/attachment-picker/attachment-picker.jsx b/twake/frontend/src/app/components/attachment-picker/attachment-picker.jsx
index c8e7bf46..fddfebeb 100755
--- a/twake/frontend/src/app/components/attachment-picker/attachment-picker.jsx
+++ b/twake/frontend/src/app/components/attachment-picker/attachment-picker.jsx
@@ -127,9 +127,9 @@ export default class AttachmentPicker extends Component {
                     type: 'menu',
                     icon: 'folder',
                     text: Languages.t(
-                      'components.attachmentpicker.from_twake',
+                      'components.attachmentpicker.from_tdrive',
                       [],
-                      'From Twake Documents',
+                      'From Tdrive Documents',
                     ),
                     submenu: [
                       {
diff --git a/twake/frontend/src/app/components/calendar/date-picker.jsx b/twake/frontend/src/app/components/calendar/date-picker.jsx
index f6f85cb1..e8d279df 100755
--- a/twake/frontend/src/app/components/calendar/date-picker.jsx
+++ b/twake/frontend/src/app/components/calendar/date-picker.jsx
@@ -4,7 +4,7 @@ import Tooltip from 'components/tooltip/tooltip.jsx';
 import moment from 'moment';
 import DateTimeUtils from 'app/features/global/utils/datetime.js';
 import UserService from 'app/features/users/services/current-user-service';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 import DayPicker from './day-picker/day-picker.jsx';
 import MenusManager from 'app/components/menus/menus-manager.jsx';
 import Input from 'components/inputs/input.jsx';
diff --git a/twake/frontend/src/app/components/components-tester/components-tester.jsx b/twake/frontend/src/app/components/components-tester/components-tester.jsx
index d93b1901..67bab63a 100755
--- a/twake/frontend/src/app/components/components-tester/components-tester.jsx
+++ b/twake/frontend/src/app/components/components-tester/components-tester.jsx
@@ -39,7 +39,7 @@ export default class ComponentsTester extends React.Component {
       <div className="componentTester">
         <div className="section">
           <div className="title">Test des composants</div>
-          <div className="subtitle">ctrl+alt+e pour revenir à Twake</div>
+          <div className="subtitle">ctrl+alt+e pour revenir à Tdrive</div>
         </div>
 
         <GroupInputs />
diff --git a/twake/frontend/src/app/components/debug/debug-state.tsx b/twake/frontend/src/app/components/debug/debug-state.tsx
index 45a66d8a..8e2484d1 100644
--- a/twake/frontend/src/app/components/debug/debug-state.tsx
+++ b/twake/frontend/src/app/components/debug/debug-state.tsx
@@ -2,13 +2,13 @@
 import React from 'react';
 import { useRecoilCallback } from 'recoil';
 
-interface TwakeDebugState {
+interface TdriveDebugState {
   dumpStateSnapshot?(): void;
   get?(key: string): void;
   getAllAtoms?(): void;
 }
 
-const twakeDebugState: TwakeDebugState = {};
+const tdriveDebugState: TdriveDebugState = {};
 
 const useDebugRecoilState = () => {
   /**
@@ -17,7 +17,7 @@ const useDebugRecoilState = () => {
    * @param {string} key - The key of the atom
    * @returns {void}
    */
-  twakeDebugState.get = useRecoilCallback(
+  tdriveDebugState.get = useRecoilCallback(
     ({ snapshot }) =>
       async (key: string) => {
         const allNodes = Array.from(snapshot.getNodes_UNSTABLE());
@@ -35,7 +35,7 @@ const useDebugRecoilState = () => {
    *
    * @returns {void}
    */
-  twakeDebugState.dumpStateSnapshot = useRecoilCallback(
+  tdriveDebugState.dumpStateSnapshot = useRecoilCallback(
     ({ snapshot }) =>
       async () => {
         const result: Record<string, any> = {
@@ -58,7 +58,7 @@ const useDebugRecoilState = () => {
         const link = document.createElement('a');
 
         link.href = url;
-        link.download = `twake-state-${new Date().toISOString()}.json`;
+        link.download = `tdrive-state-${new Date().toISOString()}.json`;
 
         link.click();
         URL.revokeObjectURL(url);
@@ -71,7 +71,7 @@ const useDebugRecoilState = () => {
    *
    * @returns {void}
    */
-  twakeDebugState.getAllAtoms = useRecoilCallback(
+  tdriveDebugState.getAllAtoms = useRecoilCallback(
     ({ snapshot }) =>
       async () => {
         for (const node of snapshot.getNodes_UNSTABLE()) {
@@ -83,7 +83,7 @@ const useDebugRecoilState = () => {
     [],
   );
 
-  (window as any).twakeDebugState = twakeDebugState;
+  (window as any).tdriveDebugState = tdriveDebugState;
 };
 
 
diff --git a/twake/frontend/src/app/components/desktop-redirect/index.tsx b/twake/frontend/src/app/components/desktop-redirect/index.tsx
index 2315bf22..67c38639 100644
--- a/twake/frontend/src/app/components/desktop-redirect/index.tsx
+++ b/twake/frontend/src/app/components/desktop-redirect/index.tsx
@@ -42,7 +42,7 @@ export default ({ children }: PropsType): React.ReactElement => {
       if (!shouldTryDesktop) return;
       setLoading(true);
       try {
-        const path = window.location.href.replace(/^https?/, 'twake');
+        const path = window.location.href.replace(/^https?/, 'tdrive');
         detectDesktopAppPresence(path).then(isDesktopAppPresent => {
           setLoading(false);
           if (isDesktopAppPresent) {
diff --git a/twake/frontend/src/app/components/drive/drive-element.jsx b/twake/frontend/src/app/components/drive/drive-element.jsx
index 58e21ed0..b8d49e90 100755
--- a/twake/frontend/src/app/components/drive/drive-element.jsx
+++ b/twake/frontend/src/app/components/drive/drive-element.jsx
@@ -339,7 +339,7 @@ export default class DriveElement extends React.Component {
               }
               app = app.app;
               DriveService.getFileUrlForEdition(
-                app.display?.twake?.files?.editor?.edition_url,
+                app.display?.tdrive?.files?.editor?.edition_url,
                 app,
                 this.state.element?.id,
                 url => {
diff --git a/twake/frontend/src/app/components/drive/file-picker/file-picker.jsx b/twake/frontend/src/app/components/drive/file-picker/file-picker.jsx
index c7ade5d6..a7c40b39 100755
--- a/twake/frontend/src/app/components/drive/file-picker/file-picker.jsx
+++ b/twake/frontend/src/app/components/drive/file-picker/file-picker.jsx
@@ -116,7 +116,7 @@ export default class FilePicker extends Component {
           )}{' '}
           {directory.parent_id
             ? directory.name
-            : Languages.t('app.identity?.name.twake_drive', [], 'Documents')}
+            : Languages.t('app.identity?.name.tdrive_drive', [], 'Documents')}
         </div>
         <div className="drive_view list">
           {directories.map((item, index) => (
diff --git a/twake/frontend/src/app/components/emojione/emojione.tsx b/twake/frontend/src/app/components/emojione/emojione.tsx
index 716394a6..a9e748fc 100755
--- a/twake/frontend/src/app/components/emojione/emojione.tsx
+++ b/twake/frontend/src/app/components/emojione/emojione.tsx
@@ -55,13 +55,13 @@ const Emojione = React.memo((props: Props) => {
     return <Icon type="trash" className="trash_emoji" />;
   }
 
-  if (props.type.substr(0, 7) === ':twake-') {
+  if (props.type.substr(0, 7) === ':tdrive-') {
     return (
       <i
         className={'emojione emoji-image ' + (props.className || '')}
         style={{
           backgroundImage:
-            "url('/public/img/twake-emoji/" + props.type.replace(/:/g, '') + ".png')",
+            "url('/public/img/tdrive-emoji/" + props.type.replace(/:/g, '') + ".png')",
         }}
       />
     );
diff --git a/twake/frontend/src/app/components/invitation/parts/allow-anyone-by-email.tsx b/twake/frontend/src/app/components/invitation/parts/allow-anyone-by-email.tsx
index 4b4cabcb..ccd9c28a 100644
--- a/twake/frontend/src/app/components/invitation/parts/allow-anyone-by-email.tsx
+++ b/twake/frontend/src/app/components/invitation/parts/allow-anyone-by-email.tsx
@@ -36,7 +36,7 @@ export default (): React.ReactElement => {
     <>
       <Subtitle className="mt-4 block">Automatically invite my business</Subtitle>
       <Info className="block">
-        If this is enabled, anyone creating a Twake account with your business email will
+        If this is enabled, anyone creating a Tdrive account with your business email will
         automatically be added to this company and this workspace.
       </Info>
       <div className="flex flex-row space-x-2 mt-1 bg-zinc-200 px-3 py-2 rounded-md border-transparent w-full h-9">
diff --git a/twake/frontend/src/app/components/menus/menus-manager.jsx b/twake/frontend/src/app/components/menus/menus-manager.jsx
index e40fd538..d5c4d655 100755
--- a/twake/frontend/src/app/components/menus/menus-manager.jsx
+++ b/twake/frontend/src/app/components/menus/menus-manager.jsx
@@ -1,6 +1,6 @@
 import Observable from 'app/deprecated/CollectionsV1/observable.js';
 import Number from 'app/features/global/utils/Numbers';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 
 /**
  *  Menus manager service, choose where to generate menu
diff --git a/twake/frontend/src/app/components/mobile-redirect/index.tsx b/twake/frontend/src/app/components/mobile-redirect/index.tsx
index 517e1e94..948177c7 100644
--- a/twake/frontend/src/app/components/mobile-redirect/index.tsx
+++ b/twake/frontend/src/app/components/mobile-redirect/index.tsx
@@ -101,9 +101,9 @@ export default function MobileRedirect(props: { children: ReactNode }) {
     <>
       <div className="mobile_redirect_container">
         <div className="open_on_mobile">
-          <span className="open_on_mobile_title">Open Twake in...</span>
+          <span className="open_on_mobile_title">Open Tdrive in...</span>
           <a className="open_on_mobile_actions" href={backToWebUrl()}>
-            <Smartphone /> <span>Twake App</span>
+            <Smartphone /> <span>Tdrive App</span>
             <span style={{ flex: 1 }}></span>
             <Button className="action_button" type="primary">
               Open
diff --git a/twake/frontend/src/app/components/new-version/new-version-component.tsx b/twake/frontend/src/app/components/new-version/new-version-component.tsx
index bf17a145..9895d1b4 100644
--- a/twake/frontend/src/app/components/new-version/new-version-component.tsx
+++ b/twake/frontend/src/app/components/new-version/new-version-component.tsx
@@ -5,7 +5,7 @@ import Api from 'app/features/global/framework/api-service';
 import Banner from 'app/components/banner/banner';
 import Emojione from 'app/components/emojione/emojione';
 import Languages from 'app/features/global/services/languages-service';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 import ModalManager from 'app/components/modal/modal-manager';
 import NewVersionModal from './new-version-modal';
 import { ServerInfoType } from 'app/features/global/services/init-service';
diff --git a/twake/frontend/src/app/components/on-boarding/company-status-component.tsx b/twake/frontend/src/app/components/on-boarding/company-status-component.tsx
index fb3a09db..2d6eb2f0 100644
--- a/twake/frontend/src/app/components/on-boarding/company-status-component.tsx
+++ b/twake/frontend/src/app/components/on-boarding/company-status-component.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import ModalManager from 'app/components/modal/modal-manager';
 import UserService from 'app/features/users/services/current-user-service';
-import WelcomeOnTwake from './popups/welcome-on-twake';
+import WelcomeOnTdrive from './popups/welcome-on-tdrive';
 import DepreciatedCollections from 'app/deprecated/CollectionsV1/Collections/Collections.js';
 import InitService from 'app/features/global/services/init-service';
 import Groups from 'app/deprecated/workspaces/groups.js';
@@ -46,7 +46,7 @@ const CompanyStatusComponent = (): JSX.Element => {
 
     if (isNewUser) {
       localStorage.setItem(`onboarding_${companyId}`, 'completed');
-      return ModalManager.open(<WelcomeOnTwake email={user.email} />, {
+      return ModalManager.open(<WelcomeOnTdrive email={user.email} />, {
         position: 'center',
         size: { width: '600px' },
       });
diff --git a/twake/frontend/src/app/components/on-boarding/popups/welcome-on-twake.tsx b/twake/frontend/src/app/components/on-boarding/popups/welcome-on-tdrive.tsx
similarity index 100%
rename from twake/frontend/src/app/components/on-boarding/popups/welcome-on-twake.tsx
rename to twake/frontend/src/app/components/on-boarding/popups/welcome-on-tdrive.tsx
diff --git a/twake/frontend/src/app/components/rich-text-editor/emojis-service.js b/twake/frontend/src/app/components/rich-text-editor/emojis-service.js
index 6053acb0..8bf3f4d0 100755
--- a/twake/frontend/src/app/components/rich-text-editor/emojis-service.js
+++ b/twake/frontend/src/app/components/rich-text-editor/emojis-service.js
@@ -1,6 +1,6 @@
 import emojis_json from 'emojione/emoji.json';
 
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 import { emojiIndex } from 'emoji-mart';
 
 class Emojis {
diff --git a/twake/frontend/src/app/components/rich-text-editor/plugins/commands/index.ts b/twake/frontend/src/app/components/rich-text-editor/plugins/commands/index.ts
index a9cc2512..87a675bb 100644
--- a/twake/frontend/src/app/components/rich-text-editor/plugins/commands/index.ts
+++ b/twake/frontend/src/app/components/rich-text-editor/plugins/commands/index.ts
@@ -35,7 +35,7 @@ const resolver = (
   getCompanyApplications(Groups.currentGroupId).forEach((app: Application) => {
     if (app) {
       commands = commands.concat(
-        (app.display?.twake?.chat?.commands || []).map(c => ({
+        (app.display?.tdrive?.chat?.commands || []).map(c => ({
           command: `/${app?.identity?.code} ${c.command}`,
           description: c.description,
         })),
diff --git a/twake/frontend/src/app/components/search-popup/parts/drive-item-result.tsx b/twake/frontend/src/app/components/search-popup/parts/drive-item-result.tsx
index 62695f8f..86c680eb 100644
--- a/twake/frontend/src/app/components/search-popup/parts/drive-item-result.tsx
+++ b/twake/frontend/src/app/components/search-popup/parts/drive-item-result.tsx
@@ -33,9 +33,9 @@ export default (props: { driveItem: DriveItem & { user?: UserType } }) => {
   const currentWorkspaceId = useRouterWorkspace();
   const companyApplications = useCompanyApplications();
   const [_, setParentId] = useRecoilState(DriveCurrentFolderAtom('root'));
-  const twakeDriveApplicationId =
+  const tdriveDriveApplicationId =
     companyApplications.applications.find(application => {
-      return application.identity.code === 'twake_drive';
+      return application.identity.code === 'tdrive_drive';
     })?.id || '';
   const file = props.driveItem;
   const name = file?.name;
@@ -96,7 +96,7 @@ export default (props: { driveItem: DriveItem & { user?: UserType } }) => {
           theme="outline"
           className="w-9 px-1.5 ml-2 rounded-full border-none"
           onClick={() => {
-            openDriveItem(file, currentWorkspaceId, twakeDriveApplicationId);
+            openDriveItem(file, currentWorkspaceId, tdriveDriveApplicationId);
             setParentId(file.parent_id);
             setOpen(false);
           }}
diff --git a/twake/frontend/src/app/components/twacode/pseudo-markdown-dictionary.tsx b/twake/frontend/src/app/components/twacode/pseudo-markdown-dictionary.tsx
index b9463ff6..5af617f0 100644
--- a/twake/frontend/src/app/components/twacode/pseudo-markdown-dictionary.tsx
+++ b/twake/frontend/src/app/components/twacode/pseudo-markdown-dictionary.tsx
@@ -89,7 +89,7 @@ export const DynamicComponent = ({
       if (url.indexOf('?') > 0) {
         separator = '&';
       }
-      url += separator + 'twake_user=' + UserService.getCurrentUser().id;
+      url += separator + 'tdrive_user=' + UserService.getCurrentUser().id;
     }
     return (
       // eslint-disable-next-line react/jsx-no-target-blank
diff --git a/twake/frontend/src/app/components/uploads/upload-manager.js b/twake/frontend/src/app/components/uploads/upload-manager.js
index ba0d164b..d15fc504 100755
--- a/twake/frontend/src/app/components/uploads/upload-manager.js
+++ b/twake/frontend/src/app/components/uploads/upload-manager.js
@@ -3,7 +3,7 @@ import Number from 'app/features/global/utils/Numbers';
 import DriveService from 'app/deprecated/Apps/Drive/Drive.js';
 import Collections from 'app/deprecated/CollectionsV1/Collections/Collections.js';
 import Resumable from 'app/features/files/utils/resumable.js';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 import Api from 'app/features/global/framework/api-service';
 import JWTStorage from 'app/features/auth/jwt-storage-service';
 
diff --git a/twake/frontend/src/app/deprecated/Apps/Calendar/Calendar.js b/twake/frontend/src/app/deprecated/Apps/Calendar/Calendar.js
index e557aa49..08b76d1d 100755
--- a/twake/frontend/src/app/deprecated/Apps/Calendar/Calendar.js
+++ b/twake/frontend/src/app/deprecated/Apps/Calendar/Calendar.js
@@ -1,6 +1,6 @@
 import Languages from 'app/features/global/services/languages-service';
 import Observable from 'app/deprecated/CollectionsV1/observable.js';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 import Collections from 'app/deprecated/CollectionsV1/Collections/Collections.js';
 import MediumPopupManager from 'app/components/modal/modal-manager';
 import Workspaces from 'app/deprecated/workspaces/workspaces.jsx';
diff --git a/twake/frontend/src/app/deprecated/Apps/Drive/Drive.js b/twake/frontend/src/app/deprecated/Apps/Drive/Drive.js
index cbf33a0f..0ac2c89d 100755
--- a/twake/frontend/src/app/deprecated/Apps/Drive/Drive.js
+++ b/twake/frontend/src/app/deprecated/Apps/Drive/Drive.js
@@ -8,7 +8,7 @@ import { getCompanyApplications } from 'app/features/applications/state/company-
 import Groups from 'app/deprecated/workspaces/groups.js';
 import _ from 'lodash';
 
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 
 class Drive extends Observable {
   constructor() {
@@ -521,23 +521,23 @@ class Drive extends Observable {
 
     const apps = getCompanyApplications(Groups.currentGroupId).filter(
       app =>
-        app.display?.twake?.files?.editor?.preview_url ||
-        app.display?.twake?.files?.editor?.edition_url,
+        app.display?.tdrive?.files?.editor?.preview_url ||
+        app.display?.tdrive?.files?.editor?.edition_url,
     );
 
     //Primary exts
     apps.forEach(app => {
       if (
-        (app.display?.twake?.files?.editor?.extensions || []).indexOf(
+        (app.display?.tdrive?.files?.editor?.extensions || []).indexOf(
           ((current.extension || '') + (current.url ? '.url' : '')).toLocaleLowerCase(),
         ) >= 0
       ) {
-        if (app.display?.twake?.files?.editor?.edition_url) {
+        if (app.display?.tdrive?.files?.editor?.edition_url) {
           editor_candidate.push({ app });
         }
-        if (app.display?.twake?.files?.editor?.preview_url) {
+        if (app.display?.tdrive?.files?.editor?.preview_url) {
           preview_candidate.push({
-            url: app.display?.twake?.files?.editor?.preview_url,
+            url: app.display?.tdrive?.files?.editor?.preview_url,
             app: app,
           });
         }
@@ -587,16 +587,16 @@ class Drive extends Observable {
     //Secondary ext
     apps.forEach(app => {
       if (
-        (app.display?.twake?.files?.editor?.extensions || []).indexOf(
+        (app.display?.tdrive?.files?.editor?.extensions || []).indexOf(
           ((current.extension || '') + (current.url ? '.url' : '')).toLocaleLowerCase(),
         ) >= 0
       ) {
-        if (app.display?.twake?.files?.editor?.edition_url) {
+        if (app.display?.tdrive?.files?.editor?.edition_url) {
           editor_candidate.push({ app });
         }
-        if (app.display?.twake?.files?.editor?.preview_url) {
+        if (app.display?.tdrive?.files?.editor?.preview_url) {
           preview_candidate.push({
-            url: app.display?.twake?.files?.editor?.preview_url,
+            url: app.display?.tdrive?.files?.editor?.preview_url,
             app: app,
           });
         }
diff --git a/twake/frontend/src/app/deprecated/Apps/Tasks/Tasks.js b/twake/frontend/src/app/deprecated/Apps/Tasks/Tasks.js
index e359d505..15d7a1c2 100755
--- a/twake/frontend/src/app/deprecated/Apps/Tasks/Tasks.js
+++ b/twake/frontend/src/app/deprecated/Apps/Tasks/Tasks.js
@@ -1,5 +1,5 @@
 import Observable from 'app/deprecated/CollectionsV1/observable.js';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 import Collections from 'app/deprecated/CollectionsV1/Collections/Collections.js';
 import MediumPopupManager from 'app/components/modal/modal-manager';
 import Workspaces from 'app/deprecated/workspaces/workspaces.jsx';
diff --git a/twake/frontend/src/app/deprecated/CollectionsV1/Collections/SecuredConnection.js b/twake/frontend/src/app/deprecated/CollectionsV1/Collections/SecuredConnection.js
index 09f0a71b..5870ea70 100755
--- a/twake/frontend/src/app/deprecated/CollectionsV1/Collections/SecuredConnection.js
+++ b/twake/frontend/src/app/deprecated/CollectionsV1/Collections/SecuredConnection.js
@@ -5,7 +5,7 @@ import sha256 from 'crypto-js/sha256';
 /** SecuredConnection
  * Create websockets encrypted connection
  */
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 
 export default class SecuredConnection {
   constructor(route, options, callback, http_options, collectionId) {
diff --git a/twake/frontend/src/app/deprecated/Configurators/ConfiguratorsManager.js b/twake/frontend/src/app/deprecated/Configurators/ConfiguratorsManager.js
index 51e1b64f..c8063339 100755
--- a/twake/frontend/src/app/deprecated/Configurators/ConfiguratorsManager.js
+++ b/twake/frontend/src/app/deprecated/Configurators/ConfiguratorsManager.js
@@ -1,6 +1,6 @@
 import Observable from 'app/deprecated/CollectionsV1/observable.js';
 
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 
 class ConfiguratorsManager extends Observable {
   constructor() {
diff --git a/twake/frontend/src/app/deprecated/SelectionsManager/SelectionsManager.js b/twake/frontend/src/app/deprecated/SelectionsManager/SelectionsManager.js
index 233ffcc7..c04a909e 100755
--- a/twake/frontend/src/app/deprecated/SelectionsManager/SelectionsManager.js
+++ b/twake/frontend/src/app/deprecated/SelectionsManager/SelectionsManager.js
@@ -1,6 +1,6 @@
 import Observable from 'app/deprecated/CollectionsV1/observable.js';
 
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 
 class SelectionsManager extends Observable {
   constructor() {
diff --git a/twake/frontend/src/app/deprecated/login/account.js b/twake/frontend/src/app/deprecated/login/account.js
index a247461a..cbee43be 100755
--- a/twake/frontend/src/app/deprecated/login/account.js
+++ b/twake/frontend/src/app/deprecated/login/account.js
@@ -5,7 +5,7 @@ import Login from '../../features/auth/login-service';
 import { getUser } from '../../features/users/hooks/use-user-list';
 
 /**
- * This service is depreciated as Twake will exclusively use Console in the future
+ * This service is depreciated as Tdrive will exclusively use Console in the future
  */
 class Account {
   notify() {
diff --git a/twake/frontend/src/app/deprecated/popupManager/popupManager.js b/twake/frontend/src/app/deprecated/popupManager/popupManager.js
index 1c42fe24..57f2e63e 100755
--- a/twake/frontend/src/app/deprecated/popupManager/popupManager.js
+++ b/twake/frontend/src/app/deprecated/popupManager/popupManager.js
@@ -2,7 +2,7 @@ import Observable from 'app/deprecated/CollectionsV1/observable.js';
 import MenusManager from 'app/components/menus/menus-manager.jsx';
 import WindowService from 'app/features/global/utils/window';
 
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 
 class PopupService extends Observable {
   constructor() {
diff --git a/twake/frontend/src/app/deprecated/search/search.js b/twake/frontend/src/app/deprecated/search/search.js
index 5ca192b0..48a487ad 100755
--- a/twake/frontend/src/app/deprecated/search/search.js
+++ b/twake/frontend/src/app/deprecated/search/search.js
@@ -11,7 +11,7 @@ import DriveService from 'app/deprecated/Apps/Drive/Drive.js';
 import CalendarService from 'app/deprecated/Apps/Calendar/Calendar.js';
 import TasksService from 'app/deprecated/Apps/Tasks/Tasks.js';
 
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 
 class SearchService extends Observable {
   constructor() {
diff --git a/twake/frontend/src/app/deprecated/uploadManager/upload-manager.js b/twake/frontend/src/app/deprecated/uploadManager/upload-manager.js
index 5727a13d..ba0e8dd4 100755
--- a/twake/frontend/src/app/deprecated/uploadManager/upload-manager.js
+++ b/twake/frontend/src/app/deprecated/uploadManager/upload-manager.js
@@ -1,6 +1,6 @@
 import Observable from 'app/deprecated/CollectionsV1/observable.js';
 
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 
 class UploadManager extends Observable {
   constructor() {
diff --git a/twake/frontend/src/app/deprecated/user/CurrentUser.ts b/twake/frontend/src/app/deprecated/user/CurrentUser.ts
index 3563696b..1323825c 100755
--- a/twake/frontend/src/app/deprecated/user/CurrentUser.ts
+++ b/twake/frontend/src/app/deprecated/user/CurrentUser.ts
@@ -10,7 +10,7 @@ import Number from 'app/features/global/utils/Numbers';
 import AlertManager from 'app/features/global/services/alert-manager-service';
 import Languages from 'app/features/global/services/languages-service';
 import JWTStorage from 'app/features/auth/jwt-storage-service';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 import { useCurrentUser } from 'app/features/users/hooks/use-current-user';
 import UserAPIClient from '../../features/users/api/user-api-client';
 import { getUser } from 'app/features/users/hooks/use-user-list';
diff --git a/twake/frontend/src/app/deprecated/user/notification_parameters.js b/twake/frontend/src/app/deprecated/user/notification_parameters.js
index 2df0c552..b8806299 100755
--- a/twake/frontend/src/app/deprecated/user/notification_parameters.js
+++ b/twake/frontend/src/app/deprecated/user/notification_parameters.js
@@ -6,7 +6,7 @@ import Login from 'app/features/auth/login-service';
 import Collections from 'app/deprecated/CollectionsV1/Collections/Collections.js';
 import AlertManager from 'app/features/global/services/alert-manager-service';
 
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 
 /**
  * FIXME: This service seems still used by some components but we now have ./NotificationPreferences one which seems to overlap...
diff --git a/twake/frontend/src/app/deprecated/websocket/websocket.js b/twake/frontend/src/app/deprecated/websocket/websocket.js
index 4c66bdf7..3e7cf139 100755
--- a/twake/frontend/src/app/deprecated/websocket/websocket.js
+++ b/twake/frontend/src/app/deprecated/websocket/websocket.js
@@ -2,7 +2,7 @@ import Number from 'app/features/global/utils/Numbers';
 import Observable from 'app/deprecated/CollectionsV1/observable.js';
 import LoginService from 'app/features/auth/login-service';
 import Logger from 'app/features/global/framework/logger-service';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 import WebSocket from '../../features/global/types/websocket-types';
 
 /**
diff --git a/twake/frontend/src/app/deprecated/workspaces/groups.js b/twake/frontend/src/app/deprecated/workspaces/groups.js
index 3c5e5c18..ce2a0756 100755
--- a/twake/frontend/src/app/deprecated/workspaces/groups.js
+++ b/twake/frontend/src/app/deprecated/workspaces/groups.js
@@ -9,7 +9,7 @@ import $ from 'jquery';
 import JWTStorage from 'app/features/auth/jwt-storage-service';
 import CompanyAPIClient from '../../features/companies/api/company-api-client';
 import UserService from 'app/features/users/services/current-user-service';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 
 class Groups extends Observable {
   constructor() {
diff --git a/twake/frontend/src/app/deprecated/workspaces/workspaces.jsx b/twake/frontend/src/app/deprecated/workspaces/workspaces.jsx
index cd64864c..6bbef39e 100755
--- a/twake/frontend/src/app/deprecated/workspaces/workspaces.jsx
+++ b/twake/frontend/src/app/deprecated/workspaces/workspaces.jsx
@@ -10,7 +10,7 @@ import ConsoleService from 'app/features/console/services/console-service';
 import Api from 'app/features/global/framework/api-service';
 import LocalStorage from 'app/features/global/framework/local-storage-service';
 import Logger from 'app/features/global/framework/logger-service';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 import WindowService from 'app/features/global/utils/window';
 import RouterServices from 'app/features/router/services/router-service';
 import workspacesUsers from 'app/features/workspace-members/services/workspace-members-service';
diff --git a/twake/frontend/src/app/deprecated/workspaces/workspaces_apps.jsx b/twake/frontend/src/app/deprecated/workspaces/workspaces_apps.jsx
index 00fe5efb..41d8ec33 100755
--- a/twake/frontend/src/app/deprecated/workspaces/workspaces_apps.jsx
+++ b/twake/frontend/src/app/deprecated/workspaces/workspaces_apps.jsx
@@ -6,7 +6,7 @@ import ws from 'app/deprecated/websocket/websocket.js';
 import Collections from 'app/deprecated/CollectionsV1/Collections/Collections.js';
 import Groups from './groups.js';
 import Workspaces from './workspaces.jsx';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 import Icon from 'app/components/icon/icon';
 import { getUser } from 'app/features/users/hooks/use-user-list';
 import Login from 'app/features/auth/login-service';
@@ -218,11 +218,11 @@ class WorkspacesApps extends Observable {
   getAppIcon(app, feather = false) {
     if (app && app?.identity?.code) {
       switch (app?.identity?.code.toLocaleLowerCase()) {
-        case 'twake_calendar':
+        case 'tdrive_calendar':
           return feather ? Calendar : 'calendar-alt';
-        case 'twake_drive':
+        case 'tdrive_drive':
           return feather ? Folder : 'folder';
-        case 'twake_tasks':
+        case 'tdrive_tasks':
           return feather ? CheckSquare : 'check-square';
         default:
           return app.identity?.icon || (feather ? Hexagon : 'puzzle-piece');
diff --git a/twake/frontend/src/app/environment/environment.ts.dist b/twake/frontend/src/app/environment/environment.ts.dist
index e9d0bea7..7a4174a7 100755
--- a/twake/frontend/src/app/environment/environment.ts.dist
+++ b/twake/frontend/src/app/environment/environment.ts.dist
@@ -4,18 +4,18 @@ export default {
   front_root_url: (document.location.protocol || "http") + '//' + document.location.host,
   api_root_url: (document.location.protocol || "http") + '//' + document.location.host,
   websocket_url: (document.location.protocol || "http").replace("http", "ws") + '//' + document.location.host,
-  mobile_appstore: 'https://apps.apple.com/fr/app/twake/id1588764852?l=en',
-  mobile_googleplay: 'https://play.google.com/store/apps/details?id=com.twake.twake&gl=FR'
+  mobile_appstore: 'https://apps.apple.com/fr/app/tdrive/id1588764852?l=en',
+  mobile_googleplay: 'https://play.google.com/store/apps/details?id=com.tdrive.tdrive&gl=FR'
 };
 
 /*
 export default {
   env_dev: false,
-  front_root_url: 'https://web.twake.app',
-  api_root_url: 'https://api.twake.app',
-  websocket_url: 'wss://api.twake.app'
+  front_root_url: 'https://web.tdrive.app',
+  api_root_url: 'https://api.tdrive.app',
+  websocket_url: 'wss://api.tdrive.app'
 };
 
 In this form:
-"export default { env_dev: false, front_root_url: 'https://web.twake.app', api_root_url: 'https://web.twake.app', websocket_url: 'wss://web.twake.app' };"
+"export default { env_dev: false, front_root_url: 'https://web.tdrive.app', api_root_url: 'https://web.tdrive.app', websocket_url: 'wss://web.tdrive.app' };"
 */
diff --git a/twake/frontend/src/app/features/applications/api/applications-api-client.ts b/twake/frontend/src/app/features/applications/api/applications-api-client.ts
index 95c92d28..837b0ec6 100644
--- a/twake/frontend/src/app/features/applications/api/applications-api-client.ts
+++ b/twake/frontend/src/app/features/applications/api/applications-api-client.ts
@@ -1,12 +1,12 @@
 import Api from '../../global/framework/api-service';
-import { TwakeService } from '../../global/framework/registry-decorator-service';
+import { TdriveService } from '../../global/framework/registry-decorator-service';
 import { Application } from 'app/features/applications/types/application';
 
 type DeleteApplicationResponse = {
   status: 'success' | 'error';
 };
 
-@TwakeService('ApplicationsAPIClientService')
+@TdriveService('ApplicationsAPIClientService')
 class ApplicationsAPIClientService {
   prefix = '/internal/services/applications/v1/applications';
   /**
diff --git a/twake/frontend/src/app/features/applications/api/company-applications-api-client.ts b/twake/frontend/src/app/features/applications/api/company-applications-api-client.ts
index 4b03e3e9..aeaff57f 100644
--- a/twake/frontend/src/app/features/applications/api/company-applications-api-client.ts
+++ b/twake/frontend/src/app/features/applications/api/company-applications-api-client.ts
@@ -1,11 +1,11 @@
 import Api from '../../global/framework/api-service';
-import { TwakeService } from '../../global/framework/registry-decorator-service';
+import { TdriveService } from '../../global/framework/registry-decorator-service';
 import { Application } from 'app/features/applications/types/application';
 import { WebsocketRoom } from '../../global/types/websocket-types';
 
 const PREFIX = '/internal/services/applications/v1/companies';
 
-@TwakeService('CompanyApplicationsAPIClientService')
+@TdriveService('CompanyApplicationsAPIClientService')
 class CompanyApplicationsAPIClient {
   private realtime: Map<string, WebsocketRoom[]> = new Map();
 
diff --git a/twake/frontend/src/app/features/applications/hooks/temp-fix.ts b/twake/frontend/src/app/features/applications/hooks/temp-fix.ts
index 2b4f2dc3..8b597266 100644
--- a/twake/frontend/src/app/features/applications/hooks/temp-fix.ts
+++ b/twake/frontend/src/app/features/applications/hooks/temp-fix.ts
@@ -4,30 +4,30 @@ export const replaceOnlyOfficeForCanary = (applications: Application[]) => {
   return applications.map(application => {
     if (
       application?.identity?.code === 'only_office' &&
-      !application.display?.twake?.files?.editor?.preview_url?.includes('plugins.twake.app')
+      !application.display?.tdrive?.files?.editor?.preview_url?.includes('plugins.tdrive.app')
     ) {
       return {
         ...application,
         display: {
-          twake: {
+          tdrive: {
             version: 1,
             files: {
               editor: {
-                preview_url: 'https://plugins.twake.app/plugins/onlyoffice/?preview=1',
-                edition_url: 'https://plugins.twake.app/plugins/onlyoffice/',
+                preview_url: 'https://plugins.tdrive.app/plugins/onlyoffice/?preview=1',
+                edition_url: 'https://plugins.tdrive.app/plugins/onlyoffice/',
                 empty_files: [
                   {
-                    url: 'https://plugins.twake.app/plugins/onlyoffice/assets/empty.docx',
+                    url: 'https://plugins.tdrive.app/plugins/onlyoffice/assets/empty.docx',
                     filename: 'Untitled.docx',
                     name: 'ONLYOFFICE Word Document',
                   },
                   {
-                    url: 'https://plugins.twake.app/plugins/onlyoffice/assets/empty.xlsx',
+                    url: 'https://plugins.tdrive.app/plugins/onlyoffice/assets/empty.xlsx',
                     filename: 'Untitled.xlsx',
                     name: 'ONLYOFFICE Excel Document',
                   },
                   {
-                    url: 'https://plugins.twake.app/plugins/onlyoffice/assets/empty.pptx',
+                    url: 'https://plugins.tdrive.app/plugins/onlyoffice/assets/empty.pptx',
                     filename: 'Untitled.pptx',
                     name: 'ONLYOFFICE PowerPoint Document',
                   },
diff --git a/twake/frontend/src/app/features/applications/services/application-service.ts b/twake/frontend/src/app/features/applications/services/application-service.ts
index 9b09fdcf..9fbc240c 100644
--- a/twake/frontend/src/app/features/applications/services/application-service.ts
+++ b/twake/frontend/src/app/features/applications/services/application-service.ts
@@ -16,7 +16,7 @@ class Application {
   }
 
   /**
-   * Start the Twake application: Starting all the required services for the given user
+   * Start the Tdrive application: Starting all the required services for the given user
    */
   async start(user: UserType): Promise<void> {
     if (this.started) {
diff --git a/twake/frontend/src/app/features/applications/types/application.ts b/twake/frontend/src/app/features/applications/types/application.ts
index 3a6197a3..69913845 100644
--- a/twake/frontend/src/app/features/applications/types/application.ts
+++ b/twake/frontend/src/app/features/applications/types/application.ts
@@ -1,6 +1,6 @@
 /**
  * DEPRECATED
- * We should remove this when we are sure that new application format is implemented everywhere in Twake
+ * We should remove this when we are sure that new application format is implemented everywhere in Tdrive
  */
 export type AppType = { [key: string]: unknown };
 
@@ -111,7 +111,7 @@ export type StandalonePlugin = {
 };
 
 export type ApplicationDisplay = {
-  twake?: {
+  tdrive?: {
     version?: number;
 
     /**
diff --git a/twake/frontend/src/app/features/applications/utils/application.ts b/twake/frontend/src/app/features/applications/utils/application.ts
index 46c099a0..210339e9 100644
--- a/twake/frontend/src/app/features/applications/utils/application.ts
+++ b/twake/frontend/src/app/features/applications/utils/application.ts
@@ -25,7 +25,7 @@ const defaultApplicationPayload: Application = {
     hooks: [],
   },
   display: {
-    twake: {
+    tdrive: {
       version: 1,
 
       files: {
diff --git a/twake/frontend/src/app/features/auth/auth-service.ts b/twake/frontend/src/app/features/auth/auth-service.ts
index 9c41bb0c..7d977ad1 100644
--- a/twake/frontend/src/app/features/auth/auth-service.ts
+++ b/twake/frontend/src/app/features/auth/auth-service.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-empty-function */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { TwakeService } from 'app/features/global/framework/registry-decorator-service';
+import { TdriveService } from 'app/features/global/framework/registry-decorator-service';
 import InitService, {
   ConsoleConfiguration,
   InternalConfiguration,
@@ -18,7 +18,7 @@ import JWT, { JWTDataType } from 'app/features/auth/jwt-storage-service';
 import UserAPIClient from '../../features/users/api/user-api-client';
 import Application from 'app/features/applications/services/application-service';
 import LocalStorage from 'app/features/global/framework/local-storage-service';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 
 type AccountType = 'remote' | 'internal';
 export type LoginState =
@@ -32,7 +32,7 @@ export type LoginState =
   | 'logout';
 type InitState = '' | 'initializing' | 'initialized';
 
-@TwakeService('AuthService')
+@TdriveService('AuthService')
 class AuthService {
   private provider: AuthProvider<any, any, any> | null = null;
   private logger: Logger.Logger;
diff --git a/twake/frontend/src/app/features/auth/jwt-storage-service.ts b/twake/frontend/src/app/features/auth/jwt-storage-service.ts
index 21d126a0..22ec52be 100755
--- a/twake/frontend/src/app/features/auth/jwt-storage-service.ts
+++ b/twake/frontend/src/app/features/auth/jwt-storage-service.ts
@@ -3,7 +3,7 @@ import LocalStorage from 'app/features/global/framework/local-storage-service';
 import LoginService from 'app/features/auth/login-service';
 import WindowService from 'app/features/global/utils/window';
 import ConsoleAPIClient from 'app/features/console/api/console-api-client';
-import { TwakeService } from '../global/framework/registry-decorator-service';
+import { TdriveService } from '../global/framework/registry-decorator-service';
 import Logger from '../global/framework/logger-service';
 
 export type JWTDataType = {
@@ -20,7 +20,7 @@ if ((WindowService.findGetParameter('mobile_login') as any) === '1') {
   LocalStorage.setItem('mobile_login', '1');
 }
 
-@TwakeService('JWTStorageService')
+@TdriveService('JWTStorageService')
 class JWTStorage {
   private timeDelta = 5 * 60;
   private jwtData: JWTDataType = {
diff --git a/twake/frontend/src/app/features/auth/login-service.ts b/twake/frontend/src/app/features/auth/login-service.ts
index c2b3532a..3b1a5c92 100755
--- a/twake/frontend/src/app/features/auth/login-service.ts
+++ b/twake/frontend/src/app/features/auth/login-service.ts
@@ -3,7 +3,7 @@
 import Logger from 'app/features/global/framework/logger-service';
 import Observable from 'app/deprecated/CollectionsV1/observable.js';
 import WindowState from 'app/features/global/utils/window';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 import RouterServices from '../router/services/router-service';
 import LocalStorage from 'app/features/global/framework/local-storage-service';
 import AuthService from 'app/features/auth/auth-service';
diff --git a/twake/frontend/src/app/features/auth/provider/internal/internal-auth-provider-service.ts b/twake/frontend/src/app/features/auth/provider/internal/internal-auth-provider-service.ts
index 504e08f3..ddc34fe8 100644
--- a/twake/frontend/src/app/features/auth/provider/internal/internal-auth-provider-service.ts
+++ b/twake/frontend/src/app/features/auth/provider/internal/internal-auth-provider-service.ts
@@ -1,9 +1,9 @@
 import Logger from 'app/features/global/framework/logger-service';
 import { InternalConfiguration } from '../../../global/services/init-service';
 import Observable from '../../../../deprecated/Observable/Observable';
-import { TwakeService } from '../../../global/framework/registry-decorator-service';
+import { TdriveService } from '../../../global/framework/registry-decorator-service';
 import { AuthProvider, InitParameters } from '../auth-provider';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 import RouterService from 'app/features/router/services/router-service';
 import ConsoleAPIClient from 'app/features/console/api/console-api-client';
 
@@ -25,7 +25,7 @@ export type SignOutParameters = {
   reload: boolean;
 };
 
-@TwakeService('InternalAuthProvider')
+@TdriveService('InternalAuthProvider')
 export default class InternalAuthProviderService
   extends Observable
   implements AuthProvider<SignInParameters, SignOutParameters, SignUpParameters>
diff --git a/twake/frontend/src/app/features/auth/provider/oidc/oidc-auth-provider-service.ts b/twake/frontend/src/app/features/auth/provider/oidc/oidc-auth-provider-service.ts
index e8ecf3c6..8aed1ba1 100644
--- a/twake/frontend/src/app/features/auth/provider/oidc/oidc-auth-provider-service.ts
+++ b/twake/frontend/src/app/features/auth/provider/oidc/oidc-auth-provider-service.ts
@@ -5,7 +5,7 @@ import { ConsoleConfiguration } from '../../../global/services/init-service';
 import Observable from '../../../../deprecated/Observable/Observable';
 import Logger from 'app/features/global/framework/logger-service';
 import { getAsFrontUrl } from 'app/features/global/utils/URLUtils';
-import { TwakeService } from '../../../global/framework/registry-decorator-service';
+import { TdriveService } from '../../../global/framework/registry-decorator-service';
 import EnvironmentService from '../../../global/framework/environment-service';
 import { AuthProvider, InitParameters } from '../auth-provider';
 import ConsoleService from 'app/features/console/services/console-service';
@@ -16,7 +16,7 @@ const OIDC_CALLBACK_URL = '/oidccallback';
 const OIDC_SIGNOUT_URL = '/signout';
 const OIDC_SILENT_URL = '/oidcsilent';
 
-@TwakeService('OIDCAuthProvider')
+@TdriveService('OIDCAuthProvider')
 export default class OIDCAuthProviderService
   extends Observable
   implements AuthProvider<unknown, unknown, unknown>
diff --git a/twake/frontend/src/app/features/channel-members-search/api/members-api-client.ts b/twake/frontend/src/app/features/channel-members-search/api/members-api-client.ts
index ae3889ff..1ce6a47e 100644
--- a/twake/frontend/src/app/features/channel-members-search/api/members-api-client.ts
+++ b/twake/frontend/src/app/features/channel-members-search/api/members-api-client.ts
@@ -1,6 +1,6 @@
 import { ChannelMemberType } from 'app/features/channel-members-search/types/channel-members';
 import Api from 'app/features/global/framework/api-service';
-import { TwakeService } from 'app/features/global/framework/registry-decorator-service';
+import { TdriveService } from 'app/features/global/framework/registry-decorator-service';
 import { WebsocketRoom } from 'app/features/global/types/websocket-types';
 import {
   ParamsChannelMember,
@@ -9,7 +9,7 @@ import {
   ResponseChannelMemberTypeList,
 } from '../types/channel-members';
 
-@TwakeService('ChannelMemberAPIClientService')
+@TdriveService('ChannelMemberAPIClientService')
 class ChannelMembersApiClient {
   private readonly apiBaseUrl: string = '/internal/services/channels/v1/companies';
   private _realtime: WebsocketRoom = { room: '', token: '' };
diff --git a/twake/frontend/src/app/features/channel-members-search/api/pending-emails-api-client.ts b/twake/frontend/src/app/features/channel-members-search/api/pending-emails-api-client.ts
index 51db93de..1be6122a 100644
--- a/twake/frontend/src/app/features/channel-members-search/api/pending-emails-api-client.ts
+++ b/twake/frontend/src/app/features/channel-members-search/api/pending-emails-api-client.ts
@@ -1,8 +1,8 @@
 import Api from "app/features/global/framework/api-service";
-import { TwakeService } from "app/features/global/framework/registry-decorator-service";
+import { TdriveService } from "app/features/global/framework/registry-decorator-service";
 import { ChannelPendingEmail, ChannelPendingEmailResponse, ParamsChannelMember, PayloadChannelPendingEmail, ResponseChannelPendingEmail, ResponseDeletePendingEmailResponse } from "../types/channel-members";
 
-@TwakeService('ChannelPendingEmailMemberAPIClientService')
+@TdriveService('ChannelPendingEmailMemberAPIClientService')
 class ChannelPendingEmailApiClient {
     private readonly apiBaseUrl: string = '/internal/services/channels/v1/companies';
 
diff --git a/twake/frontend/src/app/features/channel-members/api/channel-members-api-client.ts b/twake/frontend/src/app/features/channel-members/api/channel-members-api-client.ts
index 5051b438..335b3bff 100644
--- a/twake/frontend/src/app/features/channel-members/api/channel-members-api-client.ts
+++ b/twake/frontend/src/app/features/channel-members/api/channel-members-api-client.ts
@@ -1,5 +1,5 @@
 import Api from '../../global/framework/api-service';
-import { TwakeService } from '../../global/framework/registry-decorator-service';
+import { TdriveService } from '../../global/framework/registry-decorator-service';
 import {
   ChannelMemberRole,
   ChannelMemberType,
@@ -10,7 +10,7 @@ import { ChannelMemberReadSectionType } from '../types/channel-member-read-secti
 type ChannelMembersSaveRequest = { resource: Partial<ChannelMemberType> };
 type ChannelMembersSaveResponse = { resource: ChannelMemberType };
 
-@TwakeService('ChannelMembersAPIClientService')
+@TdriveService('ChannelMembersAPIClientService')
 class ChannelCurrentMemberAPIClientService {
   private readonly prefix = '/internal/services/channels/v1/companies';
   private realtime: Map<
diff --git a/twake/frontend/src/app/features/channels/api/channel-api-client.ts b/twake/frontend/src/app/features/channels/api/channel-api-client.ts
index 35a0a271..7f6a92d8 100644
--- a/twake/frontend/src/app/features/channels/api/channel-api-client.ts
+++ b/twake/frontend/src/app/features/channels/api/channel-api-client.ts
@@ -1,6 +1,6 @@
 import Api from '../../global/framework/api-service';
 import { ChannelType } from 'app/features/channels/types/channel';
-import { TwakeService } from '../../global/framework/registry-decorator-service';
+import { TdriveService } from '../../global/framework/registry-decorator-service';
 import { delayRequest } from 'app/features/global/utils/managedSearchRequest';
 import { removeBadgesNow } from 'app/features/users/hooks/use-notifications';
 
@@ -14,7 +14,7 @@ export type SearchOptions = {
   limit?: number;
 };
 
-@TwakeService('ChannelAPIClientService')
+@TdriveService('ChannelAPIClientService')
 class ChannelAPIClientService {
   private logger = Logger.getLogger('ChannelAPIClientService');
 
diff --git a/twake/frontend/src/app/features/channels/api/channels-mine-api-client.ts b/twake/frontend/src/app/features/channels/api/channels-mine-api-client.ts
index b66b0238..794c8be6 100644
--- a/twake/frontend/src/app/features/channels/api/channels-mine-api-client.ts
+++ b/twake/frontend/src/app/features/channels/api/channels-mine-api-client.ts
@@ -1,6 +1,6 @@
 import Api from '../../global/framework/api-service';
 import { ChannelType } from 'app/features/channels/types/channel';
-import { TwakeService } from '../../global/framework/registry-decorator-service';
+import { TdriveService } from '../../global/framework/registry-decorator-service';
 import { WebsocketRoom } from '../../global/types/websocket-types';
 
 type ChannelsMineGetResponse = { resources: ChannelType[]; websockets: WebsocketRoom[] };
@@ -10,7 +10,7 @@ type ChannelsMineDeleteBaseResponse = {
   message: string;
 };
 
-@TwakeService('ChannelsMineAPIClientService')
+@TdriveService('ChannelsMineAPIClientService')
 class ChannelsMineAPIClient {
   private readonly prefix = '/internal/services/channels/v1/companies';
   private readonly realtime: Map<string, WebsocketRoom[]> = new Map();
diff --git a/twake/frontend/src/app/features/channels/api/channels-reachable-api-client.ts b/twake/frontend/src/app/features/channels/api/channels-reachable-api-client.ts
index ae9645e3..32df1ed2 100644
--- a/twake/frontend/src/app/features/channels/api/channels-reachable-api-client.ts
+++ b/twake/frontend/src/app/features/channels/api/channels-reachable-api-client.ts
@@ -5,10 +5,10 @@ import {
 } from 'app/features/channels/types/channels-reachable-types';
 import Api from '../../global/framework/api-service';
 import { ChannelType } from 'app/features/channels/types/channel';
-import { TwakeService } from '../../global/framework/registry-decorator-service';
+import { TdriveService } from '../../global/framework/registry-decorator-service';
 import { ChannelMemberType } from 'app/features/channel-members/types/channel-member-types';
 
-@TwakeService('ChannelsReachableAPIClientService')
+@TdriveService('ChannelsReachableAPIClientService')
 class ChannelsReachableAPIClientService {
   private readonly prefix = '/internal/services/channels/v1/companies';
 
diff --git a/twake/frontend/src/app/features/companies/api/company-api-client.ts b/twake/frontend/src/app/features/companies/api/company-api-client.ts
index 6e056e94..79507aa8 100644
--- a/twake/frontend/src/app/features/companies/api/company-api-client.ts
+++ b/twake/frontend/src/app/features/companies/api/company-api-client.ts
@@ -1,7 +1,7 @@
 import { CompanyType } from 'app/features/companies/types/company';
 import { WorkspaceType } from 'app/features/workspaces/types/workspace';
 import Api from '../../global/framework/api-service';
-import { TwakeService } from '../../global/framework/registry-decorator-service';
+import { TdriveService } from '../../global/framework/registry-decorator-service';
 import { WebsocketRoom } from '../../global/types/websocket-types';
 
 const PREFIX = '/internal/services/users/v1';
@@ -12,7 +12,7 @@ export type UpdateWorkspaceBody = {
   resource: WorkspaceUpdateResource;
 };
 
-@TwakeService('CompanyAPIClientService')
+@TdriveService('CompanyAPIClientService')
 class CompanyAPIClient {
   private realtime: Map<string, WebsocketRoom> = new Map();
 
diff --git a/twake/frontend/src/app/features/companies/types/company.ts b/twake/frontend/src/app/features/companies/types/company.ts
index ceed04a9..5606d46a 100644
--- a/twake/frontend/src/app/features/companies/types/company.ts
+++ b/twake/frontend/src/app/features/companies/types/company.ts
@@ -26,7 +26,7 @@ export type CompanyStatsObjectType = {
   total_members: number;
   total_guests: number;
   total_messages: number;
-  //Will be completed with Twake specific stats
+  //Will be completed with Tdrive specific stats
 };
 
 export type CompanyPlanObjectType = {
diff --git a/twake/frontend/src/app/features/console/api/console-api-client.ts b/twake/frontend/src/app/features/console/api/console-api-client.ts
index a3d52f69..b21b2d21 100644
--- a/twake/frontend/src/app/features/console/api/console-api-client.ts
+++ b/twake/frontend/src/app/features/console/api/console-api-client.ts
@@ -1,5 +1,5 @@
 import Api from 'app/features/global/framework/api-service';
-import { TwakeService } from 'app/features/global/framework/registry-decorator-service';
+import { TdriveService } from 'app/features/global/framework/registry-decorator-service';
 import JWTStorage, { JWTDataType } from 'app/features/auth/jwt-storage-service';
 
 type LoginParams = {
@@ -16,7 +16,7 @@ type SignupParams = {
   username: string;
 };
 
-@TwakeService('ConsoleAPIClientService')
+@TdriveService('ConsoleAPIClientService')
 class ConsoleAPIClient {
   login(params: LoginParams, disableJWTAuthentication = false): Promise<string> {
     return Api.post<LoginParams, { access_token: string }>(
diff --git a/twake/frontend/src/app/features/drive-twake/api-client/api-client.ts b/twake/frontend/src/app/features/drive-tdrive/api-client/api-client.ts
similarity index 76%
rename from twake/frontend/src/app/features/drive-twake/api-client/api-client.ts
rename to twake/frontend/src/app/features/drive-tdrive/api-client/api-client.ts
index d6ad2c83..cc64f22b 100644
--- a/twake/frontend/src/app/features/drive-twake/api-client/api-client.ts
+++ b/twake/frontend/src/app/features/drive-tdrive/api-client/api-client.ts
@@ -1,9 +1,9 @@
 import Api from '../../global/framework/api-service';
-import { DriveTwakeTab } from '../types';
+import { DriveTdriveTab } from '../types';
 
-export class DriveTwakeApiClient {
+export class DriveTdriveApiClient {
   static async getTab(companyId: string, tabId: string) {
-    return await Api.get<DriveTwakeTab>(
+    return await Api.get<DriveTdriveTab>(
       `/internal/services/documents/v1/companies/${companyId}/tabs/${tabId}`,
     );
   }
@@ -15,7 +15,7 @@ export class DriveTwakeApiClient {
     itemId: string,
     level: 'write' | 'read',
   ) {
-    return await Api.post<DriveTwakeTab, DriveTwakeTab>(
+    return await Api.post<DriveTdriveTab, DriveTdriveTab>(
       `/internal/services/documents/v1/companies/${companyId}/tabs/${tabId}`,
       {
         company_id: companyId,
diff --git a/twake/frontend/src/app/features/drive-twake/hooks/use-drive-twake-tab.tsx b/twake/frontend/src/app/features/drive-tdrive/hooks/use-drive-tdrive-tab.tsx
similarity index 58%
rename from twake/frontend/src/app/features/drive-twake/hooks/use-drive-twake-tab.tsx
rename to twake/frontend/src/app/features/drive-tdrive/hooks/use-drive-tdrive-tab.tsx
index b36bce81..f4ec9718 100644
--- a/twake/frontend/src/app/features/drive-twake/hooks/use-drive-twake-tab.tsx
+++ b/twake/frontend/src/app/features/drive-tdrive/hooks/use-drive-tdrive-tab.tsx
@@ -1,17 +1,17 @@
 import useRouterCompany from 'app/features/router/hooks/use-router-company';
 import { useEffect, useState } from 'react';
 import { useRecoilState } from 'recoil';
-import { DriveTwakeApiClient } from '../api-client/api-client';
-import { DriveTwakeTabAtom } from '../state/store';
+import { DriveTdriveApiClient } from '../api-client/api-client';
+import { DriveTdriveTabAtom } from '../state/store';
 
-export const useDriveTwakeTab = (channelId: string, tabId: string) => {
+export const useDriveTdriveTab = (channelId: string, tabId: string) => {
   const companyId = useRouterCompany();
-  const [tab, setTab] = useRecoilState(DriveTwakeTabAtom(tabId));
+  const [tab, setTab] = useRecoilState(DriveTdriveTabAtom(tabId));
   const [loading, setLoading] = useState(false);
 
   useEffect(() => {
     setLoading(true);
-    DriveTwakeApiClient.getTab(companyId, tabId)
+    DriveTdriveApiClient.getTab(companyId, tabId)
       .then(setTab)
       .finally(() => setLoading(false));
   }, [companyId, tabId]);
@@ -20,7 +20,7 @@ export const useDriveTwakeTab = (channelId: string, tabId: string) => {
     tab,
     setTab: async (itemId: string, level: 'read' | 'write') => {
       setLoading(true);
-      const tab = await DriveTwakeApiClient.setTab(companyId, tabId, channelId, itemId, level);
+      const tab = await DriveTdriveApiClient.setTab(companyId, tabId, channelId, itemId, level);
       if (tab.item_id) setTab(tab);
       setLoading(false);
     },
diff --git a/twake/frontend/src/app/features/drive-tdrive/state/store.ts b/twake/frontend/src/app/features/drive-tdrive/state/store.ts
new file mode 100644
index 00000000..c9c367a6
--- /dev/null
+++ b/twake/frontend/src/app/features/drive-tdrive/state/store.ts
@@ -0,0 +1,7 @@
+import { atomFamily } from 'recoil';
+import { DriveTdriveTab } from '../types';
+
+export const DriveTdriveTabAtom = atomFamily<DriveTdriveTab | null, string>({
+  key: 'DriveTdriveTabAtom',
+  default: () => null,
+});
diff --git a/twake/frontend/src/app/features/drive-twake/types.ts b/twake/frontend/src/app/features/drive-tdrive/types.ts
similarity index 78%
rename from twake/frontend/src/app/features/drive-twake/types.ts
rename to twake/frontend/src/app/features/drive-tdrive/types.ts
index d43eb00a..e9c6bc56 100644
--- a/twake/frontend/src/app/features/drive-twake/types.ts
+++ b/twake/frontend/src/app/features/drive-tdrive/types.ts
@@ -1,4 +1,4 @@
-export type DriveTwakeTab = {
+export type DriveTdriveTab = {
   company_id: string;
   tab_id: string;
   channel_id: string;
diff --git a/twake/frontend/src/app/features/drive-twake/state/store.ts b/twake/frontend/src/app/features/drive-twake/state/store.ts
deleted file mode 100644
index bb3ef8a8..00000000
--- a/twake/frontend/src/app/features/drive-twake/state/store.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { atomFamily } from 'recoil';
-import { DriveTwakeTab } from '../types';
-
-export const DriveTwakeTabAtom = atomFamily<DriveTwakeTab | null, string>({
-  key: 'DriveTwakeTabAtom',
-  default: () => null,
-});
diff --git a/twake/frontend/src/app/features/drive/api-client/api-client.ts b/twake/frontend/src/app/features/drive/api-client/api-client.ts
index 0de0278f..c5fe36ef 100644
--- a/twake/frontend/src/app/features/drive/api-client/api-client.ts
+++ b/twake/frontend/src/app/features/drive/api-client/api-client.ts
@@ -18,22 +18,22 @@ export type SearchDocumentsBody = {
 };
 
 let publicLinkToken: null | string = null;
-let twakeTabToken: null | string = null;
+let tdriveTabToken: null | string = null;
 
 export const setPublicLinkToken = (token: string | null) => {
   publicLinkToken = token;
 };
 
-export const setTwakeTabToken = (token: string | null) => {
-  twakeTabToken = token;
+export const setTdriveTabToken = (token: string | null) => {
+  tdriveTabToken = token;
 };
 
-const appendPublicAndTwakeToken = (useAnd?: boolean) => {
+const appendPublicAndTdriveToken = (useAnd?: boolean) => {
   if (publicLinkToken) {
     return `${useAnd ? '&' : '?'}public_token=${publicLinkToken}`;
   }
-  if (twakeTabToken) {
-    return `${useAnd ? '&' : '?'}twake_tab_token=${twakeTabToken}`;
+  if (tdriveTabToken) {
+    return `${useAnd ? '&' : '?'}tdrive_tab_token=${tdriveTabToken}`;
   }
   return '';
 };
@@ -42,19 +42,19 @@ export class DriveApiClient {
   private static logger = Logger.getLogger('MessageAPIClientService');
   static async get(companyId: string, id: string | 'trash' | '') {
     return await Api.get<DriveItemDetails>(
-      `/internal/services/documents/v1/companies/${companyId}/item/${id}${appendPublicAndTwakeToken()}`,
+      `/internal/services/documents/v1/companies/${companyId}/item/${id}${appendPublicAndTdriveToken()}`,
     );
   }
 
   static async remove(companyId: string, id: string | 'trash' | '') {
     return await Api.delete<void>(
-      `/internal/services/documents/v1/companies/${companyId}/item/${id}${appendPublicAndTwakeToken()}`,
+      `/internal/services/documents/v1/companies/${companyId}/item/${id}${appendPublicAndTdriveToken()}`,
     );
   }
 
   static async update(companyId: string, id: string, update: Partial<DriveItem>) {
     return await Api.post<Partial<DriveItem>, DriveItem>(
-      `/internal/services/documents/v1/companies/${companyId}/item/${id}${appendPublicAndTwakeToken()}`,
+      `/internal/services/documents/v1/companies/${companyId}/item/${id}${appendPublicAndTdriveToken()}`,
       update,
     );
   }
@@ -68,14 +68,14 @@ export class DriveApiClient {
       { item: Partial<DriveItem>; version: Partial<DriveItemVersion> },
       DriveItem
     >(
-      `/internal/services/documents/v1/companies/${companyId}/item${appendPublicAndTwakeToken()}`,
+      `/internal/services/documents/v1/companies/${companyId}/item${appendPublicAndTdriveToken()}`,
       data as { item: Partial<DriveItem>; version: Partial<DriveItemVersion> },
     );
   }
 
   static async createVersion(companyId: string, id: string, version: Partial<DriveItemVersion>) {
     return await Api.post<Partial<DriveItemVersion>, DriveItemVersion>(
-      `/internal/services/documents/v1/companies/${companyId}/item/${id}/version${appendPublicAndTwakeToken()}`,
+      `/internal/services/documents/v1/companies/${companyId}/item/${id}/version${appendPublicAndTdriveToken()}`,
       version,
     );
   }
@@ -84,7 +84,7 @@ export class DriveApiClient {
     return Api.get<{ token: string }>(
       `/internal/services/documents/v1/companies/${companyId}/item/download/token` +
         `?items=${ids.join(',')}&version_id=${versionId}` +
-        appendPublicAndTwakeToken(true),
+        appendPublicAndTdriveToken(true),
     );
   }
 
@@ -92,12 +92,12 @@ export class DriveApiClient {
     const { token } = await DriveApiClient.getDownloadToken(companyId, [id], versionId);
     if (versionId)
       return Api.route(
-        `/internal/services/documents/v1/companies/${companyId}/item/${id}/download?version_id=${versionId}&token=${token}${appendPublicAndTwakeToken(
+        `/internal/services/documents/v1/companies/${companyId}/item/${id}/download?version_id=${versionId}&token=${token}${appendPublicAndTdriveToken(
           true,
         )}`,
       );
     return Api.route(
-      `/internal/services/documents/v1/companies/${companyId}/item/${id}/download?token=${token}${appendPublicAndTwakeToken(
+      `/internal/services/documents/v1/companies/${companyId}/item/${id}/download?token=${token}${appendPublicAndTdriveToken(
         true,
       )}`,
     );
@@ -108,7 +108,7 @@ export class DriveApiClient {
     return Api.route(
       `/internal/services/documents/v1/companies/${companyId}/item/download/zip` +
         `?items=${ids.join(',')}&token=${token}` +
-        appendPublicAndTwakeToken(true),
+        appendPublicAndTdriveToken(true),
     );
   }
 
diff --git a/twake/frontend/src/app/features/drive/types.ts b/twake/frontend/src/app/features/drive/types.ts
index 5bc30007..1136fd5b 100644
--- a/twake/frontend/src/app/features/drive/types.ts
+++ b/twake/frontend/src/app/features/drive/types.ts
@@ -53,7 +53,7 @@ export type DriveItemVersion = {
   id: string;
 
   //The file itself, using the existing new node "file" entity
-  provider: string | 'drive' | 'internal'; //Equivalent to "source" in twake/backend/node/src/services/messages/entities/message-files.ts
+  provider: string | 'drive' | 'internal'; //Equivalent to "source" in tdrive/backend/node/src/services/messages/entities/message-files.ts
   drive_item_id: string;
   file_metadata: FileMetadata; //New field
 
diff --git a/twake/frontend/src/app/features/global/framework/api-service.ts b/twake/frontend/src/app/features/global/framework/api-service.ts
index 1a24a986..5f9d5037 100755
--- a/twake/frontend/src/app/features/global/framework/api-service.ts
+++ b/twake/frontend/src/app/features/global/framework/api-service.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 import Requests from 'app/features/global/framework/requests-api-service';
 
 class GroupedQueryApi {
diff --git a/twake/frontend/src/app/features/global/framework/local-storage-service.ts b/twake/frontend/src/app/features/global/framework/local-storage-service.ts
index b28d02f4..ddd9d36b 100755
--- a/twake/frontend/src/app/features/global/framework/local-storage-service.ts
+++ b/twake/frontend/src/app/features/global/framework/local-storage-service.ts
@@ -1,5 +1,5 @@
 export default class LocalStorage {
-  static prefix = 'twake:';
+  static prefix = 'tdrive:';
 
   static setItem(key: string, value: unknown) {
     window.localStorage.setItem(`${LocalStorage.prefix}${key}`, JSON.stringify(value));
@@ -28,7 +28,7 @@ export default class LocalStorage {
       if (key) {
         const depreciatedKeysRemove =
           [
-            'twake-collections-db',
+            'tdrive-collections-db',
             'm_input',
             'language',
             'jwt',
diff --git a/twake/frontend/src/app/features/global/framework/registry-decorator-service.ts b/twake/frontend/src/app/features/global/framework/registry-decorator-service.ts
index 9eea79ac..83548932 100644
--- a/twake/frontend/src/app/features/global/framework/registry-decorator-service.ts
+++ b/twake/frontend/src/app/features/global/framework/registry-decorator-service.ts
@@ -3,8 +3,8 @@ import ServiceRegistry from 'app/features/global/framework/registry-service';
 
 const SERVICE_SUFFIX = 'ChannelServiceImpl';
 
-export function TwakeService(name: string): ClassDecorator {
-  return function DecoratedTwakeService(target: any): any {
+export function TdriveService(name: string): ClassDecorator {
+  return function DecoratedTdriveService(target: any): any {
     const originalConstrutor = target;
 
     const decorated: any = function (...args: any) {
diff --git a/twake/frontend/src/app/features/global/hooks/use-http.ts b/twake/frontend/src/app/features/global/hooks/use-http.ts
index 7f07eff7..cea3b187 100644
--- a/twake/frontend/src/app/features/global/hooks/use-http.ts
+++ b/twake/frontend/src/app/features/global/hooks/use-http.ts
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { Maybe } from 'app/features/global/types/global-types';
-import Globals from '../services/globals-twake-app-service';
+import Globals from '../services/globals-tdrive-app-service';
 import JWTStorage from '../../auth/jwt-storage-service';
 import Logger from '../framework/logger-service';
 
diff --git a/twake/frontend/src/app/features/global/hooks/use-usetiful.ts b/twake/frontend/src/app/features/global/hooks/use-usetiful.ts
index 12ab61e0..750e07d1 100644
--- a/twake/frontend/src/app/features/global/hooks/use-usetiful.ts
+++ b/twake/frontend/src/app/features/global/hooks/use-usetiful.ts
@@ -2,7 +2,7 @@
 import { useEffect } from 'react';
 
 import { useCurrentUser } from 'app/features/users/hooks/use-current-user';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 import Logger from 'app/features/global/framework/logger-service';
 
 let initiatedService = false;
diff --git a/twake/frontend/src/app/features/global/services/alert-manager-service.ts b/twake/frontend/src/app/features/global/services/alert-manager-service.ts
index 78bd24fc..db488b8a 100755
--- a/twake/frontend/src/app/features/global/services/alert-manager-service.ts
+++ b/twake/frontend/src/app/features/global/services/alert-manager-service.ts
@@ -2,7 +2,7 @@
 import { Modal } from 'antd';
 
 import Languages from 'app/features/global/services/languages-service';
-import { TwakeService } from '../framework/registry-decorator-service';
+import { TdriveService } from '../framework/registry-decorator-service';
 
 const { confirm, info } = Modal;
 
@@ -10,7 +10,7 @@ type Options = {
   title?: string;
   text?: string;
 };
-@TwakeService('Alert')
+@TdriveService('Alert')
 class AlertServiceService {
   alert(onClose: () => void, options?: Options) {
     info({
diff --git a/twake/frontend/src/app/features/global/services/feature-toggles-service.ts b/twake/frontend/src/app/features/global/services/feature-toggles-service.ts
index 5b1d4237..a3195eef 100644
--- a/twake/frontend/src/app/features/global/services/feature-toggles-service.ts
+++ b/twake/frontend/src/app/features/global/services/feature-toggles-service.ts
@@ -24,7 +24,7 @@ availableFeaturesWithDefaults.set(FeatureNames.UNLIMITED_STORAGE, true);
 availableFeaturesWithDefaults.set(FeatureNames.COMPANY_INVITE_MEMBER, true);
 
 /**
- * ChannelServiceImpl that allow you to manage feature flipping in Twake using react feature toggles
+ * ChannelServiceImpl that allow you to manage feature flipping in Tdrive using react feature toggles
  */
 class FeatureTogglesService {
   public activeFeatureNames: FeatureNames[];
diff --git a/twake/frontend/src/app/features/global/services/globals-twake-app-service.ts b/twake/frontend/src/app/features/global/services/globals-tdrive-app-service.ts
similarity index 96%
rename from twake/frontend/src/app/features/global/services/globals-twake-app-service.ts
rename to twake/frontend/src/app/features/global/services/globals-tdrive-app-service.ts
index dad1f493..413e2905 100755
--- a/twake/frontend/src/app/features/global/services/globals-twake-app-service.ts
+++ b/twake/frontend/src/app/features/global/services/globals-tdrive-app-service.ts
@@ -31,7 +31,7 @@ document.body.addEventListener('dragover', e => e.preventDefault());
 document.body.addEventListener('dragenter', e => e.preventDefault());
 document.body.addEventListener('drop', e => e.preventDefault());
 
-class TwakeApp {
+class TdriveApp {
   window: Window;
   environment: EnvironmentType;
   store_public_access_get_data: any;
@@ -67,6 +67,6 @@ class TwakeApp {
   }
 }
 
-const app = new TwakeApp();
-(window as any).TwakeApp = app;
+const app = new TdriveApp();
+(window as any).TdriveApp = app;
 export default app;
diff --git a/twake/frontend/src/app/features/global/services/pseudo-markdown-compiler-service.ts b/twake/frontend/src/app/features/global/services/pseudo-markdown-compiler-service.ts
index 82938eb4..e5219e40 100644
--- a/twake/frontend/src/app/features/global/services/pseudo-markdown-compiler-service.ts
+++ b/twake/frontend/src/app/features/global/services/pseudo-markdown-compiler-service.ts
@@ -6,7 +6,7 @@ import Collections from 'app/deprecated/CollectionsV1/Collections/Collections.js
 import PseudoMarkdownDictionary from 'components/twacode/pseudo-markdown-dictionary';
 import anchorme from 'anchorme';
 import emojis_original_service from 'emojione';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 
 class PseudoMarkdownCompiler {
   saved_messages: { [key: string]: any } = {};
diff --git a/twake/frontend/src/app/features/global/services/websocket-factory-service.ts b/twake/frontend/src/app/features/global/services/websocket-factory-service.ts
index 4a687329..d51872d5 100644
--- a/twake/frontend/src/app/features/global/services/websocket-factory-service.ts
+++ b/twake/frontend/src/app/features/global/services/websocket-factory-service.ts
@@ -1,4 +1,4 @@
-import Globals from './globals-twake-app-service';
+import Globals from './globals-tdrive-app-service';
 import Logger from '../framework/logger-service';
 import JWT from '../../auth/jwt-storage-service';
 import WebSocketService, { WebSocketOptions } from './websocket-service';
diff --git a/twake/frontend/src/app/features/global/utils/URLUtils.ts b/twake/frontend/src/app/features/global/utils/URLUtils.ts
index 0cc05fdd..4d41bbb5 100644
--- a/twake/frontend/src/app/features/global/utils/URLUtils.ts
+++ b/twake/frontend/src/app/features/global/utils/URLUtils.ts
@@ -1,5 +1,5 @@
 import environment from 'app/environment/environment';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 
 export function addApiUrlIfNeeded(url: string, asCssUrl?: boolean): string {
   function _wrap(url: string): string {
diff --git a/twake/frontend/src/app/features/global/utils/datetime.js b/twake/frontend/src/app/features/global/utils/datetime.js
index bf5cba6e..d6048d16 100755
--- a/twake/frontend/src/app/features/global/utils/datetime.js
+++ b/twake/frontend/src/app/features/global/utils/datetime.js
@@ -7,7 +7,7 @@ import 'moment/locale/es';
 import Observable from 'app/deprecated/CollectionsV1/observable.js';
 import UserService from 'app/features/users/services/current-user-service';
 
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 
 class DateTime extends Observable {
   constructor() {
diff --git a/twake/frontend/src/app/features/global/utils/window.ts b/twake/frontend/src/app/features/global/utils/window.ts
index fea70c55..feab6a08 100755
--- a/twake/frontend/src/app/features/global/utils/window.ts
+++ b/twake/frontend/src/app/features/global/utils/window.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { capitalize } from 'lodash';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 
 class WindowState {
   public readonly app_name: string = 'Tdrive';
diff --git a/twake/frontend/src/app/features/invitation/api/invitation-api-client.ts b/twake/frontend/src/app/features/invitation/api/invitation-api-client.ts
index bbe07f49..4aecfe64 100644
--- a/twake/frontend/src/app/features/invitation/api/invitation-api-client.ts
+++ b/twake/frontend/src/app/features/invitation/api/invitation-api-client.ts
@@ -1,5 +1,5 @@
 import Api from 'app/features/global/framework/api-service';
-import { TwakeService } from 'app/features/global/framework/registry-decorator-service';
+import { TdriveService } from 'app/features/global/framework/registry-decorator-service';
 import { InvitationType as InvitationRoleType, InvitedUser } from '../state/invitation';
 import Logger from 'app/features/global/framework/logger-service';
 
@@ -30,7 +30,7 @@ type WorkspaceInvitationTokenPayloadType = {
   channels: string[];
 };
 
-@TwakeService('InvitationApiClientService')
+@TdriveService('InvitationApiClientService')
 class InvitationApiClient {
   private readonly apiBaseUrl: string = '/internal/services/workspaces/v1/companies';
   logger: Logger.Logger;
diff --git a/twake/frontend/src/app/features/messages/api/message-api-client.ts b/twake/frontend/src/app/features/messages/api/message-api-client.ts
index d9baf2ae..d5a0007f 100644
--- a/twake/frontend/src/app/features/messages/api/message-api-client.ts
+++ b/twake/frontend/src/app/features/messages/api/message-api-client.ts
@@ -1,4 +1,4 @@
-import { TwakeService } from '../../global/framework/registry-decorator-service';
+import { TdriveService } from '../../global/framework/registry-decorator-service';
 import {
   Message,
   MessageExtended,
@@ -40,7 +40,7 @@ export interface FileSearchOptions extends BaseSearchOptions {
   next_page_token?: string;
 }
 
-@TwakeService('MessageAPIClientService')
+@TdriveService('MessageAPIClientService')
 class MessageAPIClient {
   private readonly prefixUrl: string = '/internal/services/messages/v1';
   private realtime: Map<string, WebsocketRoom[]> = new Map();
diff --git a/twake/frontend/src/app/features/messages/api/message-thread-api-client.ts b/twake/frontend/src/app/features/messages/api/message-thread-api-client.ts
index 441851b5..254c7011 100644
--- a/twake/frontend/src/app/features/messages/api/message-thread-api-client.ts
+++ b/twake/frontend/src/app/features/messages/api/message-thread-api-client.ts
@@ -5,12 +5,12 @@ import {
   MessageWithReplies,
 } from 'app/features/messages/types/message';
 import Api from 'app/features/global/framework/api-service';
-import { TwakeService } from 'app/features/global/framework/registry-decorator-service';
+import { TdriveService } from 'app/features/global/framework/registry-decorator-service';
 
 /**
  * This service is to create and update a thread
  */
-@TwakeService('MessageThreadAPIClient')
+@TdriveService('MessageThreadAPIClient')
 class MessageThreadAPIClient {
   private readonly prefixUrl: string = '/internal/services/messages/v1';
 
diff --git a/twake/frontend/src/app/features/messages/api/message-view-api-client.ts b/twake/frontend/src/app/features/messages/api/message-view-api-client.ts
index 9059f324..2a9ce4e1 100644
--- a/twake/frontend/src/app/features/messages/api/message-view-api-client.ts
+++ b/twake/frontend/src/app/features/messages/api/message-view-api-client.ts
@@ -1,5 +1,5 @@
 import { MessageWithReplies } from 'app/features/messages/types/message';
-import { TwakeService } from 'app/features/global/framework/registry-decorator-service';
+import { TdriveService } from 'app/features/global/framework/registry-decorator-service';
 import Api from 'app/features/global/framework/api-service';
 import { WebsocketRoom } from 'app/features/global/types/websocket-types';
 import Numbers from 'app/features/global/utils/Numbers';
@@ -12,7 +12,7 @@ import Numbers from 'app/features/global/utils/Numbers';
  *  - my active threads view
  *  - ...
  */
-@TwakeService('MessageViewAPIClientService')
+@TdriveService('MessageViewAPIClientService')
 class MessageViewAPIClient {
   private readonly prefixUrl: string = '/internal/services/messages/v1';
   private realtime: Map<string, WebsocketRoom[]> = new Map();
diff --git a/twake/frontend/src/app/features/messages/services/message-editor-service-factory.ts b/twake/frontend/src/app/features/messages/services/message-editor-service-factory.ts
index d111e8c4..f7810770 100644
--- a/twake/frontend/src/app/features/messages/services/message-editor-service-factory.ts
+++ b/twake/frontend/src/app/features/messages/services/message-editor-service-factory.ts
@@ -19,5 +19,5 @@ class MessageEditorServiceFactory {
 }
 
 const factory = new MessageEditorServiceFactory();
-(window as any).TwakeMessageEditorServiceFactory = factory;
+(window as any).TdriveMessageEditorServiceFactory = factory;
 export default factory;
diff --git a/twake/frontend/src/app/features/notifications-preferences/api/notifications-preferences-api-client.ts b/twake/frontend/src/app/features/notifications-preferences/api/notifications-preferences-api-client.ts
index 04a2746e..bb41d66e 100644
--- a/twake/frontend/src/app/features/notifications-preferences/api/notifications-preferences-api-client.ts
+++ b/twake/frontend/src/app/features/notifications-preferences/api/notifications-preferences-api-client.ts
@@ -1,8 +1,8 @@
 import { preferencesType, NotificationPreferencesType } from '../types/notifications-preferences';
 import Api from 'app/features/global/framework/api-service';
-import { TwakeService } from 'app/features/global/framework/registry-decorator-service';
+import { TdriveService } from 'app/features/global/framework/registry-decorator-service';
 
-@TwakeService('NotificationsPreferencesAPIClientService')
+@TdriveService('NotificationsPreferencesAPIClientService')
 class NotificationsPreferencesAPIClientService {
   private readonly apiUrl = '/internal/services/notifications/v1/preferences';
 
diff --git a/twake/frontend/src/app/features/pending-emails/api/pending-emails-api-client.ts b/twake/frontend/src/app/features/pending-emails/api/pending-emails-api-client.ts
index b6073b12..599d66b1 100644
--- a/twake/frontend/src/app/features/pending-emails/api/pending-emails-api-client.ts
+++ b/twake/frontend/src/app/features/pending-emails/api/pending-emails-api-client.ts
@@ -5,9 +5,9 @@ import {
   SavePendingEmailRequest,
 } from '../types/pending-email';
 import Api from 'app/features/global/framework/api-service';
-import { TwakeService } from 'app/features/global/framework/registry-decorator-service';
+import { TdriveService } from 'app/features/global/framework/registry-decorator-service';
 
-@TwakeService('PendingEmailsAPIClientService')
+@TdriveService('PendingEmailsAPIClientService')
 class PendingEmailsAPIClientService {
   private readonly prefix = '/internal/services/channels/v1/companies';
 
diff --git a/twake/frontend/src/app/features/tabs/api/tabs-api-client.ts b/twake/frontend/src/app/features/tabs/api/tabs-api-client.ts
index 8dc9bc03..01da83e3 100644
--- a/twake/frontend/src/app/features/tabs/api/tabs-api-client.ts
+++ b/twake/frontend/src/app/features/tabs/api/tabs-api-client.ts
@@ -1,6 +1,6 @@
 import { TabType } from 'app/features/tabs/types/tab';
 import Api from '../../global/framework/api-service';
-import { TwakeService } from '../../global/framework/registry-decorator-service';
+import { TdriveService } from '../../global/framework/registry-decorator-service';
 import { WebsocketRoom } from '../../global/types/websocket-types';
 
 type TabKey = {
@@ -9,7 +9,7 @@ type TabKey = {
   channelId: string;
 };
 
-@TwakeService('TabsAPIClientService')
+@TdriveService('TabsAPIClientService')
 class TabsAPIClient {
   private readonly prefixUrl: string = '/internal/services/channels/v1';
   private realtime: Map<string, WebsocketRoom[]> = new Map();
diff --git a/twake/frontend/src/app/features/users/api/user-api-client.ts b/twake/frontend/src/app/features/users/api/user-api-client.ts
index e92e415c..0b098410 100644
--- a/twake/frontend/src/app/features/users/api/user-api-client.ts
+++ b/twake/frontend/src/app/features/users/api/user-api-client.ts
@@ -2,7 +2,7 @@
 import { CompanyType } from 'app/features/companies/types/company';
 import { UserPreferencesType, UserType } from 'app/features/users/types/user';
 import Api from '../../global/framework/api-service';
-import { TwakeService } from '../../global/framework/registry-decorator-service';
+import { TdriveService } from '../../global/framework/registry-decorator-service';
 import { WebsocketRoom } from '../../global/types/websocket-types';
 import WorkspaceAPIClient from '../../workspaces/api/workspace-api-client';
 import CurrentUser from '../../../deprecated/user/CurrentUser';
@@ -20,7 +20,7 @@ type SearchUserApiResponse<T> = {
   resources: T[];
 };
 
-@TwakeService('UserAPIClientService')
+@TdriveService('UserAPIClientService')
 class UserAPIClientService {
   private readonly prefixUrl: string = '/internal/services/users/v1';
   private realtime: Map<string, WebsocketRoom> = new Map();
diff --git a/twake/frontend/src/app/features/users/api/user-notification-api-client.ts b/twake/frontend/src/app/features/users/api/user-notification-api-client.ts
index e26451c1..af49f781 100644
--- a/twake/frontend/src/app/features/users/api/user-notification-api-client.ts
+++ b/twake/frontend/src/app/features/users/api/user-notification-api-client.ts
@@ -1,9 +1,9 @@
 import Api from '../../global/framework/api-service';
 import { NotificationType } from 'app/features/users/types/notification-types';
-import { TwakeService } from '../../global/framework/registry-decorator-service';
+import { TdriveService } from '../../global/framework/registry-decorator-service';
 import { WebsocketRoom } from 'app/features/global/types/websocket-types';
 
-@TwakeService('UserNotificationAPIClientService')
+@TdriveService('UserNotificationAPIClientService')
 class UserNotificationAPIClient {
   private realtime: WebsocketRoom = { room: '', token: '' };
 
diff --git a/twake/frontend/src/app/features/users/services/current-user-service.ts b/twake/frontend/src/app/features/users/services/current-user-service.ts
index e398e10b..73138343 100755
--- a/twake/frontend/src/app/features/users/services/current-user-service.ts
+++ b/twake/frontend/src/app/features/users/services/current-user-service.ts
@@ -5,7 +5,7 @@ import Collections, { Collection } from 'app/deprecated/CollectionsV1/Collection
 import Api from 'app/features/global/framework/api-service';
 import Languages from 'app/features/global/services/languages-service';
 import { UserType } from 'app/features/users/types/user';
-import { TwakeService } from 'app/features/global/framework/registry-decorator-service';
+import { TdriveService } from 'app/features/global/framework/registry-decorator-service';
 import { addApiUrlIfNeeded } from 'app/features/global/utils/URLUtils';
 import { getUser } from '../hooks/use-user-list';
 import { getGradient } from 'app/atoms/avatar';
@@ -17,7 +17,7 @@ type SearchQueryType = {
   timeout_search?: ReturnType<typeof setTimeout>;
 };
 
-@TwakeService('UserServiceImpl')
+@TdriveService('UserServiceImpl')
 class User {
   private users_repository: Collection;
   private searchQueries: SearchQueryType;
diff --git a/twake/frontend/src/app/features/users/services/listen-users-service.ts b/twake/frontend/src/app/features/users/services/listen-users-service.ts
index ff72b47c..8d7a1dc2 100755
--- a/twake/frontend/src/app/features/users/services/listen-users-service.ts
+++ b/twake/frontend/src/app/features/users/services/listen-users-service.ts
@@ -3,7 +3,7 @@
 import ws from 'app/deprecated/websocket/websocket';
 import Collections from 'app/deprecated/CollectionsV1/Collections/Collections';
 import UserService from './current-user-service';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 import userAsyncGet from 'app/features/users/utils/async-get';
 
 type Timeout = ReturnType<typeof setTimeout>;
diff --git a/twake/frontend/src/app/features/viewer/api/viewer-api-client.ts b/twake/frontend/src/app/features/viewer/api/viewer-api-client.ts
index f292ded4..60db8521 100644
--- a/twake/frontend/src/app/features/viewer/api/viewer-api-client.ts
+++ b/twake/frontend/src/app/features/viewer/api/viewer-api-client.ts
@@ -2,7 +2,7 @@ import { ChannelType } from 'app/features/channels/types/channel';
 import { MessageFileType, MessageWithReplies } from 'app/features/messages/types/message';
 import { UserType } from 'app/features/users/types/user';
 import Api from '../../global/framework/api-service';
-import { TwakeService } from '../../global/framework/registry-decorator-service';
+import { TdriveService } from '../../global/framework/registry-decorator-service';
 
 const MESSAGES_PREFIX = '/internal/services/messages/v1/companies';
 
@@ -22,7 +22,7 @@ export type MessageFileDetails = MessageFileType & {
   };
 };
 
-@TwakeService('ViewerAPIClientService')
+@TdriveService('ViewerAPIClientService')
 class ViewerAPIClient {
   async getMessageFile(companyId: string, messageId: string, msgFileId: string) {
     const route = `${MESSAGES_PREFIX}/${companyId}/messages/${messageId}/files/${msgFileId}`;
diff --git a/twake/frontend/src/app/features/workspace-members/api/workspace-members-api-client.ts b/twake/frontend/src/app/features/workspace-members/api/workspace-members-api-client.ts
index edb67598..9c189394 100644
--- a/twake/frontend/src/app/features/workspace-members/api/workspace-members-api-client.ts
+++ b/twake/frontend/src/app/features/workspace-members/api/workspace-members-api-client.ts
@@ -3,11 +3,11 @@ import {
   WorkspacePendingUserType,
   WorkspaceUserType,
 } from 'app/features/workspaces/types/workspace';
-import { TwakeService } from '../../global/framework/registry-decorator-service';
+import { TdriveService } from '../../global/framework/registry-decorator-service';
 
 const PREFIX = '/internal/services/workspaces/v1/companies';
 
-@TwakeService('WorkspaceUserAPIClientService')
+@TdriveService('WorkspaceUserAPIClientService')
 class WorkspaceUserAPIClientService {
   /**
    * Get all workspace users
diff --git a/twake/frontend/src/app/features/workspace-members/services/workspace-members-service.ts b/twake/frontend/src/app/features/workspace-members/services/workspace-members-service.ts
index 31eba5dd..1caa2649 100755
--- a/twake/frontend/src/app/features/workspace-members/services/workspace-members-service.ts
+++ b/twake/frontend/src/app/features/workspace-members/services/workspace-members-service.ts
@@ -13,7 +13,7 @@ import Numbers from 'app/features/global/utils/Numbers';
 import WorkspaceUserRights from 'app/features/workspaces/services/workspace-user-rights-service';
 import CurrentUser from 'app/deprecated/user/CurrentUser';
 import AlertManager from 'app/features/global/services/alert-manager-service';
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 
 const prefixRoute = '/internal/services/workspaces/v1';
 
diff --git a/twake/frontend/src/app/features/workspaces/api/workspace-api-client.ts b/twake/frontend/src/app/features/workspaces/api/workspace-api-client.ts
index c5066015..702c9bd7 100644
--- a/twake/frontend/src/app/features/workspaces/api/workspace-api-client.ts
+++ b/twake/frontend/src/app/features/workspaces/api/workspace-api-client.ts
@@ -1,7 +1,7 @@
 import Api from '../../global/framework/api-service';
 import { CompanyType } from 'app/features/companies/types/company';
 import { WorkspaceType } from 'app/features/workspaces/types/workspace';
-import { TwakeService } from '../../global/framework/registry-decorator-service';
+import { TdriveService } from '../../global/framework/registry-decorator-service';
 import { WebsocketRoom } from '../../global/types/websocket-types';
 import _ from 'lodash';
 
@@ -21,7 +21,7 @@ type UpdateWorkspaceInviteDomainResponse = {
   status: string;
 }
 
-@TwakeService('WorkspaceAPIClientService')
+@TdriveService('WorkspaceAPIClientService')
 class WorkspaceAPIClient {
   private realtime: Map<string, WebsocketRoom[]> = new Map();
 
diff --git a/twake/frontend/src/app/molecules/grouped-rows/company/index.stories.tsx b/twake/frontend/src/app/molecules/grouped-rows/company/index.stories.tsx
index b8821948..8410dd25 100644
--- a/twake/frontend/src/app/molecules/grouped-rows/company/index.stories.tsx
+++ b/twake/frontend/src/app/molecules/grouped-rows/company/index.stories.tsx
@@ -22,7 +22,7 @@ const Template: ComponentStory<any> = (props: {
           avatar={
             <Avatar
               type="square"
-              avatar="https://s3.eu-west-3.amazonaws.com/twake.eu-west-3/public/uploads/grouplogo/dffc6bb54e7b5d6ee45d2d877839aa88.png"
+              avatar="https://s3.eu-west-3.amazonaws.com/tdrive.eu-west-3/public/uploads/grouplogo/dffc6bb54e7b5d6ee45d2d877839aa88.png"
             />
           }
           title="Linagora"
diff --git a/twake/frontend/src/app/molecules/grouped-rows/workspace/index.stories.tsx b/twake/frontend/src/app/molecules/grouped-rows/workspace/index.stories.tsx
index e143cfb8..63e17bd6 100644
--- a/twake/frontend/src/app/molecules/grouped-rows/workspace/index.stories.tsx
+++ b/twake/frontend/src/app/molecules/grouped-rows/workspace/index.stories.tsx
@@ -22,7 +22,7 @@ const Template: ComponentStory<any> = (props: {
           avatar={
             <Avatar
               type="square"
-              avatar="https://s3.eu-west-3.amazonaws.com/twake.eu-west-3/public/uploads/grouplogo/dffc6bb54e7b5d6ee45d2d877839aa88.png"
+              avatar="https://s3.eu-west-3.amazonaws.com/tdrive.eu-west-3/public/uploads/grouplogo/dffc6bb54e7b5d6ee45d2d877839aa88.png"
             />
           }
           title="Home"
@@ -33,7 +33,7 @@ const Template: ComponentStory<any> = (props: {
           avatar={
             <Avatar
               type="square"
-              avatar="https://s3.eu-west-3.amazonaws.com/twake.eu-west-3/public/uploads/wslogo/2bb1d89d73e9597140d48fc095737f23.png"
+              avatar="https://s3.eu-west-3.amazonaws.com/tdrive.eu-west-3/public/uploads/wslogo/2bb1d89d73e9597140d48fc095737f23.png"
             />
           }
           title="Software"
diff --git a/twake/frontend/src/app/styles/colors.less b/twake/frontend/src/app/styles/colors.less
index f0434b02..747e29b8 100644
--- a/twake/frontend/src/app/styles/colors.less
+++ b/twake/frontend/src/app/styles/colors.less
@@ -1,4 +1,4 @@
-// --- Twake default colors --- //
+// --- Tdrive default colors --- //
 @black: #000000;
 @black-alpha-50: #18295288;
 @black-alpha-70: #18295255;
diff --git a/twake/frontend/src/app/styles/fonts.less b/twake/frontend/src/app/styles/fonts.less
index f30cd862..f77274d4 100644
--- a/twake/frontend/src/app/styles/fonts.less
+++ b/twake/frontend/src/app/styles/fonts.less
@@ -1,4 +1,4 @@
-// --- Twake fonts --- //
+// --- Tdrive fonts --- //
 
 // 'Inter' = Default
 // Helvetica Neue = Other alphabets fallback
diff --git a/twake/frontend/src/app/styles/shadows.less b/twake/frontend/src/app/styles/shadows.less
index 16c5de90..cbca4a10 100644
--- a/twake/frontend/src/app/styles/shadows.less
+++ b/twake/frontend/src/app/styles/shadows.less
@@ -1,4 +1,4 @@
-// --- Twake shadows --- //
+// --- Tdrive shadows --- //
 @checkbox-shadow: 0px 0px 20px rgba(0, 0, 0, 0.15);
 @box-shadow-base: 0 2px 15px rgba(0, 0, 0, 0.3); //0 2px 4px rgba(0, 0, 0, 0.5)
 @box-shadow-large: 0 2px 15px rgba(0, 0, 0, 0.2); //0 2px 4px rgba(0, 0, 0, 0.5)
diff --git a/twake/frontend/src/app/styles/sizes.less b/twake/frontend/src/app/styles/sizes.less
index 0c116da6..9eee0b79 100644
--- a/twake/frontend/src/app/styles/sizes.less
+++ b/twake/frontend/src/app/styles/sizes.less
@@ -1,4 +1,4 @@
-// --- Twake sizes --- //
+// --- Tdrive sizes --- //
 @border-radius-small: 4px;
 @border-radius-base: 8px;
 @border-radius-large: 20px;
diff --git a/twake/frontend/src/app/styles/themes/dark.less b/twake/frontend/src/app/styles/themes/dark.less
index 440779f2..dbfcb223 100755
--- a/twake/frontend/src/app/styles/themes/dark.less
+++ b/twake/frontend/src/app/styles/themes/dark.less
@@ -1,9 +1,9 @@
 /*! ==UserStyle==
- * @name        Twake Dark Mode
+ * @name        Tdrive Dark Mode
  * @namespace   github.com/chamerling/userstyles
  * @version     0.0.6
  * @homepageURL https://github.com/chamerling/userstyles/
- * @updateURL   https://github.com/chamerling/userstyles/raw/main/themes/web.twake.app/dark.user.css
+ * @updateURL   https://github.com/chamerling/userstyles/raw/main/themes/web.tdrive.app/dark.user.css
  * @license     MIT
  * @author      chamerling
  * ==/UserStyle== */
@@ -34,7 +34,7 @@
     --nord14: #a3be8c;
     --nord15: #b48ead;
 
-    /* Twake variables */
+    /* Tdrive variables */
     --primary: @primary;
     --primary-hover: var(--nord10);
     --secondary: var(--nord0);
diff --git a/twake/frontend/src/app/views/client/body/drive/browser.tsx b/twake/frontend/src/app/views/client/body/drive/browser.tsx
index f42665b6..82c309fe 100644
--- a/twake/frontend/src/app/views/client/body/drive/browser.tsx
+++ b/twake/frontend/src/app/views/client/body/drive/browser.tsx
@@ -4,7 +4,7 @@ import { Base, BaseSmall, Subtitle, Title } from 'app/atoms/text';
 import Menu from 'app/components/menus/menu';
 import { getFilesTree } from 'app/components/uploads/file-tree-utils';
 import UploadZone from 'app/components/uploads/upload-zone';
-import { setTwakeTabToken } from 'app/features/drive/api-client/api-client';
+import { setTdriveTabToken } from 'app/features/drive/api-client/api-client';
 import { useDriveItem } from 'app/features/drive/hooks/use-drive-item';
 import { DriveRealtimeObject } from 'app/features/drive/hooks/use-drive-realtime';
 import { useDriveUpload } from 'app/features/drive/hooks/use-drive-upload';
@@ -34,15 +34,15 @@ export const DriveCurrentFolderAtom = atomFamily<string, string>({
 export default memo(
   ({
     initialParentId,
-    twakeTabContextToken,
+    tdriveTabContextToken,
     inPublicSharing,
   }: {
     initialParentId?: string;
-    twakeTabContextToken?: string;
+    tdriveTabContextToken?: string;
     inPublicSharing?: boolean;
   }) => {
     const companyId = useRouterCompany();
-    setTwakeTabToken(twakeTabContextToken || null);
+    setTdriveTabToken(tdriveTabContextToken || null);
 
     const [parentId, _setParentId] = useRecoilState(
       DriveCurrentFolderAtom(initialParentId || 'root'),
diff --git a/twake/frontend/src/app/views/client/body/drive/modals/create/index.tsx b/twake/frontend/src/app/views/client/body/drive/modals/create/index.tsx
index 584d7e0b..3c3368b3 100644
--- a/twake/frontend/src/app/views/client/body/drive/modals/create/index.tsx
+++ b/twake/frontend/src/app/views/client/body/drive/modals/create/index.tsx
@@ -100,11 +100,11 @@ export const CreateModal = ({
               />
 
               {(applications || [])
-                .filter(app => app.display?.twake?.files?.editor?.empty_files?.length)
+                .filter(app => app.display?.tdrive?.files?.editor?.empty_files?.length)
                 .reduce(
                   (a, app) => [
                     ...a,
-                    ...(app.display?.twake?.files?.editor?.empty_files || [])
+                    ...(app.display?.tdrive?.files?.editor?.empty_files || [])
                       .filter(ef => ef?.filename)
                       .map(ef => ({
                         app,
diff --git a/twake/frontend/src/app/views/client/body/drive/modals/update-access/internal-access.tsx b/twake/frontend/src/app/views/client/body/drive/modals/update-access/internal-access.tsx
index 4153fc12..1a6e9c3e 100644
--- a/twake/frontend/src/app/views/client/body/drive/modals/update-access/internal-access.tsx
+++ b/twake/frontend/src/app/views/client/body/drive/modals/update-access/internal-access.tsx
@@ -87,7 +87,7 @@ export const InternalAccessManager = ({ id, disabled }: { id: string; disabled:
               <Base>Channel access</Base>
               <br />
               <Info>
-                {channelEntities.length} channel(s) from Twake chat have access to this item.
+                {channelEntities.length} channel(s) from Tdrive chat have access to this item.
               </Info>
             </div>
             <div className="shrink-0 ml-2">
@@ -112,7 +112,7 @@ export const InternalAccessManager = ({ id, disabled }: { id: string; disabled:
                         //Do nothing
                       },
                       {
-                        text: 'You will need to go to Twake chat to give back access to this item.',
+                        text: 'You will need to go to Tdrive chat to give back access to this item.',
                       },
                     );
                   } else {
diff --git a/twake/frontend/src/app/views/client/body/drive/shared.tsx b/twake/frontend/src/app/views/client/body/drive/shared.tsx
index 4188cb51..89509520 100755
--- a/twake/frontend/src/app/views/client/body/drive/shared.tsx
+++ b/twake/frontend/src/app/views/client/body/drive/shared.tsx
@@ -53,11 +53,11 @@ export default () => {
           </span>
         </div>
         <div className="shrink-0">
-          <a href="https://twake.app" target="_BLANK" rel="noreferrer" className="!text-white">
+          <a href="https://tdrive.app" target="_BLANK" rel="noreferrer" className="!text-white">
             <span className="nomobile text-white">
               {Languages.t('scenes.app.mainview.create_account')}
             </span>
-            Twake Workplace &nbsp; 👉
+            Tdrive Workplace &nbsp; 👉
           </a>
         </div>
       </div>
diff --git a/twake/frontend/src/app/views/client/popup/AddUser/AddUser.scss b/twake/frontend/src/app/views/client/popup/AddUser/AddUser.scss
index 557a91ee..32f5743a 100755
--- a/twake/frontend/src/app/views/client/popup/AddUser/AddUser.scss
+++ b/twake/frontend/src/app/views/client/popup/AddUser/AddUser.scss
@@ -128,7 +128,7 @@
   justify-content: space-between;
 }
 
-.add-user-from-twake-console {
+.add-user-from-tdrive-console {
   display: flex;
   flex-direction: column;
   justify-content: center;
diff --git a/twake/frontend/src/app/views/client/popup/AddUser/AddUserByEmail.tsx b/twake/frontend/src/app/views/client/popup/AddUser/AddUserByEmail.tsx
index 37b76d24..1a0810d6 100644
--- a/twake/frontend/src/app/views/client/popup/AddUser/AddUserByEmail.tsx
+++ b/twake/frontend/src/app/views/client/popup/AddUser/AddUserByEmail.tsx
@@ -78,7 +78,7 @@ export default (props: PropsType): JSX.Element => {
   }, [company.stats?.total_members]);
 
   return (
-    <div className="add-user-from-twake-console">
+    <div className="add-user-from-tdrive-console">
       <Typography.Title level={3}>
         {Languages.t('scenes.app.workspaces.create_company.invitations.title_2')}{' '}
       </Typography.Title>
@@ -99,7 +99,7 @@ export default (props: PropsType): JSX.Element => {
         />
       </div>
       <div className="current-user-state small-text small-top-margin">
-        {Languages.t('scenes.app.popup.adduserfromtwakeconsole.current_users_state', [
+        {Languages.t('scenes.app.popup.adduserfromtdriveconsole.current_users_state', [
           emails.length || 0,
         ])}
       </div>
diff --git a/twake/frontend/src/app/views/client/popup/UserParameter/UserParameter.jsx b/twake/frontend/src/app/views/client/popup/UserParameter/UserParameter.jsx
index 121e1c18..00320183 100755
--- a/twake/frontend/src/app/views/client/popup/UserParameter/UserParameter.jsx
+++ b/twake/frontend/src/app/views/client/popup/UserParameter/UserParameter.jsx
@@ -639,7 +639,7 @@ export default class UserParameter extends Component {
                   text: this.state.i18n.t('scenes.apps.account.assistant.title'),
                   emoji: ':robot:',
                   hide:
-                    document.location.origin === 'https://web.twake.app' &&
+                    document.location.origin === 'https://web.tdrive.app' &&
                     workspaceService.currentGroupId !== '56393af2-e5fe-11e9-b894-0242ac120004',
                   selected: this.state.page === 4 ? 'selected' : '',
                   onClick: () => {
diff --git a/twake/frontend/src/app/views/client/popup/WorkspaceParameter/Pages/Applications/CompanyApplicationPopup.tsx b/twake/frontend/src/app/views/client/popup/WorkspaceParameter/Pages/Applications/CompanyApplicationPopup.tsx
index 4a5acf36..7ea66c00 100644
--- a/twake/frontend/src/app/views/client/popup/WorkspaceParameter/Pages/Applications/CompanyApplicationPopup.tsx
+++ b/twake/frontend/src/app/views/client/popup/WorkspaceParameter/Pages/Applications/CompanyApplicationPopup.tsx
@@ -57,9 +57,9 @@ const InformationsDescriptions = ({ application }: { application: Application })
         <Text type="secondary">{createdDate}</Text>
       </Item>
 
-      <Item label="Compatible with Twake" span={3}>
+      <Item label="Compatible with Tdrive" span={3}>
         <Text type="secondary">
-          {application.identity.compatibility.includes('twake')
+          {application.identity.compatibility.includes('tdrive')
             ? 'Yes'
             : `No, this integration is compatible with ${application.identity.compatibility
                 .map(v => capitalize(v))
diff --git a/twake/frontend/src/app/views/client/popup/WorkspaceParameter/Pages/Applications/CompanyApplicationsTable.tsx b/twake/frontend/src/app/views/client/popup/WorkspaceParameter/Pages/Applications/CompanyApplicationsTable.tsx
index 630b3678..f6681c6d 100644
--- a/twake/frontend/src/app/views/client/popup/WorkspaceParameter/Pages/Applications/CompanyApplicationsTable.tsx
+++ b/twake/frontend/src/app/views/client/popup/WorkspaceParameter/Pages/Applications/CompanyApplicationsTable.tsx
@@ -137,7 +137,7 @@ export default () => {
         const { key, ...application } = record;
         return (
           <div style={{ float: 'right' }}>
-            {!!(application.display?.twake?.configuration || []).includes('global') && (
+            {!!(application.display?.tdrive?.configuration || []).includes('global') && (
               <Button
                 type="ghost"
                 style={{ marginRight: 8 }}
diff --git a/twake/frontend/src/app/views/client/popup/WorkspaceParameter/Pages/CreateCompanyAccount.jsx b/twake/frontend/src/app/views/client/popup/WorkspaceParameter/Pages/CreateCompanyAccount.jsx
index 6c04f203..319a3eb1 100755
--- a/twake/frontend/src/app/views/client/popup/WorkspaceParameter/Pages/CreateCompanyAccount.jsx
+++ b/twake/frontend/src/app/views/client/popup/WorkspaceParameter/Pages/CreateCompanyAccount.jsx
@@ -116,7 +116,7 @@ export default class CreateCompanyAccount extends Component {
             {Languages.t(
               'scenes.apps.account.message_temporary',
               [],
-              'A temporary account works like a normal Twake account, but you generate its password and you will be able to reset it if necessary.',
+              'A temporary account works like a normal Tdrive account, but you generate its password and you will be able to reset it if necessary.',
             )}
             <br />
             {Languages.t(
diff --git a/twake/frontend/src/app/views/client/popup/application-parameters/pages/TwacodeTester.jsx b/twake/frontend/src/app/views/client/popup/application-parameters/pages/TwacodeTester.jsx
index c0fb57b1..b3a8fd99 100755
--- a/twake/frontend/src/app/views/client/popup/application-parameters/pages/TwacodeTester.jsx
+++ b/twake/frontend/src/app/views/client/popup/application-parameters/pages/TwacodeTester.jsx
@@ -55,7 +55,7 @@ export default class TwacodeTester extends Component {
 
           <div className="smalltext">
             {Languages.t(
-              'scenes.app.popup.appsparameters.pages.instruction_message_twakecode',
+              'scenes.app.popup.appsparameters.pages.instruction_message_tdrivecode',
               [],
               'Commencez par écrire votre message sous le format JSON.',
             )}
@@ -94,7 +94,7 @@ export default class TwacodeTester extends Component {
             {this.state.display_json_error && (
               <span>
                 {Languages.t(
-                  'scenes.app.popup.appsparameters.pages.error_Json_Ttwakecode',
+                  'scenes.app.popup.appsparameters.pages.error_Json_Ttdrivecode',
                   [],
                   'Il y a une erreur dans votre JSON.',
                 )}
diff --git a/twake/frontend/src/app/views/client/popup/application-parameters/pages/WorkspaceAppsEditor.jsx b/twake/frontend/src/app/views/client/popup/application-parameters/pages/WorkspaceAppsEditor.jsx
index 34313d56..8018a3bd 100755
--- a/twake/frontend/src/app/views/client/popup/application-parameters/pages/WorkspaceAppsEditor.jsx
+++ b/twake/frontend/src/app/views/client/popup/application-parameters/pages/WorkspaceAppsEditor.jsx
@@ -205,8 +205,8 @@ export default props => {
           <div className="smalltext" style={{ opacity: 1 }}>
             <Emojione type={':exploding_head:'} /> If you do not know how to fill these, go to{' '}
             {/* eslint-disable-next-line react/jsx-no-target-blank */}
-            <a href="https://doc.twake.app" target="_blank" rel="noreferrer">
-              the Twake API documentation
+            <a href="https://doc.tdrive.app" target="_blank" rel="noreferrer">
+              the Tdrive API documentation
             </a>{' '}
             !
           </div>
@@ -348,7 +348,7 @@ export default props => {
               description={Languages.t(
                 'scenes.app.popup.appsparameters.pages.api_data_description',
                 [],
-                "Données utiles pour l'API Twake.",
+                "Données utiles pour l'API Tdrive.",
               )}
             >
               <div className="parameters_form" style={{ maxWidth: 'none', paddingTop: 10 }}>
@@ -390,7 +390,7 @@ export default props => {
                   )}
                 </div>
                 <Input
-                  placeholder={'https://domain.com/api/twake/events'}
+                  placeholder={'https://domain.com/api/tdrive/events'}
                   type="text"
                   disabled={loading}
                   value={application.api_event_url}
@@ -557,7 +557,7 @@ export default props => {
                 {Languages.t(
                   'scenes.app.popup.appsparameters.pages.parameters_form_small_text',
                   [],
-                  "L'application non publiée ne fonctionnera que dans votre entreprise, si vous souhaitez la rendre disponible à tous les utilisateurs de Twake activez cette option.",
+                  "L'application non publiée ne fonctionnera que dans votre entreprise, si vous souhaitez la rendre disponible à tous les utilisateurs de Tdrive activez cette option.",
                 )}
               </div>
 
@@ -567,7 +567,7 @@ export default props => {
                   {Languages.t(
                     'scenes.app.popup.appsparameters.pages.available_publication_alert',
                     [],
-                    'La publication de votre application est actuellement en attente de validation par les équipes de Twake.',
+                    'La publication de votre application est actuellement en attente de validation par les équipes de Tdrive.',
                   )}
                 </div>
               )}
diff --git a/twake/frontend/src/app/views/client/popup/application-parameters/pages/application-editor/components/application-access.tsx b/twake/frontend/src/app/views/client/popup/application-parameters/pages/application-editor/components/application-access.tsx
index 19b714e0..1a52d160 100644
--- a/twake/frontend/src/app/views/client/popup/application-parameters/pages/application-editor/components/application-access.tsx
+++ b/twake/frontend/src/app/views/client/popup/application-parameters/pages/application-editor/components/application-access.tsx
@@ -23,7 +23,7 @@ export const ApplicationAccess = ({
   return (
     <>
       <Row>
-        <Title level={3}>{Languages.t('twake.application.access.title')}</Title>
+        <Title level={3}>{Languages.t('tdrive.application.access.title')}</Title>
       </Row>
       <Row className="small-bottom-margin">
         <ApplicationHelp />
@@ -47,7 +47,7 @@ export const ApplicationAccess = ({
               />
             ) : (
               <Text type="secondary">
-                {Languages.t('twake.application.access.no_default_scopes_available', [key])}
+                {Languages.t('tdrive.application.access.no_default_scopes_available', [key])}
               </Text>
             )}
           </div>
diff --git a/twake/frontend/src/app/views/client/popup/application-parameters/pages/application-editor/components/application-api.tsx b/twake/frontend/src/app/views/client/popup/application-parameters/pages/application-editor/components/application-api.tsx
index cd295528..c9ef6a7d 100644
--- a/twake/frontend/src/app/views/client/popup/application-parameters/pages/application-editor/components/application-api.tsx
+++ b/twake/frontend/src/app/views/client/popup/application-parameters/pages/application-editor/components/application-api.tsx
@@ -53,7 +53,7 @@ export const ApplicationAPI = ({
       </Row>
       <Row className="bottom-margin">
         <Input
-          placeholder={'https://domain.com/api/twake/events'}
+          placeholder={'https://domain.com/api/tdrive/events'}
           defaultValue={application.api?.hooks_url}
           onChange={e => {
             e.target.value &&
diff --git a/twake/frontend/src/app/views/client/popup/application-parameters/pages/application-editor/components/application-help.tsx b/twake/frontend/src/app/views/client/popup/application-parameters/pages/application-editor/components/application-help.tsx
index db60410f..3eb67732 100644
--- a/twake/frontend/src/app/views/client/popup/application-parameters/pages/application-editor/components/application-help.tsx
+++ b/twake/frontend/src/app/views/client/popup/application-parameters/pages/application-editor/components/application-help.tsx
@@ -10,7 +10,7 @@ export const ApplicationHelp = () => (
     <Text type="secondary">
       <Emojione type=":exploding_head:" />{' '}
       {Languages.t('scenes.app.popup.appsparameters.pages.application_editor.help_text')}
-      <Link onClick={() => window.open('https://doc.twake.app', 'blank')}>
+      <Link onClick={() => window.open('https://doc.tdrive.app', 'blank')}>
         {Languages.t('scenes.app.popup.appsparameters.pages.application_editor.help_link')}
       </Link>
     </Text>
diff --git a/twake/frontend/src/app/views/client/viewer/display.tsx b/twake/frontend/src/app/views/client/viewer/display.tsx
index f31ad900..33c03faf 100644
--- a/twake/frontend/src/app/views/client/viewer/display.tsx
+++ b/twake/frontend/src/app/views/client/viewer/display.tsx
@@ -39,7 +39,7 @@ export default () => {
     return <ArchiveDisplay download={download} name={name} />;
   }
 
-  // /* Uncomment after https://github.com/linagora/Twake/issues/2453 is done
+  // /* Uncomment after https://github.com/linagora/Tdrive/issues/2453 is done
   if (type) {
     return <OtherDisplay download={download} name={name} id={id} />;
   }
diff --git a/twake/frontend/src/app/views/client/viewer/other/editors-service.ts b/twake/frontend/src/app/views/client/viewer/other/editors-service.ts
index 7105096c..b386a413 100644
--- a/twake/frontend/src/app/views/client/viewer/other/editors-service.ts
+++ b/twake/frontend/src/app/views/client/viewer/other/editors-service.ts
@@ -21,8 +21,8 @@ export const useEditors = (
   const { applications } = useCompanyApplications();
   const apps = applications.filter(
     app =>
-      app.display?.twake?.files?.editor?.preview_url ||
-      app.display?.twake?.files?.editor?.edition_url,
+      app.display?.tdrive?.files?.editor?.preview_url ||
+      app.display?.tdrive?.files?.editor?.edition_url,
   );
 
   const preview_candidate: EditorType[] = [];
@@ -44,16 +44,16 @@ export const useEditors = (
   //Primary exts
   apps.forEach(app => {
     if (
-      (app.display?.twake?.files?.editor?.extensions || []).indexOf(
+      (app.display?.tdrive?.files?.editor?.extensions || []).indexOf(
         ((extension || '') + (options?.url ? '.url' : '')).toLocaleLowerCase(),
       ) >= 0
     ) {
-      if (app.display?.twake?.files?.editor?.edition_url) {
+      if (app.display?.tdrive?.files?.editor?.edition_url) {
         editor_candidate.push({ app });
       }
-      if (app.display?.twake?.files?.editor?.preview_url) {
+      if (app.display?.tdrive?.files?.editor?.preview_url) {
         preview_candidate.push({
-          url: app.display?.twake?.files?.editor?.preview_url,
+          url: app.display?.tdrive?.files?.editor?.preview_url,
           app: app,
         });
       }
@@ -66,7 +66,7 @@ export const useEditors = (
       return;
     }
 
-    window.open(getFileUrl(app.display?.twake?.files?.editor?.edition_url, fileId, driveId));
+    window.open(getFileUrl(app.display?.tdrive?.files?.editor?.edition_url, fileId, driveId));
   };
 
   const getPreviewUrl = (fileId: string): string => {
diff --git a/twake/frontend/src/app/views/error/index.tsx b/twake/frontend/src/app/views/error/index.tsx
index c19a8a2c..4a4f774c 100644
--- a/twake/frontend/src/app/views/error/index.tsx
+++ b/twake/frontend/src/app/views/error/index.tsx
@@ -26,10 +26,10 @@ export default () => {
       <div className="error_message skew_in_top_nobounce">
         <div className="title">
           <Emojione type="👨‍🚀" size={32} />{' '}
-          {Languages.t('scenes.error_on_twake', [], 'You found an error on the Twake platform !')}
+          {Languages.t('scenes.error_on_tdrive', [], 'You found an error on the Tdrive platform !')}
         </div>
         <div className="subtitle">
-          {Languages.t('scenes.no_panic', [], "Don't panic! Just reload this page to fix Twake.")}
+          {Languages.t('scenes.no_panic', [], "Don't panic! Just reload this page to fix Tdrive.")}
         </div>
         {state?.error?.name && (
           <div className="text">
diff --git a/twake/frontend/src/app/views/join/index.tsx b/twake/frontend/src/app/views/join/index.tsx
index 2d7cd1af..eac36bda 100644
--- a/twake/frontend/src/app/views/join/index.tsx
+++ b/twake/frontend/src/app/views/join/index.tsx
@@ -141,7 +141,7 @@ export default (): JSX.Element => {
                     👋
                   </span>
                 </Title>
-                <Text>{Languages.t('scenes.join.twake_description')}</Text>
+                <Text>{Languages.t('scenes.join.tdrive_description')}</Text>
                 <Divider />
 
                 {lockedInvitation && (
diff --git a/twake/frontend/src/app/views/login/internal/error/index.tsx b/twake/frontend/src/app/views/login/internal/error/index.tsx
index 4ce90dc8..715aada3 100755
--- a/twake/frontend/src/app/views/login/internal/error/index.tsx
+++ b/twake/frontend/src/app/views/login/internal/error/index.tsx
@@ -11,7 +11,7 @@ export default () => {
       <div className="error_message skew_in_top_nobounce">
         <div className="title">
           <Emojione type="❌" size={32} />{' '}
-          {Languages.t('scenes.login_error', [], 'There was an error while logging you into Twake')}
+          {Languages.t('scenes.login_error', [], 'There was an error while logging you into Tdrive')}
         </div>
         <div className="subtitle">{LoginService.parsed_error_code}</div>
 
diff --git a/twake/frontend/src/app/views/login/internal/internal-login.tsx b/twake/frontend/src/app/views/login/internal/internal-login.tsx
index 68a608d7..daf30246 100755
--- a/twake/frontend/src/app/views/login/internal/internal-login.tsx
+++ b/twake/frontend/src/app/views/login/internal/internal-login.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { Typography } from 'antd';
 
-import Globals from 'app/features/global/services/globals-twake-app-service';
+import Globals from 'app/features/global/services/globals-tdrive-app-service';
 import Languages from 'app/features/global/services/languages-service';
 import InitService from 'app/features/global/services/init-service';
 import LoginService from 'app/features/auth/login-service';
@@ -39,7 +39,7 @@ export default () => {
   return (
     <div className="loginPage">
       {server_infos_loaded && !server_infos?.configuration?.branding?.name && (
-        <div className="twake_logo" />
+        <div className="tdrive_logo" />
       )}
 
       {LoginService.state === 'error' && <Error />}
@@ -49,17 +49,17 @@ export default () => {
       {LoginService.state === 'forgot_password' && <ForgotPassword />}
 
       <div className={'app_version_footer '}>
-        <div className="version_name fade_in">Twake {Globals.version.version_name}</div>
+        <div className="version_name fade_in">Tdrive {Globals.version.version_name}</div>
         <div style={{ height: 20 }}>
           {server_infos_loaded && server_infos?.configuration?.branding?.name && (
             <div className="smalltext fade_in">
               {server_infos?.configuration?.branding?.name &&
                 Languages.t('scenes.login.footer.branding', [
                   server_infos?.configuration?.branding?.name,
-                  server_infos?.configuration?.branding.link || 'twake.app',
+                  server_infos?.configuration?.branding.link || 'tdrive.app',
                 ])}
-              <Typography.Link onClick={() => window.open('https://twakeapp.com', 'blank')}>
-                {Languages.t('scenes.login.footer.go_to_twake')}
+              <Typography.Link onClick={() => window.open('https://tdriveapp.com', 'blank')}>
+                {Languages.t('scenes.login.footer.go_to_tdrive')}
               </Typography.Link>
               {' - ' + Globals.version.version}
             </div>
@@ -67,9 +67,9 @@ export default () => {
           {server_infos_loaded && !server_infos?.configuration?.branding?.name && (
             <Typography.Link
               className="fade_in"
-              onClick={() => window.open('https://twakeapp.com', 'blank')}
+              onClick={() => window.open('https://tdriveapp.com', 'blank')}
             >
-              {Languages.t('scenes.login.footer.go_to_twake')}
+              {Languages.t('scenes.login.footer.go_to_tdrive')}
             </Typography.Link>
           )}
         </div>
diff --git a/twake/frontend/src/app/views/login/internal/login.scss b/twake/frontend/src/app/views/login/internal/login.scss
index 22955afb..a8ced199 100755
--- a/twake/frontend/src/app/views/login/internal/login.scss
+++ b/twake/frontend/src/app/views/login/internal/login.scss
@@ -1,5 +1,5 @@
 .loginPage {
-  .twake_logo {
+  .tdrive_logo {
     color: #fff;
     position: absolute;
     top: 45px;
diff --git a/twake/frontend/src/utils/browser-detect/detect.ts b/twake/frontend/src/utils/browser-detect/detect.ts
index e5a9e06e..f6739dd4 100644
--- a/twake/frontend/src/utils/browser-detect/detect.ts
+++ b/twake/frontend/src/utils/browser-detect/detect.ts
@@ -1,9 +1,9 @@
 import customProtocolCheck from 'custom-protocol-check';
 
 /**
- * checks if the twake app is installed in the system using the browser
+ * checks if the tdrive app is installed in the system using the browser
  *
- * @returns {boolean} true if the twake app is installed
+ * @returns {boolean} true if the tdrive app is installed
  */
 export const detect = async (path: string): Promise<boolean> => {
   return new Promise(resolve => {
diff --git a/twake/frontend/src/utils/browser-detect/index.ts b/twake/frontend/src/utils/browser-detect/index.ts
index 0d2c46ce..4d2a367e 100644
--- a/twake/frontend/src/utils/browser-detect/index.ts
+++ b/twake/frontend/src/utils/browser-detect/index.ts
@@ -4,9 +4,9 @@ import { getBrowserInformation } from './common';
 import { detect } from './detect';
 
 /**
- * Checks if the twake desktop app is installed in the system.
+ * Checks if the tdrive desktop app is installed in the system.
  *
- * @returns {Promise<boolean>} true if the twake app is installed
+ * @returns {Promise<boolean>} true if the tdrive app is installed
  */
 export async function detectDesktopAppPresence(
   path?: string,
@@ -34,5 +34,5 @@ export async function detectDesktopAppPresence(
     `Desktop app detection: target browser: ${targetBrowser?.name} on ${targetBrowser?.os}`,
   );
 
-  return await detect(path || 'twake://check');
+  return await detect(path || 'tdrive://check');
 }
diff --git a/twake/update_version.js b/twake/update_version.js
index 8a5a9ed1..cfe1d5cf 100755
--- a/twake/update_version.js
+++ b/twake/update_version.js
@@ -3,16 +3,16 @@
  */
 
 const versions = {
-  VERSION_NAME: process.env.TWAKE_VERSION_NAME || "Albatros",
-  VERSION: process.env.TWAKE_VERSION || "2023.Q1",
-  VERSION_DETAIL: process.env.TWAKE_VERSION_DETAIL || "2023.Q1.1223",
-  MIN_VERSION_WEB: process.env.TWAKE_MIN_VERSION_WEB || "2022.Q2.975",
-  MIN_VERSION_MOBILE: process.env.TWAKE_MIN_VERSION_MOBILE || "2022.Q2.975",
+  VERSION_NAME: process.env.Tdrive_VERSION_NAME || "Albatros",
+  VERSION: process.env.Tdrive_VERSION || "2023.Q1",
+  VERSION_DETAIL: process.env.Tdrive_VERSION_DETAIL || "2023.Q1.1223",
+  MIN_VERSION_WEB: process.env.Tdrive_MIN_VERSION_WEB || "2022.Q2.975",
+  MIN_VERSION_MOBILE: process.env.Tdrive_MIN_VERSION_MOBILE || "2022.Q2.975",
 };
 
 const files = [
   "frontend/src/app/environment/version.ts",
-  "backend/core/src/Twake/Core/Controller/Version.php",
+  "backend/core/src/Tdrive/Core/Controller/Version.php",
   "backend/node/src/version.ts",
   "../.github/workflows/publish-backend.yml",
   "../.github/workflows/publish-frontend.yml",