diff --git a/Account/Sources/Account/Feedly/FeedlyAPICaller.swift b/Account/Sources/Account/Feedly/FeedlyAPICaller.swift
index 3b676c360..fdea88fe2 100644
--- a/Account/Sources/Account/Feedly/FeedlyAPICaller.swift
+++ b/Account/Sources/Account/Feedly/FeedlyAPICaller.swift
@@ -605,7 +605,7 @@ extension FeedlyAPICaller: FeedlyGetCollectionsService {
 
 extension FeedlyAPICaller: FeedlyGetStreamContentsService {
 	
-	func getStreamContents(for resource: FeedlyResourceId, continuation: String? = nil, newerThan: Date?, unreadOnly: Bool?, completion: @escaping (Result<FeedlyStream, Error>) -> ()) {
+	func getStreamContents(for resource: FeedlyResourceID, continuation: String? = nil, newerThan: Date?, unreadOnly: Bool?, completion: @escaping (Result<FeedlyStream, Error>) -> ()) {
 		guard !isSuspended else {
 			return DispatchQueue.main.async {
 				completion(.failure(TransportError.suspended))
@@ -673,7 +673,7 @@ extension FeedlyAPICaller: FeedlyGetStreamContentsService {
 
 extension FeedlyAPICaller: FeedlyGetStreamIDsService {
 	
-	func streamIDs(for resource: FeedlyResourceId, continuation: String? = nil, newerThan: Date?, unreadOnly: Bool?, completion: @escaping (Result<FeedlyStreamIDs, Error>) -> ()) {
+	func streamIDs(for resource: FeedlyResourceID, continuation: String? = nil, newerThan: Date?, unreadOnly: Bool?, completion: @escaping (Result<FeedlyStreamIDs, Error>) -> ()) {
 		guard !isSuspended else {
 			return DispatchQueue.main.async {
 				completion(.failure(TransportError.suspended))
diff --git a/Account/Sources/Account/Feedly/FeedlyResourceProviding.swift b/Account/Sources/Account/Feedly/FeedlyResourceProviding.swift
index c58d25a28..967d09e5c 100644
--- a/Account/Sources/Account/Feedly/FeedlyResourceProviding.swift
+++ b/Account/Sources/Account/Feedly/FeedlyResourceProviding.swift
@@ -9,12 +9,12 @@
 import Foundation
 
 protocol FeedlyResourceProviding {
-	var resource: FeedlyResourceId { get }
+	var resource: FeedlyResourceID { get }
 }
 
 extension FeedlyFeedResourceId: FeedlyResourceProviding {
 	
-	var resource: FeedlyResourceId {
+	var resource: FeedlyResourceID {
 		return self
 	}
 }
diff --git a/Account/Sources/Account/Feedly/Models/FeedlyResourceId.swift b/Account/Sources/Account/Feedly/Models/FeedlyResourceId.swift
index 239cca1e0..aaf976f1d 100644
--- a/Account/Sources/Account/Feedly/Models/FeedlyResourceId.swift
+++ b/Account/Sources/Account/Feedly/Models/FeedlyResourceId.swift
@@ -9,14 +9,14 @@
 import Foundation
 
 /// The kinds of Resource Ids is documented here: https://developer.feedly.com/cloud/
-protocol FeedlyResourceId {
+protocol FeedlyResourceID {
 	
 	/// The resource Id from Feedly.
 	var id: String { get }
 }
 
 /// The Feed Resource is documented here: https://developer.feedly.com/cloud/
-struct FeedlyFeedResourceId: FeedlyResourceId {
+struct FeedlyFeedResourceId: FeedlyResourceID {
 	let id: String
 	
 	/// The location of the kind of resource a concrete type represents.
@@ -44,7 +44,7 @@ extension FeedlyFeedResourceId {
 	}
 }
 
-struct FeedlyCategoryResourceID: FeedlyResourceId {
+struct FeedlyCategoryResourceID: FeedlyResourceID {
 	let id: String
 	
 	enum Global {
@@ -71,7 +71,7 @@ struct FeedlyCategoryResourceID: FeedlyResourceId {
 	}
 }
 
-struct FeedlyTagResourceId: FeedlyResourceId {
+struct FeedlyTagResourceId: FeedlyResourceID {
 	let id: String
 	
 	enum Global {
diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyAddFeedToCollectionOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyAddFeedToCollectionOperation.swift
index d84f1b575..3ee5e854e 100644
--- a/Account/Sources/Account/Feedly/Operations/FeedlyAddFeedToCollectionOperation.swift
+++ b/Account/Sources/Account/Feedly/Operations/FeedlyAddFeedToCollectionOperation.swift
@@ -33,7 +33,7 @@ final class FeedlyAddFeedToCollectionOperation: FeedlyOperation, FeedlyFeedsAndF
 	
 	private(set) var feedsAndFolders = [([FeedlyFeed], Folder)]()
 	
-	var resource: FeedlyResourceId {
+	var resource: FeedlyResourceID {
 		return feedResource
 	}
 	
diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyGetStreamContentsOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyGetStreamContentsOperation.swift
index 68889cb93..cc9269d96 100644
--- a/Account/Sources/Account/Feedly/Operations/FeedlyGetStreamContentsOperation.swift
+++ b/Account/Sources/Account/Feedly/Operations/FeedlyGetStreamContentsOperation.swift
@@ -27,7 +27,7 @@ protocol FeedlyGetStreamContentsOperationDelegate: AnyObject {
 final class FeedlyGetStreamContentsOperation: FeedlyOperation, FeedlyEntryProviding, FeedlyParsedItemProviding, Logging {
 	
 	struct ResourceProvider: FeedlyResourceProviding {
-		var resource: FeedlyResourceId
+		var resource: FeedlyResourceID
 	}
 	
 	let resourceProvider: FeedlyResourceProviding
@@ -82,7 +82,7 @@ final class FeedlyGetStreamContentsOperation: FeedlyOperation, FeedlyEntryProvid
 	
 	weak var streamDelegate: FeedlyGetStreamContentsOperationDelegate?
 
-	init(account: Account, resource: FeedlyResourceId, service: FeedlyGetStreamContentsService, continuation: String? = nil, newerThan: Date?, unreadOnly: Bool? = nil) {
+	init(account: Account, resource: FeedlyResourceID, service: FeedlyGetStreamContentsService, continuation: String? = nil, newerThan: Date?, unreadOnly: Bool? = nil) {
 		self.account = account
 		self.resourceProvider = ResourceProvider(resource: resource)
 		self.service = service
diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyGetStreamIdsOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyGetStreamIdsOperation.swift
index 39f6feed1..34b4f7124 100644
--- a/Account/Sources/Account/Feedly/Operations/FeedlyGetStreamIdsOperation.swift
+++ b/Account/Sources/Account/Feedly/Operations/FeedlyGetStreamIdsOperation.swift
@@ -29,11 +29,11 @@ final class FeedlyGetStreamIdsOperation: FeedlyOperation, FeedlyEntryIdentifierP
 	let account: Account
 	let service: FeedlyGetStreamIDsService
 	let continuation: String?
-	let resource: FeedlyResourceId
+	let resource: FeedlyResourceID
 	let unreadOnly: Bool?
 	let newerThan: Date?
 
-	init(account: Account, resource: FeedlyResourceId, service: FeedlyGetStreamIDsService, continuation: String? = nil, newerThan: Date? = nil, unreadOnly: Bool?) {
+	init(account: Account, resource: FeedlyResourceID, service: FeedlyGetStreamIDsService, continuation: String? = nil, newerThan: Date? = nil, unreadOnly: Bool?) {
 		self.account = account
 		self.resource = resource
 		self.service = service
diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyGetUpdatedArticleIdsOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyGetUpdatedArticleIdsOperation.swift
index 219469b1e..0e94585ff 100644
--- a/Account/Sources/Account/Feedly/Operations/FeedlyGetUpdatedArticleIdsOperation.swift
+++ b/Account/Sources/Account/Feedly/Operations/FeedlyGetUpdatedArticleIdsOperation.swift
@@ -17,11 +17,11 @@ import Secrets
 class FeedlyGetUpdatedArticleIdsOperation: FeedlyOperation, FeedlyEntryIdentifierProviding, Logging {
 
 	private let account: Account
-	private let resource: FeedlyResourceId
+	private let resource: FeedlyResourceID
 	private let service: FeedlyGetStreamIDsService
 	private let newerThan: Date?
 	
-	init(account: Account, resource: FeedlyResourceId, service: FeedlyGetStreamIDsService, newerThan: Date?) {
+	init(account: Account, resource: FeedlyResourceID, service: FeedlyGetStreamIDsService, newerThan: Date?) {
 		self.account = account
 		self.resource = resource
 		self.service = service
diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyIngestStarredArticleIdsOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyIngestStarredArticleIdsOperation.swift
index 6aef1da75..aede1bf99 100644
--- a/Account/Sources/Account/Feedly/Operations/FeedlyIngestStarredArticleIdsOperation.swift
+++ b/Account/Sources/Account/Feedly/Operations/FeedlyIngestStarredArticleIdsOperation.swift
@@ -20,7 +20,7 @@ import Secrets
 final class FeedlyIngestStarredArticleIdsOperation: FeedlyOperation, Logging {
 
 	private let account: Account
-	private let resource: FeedlyResourceId
+	private let resource: FeedlyResourceID
 	private let service: FeedlyGetStreamIDsService
 	private let database: SyncDatabase
 	private var remoteEntryIds = Set<String>()
@@ -30,7 +30,7 @@ final class FeedlyIngestStarredArticleIdsOperation: FeedlyOperation, Logging {
 		self.init(account: account, resource: resource, service: service, database: database, newerThan: newerThan)
 	}
 	
-	init(account: Account, resource: FeedlyResourceId, service: FeedlyGetStreamIDsService, database: SyncDatabase, newerThan: Date?) {
+	init(account: Account, resource: FeedlyResourceID, service: FeedlyGetStreamIDsService, database: SyncDatabase, newerThan: Date?) {
 		self.account = account
 		self.resource = resource
 		self.service = service
diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift
index cc052806e..be47aa5a5 100644
--- a/Account/Sources/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift
+++ b/Account/Sources/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift
@@ -18,10 +18,10 @@ import Secrets
 class FeedlyIngestStreamArticleIdsOperation: FeedlyOperation, Logging {
 
 	private let account: Account
-	private let resource: FeedlyResourceId
+	private let resource: FeedlyResourceID
 	private let service: FeedlyGetStreamIDsService
 	
-	init(account: Account, resource: FeedlyResourceId, service: FeedlyGetStreamIDsService) {
+	init(account: Account, resource: FeedlyResourceID, service: FeedlyGetStreamIDsService) {
 		self.account = account
 		self.resource = resource
 		self.service = service
diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyIngestUnreadArticleIdsOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyIngestUnreadArticleIdsOperation.swift
index 5406beced..32c5b6105 100644
--- a/Account/Sources/Account/Feedly/Operations/FeedlyIngestUnreadArticleIdsOperation.swift
+++ b/Account/Sources/Account/Feedly/Operations/FeedlyIngestUnreadArticleIdsOperation.swift
@@ -21,7 +21,7 @@ import Secrets
 final class FeedlyIngestUnreadArticleIdsOperation: FeedlyOperation, Logging {
 
 	private let account: Account
-	private let resource: FeedlyResourceId
+	private let resource: FeedlyResourceID
 	private let service: FeedlyGetStreamIDsService
 	private let database: SyncDatabase
 	private var remoteEntryIDs = Set<String>()
@@ -31,7 +31,7 @@ final class FeedlyIngestUnreadArticleIdsOperation: FeedlyOperation, Logging {
 		self.init(account: account, resource: resource, service: service, database: database, newerThan: newerThan)
 	}
 	
-	init(account: Account, resource: FeedlyResourceId, service: FeedlyGetStreamIDsService, database: SyncDatabase, newerThan: Date?) {
+	init(account: Account, resource: FeedlyResourceID, service: FeedlyGetStreamIDsService, database: SyncDatabase, newerThan: Date?) {
 		self.account = account
 		self.resource = resource
 		self.service = service
diff --git a/Account/Sources/Account/Feedly/Operations/FeedlySyncStreamContentsOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlySyncStreamContentsOperation.swift
index 75f0b7bb2..5f2abe908 100644
--- a/Account/Sources/Account/Feedly/Operations/FeedlySyncStreamContentsOperation.swift
+++ b/Account/Sources/Account/Feedly/Operations/FeedlySyncStreamContentsOperation.swift
@@ -15,14 +15,14 @@ import Secrets
 final class FeedlySyncStreamContentsOperation: FeedlyOperation, FeedlyOperationDelegate, FeedlyGetStreamContentsOperationDelegate, FeedlyCheckpointOperationDelegate, Logging {
 
 	private let account: Account
-	private let resource: FeedlyResourceId
+	private let resource: FeedlyResourceID
 	private let operationQueue = MainThreadOperationQueue()
 	private let service: FeedlyGetStreamContentsService
 	private let newerThan: Date?
 	private let isPagingEnabled: Bool
 	private let finishOperation: FeedlyCheckpointOperation
 	
-	init(account: Account, resource: FeedlyResourceId, service: FeedlyGetStreamContentsService, isPagingEnabled: Bool, newerThan: Date?) {
+	init(account: Account, resource: FeedlyResourceID, service: FeedlyGetStreamContentsService, isPagingEnabled: Bool, newerThan: Date?) {
 		self.account = account
 		self.resource = resource
 		self.service = service
diff --git a/Account/Sources/Account/Feedly/Services/FeedlyGetStreamContentsService.swift b/Account/Sources/Account/Feedly/Services/FeedlyGetStreamContentsService.swift
index 6770a2593..198cbf7d4 100644
--- a/Account/Sources/Account/Feedly/Services/FeedlyGetStreamContentsService.swift
+++ b/Account/Sources/Account/Feedly/Services/FeedlyGetStreamContentsService.swift
@@ -9,5 +9,5 @@
 import Foundation
 
 protocol FeedlyGetStreamContentsService: AnyObject {
-	func getStreamContents(for resource: FeedlyResourceId, continuation: String?, newerThan: Date?, unreadOnly: Bool?, completion: @escaping (Result<FeedlyStream, Error>) -> ())
+	func getStreamContents(for resource: FeedlyResourceID, continuation: String?, newerThan: Date?, unreadOnly: Bool?, completion: @escaping (Result<FeedlyStream, Error>) -> ())
 }
diff --git a/Account/Sources/Account/Feedly/Services/FeedlyGetStreamIdsService.swift b/Account/Sources/Account/Feedly/Services/FeedlyGetStreamIdsService.swift
index ae9f55493..e319aa855 100644
--- a/Account/Sources/Account/Feedly/Services/FeedlyGetStreamIdsService.swift
+++ b/Account/Sources/Account/Feedly/Services/FeedlyGetStreamIdsService.swift
@@ -9,5 +9,5 @@
 import Foundation
 
 protocol FeedlyGetStreamIDsService: AnyObject {
-	func streamIDs(for resource: FeedlyResourceId, continuation: String?, newerThan: Date?, unreadOnly: Bool?, completion: @escaping (Result<FeedlyStreamIDs, Error>) -> ())
+	func streamIDs(for resource: FeedlyResourceID, continuation: String?, newerThan: Date?, unreadOnly: Bool?, completion: @escaping (Result<FeedlyStreamIDs, Error>) -> ())
 }