diff --git a/lisp/ox.el b/lisp/ox.el
index f7d0ef5e6..d6dcc8262 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -4149,18 +4149,9 @@ alphanumeric characters only."
 		     h))))
     (or (gethash datum cache)
 	(puthash datum
-		 (format "%s:%d"
+		 (format "org%s%d"
 			 (if type
-			     (case type
-			       (headline "sec")
-			       (paragraph
-				(if (org-element-property :caption datum)
-				    "fig" "paragraph"))
-			       (latex-environment "eq")
-			       (table "tbl")
-			       (otherwise
-				(replace-regexp-in-string "-" ""
-							  (symbol-name type))))
+			     (replace-regexp-in-string "-" "" (symbol-name type))
 			   "secondarystring")
 			 (incf (gethash type cache 0)))
 		 cache))))