From eacdf20819f3b7e0c312a5521791c6b45e183d28 Mon Sep 17 00:00:00 2001
From: tomasstrba <57389842+tomasstrba@users.noreply.github.com>
Date: Wed, 8 Jul 2020 14:43:53 +0200
Subject: [PATCH] Deprecating harmful terminology

---
 App/AppDelegate.swift                         |   2 +-
 App/Base.lproj/Main.storyboard                |  47 +++----
 .../Contents.json                             |   0
 .../Contents.json                             |   0
 App/MainViewController.swift                  |   2 +-
 App/TrustedSitesViewController.swift          |   5 +-
 DuckDuckGo.xcodeproj/project.pbxproj          |  16 +--
 SafariAppExtension/Dashboard.storyboard       | 132 +++++++++---------
 .../MainDashboardViewController.swift         |  24 ++--
 Shared/AppLinks.swift                         |   2 +-
 StatisticsFramework/Pixel.swift               |   4 +-
 SyncSupport/SyncRunner.swift                  |  16 +--
 .../BlockerListManager.swift                  |   6 +-
 .../ContentBlockerRulesBuilder.swift          |   9 +-
 .../TempUnprotectedSitesDataService.swift     | 123 ++++++++++++++++
 .../TempWhitelistDataService.swift            | 123 ----------------
 .../TrustedSitesManager.swift                 |  22 +--
 UnitTests/BlockerListManagerTests.swift       |   4 +-
 .../ContentBlockerRulesBuilderTests.swift     |   2 +-
 UnitTests/SyncRunnerTests.swift               |  10 +-
 ...edSitesDataServiceUserDefaultsTests.swift} |   8 +-
 UnitTests/TrustedSitesManagerTests.swift      |  13 +-
 UnitTests/mocks.swift                         |   6 +-
 23 files changed, 289 insertions(+), 287 deletions(-)
 rename App/Colours.xcassets/{WhitelistEmptyBorder.colorset => NoUnprotectedSitesBorder.colorset}/Contents.json (100%)
 rename App/Colours.xcassets/{WhitelistEmptyFill.colorset => NoUnprotectedSitesFill.colorset}/Contents.json (100%)
 create mode 100644 TrackerBlockingFramework/TempUnprotectedSitesDataService.swift
 delete mode 100644 TrackerBlockingFramework/TempWhitelistDataService.swift
 rename UnitTests/{TempWhitelistDataServiceUserDefaultsTests.swift => TempUnprotectedSitesDataServiceUserDefaultsTests.swift} (75%)

diff --git a/App/AppDelegate.swift b/App/AppDelegate.swift
index 638d583..58c3fea 100644
--- a/App/AppDelegate.swift
+++ b/App/AppDelegate.swift
@@ -51,7 +51,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
         switch urls[0].absoluteString {
             
-        case AppLinks.manageWhitelist:
+        case AppLinks.manageUnprotectedSites:
             controller.selectTrustedSites(self)
             
         default:
diff --git a/App/Base.lproj/Main.storyboard b/App/Base.lproj/Main.storyboard
index 7c7febe..239f2b0 100644
--- a/App/Base.lproj/Main.storyboard
+++ b/App/Base.lproj/Main.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -243,8 +243,8 @@
                                                     <rect key="frame" x="0.0" y="-2" width="210" height="5"/>
                                                 </box>
                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gyh-oR-IZE">
-                                                    <rect key="frame" x="18" y="20" width="79" height="21"/>
-                                                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Whitelist" id="PCA-Tc-qMw">
+                                                    <rect key="frame" x="18" y="20" width="158" height="21"/>
+                                                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Unprotected Sites" id="PCA-Tc-qMw">
                                                         <font key="font" metaFont="systemSemibold" size="18"/>
                                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -521,7 +521,6 @@
                                             <tableColumns>
                                                 <tableColumn width="586" minWidth="40" maxWidth="1000" id="Jc3-sP-dr8">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                                        <font key="font" metaFont="message" size="11"/>
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                                     </tableHeaderCell>
@@ -539,7 +538,7 @@
                                                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aBi-uE-RQS">
                                                                     <rect key="frame" x="0.0" y="43" width="586" height="26"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                                                    <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Whitelist" id="lcM-vz-Ltd">
+                                                                    <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Unprotected Sites" id="lcM-vz-Ltd">
                                                                         <font key="font" metaFont="systemBold" size="22"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -559,7 +558,7 @@
                                                                 <outlet property="textField" destination="aBi-uE-RQS" id="PI9-1v-JrM"/>
                                                             </connections>
                                                         </tableCellView>
-                                                        <tableCellView identifier="Entry" id="i9m-aw-Vzv" customClass="WhitelistEntryView" customModule="DuckDuckGo_Privacy_Essentials" customModuleProvider="target">
+                                                        <tableCellView identifier="Entry" id="i9m-aw-Vzv" customClass="ProtectionEntryTableCellView" customModule="DuckDuckGo_Privacy_Essentials" customModuleProvider="target">
                                                             <rect key="frame" x="0.0" y="100" width="586" height="50"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
@@ -664,28 +663,28 @@
                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Exceptions" id="dtH-LG-vGf"/>
                                         </imageView>
                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4GI-aE-TNs">
-                                            <rect key="frame" x="139" y="211" width="210" height="26"/>
-                                            <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="No whitelisted sites" id="7v2-fY-5nH">
+                                            <rect key="frame" x="132" y="211" width="224" height="26"/>
+                                            <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="No unprotected sites" id="7v2-fY-5nH">
                                                 <font key="font" metaFont="systemBold" size="22"/>
                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
                                         <scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9vg-Ts-M0O">
-                                            <rect key="frame" x="69" y="40" width="350" height="135"/>
+                                            <rect key="frame" x="67" y="40" width="355" height="135"/>
                                             <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="fbl-dg-Avp">
-                                                <rect key="frame" x="0.0" y="0.0" width="350" height="135"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="355" height="135"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <textView editable="NO" selectable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="haL-kB-qUz">
-                                                        <rect key="frame" x="0.0" y="0.0" width="350" height="135"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="355" height="135"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <color key="textColor" red="0.36862745099999999" green="0.3803921569" blue="0.40784313729999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                        <size key="minSize" width="350" height="135"/>
+                                                        <size key="minSize" width="355" height="135"/>
                                                         <size key="maxSize" width="440" height="10000000"/>
                                                         <attributedString key="textStorage">
-                                                            <fragment content="Disabling Privacy Protection automatically adds a whitelist entry for that domain.">
+                                                            <fragment content="Disabling Privacy Protection automatically adds that domain to your list of unprotected sites.">
                                                                 <attributes>
                                                                     <color key="NSColor" red="0.36862745099999999" green="0.3803921569" blue="0.40784313729999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <font key="NSFont" metaFont="system" size="16"/>
@@ -698,7 +697,7 @@
                                                 </subviews>
                                             </clipView>
                                             <constraints>
-                                                <constraint firstAttribute="width" constant="350" id="8ad-Tm-51G"/>
+                                                <constraint firstAttribute="width" constant="355" id="8ad-Tm-51G"/>
                                                 <constraint firstAttribute="height" constant="135" id="B35-sm-yM6"/>
                                             </constraints>
                                             <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="cTl-Dh-h5J">
@@ -706,7 +705,7 @@
                                                 <autoresizingMask key="autoresizingMask"/>
                                             </scroller>
                                             <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="fTe-vE-VoM">
-                                                <rect key="frame" x="334" y="0.0" width="16" height="135"/>
+                                                <rect key="frame" x="339" y="0.0" width="16" height="135"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                             </scroller>
                                         </scrollView>
@@ -720,8 +719,8 @@
                                         <constraint firstItem="4GI-aE-TNs" firstAttribute="centerX" secondItem="Khr-Iq-su0" secondAttribute="centerX" id="zZm-G2-Q3W"/>
                                     </constraints>
                                 </view>
-                                <color key="borderColor" name="WhitelistEmptyBorder"/>
-                                <color key="fillColor" name="WhitelistEmptyFill"/>
+                                <color key="borderColor" name="NoUnprotectedSitesBorder"/>
+                                <color key="fillColor" name="NoUnprotectedSitesFill"/>
                             </box>
                         </subviews>
                         <constraints>
@@ -1089,6 +1088,12 @@
         <namedColor name="HomeScreenFill">
             <color red="0.98431372549019602" green="0.98431372549019602" blue="0.98431372549019602" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <namedColor name="NoUnprotectedSitesBorder">
+            <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="NoUnprotectedSitesFill">
+            <color red="0.98431372549019602" green="0.98431372549019602" blue="0.98431372549019602" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
         <namedColor name="SelectedBackground">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
@@ -1098,11 +1103,5 @@
         <namedColor name="UnselectedBackground">
             <color red="0.9649999737739563" green="0.9649999737739563" blue="0.9649999737739563" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
-        <namedColor name="WhitelistEmptyBorder">
-            <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
-        <namedColor name="WhitelistEmptyFill">
-            <color red="0.98431372549019602" green="0.98431372549019602" blue="0.98431372549019602" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
     </resources>
 </document>
diff --git a/App/Colours.xcassets/WhitelistEmptyBorder.colorset/Contents.json b/App/Colours.xcassets/NoUnprotectedSitesBorder.colorset/Contents.json
similarity index 100%
rename from App/Colours.xcassets/WhitelistEmptyBorder.colorset/Contents.json
rename to App/Colours.xcassets/NoUnprotectedSitesBorder.colorset/Contents.json
diff --git a/App/Colours.xcassets/WhitelistEmptyFill.colorset/Contents.json b/App/Colours.xcassets/NoUnprotectedSitesFill.colorset/Contents.json
similarity index 100%
rename from App/Colours.xcassets/WhitelistEmptyFill.colorset/Contents.json
rename to App/Colours.xcassets/NoUnprotectedSitesFill.colorset/Contents.json
diff --git a/App/MainViewController.swift b/App/MainViewController.swift
index 3954638..67ef455 100644
--- a/App/MainViewController.swift
+++ b/App/MainViewController.swift
@@ -55,7 +55,7 @@ class MainViewController: NSViewController {
     }
 
     @IBAction func selectTrustedSites(_ sender: Any) {
-        pixel.fire(.homeWhitelistOpened)
+        pixel.fire(.homeUnprotectedSitesOpened)
         deselectAllSectionButtons()
         tabs.selectTabViewItem(at: 1)
         setSectionButtonSelected(atIndex: 1)
diff --git a/App/TrustedSitesViewController.swift b/App/TrustedSitesViewController.swift
index 54f8263..43261d4 100644
--- a/App/TrustedSitesViewController.swift
+++ b/App/TrustedSitesViewController.swift
@@ -59,7 +59,8 @@ extension TrustedSitesViewController: NSTableViewDelegate {
         if row == 0 {
             return tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier("Header"), owner: nil)
         } else {
-            guard let entry = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier("Entry"), owner: nil) as? WhitelistEntryView else {
+            guard let entry = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier("Entry"), owner: nil) as? ProtectionEntryTableCellView
+                else {
                 fatalError("Failed to make 'Entry' view")
             }
             entry.textField?.stringValue = trustedSites.allDomains()[row - 1]
@@ -86,7 +87,7 @@ extension TrustedSitesViewController: NSTableViewDataSource {
 
 }
 
-class WhitelistEntryView: NSTableCellView {
+class ProtectionEntryTableCellView: NSTableCellView {
  
     typealias OnDelete = () -> Void
     
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index e7ddfc1..91d51bf 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -86,10 +86,10 @@
 		854A9F542271CB01008F2A93 /* AppIcon.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 854A9F532271CB01008F2A93 /* AppIcon.xcassets */; };
 		854A9F552271CB0A008F2A93 /* AppIcon.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 854A9F532271CB01008F2A93 /* AppIcon.xcassets */; };
 		854A9F562271CB0B008F2A93 /* AppIcon.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 854A9F532271CB01008F2A93 /* AppIcon.xcassets */; };
-		854EFAD72333974D00A6BDC3 /* TempWhitelistDataService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 854EFAD5233394F400A6BDC3 /* TempWhitelistDataService.swift */; };
+		854EFAD72333974D00A6BDC3 /* TempUnprotectedSitesDataService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 854EFAD5233394F400A6BDC3 /* TempUnprotectedSitesDataService.swift */; };
 		854EFADA233397D100A6BDC3 /* HTTPURLResponseExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 854EFAD82333977A00A6BDC3 /* HTTPURLResponseExtension.swift */; };
 		854EFADD23339C9500A6BDC3 /* DataCompletion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 854EFADB23339C4A00A6BDC3 /* DataCompletion.swift */; };
