diff --git a/parse.rkt b/parse.rkt
index 6d72774..7d351f6 100644
--- a/parse.rkt
+++ b/parse.rkt
@@ -12,7 +12,7 @@
 
 (begin-for-syntax
   (require racket/contract/base
-           syntax/parse/private/residual-ct)
+           stxparse-info/parse/private/residual-ct)
   (provide pattern-expander?
            (contract-out
             [pattern-expander
diff --git a/parse/debug.rkt b/parse/debug.rkt
index a816fd4..6a51b99 100644
--- a/parse/debug.rkt
+++ b/parse/debug.rkt
@@ -8,7 +8,7 @@
          racket/list
          racket/pretty
          "../parse.rkt"
-         (except-in syntax/parse/private/residual
+         (except-in stxparse-info/parse/private/residual
                     prop:pattern-expander syntax-local-syntax-parse-pattern-introduce)
          "private/runtime.rkt"
          "private/runtime-progress.rkt"
diff --git a/parse/define.rkt b/parse/define.rkt
index 97c2010..28e5148 100644
--- a/parse/define.rkt
+++ b/parse/define.rkt
@@ -1,10 +1,10 @@
 #lang racket/base
 (require (for-syntax racket/base
-                     syntax/parse
+                     stxparse-info/parse
                      "private/sc.rkt"))
 (provide define-simple-macro
          define-syntax-parser
-         (for-syntax (all-from-out syntax/parse)))
+         (for-syntax (all-from-out stxparse-info/parse)))
 
 (define-syntax (define-simple-macro stx)
   (syntax-parse stx
diff --git a/parse/experimental/contract.rkt b/parse/experimental/contract.rkt
index b4dbec4..5d5144b 100644
--- a/parse/experimental/contract.rkt
+++ b/parse/experimental/contract.rkt
@@ -1,8 +1,8 @@
 #lang racket/base
-(require syntax/parse/pre
+(require stxparse-info/parse/pre
          "provide.rkt"
          syntax/contract
-         (only-in syntax/parse/private/residual ;; keep abs. path
+         (only-in stxparse-info/parse/private/residual ;; keep abs. path
                   this-context-syntax
                   this-role)
          racket/contract/base)
diff --git a/parse/experimental/private/substitute.rkt b/parse/experimental/private/substitute.rkt
index 20cb572..274bfb8 100644
--- a/parse/experimental/private/substitute.rkt
+++ b/parse/experimental/private/substitute.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require syntax/parse/private/minimatch
+(require stxparse-info/parse/private/minimatch
          racket/private/promise
          racket/private/stx) ;; syntax/stx
 (provide translate)
@@ -444,7 +444,7 @@ An VarRef is one of
                    [else
                     (err/not-syntax ctx v0)]))])))
 
-;; Note: slightly different from error msg in syntax/parse/private/residual:
+;; Note: slightly different from error msg in stxparse-info/parse/private/residual:
 ;; here says "contains" instead of "is bound to", because might be within list
 (define (err/not-syntax ctx v)
   (raise-syntax-error #f
diff --git a/parse/experimental/provide.rkt b/parse/experimental/provide.rkt
index 8e5f234..64f9c7a 100644
--- a/parse/experimental/provide.rkt
+++ b/parse/experimental/provide.rkt
@@ -5,8 +5,8 @@
          (for-syntax racket/base
                      racket/syntax
                      "../private/minimatch.rkt"
-                     syntax/parse/pre
-                     syntax/parse/private/residual-ct ;; keep abs. path
+                     stxparse-info/parse/pre
+                     stxparse-info/parse/private/residual-ct ;; keep abs. path
                      "../private/kws.rkt"
                      syntax/contract))
 (provide provide-syntax-class/contract
diff --git a/parse/experimental/reflect.rkt b/parse/experimental/reflect.rkt
index b92f53e..ca2deab 100644
--- a/parse/experimental/reflect.rkt
+++ b/parse/experimental/reflect.rkt
@@ -2,7 +2,7 @@
 (require (for-syntax racket/base
                      racket/lazy-require
                      racket/syntax
-                     syntax/parse/private/residual-ct) ;; keep abs.path
+                     stxparse-info/parse/private/residual-ct) ;; keep abs.path
          racket/contract/base
          racket/contract/combinator
          "../private/minimatch.rkt"
@@ -11,12 +11,12 @@
          "../private/kws.rkt")
 (begin-for-syntax
  (lazy-require
-  [syntax/parse/private/rep-data ;; keep abs. path
+  [stxparse-info/parse/private/rep-data ;; keep abs. path
    (get-stxclass)]))
 ;; FIXME: workaround for phase>0 bug in racket/runtime-path (and thus lazy-require)
 ;; Without this, dependencies don't get collected.
 (require racket/runtime-path (for-meta 2 '#%kernel))
-(define-runtime-module-path-index _unused_ 'syntax/parse/private/rep-data)
+(define-runtime-module-path-index _unused_ 'stxparse-info/parse/private/rep-data)
 
 (define-syntax (reify-syntax-class stx)
   (if (eq? (syntax-local-context) 'expression)
diff --git a/parse/experimental/splicing.rkt b/parse/experimental/splicing.rkt
index f9105c1..8b2eb97 100644
--- a/parse/experimental/splicing.rkt
+++ b/parse/experimental/splicing.rkt
@@ -1,19 +1,19 @@
 #lang racket/base
 (require (for-syntax racket/base
-                     syntax/parse
+                     stxparse-info/parse
                      racket/lazy-require
                      "../private/kws.rkt")
-         syntax/parse/private/residual) ;; keep abs. path
+         stxparse-info/parse/private/residual) ;; keep abs. path
 (provide define-primitive-splicing-syntax-class)
 
 (begin-for-syntax
  (lazy-require
-  [syntax/parse/private/rep-attrs
+  [stxparse-info/parse/private/rep-attrs
    (sort-sattrs)]))
 ;; FIXME: workaround for phase>0 bug in racket/runtime-path (and thus lazy-require)
 ;; Without this, dependencies don't get collected.
 (require racket/runtime-path (for-meta 2 '#%kernel))
-(define-runtime-module-path-index _unused_ 'syntax/parse/private/rep-attrs)
+(define-runtime-module-path-index _unused_ 'stxparse-info/parse/private/rep-attrs)
 
 (define-syntax (define-primitive-splicing-syntax-class stx)
 
diff --git a/parse/experimental/template.rkt b/parse/experimental/template.rkt
index 4f0b2d3..7de099f 100644
--- a/parse/experimental/template.rkt
+++ b/parse/experimental/template.rkt
@@ -2,11 +2,11 @@
 (require (for-syntax racket/base
                      "dset.rkt"
                      racket/syntax
-                     syntax/parse/private/minimatch
+                     stxparse-info/parse/private/minimatch
                      racket/private/stx ;; syntax/stx
                      racket/private/sc
                      racket/struct)
-         syntax/parse/private/residual
+         stxparse-info/parse/private/residual
          "private/substitute.rkt")
 (provide template
          template/loc
diff --git a/parse/private/litconv.rkt b/parse/private/litconv.rkt
index 9197505..1bea359 100644
--- a/parse/private/litconv.rkt
+++ b/parse/private/litconv.rkt
@@ -5,12 +5,12 @@
                      "lib.rkt"
                      "kws.rkt"
                      racket/syntax)
-         syntax/parse/private/residual-ct ;; keep abs. path
-         syntax/parse/private/residual)   ;; keep abs. path
+         stxparse-info/parse/private/residual-ct ;; keep abs. path
+         stxparse-info/parse/private/residual)   ;; keep abs. path
 (begin-for-syntax
  (lazy-require
   [syntax/private/keyword (options-select-value parse-keyword-options)]
-  [syntax/parse/private/rep ;; keep abs. path
+  [stxparse-info/parse/private/rep ;; keep abs. path
    (parse-kw-formals
     check-conventions-rules
     check-datum-literals-list
@@ -18,7 +18,7 @@
 ;; FIXME: workaround for phase>0 bug in racket/runtime-path (and thus lazy-require)
 ;; Without this, dependencies don't get collected.
 (require racket/runtime-path racket/syntax (for-meta 2 '#%kernel))
-(define-runtime-module-path-index _unused_ 'syntax/parse/private/rep)
+(define-runtime-module-path-index _unused_ 'stxparse-info/parse/private/rep)
 
 (provide define-conventions
          define-literal-set
@@ -215,7 +215,7 @@ change between when define-literal-set is compiled and the comparison
 involving L. For example:
 
   (module M racket
-    (require syntax/parse)
+    (require stxparse-info/parse)
     (define-literal-set LS (lambda))
     (require (only-in some-other-lang lambda))
     .... LS ....)
diff --git a/parse/private/opt.rkt b/parse/private/opt.rkt
index 0dc2460..c1424d7 100644
--- a/parse/private/opt.rkt
+++ b/parse/private/opt.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require racket/syntax
          racket/pretty
-         syntax/parse/private/residual-ct ;; keep abs. path
+         stxparse-info/parse/private/residual-ct ;; keep abs. path
          "minimatch.rkt"
          "rep-patterns.rkt"
          "kws.rkt")
diff --git a/parse/private/parse.rkt b/parse/private/parse.rkt
index db71140..afd2de8 100644
--- a/parse/private/parse.rkt
+++ b/parse/private/parse.rkt
@@ -16,9 +16,9 @@
          racket/syntax
          racket/stxparam
          syntax/stx
-         syntax/parse/private/residual ;; keep abs. path
-         syntax/parse/private/runtime  ;; keep abs.path 
-         syntax/parse/private/runtime-reflect) ;; keep abs. path
+         stxparse-info/parse/private/residual ;; keep abs. path
+         stxparse-info/parse/private/runtime  ;; keep abs.path 
+         stxparse-info/parse/private/runtime-reflect) ;; keep abs. path
 
 ;; ============================================================
 
diff --git a/parse/private/rep-attrs.rkt b/parse/private/rep-attrs.rkt
index 11fbe0a..75e1880 100644
--- a/parse/private/rep-attrs.rkt
+++ b/parse/private/rep-attrs.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require syntax/parse/private/residual-ct ;; keep abs. path
+(require stxparse-info/parse/private/residual-ct ;; keep abs. path
          racket/contract/base
          syntax/private/id-table
          racket/syntax
diff --git a/parse/private/rep-data.rkt b/parse/private/rep-data.rkt
index 702b279..f8c0a80 100644
--- a/parse/private/rep-data.rkt
+++ b/parse/private/rep-data.rkt
@@ -3,7 +3,7 @@
          racket/dict
          syntax/private/id-table
          racket/syntax
-         syntax/parse/private/residual-ct ;; keep abs. path
+         stxparse-info/parse/private/residual-ct ;; keep abs. path
          "minimatch.rkt"
          "kws.rkt")
 ;; from residual.rkt
diff --git a/parse/private/rep-patterns.rkt b/parse/private/rep-patterns.rkt
index addbf2a..fdd0742 100644
--- a/parse/private/rep-patterns.rkt
+++ b/parse/private/rep-patterns.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require syntax/parse/private/residual-ct ;; keep abs. path
+(require stxparse-info/parse/private/residual-ct ;; keep abs. path
          "rep-attrs.rkt"
          "minimatch.rkt"
          racket/syntax)
diff --git a/parse/private/rep.rkt b/parse/private/rep.rkt
index cc32c04..e6aafdc 100644
--- a/parse/private/rep.rkt
+++ b/parse/private/rep.rkt
@@ -1,8 +1,8 @@
 #lang racket/base
 (require (for-template racket/base
-                       syntax/parse/private/keywords
-                       syntax/parse/private/residual ;; keep abs. path
-                       syntax/parse/private/runtime)
+                       stxparse-info/parse/private/keywords
+                       stxparse-info/parse/private/residual ;; keep abs. path
+                       stxparse-info/parse/private/runtime)
          racket/list
          racket/contract/base
          "make.rkt"
@@ -16,7 +16,7 @@
          "rep-attrs.rkt"
          "rep-data.rkt"
          "rep-patterns.rkt"
-         syntax/parse/private/residual-ct ;; keep abs. path
+         stxparse-info/parse/private/residual-ct ;; keep abs. path
          "kws.rkt")
 
 ;; Error reporting
diff --git a/parse/private/residual.rkt b/parse/private/residual.rkt
index baea065..d384409 100644
--- a/parse/private/residual.rkt
+++ b/parse/private/residual.rkt
@@ -8,8 +8,8 @@
 ;; Compile-time
 
 (require (for-syntax racket/private/sc
-                     syntax/parse/private/residual-ct))
-(provide (for-syntax (all-from-out syntax/parse/private/residual-ct)))
+                     stxparse-info/parse/private/residual-ct))
+(provide (for-syntax (all-from-out stxparse-info/parse/private/residual-ct)))
 
 (begin-for-syntax
   ;; == from runtime.rkt
diff --git a/parse/private/runtime-reflect.rkt b/parse/private/runtime-reflect.rkt
index 63dc1bb..c0a51c1 100644
--- a/parse/private/runtime-reflect.rkt
+++ b/parse/private/runtime-reflect.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
-(require syntax/parse/private/residual ;; keep abs. path
-         (only-in syntax/parse/private/residual-ct ;; keep abs. path
+(require stxparse-info/parse/private/residual ;; keep abs. path
+         (only-in stxparse-info/parse/private/residual-ct ;; keep abs. path
                   attr-name attr-depth)
          "kws.rkt")
 (provide reflect-parser
diff --git a/parse/private/runtime-report.rkt b/parse/private/runtime-report.rkt
index 8029e9f..6979e22 100644
--- a/parse/private/runtime-report.rkt
+++ b/parse/private/runtime-report.rkt
@@ -5,7 +5,7 @@
          racket/struct
          syntax/srcloc
          "minimatch.rkt"
-         syntax/parse/private/residual
+         stxparse-info/parse/private/residual
          "kws.rkt")
 (provide call-current-failure-handler
          current-failure-handler
diff --git a/parse/private/runtime.rkt b/parse/private/runtime.rkt
index c4a1ce9..bc115bb 100644
--- a/parse/private/runtime.rkt
+++ b/parse/private/runtime.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require racket/stxparam
-         syntax/parse/private/residual ;; keep abs. path
+         stxparse-info/parse/private/residual ;; keep abs. path
          (for-syntax racket/base
                      racket/list
                      syntax/kerncase
diff --git a/parse/private/sc.rkt b/parse/private/sc.rkt
index fc8abf7..a15968f 100644
--- a/parse/private/sc.rkt
+++ b/parse/private/sc.rkt
@@ -6,7 +6,7 @@
 ;; keep and keep as abs. path -- lazy-loaded macros produce references to this
 ;; must be required via *absolute module path* from any disappearing module
 ;; (so for consistency etc, require absolutely from all modules)
-(require syntax/parse/private/residual
+(require stxparse-info/parse/private/residual
          racket/syntax
          racket/stxparam
          syntax/stx)
@@ -16,7 +16,7 @@
   ;; load macro transformers lazily via identifier
   ;; This module path must also be absolute (not sure why,
   ;; but it definitely breaks on relative module path).
-  [syntax/parse/private/parse-aux
+  [stxparse-info/parse/private/parse-aux
    (id:define-syntax-class
     id:define-splicing-syntax-class
     id:define-integrable-syntax-class
@@ -29,7 +29,7 @@
 ;; FIXME: workaround for phase>0 bug in racket/runtime-path (and thus lazy-require)
 ;; Without this, dependencies don't get collected.
 (require racket/runtime-path (for-meta 2 '#%kernel))
-(define-runtime-module-path-index _unused_ 'syntax/parse/private/parse-aux)
+(define-runtime-module-path-index _unused_ 'stxparse-info/parse/private/parse-aux)
 
 (provide define-syntax-class
          define-splicing-syntax-class