diff --git a/l10n/en-US/viewer.properties b/l10n/en-US/viewer.properties
index 4a95b937d894cf..efa97af2f5c884 100644
--- a/l10n/en-US/viewer.properties
+++ b/l10n/en-US/viewer.properties
@@ -251,21 +251,21 @@ printing_not_ready=Warning: The PDF is not fully loaded for printing.
 web_fonts_disabled=Web fonts are disabled: unable to use embedded PDF fonts.
 
 # Editor
-editor_free_text.title=Add FreeText Annotation
-editor_free_text_label=FreeText Annotation
-editor_ink.title=Add Ink Annotation
-editor_ink_label=Ink Annotation
+editor_text.title=Text
+editor_text_label=Text
+editor_draw.title=Draw
+editor_draw_label=Draw
 
-free_text_default_content=Enter text…
+text_default_content=Start typing…
 
 # Editor Parameters
-editor_free_text_color=Color
-editor_free_text_size=Size
-editor_ink_color=Color
-editor_ink_thickness=Thickness
-editor_ink_opacity=Opacity
+editor_text_color=Color
+editor_text_size=Size
+editor_draw_color=Color
+editor_draw_thickness=Thickness
+editor_draw_opacity=Opacity
 
 # Editor aria
-editor_free_text_aria_label=FreeText Editor
-editor_ink_aria_label=Ink Editor
-editor_ink_canvas_aria_label=User-created image
+editor_text_aria_label=Text Editor
+editor_draw_aria_label=Draw Editor
+editor_draw_canvas_aria_label=User-created image
diff --git a/src/display/editor/freetext.js b/src/display/editor/freetext.js
index 060a6380f2fbc4..6b8df8c991cc60 100644
--- a/src/display/editor/freetext.js
+++ b/src/display/editor/freetext.js
@@ -74,7 +74,7 @@ class FreeTextEditor extends AnnotationEditor {
 
   static initialize(l10n) {
     this._l10nPromise = new Map(
-      ["free_text_default_content", "editor_free_text_aria_label"].map(str => [
+      ["text_default_content", "editor_text_aria_label"].map(str => [
         str,
         l10n.get(str),
       ])
@@ -405,11 +405,11 @@ class FreeTextEditor extends AnnotationEditor {
     this.enableEditing();
 
     FreeTextEditor._l10nPromise
-      .get("editor_free_text_aria_label")
+      .get("editor_text_aria_label")
       .then(msg => this.editorDiv?.setAttribute("aria-label", msg));
 
     FreeTextEditor._l10nPromise
-      .get("free_text_default_content")
+      .get("text_default_content")
       .then(msg => this.editorDiv?.setAttribute("default-content", msg));
     this.editorDiv.contentEditable = true;
 
diff --git a/src/display/editor/ink.js b/src/display/editor/ink.js
index 09a54cfb8db348..29e5ebcb6fd4bc 100644
--- a/src/display/editor/ink.js
+++ b/src/display/editor/ink.js
@@ -85,7 +85,7 @@ class InkEditor extends AnnotationEditor {
 
   static initialize(l10n) {
     this._l10nPromise = new Map(
-      ["editor_ink_canvas_aria_label", "editor_ink_aria_label"].map(str => [
+      ["editor_draw_canvas_aria_label", "editor_draw_aria_label"].map(str => [
         str,
         l10n.get(str),
       ])
@@ -589,7 +589,7 @@ class InkEditor extends AnnotationEditor {
     this.canvas.className = "inkEditorCanvas";
 
     InkEditor._l10nPromise
-      .get("editor_ink_canvas_aria_label")
+      .get("editor_draw_canvas_aria_label")
       .then(msg => this.canvas?.setAttribute("aria-label", msg));
     this.div.append(this.canvas);
     this.ctx = this.canvas.getContext("2d");
@@ -623,7 +623,7 @@ class InkEditor extends AnnotationEditor {
     super.render();
 
     InkEditor._l10nPromise
-      .get("editor_ink_aria_label")
+      .get("editor_draw_aria_label")
       .then(msg => this.div?.setAttribute("aria-label", msg));
 
     const [x, y, w, h] = this.#getInitialBBox();
diff --git a/web/l10n_utils.js b/web/l10n_utils.js
index 257bfaae17b1f1..1169807c5650b3 100644
--- a/web/l10n_utils.js
+++ b/web/l10n_utils.js
@@ -82,10 +82,10 @@ const DEFAULT_L10N_STRINGS = {
   web_fonts_disabled:
     "Web fonts are disabled: unable to use embedded PDF fonts.",
 
-  free_text_default_content: "Enter text…",
-  editor_free_text_aria_label: "FreeText Editor",
-  editor_ink_aria_label: "Ink Editor",
-  editor_ink_canvas_aria_label: "User-created image",
+  text_default_content: "Start typing…",
+  editor_text_aria_label: "Text",
+  editor_draw_aria_label: "Draw",
+  editor_draw_canvas_aria_label: "User-created image",
 };
 
 function getL10nFallback(key, args) {
diff --git a/web/viewer.html b/web/viewer.html
index 0a54dea23648b8..8576e935a3a17d 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -151,11 +151,11 @@
         <div class="editorParamsToolbar hidden doorHangerRight" id="editorFreeTextParamsToolbar">
           <div class="editorParamsToolbarContainer">
             <div class="editorParamsSetter">
-              <label for="editorFreeTextColor" class="editorParamsLabel" data-l10n-id="editor_free_text_color">Color</label>
+              <label for="editorFreeTextColor" class="editorParamsLabel" data-l10n-id="editor_text_color">Color</label>
               <input type="color" id="editorFreeTextColor" class="editorParamsColor" tabindex="100">
             </div>
             <div class="editorParamsSetter">
-              <label for="editorFreeTextFontSize" class="editorParamsLabel" data-l10n-id="editor_free_text_size">Size</label>
+              <label for="editorFreeTextFontSize" class="editorParamsLabel" data-l10n-id="editor_text_size">Size</label>
               <input type="range" id="editorFreeTextFontSize" class="editorParamsSlider" value="10" min="5" max="100" step="1" tabindex="101">
             </div>
           </div>
@@ -164,15 +164,15 @@
         <div class="editorParamsToolbar hidden doorHangerRight" id="editorInkParamsToolbar">
           <div class="editorParamsToolbarContainer">
             <div class="editorParamsSetter">
-              <label for="editorInkColor" class="editorParamsLabel" data-l10n-id="editor_ink_color">Color</label>
+              <label for="editorInkColor" class="editorParamsLabel" data-l10n-id="editor_draw_color">Color</label>
               <input type="color" id="editorInkColor" class="editorParamsColor" tabindex="102">
             </div>
             <div class="editorParamsSetter">
-              <label for="editorInkThickness" class="editorParamsLabel" data-l10n-id="editor_ink_thickness">Thickness</label>
+              <label for="editorInkThickness" class="editorParamsLabel" data-l10n-id="editor_draw_thickness">Thickness</label>
               <input type="range" id="editorInkThickness" class="editorParamsSlider" value="1" min="1" max="20" step="1" tabindex="103">
             </div>
             <div class="editorParamsSetter">
-              <label for="editorInkOpacity" class="editorParamsLabel" data-l10n-id="editor_ink_opacity">Opacity</label>
+              <label for="editorInkOpacity" class="editorParamsLabel" data-l10n-id="editor_draw_opacity">Opacity</label>
               <input type="range" id="editorInkOpacity" class="editorParamsSlider" value="100" min="1" max="100" step="1" tabindex="104">
             </div>
           </div>
@@ -318,11 +318,11 @@
                 <div class="verticalToolbarSeparator hiddenSmallView"></div>
 
                 <div id="editorModeButtons" class="splitToolbarButton toggled hidden" role="radiogroup">
-                  <button id="editorFreeText" class="toolbarButton" disabled="disabled" title="Add FreeText Annotation" role="radio" aria-checked="false" tabindex="36" data-l10n-id="editor_free_text">
-                    <span data-l10n-id="editor_free_text_label">FreeText Annotation</span>
+                  <button id="editorFreeText" class="toolbarButton" disabled="disabled" title="Text" role="radio" aria-checked="false" tabindex="36" data-l10n-id="editor_text">
+                    <span data-l10n-id="editor_text_label">Text</span>
                   </button>
-                  <button id="editorInk" class="toolbarButton" disabled="disabled" title="Add Ink Annotation" role="radio" aria-checked="false" tabindex="37" data-l10n-id="editor_ink">
-                    <span data-l10n-id="editor_ink_label">Ink Annotation</span>
+                  <button id="editorInk" class="toolbarButton" disabled="disabled" title="Draw" role="radio" aria-checked="false" tabindex="37" data-l10n-id="editor_draw">
+                    <span data-l10n-id="editor_draw_label">Draw</span>
                   </button>
                 </div>