diff --git a/emacs/mu4e-speedbar.el b/emacs/mu4e-speedbar.el
index 9d806c3b..86cdf79f 100644
--- a/emacs/mu4e-speedbar.el
+++ b/emacs/mu4e-speedbar.el
@@ -44,14 +44,14 @@
 
 (defvar mu4e-main-speedbar-key-map nil
   "Keymap used when in mu4e display mode.")
-(defvar mu4e-headers-speedbar-key-map nil
+(defvar mu4e-hdrs-speedbar-key-map nil
   "Keymap used when in mu4e display mode.")
 (defvar mu4e-view-speedbar-key-map nil
   "Keymap used when in mu4e display mode.")
 
 (defvar mu4e-main-speedbar-menu-items nil
   "Additional menu-items to add to speedbar frame.")
-(defvar mu4e-headers-speedbar-menu-items nil
+(defvar mu4e-hdrs-speedbar-menu-items nil
   "Additional menu-items to add to speedbar frame.")
 (defvar mu4e-view-speedbar-menu-items nil
   "Additional menu-items to add to speedbar frame.")
@@ -61,7 +61,7 @@
   "Install those variables used by speedbar to enhance mu4e."
   (dolist (keymap
 	    '( mu4e-main-speedbar-key-map
-	       mu4e-headers-speedbar-key-map
+	       mu4e-hdrs-speedbar-key-map
 	       mu4e-view-speedbar-key-map))
     (unless keymap
       (setq keymap (speedbar-make-specialized-keymap))
@@ -122,7 +122,7 @@
   (mu4e~speedbar-render-maildir-list))
 
 (defun mu4e-main-speedbar-buttons (buffer) (mu4e-speedbar-buttons buffer)) 
-(defun mu4e-headers-speedbar-buttons (buffer) (mu4e-speedbar-buttons buffer)) 
+(defun mu4e-hdrs-speedbar-buttons (buffer) (mu4e-speedbar-buttons buffer)) 
 (defun mu4e-view-speedbar-buttons (buffer) (mu4e-speedbar-buttons buffer))