diff --git a/source/containers.tex b/source/containers.tex
index c8abbf38f6..25195a33ec 100644
--- a/source/containers.tex
+++ b/source/containers.tex
@@ -11043,9 +11043,9 @@
     class span;
 
   template<class ElementType, size_t Extent>
-    inline constexpr bool ranges::enable_view<span<ElementType, Extent>> = true;
+    inline constexpr bool ranges::@\deflibspec{enable_view}{<}{span}@<ElementType, Extent>> = true;
   template<class ElementType, size_t Extent>
-    inline constexpr bool ranges::enable_borrowed_range<span<ElementType, Extent>> = true;
+    inline constexpr bool ranges::@\deflibspec{enable_borrowed_range}{<}{span}@<ElementType, Extent>> = true;
 
   // \ref{span.objectrep}, views of object representation
   template<class ElementType, size_t Extent>
diff --git a/source/iostreams.tex b/source/iostreams.tex
index 3554d361ca..d847b5cad4 100644
--- a/source/iostreams.tex
+++ b/source/iostreams.tex
@@ -12670,14 +12670,14 @@
 
 namespace std::ranges {
   template<>
-    inline constexpr bool enable_borrowed_range<filesystem::directory_iterator> = true;
+    inline constexpr bool @\deflibspec{enable_borrowed_range}{<filesystem::}{directory_iterator}@> = true;
   template<>
-    inline constexpr bool enable_borrowed_range<filesystem::recursive_directory_iterator> = true;
+    inline constexpr bool @\deflibspec{enable_borrowed_range}{<filesystem::}{recursive_directory_iterator}@> = true;
 
   template<>
-    inline constexpr bool enable_view<filesystem::directory_iterator> = true;
+    inline constexpr bool @\deflibspec{enable_view}{<filesystem::}{directory_iterator}@> = true;
   template<>
-    inline constexpr bool enable_view<filesystem::recursive_directory_iterator> = true;
+    inline constexpr bool @\deflibspec{enable_view}{<filesystem::}{recursive_directory_iterator}@> = true;
 }
 \end{codeblock}
 
diff --git a/source/iterators.tex b/source/iterators.tex
index ce9786e65a..f96635bcb1 100644
--- a/source/iterators.tex
+++ b/source/iterators.tex
@@ -316,7 +316,7 @@
 
   template<class Iterator1, class Iterator2>
       requires (!@\libconcept{sized_sentinel_for}@<Iterator1, Iterator2>)
-    inline constexpr bool disable_sized_sentinel_for<reverse_iterator<Iterator1>,
+    inline constexpr bool @\deflibspec{disable_sized_sentinel_for}{<}{reverse_iterator}@<Iterator1>,
                                                      reverse_iterator<Iterator2>> = true;
 
   // \ref{insert.iterators}, insert iterators
