diff --git a/DOCS/interface-changes/sub-ass-options.txt b/DOCS/interface-changes/sub-ass-options.txt
index 9e74cf4c67..8497471570 100644
--- a/DOCS/interface-changes/sub-ass-options.txt
+++ b/DOCS/interface-changes/sub-ass-options.txt
@@ -1 +1,2 @@
 rename `--sub-ass-line-spacing` to `--sub-line-spacing`
+rename `--sub-ass-shaper` to `--sub-shaper`
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index fe346d96f7..a190141da8 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -2524,7 +2524,7 @@ Subtitles
 ``--sub-line-spacing=<value>``
     Set line spacing value for SSA/ASS renderer.
 
-``--sub-ass-shaper=<simple|complex>``
+``--sub-shaper=<simple|complex>``
     Set the text layout engine used by libass.
 
     :simple:   uses Fribidi only, fast, doesn't render some languages correctly
diff --git a/options/options.c b/options/options.c
index b62b43f202..a722593da5 100644
--- a/options/options.c
+++ b/options/options.c
@@ -315,8 +315,8 @@ const struct m_sub_options mp_subtitle_sub_opts = {
             .flags = M_OPT_FILE | UPDATE_SUB_HARD},
         {"sub-ass-hinting", OPT_CHOICE(ass_hinting,
             {"none", 0}, {"light", 1}, {"normal", 2}, {"native", 3})},
-        {"sub-ass-shaper", OPT_CHOICE(ass_shaper,
-            {"simple", 0}, {"complex", 1})},
+        {"sub-shaper", OPT_CHOICE(sub_shaper, {"simple", 0}, {"complex", 1})},
+        {"sub-ass-shaper", OPT_REPLACED("sub-shaper")},
         {"sub-ass-prune-delay", OPT_DOUBLE(ass_prune_delay), M_RANGE(-1.0, DBL_MAX)},
         {"sub-ass-justify", OPT_BOOL(ass_justify)},
         {"sub-scale-by-window", OPT_BOOL(sub_scale_by_window)},
@@ -343,7 +343,7 @@ const struct m_sub_options mp_subtitle_sub_opts = {
         .ass_vsfilter_color_compat = 1,
         .ass_use_video_data = 2,
         .ass_video_aspect = 0,
-        .ass_shaper = 1,
+        .sub_shaper = 1,
         .use_embedded_fonts = true,
     },
     .change_flags = UPDATE_OSD,
diff --git a/options/options.h b/options/options.h
index 0175f4c2cc..e888b866fb 100644
--- a/options/options.h
+++ b/options/options.h
@@ -117,7 +117,7 @@ struct mp_subtitle_opts {
     char **ass_style_override_list;
     char *ass_styles_file;
     int ass_hinting;
-    int ass_shaper;
+    int sub_shaper;
     double ass_prune_delay;
     bool ass_justify;
     bool sub_clear_on_seek;
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index d5b610bac9..c7bb1e35e6 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -552,7 +552,7 @@ static void configure_ass(struct sd *sd, struct mp_osd_res *dim,
     }
     ass_set_use_margins(priv, set_use_margins);
     ass_set_line_position(priv, set_sub_pos);
-    ass_set_shaper(priv, opts->ass_shaper);
+    ass_set_shaper(priv, opts->sub_shaper);
     int set_force_flags = 0;
     if (total_override) {
         set_force_flags |= ASS_OVERRIDE_BIT_FONT_NAME