client.go                    | 6 +++---
 ordered-bitmap.go            | 4 ++--
 request-strategy/order.go    | 4 ++--
 smartban.go                  | 4 ++--
 webtorrent/tracker-client.go | 4 ++--

diff --git a/client.go b/client.go
index 7524cb0f600fab9c76893df9df1dbf000844f58e..cc328cc6567976b1635930467a5d295a529f530f 100644
--- a/client.go
+++ b/client.go
@@ -23,7 +23,7 @@ 	"github.com/anacrolix/chansync"
 	"github.com/anacrolix/chansync/events"
 	"github.com/anacrolix/dht/v2"
 	"github.com/anacrolix/dht/v2/krpc"
-	"github.com/anacrolix/generics"
+	g "github.com/anacrolix/generics"
 	. "github.com/anacrolix/generics"
 	"github.com/anacrolix/log"
 	"github.com/anacrolix/missinggo/perf"
@@ -195,7 +195,7 @@
 // Initializes a bare minimum Client. *Client and *ClientConfig must not be nil.
 func (cl *Client) init(cfg *ClientConfig) {
 	cl.config = cfg
-	generics.MakeMap(&cl.dopplegangerAddrs)
+	g.MakeMap(&cl.dopplegangerAddrs)
 	cl.torrents = make(map[metainfo.Hash]*Torrent)
 	cl.dialRateLimiter = rate.NewLimiter(10, 10)
 	cl.activeAnnounceLimiter.SlotsPerKey = 2
@@ -1461,7 +1461,7 @@ 	ipAddr, ok := netip.AddrFromSlice(ip)
 	if !ok {
 		panic(ip)
 	}
-	generics.MakeMapIfNilAndSet(&cl.badPeerIPs, ipAddr, struct{}{})
+	g.MakeMapIfNilAndSet(&cl.badPeerIPs, ipAddr, struct{}{})
 	for _, t := range cl.torrents {
 		t.iterPeers(func(p *Peer) {
 			if p.remoteIp().Equal(ip) {
diff --git a/ordered-bitmap.go b/ordered-bitmap.go
index 3be15c5b0d67836ed99b68d5709ed951dac27a29..741067168431032cec7b71d2aa9ac98079a98afb 100644
--- a/ordered-bitmap.go
+++ b/ordered-bitmap.go
@@ -1,7 +1,7 @@
 package torrent
 
 import (
-	"github.com/anacrolix/generics"
+	g "github.com/anacrolix/generics"
 	list "github.com/bahlo/generic-list-go"
 
 	"github.com/anacrolix/torrent/typed-roaring"
@@ -33,7 +33,7 @@
 func (o *orderedBitmap[T]) Add(index T) {
 	o.bitmap.Add(index)
 	if _, ok := o.elements[index]; !ok {
-		generics.MakeMapIfNilAndSet(&o.elements, index, o.order.PushBack(index))
+		g.MakeMapIfNilAndSet(&o.elements, index, o.order.PushBack(index))
 	}
 }
 
diff --git a/request-strategy/order.go b/request-strategy/order.go
index 6c134be1d333e19ff43f523da1c4d485dde5bbed..f608083159214a2fc00486ef932e15cd6e7903ee 100644
--- a/request-strategy/order.go
+++ b/request-strategy/order.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"expvar"
 
-	"github.com/anacrolix/generics"
+	g "github.com/anacrolix/generics"
 	"github.com/anacrolix/multiless"
 
 	"github.com/anacrolix/torrent/metainfo"
@@ -55,7 +55,7 @@ 	if cap, ok := input.Capacity(); ok {
 		storageLeft = &cap
 	}
 	var allTorrentsUnverifiedBytes int64
-	var lastItem generics.Option[pieceRequestOrderItem]
+	var lastItem g.Option[pieceRequestOrderItem]
 	pro.tree.Scan(func(_i pieceRequestOrderItem) bool {
 		// Check that scan emits pieces in priority order.
 		if lastItem.Ok {
diff --git a/smartban.go b/smartban.go
index 96cc2acfdbc717e2be5e0a0284eb86884d498b71..034a702d950372400c8dddb002fa1121304073e5 100644
--- a/smartban.go
+++ b/smartban.go
@@ -5,7 +5,7 @@ 	"bytes"
 	"crypto/sha1"
 	"net/netip"
 
-	"github.com/anacrolix/generics"
+	g "github.com/anacrolix/generics"
 
 	"github.com/anacrolix/torrent/smartban"
 )
@@ -26,7 +26,7 @@
 func (me *blockCheckingWriter) checkBlock() {
 	b := me.blockBuffer.Next(me.chunkSize)
 	for _, peer := range me.cache.CheckBlock(me.requestIndex, b) {
-		generics.MakeMapIfNilAndSet(&me.badPeers, peer, struct{}{})
+		g.MakeMapIfNilAndSet(&me.badPeers, peer, struct{}{})
 	}
 	me.requestIndex++
 }
diff --git a/webtorrent/tracker-client.go b/webtorrent/tracker-client.go
index 97b9b6211aa744bd09a19d8cc5527ee671f2f578..30a35be7712d0fe5848f34ab76bf602ed990d138 100644
--- a/webtorrent/tracker-client.go
+++ b/webtorrent/tracker-client.go
@@ -9,7 +9,7 @@ 	"net/http"
 	"sync"
 	"time"
 
-	"github.com/anacrolix/generics"
+	g "github.com/anacrolix/generics"
 	"github.com/anacrolix/log"
 	"github.com/gorilla/websocket"
 	"github.com/pion/datachannel"
@@ -286,7 +286,7 @@ 	if err != nil {
 		return fmt.Errorf("write AnnounceRequest: %w", err)
 	}
 	for _, offer := range offers {
-		generics.MakeMapIfNilAndSet(&tc.outboundOffers, offer.offerId, offer.outboundOfferValue)
+		g.MakeMapIfNilAndSet(&tc.outboundOffers, offer.offerId, offer.outboundOfferValue)
 	}
 	return nil
 }