diff --git a/go.mod b/go.mod
index fe6917a1..d21561ad 100644
--- a/go.mod
+++ b/go.mod
@@ -22,10 +22,10 @@ require (
 	github.com/ipfs/go-ipfs-exchange-interface v0.2.0
 	github.com/ipfs/go-ipld-format v0.5.0
 	github.com/ipfs/go-log/v2 v2.5.1
-	github.com/ipfs/go-unixfsnode v1.7.2-0.20230622024455-de5cbf74cbe0
+	github.com/ipfs/go-unixfsnode v1.7.2-0.20230707090412-166be19558d9
 	github.com/ipld/go-car/v2 v2.10.1
 	github.com/ipld/go-codec-dagpb v1.6.0
-	github.com/ipld/go-ipld-prime v0.20.1-0.20230629094729-829a31766846
+	github.com/ipld/go-ipld-prime v0.20.1-0.20230707090759-349deb22a1fd
 	github.com/ipld/ipld/specs v0.0.0-20230705075038-29da2e853cdb
 	github.com/ipni/go-libipni v0.0.8-0.20230425184153-86a1fcb7f7ff
 	github.com/libp2p/go-libp2p v0.27.1
diff --git a/go.sum b/go.sum
index 28778b3c..410de784 100644
--- a/go.sum
+++ b/go.sum
@@ -329,15 +329,15 @@ github.com/ipfs/go-metrics-interface v0.0.1/go.mod h1:6s6euYU4zowdslK0GKHmqaIZ3j
 github.com/ipfs/go-peertaskqueue v0.8.1 h1:YhxAs1+wxb5jk7RvS0LHdyiILpNmRIRnZVztekOF0pg=
 github.com/ipfs/go-peertaskqueue v0.8.1/go.mod h1:Oxxd3eaK279FxeydSPPVGHzbwVeHjatZ2GA8XD+KbPU=
 github.com/ipfs/go-unixfs v0.4.5 h1:wj8JhxvV1G6CD7swACwSKYa+NgtdWC1RUit+gFnymDU=
-github.com/ipfs/go-unixfsnode v1.7.2-0.20230622024455-de5cbf74cbe0 h1:XTKKTDz0rbJ53ff/7borHTvN64zJK74wZDvrYfdN0Fg=
-github.com/ipfs/go-unixfsnode v1.7.2-0.20230622024455-de5cbf74cbe0/go.mod h1:PVfoyZkX1B34qzT3vJO4nsLUpRCyhnMuHBznRcXirlk=
+github.com/ipfs/go-unixfsnode v1.7.2-0.20230707090412-166be19558d9 h1:GXlyCGBZ235qjUd4HIP0D/qsBQxx2KWvugopoIuqeCk=
+github.com/ipfs/go-unixfsnode v1.7.2-0.20230707090412-166be19558d9/go.mod h1:PVfoyZkX1B34qzT3vJO4nsLUpRCyhnMuHBznRcXirlk=
 github.com/ipfs/go-verifcid v0.0.2 h1:XPnUv0XmdH+ZIhLGKg6U2vaPaRDXb9urMyNVCE7uvTs=
 github.com/ipld/go-car/v2 v2.10.1 h1:MRDqkONNW9WRhB79u+Z3U5b+NoN7lYA5B8n8qI3+BoI=
 github.com/ipld/go-car/v2 v2.10.1/go.mod h1:sQEkXVM3csejlb1kCCb+vQ/pWBKX9QtvsrysMQjOgOg=
 github.com/ipld/go-codec-dagpb v1.6.0 h1:9nYazfyu9B1p3NAgfVdpRco3Fs2nFC72DqVsMj6rOcc=
 github.com/ipld/go-codec-dagpb v1.6.0/go.mod h1:ANzFhfP2uMJxRBr8CE+WQWs5UsNa0pYtmKZ+agnUw9s=
-github.com/ipld/go-ipld-prime v0.20.1-0.20230629094729-829a31766846 h1:0gIWxUu4gU/Do25cwk82TRA621GjoZRSyVY472LaBrQ=
-github.com/ipld/go-ipld-prime v0.20.1-0.20230629094729-829a31766846/go.mod h1:PRQpXNcJypaPiiSdarsrJABPkYrBvafwDl0B9HjujZ8=
+github.com/ipld/go-ipld-prime v0.20.1-0.20230707090759-349deb22a1fd h1:/MI1u/0eL1gW3lFxMOs1sX/+bSCQgjQbK+yTJkvXMrc=
+github.com/ipld/go-ipld-prime v0.20.1-0.20230707090759-349deb22a1fd/go.mod h1:PRQpXNcJypaPiiSdarsrJABPkYrBvafwDl0B9HjujZ8=
 github.com/ipld/go-ipld-prime/storage/bsadapter v0.0.0-20230102063945-1a409dc236dd h1:gMlw/MhNr2Wtp5RwGdsW23cs+yCuj9k2ON7i9MiJlRo=
 github.com/ipld/ipld/specs v0.0.0-20230705075038-29da2e853cdb h1:SDDUglxqma8Zl5BwGb8VPnkXXR48t7pcPnh9x8Mfp9I=
 github.com/ipld/ipld/specs v0.0.0-20230705075038-29da2e853cdb/go.mod h1:eB2ZYKBGUJFuxTCO8YC0jJu41iquw6AvHhpP7N2yw8k=
diff --git a/pkg/types/types.go b/pkg/types/types.go
index 55b6057d..fb8dd3bd 100644
--- a/pkg/types/types.go
+++ b/pkg/types/types.go
@@ -273,7 +273,7 @@ func (ds DagScope) TerminalSelectorSpec() builder.SelectorSpec {
 	case DagScopeAll:
 		return unixfsnode.ExploreAllRecursivelySelector
 	case DagScopeEntity:
-		return unixfsnode.MatchUnixFSPreloadSelector // file
+		return unixfsnode.MatchUnixFSEntitySelector
 	case DagScopeBlock:
 		return matcherSelector
 	case DagScope(""):
diff --git a/pkg/verifiedcar/verifiedcar_test.go b/pkg/verifiedcar/verifiedcar_test.go
index 52d52656..a48660a6 100644
--- a/pkg/verifiedcar/verifiedcar_test.go
+++ b/pkg/verifiedcar/verifiedcar_test.go
@@ -8,7 +8,6 @@ import (
 	"io"
 	"math/rand"
 	"os"
-	"runtime/debug"
 	"testing"
 	"time"
 
@@ -86,7 +85,6 @@ func TestUnixfs20mVariety(t *testing.T) {
 				}, nil
 			}
 			lsys.StorageReadOpener = func(lc linking.LinkContext, l datamodel.Link) (io.Reader, error) {
-				debug.PrintStack()
 				return nil, fmt.Errorf("unexpected read of %s", l.String())
 			}
 
@@ -191,15 +189,15 @@ func TestVerifiedCar(t *testing.T) {
 	})
 	unixfsShardedDirBlocks := testutil.ToBlocks(t, lsys, unixfsShardedDir.Root, allSelector)
 
-	unixfsPreloadSelector := unixfsnode.MatchUnixFSPreloadSelector.Node()
+	unixfsPreloadSelector := unixfsnode.MatchUnixFSEntitySelector.Node()
 
 	unixfsPreloadDirBlocks := testutil.ToBlocks(t, lsys, unixfsDir.Root, unixfsPreloadSelector)
 	unixfsPreloadShardedDirBlocks := testutil.ToBlocks(t, lsys, unixfsShardedDir.Root, unixfsPreloadSelector)
 
-	unixfsDirSubsetSelector := unixfsnode.UnixFSPathSelectorBuilder(unixfsDir.Children[1].Path, unixfsnode.MatchUnixFSPreloadSelector, false)
+	unixfsDirSubsetSelector := unixfsnode.UnixFSPathSelectorBuilder(unixfsDir.Children[1].Path, unixfsnode.MatchUnixFSEntitySelector, false)
 
 	unixfsWrappedPathSelector := unixfsnode.UnixFSPathSelectorBuilder(wrapPath, unixfsnode.ExploreAllRecursivelySelector, false)
-	unixfsWrappedPreloadPathSelector := unixfsnode.UnixFSPathSelectorBuilder(wrapPath, unixfsnode.MatchUnixFSPreloadSelector, false)
+	unixfsWrappedPreloadPathSelector := unixfsnode.UnixFSPathSelectorBuilder(wrapPath, unixfsnode.MatchUnixFSEntitySelector, false)
 	preloadSubst := ssb.ExploreInterpretAs("unixfs", ssb.ExploreRecursive(
 		selector.RecursionLimitDepth(1),
 		ssb.ExploreAll(ssb.ExploreRecursiveEdge()),