diff --git a/l10n/en-US/viewer.properties b/l10n/en-US/viewer.properties
index 4a95b937d..008035661 100644
--- a/l10n/en-US/viewer.properties
+++ b/l10n/en-US/viewer.properties
@@ -251,12 +251,12 @@ 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_free_text2.title=Text
+editor_free_text2_label=Text
+editor_ink2.title=Draw
+editor_ink2_label=Draw
 
-free_text_default_content=Enter text…
+free_text2_default_content=Start typing…
 
 # Editor Parameters
 editor_free_text_color=Color
@@ -266,6 +266,6 @@ editor_ink_thickness=Thickness
 editor_ink_opacity=Opacity
 
 # Editor aria
-editor_free_text_aria_label=FreeText Editor
-editor_ink_aria_label=Ink Editor
+editor_free_text2_aria_label=Text Editor
+editor_ink2_aria_label=Draw Editor
 editor_ink_canvas_aria_label=User-created image
diff --git a/src/display/editor/freetext.js b/src/display/editor/freetext.js
index 060a6380f..711f7cc9b 100644
--- a/src/display/editor/freetext.js
+++ b/src/display/editor/freetext.js
@@ -74,10 +74,9 @@ class FreeTextEditor extends AnnotationEditor {
 
   static initialize(l10n) {
     this._l10nPromise = new Map(
-      ["free_text_default_content", "editor_free_text_aria_label"].map(str => [
-        str,
-        l10n.get(str),
-      ])
+      ["free_text2_default_content", "editor_free_text2_aria_label"].map(
+        str => [str, l10n.get(str)]
+      )
     );
 
     const style = getComputedStyle(document.documentElement);
@@ -405,11 +404,11 @@ class FreeTextEditor extends AnnotationEditor {
     this.enableEditing();
 
     FreeTextEditor._l10nPromise
-      .get("editor_free_text_aria_label")
+      .get("editor_free_text2_aria_label")
       .then(msg => this.editorDiv?.setAttribute("aria-label", msg));
 
     FreeTextEditor._l10nPromise
-      .get("free_text_default_content")
+      .get("free_text2_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 09a54cfb8..66e3ad2bb 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_ink_canvas_aria_label", "editor_ink2_aria_label"].map(str => [
         str,
         l10n.get(str),
       ])
@@ -623,7 +623,7 @@ class InkEditor extends AnnotationEditor {
     super.render();
 
     InkEditor._l10nPromise
-      .get("editor_ink_aria_label")
+      .get("editor_ink2_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 257bfaae1..c91100600 100644
--- a/web/l10n_utils.js
+++ b/web/l10n_utils.js
@@ -82,9 +82,9 @@ 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",
+  free_text2_default_content: "Start typing…",
+  editor_free_text2_aria_label: "Text Editor",
+  editor_ink2_aria_label: "Draw Editor",
   editor_ink_canvas_aria_label: "User-created image",
 };
 
diff --git a/web/viewer.html b/web/viewer.html
index 0a54dea23..340057995 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -318,11 +318,11 @@ See https://github.com/adobe-type-tools/cmap-resources
                 <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_free_text2">
+                    <span data-l10n-id="editor_free_text2_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_ink2">
+                    <span data-l10n-id="editor_ink2_label">Draw</span>
                   </button>
                 </div>