diff --git a/pages/@[account]/index/followers.vue b/pages/@[account]/index/followers.vue
index 825c1564..0a749e59 100644
--- a/pages/@[account]/index/followers.vue
+++ b/pages/@[account]/index/followers.vue
@@ -5,7 +5,7 @@ const handle = $(computedEager(() => params.account as string))
 definePageMeta({ name: 'account-followers' })
 
 const account = await fetchAccountByHandle(handle)
-const paginator = account ? useMasto().accounts.getFollowersIterable(account.id, {}) : null
+const paginator = account ? useMasto().accounts.iterateFollowers(account.id, {}) : null
 </script>
 
 <template>
diff --git a/pages/@[account]/index/following.vue b/pages/@[account]/index/following.vue
index 3e05c670..62e2011b 100644
--- a/pages/@[account]/index/following.vue
+++ b/pages/@[account]/index/following.vue
@@ -5,7 +5,7 @@ const handle = $(computedEager(() => params.account as string))
 definePageMeta({ name: 'account-following' })
 
 const account = await fetchAccountByHandle(handle)
-const paginator = account ? useMasto().accounts.getFollowingIterable(account.id, {}) : null
+const paginator = account ? useMasto().accounts.iterateFollowing(account.id, {}) : null
 </script>
 
 <template>