-		854EFADF2333A03400A6BDC3 /* TempWhitelistDataServiceUserDefaultsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 854EFADE2333A03400A6BDC3 /* TempWhitelistDataServiceUserDefaultsTests.swift */; };
+		854EFADF2333A03400A6BDC3 /* TempUnprotectedSitesDataServiceUserDefaultsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 854EFADE2333A03400A6BDC3 /* TempUnprotectedSitesDataServiceUserDefaultsTests.swift */; };
 		854EFAE12333B4AF00A6BDC3 /* TrustedSitesManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 854EFAE02333B4AF00A6BDC3 /* TrustedSitesManagerTests.swift */; };
 		854EFAE32333BB4D00A6BDC3 /* BlockerListManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 854EFAE22333BB4D00A6BDC3 /* BlockerListManagerTests.swift */; };
 		8551502A2375AA7900DBC528 /* SyncSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 855150282375AA7900DBC528 /* SyncSupport.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -529,10 +529,10 @@
 		854A9F4622708783008F2A93 /* TrustedSitesManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrustedSitesManager.swift; sourceTree = "<group>"; };
 		854A9F4F2271B078008F2A93 /* Shared.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Shared.xcassets; sourceTree = "<group>"; };
 		854A9F532271CB01008F2A93 /* AppIcon.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = AppIcon.xcassets; sourceTree = "<group>"; };
-		854EFAD5233394F400A6BDC3 /* TempWhitelistDataService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempWhitelistDataService.swift; sourceTree = "<group>"; };
+		854EFAD5233394F400A6BDC3 /* TempUnprotectedSitesDataService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempUnprotectedSitesDataService.swift; sourceTree = "<group>"; };
 		854EFAD82333977A00A6BDC3 /* HTTPURLResponseExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPURLResponseExtension.swift; sourceTree = "<group>"; };
 		854EFADB23339C4A00A6BDC3 /* DataCompletion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataCompletion.swift; sourceTree = "<group>"; };
-		854EFADE2333A03400A6BDC3 /* TempWhitelistDataServiceUserDefaultsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempWhitelistDataServiceUserDefaultsTests.swift; sourceTree = "<group>"; };
+		854EFADE2333A03400A6BDC3 /* TempUnprotectedSitesDataServiceUserDefaultsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempUnprotectedSitesDataServiceUserDefaultsTests.swift; sourceTree = "<group>"; };
 		854EFAE02333B4AF00A6BDC3 /* TrustedSitesManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrustedSitesManagerTests.swift; sourceTree = "<group>"; };
 		854EFAE22333BB4D00A6BDC3 /* BlockerListManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlockerListManagerTests.swift; sourceTree = "<group>"; };
 		855150262375AA7900DBC528 /* SyncSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SyncSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -921,7 +921,7 @@
 				859F13CC227926D800EDE40A /* PageData.swift */,
 				859914E0227B0C1C0023C1F2 /* PrivacyPractice.swift */,
 				859914DE227B08EC0023C1F2 /* PrivacyPracticesManager.swift */,
-				854EFAD5233394F400A6BDC3 /* TempWhitelistDataService.swift */,
+				854EFAD5233394F400A6BDC3 /* TempUnprotectedSitesDataService.swift */,
 				850AFAFC232A4FF8004C859B /* TermsOfService.swift */,
 				850AFAFE232A505B004C859B /* tosdr.json */,
 				8587A6852278901300F622AF /* TrackerBlocking.h */,
@@ -999,7 +999,7 @@
 				859F13D5227A468600EDE40A /* PageDataTests.swift */,
 				850AFB00232A50DF004C859B /* PrivacyPracticesTests.swift */,
 				85C55C2C230C5CEA0030B52A /* sample-tracker-data.json */,
-				854EFADE2333A03400A6BDC3 /* TempWhitelistDataServiceUserDefaultsTests.swift */,
+				854EFADE2333A03400A6BDC3 /* TempUnprotectedSitesDataServiceUserDefaultsTests.swift */,
 				8576BB7023100FF5005DAB06 /* tracker-cases.json */,
 				8541840E2283A54300DD2900 /* TrackerDataManagerTests.swift */,
 				834E585C232F2EBF00B43C37 /* TrackerDataServiceUserDefaultsTests.swift */,
@@ -1646,7 +1646,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				85A527C9227F634600233FDF /* ContentBlockerRule.swift in Sources */,
-				854EFAD72333974D00A6BDC3 /* TempWhitelistDataService.swift in Sources */,
+				854EFAD72333974D00A6BDC3 /* TempUnprotectedSitesDataService.swift in Sources */,
 				859F13DB227A4BE100EDE40A /* PageData.swift in Sources */,
 				859E7CF7230EFB96007353C0 /* ContentBlockerRulesBuilder.swift in Sources */,
 				859914E1227B0C1C0023C1F2 /* PrivacyPractice.swift in Sources */,
@@ -1682,7 +1682,7 @@
 				859F13D2227A3B2C00EDE40A /* GradeTests.swift in Sources */,
 				855150372375AABC00DBC528 /* SyncUserDefaultsTests.swift in Sources */,
 				855205C42333C9DE003E5640 /* DeepDetectionTests.swift in Sources */,
-				854EFADF2333A03400A6BDC3 /* TempWhitelistDataServiceUserDefaultsTests.swift in Sources */,
+				854EFADF2333A03400A6BDC3 /* TempUnprotectedSitesDataServiceUserDefaultsTests.swift in Sources */,
 				8587A6932278901400F622AF /* TrackerDetectionTests.swift in Sources */,
 				8347D38E23325E13006AB02A /* FireOncePixelTests.swift in Sources */,
 				850AFB01232A50DF004C859B /* PrivacyPracticesTests.swift in Sources */,
diff --git a/SafariAppExtension/Dashboard.storyboard b/SafariAppExtension/Dashboard.storyboard
index 3839a69..1387cc9 100644
--- a/SafariAppExtension/Dashboard.storyboard
+++ b/SafariAppExtension/Dashboard.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16096"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -25,17 +25,17 @@
                 <customObject id="PdZ-5R-Xob" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
                 <viewController storyboardIdentifier="MainDashboard" id="yVf-K8-uRd" customClass="MainDashboardViewController" customModule="SafariAppExtension" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" id="nT0-5T-PJt">
