rename OfficeUIFabricFramework to FluentUIFramework (microsoft#14)

* Find and replace "OfficeUIFabric" to "FluentUI" * update image name
HeyImChris · Apr 15, 2020 · c3c8d15 · c3c8d15
1 parent 2b9edfa
commit c3c8d15
Show file tree

Hide file tree

Showing 20 changed files with 46 additions and 53 deletions.
diff --git a/ios/FluentUI.Demo/FluentUI.Demo.xcodeproj/project.pbxproj b/ios/FluentUI.Demo/FluentUI.Demo.xcodeproj/project.pbxproj
@@ -143,7 +143,7 @@
 		FD7254EC21471A3F002F4069 /* MSDateTimePickerDemoController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSDateTimePickerDemoController.swift; sourceTree = "<group>"; };
 		FD7DF06121FB941400857267 /* MSTooltipDemoController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSTooltipDemoController.swift; sourceTree = "<group>"; };
 		FDCF7C8221BF35680058E9E6 /* MSSegmentedControlDemoController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSSegmentedControlDemoController.swift; sourceTree = "<group>"; };
-		FDDD73FA22C6D86A00A9D995 /* OfficeUIFabric.Demo-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OfficeUIFabric.Demo-Bridging-Header.h"; sourceTree = "<group>"; };
+		FDDD73FA22C6D86A00A9D995 /* FluentUI.Demo-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "FluentUI.Demo-Bridging-Header.h"; sourceTree = "<group>"; };
 		FDDD73FB22C6D86B00A9D995 /* ObjectiveCDemoController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjectiveCDemoController.m; sourceTree = "<group>"; };
 		FDDD73FC22C6D86B00A9D995 /* ObjectiveCDemoController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectiveCDemoController.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -175,7 +175,7 @@
 			isa = PBXGroup;
 			children = (
 				A5CEC21D20E436F20016922A /* Info.plist */,
-				FDDD73FA22C6D86A00A9D995 /* OfficeUIFabric.Demo-Bridging-Header.h */,
+				FDDD73FA22C6D86A00A9D995 /* FluentUI.Demo-Bridging-Header.h */,
 			);
 			name = Configuration;
 			sourceTree = "<group>";
@@ -616,7 +616,7 @@
 				PRODUCT_NAME = FluentUI.Demo;
 				PROVISIONING_PROFILE = "4596e7d8-5232-4b9f-82bf-63883e38cd5c";
 				PROVISIONING_PROFILE_SPECIFIER = "Office Fabric Demo Dogfood Distribution";
-				SWIFT_OBJC_BRIDGING_HEADER = "FluentUI.Demo/OfficeUIFabric.Demo-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "FluentUI.Demo/FluentUI.Demo-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -759,7 +759,7 @@
 				PRODUCT_NAME = FluentUI.Demo;
 				PROVISIONING_PROFILE = "63d62159-2691-4b44-9553-b668cc1746c1";
 				PROVISIONING_PROFILE_SPECIFIER = "Office UI Fabric Demo Development";
-				SWIFT_OBJC_BRIDGING_HEADER = "FluentUI.Demo/OfficeUIFabric.Demo-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "FluentUI.Demo/FluentUI.Demo-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -785,7 +785,7 @@
 				PRODUCT_NAME = FluentUI.Demo;
 				PROVISIONING_PROFILE = "63d62159-2691-4b44-9553-b668cc1746c1";
 				PROVISIONING_PROFILE_SPECIFIER = "Office UI Fabric Demo Development";
-				SWIFT_OBJC_BRIDGING_HEADER = "FluentUI.Demo/OfficeUIFabric.Demo-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "FluentUI.Demo/FluentUI.Demo-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};

diff --git a/ios/FluentUI.Demo/FluentUI.Demo/AppDelegate.swift b/ios/FluentUI.Demo/FluentUI.Demo/AppDelegate.swift
@@ -22,7 +22,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
     var window: UIWindow?
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        OfficeUIFabricFramework.initializeAppearance()
+        FluentUIFramework.initializeAppearance()
 
         let splitViewController = window!.rootViewController as! UISplitViewController
         let masterContainer = splitViewController.viewControllers.first as! UINavigationController

