diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard
index 8a9779033..de9fcca7e 100644
--- a/iOS/Base.lproj/Main.storyboard
+++ b/iOS/Base.lproj/Main.storyboard
@@ -118,7 +118,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="208" id="T5d-L4-OKG" customClass="TimelineTableViewCell">
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="208" id="T5d-L4-OKG" customClass="TimelineTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="50" width="414" height="208"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="T5d-L4-OKG" id="QKC-jN-XDy">
diff --git a/iOS/Timeline/MasterTimelineTitleView.swift b/iOS/Timeline/TimelineTitleView.swift
similarity index 86%
rename from iOS/Timeline/MasterTimelineTitleView.swift
rename to iOS/Timeline/TimelineTitleView.swift
index fcca1817d..60c1b3ee1 100644
--- a/iOS/Timeline/MasterTimelineTitleView.swift
+++ b/iOS/Timeline/TimelineTitleView.swift
@@ -1,5 +1,5 @@
 //
-//  MasterFeedTitleView.swift
+//  FeedTitleView.swift
 //  NetNewsWire-iOS
 //
 //  Created by Maurice Parker on 9/21/19.
@@ -8,11 +8,11 @@
 
 import UIKit
 
-class MasterTimelineTitleView: UIView {
+class TimelineTitleView: UIView {
 
 	@IBOutlet weak var iconView: IconView!
 	@IBOutlet weak var label: UILabel!
-	@IBOutlet weak var unreadCountView: MasterTimelineUnreadCountView!
+	@IBOutlet weak var unreadCountView: TimelineUnreadCountView!
 
 	private lazy var pointerInteraction: UIPointerInteraction = {
 		UIPointerInteraction(delegate: self)
@@ -44,7 +44,7 @@ class MasterTimelineTitleView: UIView {
 	}
 }
 
-extension MasterTimelineTitleView: UIPointerInteractionDelegate {
+extension TimelineTitleView: UIPointerInteractionDelegate {
 	
 	func pointerInteraction(_ interaction: UIPointerInteraction, styleFor region: UIPointerRegion) -> UIPointerStyle? {
 		var rect = self.frame
diff --git a/iOS/Timeline/MasterTimelineTitleView.xib b/iOS/Timeline/TimelineTitleView.xib
similarity index 93%
rename from iOS/Timeline/MasterTimelineTitleView.xib
rename to iOS/Timeline/TimelineTitleView.xib
index 7d5b53ce6..54034dd4a 100644
--- a/iOS/Timeline/MasterTimelineTitleView.xib
+++ b/iOS/Timeline/TimelineTitleView.xib
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15508"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MasterTimelineTitleView" customModule="NetNewsWire" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TimelineTitleView" customModule="NetNewsWire" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="190" height="38"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
@@ -19,7 +19,7 @@
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <view verifyAmbiguity="off" opaque="NO" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="z9o-XA-3t4" customClass="MasterTimelineUnreadCountView" customModule="NetNewsWire" customModuleProvider="target">
+                <view verifyAmbiguity="off" opaque="NO" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="z9o-XA-3t4" customClass="TimelineUnreadCountView" customModule="NetNewsWire" customModuleProvider="target">
                     <rect key="frame" x="79.5" y="9" width="110.5" height="20"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </view>
@@ -32,6 +32,7 @@
                     </constraints>
                 </view>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstItem="5gI-Wl-lnK" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="1Yh-ha-Pu8"/>
@@ -45,7 +46,6 @@
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <connections>
                 <outlet property="iconView" destination="5gI-Wl-lnK" id="IiR-qS-d22"/>
                 <outlet property="label" destination="5F6-2v-qSS" id="ec7-8Y-PRv"/>
diff --git a/iOS/Timeline/MasterTimelineUnreadCountView.swift b/iOS/Timeline/TimelineUnreadCountView.swift
similarity index 89%
rename from iOS/Timeline/MasterTimelineUnreadCountView.swift
rename to iOS/Timeline/TimelineUnreadCountView.swift
index a4674a2ce..603865e3f 100644
--- a/iOS/Timeline/MasterTimelineUnreadCountView.swift
+++ b/iOS/Timeline/TimelineUnreadCountView.swift
@@ -1,5 +1,5 @@
 //
-//  MasterTimelineUnreadCountView.swift
+//  TimelineUnreadCountView.swift
 //  NetNewsWire-iOS
 //
 //  Created by Maurice Parker on 9/30/19.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-class MasterTimelineUnreadCountView: FeedUnreadCountView {
+class TimelineUnreadCountView: FeedUnreadCountView {
 
 	override var padding: UIEdgeInsets {
 		return UIEdgeInsets(top: 2.0, left: 9.0, bottom: 2.0, right: 9.0)
diff --git a/iOS/Timeline/MasterTimelineViewController.swift b/iOS/Timeline/TimelineViewController.swift
similarity index 98%
rename from iOS/Timeline/MasterTimelineViewController.swift
rename to iOS/Timeline/TimelineViewController.swift
index 2d597ebd6..a92853357 100644
--- a/iOS/Timeline/MasterTimelineViewController.swift
+++ b/iOS/Timeline/TimelineViewController.swift
@@ -85,7 +85,7 @@ class TimelineViewController: UITableViewController, UndoableCommandRunner {
 		iconSize = AppDefaults.shared.timelineIconSize
 		resetEstimatedRowHeight()
 
-		if let titleView = Bundle.main.loadNibNamed("MasterTimelineTitleView", owner: self, options: nil)?[0] as? MasterTimelineTitleView {
+		if let titleView = Bundle.main.loadNibNamed("TimelineTitleView", owner: self, options: nil)?[0] as? TimelineTitleView {
 			navigationItem.titleView = titleView
 		}
 		
@@ -445,7 +445,7 @@ class TimelineViewController: UITableViewController, UndoableCommandRunner {
 
 	@objc func feedIconDidBecomeAvailable(_ note: Notification) {
 		
-		if let titleView = navigationItem.titleView as? MasterTimelineTitleView {
+		if let titleView = navigationItem.titleView as? TimelineTitleView {
 			titleView.iconView.iconImage = coordinator.timelineIconImage
 		}
 		
@@ -479,7 +479,7 @@ class TimelineViewController: UITableViewController, UndoableCommandRunner {
 	}
 
 	@objc func faviconDidBecomeAvailable(_ note: Notification) {
-		if let titleView = navigationItem.titleView as? MasterTimelineTitleView {
+		if let titleView = navigationItem.titleView as? TimelineTitleView {
 			titleView.iconView.iconImage = coordinator.timelineIconImage
 		}
 		if coordinator.showIcons {
@@ -504,7 +504,7 @@ class TimelineViewController: UITableViewController, UndoableCommandRunner {
 	}
 	
 	@objc func displayNameDidChange(_ note: Notification) {
-		if let titleView = navigationItem.titleView as? MasterTimelineTitleView {
+		if let titleView = navigationItem.titleView as? TimelineTitleView {
 			titleView.label.text = coordinator.timelineFeed?.nameForDisplay
 		}
 	}
@@ -613,7 +613,7 @@ private extension TimelineViewController {
 		
 		title = coordinator.timelineFeed?.nameForDisplay ?? "Timeline"
 
-		if let titleView = navigationItem.titleView as? MasterTimelineTitleView {
+		if let titleView = navigationItem.titleView as? TimelineTitleView {
 			let timelineIconImage = coordinator.timelineIconImage
 			titleView.iconView.iconImage = timelineIconImage
 			if let preferredColor = timelineIconImage?.preferredColor {
@@ -684,7 +684,7 @@ private extension TimelineViewController {
 	}
 	
 	func updateTitleUnreadCount() {
-		if let titleView = navigationItem.titleView as? MasterTimelineTitleView {
+		if let titleView = navigationItem.titleView as? TimelineTitleView {
 			titleView.unreadCountView.unreadCount = coordinator.timelineUnreadCount
 		}
 	}