;;; @@ buffer local variables
 ;;;
 
-;;; @@@ in raw buffer
+;;; @@@ in raw-buffer
 ;;;
 
 (defvar mime-raw-entity-info
 (make-variable-buffer-local 'mime-preview-buffer)
 
 
-;;; @@@ in view buffer
+;;; @@@ in preview-buffer
 ;;;
 
 (defvar mime-mother-buffer nil
     (play       "Play current entity"     mime-preview-play-current-entity)
     (extract    "Extract current entity"  mime-preview-extract-current-entity)
     (print      "Print current entity"    mime-preview-print-current-entity)
-    (x-face     "Show X Face"             mime-view-display-x-face)
+    (x-face     "Show X Face"             mime-preview-display-x-face)
     )
   "Menu for MIME Viewer")
 
 ;;; @@ X-Face
 ;;;
 
-(defun mime-view-display-x-face ()
+(defun mime-preview-display-x-face ()
   (interactive)
   (save-window-excursion
     (set-buffer mime-raw-buffer)