diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index ba9e4395a..fd95bc094 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -201,7 +201,10 @@ file name  play this sound file.  If not possible, fall back to beep"
 	  (const :tag "Standard beep" t)
 	  (file :tag "Play sound file")))
 
-(defcustom org-clock-modeline-total 'auto
+(define-obsolete-variable-alias 'org-clock-modeline-total
+  'org-clock-mode-line-total "24.3")
+
+(defcustom org-clock-mode-line-total 'auto
   "Default setting for the time included for the mode line clock.
 This can be overruled locally using the CLOCK_MODELINE_TOTAL property.
 Allowed values are:
@@ -1313,10 +1316,10 @@ for a todo state to switch to, overriding the existing value
 This is for the currently running clock as it is displayed
 in the mode line.  This function looks at the properties
 LAST_REPEAT and in particular CLOCK_MODELINE_TOTAL and the
-corresponding variable `org-clock-modeline-total' and then
+corresponding variable `org-clock-mode-line-total' and then
 decides which time to use."
   (let ((cmt (or (org-entry-get nil "CLOCK_MODELINE_TOTAL")
-		 (symbol-name org-clock-modeline-total)))
+		 (symbol-name org-clock-mode-line-total)))
 	(lr (org-entry-get nil "LAST_REPEAT")))
     (cond
      ((equal cmt "current")
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index 51aead1b8..58be52d9e 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -692,13 +692,13 @@ month and 365.24 days for a year)."
   :group 'org-faces)
 
 (defface org-agenda-filter-tags
-  (org-compatible-face 'modeline
+  (org-compatible-face 'mode-line
     nil)
   "Face for tag(s) in the mode-line when filtering the agenda."
   :group 'org-faces)
 
 (defface org-agenda-filter-category
-  (org-compatible-face 'modeline
+  (org-compatible-face 'mode-line
     nil)
   "Face for tag(s) in the mode-line when filtering the agenda."
   :group 'org-faces)
@@ -770,9 +770,9 @@ level org-n-level-faces"
   "Face used to highlight math latex and other special exporter stuff."
   :group 'org-faces)
 
-(org-copy-face 'modeline 'org-mode-line-clock
+(org-copy-face 'mode-line 'org-mode-line-clock
   "Face used for clock display in mode line.")
-(org-copy-face 'modeline 'org-mode-line-clock-overrun
+(org-copy-face 'mode-line 'org-mode-line-clock-overrun
   "Face used for clock display for overrun tasks in mode line."
   :background "red")