diff --git a/doc/org-manual.org b/doc/org-manual.org
index 0aab43f60..ce4fedb55 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -1638,14 +1638,14 @@ you, configure the option ~org-table-auto-blank-field~.
   the same as the format used by Orgtbl radio tables, see [[*Translator
   functions]], for a detailed description.
 
-- {{{kbd(M-x org-table-electric-header-mode)}}} :: 
+- {{{kbd(M-x org-table-header-line-mode)}}} ::
 
-  #+findex: org-table-electric-header-mode
-  #+vindex: org-table-electric-header-p
+  #+findex: org-table-header-line-mode
+  #+vindex: org-table-header-line-p
   Turn on the display of the first data row of the table at point in
   the window header line when this first row is not visible anymore in
   the buffer.  You can activate this minor mode by default by setting
-  the option ~org-table-electric-header-p~ to ~t~.
+  the option ~org-table-header-line-p~ to ~t~.
 
 ** Column Width and Alignment
 :PROPERTIES:
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 0b29007a2..d4505fed4 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -25,14 +25,14 @@ commands should work as usual.  You cannot use numbers superior to 64
 for numeric priorities, as it would clash with priorities like [#A]
 where the "A" is internally converted to its numeric value of 65.
 
-*** New minor mode ~org-table-electric-header-mode~
+*** New minor mode ~org-table-header-line-mode~
 
 Turn on the display of the first data row of the table at point in the
 window header line when this first row is not visible anymore in the
 buffer.
 
 You can activate this minor mode by default by setting the option
-~org-table-electric-header-p~ to =t=.
+~org-table-header-line-p~ to =t=.
 
 *** Property drawers allowed before first headline
 
@@ -56,10 +56,10 @@ value in call to =java=.
 
 ** New options
 
-*** New option ~org-table-electric-header-p~
+*** New option ~org-table-header-line-p~
 
 Setting this option to =t= will activate
-~org-table-electric-header-mode~ in org-mode buffers.
+~org-table-header-line-mode~ in org-mode buffers.
 
 *** New option to group captured datetime entries by month
 
@@ -89,7 +89,7 @@ You can also set this option to =t= or to =from-agenda=.
 This option will add a timeout to notifications.
 
 ** New commands
-*** ~org-table-electric-header-mode~
+*** ~org-table-header-line-mode~
 
 Turn on a minor mode to display the first data row of the table at
 point in the header-line when the beginning of the table is invisible.
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 210d66d9b..5a2f10fbc 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -166,8 +166,8 @@ table, obtained by prompting the user."
   :tag "Org Table Settings"
   :group 'org-table)
 
-(defcustom org-table-electric-header-p nil
-  "Activate `org-table-electric-header-mode' by default?"
+(defcustom org-table-header-line-p nil
+  "Activate `org-table-header-line-mode' by default?"
   :type 'boolean
   :package-version "9.4"
   :group 'org-table)
@@ -453,7 +453,7 @@ prevents it from hanging Emacs."
 ;;; Org table electric header minor mode
 (defvar org-table-temp-header-line nil)
 (defvar org-table-temp-header-remapping nil)
-(defvar org-table-electric-header-mode nil)
+(defvar org-table-header-line-mode nil)
 (defun org-table-set-header-line-format ()
   "Set the header of table at point as the `header-line-format'.
 Assume `org-table-temp-header-line' already stores the previously
@@ -489,15 +489,15 @@ existing value of `header-line-format' we might want to restore."
     (setq header-line-format org-table-temp-header-line)))
 
 ;;;###autoload
-(define-minor-mode org-table-electric-header-mode
+(define-minor-mode org-table-header-line-mode
   "Display the first row of the table at point in the header line."
-  :init-value org-table-electric-header-p
+  :init-value org-table-header-line-p
   :global nil
-  :variable org-table-electric-header-mode
+  :variable org-table-header-line-mode
   :group 'org-table
   (unless (eq major-mode 'org-mode)
     (user-error "Cannot turn org table electric mode outside org-mode buffers"))
-  (if org-table-electric-header-mode
+  (if org-table-header-line-mode
       (progn (setq org-table-temp-header-line header-line-format)
 	     (add-hook 'post-command-hook 'org-table-set-header-line-format))
     (remove-hook 'post-command-hook 'org-table-set-header-line-format)