-                        <rect key="frame" x="0.0" y="0.0" width="589" height="450"/>
+                        <rect key="frame" x="0.0" y="0.0" width="592" height="450"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dEX-r8-b3F" userLabel="Items Stack">
-                                <rect key="frame" x="0.0" y="0.0" width="589" height="250"/>
+                                <rect key="frame" x="0.0" y="0.0" width="592" height="250"/>
                                 <subviews>
                                     <view translatesAutoresizingMaskIntoConstraints="NO" id="CmJ-kZ-cIg" userLabel="Connection View">
-                                        <rect key="frame" x="0.0" y="200" width="589" height="50"/>
+                                        <rect key="frame" x="0.0" y="200" width="592" height="50"/>
                                         <subviews>
                                             <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5gX-yF-nUl">
-                                                <rect key="frame" x="16" y="0.0" width="557" height="50"/>
+                                                <rect key="frame" x="16" y="0.0" width="560" height="50"/>
                                                 <subviews>
                                                     <imageView horizontalHuggingPriority="750" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Czi-OK-Y5s">
                                                         <rect key="frame" x="0.0" y="15" width="20" height="20"/>
@@ -46,7 +46,7 @@
                                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="PP Icon Unknown" id="FWu-o4-FEd"/>
                                                     </imageView>
                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zXw-2T-rbv">
-                                                        <rect key="frame" x="30" y="17" width="529" height="17"/>
+                                                        <rect key="frame" x="30" y="17" width="532" height="17"/>
                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Unencrypted Connection" id="w9Q-b6-gKP">
                                                             <font key="font" metaFont="systemMedium" size="14"/>
                                                             <color key="textColor" name="ItemTitle"/>
@@ -64,9 +64,9 @@
                                                 </customSpacing>
                                             </stackView>
                                             <box boxType="custom" borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="U1A-Uy-e50" userLabel="Separator">
-                                                <rect key="frame" x="0.0" y="49" width="589" height="1"/>
+                                                <rect key="frame" x="0.0" y="49" width="592" height="1"/>
                                                 <view key="contentView" id="1Cr-ho-CRS">
-                                                    <rect key="frame" x="0.0" y="0.0" width="589" height="1"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="592" height="1"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 </view>
                                                 <constraints>
@@ -88,10 +88,10 @@
                                         </constraints>
                                     </view>
                                     <view translatesAutoresizingMaskIntoConstraints="NO" id="YDc-ak-MrW" userLabel="Trackers View" customClass="ClickableView" customModule="SafariAppExtension" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="150" width="589" height="50"/>
+                                        <rect key="frame" x="0.0" y="150" width="592" height="50"/>
                                         <subviews>
                                             <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lzH-Oi-Wga">
-                                                <rect key="frame" x="16" y="0.0" width="557" height="50"/>
+                                                <rect key="frame" x="16" y="0.0" width="560" height="50"/>
                                                 <subviews>
                                                     <imageView horizontalHuggingPriority="750" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="H5D-fS-3Pc">
                                                         <rect key="frame" x="0.0" y="15" width="20" height="20"/>
@@ -102,7 +102,7 @@
                                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="PP Icon Check" id="1VH-cw-rfp"/>
                                                     </imageView>
                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vJA-6G-nQL">
-                                                        <rect key="frame" x="30" y="17" width="507" height="17"/>
+                                                        <rect key="frame" x="30" y="17" width="510" height="17"/>
                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="0 Trackers Found" id="Bq1-Kg-et4">
                                                             <font key="font" metaFont="systemMedium" size="14"/>
                                                             <color key="textColor" name="ItemTitle"/>
@@ -110,7 +110,7 @@
                                                         </textFieldCell>
                                                     </textField>
                                                     <imageView horizontalHuggingPriority="252" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="9qo-rF-p6G">
-                                                        <rect key="frame" x="547" y="17" width="10" height="16"/>
+                                                        <rect key="frame" x="550" y="17" width="10" height="16"/>
                                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="PP Arrow Forward" id="7K8-YL-GkL"/>
                                                         <color key="contentTintColor" name="Arrow"/>
                                                     </imageView>
@@ -127,9 +127,9 @@
                                                 </customSpacing>
                                             </stackView>
                                             <box boxType="custom" borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="hVH-5N-lfw" userLabel="Separator">
-                                                <rect key="frame" x="0.0" y="49" width="589" height="1"/>
+                                                <rect key="frame" x="0.0" y="49" width="592" height="1"/>
                                                 <view key="contentView" id="ibc-q2-jnI">
-                                                    <rect key="frame" x="0.0" y="0.0" width="589" height="1"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="592" height="1"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 </view>
                                                 <constraints>
@@ -158,10 +158,10 @@
                                         </gestureRecognizers>
                                     </view>
                                     <view translatesAutoresizingMaskIntoConstraints="NO" id="XuR-Kz-dfd" userLabel="Privacy Practices View">
-                                        <rect key="frame" x="0.0" y="100" width="589" height="50"/>
+                                        <rect key="frame" x="0.0" y="100" width="592" height="50"/>
                                         <subviews>
                                             <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zOQ-il-Thx">
-                                                <rect key="frame" x="16" y="0.0" width="557" height="50"/>
+                                                <rect key="frame" x="16" y="0.0" width="560" height="50"/>
                                                 <subviews>
                                                     <imageView horizontalHuggingPriority="750" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="v95-je-r3q">
                                                         <rect key="frame" x="0.0" y="15" width="20" height="20"/>
@@ -172,7 +172,7 @@
                                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="PP Icon Unknown" id="o87-cq-g0S"/>
                                                     </imageView>
                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NQT-96-owm">
-                                                        <rect key="frame" x="30" y="17" width="529" height="17"/>
+                                                        <rect key="frame" x="30" y="17" width="532" height="17"/>
                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Unknown Privacy Practices" id="nuU-FI-1bX">
                                                             <font key="font" metaFont="systemMedium" size="14"/>
                                                             <color key="textColor" name="ItemTitle"/>
@@ -190,9 +190,9 @@
                                                 </customSpacing>
                                             </stackView>
                                             <box boxType="custom" borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="NbS-jl-hpZ" userLabel="Separator">
-                                                <rect key="frame" x="0.0" y="49" width="589" height="1"/>
+                                                <rect key="frame" x="0.0" y="49" width="592" height="1"/>
                                                 <view key="contentView" id="TBU-Cl-EtL">
-                                                    <rect key="frame" x="0.0" y="0.0" width="589" height="1"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="592" height="1"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 </view>
                                                 <constraints>
@@ -214,23 +214,23 @@
                                         </constraints>
                                     </view>
                                     <box boxType="custom" borderType="none" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="2Cp-NG-aaD" userLabel="Site Protection Box">
-                                        <rect key="frame" x="0.0" y="50" width="589" height="50"/>
+                                        <rect key="frame" x="0.0" y="50" width="592" height="50"/>
                                         <view key="contentView" id="xta-2P-4GV">
-                                            <rect key="frame" x="0.0" y="0.0" width="589" height="50"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="592" height="50"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <stackView distribution="fillProportionally" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lfY-HN-Hc1">
-                                                    <rect key="frame" x="16" y="0.0" width="557" height="50"/>
+                                                    <rect key="frame" x="16" y="0.0" width="560" height="50"/>
                                                     <subviews>
                                                         <stackView distribution="fillEqually" orientation="vertical" alignment="leading" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="RCD-6U-mVo">
-                                                            <rect key="frame" x="0.0" y="0.0" width="511" height="50"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="514" height="50"/>
                                                             <subviews>
                                                                 <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aLg-JS-Wgp">
-                                                                    <rect key="frame" x="0.0" y="33" width="128" height="17"/>
+                                                                    <rect key="frame" x="0.0" y="33" width="192" height="17"/>
                                                                     <subviews>
                                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="urB-Oh-x1S">
-                                                                            <rect key="frame" x="-2" y="0.0" width="132" height="17"/>
-                                                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Added to Whitelist" id="wnA-0a-BaX">
+                                                                            <rect key="frame" x="-2" y="0.0" width="196" height="17"/>
+                                                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Added to Unprotected Sites" id="wnA-0a-BaX">
                                                                                 <font key="font" metaFont="systemBold" size="14"/>
                                                                                 <color key="textColor" name="ItemTitle"/>
                                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -245,11 +245,11 @@
                                                                     </customSpacing>
                                                                 </stackView>
                                                                 <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="i0D-m3-TFt">
-                                                                    <rect key="frame" x="0.0" y="17" width="165" height="16"/>
+                                                                    <rect key="frame" x="0.0" y="17" width="229" height="16"/>
                                                                     <subviews>
                                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="efC-4d-6e7">
-                                                                            <rect key="frame" x="-2" y="0.0" width="169" height="16"/>
-                                                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Removed from Whitelist" id="7EW-Gx-uDT">
+                                                                            <rect key="frame" x="-2" y="0.0" width="233" height="16"/>
+                                                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Removed from Unprotected Sites" id="7EW-Gx-uDT">
                                                                                 <font key="font" metaFont="systemBold" size="14"/>
                                                                                 <color key="textColor" name="ItemTitle"/>
                                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -284,7 +284,7 @@
                                                             </customSpacing>
                                                         </stackView>
                                                         <switch horizontalHuggingPriority="750" verticalHuggingPriority="750" baseWritingDirection="leftToRight" state="on" translatesAutoresizingMaskIntoConstraints="NO" id="GT7-Dd-T5H">