diff --git a/ios/FluentUI.Demo/FluentUI.Demo/Demos/MSTableViewHeaderFooterViewDemoController.swift b/ios/FluentUI.Demo/FluentUI.Demo/Demos/MSTableViewHeaderFooterViewDemoController.swift
@@ -106,7 +106,7 @@ extension MSTableViewHeaderFooterViewDemoController: UITableViewDelegate {
                 let title = NSMutableAttributedString(string: section.footerText)
                 let range = (title.string as NSString).range(of: section.footerLinkText)
                 if range.location != -1 {
-                    title.addAttribute(.link, value: "https://github.com/OfficeDev/ui-fabric-ios", range: range)
+                    title.addAttribute(.link, value: "https://github.com/microsoft/fluentui-apple", range: range)
                 }
                 footer.setup(style: .footer, attributedTitle: title)
 

diff --git a/...emo/OfficeUIFabric.Demo-Bridging-Header.h → ...ntUI.Demo/FluentUI.Demo-Bridging-Header.h b/...emo/OfficeUIFabric.Demo-Bridging-Header.h → ...ntUI.Demo/FluentUI.Demo-Bridging-Header.h
diff --git a/ios/FluentUI.Demo/FluentUI.Demo/MasterViewController.swift b/ios/FluentUI.Demo/FluentUI.Demo/MasterViewController.swift
@@ -28,7 +28,7 @@ class MasterViewController: UITableViewController {
         let titleView = MSTwoLineTitleView()
         titleView.setup(
             title: navigationItem.title ?? "",
-            subtitle: OfficeUIFabricFramework.bundle.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String
+            subtitle: FluentUIFramework.bundle.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String
         )
         navigationItem.titleView = titleView
 

diff --git a/...assets/FabricLogo.imageset/fabricLogo.pdf → ...ets.xcassets/AppLogo.imageset/AppLogo.pdf b/...assets/FabricLogo.imageset/fabricLogo.pdf → ...ets.xcassets/AppLogo.imageset/AppLogo.pdf
diff --git a/...s/FabricLogo.imageset/fabricLogoLarge.pdf → ...cassets/AppLogo.imageset/AppLogoLarge.pdf b/...s/FabricLogo.imageset/fabricLogoLarge.pdf → ...cassets/AppLogo.imageset/AppLogoLarge.pdf
diff --git a/...cassets/FabricLogo.imageset/Contents.json → ...s.xcassets/AppLogo.imageset/Contents.json b/...cassets/FabricLogo.imageset/Contents.json → ...s.xcassets/AppLogo.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "fabricLogo.pdf"
+      "filename" : "AppLogo.pdf"
     },
     {
       "idiom" : "universal",
@@ -14,7 +14,7 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "fabricLogoLarge.pdf",
+      "filename" : "AppLogoLarge.pdf",
       "width-class" : "regular",
       "height-class" : "regular"
     }

diff --git a/ios/FluentUI.Demo/FluentUI.Demo/Resources/Base.lproj/LaunchScreen.storyboard b/ios/FluentUI.Demo/FluentUI.Demo/Resources/Base.lproj/LaunchScreen.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -16,7 +16,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="FabricLogo" translatesAutoresizingMaskIntoConstraints="NO" id="BcY-Lz-Dg7">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="AppLogo" translatesAutoresizingMaskIntoConstraints="NO" id="BcY-Lz-Dg7">
                                 <rect key="frame" x="97.5" y="215" width="180" height="180"/>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="MicrosoftLogo" translatesAutoresizingMaskIntoConstraints="NO" id="0lb-20-DtA">
@@ -39,7 +39,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="FabricLogo" width="180" height="180"/>
+        <image name="AppLogo" width="180" height="180"/>
         <image name="MicrosoftLogo" width="99" height="21"/>
     </resources>
 </document>
diff --git a/ios/FluentUI.Tests/OfficeUIFabricTests.swift → ios/FluentUI.Tests/FluentUITests.swift b/ios/FluentUI.Tests/OfficeUIFabricTests.swift → ios/FluentUI.Tests/FluentUITests.swift
@@ -6,7 +6,7 @@
 import XCTest
 @testable import FluentUI
 
-class OfficeUIFabricTests: XCTestCase {
+class FluentUITests: XCTestCase {
     override func setUp() {
         super.setUp()
         // Put setup code here. This method is called before the invocation of each test method in the class.

diff --git a/ios/FluentUI.xcodeproj/project.pbxproj b/ios/FluentUI.xcodeproj/project.pbxproj
@@ -48,7 +48,7 @@
 		8FD0118B228A82A600D25925 /* MSCalendarConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDF41ED82141A02200EC527C /* MSCalendarConfiguration.swift */; };
 		8FD0118C228A82A600D25925 /* MSDayOfMonth.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD777528219E3F6C00033D58 /* MSDayOfMonth.swift */; };
 		8FD0118D228A82A600D25925 /* Obscurable.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDA1AF8E21484A26001AE720 /* Obscurable.swift */; };
-		8FD0118E228A82A600D25925 /* OfficeUIFabric.swift in Sources */ = {isa = PBXBuildFile; fileRef = A559BB82212B7D870055E107 /* OfficeUIFabric.swift */; };
+		8FD0118E228A82A600D25925 /* FluentUIFramework.swift in Sources */ = {isa = PBXBuildFile; fileRef = A559BB82212B7D870055E107 /* FluentUIFramework.swift */; };
 		8FD0118F228A82A600D25925 /* MSDateTimePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD77752F21A490BA00033D58 /* MSDateTimePicker.swift */; };
 		8FD01190228A82A600D25925 /* DateTimePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD1FAE1A2272464B00A5DBA4 /* DateTimePicker.swift */; };
 		8FD01191228A82A600D25925 /* MSDatePickerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD4F2A1F214AE20400C437D6 /* MSDatePickerController.swift */; };
