                                            default-directory)
                          t)))
   (let ((current-dir default-directory)
-        (local-tags-filename (ectags-expand-table-name default-directory))
+        (local-tags-filename (ectags-expand-tag-file-name default-directory))
         (checked-dirs 5))
     (while (and (not (file-exists-p local-tags-filename))
                 (not (ectags-verify-tags-file local-tags-filename))
                 (> checked-dirs 0))
       (setq current-dir (file-name-directory (directory-file-name current-dir)))
-      (setq local-tags-filename (ectags-expand-table-name current-dir))
+      (setq local-tags-filename (ectags-expand-tag-file-name current-dir))
       (setq checked-dirs (1- checked-dirs)))
 
     (if (and (> checked-dirs 0)

            ((= ?N kind-char) "name import")))))

(defun ectags-match (tag-line)
  "Given a tags match line, parse it and returns the the tag as a list."
  (let* ((tag-name (if (string-match "^\\([^\t]+\\)" tag-line)
                       (match-string-no-properties 1 tag-line)))
         (tfname (if (string-match "^[^\t]+\t\\([^\t]+\\)" tag-line)


  (if (> (length ectags--matches) 0)
      (progn
        (ectags-insert-matches)
        (unless (get-buffer-window ectags-buffer-name)
          (goto-char (point-min))
          (select-window (split-window-vertically))
