diff --git a/tmux.1 b/tmux.1
index bb7d80077..b5f7696c8 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1114,8 +1114,7 @@ the client has an independent active pane
 .It ignore\-size
 the client does not affect the size of other clients
 .It new\-window\-layouts
-the client receives the current layout serialization in control mode rather
-than the legacy serialization
+the client receives layouts in the new form rather than the old form
 .It no\-detach\-on\-destroy
 do not detach the client when the session it is attached to is destroyed if
 there are any other sessions
@@ -2690,7 +2689,7 @@ $ tmux select\-layout \[aq]aadd,v2:159x48+0+0{%0,0:79x48+0+0;%1,1:79x48+80+0}\[a
 .Pp
 .Nm
 automatically adjusts the size of the layout for the current window size.
-A current or legacy layout can be applied to a window with the same number or
+A layout in either form can be applied to a window with the same number or
 fewer panes; surplus layout cells are discarded.
 .Pp
 Commands related to windows and panes are as follows:
@@ -3401,7 +3400,7 @@ format variable.
 It is repeated for each pane from the same window.
 Its format is described under
 .Ic select\-layout .
-In control mode, it uses the legacy format unless the client has the
+In control mode, it uses the old form unless the client has the
 .Ql new\-window\-layouts
 flag.
 .Tg lsw
@@ -3445,7 +3444,7 @@ The default format includes the layout of each window, also available with the
 format variable.
 The format is described under
 .Ic select\-layout .
-In control mode, the legacy format is used unless the client has the
+In control mode, the old form is used unless the client has the
 .Ql new\-window\-layouts
 flag.
 .Pp
@@ -3976,7 +3975,7 @@ applies the last set layout if possible (undoes the most recent layout change).
 spreads the current pane and any panes next to it out evenly.
 .Pp
 .Ar layout\-name
-may be a serialized layout with an optional outer checksum followed by one
+may be a layout description with an optional outer checksum followed by one
 root layout cell:
 .Bd -literal -offset indent
 layout = [checksum,][v2:]cell
@@ -3984,13 +3983,13 @@ layout = [checksum,][v2:]cell
 .Pp
 The
 .Ql v2:
-prefix identifies the current format and is included in generated current
-layouts.
-It may be omitted when reading a current layout for compatibility with older
-output.
+prefix identifies the new form and is included in generated layouts using the
+new form.
+It may be omitted when reading a layout in the new form for compatibility
+with older output.
 An explicit
 .Ql v2:
-prefix may not be used with legacy cell syntax and unknown versions are
+prefix may not be used with the old cell form and unknown versions are
 rejected.
 .Pp
 A layout cell is either a container cell or a pane cell.
@@ -4042,7 +4041,7 @@ container = geometry{cell;cell;...}
 pane      = %pane-id,z-index:geometry[:flags]
 .Ed
 .Pp
-Pane IDs in the current format must be unique.
+Pane IDs in the new form must be unique.
 If the layout and target window have the same number of panes and the pane IDs
 exactly match those in the target window, panes are assigned by ID.
 If none match, panes are assigned in tree order, allowing a layout from another
@@ -4086,16 +4085,16 @@ For example, this layout contains two tiled panes and one floating pane:
 7749,v2:120x40+0+0{%0,1:60x40+0+0;%1,2:59x40+61+0;%2,0:28x8+11+6:f}
 .Ed
 .Pp
-The legacy format uses commas rather than semicolons to separate child cells
+The old form uses commas rather than semicolons to separate child cells
 and does not include z-indexes or flags:
 .Bd -literal -offset indent
-legacy-geometry = widthxheight,x,y
-cell            = legacy-geometry{cell,cell,...}
-                | legacy-geometry[cell,cell,...]
-                | legacy-geometry[,pane-id]
+old-geometry = widthxheight,x,y
+cell         = old-geometry{cell,cell,...}
+             | old-geometry[cell,cell,...]
+             | old-geometry[,pane-id]
 .Ed
 .Pp
-Pane IDs are optional in legacy layouts and are ignored when assigning panes.
+Pane IDs are optional in old layouts and are ignored when assigning panes.
 This permits layouts from versions of
 .Nm
 before pane IDs were added.
@@ -4111,21 +4110,21 @@ accepted and checked but are not generated by
 .Ic list\-windows .
 Version prefixes are accepted only on the outer layout, not on nested cells.
 A layout must use one form consistently.
-In a legacy layout, panes are treated as tiled, visible and unzoomed.
+In an old layout, panes are treated as tiled, visible and unzoomed.
 Outside control mode,
 .Ql window_layout
 and
 .Ql window_visible_layout
-generate the current format with a checksum.
-In control mode, they generate the legacy format by default; a client with the
+generate the new form with a checksum.
+In control mode, they generate the old form by default; a client with the
 .Ql new\-window\-layouts
-flag receives the current format instead.
+flag receives the new form instead.
 .Ic list\-windows
 uses
 .Ql window_layout
 for the layout in its default output.
 .Pp
-A serialized layout is a layout snapshot, not a complete session restoration.
+A layout description is a snapshot, not a complete saved session.
 It rearranges existing panes and windows but does not create panes or windows.
 .Pp
 Layouts for multiple windows may be prefixed by their window IDs and joined:
@@ -7455,7 +7454,7 @@ The following variables are available, where appropriate:
 .It Li "window_id" Ta "" Ta "Unique window ID"
 .It Li "window_index" Ta "#I" Ta "Index of window"
 .It Li "window_last_flag" Ta "" Ta "1 if window is the last used"
-.It Li "window_layout" Ta "" Ta "Window layout description (legacy by default in control mode)"
+.It Li "window_layout" Ta "" Ta "Window layout description (old form by default in control mode)"
 .It Li "window_linked" Ta "" Ta "1 if window is linked across sessions"
 .It Li "window_linked_sessions" Ta "" Ta "Number of sessions this window is linked to"
 .It Li "window_linked_sessions_list" Ta "" Ta "List of sessions this window is linked to"
@@ -7470,7 +7469,7 @@ The following variables are available, where appropriate:
 .It Li "window_silence_flag" Ta "" Ta "1 if window has silence alert"
 .It Li "window_stack_index" Ta "" Ta "Index in session most recent stack"
 .It Li "window_start_flag" Ta "" Ta "1 if window has the lowest index"
-.It Li "window_visible_layout" Ta "" Ta "Visible window layout description (legacy by default in control mode)"
+.It Li "window_visible_layout" Ta "" Ta "Visible window layout description (old form by default in control mode)"
 .It Li "window_width" Ta "" Ta "Width of window"
 .It Li "window_zoomed_flag" Ta "" Ta "1 if window is zoomed"
 .It Li "wrap_flag" Ta "" Ta "Pane wrap flag"
@@ -9017,9 +9016,9 @@ The window's visible layout is
 .Ar window\-visible\-layout
 and the window flags are
 .Ar window\-flags .
-The layouts use the legacy serialization unless the client has the
+The layouts use the old form unless the client has the
 .Ql new\-window\-layouts
-flag, in which case they use the current serialization.
+flag, in which case they use the new form.
 .It Ic %message Ar message
 A message sent with the
 .Ic display\-message