-                                                            <rect key="frame" x="517" y="13" width="42" height="24"/>
+                                                            <rect key="frame" x="520" y="13" width="42" height="24"/>
                                                             <connections>
                                                                 <action selector="toggleProtection:" target="yVf-K8-uRd" id="HNu-JO-qc3"/>
                                                             </connections>
@@ -300,9 +300,9 @@
                                                     </customSpacing>
                                                 </stackView>
                                                 <box boxType="custom" borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="PRw-An-ASO" userLabel="Separator">
-                                                    <rect key="frame" x="0.0" y="49" width="589" height="1"/>
+                                                    <rect key="frame" x="0.0" y="49" width="592" height="1"/>
                                                     <view key="contentView" id="uYF-vd-p2c">
-                                                        <rect key="frame" x="0.0" y="0.0" width="589" height="1"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="592" height="1"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     </view>
                                                     <constraints>
@@ -329,33 +329,33 @@
                                         <color key="fillColor" name="ProtectionToggleBackground"/>
                                     </box>
                                     <stackView distribution="fillEqually" orientation="vertical" alignment="centerX" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Pjl-CB-ocT">
-                                        <rect key="frame" x="0.0" y="0.0" width="589" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="592" height="50"/>
                                         <subviews>
                                             <stackView distribution="fillEqually" orientation="horizontal" alignment="centerY" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9JK-R1-RQT">
-                                                <rect key="frame" x="0.0" y="0.0" width="589" height="50"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="592" height="50"/>
                                                 <subviews>
                                                     <view translatesAutoresizingMaskIntoConstraints="NO" id="xOQ-JE-MgF">
-                                                        <rect key="frame" x="0.0" y="0.0" width="295" height="50"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="296" height="50"/>
                                                         <subviews>
                                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DKZ-mC-dhQ" customClass="ClickableTextField" customModule="SafariAppExtension" customModuleProvider="target">
-                                                                <rect key="frame" x="90" y="17" width="116" height="16"/>
+                                                                <rect key="frame" x="88" y="17" width="121" height="16"/>
                                                                 <gestureRecognizers>
                                                                     <clickGestureRecognizer delaysPrimaryMouseButtonEvents="YES" numberOfClicksRequired="1" id="Fge-04-xuQ">
                                                                         <connections>
-                                                                            <action selector="manageWhitelist:" target="yVf-K8-uRd" id="qCt-sJ-TYH"/>
+                                                                            <action selector="manageUnprotectedSites:" target="yVf-K8-uRd" id="qCt-sJ-TYH"/>
                                                                         </connections>
                                                                     </clickGestureRecognizer>
                                                                 </gestureRecognizers>
-                                                                <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Manage Whitelist" id="VNz-51-3td">
+                                                                <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Unprotected Sites" id="VNz-51-3td">
                                                                     <font key="font" metaFont="systemMedium" size="13"/>
                                                                     <color key="textColor" name="ItemTitle"/>
                                                                     <color key="backgroundColor" name="ItemTitleInverse"/>
                                                                 </textFieldCell>
                                                             </textField>
                                                             <box boxType="custom" borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="atJ-Hf-lz9" userLabel="Separator">
-                                                                <rect key="frame" x="0.0" y="49" width="295" height="1"/>
+                                                                <rect key="frame" x="0.0" y="49" width="296" height="1"/>
                                                                 <view key="contentView" id="qkT-qi-lkd">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="295" height="1"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="296" height="1"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                 </view>
                                                                 <constraints>
@@ -375,10 +375,10 @@
                                                         </constraints>
                                                     </view>
                                                     <view translatesAutoresizingMaskIntoConstraints="NO" id="Kdi-rJ-JRr">
-                                                        <rect key="frame" x="295" y="0.0" width="294" height="50"/>
+                                                        <rect key="frame" x="296" y="0.0" width="296" height="50"/>
                                                         <subviews>
                                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QaT-Zm-7Gd" customClass="ClickableTextField" customModule="SafariAppExtension" customModuleProvider="target">
-                                                                <rect key="frame" x="85" y="17" width="125" height="16"/>
+                                                                <rect key="frame" x="86" y="17" width="125" height="16"/>
                                                                 <gestureRecognizers>
                                                                     <clickGestureRecognizer delaysPrimaryMouseButtonEvents="YES" numberOfClicksRequired="1" id="Bgw-WN-92W">
                                                                         <connections>
@@ -405,9 +405,9 @@
                                                                 <color key="fillColor" name="SeparatorColor"/>
                                                             </box>
                                                             <box boxType="custom" borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="L78-As-sjm" userLabel="Separator">
-                                                                <rect key="frame" x="0.0" y="49" width="294" height="1"/>
+                                                                <rect key="frame" x="0.0" y="49" width="296" height="1"/>
                                                                 <view key="contentView" id="L3O-It-dV7">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="294" height="1"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="296" height="1"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                 </view>
                                                                 <constraints>
@@ -440,27 +440,27 @@
                                                 </customSpacing>
                                             </stackView>
                                             <view translatesAutoresizingMaskIntoConstraints="NO" id="N4i-u7-f57">
-                                                <rect key="frame" x="0.0" y="0.0" width="589" height="50"/>
+                                                <rect key="frame" x="0.0" y="-50" width="592" height="50"/>
                                                 <subviews>
                                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4Uc-yr-DeA">
-                                                        <rect key="frame" x="179" y="16" width="231" height="18"/>
+                                                        <rect key="frame" x="180" y="16" width="232" height="19"/>
                                                         <subviews>
                                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5wF-F9-LVm">
-                                                                <rect key="frame" x="-2" y="0.0" width="159" height="18"/>
+                                                                <rect key="frame" x="-2" y="0.0" width="160" height="19"/>
                                                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Is this website broken?" id="VMe-Xh-Z38">
-                                                                    <font key="font" size="15" name="ProximaNova-Bold"/>
+                                                                    <font key="font" metaFont="system" size="15"/>
                                                                     <color key="textColor" name="ItemTitle"/>
                                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                 </textFieldCell>
                                                             </textField>
                                                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9tX-9h-vIC" customClass="ClickableButton" customModule="SafariAppExtension" customModuleProvider="target">
-                                                                <rect key="frame" x="163" y="0.0" width="30" height="18"/>
+                                                                <rect key="frame" x="164" y="0.0" width="30" height="19"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="30" id="HtH-ca-sYc"/>
                                                                 </constraints>
                                                                 <buttonCell key="cell" type="roundRect" title="Yes" bezelStyle="roundedRect" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="fY1-dF-RAT">
                                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                    <font key="font" size="15" name="ProximaNova-Regular"/>
+                                                                    <font key="font" metaFont="system" size="15"/>
                                                                 </buttonCell>
                                                                 <color key="contentTintColor" name="ItemTitle"/>
                                                                 <connections>
@@ -468,13 +468,13 @@
                                                                 </connections>
                                                             </button>
                                                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ro2-J5-yZN" customClass="ClickableButton" customModule="SafariAppExtension" customModuleProvider="target">
-                                                                <rect key="frame" x="201" y="0.0" width="30" height="18"/>
+                                                                <rect key="frame" x="202" y="0.0" width="30" height="19"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="30" id="MIb-9a-7Jy"/>
                                                                 </constraints>
                                                                 <buttonCell key="cell" type="roundRect" title="No" bezelStyle="roundedRect" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="2qF-ze-dfK">
                                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                    <font key="font" size="15" name="ProximaNova-Regular"/>
+                                                                    <font key="font" metaFont="system" size="15"/>
                                                                 </buttonCell>
                                                                 <color key="contentTintColor" name="ItemTitle"/>
                                                                 <connections>
@@ -494,9 +494,9 @@
                                                         </customSpacing>
                                                     </stackView>
                                                     <box boxType="custom" borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="jl0-iC-kcw" userLabel="Separator">
-                                                        <rect key="frame" x="0.0" y="49" width="589" height="1"/>
+                                                        <rect key="frame" x="0.0" y="49" width="592" height="1"/>
                                                         <view key="contentView" id="1Dj-ir-Sn3">
-                                                            <rect key="frame" x="0.0" y="0.0" width="589" height="1"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="592" height="1"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         </view>
                                                         <constraints>
@@ -554,17 +554,17 @@
                                 </customSpacing>
                             </stackView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="YBF-ON-sRb">
-                                <rect key="frame" x="0.0" y="250" width="589" height="200"/>
+                                <rect key="frame" x="0.0" y="250" width="592" height="200"/>
                                 <subviews>
                                     <stackView distribution="fill" orientation="vertical" alignment="centerX" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VPl-kJ-Ago" userLabel="Header Stack">
-                                        <rect key="frame" x="0.0" y="-9" width="589" height="218"/>
+                                        <rect key="frame" x="0.0" y="-9" width="592" height="218"/>
                                         <subviews>
                                             <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="4Ss-Wb-RHc">
-                                                <rect key="frame" x="225" y="113" width="140" height="105"/>
+                                                <rect key="frame" x="226" y="113" width="140" height="105"/>
                                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="PP Grade Null" id="QDC-fr-Mwq"/>
                                             </imageView>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Zyd-k1-7eh">
-                                                <rect key="frame" x="14" y="84" width="561" height="21"/>
+                                                <rect key="frame" x="14" y="84" width="564" height="21"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingHead" alignment="center" title="new tab" id="DXb-Zl-jW8">
                                                     <font key="font" metaFont="systemSemibold" size="18"/>
                                                     <color key="textColor" name="SiteTitle"/>
