diff --git a/community-build/community-projects/xml-interpolator b/community-build/community-projects/xml-interpolator
index e5c93c3dc977..0c020ee5a447 160000
--- a/community-build/community-projects/xml-interpolator
+++ b/community-build/community-projects/xml-interpolator
@@ -1 +1 @@
-Subproject commit e5c93c3dc97788cc4d4e12e01349962fdd60cf43
+Subproject commit 0c020ee5a447db293f48a9ec2bf5ff23bd0d0726
diff --git a/docs/docs/reference/metaprogramming/macros.md b/docs/docs/reference/metaprogramming/macros.md
index 0282f3931375..d8ed5dccea23 100644
--- a/docs/docs/reference/metaprogramming/macros.md
+++ b/docs/docs/reference/metaprogramming/macros.md
@@ -315,7 +315,7 @@ That is, the `showExpr` method converts its `Expr` argument to a string (`code`)
 the result back to an `Expr[String]` using the `toExpr` method.
 
 **Note**: the `toExpr` extension method can be ommited by importing an implicit
-conversion with `import scala.quoted.autolift._`. The programmer is able to
+conversion with `import given scala.quoted.autolift._`. The programmer is able to
 declutter slightly the code at the cost of readable _phase distinction_ between
 stages.
 
diff --git a/library/src/scala/quoted/package.scala b/library/src/scala/quoted/package.scala
index e12ed1214368..0868eee2188e 100644
--- a/library/src/scala/quoted/package.scala
+++ b/library/src/scala/quoted/package.scala
@@ -48,7 +48,7 @@ package object quoted {
   private object NoResult
 
   object autolift {
-    implicit def autoToExpr[T: Liftable](x: T) given QuoteContext: Expr[T] = x.toExpr
+    given autoToExpr[T] as Conversion[T, Expr[T]] given Liftable[T], QuoteContext = _.toExpr
   }
 
   implicit object ExprOps {
diff --git a/tests/disabled/neg-with-compiler/quote-run-in-macro-2/quoted_1.scala b/tests/disabled/neg-with-compiler/quote-run-in-macro-2/quoted_1.scala
index 2004cfcf3d78..8c366159306b 100644
--- a/tests/disabled/neg-with-compiler/quote-run-in-macro-2/quoted_1.scala
+++ b/tests/disabled/neg-with-compiler/quote-run-in-macro-2/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/disabled/run/xml-interpolation-3/XmlQuote_1.scala b/tests/disabled/run/xml-interpolation-3/XmlQuote_1.scala
index 8c09c884d28b..fd34082390ce 100644
--- a/tests/disabled/run/xml-interpolation-3/XmlQuote_1.scala
+++ b/tests/disabled/run/xml-interpolation-3/XmlQuote_1.scala
@@ -1,6 +1,6 @@
 import scala.quoted._
 import scala.tasty.Tasty
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 import scala.language.implicitConversions
 
diff --git a/tests/neg-macros/i6432/Macro_1.scala b/tests/neg-macros/i6432/Macro_1.scala
index f2f3b04c5d25..6ece7444ed5b 100644
--- a/tests/neg-macros/i6432/Macro_1.scala
+++ b/tests/neg-macros/i6432/Macro_1.scala
@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 import scala.quoted.matching._
 
 object Macro {
diff --git a/tests/neg-macros/i6432b/Macro_1.scala b/tests/neg-macros/i6432b/Macro_1.scala
index f2f3b04c5d25..6ece7444ed5b 100644
--- a/tests/neg-macros/i6432b/Macro_1.scala
+++ b/tests/neg-macros/i6432b/Macro_1.scala
@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 import scala.quoted.matching._
 
 object Macro {
diff --git a/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala b/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala
index 9bc5638ab34e..90c5ebcab0b7 100644
--- a/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala
+++ b/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala
@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object E {
 
diff --git a/tests/neg-macros/inline-tuples-1/Macro_1.scala b/tests/neg-macros/inline-tuples-1/Macro_1.scala
index 4c2524d50e5a..b1bf95290ebf 100644
--- a/tests/neg-macros/inline-tuples-1/Macro_1.scala
+++ b/tests/neg-macros/inline-tuples-1/Macro_1.scala
@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
   def tup1(tup: Tuple1[Int]) given QuoteContext: Expr[Int] = tup.productIterator.map(_.asInstanceOf[Int]).sum
diff --git a/tests/neg-macros/quote-interpolator-core-old.scala b/tests/neg-macros/quote-interpolator-core-old.scala
index cdca5dbb905f..3004ddfb8115 100644
--- a/tests/neg-macros/quote-interpolator-core-old.scala
+++ b/tests/neg-macros/quote-interpolator-core-old.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 // This test checks the correct interpretation of the inlined value class
 
diff --git a/tests/neg-macros/quote-macro-splice.scala b/tests/neg-macros/quote-macro-splice.scala
index 60be371f87ab..5b785d7ee905 100644
--- a/tests/neg-macros/quote-macro-splice.scala
+++ b/tests/neg-macros/quote-macro-splice.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Test {
 
diff --git a/tests/neg-macros/splice-in-top-level-splice-1.scala b/tests/neg-macros/splice-in-top-level-splice-1.scala
index 4000ff0a1a07..adb12f56d016 100644
--- a/tests/neg-macros/splice-in-top-level-splice-1.scala
+++ b/tests/neg-macros/splice-in-top-level-splice-1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Foo {
   inline def foo(): Int = ${bar(${x})} // error
diff --git a/tests/neg-with-compiler/quote-run-in-macro-1/quoted_1.scala b/tests/neg-with-compiler/quote-run-in-macro-1/quoted_1.scala
index 8646d47c139a..eb7bf8cdf624 100644
--- a/tests/neg-with-compiler/quote-run-in-macro-1/quoted_1.scala
+++ b/tests/neg-with-compiler/quote-run-in-macro-1/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/pending/run/tasty-comments/quoted_1.scala b/tests/pending/run/tasty-comments/quoted_1.scala
index 4c6f4f46a2a0..20f37abdb77d 100644
--- a/tests/pending/run/tasty-comments/quoted_1.scala
+++ b/tests/pending/run/tasty-comments/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 
 object Macros {
diff --git a/tests/pos-macros/i6803b/Macro_1.scala b/tests/pos-macros/i6803b/Macro_1.scala
index 137a9bb6674c..0aa15973d997 100644
--- a/tests/pos-macros/i6803b/Macro_1.scala
+++ b/tests/pos-macros/i6803b/Macro_1.scala
@@ -2,7 +2,7 @@ package blah
 
 import scala.language.implicitConversions
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object AsObject {
   final class LineNo(val lineNo: Int)
diff --git a/tests/pos-macros/quote-nested-object/Macro_1.scala b/tests/pos-macros/quote-nested-object/Macro_1.scala
index 112b9ecc88c7..3f656e201730 100644
--- a/tests/pos-macros/quote-nested-object/Macro_1.scala
+++ b/tests/pos-macros/quote-nested-object/Macro_1.scala
@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macro {
 
diff --git a/tests/pos-with-compiler/quote-0.scala b/tests/pos-with-compiler/quote-0.scala
index 47d0e0315430..39c459c93cb2 100644
--- a/tests/pos-with-compiler/quote-0.scala
+++ b/tests/pos-with-compiler/quote-0.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala b/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala
index 3dff46b4d38a..ed06ae8720ac 100644
--- a/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala
+++ b/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Foo {
 
diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala b/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala
index 5b8222c3c1c8..be144099f497 100644
--- a/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala
+++ b/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Foo {
 
diff --git a/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala b/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala
index 872c122652a2..38b7cf7e75f1 100644
--- a/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala
+++ b/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run-macros/f-interpolation-1/FQuote_1.scala b/tests/run-macros/f-interpolation-1/FQuote_1.scala
index 8bf6892eeaca..c71aca280ef6 100644
--- a/tests/run-macros/f-interpolation-1/FQuote_1.scala
+++ b/tests/run-macros/f-interpolation-1/FQuote_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 import scala.language.implicitConversions
 
diff --git a/tests/run-macros/f-interpolator-neg/Macros_1.scala b/tests/run-macros/f-interpolator-neg/Macros_1.scala
index 87de7c505817..e7916126b21b 100644
--- a/tests/run-macros/f-interpolator-neg/Macros_1.scala
+++ b/tests/run-macros/f-interpolator-neg/Macros_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 import scala.quoted.matching._
 
 import scala.language.implicitConversions
diff --git a/tests/run-macros/i4734/Macro_1.scala b/tests/run-macros/i4734/Macro_1.scala
index ef845271e8bc..802cad99da97 100644
--- a/tests/run-macros/i4734/Macro_1.scala
+++ b/tests/run-macros/i4734/Macro_1.scala
@@ -1,6 +1,6 @@
 import scala.annotation.tailrec
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
   inline def unrolledForeach(seq: IndexedSeq[Int], f: => Int => Unit, inline unrollSize: Int): Unit = // or f: Int => Unit
diff --git a/tests/run-macros/i4735/Macro_1.scala b/tests/run-macros/i4735/Macro_1.scala
index e5142aa990b0..6b07a8f7f22e 100644
--- a/tests/run-macros/i4735/Macro_1.scala
+++ b/tests/run-macros/i4735/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.annotation.tailrec
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 import scala.quoted._
 
diff --git a/tests/run-macros/i5119/Macro_1.scala b/tests/run-macros/i5119/Macro_1.scala
index 7d5bfa337a89..d336ce2e1c6b 100644
--- a/tests/run-macros/i5119/Macro_1.scala
+++ b/tests/run-macros/i5119/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macro {
   class StringContextOps(sc: => StringContext) {
diff --git a/tests/run-macros/i5119b/Macro_1.scala b/tests/run-macros/i5119b/Macro_1.scala
index 2340143d8871..5d040fd169f5 100644
--- a/tests/run-macros/i5119b/Macro_1.scala
+++ b/tests/run-macros/i5119b/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 
 object Macro {
diff --git a/tests/run-macros/i5188a/Macro_1.scala b/tests/run-macros/i5188a/Macro_1.scala
index ea37eb5eb48c..dd12446131f7 100644
--- a/tests/run-macros/i5188a/Macro_1.scala
+++ b/tests/run-macros/i5188a/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Lib {
   inline def sum(inline args: Int*): Int = ${ impl(args: _*) }
diff --git a/tests/run-macros/i6518/Macro_1.scala b/tests/run-macros/i6518/Macro_1.scala
index 2468da6846e1..b5c82b75b932 100644
--- a/tests/run-macros/i6518/Macro_1.scala
+++ b/tests/run-macros/i6518/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run-macros/inferred-repeated-result/test_1.scala b/tests/run-macros/inferred-repeated-result/test_1.scala
index 2de5462d019b..14b6e6a1681a 100644
--- a/tests/run-macros/inferred-repeated-result/test_1.scala
+++ b/tests/run-macros/inferred-repeated-result/test_1.scala
@@ -1,6 +1,6 @@
 object Macros {
   import scala.quoted._
-  import scala.quoted.autolift._
+  import given scala.quoted.autolift._
 
   inline def go[T](t: => T) = ${ impl('t) }
   def impl[T](expr: Expr[T]) given (qctx: QuoteContext): Expr[Unit] = {
diff --git a/tests/run-macros/inline-option/Macro_1.scala b/tests/run-macros/inline-option/Macro_1.scala
index e24f61fc4656..5752ee31bdc7 100644
--- a/tests/run-macros/inline-option/Macro_1.scala
+++ b/tests/run-macros/inline-option/Macro_1.scala
@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run-macros/inline-tuples-1/Macro_1.scala b/tests/run-macros/inline-tuples-1/Macro_1.scala
index 4c2524d50e5a..b1bf95290ebf 100644
--- a/tests/run-macros/inline-tuples-1/Macro_1.scala
+++ b/tests/run-macros/inline-tuples-1/Macro_1.scala
@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
   def tup1(tup: Tuple1[Int]) given QuoteContext: Expr[Int] = tup.productIterator.map(_.asInstanceOf[Int]).sum
diff --git a/tests/run-macros/inline-tuples-2/Macro_1.scala b/tests/run-macros/inline-tuples-2/Macro_1.scala
index a8bc875d252f..9986f30c04a3 100644
--- a/tests/run-macros/inline-tuples-2/Macro_1.scala
+++ b/tests/run-macros/inline-tuples-2/Macro_1.scala
@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run-macros/inline-varargs-1/Macro_1.scala b/tests/run-macros/inline-varargs-1/Macro_1.scala
index 8e90266eca52..d79e9452bd2b 100644
--- a/tests/run-macros/inline-varargs-1/Macro_1.scala
+++ b/tests/run-macros/inline-varargs-1/Macro_1.scala
@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
   def sum(nums: Int*) given QuoteContext: Expr[Int] = nums.sum
diff --git a/tests/run-macros/quote-force/quoted_1.scala b/tests/run-macros/quote-force/quoted_1.scala
index 7af3975e7183..8c11e05e2a5e 100644
--- a/tests/run-macros/quote-force/quoted_1.scala
+++ b/tests/run-macros/quote-force/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 case class Location(owners: List[String])
 
diff --git a/tests/run-macros/quote-impure-by-name/quoted_1.scala b/tests/run-macros/quote-impure-by-name/quoted_1.scala
index 031427770025..efed41619910 100644
--- a/tests/run-macros/quote-impure-by-name/quoted_1.scala
+++ b/tests/run-macros/quote-impure-by-name/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 
 class Index[K, Keys](val index: String) extends AnyVal {
diff --git a/tests/run-macros/quote-inline-function/quoted_1.scala b/tests/run-macros/quote-inline-function/quoted_1.scala
index 860d9aea942d..d51517129b8a 100644
--- a/tests/run-macros/quote-inline-function/quoted_1.scala
+++ b/tests/run-macros/quote-inline-function/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run-macros/quote-matching-optimize-1/Macro_1.scala b/tests/run-macros/quote-matching-optimize-1/Macro_1.scala
index 971562517532..91b89d6f0637 100644
--- a/tests/run-macros/quote-matching-optimize-1/Macro_1.scala
+++ b/tests/run-macros/quote-matching-optimize-1/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macro {
 
diff --git a/tests/run-macros/quote-matching-optimize-2/Macro_1.scala b/tests/run-macros/quote-matching-optimize-2/Macro_1.scala
index 10cc81ac79c8..14592cae64c0 100644
--- a/tests/run-macros/quote-matching-optimize-2/Macro_1.scala
+++ b/tests/run-macros/quote-matching-optimize-2/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 import scala.tasty.Reflection
 
diff --git a/tests/run-macros/quote-matching-optimize-3/Macro_1.scala b/tests/run-macros/quote-matching-optimize-3/Macro_1.scala
index 7dd102311d0a..cf98b4b761fd 100644
--- a/tests/run-macros/quote-matching-optimize-3/Macro_1.scala
+++ b/tests/run-macros/quote-matching-optimize-3/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 import scala.tasty.Reflection
 
diff --git a/tests/run-macros/quote-simple-macro/quoted_1.scala b/tests/run-macros/quote-simple-macro/quoted_1.scala
index 41700d548e0a..941bf02a485f 100644
--- a/tests/run-macros/quote-simple-macro/quoted_1.scala
+++ b/tests/run-macros/quote-simple-macro/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
   inline def foo(inline i: Int, dummy: Int, j: Int): Int = ${ bar(i, 'j) }
diff --git a/tests/run-macros/quote-unrolled-foreach/quoted_1.scala b/tests/run-macros/quote-unrolled-foreach/quoted_1.scala
index 9ff9f7615b0c..8cae5527c034 100644
--- a/tests/run-macros/quote-unrolled-foreach/quoted_1.scala
+++ b/tests/run-macros/quote-unrolled-foreach/quoted_1.scala
@@ -1,6 +1,6 @@
 import scala.annotation.tailrec
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macro {
 
diff --git a/tests/run-macros/tasty-argument-tree-1/quoted_1.scala b/tests/run-macros/tasty-argument-tree-1/quoted_1.scala
index ef7b8596cbfc..cd90ac3edf38 100644
--- a/tests/run-macros/tasty-argument-tree-1/quoted_1.scala
+++ b/tests/run-macros/tasty-argument-tree-1/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run-macros/tasty-custom-show/quoted_1.scala b/tests/run-macros/tasty-custom-show/quoted_1.scala
index 30239facfb4e..c0c5751ef407 100644
--- a/tests/run-macros/tasty-custom-show/quoted_1.scala
+++ b/tests/run-macros/tasty-custom-show/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 
 object Macros {
diff --git a/tests/run-macros/tasty-definitions-1/quoted_1.scala b/tests/run-macros/tasty-definitions-1/quoted_1.scala
index 8ddfcbce595c..88ed817ced20 100644
--- a/tests/run-macros/tasty-definitions-1/quoted_1.scala
+++ b/tests/run-macros/tasty-definitions-1/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run-macros/tasty-eval/quoted_1.scala b/tests/run-macros/tasty-eval/quoted_1.scala
index 55b546c9045b..df2fd3d901da 100644
--- a/tests/run-macros/tasty-eval/quoted_1.scala
+++ b/tests/run-macros/tasty-eval/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run-macros/tasty-extractors-1/quoted_1.scala b/tests/run-macros/tasty-extractors-1/quoted_1.scala
index 2ef08ce8e8d6..0a98043818e4 100644
--- a/tests/run-macros/tasty-extractors-1/quoted_1.scala
+++ b/tests/run-macros/tasty-extractors-1/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run-macros/tasty-extractors-2/quoted_1.scala b/tests/run-macros/tasty-extractors-2/quoted_1.scala
index e1aa303b7dfd..25c081a50bf1 100644
--- a/tests/run-macros/tasty-extractors-2/quoted_1.scala
+++ b/tests/run-macros/tasty-extractors-2/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run-macros/tasty-extractors-3/quoted_1.scala b/tests/run-macros/tasty-extractors-3/quoted_1.scala
index da4943128d59..7c9f7458759e 100644
--- a/tests/run-macros/tasty-extractors-3/quoted_1.scala
+++ b/tests/run-macros/tasty-extractors-3/quoted_1.scala
@@ -1,6 +1,6 @@
 import scala.quoted._
 
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run-macros/tasty-extractors-constants-1/quoted_1.scala b/tests/run-macros/tasty-extractors-constants-1/quoted_1.scala
index a74ae5a48cc6..574fc1e4f3c2 100644
--- a/tests/run-macros/tasty-extractors-constants-1/quoted_1.scala
+++ b/tests/run-macros/tasty-extractors-constants-1/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 import scala.quoted.matching._
 
diff --git a/tests/run-macros/tasty-extractors-types/quoted_1.scala b/tests/run-macros/tasty-extractors-types/quoted_1.scala
index 5ca101f388e5..77b08c28ae3f 100644
--- a/tests/run-macros/tasty-extractors-types/quoted_1.scala
+++ b/tests/run-macros/tasty-extractors-types/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run-macros/tasty-getfile-implicit-fun-context/Macro_1.scala b/tests/run-macros/tasty-getfile-implicit-fun-context/Macro_1.scala
index 7c17e3fac9d9..76923f20d142 100644
--- a/tests/run-macros/tasty-getfile-implicit-fun-context/Macro_1.scala
+++ b/tests/run-macros/tasty-getfile-implicit-fun-context/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object SourceFiles {
 
diff --git a/tests/run-macros/tasty-getfile/Macro_1.scala b/tests/run-macros/tasty-getfile/Macro_1.scala
index b3da537b969a..4b78c68075cb 100644
--- a/tests/run-macros/tasty-getfile/Macro_1.scala
+++ b/tests/run-macros/tasty-getfile/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 
 object SourceFiles {
diff --git a/tests/run-macros/tasty-indexed-map/quoted_1.scala b/tests/run-macros/tasty-indexed-map/quoted_1.scala
index 2c1883baa519..2d49fc3b49da 100644
--- a/tests/run-macros/tasty-indexed-map/quoted_1.scala
+++ b/tests/run-macros/tasty-indexed-map/quoted_1.scala
@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 class MyMap[Keys](private val underlying: Array[Int]) extends AnyVal {
   def get[K <: String](implicit i: Index[K, Keys]): Int = underlying(i.index)
diff --git a/tests/run-macros/tasty-interpolation-1/Macro.scala b/tests/run-macros/tasty-interpolation-1/Macro.scala
index 2e803cb7817d..6534b0cb93d8 100644
--- a/tests/run-macros/tasty-interpolation-1/Macro.scala
+++ b/tests/run-macros/tasty-interpolation-1/Macro.scala
@@ -1,7 +1,7 @@
 
 import scala.quoted._
 import scala.language.implicitConversions
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macro {
 
@@ -77,7 +77,7 @@ abstract class MacroStringInterpolator[T] {
   }
 
   protected implicit def StringContextIsLiftable: Liftable[StringContext] = new Liftable[StringContext] {
-    def toExpr(strCtx: StringContext) = '{StringContext(${strCtx.parts.toList}: _*)}
+    def toExpr(strCtx: StringContext) = '{StringContext(${strCtx.parts.toSeq}: _*)}
   }
 
   protected class NotStaticlyKnownError(msg: String, expr: Expr[Any]) extends Exception(msg)
diff --git a/tests/run-macros/tasty-linenumber-2/quoted_1.scala b/tests/run-macros/tasty-linenumber-2/quoted_1.scala
index 905c46c28e8f..98bd01c47a38 100644
--- a/tests/run-macros/tasty-linenumber-2/quoted_1.scala
+++ b/tests/run-macros/tasty-linenumber-2/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 class LineNumber(val value: Int) {
   override def toString: String = value.toString
diff --git a/tests/run-macros/tasty-linenumber/quoted_1.scala b/tests/run-macros/tasty-linenumber/quoted_1.scala
index c47de1566c59..b69916a357e7 100644
--- a/tests/run-macros/tasty-linenumber/quoted_1.scala
+++ b/tests/run-macros/tasty-linenumber/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 class LineNumber(val value: Int) {
   override def toString: String = value.toString
diff --git a/tests/run-macros/tasty-location/quoted_1.scala b/tests/run-macros/tasty-location/quoted_1.scala
index 15f0ffa15281..0ace1c98eb13 100644
--- a/tests/run-macros/tasty-location/quoted_1.scala
+++ b/tests/run-macros/tasty-location/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 case class Location(owners: List[String])
 
diff --git a/tests/run-macros/tasty-original-source/Macros_1.scala b/tests/run-macros/tasty-original-source/Macros_1.scala
index 6ccde3553d8c..a28631662d95 100644
--- a/tests/run-macros/tasty-original-source/Macros_1.scala
+++ b/tests/run-macros/tasty-original-source/Macros_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run-macros/tasty-positioned/quoted_1.scala b/tests/run-macros/tasty-positioned/quoted_1.scala
index 45ab025a8c8f..531f8270e9ac 100644
--- a/tests/run-macros/tasty-positioned/quoted_1.scala
+++ b/tests/run-macros/tasty-positioned/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 case class Position(path: String, start: Int, end: Int,
     startLine: Int, startColumn: Int, endLine: Int, endColumn: Int)
diff --git a/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala b/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala
index 748995c56702..8f28a102a001 100644
--- a/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala
+++ b/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 import scala.quoted.matching._
 
 import scala.language.implicitConversions
diff --git a/tests/run-macros/tasty-subtyping/quoted_1.scala b/tests/run-macros/tasty-subtyping/quoted_1.scala
index 51b28284bd85..16a637caac11 100644
--- a/tests/run-macros/tasty-subtyping/quoted_1.scala
+++ b/tests/run-macros/tasty-subtyping/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run-macros/tasty-typeof/Macro_1.scala b/tests/run-macros/tasty-typeof/Macro_1.scala
index e81eee70f76d..bd3fb4c664bc 100644
--- a/tests/run-macros/tasty-typeof/Macro_1.scala
+++ b/tests/run-macros/tasty-typeof/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run-macros/xml-interpolation-1/XmlQuote_1.scala b/tests/run-macros/xml-interpolation-1/XmlQuote_1.scala
index 0b2bd62b5af1..41a21ce7c749 100644
--- a/tests/run-macros/xml-interpolation-1/XmlQuote_1.scala
+++ b/tests/run-macros/xml-interpolation-1/XmlQuote_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 
 import scala.language.implicitConversions
diff --git a/tests/run-macros/xml-interpolation-2/XmlQuote_1.scala b/tests/run-macros/xml-interpolation-2/XmlQuote_1.scala
index 88604ba2e18b..4638ca42a39a 100644
--- a/tests/run-macros/xml-interpolation-2/XmlQuote_1.scala
+++ b/tests/run-macros/xml-interpolation-2/XmlQuote_1.scala
@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 
 import scala.language.implicitConversions
diff --git a/tests/run-macros/xml-interpolation-3/XmlQuote_1.scala b/tests/run-macros/xml-interpolation-3/XmlQuote_1.scala
index 557bfd00881c..fa6e7be76cf6 100644
--- a/tests/run-macros/xml-interpolation-3/XmlQuote_1.scala
+++ b/tests/run-macros/xml-interpolation-3/XmlQuote_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 import scala.language.implicitConversions
 
diff --git a/tests/run-macros/xml-interpolation-4/Macros_1.scala b/tests/run-macros/xml-interpolation-4/Macros_1.scala
index 8c4de3214103..9fbc8ce99e3b 100644
--- a/tests/run-macros/xml-interpolation-4/Macros_1.scala
+++ b/tests/run-macros/xml-interpolation-4/Macros_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 import scala.language.implicitConversions
 
diff --git a/tests/run-with-compiler-custom-args/staged-streams_1.scala b/tests/run-with-compiler-custom-args/staged-streams_1.scala
index ddb3a170dca3..755195ddb6b1 100644
--- a/tests/run-with-compiler-custom-args/staged-streams_1.scala
+++ b/tests/run-with-compiler-custom-args/staged-streams_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 /**
   * Port of the strymonas library as described in O. Kiselyov et al., Stream fusion, to completeness (POPL 2017)
diff --git a/tests/run-with-compiler/quote-lib.scala b/tests/run-with-compiler/quote-lib.scala
index 915f8fe28736..1f51259c7b0e 100644
--- a/tests/run-with-compiler/quote-lib.scala
+++ b/tests/run-with-compiler/quote-lib.scala
@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 import liftable.Units._
 import liftable.Lets._
diff --git a/tests/run-with-compiler/quote-lift-Array.scala b/tests/run-with-compiler/quote-lift-Array.scala
index 45db0fb959bf..b4358c868922 100644
--- a/tests/run-with-compiler/quote-lift-Array.scala
+++ b/tests/run-with-compiler/quote-lift-Array.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Test {
   implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
diff --git a/tests/run-with-compiler/quote-lift-IArray.scala b/tests/run-with-compiler/quote-lift-IArray.scala
index c90144e4db52..e43b96f18a28 100644
--- a/tests/run-with-compiler/quote-lift-IArray.scala
+++ b/tests/run-with-compiler/quote-lift-IArray.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Test {
   implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
diff --git a/tests/run-with-compiler/quote-run-constants.scala b/tests/run-with-compiler/quote-run-constants.scala
index dbc1b22006e3..3f2d26b77ffd 100644
--- a/tests/run-with-compiler/quote-run-constants.scala
+++ b/tests/run-with-compiler/quote-run-constants.scala
@@ -1,5 +1,5 @@
 
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 import scala.quoted._
 
diff --git a/tests/run-with-compiler/quote-run-many.scala b/tests/run-with-compiler/quote-run-many.scala
index a605a9c0989e..0c35431c2169 100644
--- a/tests/run-with-compiler/quote-run-many.scala
+++ b/tests/run-with-compiler/quote-run-many.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Test {
   def main(args: Array[String]): Unit = {
diff --git a/tests/run-with-compiler/quote-run-staged-interpreter.scala b/tests/run-with-compiler/quote-run-staged-interpreter.scala
index c72a7ca91c54..4918f8e21b9a 100644
--- a/tests/run-with-compiler/quote-run-staged-interpreter.scala
+++ b/tests/run-with-compiler/quote-run-staged-interpreter.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 enum Exp {
   case Num(n: Int)
diff --git a/tests/run-with-compiler/quote-show-blocks.scala b/tests/run-with-compiler/quote-show-blocks.scala
index 6128ac86321f..47bb41b6eb8f 100644
--- a/tests/run-with-compiler/quote-show-blocks.scala
+++ b/tests/run-with-compiler/quote-show-blocks.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Test {
   implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
diff --git a/tests/run-with-compiler/quote-unrolled-foreach.scala b/tests/run-with-compiler/quote-unrolled-foreach.scala
index 86b5c56184df..c93e526bc1fc 100644
--- a/tests/run-with-compiler/quote-unrolled-foreach.scala
+++ b/tests/run-with-compiler/quote-unrolled-foreach.scala
@@ -1,6 +1,6 @@
 import scala.annotation.tailrec
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Test {
   implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
diff --git a/tests/run-with-compiler/shonan-hmm-simple.scala b/tests/run-with-compiler/shonan-hmm-simple.scala
index 56ffad70fe21..e949246806c2 100644
--- a/tests/run-with-compiler/shonan-hmm-simple.scala
+++ b/tests/run-with-compiler/shonan-hmm-simple.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 trait Ring[T] {
   val zero: T
diff --git a/tests/run-with-compiler/shonan-hmm/Lifters.scala b/tests/run-with-compiler/shonan-hmm/Lifters.scala
index 3be354ec0fda..dff1335bf3f4 100644
--- a/tests/run-with-compiler/shonan-hmm/Lifters.scala
+++ b/tests/run-with-compiler/shonan-hmm/Lifters.scala
@@ -3,7 +3,7 @@ import UnrolledExpr._
 
 import scala.reflect.ClassTag
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 object Lifters {
   implicit def LiftedClassTag[T: Type: ClassTag]  given QuoteContext: Expr[ClassTag[T]] = {
diff --git a/tests/run-with-compiler/shonan-hmm/MVmult.scala b/tests/run-with-compiler/shonan-hmm/MVmult.scala
index 9c1ceb44bae1..6f19f78de5c8 100644
--- a/tests/run-with-compiler/shonan-hmm/MVmult.scala
+++ b/tests/run-with-compiler/shonan-hmm/MVmult.scala
@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 class MVmult[Idx, T, Unt](tring: Ring[T], vec: VecROp[Idx, T, Unt]) {
   private[this] val blas2 = new Blas2(tring, vec)
diff --git a/tests/run-with-compiler/shonan-hmm/VecROp.scala b/tests/run-with-compiler/shonan-hmm/VecROp.scala
index 2996ba754b0d..006fc563d1a2 100644
--- a/tests/run-with-compiler/shonan-hmm/VecROp.scala
+++ b/tests/run-with-compiler/shonan-hmm/VecROp.scala
@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 trait VecROp[Idx, T, Unt] extends VecOp[Idx, Unt] {
   def reduce: ((T, T) => T, T, Vec[Idx, T]) => T
diff --git a/tests/run-with-compiler/tasty-extractors-constants-2/quoted_1.scala b/tests/run-with-compiler/tasty-extractors-constants-2/quoted_1.scala
index 2ad5214347f1..d329c65ad84c 100644
--- a/tests/run-with-compiler/tasty-extractors-constants-2/quoted_1.scala
+++ b/tests/run-with-compiler/tasty-extractors-constants-2/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.autolift._
+import given scala.quoted.autolift._
 
 import scala.tasty.util._