4 files changed, 11 insertions, 11 deletions
diff --git a/src/view/screens/Home.tsx b/src/view/screens/Home.tsx
index 871aae9c7..1f9abdafa 100644
--- a/src/view/screens/Home.tsx
+++ b/src/view/screens/Home.tsx
@@ -4,7 +4,7 @@ import {useFocusEffect, useIsFocused} from '@react-navigation/native'
 import {observer} from 'mobx-react-lite'
 import useAppState from 'react-native-appstate-hook'
 import {NativeStackScreenProps, HomeTabNavigatorParams} from 'lib/routes/types'
-import {FeedModel} from 'state/models/feed-view'
+import {PostsFeedModel} from 'state/models/feeds/posts'
 import {withAuthRequired} from 'view/com/auth/withAuthRequired'
 import {Feed} from '../com/posts/Feed'
 import {FollowingEmptyState} from 'view/com/posts/FollowingEmptyState'
@@ -26,7 +26,7 @@ export const HomeScreen = withAuthRequired((_opts: Props) => {
   const [selectedPage, setSelectedPage] = React.useState(0)
 
   const algoFeed = React.useMemo(() => {
-    const feed = new FeedModel(store, 'goodstuff', {})
+    const feed = new PostsFeedModel(store, 'goodstuff', {})
     feed.setup()
     return feed
   }, [store])
@@ -104,7 +104,7 @@ const FeedPage = observer(
     renderEmptyState,
   }: {
     testID?: string
-    feed: FeedModel
+    feed: PostsFeedModel
     isPageFocused: boolean
     renderEmptyState?: () => JSX.Element
   }) => {
diff --git a/src/view/screens/PostThread.tsx b/src/view/screens/PostThread.tsx
index 9bfdcc95a..e3ceb0bef 100644
--- a/src/view/screens/PostThread.tsx
+++ b/src/view/screens/PostThread.tsx
@@ -7,7 +7,7 @@ import {withAuthRequired} from 'view/com/auth/withAuthRequired'
 import {ViewHeader} from '../com/util/ViewHeader'
 import {PostThread as PostThreadComponent} from '../com/post-thread/PostThread'
 import {ComposePrompt} from 'view/com/composer/Prompt'
-import {PostThreadViewModel} from 'state/models/post-thread-view'
+import {PostThreadModel} from 'state/models/content/post-thread'
 import {useStores} from 'state/index'
 import {s} from 'lib/styles'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
@@ -22,8 +22,8 @@ export const PostThreadScreen = withAuthRequired(({route}: Props) => {
   const safeAreaInsets = useSafeAreaInsets()
   const {name, rkey} = route.params
   const uri = makeRecordUri(name, 'app.bsky.feed.post', rkey)
-  const view = useMemo<PostThreadViewModel>(
-    () => new PostThreadViewModel(store, {uri}),
+  const view = useMemo<PostThreadModel>(
+    () => new PostThreadModel(store, {uri}),
     [store, uri],
   )
 
diff --git a/src/view/screens/Profile.tsx b/src/view/screens/Profile.tsx
index 556578e77..e3158a973 100644
--- a/src/view/screens/Profile.tsx
+++ b/src/view/screens/Profile.tsx
@@ -8,7 +8,7 @@ import {ViewSelector} from '../com/util/ViewSelector'
 import {CenteredView} from '../com/util/Views'
 import {ProfileUiModel} from 'state/models/ui/profile'
 import {useStores} from 'state/index'
-import {FeedSliceModel} from 'state/models/feed-view'
+import {PostsFeedSliceModel} from 'state/models/feeds/posts'
 import {ProfileHeader} from '../com/profile/ProfileHeader'
 import {FeedSlice} from '../com/posts/FeedSlice'
 import {PostFeedLoadingPlaceholder} from '../com/util/LoadingPlaceholder'
@@ -124,7 +124,7 @@ export const ProfileScreen = withAuthRequired(
               style={styles.emptyState}
             />
           )
-        } else if (item instanceof FeedSliceModel) {
+        } else if (item instanceof PostsFeedSliceModel) {
           return <FeedSlice slice={item} ignoreMuteFor={uiState.profile.did} />
         }
         return <View />
diff --git a/src/view/screens/Search.tsx b/src/view/screens/Search.tsx
index e6947013e..e1fb3ec0a 100644
--- a/src/view/screens/Search.tsx
+++ b/src/view/screens/Search.tsx
@@ -16,7 +16,7 @@ import {
 import {observer} from 'mobx-react-lite'
 import {Text} from 'view/com/util/text/Text'
 import {useStores} from 'state/index'
-import {UserAutocompleteViewModel} from 'state/models/user-autocomplete-view'
+import {UserAutocompleteModel} from 'state/models/discovery/user-autocomplete'
 import {SearchUIModel} from 'state/models/ui/search'
 import {FoafsModel} from 'state/models/discovery/foafs'
 import {SuggestedActorsModel} from 'state/models/discovery/suggested-actors'
@@ -37,8 +37,8 @@ export const SearchScreen = withAuthRequired(
     const onMainScroll = useOnMainScroll(store)
     const [isInputFocused, setIsInputFocused] = React.useState<boolean>(false)
     const [query, setQuery] = React.useState<string>('')
-    const autocompleteView = React.useMemo<UserAutocompleteViewModel>(
-      () => new UserAutocompleteViewModel(store),
+    const autocompleteView = React.useMemo<UserAutocompleteModel>(
+      () => new UserAutocompleteModel(store),
       [store],
     )
     const foafs = React.useMemo<FoafsModel>(