From 54be9ae32c0ffebdc19d23062a28128f16c89891 Mon Sep 17 00:00:00 2001
From: Morgan Chen <morganchen12@gmail.com>
Date: Thu, 3 Nov 2016 15:37:32 -0700
Subject: [PATCH 1/2] rename objc classes to use FUI prefix in sample

---
 .../project.pbxproj                           | 104 +++++++++---------
 .../Base.lproj/Main.storyboard                |  76 ++++++-------
 .../{AppDelegate.h => FUIAppDelegate.h}       |   4 +-
 .../{AppDelegate.m => FUIAppDelegate.m}       |   4 +-
 .../{FIRSample.h => FUISample.h}              |   6 +-
 .../{FIRSample.m => FUISample.m}              |  10 +-
 ...ontroller.h => FUISamplesViewController.h} |   2 +-
 ...ontroller.m => FUISamplesViewController.m} |  24 ++--
 .../{FIRChatMessage.h => FUIChatMessage.h}    |   2 +-
 .../{FIRChatMessage.m => FUIChatMessage.m}    |   4 +-
 ...ataSource.h => FUIChatMessageDataSource.h} |   4 +-
 ...ataSource.m => FUIChatMessageDataSource.m} |   4 +-
 ...ewCell.h => FUIChatMessageTableViewCell.h} |   2 +-
 ...ewCell.m => FUIChatMessageTableViewCell.m} |   4 +-
 ...ll.xib => FUIChatMessageTableViewCell.xib} |   6 +-
 ...ewController.h => FUIChatViewController.h} |   4 +-
 ...ewController.m => FUIChatViewController.m} |  18 +--
 ...ontroller.h => FUIStorageViewController.h} |   2 +-
 ...ontroller.m => FUIStorageViewController.m} |   6 +-
 samples/objc/FirebaseUI-demo-objc/main.m      |   4 +-
 20 files changed, 145 insertions(+), 145 deletions(-)
 rename samples/objc/FirebaseUI-demo-objc/{AppDelegate.h => FUIAppDelegate.h} (90%)
 rename samples/objc/FirebaseUI-demo-objc/{AppDelegate.m => FUIAppDelegate.m} (95%)
 rename samples/objc/FirebaseUI-demo-objc/{FIRSample.h => FUISample.h} (94%)
 rename samples/objc/FirebaseUI-demo-objc/{FIRSample.m => FUISample.m} (89%)
 rename samples/objc/FirebaseUI-demo-objc/{FIRSamplesViewController.h => FUISamplesViewController.h} (91%)
 rename samples/objc/FirebaseUI-demo-objc/{FIRSamplesViewController.m => FUISamplesViewController.m} (86%)
 rename samples/objc/FirebaseUI-demo-objc/Samples/Chat/{FIRChatMessage.h => FUIChatMessage.h} (95%)
 rename samples/objc/FirebaseUI-demo-objc/Samples/Chat/{FIRChatMessage.m => FUIChatMessage.m} (94%)
 rename samples/objc/FirebaseUI-demo-objc/Samples/Chat/{FIRChatMessageDataSource.h => FUIChatMessageDataSource.h} (84%)
 rename samples/objc/FirebaseUI-demo-objc/Samples/Chat/{FIRChatMessageDataSource.m => FUIChatMessageDataSource.m} (92%)
 rename samples/objc/FirebaseUI-demo-objc/Samples/Chat/{FIRChatMessageTableViewCell.h => FUIChatMessageTableViewCell.h} (93%)
 rename samples/objc/FirebaseUI-demo-objc/Samples/Chat/{FIRChatMessageTableViewCell.m => FUIChatMessageTableViewCell.m} (89%)
 rename samples/objc/FirebaseUI-demo-objc/Samples/Chat/{FIRChatMessageTableViewCell.xib => FUIChatMessageTableViewCell.xib} (97%)
 rename samples/objc/FirebaseUI-demo-objc/Samples/Chat/{FIRChatViewController.h => FUIChatViewController.h} (88%)
 rename samples/objc/FirebaseUI-demo-objc/Samples/Chat/{FIRChatViewController.m => FUIChatViewController.m} (89%)
 rename samples/objc/FirebaseUI-demo-objc/Samples/Storage/{FIRStorageViewController.h => FUIStorageViewController.h} (92%)
 rename samples/objc/FirebaseUI-demo-objc/Samples/Storage/{FIRStorageViewController.m => FUIStorageViewController.m} (97%)

diff --git a/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj b/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj
index 156383c04c3..fd51a4ffd9a 100644
--- a/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj
+++ b/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj
@@ -8,7 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		8D7D5DC11D9D9536006C1857 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8D7D5DC01D9D9536006C1857 /* GoogleService-Info.plist */; };
-		8D7F86B51D9DAA0100C2A122 /* FIRStorageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D7F86B41D9DAA0100C2A122 /* FIRStorageViewController.m */; };
+		8D7F86B51D9DAA0100C2A122 /* FUIStorageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D7F86B41D9DAA0100C2A122 /* FUIStorageViewController.m */; };
 		C329B1B21DAD6E5100059A13 /* FIRCustomEmailEntryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C329B1B01DAD6E5100059A13 /* FIRCustomEmailEntryViewController.m */; };
 		C329B1B31DAD6E5100059A13 /* FIRCustomEmailEntryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C329B1B11DAD6E5100059A13 /* FIRCustomEmailEntryViewController.xib */; };
 		C34FC1FE1DB17C8B009ED69A /* FIRCustomPasswordVerificationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C34FC1FC1DB17C8B009ED69A /* FIRCustomPasswordVerificationViewController.m */; };
@@ -23,15 +23,15 @@
 		C3A8B7CB1DB1454D00CDF0ED /* FIRCustomPasswordRecoveryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3A8B7C91DB1454D00CDF0ED /* FIRCustomPasswordRecoveryViewController.m */; };
 		C3A8B7CC1DB1454D00CDF0ED /* FIRCustomPasswordRecoveryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C3A8B7CA1DB1454D00CDF0ED /* FIRCustomPasswordRecoveryViewController.xib */; };
 		C3AC675E1D81FE6B00FC956D /* FIRAuthViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC67531D81FE6B00FC956D /* FIRAuthViewController.m */; };
-		C3AC675F1D81FE6B00FC956D /* FIRChatMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC67561D81FE6B00FC956D /* FIRChatMessage.m */; };
-		C3AC67601D81FE6B00FC956D /* FIRChatMessageDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC67581D81FE6B00FC956D /* FIRChatMessageDataSource.m */; };
-		C3AC67611D81FE6B00FC956D /* FIRChatMessageTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC675A1D81FE6B00FC956D /* FIRChatMessageTableViewCell.m */; };
-		C3AC67621D81FE6B00FC956D /* FIRChatMessageTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = C3AC675B1D81FE6B00FC956D /* FIRChatMessageTableViewCell.xib */; };
-		C3AC67631D81FE6B00FC956D /* FIRChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC675D1D81FE6B00FC956D /* FIRChatViewController.m */; };
-		C3AC67661D82002F00FC956D /* FIRSample.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC67651D82002F00FC956D /* FIRSample.m */; };
-		C3F23ED01D80F58A0020509F /* FIRSamplesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3F23ECF1D80F58A0020509F /* FIRSamplesViewController.m */; };
+		C3AC675F1D81FE6B00FC956D /* FUIChatMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC67561D81FE6B00FC956D /* FUIChatMessage.m */; };
+		C3AC67601D81FE6B00FC956D /* FUIChatMessageDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC67581D81FE6B00FC956D /* FUIChatMessageDataSource.m */; };
+		C3AC67611D81FE6B00FC956D /* FUIChatMessageTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC675A1D81FE6B00FC956D /* FUIChatMessageTableViewCell.m */; };
+		C3AC67621D81FE6B00FC956D /* FUIChatMessageTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = C3AC675B1D81FE6B00FC956D /* FUIChatMessageTableViewCell.xib */; };
+		C3AC67631D81FE6B00FC956D /* FUIChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC675D1D81FE6B00FC956D /* FUIChatViewController.m */; };
+		C3AC67661D82002F00FC956D /* FUISample.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC67651D82002F00FC956D /* FUISample.m */; };
+		C3F23ED01D80F58A0020509F /* FUISamplesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3F23ECF1D80F58A0020509F /* FUISamplesViewController.m */; };
 		D81A05F61B86A78700498183 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D81A05F51B86A78700498183 /* main.m */; };
