diff --git a/client/src/app/+video-studio/edit/video-studio-edit.component.html b/client/src/app/+video-studio/edit/video-studio-edit.component.html
index f50553cde..f6abf679f 100644
--- a/client/src/app/+video-studio/edit/video-studio-edit.component.html
+++ b/client/src/app/+video-studio/edit/video-studio-edit.component.html
@@ -68,8 +68,8 @@
 
       <my-button
         theme="primary" i18n-label label="Apply edits" icon="circle-tick"
-        (click)="runEdition()" (keydown.enter)="runEdition()"
-        [disabled]="!form.valid || isRunningEdition || noEdition()"
+        (click)="runEdit()" (keydown.enter)="runEdit()"
+        [disabled]="!form.valid || isRunningEdit || noEdit()"
       ></my-button>
     </form>
 
@@ -78,7 +78,7 @@
       <my-embed [video]="video"></my-embed>
     </div>
 
-    <div class="tasks-container" *ngIf="!noEdition()">
+    <div class="tasks-container" *ngIf="!noEdit()">
       <div class="mb-1 fw-bold" i18n>Edits to apply:</div>
 
       <ol>
diff --git a/client/src/app/+video-studio/edit/video-studio-edit.component.ts b/client/src/app/+video-studio/edit/video-studio-edit.component.ts
index a02d8e90e..063bcd671 100644
--- a/client/src/app/+video-studio/edit/video-studio-edit.component.ts
+++ b/client/src/app/+video-studio/edit/video-studio-edit.component.ts
@@ -34,7 +34,7 @@ import { GlobalIconComponent } from '@app/shared/shared-icons/global-icon.compon
   ]
 })
 export class VideoStudioEditComponent extends FormReactive implements OnInit {
-  isRunningEditing = false
+  isRunningEdit = false
 
   video: VideoDetails
 
@@ -86,10 +86,10 @@ export class VideoStudioEditComponent extends FormReactive implements OnInit {
     return this.serverService.getHTMLConfig().video.image.extensions
   }
 
-  async runEditing () {
-    if (this.isRunningEditing) return
+  async runEdit () {
+    if (this.isRunningEdit) return
     if (!this.form.valid) return
-    if (this.noEditing()) return
+    if (this.noEdit()) return
 
     const title = $localize`Are you sure you want to edit "${this.video.name}"?`
     const listHTML = this.getTasksSummary().map(t => `<li>${t}</li>`).join('')
@@ -100,7 +100,7 @@ export class VideoStudioEditComponent extends FormReactive implements OnInit {
 
     if (await this.confirmService.confirm(confirmHTML, title) !== true) return
 
-    this.isRunningEditing = true
+    this.isRunningEdit = true
 
     const tasks = this.buildTasks()
 
@@ -117,7 +117,7 @@ export class VideoStudioEditComponent extends FormReactive implements OnInit {
 
         error: err => {
           this.loadingBar.useRef().complete()
-          this.isRunningEditing = false
+          this.isRunningEdit = false
           this.notifier.error(err.message)
           logger.error(err)
         }
@@ -132,7 +132,7 @@ export class VideoStudioEditComponent extends FormReactive implements OnInit {
     return $localize`(extensions: ${this.imageExtensions.join(', ')})`
   }
 
-  noEditing () {
+  noEdit () {
     return this.buildTasks().length === 0
   }
 
diff --git a/client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.html b/client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.html
index fb9d8be1c..31fef6066 100644
--- a/client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.html
+++ b/client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.html
@@ -17,7 +17,7 @@
       <div class="d-flex justify-content-between align-items-center mb-3 ms-2">
         <my-peertube-checkbox
           inputName="raw-edition"
-          [(ngModel)]="rawEdition" (ngModelChange)="onRawEditionSwitch()"
+          [(ngModel)]="rawEdit" (ngModelChange)="onRawEditSwitch()"
           i18n-labelText labelText="Edit raw"
         ></my-peertube-checkbox>
 
diff --git a/server/core/initializers/constants.ts b/server/core/initializers/constants.ts
index 8c86281d2..4b46a8f51 100644
--- a/server/core/initializers/constants.ts
+++ b/server/core/initializers/constants.ts
@@ -1113,7 +1113,7 @@ export const TRACKER_RATE_LIMITS = {
 }
 
 // We use -2 instead of 2 because of historical reason
-// When p2p-media-loader bumps to v3, we'll be able to switch to it
+// When p2p-media-loader bumps to v3, we'll be able to switch to 3 directly
 export const P2P_MEDIA_LOADER_PEER_VERSION = -2
 
 // ---------------------------------------------------------------------------