@@ -106,7 +106,7 @@
 		A542A9D9226FC01C00204A52 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A54D97DB217E5CED0072681A /* Assets.xcassets */; };
 		A54D97DA217A5FC10072681A /* CALayer+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A54D97D9217A5FC10072681A /* CALayer+Extensions.swift */; };
 		A559BB7E212B6D100055E107 /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A559BB7D212B6D100055E107 /* String+Extension.swift */; };
-		A559BB83212B7D870055E107 /* OfficeUIFabric.swift in Sources */ = {isa = PBXBuildFile; fileRef = A559BB82212B7D870055E107 /* OfficeUIFabric.swift */; };
+		A559BB83212B7D870055E107 /* FluentUIFramework.swift in Sources */ = {isa = PBXBuildFile; fileRef = A559BB82212B7D870055E107 /* FluentUIFramework.swift */; };
 		A56CE7B622E68A7800AA77EE /* UIColor+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A56CE7B522E68A7800AA77EE /* UIColor+Extensions.swift */; };
 		A56CE7B722E68A7800AA77EE /* UIColor+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A56CE7B522E68A7800AA77EE /* UIColor+Extensions.swift */; };
 		A578C4A22321CFD6002D5C40 /* MSAvatar.swift in Sources */ = {isa = PBXBuildFile; fileRef = A578C4A12321CFD6002D5C40 /* MSAvatar.swift */; };
@@ -128,8 +128,8 @@
 		A5B87B04211E22B70038C37C /* MSDimmingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5B87B03211E22B70038C37C /* MSDimmingView.swift */; };
 		A5B87B06211E23650038C37C /* UIView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5B87B05211E23650038C37C /* UIView+Extensions.swift */; };
 		A5CEC15B20D980B30016922A /* FluentUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5CEC15120D980B20016922A /* FluentUI.framework */; };
