diff --git a/source/basic.tex b/source/basic.tex
index 5c7ceed598..2dfee870b3 100644
--- a/source/basic.tex
+++ b/source/basic.tex
@@ -4384,7 +4384,7 @@
 \pnum
 The library provides default definitions for the global allocation and
 deallocation functions. Some global allocation and deallocation
-functions are replaceable\iref{dcl.fct.def.replace}.
+functions are replaceable\iref{term.replaceable.function}.
 The following allocation and deallocation functions\iref{support.dynamic}
 are implicitly declared in global scope in each translation unit of a
 program.
@@ -5224,9 +5224,10 @@
 arrays of such types, and cv-qualified versions of these
 types are collectively called \defnadjx{trivially relocatable}{types}{type}.
 \label{term.replaceable.type}%
+\indextext{replaceable!type|see{type, replaceable}}%
 Cv-unqualified scalar types, replaceable class types\iref{class.prop}, and
 arrays of such types are collectively called
-\defnadjx{replaceable}{types}{type}.
+\defnx{replaceable types}{type!replaceable}.
 \label{term.standard.layout.type}%
 Scalar types, standard-layout class
 types\iref{class.prop}, arrays of such types, and
@@ -7993,7 +7994,7 @@
 It is
 \impldef{replaceability of the contract-violation handler}
 whether the contract-violation handler
-is replaceable\iref{dcl.fct.def.replace}.
+is replaceable\iref{term.replaceable.function}.
 If the contract-violation handler
 is not replaceable,
 a declaration of a replacement function for the contract-violation handler
diff --git a/source/classes.tex b/source/classes.tex
index 44d454567c..5f3fc4ea12 100644
--- a/source/classes.tex
+++ b/source/classes.tex
@@ -248,8 +248,9 @@
 \item it has a deleted destructor.
 \end{itemize}
 
+\indextext{replaceable!class|see{class, replaceable}}%
 \pnum
-A class \tcode{C} is a \defnadj{replaceable}{class} if it is
+A class \tcode{C} is a \defnx{replaceable class}{class!replaceable} if it is
 eligible for replacement and
 \begin{itemize}
 \item has the \tcode{replaceable_if_eligible} \grammarterm{class-property-specifier},
diff --git a/source/declarations.tex b/source/declarations.tex
index 502fa0fa29..ee70278b83 100644
--- a/source/declarations.tex
+++ b/source/declarations.tex
@@ -7540,10 +7540,14 @@
 
 \rSec2[dcl.fct.def.replace]{Replaceable function definitions}
 
+\indextext{function!replaceable|(}%
+\indextext{replaceable!function|see{function, replaceable}}%
+
 \pnum
+\label{term.replaceable.function}%
 Certain functions
 for which a definition is supplied by the implementation
-are \defn{replaceable}.
+are \defnx{replaceable}{function!replaceable}.
 A \Cpp{} program may
 provide a definition with the signature of a replaceable function,
 called a \defnadj{replacement}{function}.
@@ -7575,7 +7579,7 @@
 The implementation-supplied function definition
 is an otherwise-unnamed function with no linkage.
 \end{note}
-
+\indextext{function!replaceable|)}%
 
 \rSec1[dcl.struct.bind]{Structured binding declarations}%
 \indextext{structured binding declaration}%
diff --git a/source/diagnostics.tex b/source/diagnostics.tex
index d16f516a77..be2b863f7d 100644
--- a/source/diagnostics.tex
+++ b/source/diagnostics.tex
@@ -2500,6 +2500,6 @@
 
 \pnum
 \remarks
-This function is replaceable\iref{dcl.fct.def.replace}.
+This function is replaceable\iref{term.replaceable.function}.
 
 \end{itemdescr}
diff --git a/source/exec.tex b/source/exec.tex
index 34d0a3ebd6..aa4956d150 100644
--- a/source/exec.tex
+++ b/source/exec.tex
@@ -8450,7 +8450,7 @@
 
 \pnum
 \remarks
-This function is replaceable\iref{dcl.fct.def.replace}.
+This function is replaceable\iref{term.replaceable.function}.
 \end{itemdescr}
 
 \begin{codeblock}
diff --git a/source/lib-intro.tex b/source/lib-intro.tex
index b78c4f80eb..4444d26a0d 100644
--- a/source/lib-intro.tex
+++ b/source/lib-intro.tex
@@ -3416,7 +3416,7 @@
 \pnum
 If a function defined in
 \ref{\firstlibchapter} through \ref{\lastlibchapter} and \ref{depr}
-is specified as replaceable\iref{dcl.fct.def.replace},
+is specified as replaceable\iref{term.replaceable.function},
 the description of function semantics apply
 to both the default version defined by the \Cpp{} standard library and
 the replacement function defined by the program.
diff --git a/source/support.tex b/source/support.tex
index 19e19d6f11..9040c670c8 100644
--- a/source/support.tex
+++ b/source/support.tex
@@ -2498,7 +2498,7 @@
 
 \pnum
 \remarks
-This function is replaceable\iref{dcl.fct.def.replace}.
+This function is replaceable\iref{term.replaceable.function}.
 \end{itemdescr}
 
 \indexlibrarymember{new}{operator}%
@@ -2547,7 +2547,7 @@
 
 \pnum
 \remarks
-This function is replaceable\iref{dcl.fct.def.replace}.
+This function is replaceable\iref{term.replaceable.function}.
 \end{itemdescr}
 
 \indexlibrarymember{delete}{operator}%
@@ -2632,7 +2632,7 @@
 or
 \tcode{realloc},
 declared in \libheaderref{cstdlib}.
-This function is replaceable\iref{dcl.fct.def.replace}.
+This function is replaceable\iref{term.replaceable.function}.
 If a replacement function
 without a \tcode{size} parameter
 is defined by the program,
@@ -2694,7 +2694,7 @@
 
 \pnum
 \remarks
-This function is replaceable\iref{dcl.fct.def.replace}.
+This function is replaceable\iref{term.replaceable.function}.
 \end{itemdescr}
 
 \rSec3[new.delete.array]{Array forms}
@@ -2750,7 +2750,7 @@
 
 \pnum
 \remarks
-This function is replaceable\iref{dcl.fct.def.replace}.
+This function is replaceable\iref{term.replaceable.function}.
 \end{itemdescr}
 
 \indexlibrarymember{new}{operator}%
@@ -2791,7 +2791,7 @@
 
 \pnum
 \remarks
-This function is replaceable\iref{dcl.fct.def.replace}.
+This function is replaceable\iref{term.replaceable.function}.
 \end{itemdescr}
 
 \indexlibrarymember{delete}{operator}%
@@ -2859,7 +2859,7 @@
 
 \pnum
 \remarks
-This function is replaceable\iref{dcl.fct.def.replace}.
+This function is replaceable\iref{term.replaceable.function}.
 If a replacement function
 without a \tcode{size} parameter
 is defined by the program,
@@ -2921,7 +2921,7 @@
 
 \pnum
 \remarks
-This function is replaceable\iref{dcl.fct.def.replace}.
+This function is replaceable\iref{term.replaceable.function}.
 \end{itemdescr}
 
 \rSec3[new.delete.placement]{Non-allocating forms}