-		D81A05F91B86A78700498183 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D81A05F81B86A78700498183 /* AppDelegate.m */; };
+		D81A05F91B86A78700498183 /* FUIAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D81A05F81B86A78700498183 /* FUIAppDelegate.m */; };
 		D81A05FF1B86A78700498183 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D81A05FD1B86A78700498183 /* Main.storyboard */; };
 		D81A06011B86A78700498183 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D81A06001B86A78700498183 /* Images.xcassets */; };
 		D81A06041B86A78700498183 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = D81A06021B86A78700498183 /* LaunchScreen.xib */; };
@@ -39,8 +39,8 @@
 
 /* Begin PBXFileReference section */
 		8D7D5DC01D9D9536006C1857 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
-		8D7F86B31D9DAA0100C2A122 /* FIRStorageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FIRStorageViewController.h; path = Storage/FIRStorageViewController.h; sourceTree = "<group>"; };
-		8D7F86B41D9DAA0100C2A122 /* FIRStorageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FIRStorageViewController.m; path = Storage/FIRStorageViewController.m; sourceTree = "<group>"; };
+		8D7F86B31D9DAA0100C2A122 /* FUIStorageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FUIStorageViewController.h; path = Storage/FUIStorageViewController.h; sourceTree = "<group>"; };
+		8D7F86B41D9DAA0100C2A122 /* FUIStorageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FUIStorageViewController.m; path = Storage/FUIStorageViewController.m; sourceTree = "<group>"; };
 		C329B1AF1DAD6E5100059A13 /* FIRCustomEmailEntryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRCustomEmailEntryViewController.h; sourceTree = "<group>"; };
 		C329B1B01DAD6E5100059A13 /* FIRCustomEmailEntryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRCustomEmailEntryViewController.m; sourceTree = "<group>"; };
 		C329B1B11DAD6E5100059A13 /* FIRCustomEmailEntryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FIRCustomEmailEntryViewController.xib; sourceTree = "<group>"; };
@@ -63,24 +63,24 @@
 		C3A8B7CA1DB1454D00CDF0ED /* FIRCustomPasswordRecoveryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FIRCustomPasswordRecoveryViewController.xib; sourceTree = "<group>"; };
 		C3AC67521D81FE6B00FC956D /* FIRAuthViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRAuthViewController.h; sourceTree = "<group>"; };
 		C3AC67531D81FE6B00FC956D /* FIRAuthViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRAuthViewController.m; sourceTree = "<group>"; };
-		C3AC67551D81FE6B00FC956D /* FIRChatMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRChatMessage.h; sourceTree = "<group>"; };
-		C3AC67561D81FE6B00FC956D /* FIRChatMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRChatMessage.m; sourceTree = "<group>"; };
-		C3AC67571D81FE6B00FC956D /* FIRChatMessageDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRChatMessageDataSource.h; sourceTree = "<group>"; };
-		C3AC67581D81FE6B00FC956D /* FIRChatMessageDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRChatMessageDataSource.m; sourceTree = "<group>"; };
-		C3AC67591D81FE6B00FC956D /* FIRChatMessageTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRChatMessageTableViewCell.h; sourceTree = "<group>"; };
-		C3AC675A1D81FE6B00FC956D /* FIRChatMessageTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRChatMessageTableViewCell.m; sourceTree = "<group>"; };
-		C3AC675B1D81FE6B00FC956D /* FIRChatMessageTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FIRChatMessageTableViewCell.xib; sourceTree = "<group>"; };
-		C3AC675C1D81FE6B00FC956D /* FIRChatViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRChatViewController.h; sourceTree = "<group>"; };
-		C3AC675D1D81FE6B00FC956D /* FIRChatViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRChatViewController.m; sourceTree = "<group>"; };
-		C3AC67641D82002F00FC956D /* FIRSample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRSample.h; sourceTree = "<group>"; };
-		C3AC67651D82002F00FC956D /* FIRSample.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRSample.m; sourceTree = "<group>"; };
-		C3F23ECE1D80F5890020509F /* FIRSamplesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRSamplesViewController.h; sourceTree = "<group>"; };
-		C3F23ECF1D80F58A0020509F /* FIRSamplesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRSamplesViewController.m; sourceTree = "<group>"; };
+		C3AC67551D81FE6B00FC956D /* FUIChatMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUIChatMessage.h; sourceTree = "<group>"; };
+		C3AC67561D81FE6B00FC956D /* FUIChatMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUIChatMessage.m; sourceTree = "<group>"; };
+		C3AC67571D81FE6B00FC956D /* FUIChatMessageDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUIChatMessageDataSource.h; sourceTree = "<group>"; };
+		C3AC67581D81FE6B00FC956D /* FUIChatMessageDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUIChatMessageDataSource.m; sourceTree = "<group>"; };
+		C3AC67591D81FE6B00FC956D /* FUIChatMessageTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUIChatMessageTableViewCell.h; sourceTree = "<group>"; };
+		C3AC675A1D81FE6B00FC956D /* FUIChatMessageTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUIChatMessageTableViewCell.m; sourceTree = "<group>"; };
+		C3AC675B1D81FE6B00FC956D /* FUIChatMessageTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FUIChatMessageTableViewCell.xib; sourceTree = "<group>"; };
+		C3AC675C1D81FE6B00FC956D /* FUIChatViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUIChatViewController.h; sourceTree = "<group>"; };
+		C3AC675D1D81FE6B00FC956D /* FUIChatViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUIChatViewController.m; sourceTree = "<group>"; };
+		C3AC67641D82002F00FC956D /* FUISample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUISample.h; sourceTree = "<group>"; };
+		C3AC67651D82002F00FC956D /* FUISample.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUISample.m; sourceTree = "<group>"; };
+		C3F23ECE1D80F5890020509F /* FUISamplesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUISamplesViewController.h; sourceTree = "<group>"; };
+		C3F23ECF1D80F58A0020509F /* FUISamplesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUISamplesViewController.m; sourceTree = "<group>"; };
 		D81A05F01B86A78700498183 /* FirebaseUI-demo-objc.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "FirebaseUI-demo-objc.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		D81A05F41B86A78700498183 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		D81A05F51B86A78700498183 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		D81A05F71B86A78700498183 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
-		D81A05F81B86A78700498183 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		D81A05F71B86A78700498183 /* FUIAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUIAppDelegate.h; sourceTree = "<group>"; };
+		D81A05F81B86A78700498183 /* FUIAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUIAppDelegate.m; sourceTree = "<group>"; };
 		D81A05FE1B86A78700498183 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		D81A06001B86A78700498183 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		D81A06031B86A78700498183 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
@@ -100,8 +100,8 @@
 		8D7D5DC51D9DA075006C1857 /* Storage */ = {
 			isa = PBXGroup;
 			children = (
-				8D7F86B31D9DAA0100C2A122 /* FIRStorageViewController.h */,
-				8D7F86B41D9DAA0100C2A122 /* FIRStorageViewController.m */,
+				8D7F86B31D9DAA0100C2A122 /* FUIStorageViewController.h */,
+				8D7F86B41D9DAA0100C2A122 /* FUIStorageViewController.m */,
 			);
 			name = Storage;
 			sourceTree = "<group>";
@@ -148,15 +148,15 @@
 		C3AC67541D81FE6B00FC956D /* Chat */ = {
 			isa = PBXGroup;
 			children = (
-				C3AC67551D81FE6B00FC956D /* FIRChatMessage.h */,
-				C3AC67561D81FE6B00FC956D /* FIRChatMessage.m */,
-				C3AC67571D81FE6B00FC956D /* FIRChatMessageDataSource.h */,
-				C3AC67581D81FE6B00FC956D /* FIRChatMessageDataSource.m */,
-				C3AC67591D81FE6B00FC956D /* FIRChatMessageTableViewCell.h */,
-				C3AC675A1D81FE6B00FC956D /* FIRChatMessageTableViewCell.m */,
-				C3AC675B1D81FE6B00FC956D /* FIRChatMessageTableViewCell.xib */,
-				C3AC675C1D81FE6B00FC956D /* FIRChatViewController.h */,
-				C3AC675D1D81FE6B00FC956D /* FIRChatViewController.m */,
+				C3AC67551D81FE6B00FC956D /* FUIChatMessage.h */,
+				C3AC67561D81FE6B00FC956D /* FUIChatMessage.m */,
+				C3AC67571D81FE6B00FC956D /* FUIChatMessageDataSource.h */,
+				C3AC67581D81FE6B00FC956D /* FUIChatMessageDataSource.m */,
+				C3AC67591D81FE6B00FC956D /* FUIChatMessageTableViewCell.h */,
+				C3AC675A1D81FE6B00FC956D /* FUIChatMessageTableViewCell.m */,
+				C3AC675B1D81FE6B00FC956D /* FUIChatMessageTableViewCell.xib */,
+				C3AC675C1D81FE6B00FC956D /* FUIChatViewController.h */,
+				C3AC675D1D81FE6B00FC956D /* FUIChatViewController.m */,
 			);
 			path = Chat;
 			sourceTree = "<group>";
@@ -181,12 +181,12 @@
 		D81A05F21B86A78700498183 /* FirebaseUI-demo-objc */ = {
 			isa = PBXGroup;
 			children = (
-				D81A05F71B86A78700498183 /* AppDelegate.h */,
-				D81A05F81B86A78700498183 /* AppDelegate.m */,
-				C3F23ECE1D80F5890020509F /* FIRSamplesViewController.h */,
-				C3F23ECF1D80F58A0020509F /* FIRSamplesViewController.m */,
-				C3AC67641D82002F00FC956D /* FIRSample.h */,
-				C3AC67651D82002F00FC956D /* FIRSample.m */,
+				D81A05F71B86A78700498183 /* FUIAppDelegate.h */,
+				D81A05F81B86A78700498183 /* FUIAppDelegate.m */,
+				C3F23ECE1D80F5890020509F /* FUISamplesViewController.h */,
+				C3F23ECF1D80F58A0020509F /* FUISamplesViewController.m */,
+				C3AC67641D82002F00FC956D /* FUISample.h */,
+				C3AC67651D82002F00FC956D /* FUISample.m */,
 				C3AC67501D81FE6B00FC956D /* Samples */,
 				D81A05FD1B86A78700498183 /* Main.storyboard */,
 				D81A06001B86A78700498183 /* Images.xcassets */,
@@ -265,7 +265,7 @@
 				C3A8B7C21DAF073400CDF0ED /* FIRCustomPasswordSignInViewController.xib in Resources */,
 				D81A05FF1B86A78700498183 /* Main.storyboard in Resources */,
 				C34FC1FF1DB17C8B009ED69A /* FIRCustomPasswordVerificationViewController.xib in Resources */,
-				C3AC67621D81FE6B00FC956D /* FIRChatMessageTableViewCell.xib in Resources */,
+				C3AC67621D81FE6B00FC956D /* FUIChatMessageTableViewCell.xib in Resources */,
 				C3A8B7CC1DB1454D00CDF0ED /* FIRCustomPasswordRecoveryViewController.xib in Resources */,
 				D81A06041B86A78700498183 /* LaunchScreen.xib in Resources */,
 				D81A06011B86A78700498183 /* Images.xcassets in Resources */,
@@ -283,21 +283,21 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D81A05F91B86A78700498183 /* AppDelegate.m in Sources */,
+				D81A05F91B86A78700498183 /* FUIAppDelegate.m in Sources */,
 				C3A8B7CB1DB1454D00CDF0ED /* FIRCustomPasswordRecoveryViewController.m in Sources */,
 				C375CB181D935D1F002EECD3 /* FIRCustomAuthPickerViewController.m in Sources */,
 				C3A8B7C11DAF073400CDF0ED /* FIRCustomPasswordSignInViewController.m in Sources */,
 				C375CB1C1D943D5F002EECD3 /* FIRCustomAuthUIDelegate.m in Sources */,
 				C34FC1FE1DB17C8B009ED69A /* FIRCustomPasswordVerificationViewController.m in Sources */,
-				C3F23ED01D80F58A0020509F /* FIRSamplesViewController.m in Sources */,
-				C3AC67631D81FE6B00FC956D /* FIRChatViewController.m in Sources */,
-				C3AC67611D81FE6B00FC956D /* FIRChatMessageTableViewCell.m in Sources */,
-				C3AC67601D81FE6B00FC956D /* FIRChatMessageDataSource.m in Sources */,
+				C3F23ED01D80F58A0020509F /* FUISamplesViewController.m in Sources */,
+				C3AC67631D81FE6B00FC956D /* FUIChatViewController.m in Sources */,
+				C3AC67611D81FE6B00FC956D /* FUIChatMessageTableViewCell.m in Sources */,
+				C3AC67601D81FE6B00FC956D /* FUIChatMessageDataSource.m in Sources */,
 				C3A8B7C61DB027D200CDF0ED /* FIRCustomPasswordSignUpViewController.m in Sources */,
-				C3AC675F1D81FE6B00FC956D /* FIRChatMessage.m in Sources */,
+				C3AC675F1D81FE6B00FC956D /* FUIChatMessage.m in Sources */,
 				D81A05F61B86A78700498183 /* main.m in Sources */,
-				C3AC67661D82002F00FC956D /* FIRSample.m in Sources */,
-				8D7F86B51D9DAA0100C2A122 /* FIRStorageViewController.m in Sources */,
+				C3AC67661D82002F00FC956D /* FUISample.m in Sources */,
+				8D7F86B51D9DAA0100C2A122 /* FUIStorageViewController.m in Sources */,
 				C329B1B21DAD6E5100059A13 /* FIRCustomEmailEntryViewController.m in Sources */,
 				C3AC675E1D81FE6B00FC956D /* FIRAuthViewController.m in Sources */,
 			);
diff --git a/samples/objc/FirebaseUI-demo-objc/Base.lproj/Main.storyboard b/samples/objc/FirebaseUI-demo-objc/Base.lproj/Main.storyboard
index 9bf0a298e17..96f2ccf1efc 100644
--- a/samples/objc/FirebaseUI-demo-objc/Base.lproj/Main.storyboard
+++ b/samples/objc/FirebaseUI-demo-objc/Base.lproj/Main.storyboard
@@ -33,7 +33,7 @@
         <!--FirebaseUI Chat-->
         <scene sceneID="ufC-wZ-h7g">
             <objects>
-                <viewController storyboardIdentifier="ViewController" title="FirebaseUI Chat" useStoryboardIdentifierAsRestorationIdentifier="YES" id="vXZ-lx-hvc" customClass="FIRChatViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="ViewController" title="FirebaseUI Chat" useStoryboardIdentifierAsRestorationIdentifier="YES" id="vXZ-lx-hvc" customClass="FUIChatViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="jyV-Pf-zRb"/>
                         <viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>
@@ -78,28 +78,28 @@
         <!--FirebaseUI Demo-->
         <scene sceneID="kgy-Av-Wvg">
             <objects>
-                <tableViewController title="FirebaseUI Demo" id="S3Q-gf-8AQ" customClass="FIRSamplesViewController" sceneMemberID="viewController">
+                <tableViewController title="FirebaseUI Demo" id="S3Q-gf-8AQ" customClass="FUISamplesViewController" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="80" sectionHeaderHeight="28" sectionFooterHeight="28" id="WhE-Mc-Kss">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="FIRSampleCell" textLabel="cAY-q4-fwa" detailTextLabel="SPU-XD-Wjm" style="IBUITableViewCellStyleSubtitle" id="qVR-uJ-bhD">
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="FUISampleCell" textLabel="cAY-q4-fwa" detailTextLabel="SPU-XD-Wjm" style="IBUITableViewCellStyleSubtitle" id="qVR-uJ-bhD">
                                 <rect key="frame" x="0.0" y="92" width="375" height="80"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="qVR-uJ-bhD" id="xcz-xR-Hj5">
-                                    <frame key="frameInset" width="342" height="79"/>
+                                    <frame key="frameInset" width="342" height="79.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="cAY-q4-fwa">
-                                            <frame key="frameInset" minX="15" minY="23" width="32" height="20"/>
+                                            <frame key="frameInset" minX="15" minY="24" width="31.5" height="19.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SPU-XD-Wjm">
-                                            <frame key="frameInset" minX="15" minY="43" width="41" height="14"/>
+                                            <frame key="frameInset" minX="15" minY="43.5" width="40.5" height="13.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -135,14 +135,14 @@
                             <tableViewSection headerTitle="Settings" id="PRj-zg-0nr">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" textLabel="l96-xc-PHH" style="IBUITableViewCellStyleDefault" id="ORf-bf-Sq2">
-                                        <rect key="frame" x="0.0" y="56" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ORf-bf-Sq2" id="roJ-pJ-jY5">
-                                            <frame key="frameInset" width="375" height="43"/>
+                                            <frame key="frameInset" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Not Signed In" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="l96-xc-PHH">
-                                                    <frame key="frameInset" minX="15" width="345" height="43"/>
+                                                    <frame key="frameInset" minX="15" width="345" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -152,10 +152,10 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="1sh-pl-VVu">
-                                        <rect key="frame" x="0.0" y="100" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="99.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1sh-pl-VVu" id="cPB-dF-hTp">
-                                            <frame key="frameInset" width="375" height="43"/>
+                                            <frame key="frameInset" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Custom Authorization UI" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="YxK-c8-9q7">
@@ -179,10 +179,10 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="07x-ce-fv8">
-                                        <rect key="frame" x="0.0" y="144" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="143.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="07x-ce-fv8" id="gtc-zM-8Jl">
-                                            <frame key="frameInset" width="375" height="43"/>
+                                            <frame key="frameInset" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Custom Scopes" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="T07-wL-pGr">
@@ -206,14 +206,14 @@
                             <tableViewSection headerTitle="IDPs" id="PVw-r0-CZU">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" textLabel="bNY-j2-MJU" style="IBUITableViewCellStyleDefault" id="2Oh-0M-qfT">
-                                        <rect key="frame" x="0.0" y="245" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="243.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2Oh-0M-qfT" id="TvY-i4-8Zf">
-                                            <frame key="frameInset" width="375" height="43"/>
+                                            <frame key="frameInset" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Email" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bNY-j2-MJU">
-                                                    <frame key="frameInset" minX="15" width="345" height="43"/>
+                                                    <frame key="frameInset" minX="15" width="345" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -223,14 +223,14 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" indentationWidth="10" textLabel="uy2-M7-fjT" style="IBUITableViewCellStyleDefault" id="xWg-io-2Mh">
-                                        <rect key="frame" x="0.0" y="289" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="287.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xWg-io-2Mh" id="yTE-jh-CKv">
-                                            <frame key="frameInset" width="375" height="43"/>
+                                            <frame key="frameInset" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Google" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="uy2-M7-fjT">
-                                                    <frame key="frameInset" minX="15" width="345" height="43"/>
+                                                    <frame key="frameInset" minX="15" width="345" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -240,14 +240,14 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" indentationWidth="10" textLabel="VO0-E4-us7" style="IBUITableViewCellStyleDefault" id="UHh-u9-c6X">
-                                        <rect key="frame" x="0.0" y="333" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="331.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UHh-u9-c6X" id="kWa-iB-lBj">
-                                            <frame key="frameInset" width="375" height="43"/>
+                                            <frame key="frameInset" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Facebook" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VO0-E4-us7">
-                                                    <frame key="frameInset" minX="15" width="345" height="43"/>
+                                                    <frame key="frameInset" minX="15" width="345" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -257,14 +257,14 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" indentationWidth="10" textLabel="xVM-YB-XaA" style="IBUITableViewCellStyleDefault" id="6bt-FY-pRU">
-                                        <rect key="frame" x="0.0" y="377" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="375.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6bt-FY-pRU" id="8RC-g4-krD">
-                                            <frame key="frameInset" width="375" height="43"/>
+                                            <frame key="frameInset" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Twitter" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xVM-YB-XaA">
-                                                    <frame key="frameInset" minX="15" width="345" height="43"/>
+                                                    <frame key="frameInset" minX="15" width="345" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -278,10 +278,10 @@
                             <tableViewSection headerTitle="Name" id="0YA-IY-hOV">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="kCl-ip-jc2">
-                                        <rect key="frame" x="0.0" y="478" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="475.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="kCl-ip-jc2" id="dm4-D7-IWN">
-                                            <frame key="frameInset" width="375" height="43"/>
+                                            <frame key="frameInset" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -290,10 +290,10 @@
                             <tableViewSection headerTitle="Email" id="Y94-bQ-cWH">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="MCw-zF-UTn">
-                                        <rect key="frame" x="0.0" y="579" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="575.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="MCw-zF-UTn" id="ea1-oT-1Py">
-                                            <frame key="frameInset" width="375" height="43"/>
+                                            <frame key="frameInset" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -302,10 +302,10 @@
                             <tableViewSection headerTitle="UID" id="Yxe-jV-t3o">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="EWm-GE-IZV">
-                                        <rect key="frame" x="0.0" y="680" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="675.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="EWm-GE-IZV" id="ISG-G9-H8V">
-                                            <frame key="frameInset" width="375" height="43"/>
+                                            <frame key="frameInset" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -314,14 +314,14 @@
                             <tableViewSection headerTitle="Provider Access Token" id="E31-4c-QDa">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" textLabel="k9f-GH-UBQ" style="IBUITableViewCellStyleDefault" id="mdj-SS-dqJ">
-                                        <rect key="frame" x="0.0" y="781" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="775.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mdj-SS-dqJ" id="oCT-Ra-9l7">
-                                            <frame key="frameInset" width="375" height="43"/>
+                                            <frame key="frameInset" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="k9f-GH-UBQ">
-                                                    <frame key="frameInset" minX="15" width="345" height="43"/>
+                                                    <frame key="frameInset" minX="15" width="345" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -335,14 +335,14 @@
                             <tableViewSection headerTitle="Provider ID Token" id="GaU-wa-aFK">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" textLabel="M61-v5-jhZ" style="IBUITableViewCellStyleDefault" id="b45-X5-eC9">
-                                        <rect key="frame" x="0.0" y="882" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="875.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="b45-X5-eC9" id="ofC-qT-5cz">
-                                            <frame key="frameInset" width="375" height="43"/>
+                                            <frame key="frameInset" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="M61-v5-jhZ">
-                                                    <frame key="frameInset" minX="15" width="345" height="43"/>
+                                                    <frame key="frameInset" minX="15" width="345" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -387,7 +387,7 @@
         <!--Storage View Controller-->
         <scene sceneID="in8-Br-kNo">
             <objects>
-                <viewController storyboardIdentifier="FIRStorageViewController" id="Ne3-90-zlK" customClass="FIRStorageViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="FUIStorageViewController" id="Ne3-90-zlK" customClass="FUIStorageViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="sSp-ee-lWK"/>
                         <viewControllerLayoutGuide type="bottom" id="6on-da-65M"/>
diff --git a/samples/objc/FirebaseUI-demo-objc/AppDelegate.h b/samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.h
similarity index 90%
rename from samples/objc/FirebaseUI-demo-objc/AppDelegate.h
rename to samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.h
index 39548dac37b..830839b1dcb 100644
--- a/samples/objc/FirebaseUI-demo-objc/AppDelegate.h
+++ b/samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.h
@@ -16,8 +16,8 @@
 
 #import <UIKit/UIKit.h>
 
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
+@interface FUIAppDelegate : UIResponder <UIApplicationDelegate>
 
 @property (strong, nonatomic) UIWindow *window;
 
-@end
\ No newline at end of file
+@end
diff --git a/samples/objc/FirebaseUI-demo-objc/AppDelegate.m b/samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.m
similarity index 95%
rename from samples/objc/FirebaseUI-demo-objc/AppDelegate.m
rename to samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.m
index 7890fe40aef..5ab4a022e37 100644
--- a/samples/objc/FirebaseUI-demo-objc/AppDelegate.m
+++ b/samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.m
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-#import "AppDelegate.h"
+#import "FUIAppDelegate.h"
 
 @import Firebase;
 #import <Fabric/Fabric.h>
@@ -22,7 +22,7 @@
 #import <TwitterKit/Twitter.h>
 
 
-@implementation AppDelegate
+@implementation FUIAppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
   [Fabric with:@[[Twitter class]]];
diff --git a/samples/objc/FirebaseUI-demo-objc/FIRSample.h b/samples/objc/FirebaseUI-demo-objc/FUISample.h
similarity index 94%
rename from samples/objc/FirebaseUI-demo-objc/FIRSample.h
rename to samples/objc/FirebaseUI-demo-objc/FUISample.h
index 71f9a216c19..05da8b3d1be 100644
--- a/samples/objc/FirebaseUI-demo-objc/FIRSample.h
+++ b/samples/objc/FirebaseUI-demo-objc/FUISample.h
@@ -1,5 +1,5 @@
 //
-//  FIRSampleContainer.h
+//  FUISample.h
 //
 //  Copyright (c) 2016 Google Inc.
 //
@@ -21,7 +21,7 @@
 
 typedef UIViewController *(^FIRControllerBlock)();
 
-@interface FIRSample : NSObject
+@interface FUISample : NSObject
 
 + (instancetype)sampleWithTitle:(NSString *)title
               sampleDescription:(NSString *)description
@@ -32,4 +32,4 @@ typedef UIViewController *(^FIRControllerBlock)();
 @property (nonatomic, copy) FIRControllerBlock controllerBlock;
 
 
-@end
\ No newline at end of file
+@end
diff --git a/samples/objc/FirebaseUI-demo-objc/FIRSample.m b/samples/objc/FirebaseUI-demo-objc/FUISample.m
similarity index 89%
rename from samples/objc/FirebaseUI-demo-objc/FIRSample.m
rename to samples/objc/FirebaseUI-demo-objc/FUISample.m
index da111ea9abe..49ef823d2bc 100644
--- a/samples/objc/FirebaseUI-demo-objc/FIRSample.m
+++ b/samples/objc/FirebaseUI-demo-objc/FUISample.m
@@ -1,5 +1,5 @@
 //
-//  FIRSampleContainer.m
+//  FUISample.m
 //
 //  Copyright (c) 2016 Google Inc.
 //
@@ -16,9 +16,9 @@
 //  limitations under the License.
 //
 
-#import "FIRSample.h"
+#import "FUISample.h"
 
-@implementation FIRSample
+@implementation FUISample
 
 - (id)initWithTitle:(NSString *)title
   sampleDescription:(NSString *)description
@@ -35,7 +35,7 @@ - (id)initWithTitle:(NSString *)title
 + (instancetype)sampleWithTitle:(NSString *)title
               sampleDescription:(NSString *)description
                      controller:(FIRControllerBlock)block {
-  FIRSample *sample = [(FIRSample *)[self alloc] initWithTitle:title
+  FUISample *sample = [(FUISample *)[self alloc] initWithTitle:title
                                              sampleDescription:description
                                                     controller:block];
 
@@ -43,4 +43,4 @@ + (instancetype)sampleWithTitle:(NSString *)title
 }
 
 
-@end
\ No newline at end of file
+@end
diff --git a/samples/objc/FirebaseUI-demo-objc/FIRSamplesViewController.h b/samples/objc/FirebaseUI-demo-objc/FUISamplesViewController.h
similarity index 91%
rename from samples/objc/FirebaseUI-demo-objc/FIRSamplesViewController.h
rename to samples/objc/FirebaseUI-demo-objc/FUISamplesViewController.h
index cffe0584489..2e5b388d3b3 100644
--- a/samples/objc/FirebaseUI-demo-objc/FIRSamplesViewController.h
+++ b/samples/objc/FirebaseUI-demo-objc/FUISamplesViewController.h
@@ -18,6 +18,6 @@
 
 #import <UIKit/UIKit.h>
 
-@interface FIRSamplesViewController : UITableViewController
+@interface FUISamplesViewController : UITableViewController
 
 @end
diff --git a/samples/objc/FirebaseUI-demo-objc/FIRSamplesViewController.m b/samples/objc/FirebaseUI-demo-objc/FUISamplesViewController.m
similarity index 86%
rename from samples/objc/FirebaseUI-demo-objc/FIRSamplesViewController.m
rename to samples/objc/FirebaseUI-demo-objc/FUISamplesViewController.m
index d7c002525bb..0d323ef3e9f 100644
--- a/samples/objc/FirebaseUI-demo-objc/FIRSamplesViewController.m
+++ b/samples/objc/FirebaseUI-demo-objc/FUISamplesViewController.m
@@ -16,17 +16,17 @@
 //  limitations under the License.
 //
 
-#import "FIRSample.h"
-#import "FIRSamplesViewController.h"
-#import "FIRChatViewController.h"
+#import "FUISample.h"
+#import "FUISamplesViewController.h"
+#import "FUIChatViewController.h"
 
-@interface FIRSamplesViewController ()
+@interface FUISamplesViewController ()
 
 @property (nonatomic) NSArray *samplesContainer;
 
 @end
 
-@implementation FIRSamplesViewController
+@implementation FUISamplesViewController
 
 - (void)viewDidLoad {
   [super viewDidLoad];
@@ -40,7 +40,7 @@ - (void)viewDidLoad {
 - (void)populateSamples {
   NSMutableArray *samples = [[NSMutableArray alloc] init];
 
-  [samples addObject:[FIRSample sampleWithTitle:@"Auth"
+  [samples addObject:[FUISample sampleWithTitle:@"Auth"
                               sampleDescription:@"Demonstrates the FirebaseAuthUI flow with customization options"
                                      controller:^UIViewController *{
                                        UIViewController *controller =
@@ -49,7 +49,7 @@ - (void)populateSamples {
                                        return controller;
                                      }]];
 
-  [samples addObject:[FIRSample sampleWithTitle:@"Chat"
+  [samples addObject:[FUISample sampleWithTitle:@"Chat"
                               sampleDescription:@"Demonstrates using a FUICollectionViewDataSource to load data from Firebase Database into a UICollectionView for a basic chat app."
                                      controller:^UIViewController *{
                                        UIViewController *controller =
@@ -57,12 +57,12 @@ - (void)populateSamples {
                                                                   bundle:NULL] instantiateViewControllerWithIdentifier:@"ViewController"];
                                        return controller;
                                      }]];
-  [samples addObject:[FIRSample sampleWithTitle:@"Storage"
+  [samples addObject:[FUISample sampleWithTitle:@"Storage"
                               sampleDescription:@"Demonstrates using FirebaseStorageUI to populate an image view."
                                      controller:^UIViewController *{
                                        UIViewController *controller =
                                        [[UIStoryboard storyboardWithName:@"Main"
-                                                                  bundle:NULL] instantiateViewControllerWithIdentifier:@"FIRStorageViewController"];
+                                                                  bundle:NULL] instantiateViewControllerWithIdentifier:@"FUIStorageViewController"];
                                        return controller;
                                      }]];
 
@@ -80,10 +80,10 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-  static NSString *cellId = @"FIRSampleCell";
+  static NSString *cellId = @"FUISampleCell";
   UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellId forIndexPath:indexPath];
 
-  FIRSample *sample = _samplesContainer[indexPath.row];
+  FUISample *sample = _samplesContainer[indexPath.row];
   cell.textLabel.text = sample.title;
   cell.detailTextLabel.text = sample.sampleDescription;
 
@@ -91,7 +91,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-  FIRSample *sample = _samplesContainer[indexPath.row];
+  FUISample *sample = _samplesContainer[indexPath.row];
   UIViewController *viewController = sample.controllerBlock();
   
   [self.navigationController pushViewController:viewController animated:YES];
diff --git a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessage.h b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessage.h
similarity index 95%
rename from samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessage.h
rename to samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessage.h
index a92c1231bd4..5feab9d180b 100644
--- a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessage.h
+++ b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessage.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-@interface FIRChatMessage : NSObject
+@interface FUIChatMessage : NSObject
 
 @property(copy, nonatomic) NSString *name;
 @property(copy, nonatomic) NSString *text;
diff --git a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessage.m b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessage.m
similarity index 94%
rename from samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessage.m
rename to samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessage.m
index 2da518f2b6a..0b507bada1e 100644
--- a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessage.m
+++ b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessage.m
@@ -14,9 +14,9 @@
 //  limitations under the License.
 //
 
-#import "FIRChatMessage.h"
+#import "FUIChatMessage.h"
 
-@implementation FIRChatMessage
+@implementation FUIChatMessage
 
 - (instancetype)init {
   return [self initWithName:@"" andText:@"" userId:@""];
diff --git a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessageDataSource.h b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessageDataSource.h
similarity index 84%
rename from samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessageDataSource.h
rename to samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessageDataSource.h
index 8f734b22bf3..3dda68206b2 100644
--- a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessageDataSource.h
+++ b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessageDataSource.h
@@ -14,8 +14,8 @@
 //  limitations under the License.
 //
 
-#import <FirebaseDatabaseUI/FUITableViewDataSource.h>
+#import <FirebaseDatabaseUI/FirebaseDatabaseUI.h>
 
-@interface FIRChatMessageDataSource : FUITableViewDataSource
+@interface FUIChatMessageDataSource : FUITableViewDataSource
 
 @end
diff --git a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessageDataSource.m b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessageDataSource.m
similarity index 92%
rename from samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessageDataSource.m
rename to samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessageDataSource.m
index 67175b5d55a..15620e95c8d 100644
--- a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessageDataSource.m
+++ b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessageDataSource.m
@@ -14,10 +14,10 @@
 //  limitations under the License.
 //
 
-#import "FIRChatMessageDataSource.h"
+#import "FUIChatMessageDataSource.h"
 @import FirebaseDatabase;
 
-@implementation FIRChatMessageDataSource
+@implementation FUIChatMessageDataSource
 
 - (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
   return YES; }
diff --git a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessageTableViewCell.h b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessageTableViewCell.h
similarity index 93%
rename from samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessageTableViewCell.h
rename to samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessageTableViewCell.h
index c9c740f5074..e7e6c895115 100644
--- a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessageTableViewCell.h
+++ b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessageTableViewCell.h
@@ -16,7 +16,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface FIRChatMessageTableViewCell : UITableViewCell
+@interface FUIChatMessageTableViewCell : UITableViewCell
 @property(weak, nonatomic) IBOutlet UILabel *myMessageLabel;
 @property(weak, nonatomic) IBOutlet UILabel *myNameLabel;
 
diff --git a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessageTableViewCell.m b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessageTableViewCell.m
similarity index 89%
rename from samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessageTableViewCell.m
rename to samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessageTableViewCell.m
index ffc0abe326e..d88282470c1 100644
--- a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessageTableViewCell.m
+++ b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessageTableViewCell.m
@@ -14,9 +14,9 @@
 //  limitations under the License.
 //
 
-#import "FIRChatMessageTableViewCell.h"
+#import "FUIChatMessageTableViewCell.h"
 
-@implementation FIRChatMessageTableViewCell
+@implementation FUIChatMessageTableViewCell
 
 - (instancetype)initWithFrame:(CGRect)frame {
   return [super initWithFrame:frame];
diff --git a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessageTableViewCell.xib b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessageTableViewCell.xib
similarity index 97%
rename from samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessageTableViewCell.xib
rename to samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessageTableViewCell.xib
index 3f64ad7a19a..25fc0e35ca1 100644
--- a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatMessageTableViewCell.xib
+++ b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatMessageTableViewCell.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1108" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
@@ -10,11 +10,11 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="d6M-nO-3us" customClass="FIRChatMessageTableViewCell">
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="d6M-nO-3us" customClass="FUIChatMessageTableViewCell">
             <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="d6M-nO-3us" id="oUR-sj-R1e">
-                <frame key="frameInset" width="320" height="43"/>
+                <frame key="frameInset" width="320" height="43.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Other Message" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5a3-Gg-71z">
diff --git a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatViewController.h b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatViewController.h
similarity index 88%
rename from samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatViewController.h
rename to samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatViewController.h
index 7ab843e8d96..e42181b6085 100644
--- a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatViewController.h
+++ b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatViewController.h
@@ -17,9 +17,9 @@
 @import UIKit;
 @import FirebaseDatabase;
 
-#import <FirebaseDatabaseUI/FUITableViewDataSource.h>
+#import <FirebaseDatabaseUI/FirebaseDatabaseUI.h>
 
-@interface FIRChatViewController : UIViewController <UITableViewDelegate, UITextFieldDelegate>
+@interface FUIChatViewController : UIViewController <UITableViewDelegate, UITextFieldDelegate>
 
 @property (strong, nonatomic) FIRDatabaseReference *ref;
 @property (strong, nonatomic) FUITableViewDataSource *dataSource;
diff --git a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatViewController.m b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatViewController.m
similarity index 89%
rename from samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatViewController.m
rename to samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatViewController.m
index 34d621ecad5..16530826266 100644
--- a/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FIRChatViewController.m
+++ b/samples/objc/FirebaseUI-demo-objc/Samples/Chat/FUIChatViewController.m
@@ -17,12 +17,12 @@
 #import <FirebaseAuthUI/FirebaseAuthUI.h>
 #import <FirebaseAuth/FirebaseAuth.h>
 
-#import "FIRChatViewController.h"
-#import "FIRChatMessage.h"
-#import "FIRChatMessageTableViewCell.h"
-#import "FIRChatMessageDataSource.h"
+#import "FUIChatViewController.h"
+#import "FUIChatMessage.h"
+#import "FUIChatMessageTableViewCell.h"
+#import "FUIChatMessageDataSource.h"
 
-@implementation FIRChatViewController
+@implementation FUIChatViewController
 
 - (void)viewDidLoad {
   [super viewDidLoad];
@@ -30,18 +30,18 @@ - (void)viewDidLoad {
   self.ref = [[FIRDatabase database].reference child:@"objc_demo-chat"];
 
   NSString *identifier = @"cellReuseIdentifier";
-  UINib *nib = [UINib nibWithNibName:@"FIRChatMessageTableViewCell" bundle:nil];
+  UINib *nib = [UINib nibWithNibName:@"FUIChatMessageTableViewCell" bundle:nil];
   [self.tableView registerNib:nib forCellReuseIdentifier:identifier];
   self.dataSource =
-  [[FIRChatMessageDataSource alloc] initWithQuery:self.ref
+  [[FUIChatMessageDataSource alloc] initWithQuery:self.ref
                                              view:self.tableView
                                      populateCell:^UITableViewCell *(UITableView *tableView,
                                                                      NSIndexPath *indexPath,
                                                                      FIRDataSnapshot *snap) {
-    FIRChatMessage *message = [[FIRChatMessage alloc] initWithName:snap.value[@"name"]
+    FUIChatMessage *message = [[FUIChatMessage alloc] initWithName:snap.value[@"name"]
                                                            andText:snap.value[@"text"]
                                                             userId:snap.value[@"uid"]];
-    FIRChatMessageTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:identifier];
+    FUIChatMessageTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:identifier];
     if ([message.uid isEqualToString:[FIRAuth auth].currentUser.uid]) {
       cell.myMessageLabel.text = message.text;
       cell.myNameLabel.text = message.name;
diff --git a/samples/objc/FirebaseUI-demo-objc/Samples/Storage/FIRStorageViewController.h b/samples/objc/FirebaseUI-demo-objc/Samples/Storage/FUIStorageViewController.h
similarity index 92%
rename from samples/objc/FirebaseUI-demo-objc/Samples/Storage/FIRStorageViewController.h
rename to samples/objc/FirebaseUI-demo-objc/Samples/Storage/FUIStorageViewController.h
index 3ec20c48da0..713adf1db23 100644
--- a/samples/objc/FirebaseUI-demo-objc/Samples/Storage/FIRStorageViewController.h
+++ b/samples/objc/FirebaseUI-demo-objc/Samples/Storage/FUIStorageViewController.h
@@ -18,6 +18,6 @@
 
 #import <UIKit/UIKit.h>
 
-@interface FIRStorageViewController : UIViewController
+@interface FUIStorageViewController : UIViewController
 
 @end
diff --git a/samples/objc/FirebaseUI-demo-objc/Samples/Storage/FIRStorageViewController.m b/samples/objc/FirebaseUI-demo-objc/Samples/Storage/FUIStorageViewController.m
similarity index 97%
rename from samples/objc/FirebaseUI-demo-objc/Samples/Storage/FIRStorageViewController.m
rename to samples/objc/FirebaseUI-demo-objc/Samples/Storage/FUIStorageViewController.m
index 2a1c17145b3..c7a7ced6d5e 100644
--- a/samples/objc/FirebaseUI-demo-objc/Samples/Storage/FIRStorageViewController.m
+++ b/samples/objc/FirebaseUI-demo-objc/Samples/Storage/FUIStorageViewController.m
@@ -16,12 +16,12 @@
 //  limitations under the License.
 //
 
-#import "FIRStorageViewController.h"
+#import "FUIStorageViewController.h"
 
 #import <FirebaseStorage/FirebaseStorage.h>
 #import <FirebaseStorageUI/FirebaseStorageUI.h>
 
-@interface FIRStorageViewController ()
+@interface FUIStorageViewController ()
 @property (nonatomic, strong) IBOutlet UIImageView *imageView;
 @property (nonatomic, strong) IBOutlet UITextField *textField;
 
@@ -29,7 +29,7 @@ @interface FIRStorageViewController ()
 @property (nonatomic, strong) IBOutlet NSLayoutConstraint *bottomConstraint;
 @end
 
-@implementation FIRStorageViewController
+@implementation FUIStorageViewController
 
 - (void)viewDidLoad {
   [super viewDidLoad];
diff --git a/samples/objc/FirebaseUI-demo-objc/main.m b/samples/objc/FirebaseUI-demo-objc/main.m
index 49c78bf2851..49c5626324e 100644
--- a/samples/objc/FirebaseUI-demo-objc/main.m
+++ b/samples/objc/FirebaseUI-demo-objc/main.m
@@ -15,10 +15,10 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "AppDelegate.h"
+#import "FUIAppDelegate.h"
 
 int main(int argc, char * argv[]) {
     @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
+        return UIApplicationMain(argc, argv, nil, NSStringFromClass([FUIAppDelegate class]));
     }
 }

From e2db215da8eea2ec14f4ab37b10ade4bd6de0972 Mon Sep 17 00:00:00 2001
From: Morgan Chen <morganchen12@gmail.com>
Date: Thu, 3 Nov 2016 15:38:55 -0700
Subject: [PATCH 2/2] fix bad pbxproj changes

---
 .../project.pbxproj                           | 49 +++++++++----------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/samples/swift/FirebaseUI-demo-swift.xcodeproj/project.pbxproj b/samples/swift/FirebaseUI-demo-swift.xcodeproj/project.pbxproj
index 144d69c626f..1596f8f87aa 100644
--- a/samples/swift/FirebaseUI-demo-swift.xcodeproj/project.pbxproj
+++ b/samples/swift/FirebaseUI-demo-swift.xcodeproj/project.pbxproj
@@ -8,7 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		19877FB24F4E45159B4C8B51 /* Pods_FirebaseUI_demo_swiftTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2DBA0AFBF780C260346490A /* Pods_FirebaseUI_demo_swiftTests.framework */; };
-		8D5F93B01D9B192D00D5A2E4 /* FIRStorageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D5F93AF1D9B192D00D5A2E4 /* FIRStorageViewController.swift */; };
+		8D5F93B01D9B192D00D5A2E4 /* StorageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D5F93AF1D9B192D00D5A2E4 /* StorageViewController.swift */; };
 		8DABC9891D3D82D600453807 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DABC9881D3D82D600453807 /* AppDelegate.swift */; };
 		8DABC98E1D3D82D600453807 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8DABC98C1D3D82D600453807 /* Main.storyboard */; };
 		8DABC9901D3D82D600453807 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8DABC98F1D3D82D600453807 /* Assets.xcassets */; };
@@ -16,11 +16,11 @@
 		8DABC99E1D3D82D600453807 /* FirebaseUI-demo-swiftTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DABC99D1D3D82D600453807 /* FirebaseUI-demo-swiftTests.swift */; };
 		8DD51E371D873B0D00E2CA51 /* UIStoryboardExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DD51E361D873B0D00E2CA51 /* UIStoryboardExtension.swift */; };
 		C302C1DC1D91CC7B00ADBD41 /* FIRAuthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C302C1D51D91CC7B00ADBD41 /* FIRAuthViewController.swift */; };
-		C302C1DD1D91CC7B00ADBD41 /* FIRChatCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C302C1D71D91CC7B00ADBD41 /* FIRChatCollectionViewCell.swift */; };
-		C302C1DE1D91CC7B00ADBD41 /* FIRChatViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C302C1D81D91CC7B00ADBD41 /* FIRChatViewController.swift */; };
-		C302C1DF1D91CC7B00ADBD41 /* FIRSamplesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C302C1D91D91CC7B00ADBD41 /* FIRSamplesViewController.swift */; };
-		C302C1E01D91CC7B00ADBD41 /* FIRSample.swift in Sources */ = {isa = PBXBuildFile; fileRef = C302C1DA1D91CC7B00ADBD41 /* FIRSample.swift */; };
-		C302C1E11D91CC7B00ADBD41 /* FIRSampleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C302C1DB1D91CC7B00ADBD41 /* FIRSampleCell.swift */; };
+		C302C1DD1D91CC7B00ADBD41 /* ChatCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C302C1D71D91CC7B00ADBD41 /* ChatCollectionViewCell.swift */; };
+		C302C1DE1D91CC7B00ADBD41 /* ChatViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C302C1D81D91CC7B00ADBD41 /* ChatViewController.swift */; };
+		C302C1DF1D91CC7B00ADBD41 /* SamplesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C302C1D91D91CC7B00ADBD41 /* SamplesViewController.swift */; };
+		C302C1E01D91CC7B00ADBD41 /* Sample.swift in Sources */ = {isa = PBXBuildFile; fileRef = C302C1DA1D91CC7B00ADBD41 /* Sample.swift */; };
+		C302C1E11D91CC7B00ADBD41 /* SampleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C302C1DB1D91CC7B00ADBD41 /* SampleCell.swift */; };
 		C39833AD1DB7ECB300D257EF /* FIRCustomAuthUIDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C39833AC1DB7ECB300D257EF /* FIRCustomAuthUIDelegate.swift */; };
 		C39BC03D1DB7F74B0060F6AF /* FIRCustomAuthPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C39BC03B1DB7F74B0060F6AF /* FIRCustomAuthPickerViewController.swift */; };
 		C39BC03E1DB7F74B0060F6AF /* FIRCustomAuthPickerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C39BC03C1DB7F74B0060F6AF /* FIRCustomAuthPickerViewController.xib */; };
