diff --git a/style/catchfilebetweentags.el b/style/catchfilebetweentags.el
--- a/style/catchfilebetweentags.el
+++ b/style/catchfilebetweentags.el
@@ -47,34 +47,35 @@
 ;; Scanning function, stolen from markdown-mode
 (defun LaTeX-catchfilebetweentags-counter-inc ()
   "Increment `LaTeX-catchfilebetweentags-counter' and return the new value."
-  (when (null LaTeX-catchfilebetweentags-counter)
-    (setq LaTeX-catchfilebetweentags-counter 0)
-    (save-excursion
-      (goto-char (point-min))
-      (while (re-search-forward (concat "^%<\\*\\([^>]+\\)>$")
-                                (point-max) t)
-        (let ((fn (string-to-number (match-string 1))))
+  (let ((fn (string-to-number (match-string 1))))
+    (filename (file-name-sans-extension (file-name-nondirectory (buffer-file-name (current-buffer)))))
+    (when (null LaTeX-catchfilebetweentags-counter)
+      (setq LaTeX-catchfilebetweentags-counter 0)
+      (save-excursion
+        (goto-char (point-min))
+        (while (re-search-forward (concat "^%<\\*\\([^>]+\\)>$")
+                                  (point-max) t)
           (when (> fn LaTeX-catchfilebetweentags-counter)
-            (setq LaTeX-catchfilebetweentags-counter fn))))))
-  (setq LaTeX-catchfilebetweentags-counter
-        (1+ LaTeX-catchfilebetweentags-counter)))
+            (setq LaTeX-catchfilebetweentags-counter fn)))))
+    (setq LaTeX-catchfilebetweentags-counter
+          (concat filename   (1+ LaTeX-catchfilebetweentags-counter)))))
 
 (defun LaTeX-env-catchfilebetweentags (_environment)
   "Insert a tag-skeleton defined by `LaTeX-catchfilebetweentags'.
 ENVIRONMENT is ignored."
-  (let* ((fn (when LaTeX-catchfilebetweentags-use-numeric-label
-               (LaTeX-catchfilebetweentags-counter-inc)))
-         (tag  (TeX-read-string
-                (if fn (format "Tag (default %s): " fn) "Tag: ")
-                nil nil (when fn (number-to-string fn)))))
-    (unless (bolp)
-      (newline)
-      (delete-horizontal-space))
-    (save-excursion
-      (insert (concat (format "%%<*%s>" tag)
-                      "\n\n"
-                      (format "%%</%s>" tag)))))
-  (forward-line))
+  (let*
+      ((fn (when LaTeX-catchfilebetweentags-use-numeric-label))
+    (tag  (TeX-read-string
+           (if fn (format "Tag (default %s): " fn) "Tag: ")
+           nil nil (when fn (number-to-string fn)))))
+  (unless (bolp)
+    (newline)
+    (delete-horizontal-space))
+  (save-excursion
+    (insert (concat (format "%%<*%s>" tag)
+                    "\n\n"
+                    (format "%%</%s>" tag)))))
+        (forward-line))
 
 (TeX-add-style-hook
  "catchfilebetweentags"