4 files changed, 27 insertions, 27 deletions

diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts
index 376143cb8..cfb750bc9 100644
--- a/server/controllers/api/config.ts
+++ b/server/controllers/api/config.ts
@@ -259,8 +259,8 @@ function customConfig (): CustomConfig {
         }
       }
     },
-    videoEditor: {
-      enabled: CONFIG.VIDEO_EDITOR.ENABLED
+    videoStudio: {
+      enabled: CONFIG.VIDEO_STUDIO.ENABLED
     },
     import: {
       videos: {
diff --git a/server/controllers/api/users/my-notifications.ts b/server/controllers/api/users/my-notifications.ts
index 55184dc0f..6014cdbbf 100644
--- a/server/controllers/api/users/my-notifications.ts
+++ b/server/controllers/api/users/my-notifications.ts
@@ -83,7 +83,7 @@ async function updateNotificationSettings (req: express.Request, res: express.Re
     abuseStateChange: body.abuseStateChange,
     newPeerTubeVersion: body.newPeerTubeVersion,
     newPluginVersion: body.newPluginVersion,
-    myVideoEditionFinished: body.myVideoEditionFinished
+    myVideoStudioEditionFinished: body.myVideoStudioEditionFinished
   }
 
   await UserNotificationSettingModel.update(values, query)
diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts
index a5ae07d95..c7617093c 100644
--- a/server/controllers/api/videos/index.ts
+++ b/server/controllers/api/videos/index.ts
@@ -35,7 +35,7 @@ import { VideoModel } from '../../../models/video/video'
 import { blacklistRouter } from './blacklist'
 import { videoCaptionsRouter } from './captions'
 import { videoCommentRouter } from './comment'
-import { editorRouter } from './editor'
+import { studioRouter } from './studio'
 import { filesRouter } from './files'
 import { videoImportsRouter } from './import'
 import { liveRouter } from './live'
@@ -52,7 +52,7 @@ const videosRouter = express.Router()
 videosRouter.use('/', blacklistRouter)
 videosRouter.use('/', rateVideoRouter)
 videosRouter.use('/', videoCommentRouter)
-videosRouter.use('/', editorRouter)
+videosRouter.use('/', studioRouter)
 videosRouter.use('/', videoCaptionsRouter)
 videosRouter.use('/', videoImportsRouter)
 videosRouter.use('/', ownershipVideoRouter)
diff --git a/server/controllers/api/videos/editor.ts b/server/controllers/api/videos/studio.ts
index 588cc1a8c..bff344f3f 100644
--- a/server/controllers/api/videos/editor.ts
+++ b/server/controllers/api/videos/studio.ts
@@ -2,26 +2,26 @@ import express from 'express'
 import { createAnyReqFiles } from '@server/helpers/express-utils'
 import { MIMETYPES } from '@server/initializers/constants'
 import { JobQueue } from '@server/lib/job-queue'
-import { buildTaskFileFieldname, getTaskFile } from '@server/lib/video-editor'
+import { buildTaskFileFieldname, getTaskFile } from '@server/lib/video-studio'
 import {
   HttpStatusCode,
-  VideoEditionTaskPayload,
-  VideoEditorCreateEdition,
-  VideoEditorTask,
-  VideoEditorTaskCut,
-  VideoEditorTaskIntro,
-  VideoEditorTaskOutro,
-  VideoEditorTaskWatermark,
-  VideoState
+  VideoState,
+  VideoStudioCreateEdition,
+  VideoStudioTask,
+  VideoStudioTaskCut,
+  VideoStudioTaskIntro,
+  VideoStudioTaskOutro,
+  VideoStudioTaskPayload,
+  VideoStudioTaskWatermark
 } from '@shared/models'
-import { asyncMiddleware, authenticate, videosEditorAddEditionValidator } from '../../../middlewares'
+import { asyncMiddleware, authenticate, videoStudioAddEditionValidator } from '../../../middlewares'
 
-const editorRouter = express.Router()
+const studioRouter = express.Router()
 
 const tasksFiles = createAnyReqFiles(
   MIMETYPES.VIDEO.MIMETYPE_EXT,
   (req: express.Request, file: Express.Multer.File, cb: (err: Error, result?: boolean) => void) => {
-    const body = req.body as VideoEditorCreateEdition
+    const body = req.body as VideoStudioCreateEdition
 
     // Fetch array element
     const matches = file.fieldname.match(/tasks\[(\d+)\]/)
@@ -43,24 +43,24 @@ const tasksFiles = createAnyReqFiles(
   }
 )
 
-editorRouter.post('/:videoId/editor/edit',
+studioRouter.post('/:videoId/studio/edit',
   authenticate,
   tasksFiles,
-  asyncMiddleware(videosEditorAddEditionValidator),
+  asyncMiddleware(videoStudioAddEditionValidator),
   asyncMiddleware(createEditionTasks)
 )
 
 // ---------------------------------------------------------------------------
 
 export {
-  editorRouter
+  studioRouter
 }
 
 // ---------------------------------------------------------------------------
 
 async function createEditionTasks (req: express.Request, res: express.Response) {
   const files = req.files as Express.Multer.File[]
-  const body = req.body as VideoEditorCreateEdition
+  const body = req.body as VideoStudioCreateEdition
   const video = res.locals.videoAll
 
   video.state = VideoState.TO_EDIT
@@ -71,13 +71,13 @@ async function createEditionTasks (req: express.Request, res: express.Response)
     tasks: body.tasks.map((t, i) => buildTaskPayload(t, i, files))
   }
 
-  JobQueue.Instance.createJob({ type: 'video-edition', payload })
+  JobQueue.Instance.createJob({ type: 'video-studio-edition', payload })
 
   return res.sendStatus(HttpStatusCode.NO_CONTENT_204)
 }
 
 const taskPayloadBuilders: {
-  [id in VideoEditorTask['name']]: (task: VideoEditorTask, indice?: number, files?: Express.Multer.File[]) => VideoEditionTaskPayload
+  [id in VideoStudioTask['name']]: (task: VideoStudioTask, indice?: number, files?: Express.Multer.File[]) => VideoStudioTaskPayload
 } = {
   'add-intro': buildIntroOutroTask,
   'add-outro': buildIntroOutroTask,
@@ -85,11 +85,11 @@ const taskPayloadBuilders: {
   'add-watermark': buildWatermarkTask
 }
 
-function buildTaskPayload (task: VideoEditorTask, indice: number, files: Express.Multer.File[]): VideoEditionTaskPayload {
+function buildTaskPayload (task: VideoStudioTask, indice: number, files: Express.Multer.File[]): VideoStudioTaskPayload {
   return taskPayloadBuilders[task.name](task, indice, files)
 }
 
-function buildIntroOutroTask (task: VideoEditorTaskIntro | VideoEditorTaskOutro, indice: number, files: Express.Multer.File[]) {
+function buildIntroOutroTask (task: VideoStudioTaskIntro | VideoStudioTaskOutro, indice: number, files: Express.Multer.File[]) {
   return {
     name: task.name,
     options: {
@@ -98,7 +98,7 @@ function buildIntroOutroTask (task: VideoEditorTaskIntro | VideoEditorTaskOutro,
   }
 }
 
-function buildCutTask (task: VideoEditorTaskCut) {
+function buildCutTask (task: VideoStudioTaskCut) {
   return {
     name: task.name,
     options: {
@@ -108,7 +108,7 @@ function buildCutTask (task: VideoEditorTaskCut) {
   }
 }
 
-function buildWatermarkTask (task: VideoEditorTaskWatermark, indice: number, files: Express.Multer.File[]) {
+function buildWatermarkTask (task: VideoStudioTaskWatermark, indice: number, files: Express.Multer.File[]) {
   return {
     name: task.name,
     options: {