diff --git a/codex/stores/maintenance.nim b/codex/stores/maintenance.nim
index 1d109031..84849933 100644
--- a/codex/stores/maintenance.nim
+++ b/codex/stores/maintenance.nim
@@ -18,7 +18,7 @@ import pkg/questionable/results
 
 import ./repostore
 import ../utils/timer
-import ../utils/safeasynciter
+import ../utils/asyncresultiterator
 import ../clock
 import ../logutils
 import ../systemclock
diff --git a/codex/stores/networkstore.nim b/codex/stores/networkstore.nim
index f8f5d2af..becb870f 100644
--- a/codex/stores/networkstore.nim
+++ b/codex/stores/networkstore.nim
@@ -19,7 +19,7 @@ import ../blockexchange
 import ../logutils
 import ../merkletree
 import ../utils/asyncheapqueue
-import ../utils/safeasynciter
+import ../utils/asyncresultiterator
 import ./blockstore
 
 export blockstore, blockexchange, asyncheapqueue
diff --git a/codex/stores/queryiterhelper.nim b/codex/stores/queryiterhelper.nim
index 21399fa0..5741d4ce 100644
--- a/codex/stores/queryiterhelper.nim
+++ b/codex/stores/queryiterhelper.nim
@@ -4,7 +4,7 @@ import pkg/chronos
 import pkg/chronicles
 import pkg/datastore/typedds
 
-import ../utils/safeasynciter
+import ../utils/asyncresultiterator
 
 {.push raises: [].}
 
diff --git a/codex/utils.nim b/codex/utils.nim
index 93427b43..8d8aeb22 100644
--- a/codex/utils.nim
+++ b/codex/utils.nim
@@ -19,9 +19,9 @@ import pkg/chronos
 import ./utils/asyncheapqueue
 import ./utils/fileutils
 import ./utils/iter
-import ./utils/safeasynciter
+import ./utils/asyncresultiterator
 
-export asyncheapqueue, fileutils, iter, safeasynciter, chronos
+export asyncheapqueue, fileutils, iter, asyncresultiterator, chronos
 
 when defined(posix):
   import os, posix
diff --git a/codex/utils/safeasynciter.nim b/codex/utils/asyncresultiterator.nim
similarity index 100%
rename from codex/utils/safeasynciter.nim
rename to codex/utils/asyncresultiterator.nim
diff --git a/tests/codex/helpers/mockrepostore.nim b/tests/codex/helpers/mockrepostore.nim
index ec46e767..dc63d766 100644
--- a/tests/codex/helpers/mockrepostore.nim
+++ b/tests/codex/helpers/mockrepostore.nim
@@ -14,7 +14,7 @@ import pkg/questionable
 import pkg/questionable/results
 
 import pkg/codex/stores/repostore
-import pkg/codex/utils/safeasynciter
+import pkg/codex/utils/asyncresultiterator
 
 type MockRepoStore* = ref object of RepoStore
   delBlockCids*: seq[Cid]
diff --git a/tests/codex/stores/testqueryiterhelper.nim b/tests/codex/stores/testqueryiterhelper.nim
index 6eef4f3b..6f932dbc 100644
--- a/tests/codex/stores/testqueryiterhelper.nim
+++ b/tests/codex/stores/testqueryiterhelper.nim
@@ -6,7 +6,7 @@ import pkg/chronos
 import pkg/datastore/typedds
 import pkg/datastore/sql/sqliteds
 import pkg/codex/stores/queryiterhelper
-import pkg/codex/utils/safeasynciter
+import pkg/codex/utils/asyncresultiterator
 
 import ../../asynctest
 import ../helpers
diff --git a/tests/codex/stores/testrepostore.nim b/tests/codex/stores/testrepostore.nim
index cd007c83..5dd21306 100644
--- a/tests/codex/stores/testrepostore.nim
+++ b/tests/codex/stores/testrepostore.nim
@@ -15,7 +15,7 @@ import pkg/codex/stores
 import pkg/codex/stores/repostore/operations
 import pkg/codex/blocktype as bt
 import pkg/codex/clock
-import pkg/codex/utils/safeasynciter
+import pkg/codex/utils/asyncresultiterator
 import pkg/codex/merkletree/codex
 
 import ../../asynctest
diff --git a/tests/codex/testutils.nim b/tests/codex/testutils.nim
index 01acd93a..a0892ee4 100644
--- a/tests/codex/testutils.nim
+++ b/tests/codex/testutils.nim
@@ -1,7 +1,7 @@
 import ./utils/testoptions
 import ./utils/testkeyutils
 import ./utils/testasyncstatemachine
-import ./utils/testsafeasynciter
+import ./utils/testasyncresultiterator
 import ./utils/testtimer
 import ./utils/testtrackedfutures
 
diff --git a/tests/codex/utils/testsafeasynciter.nim b/tests/codex/utils/testasyncresultiterator.nim
similarity index 99%
rename from tests/codex/utils/testsafeasynciter.nim
rename to tests/codex/utils/testasyncresultiterator.nim
index d405273f..7f89f082 100644
--- a/tests/codex/utils/testsafeasynciter.nim
+++ b/tests/codex/utils/testasyncresultiterator.nim
@@ -2,7 +2,7 @@ import std/sugar
 import pkg/questionable
 import pkg/chronos
 import pkg/codex/utils/iter
-import pkg/codex/utils/safeasynciter
+import pkg/codex/utils/asyncresultiterator
 
 import ../../asynctest
 import ../helpers
@@ -383,7 +383,7 @@ asyncchecksuite "Test AsyncResultIterator":
     # cancellation of the async predicate function.
 
     let fut: Future[Option[?!string]].Raising([CancelledError]) =
-      Future[Option[?!string]].Raising([CancelledError]).init("testsafeasynciter")
+      Future[Option[?!string]].Raising([CancelledError]).init("testasyncresultiterator")
 
     let iter1 = AsyncResultIterator[int].new(0 ..< 5).delayBy(10.millis)
     let iter2 = await mapFilter[int, string](