@@ -50,7 +50,7 @@
 
 /* Begin PBXFileReference section */
 		7610266FD082466CE20ADACB /* Pods-FirebaseUI-demo-swiftTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUI-demo-swiftTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FirebaseUI-demo-swiftTests/Pods-FirebaseUI-demo-swiftTests.debug.xcconfig"; sourceTree = "<group>"; };
-		8D5F93AF1D9B192D00D5A2E4 /* FIRStorageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FIRStorageViewController.swift; sourceTree = "<group>"; };
+		8D5F93AF1D9B192D00D5A2E4 /* StorageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StorageViewController.swift; sourceTree = "<group>"; };
 		8DABC9851D3D82D600453807 /* FirebaseUI-demo-swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "FirebaseUI-demo-swift.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		8DABC9881D3D82D600453807 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		8DABC98D1D3D82D600453807 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -66,12 +66,11 @@
 		C01904E28D7A26F3281335EE /* Pods_FirebaseUI_demo_swift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseUI_demo_swift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C2DBA0AFBF780C260346490A /* Pods_FirebaseUI_demo_swiftTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseUI_demo_swiftTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C302C1D51D91CC7B00ADBD41 /* FIRAuthViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FIRAuthViewController.swift; sourceTree = "<group>"; };
-		C302C1D71D91CC7B00ADBD41 /* FIRChatCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FIRChatCollectionViewCell.swift; sourceTree = "<group>"; };
-		C302C1D81D91CC7B00ADBD41 /* FIRChatViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FIRChatViewController.swift; sourceTree = "<group>"; };
-		C302C1D91D91CC7B00ADBD41 /* FIRSamplesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FIRSamplesViewController.swift; sourceTree = "<group>"; };
-		C302C1DA1D91CC7B00ADBD41 /* FIRSample.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FIRSample.swift; sourceTree = "<group>"; };
-		C302C1DB1D91CC7B00ADBD41 /* FIRSampleCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FIRSampleCell.swift; sourceTree = "<group>"; };
-		C326B7EB1DA6D364004B818F /* FirebaseUI-demo-swift.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "FirebaseUI-demo-swift.entitlements"; sourceTree = "<group>"; };
+		C302C1D71D91CC7B00ADBD41 /* ChatCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatCollectionViewCell.swift; sourceTree = "<group>"; };
+		C302C1D81D91CC7B00ADBD41 /* ChatViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatViewController.swift; sourceTree = "<group>"; };
+		C302C1D91D91CC7B00ADBD41 /* SamplesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SamplesViewController.swift; sourceTree = "<group>"; };
+		C302C1DA1D91CC7B00ADBD41 /* Sample.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Sample.swift; sourceTree = "<group>"; };
+		C302C1DB1D91CC7B00ADBD41 /* SampleCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SampleCell.swift; sourceTree = "<group>"; };
 		C39833AC1DB7ECB300D257EF /* FIRCustomAuthUIDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FIRCustomAuthUIDelegate.swift; sourceTree = "<group>"; };
 		C39BC03B1DB7F74B0060F6AF /* FIRCustomAuthPickerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FIRCustomAuthPickerViewController.swift; sourceTree = "<group>"; };
 		C39BC03C1DB7F74B0060F6AF /* FIRCustomAuthPickerViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FIRCustomAuthPickerViewController.xib; sourceTree = "<group>"; };
@@ -121,7 +120,7 @@
 		8D5F93B11D9B193C00D5A2E4 /* Storage */ = {
 			isa = PBXGroup;
 			children = (
-				8D5F93AF1D9B192D00D5A2E4 /* FIRStorageViewController.swift */,
+				8D5F93AF1D9B192D00D5A2E4 /* StorageViewController.swift */,
 			);
 			name = Storage;
 			sourceTree = "<group>";
@@ -187,9 +186,9 @@
 				C302C1D41D91CC7B00ADBD41 /* Auth */,
 				C302C1D61D91CC7B00ADBD41 /* Chat */,
 				8D5F93B11D9B193C00D5A2E4 /* Storage */,
-				C302C1D91D91CC7B00ADBD41 /* FIRSamplesViewController.swift */,
-				C302C1DA1D91CC7B00ADBD41 /* FIRSample.swift */,
-				C302C1DB1D91CC7B00ADBD41 /* FIRSampleCell.swift */,
+				C302C1D91D91CC7B00ADBD41 /* SamplesViewController.swift */,
+				C302C1DA1D91CC7B00ADBD41 /* Sample.swift */,
+				C302C1DB1D91CC7B00ADBD41 /* SampleCell.swift */,
 			);
 			path = Samples;
 			sourceTree = "<group>";