@@ -572,7 +572,7 @@
                                                 </textFieldCell>
                                             </textField>
                                             <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9QA-Bs-8ju">
-                                                <rect key="frame" x="214" y="58" width="162" height="18"/>
+                                                <rect key="frame" x="215" y="58" width="162" height="18"/>
                                                 <subviews>
                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="czp-bw-3uq">
                                                         <rect key="frame" x="-2" y="2" width="140" height="15"/>
@@ -597,7 +597,7 @@
                                                 </customSpacing>
                                             </stackView>
                                             <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xR5-py-kgz">
-                                                <rect key="frame" x="244" y="32" width="101" height="18"/>
+                                                <rect key="frame" x="246" y="32" width="101" height="18"/>
                                                 <subviews>
                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ih1-bJ-qaH">
                                                         <rect key="frame" x="-2" y="2" width="105" height="15"/>
@@ -619,7 +619,7 @@
                                                 </customSpacing>
                                             </stackView>
                                             <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0go-gC-ecL">
-                                                <rect key="frame" x="194" y="0.0" width="201" height="24"/>
+                                                <rect key="frame" x="196" y="0.0" width="201" height="24"/>
                                                 <subviews>
                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KNG-uB-8MP">
                                                         <rect key="frame" x="-2" y="5" width="205" height="15"/>
@@ -678,7 +678,7 @@
                         </constraints>
                     </view>
                     <connections>
-                        <outlet property="addedToWhitelist" destination="aLg-JS-Wgp" id="RsR-29-tEV"/>
+                        <outlet property="addedToUnprotectedSites" destination="aLg-JS-Wgp" id="RsR-29-tEV"/>
                         <outlet property="bottomButtons" destination="9JK-R1-RQT" id="gtm-Yy-iXx"/>
                         <outlet property="brokenYesNo" destination="N4i-u7-f57" id="aeK-3G-K4p"/>
                         <outlet property="encryptionIcon" destination="Czi-OK-Y5s" id="nwg-Iu-ulR"/>
@@ -687,7 +687,7 @@
                         <outlet property="enhancedStatementTextField" destination="czp-bw-3uq" id="3bj-4Q-xDU"/>
                         <outlet property="fromIcon" destination="E7N-7n-9tf" id="Tt4-jQ-05k"/>
                         <outlet property="gradeIcon" destination="4Ss-Wb-RHc" id="nRS-ta-aJa"/>
-                        <outlet property="manageWhitelistCTA" destination="DKZ-mC-dhQ" id="QvH-Ip-IxN"/>
+                        <outlet property="manageUnprotectedSitesCTA" destination="DKZ-mC-dhQ" id="QvH-Ip-IxN"/>
                         <outlet property="privacyGradeMessage" destination="xR5-py-kgz" id="GGA-N4-t5y"/>
                         <outlet property="privacyGradeTextField" destination="Ih1-bJ-qaH" id="eZV-hd-A1i"/>
                         <outlet property="privacyPracticesIcon" destination="v95-je-r3q" id="R2q-BO-i49"/>
@@ -697,7 +697,7 @@
                         <outlet property="protectionToggle" destination="GT7-Dd-T5H" id="W3l-me-Xsd"/>
                         <outlet property="regularSitesMessage" destination="0go-gC-ecL" id="XO2-Fn-FsH"/>
                         <outlet property="regularSitesTextField" destination="KNG-uB-8MP" id="kJJ-b3-BMI"/>
-                        <outlet property="removedFromWhitelist" destination="i0D-m3-TFt" id="4re-R5-nlN"/>
+                        <outlet property="removedFromUnprotectedSites" destination="i0D-m3-TFt" id="4re-R5-nlN"/>
                         <outlet property="reportBrokenSiteCTA" destination="QaT-Zm-7Gd" id="nei-Sy-8t4"/>
                         <outlet property="siteTitle" destination="Zyd-k1-7eh" id="w1h-P4-IrE"/>
                         <outlet property="trackersIcon" destination="H5D-fS-3Pc" id="hho-pH-KmM"/>
@@ -900,7 +900,7 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <clipView key="contentView" drawsBackground="NO" id="wQE-8q-Cf2">
                             <rect key="frame" x="0.0" y="0.0" width="310" height="452"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <autoresizingMask key="autoresizingMask"/>
                             <subviews>
                                 <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="none" multipleSelection="NO" autosaveColumns="NO" viewBased="YES" outlineTableColumn="ukL-ac-7We" id="9ad-6x-2Xl">
                                     <rect key="frame" x="0.0" y="0.0" width="310" height="452"/>
