diff --git a/Mastodon/Scene/HomeTimeline/HomeTimelineViewController.swift b/Mastodon/Scene/HomeTimeline/HomeTimelineViewController.swift
index 3cb6bf956..100b41300 100644
--- a/Mastodon/Scene/HomeTimeline/HomeTimelineViewController.swift
+++ b/Mastodon/Scene/HomeTimeline/HomeTimelineViewController.swift
@@ -106,7 +106,7 @@ final class HomeTimelineViewController: UIViewController, NeedsDependency, Media
         let showFollowingAction = UIAction(title: L10n.Scene.HomeTimeline.TimelineMenu.following, image: .init(systemName: "house")) { [weak self] _ in
             guard let self, let viewModel = self.viewModel else { return }
 
-            viewModel.timelineContext = .following
+            viewModel.timelineContext = .home
             viewModel.dataController.records = []
 
             viewModel.loadLatestStateMachine.enter(HomeTimelineViewModel.LoadLatestState.ContextSwitch.self)
@@ -123,7 +123,7 @@ final class HomeTimelineViewController: UIViewController, NeedsDependency, Media
         let showLocalTimelineAction = UIAction(title: L10n.Scene.HomeTimeline.TimelineMenu.localCommunity, image: .init(systemName: "building.2")) { [weak self] action in
             guard let self, let viewModel = self.viewModel else { return }
 
-            viewModel.timelineContext = .localCommunity
+            viewModel.timelineContext = .public
             viewModel.loadLatestStateMachine.enter(HomeTimelineViewModel.LoadLatestState.ContextSwitch.self)
             timelineSelectorButton.setAttributedTitle(
                 .init(string: L10n.Scene.HomeTimeline.TimelineMenu.localCommunity, attributes: [
@@ -136,10 +136,10 @@ final class HomeTimelineViewController: UIViewController, NeedsDependency, Media
 
         if let viewModel {
             switch viewModel.timelineContext {
-            case .localCommunity:
+            case .public:
                 showLocalTimelineAction.state = .on
                 showFollowingAction.state = .off
-            case .following:
+            case .home:
                 showLocalTimelineAction.state = .off
                 showFollowingAction.state = .on
             }
diff --git a/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift b/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift
index ed2793c74..aca9f5f45 100644
--- a/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift
+++ b/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift
@@ -117,11 +117,11 @@ extension HomeTimelineViewModel.LoadLatestState {
                 let response: Mastodon.Response.Content<[Mastodon.Entity.Status]>
 
                 switch viewModel.timelineContext {
-                case .following:
+                case .home:
                     response = try await viewModel.context.apiService.homeTimeline(
                         authenticationBox: viewModel.authContext.mastodonAuthenticationBox
                     )
-                case .localCommunity:
+                case .public:
                     response = try await viewModel.context.apiService.publicTimeline(
                         query: .init(local: true),
                         authenticationBox: viewModel.authContext.mastodonAuthenticationBox
diff --git a/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadOldestState.swift b/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadOldestState.swift
index 4adb57133..668095b24 100644
--- a/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadOldestState.swift
+++ b/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadOldestState.swift
@@ -64,12 +64,12 @@ extension HomeTimelineViewModel.LoadOldestState {
                     let response: Mastodon.Response.Content<[Mastodon.Entity.Status]>
 
                     switch viewModel.timelineContext {
-                    case .following:
+                    case .home:
                         response = try await viewModel.context.apiService.homeTimeline(
                             maxID: maxID,
                             authenticationBox: viewModel.authContext.mastodonAuthenticationBox
                         )
-                    case .localCommunity:
+                    case .public:
                         response = try await viewModel.context.apiService.publicTimeline(
                             query: .init(local: true, maxID: maxID),
                             authenticationBox: viewModel.authContext.mastodonAuthenticationBox
diff --git a/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel.swift b/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel.swift
index c87920e78..a67d44f8d 100644
--- a/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel.swift
+++ b/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel.swift
@@ -34,7 +34,7 @@ final class HomeTimelineViewModel: NSObject {
     @Published var scrollPositionRecord: ScrollPositionRecord? = nil
     @Published var displaySettingBarButtonItem = true
     @Published var hasPendingStatusEditReload = false
-    var timelineContext: MastodonFeed.Kind.HomeTimeline = .following
+    var timelineContext: MastodonFeed.Kind.TimelineContext = .home
 
     weak var tableView: UITableView?
     weak var timelineMiddleLoaderTableViewCellDelegate: TimelineMiddleLoaderTableViewCellDelegate?
diff --git a/MastodonSDK/Sources/MastodonCore/DataController/FeedDataController.swift b/MastodonSDK/Sources/MastodonCore/DataController/FeedDataController.swift
index 79bf82b08..793e1d436 100644
--- a/MastodonSDK/Sources/MastodonCore/DataController/FeedDataController.swift
+++ b/MastodonSDK/Sources/MastodonCore/DataController/FeedDataController.swift
@@ -172,12 +172,12 @@ private extension FeedDataController {
             let response: Mastodon.Response.Content<[Mastodon.Entity.Status]>
 
             switch timeline {
-            case .following:
+            case .home:
                 response = try await context.apiService.homeTimeline(
                     maxID: maxID,
                     authenticationBox: authContext.mastodonAuthenticationBox
                 )
-            case .localCommunity:
+            case .public:
                 response = try await context.apiService.publicTimeline(
                     query: .init(local: true, maxID: maxID),
                     authenticationBox: authContext.mastodonAuthenticationBox
diff --git a/MastodonSDK/Sources/MastodonSDK/MastodonFeed.swift b/MastodonSDK/Sources/MastodonSDK/MastodonFeed.swift
index d2684f1d8..e512143fe 100644
--- a/MastodonSDK/Sources/MastodonSDK/MastodonFeed.swift
+++ b/MastodonSDK/Sources/MastodonSDK/MastodonFeed.swift
@@ -7,13 +7,13 @@ public final class MastodonFeed {
     
     public enum Kind {
 
-        case home(timeline: HomeTimeline)
+        case home(timeline: TimelineContext)
         case notificationAll
         case notificationMentions
 
-        public enum HomeTimeline {
-            case following
-            case localCommunity
+        public enum TimelineContext {
+            case home
+            case `public`
         }
     }