@@ -218,8 +217,8 @@
 		C302C1D61D91CC7B00ADBD41 /* Chat */ = {
 			isa = PBXGroup;
 			children = (
-				C302C1D71D91CC7B00ADBD41 /* FIRChatCollectionViewCell.swift */,
-				C302C1D81D91CC7B00ADBD41 /* FIRChatViewController.swift */,
+				C302C1D71D91CC7B00ADBD41 /* ChatCollectionViewCell.swift */,
+				C302C1D81D91CC7B00ADBD41 /* ChatViewController.swift */,
 			);
 			path = Chat;
 			sourceTree = "<group>";
@@ -335,18 +334,18 @@
 			buildActionMask = 2147483647;
 			files = (
 				8DD51E371D873B0D00E2CA51 /* UIStoryboardExtension.swift in Sources */,
-				C302C1DF1D91CC7B00ADBD41 /* FIRSamplesViewController.swift in Sources */,
+				C302C1DF1D91CC7B00ADBD41 /* SamplesViewController.swift in Sources */,
 				C302C1DC1D91CC7B00ADBD41 /* FIRAuthViewController.swift in Sources */,
 				C39BC0451DB811E70060F6AF /* FIRCustomPasswordRecoveryViewController.swift in Sources */,
 				C39BC03D1DB7F74B0060F6AF /* FIRCustomAuthPickerViewController.swift in Sources */,
-				8D5F93B01D9B192D00D5A2E4 /* FIRStorageViewController.swift in Sources */,
+				8D5F93B01D9B192D00D5A2E4 /* StorageViewController.swift in Sources */,
 				C39BC0491DB812030060F6AF /* FIRCustomPasswordSignInViewController.swift in Sources */,
 				C39BC04D1DB812190060F6AF /* FIRCustomPasswordSignUpViewController.swift in Sources */,
-				C302C1DD1D91CC7B00ADBD41 /* FIRChatCollectionViewCell.swift in Sources */,
-				C302C1DE1D91CC7B00ADBD41 /* FIRChatViewController.swift in Sources */,
+				C302C1DD1D91CC7B00ADBD41 /* ChatCollectionViewCell.swift in Sources */,
+				C302C1DE1D91CC7B00ADBD41 /* ChatViewController.swift in Sources */,
 				C39BC0411DB811630060F6AF /* FIRCustomEmailEntryViewController.swift in Sources */,
-				C302C1E11D91CC7B00ADBD41 /* FIRSampleCell.swift in Sources */,
-				C302C1E01D91CC7B00ADBD41 /* FIRSample.swift in Sources */,
+				C302C1E11D91CC7B00ADBD41 /* SampleCell.swift in Sources */,
+				C302C1E01D91CC7B00ADBD41 /* Sample.swift in Sources */,
 				C39BC0511DB812330060F6AF /* FIRCustomPasswordVerificationViewController.swift in Sources */,
 				8DABC9891D3D82D600453807 /* AppDelegate.swift in Sources */,
 				C39833AD1DB7ECB300D257EF /* FIRCustomAuthUIDelegate.swift in Sources */,