diff --git a/SafariAppExtension/MainDashboardViewController.swift b/SafariAppExtension/MainDashboardViewController.swift
index fcb8546..03b5310 100644
--- a/SafariAppExtension/MainDashboardViewController.swift
+++ b/SafariAppExtension/MainDashboardViewController.swift
@@ -64,11 +64,11 @@ class MainDashboardViewController: DashboardNavigationController {
     @IBOutlet weak var protectionToggle: NSSwitch!
     @IBOutlet weak var protectionBox: NSBox!
     @IBOutlet weak var protectionMessage: NSView!
-    @IBOutlet weak var addedToWhitelist: NSView!
-    @IBOutlet weak var removedFromWhitelist: NSView!
+    @IBOutlet weak var addedToUnprotectedSites: NSView!
+    @IBOutlet weak var removedFromUnprotectedSites: NSView!
 
     @IBOutlet weak var bottomButtons: NSView!
-    @IBOutlet weak var manageWhitelistCTA: NSView!
+    @IBOutlet weak var manageUnprotectedSitesCTA: NSView!
     @IBOutlet weak var reportBrokenSiteCTA: NSView!
     @IBOutlet weak var brokenYesNo: NSView!
 
@@ -158,9 +158,9 @@ class MainDashboardViewController: DashboardNavigationController {
         navigationDelegate?.present(controller: .reportBrokenWebsite)
     }
 
-    @IBAction func manageWhitelist(_ sender: Any) {
-        pixel.fire(.dashboardWhitelistOpened)
-        NSWorkspace.shared.open(URL(string: AppLinks.manageWhitelist)!)
+    @IBAction func manageUnprotectedSites(_ sender: Any) {
+        pixel.fire(.dashboardUnprotectedSitesOpened)
+        NSWorkspace.shared.open(URL(string: AppLinks.manageUnprotectedSites)!)
     }
 
     @IBAction func clearBrokenYesNo(_ sender: Any) {
@@ -243,22 +243,22 @@ class MainDashboardViewController: DashboardNavigationController {
 
             case .on, .off:
                 self.protectionMessage.isHidden = false
-                self.addedToWhitelist.isHidden = true
-                self.removedFromWhitelist.isHidden = true
+                self.addedToUnprotectedSites.isHidden = true
+                self.removedFromUnprotectedSites.isHidden = true
                 self.bottomButtons.isHidden = false
                 self.brokenYesNo.isHidden = true
 
             case .disabled:
                 self.protectionMessage.isHidden = true
-                self.addedToWhitelist.isHidden = false
-                self.removedFromWhitelist.isHidden = true
+                self.addedToUnprotectedSites.isHidden = false
+                self.removedFromUnprotectedSites.isHidden = true
                 self.bottomButtons.isHidden = true
                 self.brokenYesNo.isHidden = false
 
             case .enabled:
                 self.protectionMessage.isHidden = true
-                self.addedToWhitelist.isHidden = true
-                self.removedFromWhitelist.isHidden = false
+                self.addedToUnprotectedSites.isHidden = true
+                self.removedFromUnprotectedSites.isHidden = false
                 self.bottomButtons.isHidden = false
                 self.brokenYesNo.isHidden = true
 
diff --git a/Shared/AppLinks.swift b/Shared/AppLinks.swift
index e957b42..66eecef 100644
--- a/Shared/AppLinks.swift
+++ b/Shared/AppLinks.swift
@@ -22,6 +22,6 @@ import Foundation
 struct AppLinks {
     
     static let home = "ddg://home"
-    static let manageWhitelist = "ddg://manageWhitelist"
+    static let manageUnprotectedSites = "ddg://manageUnprotectedSites"
     
 }
diff --git a/StatisticsFramework/Pixel.swift b/StatisticsFramework/Pixel.swift
index cd0479f..22ee90a 100644
--- a/StatisticsFramework/Pixel.swift
+++ b/StatisticsFramework/Pixel.swift
@@ -31,7 +31,7 @@ public enum PixelName: String {
     case onboardingEnableDDGSearchTime = "eon_ed_t"
     
     case homeShown = "eapp_h"
-    case homeWhitelistOpened = "eapp_h_w"
+    case homeUnprotectedSitesOpened = "eapp_h_w"
     case homeHelpOpened = "eapp_h_h"
     case homeOpenSafariToEnableDashboard = "eapp_h_sd"
     case homeOpenSafariToEnableCb = "eapp_h_scb"
@@ -47,7 +47,7 @@ public enum PixelName: String {
     case dashboardPrivacyProtectionToggleOn = "ept_on"
     case dashboardPrivacyProtectionToggleOff = "ept_off"
     case dashboardTrackerNetworksOpened = "epn"
-    case dashboardWhitelistOpened = "epw"
+    case dashboardUnprotectedSitesOpened = "epw"
     
     case safariBrowserExtensionSearch = "sbes"
 
diff --git a/SyncSupport/SyncRunner.swift b/SyncSupport/SyncRunner.swift
index 23098d8..94c371a 100644
--- a/SyncSupport/SyncRunner.swift
+++ b/SyncSupport/SyncRunner.swift
@@ -27,17 +27,17 @@ public class SyncRunner {
     public typealias SyncCompletion = (_ success: Bool) -> Void
     
     private let trackerDataService: TrackerDataService
-    private let tempWhitelistDataService: TempWhitelistDataService
+    private let tempUnprotectedSitesDataService: TempUnprotectedSitesDataService
     private let trackerDataManager: TrackerDataManager
     private let blockerListManager: BlockerListManager
     
     public init(trackerDataService: TrackerDataService = DefaultTrackerDataService(),
-                tempWhitelistDataService: TempWhitelistDataService = DefaultTempWhitelistDataService(),
+                tempUnprotectedSitesDataService: TempUnprotectedSitesDataService = DefaultTempUnprotectedSitesDataService(),
                 trackerDataManager: TrackerDataManager = TrackerBlocking.Dependencies.shared.trackerDataManager,
                 blockerListManager: BlockerListManager = TrackerBlocking.Dependencies.shared.blockerListManager) {
         
         self.trackerDataService = trackerDataService
-        self.tempWhitelistDataService = tempWhitelistDataService
+        self.tempUnprotectedSitesDataService = tempUnprotectedSitesDataService
         self.trackerDataManager = trackerDataManager
         self.blockerListManager = blockerListManager
     }
@@ -48,19 +48,19 @@ public class SyncRunner {
         let group = DispatchGroup()
         
         let trackerData = ServiceWrapper(group: group)
-        let tempWhitelistData = ServiceWrapper(group: group)
+        let tempUnprotectedSitesData = ServiceWrapper(group: group)
         
         trackerDataService.updateData(completion: trackerData.start())
-        tempWhitelistDataService.updateData(completion: tempWhitelistData.start())
+        tempUnprotectedSitesDataService.updateData(completion: tempUnprotectedSitesData.start())
         
         if group.wait(timeout: .now() + 30) == .timedOut {
             Statistics.Dependencies.shared.pixel.fire(.debugSyncTimeout)
         }
         
-        if trackerData.newData || tempWhitelistData.newData {
+        if trackerData.newData || tempUnprotectedSitesData.newData {
             os_log("Sync has new data %{public}s %{public}s", log: generalLog,
                    trackerData.newData ? "tracker data" : "",
-                   tempWhitelistData.newData ? "whitelist data" : "")
+                   tempUnprotectedSitesData.newData ? "unprotected sites data" : "")
             
             self.trackerDataManager.load()
             self.blockerListManager.update()
@@ -68,7 +68,7 @@ public class SyncRunner {
         }
         
         // if either fail, don't store the sync time - we need that data!
-        completion(trackerData.success && tempWhitelistData.success)
+        completion(trackerData.success && tempUnprotectedSitesData.success)
     }
     
 }
diff --git a/TrackerBlockingFramework/BlockerListManager.swift b/TrackerBlockingFramework/BlockerListManager.swift
index 60e5716..9b7a551 100644
--- a/TrackerBlockingFramework/BlockerListManager.swift
+++ b/TrackerBlockingFramework/BlockerListManager.swift
@@ -58,11 +58,11 @@ public class DefaultBlockerListManager: BlockerListManager {
         let trustedDomains = trustedSitesManager().allDomains()
         os_log("trustedDomains %s", log: generalLog, type: .debug, String(describing: trustedDomains))
 
-        let tempWhitelistDomains = trustedSitesManager().whitelistedDomains()
-        os_log("tempWhitelistDomains %s", log: generalLog, type: .debug, String(describing: tempWhitelistDomains))
+        let tempUnprotectedDomains = trustedSitesManager().unprotectedDomains()
+        os_log("tempUnprotectedDomains %s", log: generalLog, type: .debug, String(describing: tempUnprotectedDomains))
         
         let rules = ContentBlockerRulesBuilder(trackerData: trackerData).buildRules(withExceptions: trustedDomains,
-                                                                                    andTemporaryWhitelist: tempWhitelistDomains)
+                                                                                    andTemporaryUnprotectedDomains: tempUnprotectedDomains)
         
         guard let data = try? JSONEncoder().encode(rules) else {
             os_log("Failed to encode rules", log: generalLog, type: .error)
diff --git a/TrackerBlockingFramework/ContentBlockerRulesBuilder.swift b/TrackerBlockingFramework/ContentBlockerRulesBuilder.swift
index 9802326..79dfdf5 100644
--- a/TrackerBlockingFramework/ContentBlockerRulesBuilder.swift
+++ b/TrackerBlockingFramework/ContentBlockerRulesBuilder.swift
@@ -38,13 +38,14 @@ public struct ContentBlockerRulesBuilder {
     let trackerData: TrackerData
     
     /// Build all the rules for the given tracker data and list of exceptions.
-    public func buildRules(withExceptions exceptions: [String]? = nil, andTemporaryWhitelist tempWhitelist: [String]? = nil) -> [ContentBlockerRule] {
+    public func buildRules(withExceptions exceptions: [String]? = nil,
+                           andTemporaryUnprotectedDomains tempUnprotectedDomains: [String]? = nil) -> [ContentBlockerRule] {
         
         let trackerRules = trackerData.trackers.values.compactMap {
             buildRules(from: $0)
         }.flatMap { $0 }
         
-        return trackerRules + buildExceptions(from: exceptions, andWhitelist: tempWhitelist) + buildInstallButtonHider()
+        return trackerRules + buildExceptions(from: exceptions, andUnprotectedDomains: tempUnprotectedDomains) + buildInstallButtonHider()
     }
     
     /// Build the rules for a specific tracker.
@@ -70,8 +71,8 @@ public struct ContentBlockerRulesBuilder {
         return [ rule ]
     }
     
-    private func buildExceptions(from exceptions: [String]?, andWhitelist whitelist: [String]?) -> [ContentBlockerRule] {
-        let allExceptions = (exceptions ?? []) + (whitelist?.wildcards() ?? [])
+    private func buildExceptions(from exceptions: [String]?, andUnprotectedDomains unprotectedDomains: [String]?) -> [ContentBlockerRule] {
+        let allExceptions = (exceptions ?? []) + (unprotectedDomains?.wildcards() ?? [])
         guard !allExceptions.isEmpty else { return [] }
         return [ContentBlockerRule(trigger: .trigger(urlFilter: ".*", ifDomain: allExceptions, resourceType: nil), action: .ignorePreviousRules())]
     }
diff --git a/TrackerBlockingFramework/TempUnprotectedSitesDataService.swift b/TrackerBlockingFramework/TempUnprotectedSitesDataService.swift
new file mode 100644
index 0000000..e07b17d
--- /dev/null
+++ b/TrackerBlockingFramework/TempUnprotectedSitesDataService.swift
@@ -0,0 +1,123 @@
+//
+//  TempUnprotectedSitesDataService.swift
+//  TrackerBlocking
+//
+//  Copyright © 2019 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import Core
+import os
+
+public protocol TempUnprotectedSitesDataService {
+
+    func updateData(completion: @escaping TempUnprotectedSitesDataCompletion)
+}
+
+public typealias TempUnprotectedSitesDataCompletion = (_ success: Bool, _ newData: Bool) -> Void
+
+public class DefaultTempUnprotectedSitesDataService: TempUnprotectedSitesDataService {
+    
+    struct Paths {
+        static let unprotectedSites = "/contentblocking/trackers-whitelist-temporary.txt"
+    }
+    
+    private let apiRequest: APIRequest.Factory
+    private var tempUnprotectedSitesDataServiceStore: TempUnprotectedSitesDataServiceStore
+    
+    public init(apiRequest: @escaping APIRequest.Factory = { DefaultAPIRequest(baseUrl: .standard) },
+                tempUnprotectedSitesDataServiceStore: TempUnprotectedSitesDataServiceStore = TempUnprotectedSitesDataServiceUserDefaults()) {
+
+        self.apiRequest = apiRequest
+        self.tempUnprotectedSitesDataServiceStore = tempUnprotectedSitesDataServiceStore
+    }
+    
+    public func updateData(completion: @escaping TempUnprotectedSitesDataCompletion) {
+        os_log("Temp unprotected sites update starting", log: generalLog)
+        
+        apiRequest().get(Paths.unprotectedSites, withParams: nil) { data, response, error in
+            
+            if let error = error {
+                os_log("Temp unprotected sites request failed with error %{private}s", log: generalLog, type: .error, error.localizedDescription)
+                completion(false, false)
+                return
+            }
+            
+            guard let data = data else {
+                os_log("Temp unprotected sites request returned with no data", log: generalLog, type: .error)
+                completion(false, false)
+                return
+            }
+            
+            let newData = self.tempUnprotectedSitesDataServiceStore.etag != response?.strongEtag()
+            guard newData else {
+                os_log("Temp unprotected sites request returned with cached data, etag: %{public}s", log: generalLog, type: .default,
+                       self.tempUnprotectedSitesDataServiceStore.etag ?? "unknown")
+                completion(true, false)
+                return
+            }
+            
+            guard self.persist(data: data) else {
+                completion(false, true)
+                return
+            }
+
+            self.tempUnprotectedSitesDataServiceStore.etag = response?.strongEtag()
+            os_log("Temp unprotected sites new data with etag: %{public}s", log: generalLog, type: .default,
+                   self.tempUnprotectedSitesDataServiceStore.etag ?? "unknown")
+            completion(true, true)
+        }
+    }
+    
+    private func persist(data: Data) -> Bool {
+        let url = TempUnprotectedSitesDataLocation.dataUrl
+        do {
+            try data.write(to: url, options: .atomic)
+            os_log("Temp unprotected sites update persisted to %{public}s", log: generalLog, type: .default, url.absoluteString)
+            return true
+        } catch {
+            os_log("Temp unprotected sites data failed to persist to %{public}s %{public}s", log: generalLog, type: .error,
+                   url.absoluteString,
+                   error.localizedDescription)
+            return false
+        }
+    }
+}
+
+public protocol TempUnprotectedSitesDataServiceStore {
+    var etag: String? { get set }
+}
+
+public class TempUnprotectedSitesDataServiceUserDefaults: TempUnprotectedSitesDataServiceStore {
+    
+    private struct Key {
+        static var etag = "com.duckduckgo.tempunprotectedsitesservice.etag"
+    }
+    
+    private let userDefaults: UserDefaults
+    
+    public init(userDefaults: UserDefaults = UserDefaults(suiteName: TempUnprotectedSitesDataLocation.groupName)!) {
+        self.userDefaults = userDefaults
+    }
+    
+    public var etag: String? {
+        get {
+            return userDefaults.string(forKey: Key.etag)
+        }
+        set(etag) {
+            userDefaults.set(etag, forKey: Key.etag)
+        }
+    }
+}
diff --git a/TrackerBlockingFramework/TempWhitelistDataService.swift b/TrackerBlockingFramework/TempWhitelistDataService.swift
deleted file mode 100644
index 43caf8a..0000000
--- a/TrackerBlockingFramework/TempWhitelistDataService.swift
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-//  TempWhitelistDataService.swift
-//  TrackerBlocking
-//
-//  Copyright © 2019 DuckDuckGo. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-import Foundation
-import Core
-import os
-
-public protocol TempWhitelistDataService {
-
-    func updateData(completion: @escaping TempWhitelistDataCompletion)
-}
-
-public typealias TempWhitelistDataCompletion = (_ success: Bool, _ newData: Bool) -> Void
-
-public class DefaultTempWhitelistDataService: TempWhitelistDataService {
-    
-    struct Paths {
-        static let whitelist = "/contentblocking/trackers-whitelist-temporary.txt"
-    }
-    
-    private let apiRequest: APIRequest.Factory
-    private var tempWhitelistDataServiceStore: TempWhitelistDataServiceStore
-    
-    public init(apiRequest: @escaping APIRequest.Factory = { DefaultAPIRequest(baseUrl: .standard) },
-                tempWhitelistDataServiceStore: TempWhitelistDataServiceStore = TempWhitelistDataServiceUserDefaults()) {
-
-        self.apiRequest = apiRequest
-        self.tempWhitelistDataServiceStore = tempWhitelistDataServiceStore
-    }
-    
-    public func updateData(completion: @escaping TempWhitelistDataCompletion) {
-        os_log("Temp whitelist update starting", log: generalLog)
-        
-        apiRequest().get(Paths.whitelist, withParams: nil) { data, response, error in
-            
-            if let error = error {
-                os_log("Temp whitelist request failed with error %{private}s", log: generalLog, type: .error, error.localizedDescription)
-                completion(false, false)
-                return
-            }
-            
-            guard let data = data else {
-                os_log("Temp whitelist request returned with no data", log: generalLog, type: .error)
-                completion(false, false)
-                return
-            }
-            
-            let newData = self.tempWhitelistDataServiceStore.etag != response?.strongEtag()
-            guard newData else {
-                os_log("Temp whitelist request returned with cached data, etag: %{public}s", log: generalLog, type: .default,
-                       self.tempWhitelistDataServiceStore.etag ?? "unknown")
-                completion(true, false)
-                return
-            }
-            
-            guard self.persist(data: data) else {
-                completion(false, true)
-                return
-            }
-
-            self.tempWhitelistDataServiceStore.etag = response?.strongEtag()
-            os_log("Temp whitelist new data with etag: %{public}s", log: generalLog, type: .default,
-                   self.tempWhitelistDataServiceStore.etag ?? "unknown")
-            completion(true, true)
-        }
-    }
-    
-    private func persist(data: Data) -> Bool {
-        let url = TempWhitelistDataLocation.dataUrl
-        do {
-            try data.write(to: url, options: .atomic)
-            os_log("Temp whitelist update persisted to %{public}s", log: generalLog, type: .default, url.absoluteString)
-            return true
-        } catch {
-            os_log("Temp whitelist data failed to persist to %{public}s %{public}s", log: generalLog, type: .error,
-                   url.absoluteString,
-                   error.localizedDescription)
-            return false
-        }
-    }
-}
-
-public protocol TempWhitelistDataServiceStore {
-    var etag: String? { get set }
-}
-
-public class TempWhitelistDataServiceUserDefaults: TempWhitelistDataServiceStore {
-    
-    private struct Key {
-        static var etag = "com.duckduckgo.tempwhitelistservice.etag"
-    }
-    
-    private let userDefaults: UserDefaults
-    
-    public init(userDefaults: UserDefaults = UserDefaults(suiteName: TempWhitelistDataLocation.groupName)!) {
-        self.userDefaults = userDefaults
-    }
-    
-    public var etag: String? {
-        get {
-            return userDefaults.string(forKey: Key.etag)
-        }
-        set(etag) {
-            userDefaults.set(etag, forKey: Key.etag)
-        }
-    }
-}
diff --git a/TrackerBlockingFramework/TrustedSitesManager.swift b/TrackerBlockingFramework/TrustedSitesManager.swift
index 5230993..6fac55e 100644
--- a/TrackerBlockingFramework/TrustedSitesManager.swift
+++ b/TrackerBlockingFramework/TrustedSitesManager.swift
@@ -33,7 +33,7 @@ public protocol TrustedSitesManager {
     func addDomain(_ domain: String)
     func addDomain(forUrl url: URL)
     func allDomains() -> [String]
-    func whitelistedDomains() -> [String]
+    func unprotectedDomains() -> [String]
     func removeDomain(at index: Int)
     func removeDomain(forUrl url: URL)
     func isTrusted(url: URL) -> Bool
@@ -75,15 +75,15 @@ public class DefaultTrustedSitesManager: TrustedSitesManager {
     
     private let blockerListManager: BlockerListManager.Factory
     private let userDefaults: UserDefaults?
-    private let tempWhitelistUrl: URL
+    private let tempUnprotectedSitesUrl: URL
 
     public init(blockerListManager: @escaping BlockerListManager.Factory,
-                userDefaults: UserDefaults? = UserDefaults(suiteName: TempWhitelistDataLocation.groupName),
-                tempWhitelistUrl: URL = TempWhitelistDataLocation.dataUrl) {
+                userDefaults: UserDefaults? = UserDefaults(suiteName: TempUnprotectedSitesDataLocation.groupName),
+                tempUnprotectedSitesUrl: URL = TempUnprotectedSitesDataLocation.dataUrl) {
         
         self.blockerListManager = blockerListManager
         self.userDefaults = userDefaults
-        self.tempWhitelistUrl = tempWhitelistUrl
+        self.tempUnprotectedSitesUrl = tempUnprotectedSitesUrl
     }
     
     public func addDomain(_ domain: String) {
@@ -108,13 +108,13 @@ public class DefaultTrustedSitesManager: TrustedSitesManager {
         return domains
     }
     
-    public func whitelistedDomains() -> [String] {
-        guard let whitelist = try? String(contentsOf: tempWhitelistUrl) else {
-            os_log("Failed to load temporary whitelist from %{public}s", log: generalLog, tempWhitelistUrl.absoluteString)
+    public func unprotectedDomains() -> [String] {
+        guard let unprotectedDomains = try? String(contentsOf: tempUnprotectedSitesUrl) else {
+            os_log("Failed to load temporary unprotected domains from %{public}s", log: generalLog, tempUnprotectedSitesUrl.absoluteString)
             return []
         }
 
-        return whitelist.components(separatedBy: "\n").compactMap {
+        return unprotectedDomains.components(separatedBy: "\n").compactMap {
             let trimmed = $0.trimmingCharacters(in: .whitespaces)
             return trimmed.isEmpty ? nil : trimmed
         }
@@ -154,12 +154,12 @@ public class DefaultTrustedSitesManager: TrustedSitesManager {
  
 }
 
-public struct TempWhitelistDataLocation {
+public struct TempUnprotectedSitesDataLocation {
     
     public static var groupName = "group.com.duckduckgo.TrustedSites"
     
     public static var dataUrl: URL {
-        return containerUrl.appendingPathComponent("temporary-whitelist").appendingPathExtension("txt")
+        return containerUrl.appendingPathComponent("temporary-unprotected-sites").appendingPathExtension("txt")
     }
     
     static private var containerUrl: URL {
diff --git a/UnitTests/BlockerListManagerTests.swift b/UnitTests/BlockerListManagerTests.swift
index 4a31fd2..3ef8669 100644
--- a/UnitTests/BlockerListManagerTests.swift
+++ b/UnitTests/BlockerListManagerTests.swift
@@ -35,13 +35,13 @@ class BlockerListManagerTests: XCTestCase {
         UserDefaults(suiteName: Constants.suiteName)?.removePersistentDomain(forName: Constants.suiteName)
     }
         
-    func testWhenWhitelistedDomainsArePresentThenGeneratedRulesContainThem() {
+    func testWhenUnprotectedDomainsArePresentThenGeneratedRulesContainThem() {
         
         let trackers = [
             "Google": KnownTracker(domain: "google.com", defaultAction: .block, owner: nil, prevalence: nil, subdomains: nil, rules: nil)
         ]
         
-        trustedSitesManager._whitelistedDomains = ["domain1", "domain2"]
+        trustedSitesManager._unprotectedDomains = ["domain1", "domain2"]
         trackerDataManager.trackerData = TrackerData(trackers: trackers, entities: [:], domains: [:])
         
         let url = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString).appendingPathExtension("json")
diff --git a/UnitTests/ContentBlockerRulesBuilderTests.swift b/UnitTests/ContentBlockerRulesBuilderTests.swift
index bbf9d8e..301832e 100644
--- a/UnitTests/ContentBlockerRulesBuilderTests.swift
+++ b/UnitTests/ContentBlockerRulesBuilderTests.swift
@@ -323,7 +323,7 @@ class ContentBlockerRulesBuilderTests: XCTestCase {
     }
     // swiftlint:enable line_length
     
-    func testWhenTrackerHasWhitelistAdditionalIgnorePreviousRuleCreatedForSpecifiedDomainsOnly() {
+    func testWhenTrackerHasUnprotectedSitesAdditionalIgnorePreviousRuleCreatedForSpecifiedDomainsOnly() {
         
         let facebook = ["Facebook": KnownTracker.build(domain: "facebook.com", defaultAction: .block) ]
         
diff --git a/UnitTests/SyncRunnerTests.swift b/UnitTests/SyncRunnerTests.swift
index 127ed8f..d146730 100644
--- a/UnitTests/SyncRunnerTests.swift
+++ b/UnitTests/SyncRunnerTests.swift
@@ -17,7 +17,7 @@ class SyncRunnerTests: XCTestCase {
     func testWhenServiceReturnsSuccessWithNewDataThenCompletionSucceeds() {
         let expect = expectation(description: "When service succeeds, response in completion is true")
         let testee = SyncRunner(trackerDataService: MockDataService(success: true, newData: true),
-                                tempWhitelistDataService: MockDataService(success: true, newData: true))
+                                tempUnprotectedSitesDataService: MockDataService(success: true, newData: true))
         
         testee.sync { success  in
             XCTAssertTrue(success)
@@ -29,7 +29,7 @@ class SyncRunnerTests: XCTestCase {
     func testWhenServiceReturnsSuccessWithoutNewDataThenCompletionSucceeds() {
         let expect = expectation(description: "When service succeeds, response in completion is true")
         let testee = SyncRunner(trackerDataService: MockDataService(success: true, newData: false),
-                                tempWhitelistDataService: MockDataService(success: true, newData: true))
+                                tempUnprotectedSitesDataService: MockDataService(success: true, newData: true))
         
         testee.sync { success  in
             XCTAssertTrue(success)
@@ -41,7 +41,7 @@ class SyncRunnerTests: XCTestCase {
     func testWhenReturnsFailureWithoutNewDataThenCompletionFails() {
         let expect = expectation(description: "When service fails, response in completion is false")
         let testee = SyncRunner(trackerDataService: MockDataService(success: false, newData: false),
-                                tempWhitelistDataService: MockDataService(success: true, newData: true))
+                                tempUnprotectedSitesDataService: MockDataService(success: true, newData: true))
         testee.sync { success  in
             XCTAssertFalse(success)
             expect.fulfill()
@@ -52,7 +52,7 @@ class SyncRunnerTests: XCTestCase {
     func testWhenServiceReturnsFailureWithNewDataThenCompletionFails() {
         let expect = expectation(description: "When service fails, response in completion is false")
         let testee = SyncRunner(trackerDataService: MockDataService(success: false, newData: true),
-                                tempWhitelistDataService: MockDataService(success: true, newData: true))
+                                tempUnprotectedSitesDataService: MockDataService(success: true, newData: true))
         testee.sync { success  in
             XCTAssertFalse(success)
             expect.fulfill()
@@ -60,7 +60,7 @@ class SyncRunnerTests: XCTestCase {
         waitForExpectations(timeout: 1.0, handler: nil)
     }
     
-    class MockDataService: TrackerDataService, TempWhitelistDataService {
+    class MockDataService: TrackerDataService, TempUnprotectedSitesDataService {
         
         let success: Bool
         let newData: Bool
diff --git a/UnitTests/TempWhitelistDataServiceUserDefaultsTests.swift b/UnitTests/TempUnprotectedSitesDataServiceUserDefaultsTests.swift
similarity index 75%
rename from UnitTests/TempWhitelistDataServiceUserDefaultsTests.swift
rename to UnitTests/TempUnprotectedSitesDataServiceUserDefaultsTests.swift
index faab5b4..8bb4e14 100644
--- a/UnitTests/TempWhitelistDataServiceUserDefaultsTests.swift
+++ b/UnitTests/TempUnprotectedSitesDataServiceUserDefaultsTests.swift
@@ -1,5 +1,5 @@
 //
-//  TempWhitelistDataServiceUserDefaultsTests.swift
+//  TempUnprotectedSitesDataServiceUserDefaultsTests.swift
 //  UnitTests
 //
 //  Copyright © 2019 DuckDuckGo. All rights reserved.
@@ -22,7 +22,7 @@ import XCTest
 
 @testable import TrackerBlocking
 
-class TempWhitelistDataServiceUserDefaultsTests: XCTestCase {
+class TempUnprotectedSitesDataServiceUserDefaultsTests: XCTestCase {
     
     let testGroupName = "test"
     
@@ -31,12 +31,12 @@ class TempWhitelistDataServiceUserDefaultsTests: XCTestCase {
     }
 
     func testWhenInitializedThenEtagIsNil() {
-        let userDefaults = TempWhitelistDataServiceUserDefaults(userDefaults: UserDefaults(suiteName: testGroupName)!)
+        let userDefaults = TempUnprotectedSitesDataServiceUserDefaults(userDefaults: UserDefaults(suiteName: testGroupName)!)
         XCTAssertNil(userDefaults.etag)
     }
     
     func testWhenEtagIsSetThenItIsPersisted() {
-        let userDefaults = TempWhitelistDataServiceUserDefaults(userDefaults: UserDefaults(suiteName: testGroupName)!)
+        let userDefaults = TempUnprotectedSitesDataServiceUserDefaults(userDefaults: UserDefaults(suiteName: testGroupName)!)
         let etag = "abcd"
         userDefaults.etag = etag
         XCTAssertEqual(etag, userDefaults.etag)
diff --git a/UnitTests/TrustedSitesManagerTests.swift b/UnitTests/TrustedSitesManagerTests.swift
index 0c48e9e..a5106c5 100644
--- a/UnitTests/TrustedSitesManagerTests.swift
+++ b/UnitTests/TrustedSitesManagerTests.swift
@@ -51,19 +51,20 @@ class TrackerBlockingTests: XCTestCase {
         XCTAssertEqual(["test1"], userDefaults?.value(forKey: DefaultTrustedSitesManager.Keys.domains) as? [String])
     }
     
-    func testWhitelistReadFromUrl() throws {
+    func testUnprotectedDomainsReadFromUrl() throws {
         
-        let tempWhitelistLocation = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString).appendingPathExtension("txt")
+        let tempUnprotectedSitesLocation =
+            FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString).appendingPathExtension("txt")
         let domains = ["domain1", "domain2"].joined(separator: "\n")
-        guard FileManager.default.createFile(atPath: tempWhitelistLocation.path, contents: domains.data(using: .utf8), attributes: nil) else {
-            XCTFail("Failed to write to \(tempWhitelistLocation.path)")
+        guard FileManager.default.createFile(atPath: tempUnprotectedSitesLocation.path, contents: domains.data(using: .utf8), attributes: nil) else {
+            XCTFail("Failed to write to \(tempUnprotectedSitesLocation.path)")
             return
         }
         
         let manager = DefaultTrustedSitesManager(blockerListManager: blockerListManagerFactory,
-                                                 tempWhitelistUrl: tempWhitelistLocation)
+                                                 tempUnprotectedSitesUrl: tempUnprotectedSitesLocation)
 
-        XCTAssertEqual(["domain1", "domain2"], manager.whitelistedDomains())
+        XCTAssertEqual(["domain1", "domain2"], manager.unprotectedDomains())
         
     }
     
diff --git a/UnitTests/mocks.swift b/UnitTests/mocks.swift
index 31ddc6a..4812fb6 100644
--- a/UnitTests/mocks.swift
+++ b/UnitTests/mocks.swift
@@ -58,7 +58,7 @@ struct MockTrustedSitesManager: TrustedSitesManager {
     var lastChangedDomain: String?
 
     // swiftlint:disable identifier_name
-    var _whitelistedDomains = [String]()
+    var _unprotectedDomains = [String]()
     // swiftlint:enable identifier_name
 
     func addDomain(_ domain: String) {
@@ -73,8 +73,8 @@ struct MockTrustedSitesManager: TrustedSitesManager {
         return []
     }
     
-    func whitelistedDomains() -> [String] {
-        return _whitelistedDomains
+    func unprotectedDomains() -> [String] {
+        return _unprotectedDomains
     }
     
     func clear() {