diff --git a/source/macros.tex b/source/macros.tex
index 46011ec26a..6c2d6ac4b8 100644
--- a/source/macros.tex
+++ b/source/macros.tex
@@ -192,6 +192,8 @@
 \newcommand{\indexlibraryglobal}[1]{\indexlibrary{\idxcode{#1}}}
 \newcommand{\indexlibraryctor}[1]{\indexlibrarymisc{#1}{constructor}}
 \newcommand{\indexlibrarydtor}[1]{\indexlibrarymisc{#1}{destructor}}
+\newcommand{\indexlibraryspec}[2]{\indexlibrarymisc{#1}{\idxcode{#2}}}
+\newcommand{\deflibspec}[3]{\tcode{#1#2#3}\indexlibraryspec{#1}{#3}}
 
 % class member library index
 \newcommand{\indexlibrarymemberx}[2]{\indexlibrarymisc{#1}{\idxcode{#2}}}
diff --git a/source/ranges.tex b/source/ranges.tex
index 7616368c5f..05a6ff2eaf 100644
--- a/source/ranges.tex
+++ b/source/ranges.tex
@@ -128,7 +128,7 @@
   class subrange;
 
   template<class I, class S, subrange_kind K>
-    inline constexpr bool enable_borrowed_range<subrange<I, S, K>> = true;
+    inline constexpr bool @\deflibspec{enable_borrowed_range}{<}{subrange}@<I, S, K>> = true;
 
   // \ref{range.dangling}, dangling iterator handling
   struct dangling;
@@ -145,7 +145,7 @@
   class empty_view;
 
   template<class T>
-    inline constexpr bool enable_borrowed_range<empty_view<T>> = true;
+    inline constexpr bool @\deflibspec{enable_borrowed_range}{<}{empty_view}@<T>> = true;
 
   namespace views {
     template<class T>
@@ -168,7 +168,7 @@
   class iota_view;
 
   template<class W, class Bound>
-    inline constexpr bool enable_borrowed_range<iota_view<W, Bound>> = true;
+    inline constexpr bool @\deflibspec{enable_borrowed_range}{<}{iota_view}@<W, Bound>> = true;
 
   namespace views { inline constexpr @\unspec@ iota = @\unspec@; }
 
@@ -196,7 +196,7 @@
   class ref_view;
 
   template<class T>
-    inline constexpr bool enable_borrowed_range<ref_view<T>> = true;
+    inline constexpr bool @\deflibspec{enable_borrowed_range}{<}{ref_view}@<T>> = true;
 
   // \ref{range.owning.view}, owning view
   template<range R>
@@ -204,7 +204,7 @@
   class owning_view;
 
   template<class T>
-    inline constexpr bool enable_borrowed_range<owning_view<T>> = enable_borrowed_range<T>;
+    inline constexpr bool @\deflibspec{enable_borrowed_range}{<}{owning_view}@<T>> = enable_borrowed_range<T>;
 
   // \ref{range.filter}, filter view
   template<@\libconcept{input_range}@ V, @\libconcept{indirect_unary_predicate}@<iterator_t<V>> Pred>
@@ -226,7 +226,7 @@
   template<@\libconcept{view}@> class take_view;
 
   template<class T>
-    inline constexpr bool enable_borrowed_range<take_view<T>> = enable_borrowed_range<T>;
+    inline constexpr bool @\deflibspec{enable_borrowed_range}{<}{take_view}@<T>> = enable_borrowed_range<T>;
 
   namespace views { inline constexpr @\unspec@ take = @\unspec@; }
 
@@ -243,7 +243,7 @@
     class drop_view;
 
   template<class T>
-    inline constexpr bool enable_borrowed_range<drop_view<T>> = enable_borrowed_range<T>;
+    inline constexpr bool @\deflibspec{enable_borrowed_range}{<}{drop_view}@<T>> = enable_borrowed_range<T>;
 
   namespace views { inline constexpr @\unspec@ drop = @\unspec@; }
 
@@ -254,7 +254,7 @@
     class drop_while_view;
 
   template<class T, class Pred>
-    inline constexpr bool enable_borrowed_range<drop_while_view<T, Pred>> =
+    inline constexpr bool @\deflibspec{enable_borrowed_range}{<}{drop_while_view}@<T, Pred>> =
       enable_borrowed_range<T>;
 
   namespace views { inline constexpr @\unspec@ drop_while = @\unspec@; }
@@ -296,7 +296,7 @@
   class common_view;
 
   template<class T>
-    inline constexpr bool enable_borrowed_range<common_view<T>> = enable_borrowed_range<T>;
+    inline constexpr bool @\deflibspec{enable_borrowed_range}{<}{common_view}@<T>> = enable_borrowed_range<T>;
 
   namespace views { inline constexpr @\unspec@ common = @\unspec@; }
 
@@ -306,7 +306,7 @@
   class reverse_view;
 
   template<class T>
-    inline constexpr bool enable_borrowed_range<reverse_view<T>> = enable_borrowed_range<T>;
+    inline constexpr bool @\deflibspec{enable_borrowed_range}{<}{reverse_view}@<T>> = enable_borrowed_range<T>;
 
   namespace views { inline constexpr @\unspec@ reverse = @\unspec@; }
 
@@ -316,7 +316,7 @@
   class elements_view;
 
   template<class T, size_t N>
-    inline constexpr bool enable_borrowed_range<elements_view<T, N>> = enable_borrowed_range<T>;
+    inline constexpr bool @\deflibspec{enable_borrowed_range}{<}{elements_view}@<T, N>> = enable_borrowed_range<T>;
 
   template<class R>
     using @\libglobal{keys_view}@ = elements_view<R, 0>;
@@ -336,7 +336,7 @@
   class zip_view;
 
   template<class... Views>
-    inline constexpr bool enable_borrowed_range<zip_view<Views...>> =
+    inline constexpr bool @\deflibspec{enable_borrowed_range}{<}{zip_view}@<Views...>> =
       (enable_borrowed_range<Views> && ...);
 
   namespace views { inline constexpr @\unspec@ zip = @\unspec@; }
@@ -356,7 +356,7 @@
   class adjacent_view;
 
   template<class V, size_t N>
-    inline constexpr bool enable_borrowed_range<adjacent_view<V, N>> =
+    inline constexpr bool @\deflibspec{enable_borrowed_range}{<}{adjacent_view}@<V, N>> =
       enable_borrowed_range<V>;
 
   namespace views {
diff --git a/source/strings.tex b/source/strings.tex
index ee30bed8c1..a7b38452d4 100644
--- a/source/strings.tex
+++ b/source/strings.tex
@@ -4057,9 +4057,9 @@
   class basic_string_view;
 
   template<class charT, class traits>
-    inline constexpr bool ranges::enable_view<basic_string_view<charT, traits>> = true;
+    inline constexpr bool ranges::@\deflibspec{enable_view}{<}{basic_string_view}@<charT, traits>> = true;
   template<class charT, class traits>
-    inline constexpr bool ranges::enable_borrowed_range<basic_string_view<charT, traits>> = true;
+    inline constexpr bool ranges::@\deflibspec{enable_borrowed_range}{<}{basic_string_view}@<charT, traits>> = true;
 
   // \ref{string.view.comparison}, non-member comparison functions
   template<class charT, class traits>