diff --git a/man/man1/fzf.1 b/man/man1/fzf.1
index 929b161e..6c417482 100644
--- a/man/man1/fzf.1
+++ b/man/man1/fzf.1
@@ -534,7 +534,7 @@ color mappings.
          --color='pointer:#E12672,marker:#E17899,prompt:#98BEDE,hl+:#98BC99'\fR
 .RE
 .TP
-.B "--cursor-line"
+.B "--highlight-line"
 Highlight the whole current line
 .TP
 .B "--no-bold"
diff --git a/src/options.go b/src/options.go
index fda51cba..e2ddca6b 100644
--- a/src/options.go
+++ b/src/options.go
@@ -92,7 +92,7 @@ const Usage = `usage: fzf [options]
     --ansi                 Enable processing of ANSI color codes
     --tabstop=SPACES       Number of spaces for a tab character (default: 8)
     --color=COLSPEC        Base scheme (dark|light|16|bw) and/or custom colors
-    --cursor-line          Highlight the whole current line
+    --highlight-line       Highlight the whole current line
     --no-bold              Do not use bold text
 
   History
@@ -1950,9 +1950,9 @@ func parseOptions(opts *Options, allArgs []string) error {
 			opts.Layout = layoutDefault
 		case "--cycle":
 			opts.Cycle = true
-		case "--cursor-line":
+		case "--highlight-line":
 			opts.CursorLine = true
-		case "--no-cursor-line":
+		case "--no-highlight-line":
 			opts.CursorLine = false
 		case "--no-cycle":
 			opts.Cycle = false
diff --git a/src/terminal.go b/src/terminal.go
index 6fe90cae..93e5c6f4 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -235,7 +235,7 @@ type Terminal struct {
 	printQuery         bool
 	history            *History
 	cycle              bool
-	cursorLine         bool
+	highlightLine      bool
 	headerVisible      bool
 	headerFirst        bool
 	headerLines        int
@@ -761,7 +761,7 @@ func NewTerminal(opts *Options, eventBox *util.EventBox, executor *util.Executor
 		executor:           executor,
 		paused:             opts.Phony,
 		cycle:              opts.Cycle,
-		cursorLine:         opts.CursorLine,
+		highlightLine:      opts.CursorLine,
 		headerVisible:      true,
 		headerFirst:        opts.HeaderFirst,
 		headerLines:        opts.HeaderLines,
@@ -1920,7 +1920,7 @@ func (t *Terminal) printItem(result Result, line int, i int, current bool, bar b
 		}
 		newLine.width = t.printHighlighted(result, tui.ColNormal, tui.ColMatch, false, true)
 	}
-	if current && t.cursorLine {
+	if current && t.highlightLine {
 		maxWidth := t.window.Width() - (t.pointerLen + t.markerLen + 1)
 		fillSpaces := maxWidth - newLine.width
 		newLine.width = maxWidth