-		A5CEC16020D980B30016922A /* OfficeUIFabricTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CEC15F20D980B30016922A /* OfficeUIFabricTests.swift */; };
-		A5CEC16220D980B30016922A /* OfficeUIFabric.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CEC15420D980B20016922A /* OfficeUIFabric.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A5CEC16020D980B30016922A /* FluentUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CEC15F20D980B30016922A /* FluentUITests.swift */; };
+		A5CEC16220D980B30016922A /* FluentUI.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CEC15420D980B20016922A /* FluentUI.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A5CEC16D20D98EE70016922A /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CEC16C20D98EE70016922A /* Colors.swift */; };
 		A5CEC16F20D98F340016922A /* Fonts.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CEC16E20D98F340016922A /* Fonts.swift */; };
 		A5CEC23120E451D00016922A /* MSButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CEC23020E451D00016922A /* MSButton.swift */; };
@@ -279,7 +279,7 @@
 		A54D97DB217E5CED0072681A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		A559BB7D212B6D100055E107 /* String+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Extension.swift"; sourceTree = "<group>"; };
 		A559BB80212B6FA40055E107 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
-		A559BB82212B7D870055E107 /* OfficeUIFabric.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OfficeUIFabric.swift; sourceTree = "<group>"; };
+		A559BB82212B7D870055E107 /* FluentUIFramework.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FluentUIFramework.swift; sourceTree = "<group>"; };
 		A56CE7B522E68A7800AA77EE /* UIColor+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Extensions.swift"; sourceTree = "<group>"; };
 		A578C4A12321CFD6002D5C40 /* MSAvatar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSAvatar.swift; sourceTree = "<group>"; };
 		A589F853211BA03200471C23 /* MSLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSLabel.swift; sourceTree = "<group>"; };
@@ -298,10 +298,10 @@
 		A5B87B03211E22B70038C37C /* MSDimmingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSDimmingView.swift; sourceTree = "<group>"; };
 		A5B87B05211E23650038C37C /* UIView+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Extensions.swift"; sourceTree = "<group>"; };
 		A5CEC15120D980B20016922A /* FluentUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FluentUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		A5CEC15420D980B20016922A /* OfficeUIFabric.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OfficeUIFabric.h; sourceTree = "<group>"; };
+		A5CEC15420D980B20016922A /* FluentUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FluentUI.h; sourceTree = "<group>"; };
 		A5CEC15520D980B20016922A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A5CEC15A20D980B30016922A /* FluentUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FluentUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		A5CEC15F20D980B30016922A /* OfficeUIFabricTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OfficeUIFabricTests.swift; sourceTree = "<group>"; };
+		A5CEC15F20D980B30016922A /* FluentUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FluentUITests.swift; sourceTree = "<group>"; };
 		A5CEC16120D980B30016922A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A5CEC16C20D98EE70016922A /* Colors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = "<group>"; };
 		A5CEC16E20D98F340016922A /* Fonts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Fonts.swift; sourceTree = "<group>"; };
@@ -612,7 +612,7 @@
 			isa = PBXGroup;
 			children = (
 				FD053A342224CA33009B6378 /* MSDatePickerControllerTests.swift */,
-				A5CEC15F20D980B30016922A /* OfficeUIFabricTests.swift */,
+				A5CEC15F20D980B30016922A /* FluentUITests.swift */,
 				A5CEC16120D980B30016922A /* Info.plist */,
 			);
 			path = FluentUI.Tests;
@@ -628,7 +628,7 @@
 				FDF41ED82141A02200EC527C /* MSCalendarConfiguration.swift */,
 				FD777528219E3F6C00033D58 /* MSDayOfMonth.swift */,
 				FDA1AF8E21484A26001AE720 /* Obscurable.swift */,
-				A559BB82212B7D870055E107 /* OfficeUIFabric.swift */,
+				A559BB82212B7D870055E107 /* FluentUIFramework.swift */,
 				FD41C8C022DD48E60086F899 /* Operators.swift */,
 			);
 			path = Core;
@@ -678,7 +678,7 @@
 			isa = PBXGroup;
 			children = (
 				A5CEC15520D980B20016922A /* Info.plist */,
-				A5CEC15420D980B20016922A /* OfficeUIFabric.h */,
+				A5CEC15420D980B20016922A /* FluentUI.h */,
 			);
 			name = Configuration;
 			sourceTree = "<group>";
