diff --git a/api-untyped.rkt b/api-untyped.rkt
index f9c926c..2590122 100644
--- a/api-untyped.rkt
+++ b/api-untyped.rkt
@@ -1,8 +1,8 @@
 #lang racket/base
-;; Untyped struct definitions required to interoperate with typed-matrix's struct-map
+;; Untyped struct definitions required to interoperate with marketplace's struct-map
 ;; See also Racket PR 13593.
 
-(require racket-typed-matrix/struct-map)
+(require marketplace/struct-map)
 
 (provide (struct-out domain))
 
diff --git a/api.rkt b/api.rkt
index fba0f19..67cbaa1 100644
--- a/api.rkt
+++ b/api.rkt
@@ -60,9 +60,9 @@
 (require "mapping.rkt")
 (require racket/set)
 (require racket/match)
-(require racket-typed-matrix)
-(require racket-typed-matrix/struct-map)
-(require racket-typed-matrix/support/pseudo-substruct)
+(require marketplace)
+(require marketplace/struct-map)
+(require marketplace/support/pseudo-substruct)
 
 ;; A DomainName is a (domain ListOf<Bytes>), representing a domain
 ;; name. The head of the list is the leftmost label; for example,
diff --git a/codec.rkt b/codec.rkt
index 7b71d6c..685e9dc 100644
--- a/codec.rkt
+++ b/codec.rkt
@@ -27,7 +27,7 @@
 
 (require racket/match)
 
-(require racket-bitsyntax)
+(require (planet tonyg/bitsyntax))
 
 ;; An Opcode is a Symbol or a Number, one of the possibilities given
 ;; in the following define-mapping. It represents a DNS message
diff --git a/driver.rkt b/driver.rkt
index 1cb831b..9e5a7c0 100644
--- a/driver.rkt
+++ b/driver.rkt
@@ -5,14 +5,14 @@
 (require racket/match)
 (require racket/set)
 (require racket/bool)
-(require racket-bitsyntax)
+(require (planet tonyg/bitsyntax))
 (require "api.rkt")
 (require "codec.rkt")
 (require "zonedb.rkt")
 (require "resolver.rkt")
-(require racket-typed-matrix/sugar-typed)
-(require racket-typed-matrix/support/spy)
-(require racket-typed-matrix/drivers/udp)
+(require marketplace/sugar-typed)
+(require marketplace/support/spy)
+(require marketplace/drivers/udp)
 (require "tk-dns.rkt")
 
 ;; Instantiated with a SOA record for the zone it is serving as well
diff --git a/network-query.rkt b/network-query.rkt
index a66d9d0..e128466 100644
--- a/network-query.rkt
+++ b/network-query.rkt
@@ -5,12 +5,12 @@
 (require "api.rkt")
 (require "codec.rkt")
 (require "zonedb.rkt")
-(require racket-typed-matrix/sugar-typed)
-(require racket-typed-matrix/drivers/udp)
-(require racket-typed-matrix/drivers/timer)
-(require racket-typed-matrix/support/pseudo-substruct)
+(require marketplace/sugar-typed)
+(require marketplace/drivers/udp)
+(require marketplace/drivers/timer)
+(require marketplace/support/pseudo-substruct)
 (require "tk-dns.rkt")
-(require (rename-in racket-typed-matrix/tr-struct-copy [tr-struct-copy struct-copy])) ;; PR13149
+(require (rename-in marketplace/tr-struct-copy [tr-struct-copy struct-copy])) ;; PR13149
 
 (provide network-query
 	 (struct-out network-reply-repr)
diff --git a/proxy.rkt b/proxy.rkt
index 95de34e..87bcfea 100644
--- a/proxy.rkt
+++ b/proxy.rkt
@@ -5,16 +5,16 @@
 (require racket/match)
 (require racket/set)
 (require racket/bool)
-(require racket-bitsyntax)
+(require (planet tonyg/bitsyntax))
 (require "api.rkt")
 (require "codec.rkt")
 (require "zonedb.rkt")
 (require "network-query.rkt")
 (require "resolver.rkt")
-(require racket-typed-matrix/sugar-typed)
-(require racket-typed-matrix/support/spy)
-(require racket-typed-matrix/drivers/timer)
-(require racket-typed-matrix/drivers/udp)
+(require marketplace/sugar-typed)
+(require marketplace/support/spy)
+(require marketplace/drivers/timer)
+(require marketplace/drivers/udp)
 (require "tk-dns.rkt")
 
 (require racket/pretty)
diff --git a/tk-dns.rkt b/tk-dns.rkt
index 721e252..cefe6c5 100644
--- a/tk-dns.rkt
+++ b/tk-dns.rkt
@@ -1,12 +1,12 @@
 #lang typed/racket/base
-;; DNS drivers using racket-typed-matrix.
+;; DNS drivers using marketplace.
 
 (require racket/set)
 (require racket/match)
 (require "codec.rkt")
-(require racket-typed-matrix/sugar-typed)
-(require racket-typed-matrix/drivers/udp)
-(require racket-typed-matrix/support/pseudo-substruct)
+(require marketplace/sugar-typed)
+(require marketplace/drivers/udp)
+(require marketplace/support/pseudo-substruct)
 
 (provide (struct-out bad-dns-packet-repr)
 	 BadDnsPacket bad-dns-packet bad-dns-packet?
diff --git a/zonedb.rkt b/zonedb.rkt
index 0571c3c..c59967b 100644
--- a/zonedb.rkt
+++ b/zonedb.rkt
@@ -7,8 +7,8 @@
 (require (only-in racket/math exact-floor exact-truncate))
 (require "api.rkt")
 (require "codec.rkt")
-(require racket-bitsyntax)
-(require (rename-in racket-typed-matrix/tr-struct-copy [tr-struct-copy struct-copy])) ;; PR13149
+(require (planet tonyg/bitsyntax))
+(require (rename-in marketplace/tr-struct-copy [tr-struct-copy struct-copy])) ;; PR13149
 
 (provide CompiledZone
 	 zone-ref