diff --git a/docs/_includes/features.html b/docs/_includes/features.html
index f8ef3d484bc6..0396d7278f0f 100644
--- a/docs/_includes/features.html
+++ b/docs/_includes/features.html
@@ -21,7 +21,7 @@ <h1 id="so-features">So, features?</h1>
                         <td>Implemented</td>
                     </tr>
                     <tr>
-                        <td><a href="https://dotty.epfl.ch/docs/reference/contextual/implicit-function-types.html">Context query</a></td>
+                        <td><a href="https://dotty.epfl.ch/docs/reference/contextual/context-functions.html">Context query</a></td>
                         <td>Implemented</td>
                     </tr>
                     <tr>
@@ -29,11 +29,11 @@ <h1 id="so-features">So, features?</h1>
                         <td>Implemented</td>
                     </tr>
                     <tr>
-                        <td><a href="https://dotty.epfl.ch/docs/reference/contextual/delegates.html">Implied Instances</a></td>
+                        <td><a href="https://dotty.epfl.ch/docs/reference/contextual/givens.html">Implied Instances</a></td>
                         <td>Implemented</td>
                     </tr>
                     <tr>
-                        <td><a href="https://dotty.epfl.ch/docs/reference/contextual/given-clauses.html">Inferable parameters</a></td>
+                        <td><a href="https://dotty.epfl.ch/docs/reference/contextual/using-clauses.html">Inferable parameters</a></td>
                         <td>Implemented</td>
                     </tr>
                     <tr>
diff --git a/docs/docs/reference/contextual/delegates.md b/docs/docs/reference/contextual/delegates.md
deleted file mode 100644
index ea5ffcfee205..000000000000
--- a/docs/docs/reference/contextual/delegates.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: doc-page
-title: "Given Instances"
----
-
-The contents of this page have [moved](./givens.md).
diff --git a/docs/docs/reference/contextual/given-clauses.md b/docs/docs/reference/contextual/given-clauses.md
deleted file mode 100644
index 85a691e55bbe..000000000000
--- a/docs/docs/reference/contextual/given-clauses.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-layout: doc-page
-title: "Given Parameters"
----
-
-The contents of this page have [moved](./using-clauses.md).
-
diff --git a/docs/docs/reference/contextual/implicit-function-types-spec.md b/docs/docs/reference/contextual/implicit-function-types-spec.md
deleted file mode 100644
index 5bceb18649af..000000000000
--- a/docs/docs/reference/contextual/implicit-function-types-spec.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-layout: doc-page
-title: "Implicit Function Types - More Details"
----
-
-The contents of this page have [moved](./context-functions-spec.md).
-
diff --git a/docs/docs/reference/contextual/implicit-function-types.md b/docs/docs/reference/contextual/implicit-function-types.md
deleted file mode 100644
index 1507a3d46559..000000000000
--- a/docs/docs/reference/contextual/implicit-function-types.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: doc-page
-title: "Implicit Function Types"
----
-
-The contents of this page have [moved](./context-functions.md).
diff --git a/docs/docs/reference/features-classification.md b/docs/docs/reference/features-classification.md
index c0018549ac27..459370613f62 100644
--- a/docs/docs/reference/features-classification.md
+++ b/docs/docs/reference/features-classification.md
@@ -20,7 +20,7 @@ These new constructs directly model core features of DOT, higher-kinded types, a
  - [Union types](new-types/union-types.md),
  - [Type lambdas](new-types/type-lambdas.md),
  replacing encodings using structural types and type projection.
- - [Implicit Function Types](contextual/implicit-function-types.md) offering abstraction over given parameters.
+ - [Context Functions](contextual/context-functions.md) offering abstraction over given parameters.
 
 **Status: essential**
 
@@ -199,4 +199,4 @@ Some existing programs will break and, given the complex nature of type inferenc
 
 In our experience, macros and changes in type and implicit argument inference together cause the large majority of problems encountered when porting existing code to Scala 3. The latter source of problems could be addressed systematically by a tool that added all inferred types and implicit arguments to a Scala 2 source code file. Most likely such a tool would be implemented as a Scala 2 compiler plugin. The resulting code would have a greatly increased likelihood to compile under Scala 3, but would often be bulky to the point of being unreadable. A second part of the rewriting tool should then selectively and iteratively remove type and implicit annotations that were synthesized by the first part as long as they compile under Scala 3. This second part could be implemented as a program that invokes the Scala 3 compiler `scalac` programmatically.
 
-Several people have proposed such a tool for some time now. I believe it is time we find the will and the resources to actually implement it.
\ No newline at end of file
+Several people have proposed such a tool for some time now. I believe it is time we find the will and the resources to actually implement it.