diff --git a/pages/@[account]/index/index.vue b/pages/@[account]/index/index.vue
index f1ef6ff3..bf51e3e3 100644
--- a/pages/@[account]/index/index.vue
+++ b/pages/@[account]/index/index.vue
@@ -12,9 +12,9 @@ const { data: account } = await useAsyncData(`account:${handle}`, async () => (
 )
 const { t } = useI18n()
 
-const paginatorPosts = useMasto().accounts.getStatusesIterable(account.value!.id, { excludeReplies: true })
-const paginatorPostsWithReply = useMasto().accounts.getStatusesIterable(account.value!.id, { excludeReplies: false })
-const paginatorMedia = useMasto().accounts.getStatusesIterable(account.value!.id, { onlyMedia: true, excludeReplies: false })
+const paginatorPosts = useMasto().accounts.iterateStatuses(account.value!.id, { excludeReplies: true })
+const paginatorPostsWithReply = useMasto().accounts.iterateStatuses(account.value!.id, { excludeReplies: false })
+const paginatorMedia = useMasto().accounts.iterateStatuses(account.value!.id, { onlyMedia: true, excludeReplies: false })
 
 const tabs = $computed(() => [
   {
diff --git a/pages/blocks.vue b/pages/blocks.vue
index e7702df8..010e2012 100644
--- a/pages/blocks.vue
+++ b/pages/blocks.vue
@@ -3,7 +3,7 @@ definePageMeta({
   middleware: 'auth',
 })
 
-const paginator = useMasto().blocks.getIterator()
+const paginator = useMasto().blocks.iterate()
 
 useHeadFixed({
   title: 'Blocked users',
diff --git a/pages/bookmarks.vue b/pages/bookmarks.vue
index d8ca0c13..fd578689 100644
--- a/pages/bookmarks.vue
+++ b/pages/bookmarks.vue
@@ -3,7 +3,7 @@ definePageMeta({
   middleware: 'auth',
 })
 
-const paginator = useMasto().bookmarks.getIterator()
+const paginator = useMasto().bookmarks.iterate()
 
 const { t } = useI18n()
 
diff --git a/pages/conversations.vue b/pages/conversations.vue
index 7e456d25..31d54ec3 100644
--- a/pages/conversations.vue
+++ b/pages/conversations.vue
@@ -3,7 +3,7 @@ definePageMeta({
   middleware: 'auth',
 })
 
-const paginator = useMasto().conversations.getIterator()
+const paginator = useMasto().conversations.iterate()
 
 const { t } = useI18n()
 
diff --git a/pages/domain_blocks.vue b/pages/domain_blocks.vue
index 23ed84cb..fe601afb 100644
--- a/pages/domain_blocks.vue
+++ b/pages/domain_blocks.vue
@@ -3,7 +3,7 @@ definePageMeta({
   middleware: 'auth',
 })
 
-const paginator = useMasto().domainBlocks.getIterator()
+const paginator = useMasto().domainBlocks.iterate()
 
 useHeadFixed({
   title: 'Blocked domains',
diff --git a/pages/favourites.vue b/pages/favourites.vue
index 340d133d..b0f97722 100644
--- a/pages/favourites.vue
+++ b/pages/favourites.vue
@@ -3,7 +3,7 @@ definePageMeta({
   middleware: 'auth',
 })
 
-const paginator = useMasto().favourites.getIterator()
+const paginator = useMasto().favourites.iterate()
 const { t } = useI18n()
 
 useHeadFixed({
diff --git a/pages/home.vue b/pages/home.vue
index 1e466fa1..3f9e4639 100644
--- a/pages/home.vue
+++ b/pages/home.vue
@@ -11,7 +11,7 @@ if (useRoute().path === '/signin/callback') {
   useRouter().push('/home')
 }
 
-const paginator = useMasto().timelines.getHomeIterable()
+const paginator = useMasto().timelines.iterateHome()
 const stream = await useMasto().stream.streamUser()
 onBeforeUnmount(() => stream.disconnect())
 
diff --git a/pages/mutes.vue b/pages/mutes.vue
index 4bbfb9df..c26a24a9 100644
--- a/pages/mutes.vue
+++ b/pages/mutes.vue
@@ -3,7 +3,7 @@ definePageMeta({
   middleware: 'auth',
 })
 
-const paginator = useMasto().mutes.getIterator()
+const paginator = useMasto().mutes.iterate()
 
 useHeadFixed({
   title: 'Muted users',
diff --git a/pages/notifications.vue b/pages/notifications.vue
index 41aab53e..b9565df8 100644
--- a/pages/notifications.vue
+++ b/pages/notifications.vue
@@ -5,8 +5,8 @@ definePageMeta({
 
 const { t } = useI18n()
 
-const paginatorAll = useMasto().notifications.getIterator()
-const paginatorMention = useMasto().notifications.getIterator({ types: ['mention'] })
+const paginatorAll = useMasto().notifications.iterate()
+const paginatorMention = useMasto().notifications.iterate({ types: ['mention'] })
 
 const { clearNotifications } = useNotifications()
 onActivated(clearNotifications)
diff --git a/pages/pinned.vue b/pages/pinned.vue
index 75b18006..7094b55f 100644
--- a/pages/pinned.vue
+++ b/pages/pinned.vue
@@ -3,7 +3,7 @@ definePageMeta({
   middleware: 'auth',
 })
 
-const paginator = useMasto().accounts.getStatusesIterable(currentUser.value!.account.id, { pinned: true })
+const paginator = useMasto().accounts.iterateStatuses(currentUser.value!.account.id, { pinned: true })
 const { t } = useI18n()
 
 useHeadFixed({
diff --git a/pages/public/index.vue b/pages/public/index.vue
index 22f6c860..8a919d9a 100644
--- a/pages/public/index.vue
+++ b/pages/public/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const paginator = useMasto().timelines.getPublicIterable()
+const paginator = useMasto().timelines.iteratePublic()
 const stream = await useMasto().stream.streamPublicTimeline()
 onBeforeUnmount(() => stream.disconnect())
 
diff --git a/pages/public/local.vue b/pages/public/local.vue
index d66cbf01..8e35d0a1 100644
--- a/pages/public/local.vue
+++ b/pages/public/local.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const paginator = useMasto().timelines.getPublicIterable({ local: true })
+const paginator = useMasto().timelines.iteratePublic({ local: true })
 const stream = await useMasto().stream.streamCommunityTimeline()
 onBeforeUnmount(() => stream.disconnect())
 
diff --git a/pages/tags/[tag].vue b/pages/tags/[tag].vue
index a8c7feee..840dbf3a 100644
--- a/pages/tags/[tag].vue
+++ b/pages/tags/[tag].vue
@@ -4,7 +4,7 @@ const tagName = $(computedEager(() => params.tag as string))
 
 const { data: tag, refresh } = $(await useAsyncData(() => useMasto().tags.fetch(tagName)))
 
-const paginator = useMasto().timelines.getHashtagIterable(tagName)
+const paginator = useMasto().timelines.iterateHashtag(tagName)
 const stream = await useMasto().stream.streamTagTimeline(tagName)
 onBeforeUnmount(() => stream.disconnect())