@@ -892,7 +892,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A5CEC16220D980B30016922A /* OfficeUIFabric.h in Headers */,
+				A5CEC16220D980B30016922A /* FluentUI.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1145,7 +1145,7 @@
 				8FD0118B228A82A600D25925 /* MSCalendarConfiguration.swift in Sources */,
 				8FD0118C228A82A600D25925 /* MSDayOfMonth.swift in Sources */,
 				8FD0118D228A82A600D25925 /* Obscurable.swift in Sources */,
-				8FD0118E228A82A600D25925 /* OfficeUIFabric.swift in Sources */,
+				8FD0118E228A82A600D25925 /* FluentUIFramework.swift in Sources */,
 				8FD0118F228A82A600D25925 /* MSDateTimePicker.swift in Sources */,
 				FD41C88922DD13230086F899 /* MSShyHeaderView.swift in Sources */,
 				8FD01190228A82A600D25925 /* DateTimePicker.swift in Sources */,
@@ -1218,7 +1218,7 @@
 				B46D3F91215056940029772C /* CharacterSet+Extension.swift in Sources */,
 				A5961FA3218A25D100E2A506 /* MSPopupMenuItemCell.swift in Sources */,
 				FD599D0221348439008845EE /* MSCalendarView.swift in Sources */,
-				A559BB83212B7D870055E107 /* OfficeUIFabric.swift in Sources */,
+				A559BB83212B7D870055E107 /* FluentUIFramework.swift in Sources */,
 				1168630622E131CF0088B302 /* MSTabBarView.swift in Sources */,
 				FD599D082134AB0E008845EE /* MSCalendarViewWeekdayHeadingView.swift in Sources */,
 				FDFB8AF321361C9D0046850A /* MSCalendarViewDayMonthYearCell.swift in Sources */,
@@ -1338,7 +1338,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A5CEC16020D980B30016922A /* OfficeUIFabricTests.swift in Sources */,
+				A5CEC16020D980B30016922A /* FluentUITests.swift in Sources */,
 				FD053A352224CA33009B6378 /* MSDatePickerControllerTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/ios/FluentUI/Core/Colors.swift b/ios/FluentUI/Core/Colors.swift
@@ -68,7 +68,7 @@ public final class MSColors: NSObject {
          case warningShade30
 
          public var color: UIColor {
-             if let fluentColor = UIColor(named: "FluentColors/" + self.name, in: OfficeUIFabricFramework.resourceBundle, compatibleWith: nil) {
+             if let fluentColor = UIColor(named: "FluentColors/" + self.name, in: FluentUIFramework.resourceBundle, compatibleWith: nil) {
                  return fluentColor
              } else {
                  preconditionFailure("invalid fluent color")

diff --git a/ios/FluentUI/Core/OfficeUIFabric.swift → ios/FluentUI/Core/FluentUIFramework.swift b/ios/FluentUI/Core/OfficeUIFabric.swift → ios/FluentUI/Core/FluentUIFramework.swift
@@ -5,11 +5,11 @@
 
 import UIKit
 
-public class OfficeUIFabricFramework: NSObject {
+public class FluentUIFramework: NSObject {
     @objc public static var bundle: Bundle { return Bundle(for: self) }
     @objc public static let resourceBundle: Bundle = {
         guard let url = bundle.resourceURL?.appendingPathComponent("FluentUIResources-ios.bundle", isDirectory: true), let bundle = Bundle(url: url) else {
-            preconditionFailure("OfficeUIFabric: resource bundle is not found")
+            preconditionFailure("FluentUI resource bundle is not found")
         }
         return bundle
     }()

diff --git a/ios/FluentUI/Extensions/String+Extension.swift b/ios/FluentUI/Extensions/String+Extension.swift
@@ -7,7 +7,7 @@ import UIKit
 
 extension String {
     internal var localized: String {
-        return NSLocalizedString(self, bundle: OfficeUIFabricFramework.resourceBundle, comment: "")
+        return NSLocalizedString(self, bundle: FluentUIFramework.resourceBundle, comment: "")
     }
 
     func formatted(with args: CVarArg...) -> String {