diff --git a/MaterialComponentsBeta.podspec b/MaterialComponentsBeta.podspec
index 560db7f74d2..79e4e6d3ced 100644
--- a/MaterialComponentsBeta.podspec
+++ b/MaterialComponentsBeta.podspec
@@ -104,17 +104,18 @@ Pod::Spec.new do |mdc|
     end
   end
 
-  mdc.subspec "Tabs2" do |component|
-    component.ios.deployment_target = '9.0'
-    component.public_header_files = "components/#{component.base_name}/src/*.h"
-    component.source_files = [
-      "components/#{component.base_name}/src/*.{h,m}",
-      "components/#{component.base_name}/src/private/*.{h,m}",
+  mdc.subspec "Tabs+TabBarView" do |extension|
+    extension.ios.deployment_target = '9.0'
+    extension.public_header_files = "components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.h"
+    extension.source_files = [
+      "components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.{h,m}",
+      "components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/private/*.{h,m}"
     ]
+    extension.dependency "MaterialComponents/#{extension.base_name.split('+')[0]}"
 
-    component.test_spec 'UnitTests' do |unit_tests|
+    extension.test_spec 'UnitTests' do |unit_tests|
       unit_tests.source_files = [
-        "components/#{component.base_name}/tests/unit/*.m"
+        "components/#{extension.base_name.split('+')[0]}/tests/unit/#{extension.base_name.split('+')[1]}/*.{h,m,swift}",
       ]
     end
   end
diff --git a/MaterialComponentsSnapshotTests.podspec b/MaterialComponentsSnapshotTests.podspec
index 137157ac0c8..7a06e3a2f09 100644
--- a/MaterialComponentsSnapshotTests.podspec
+++ b/MaterialComponentsSnapshotTests.podspec
@@ -15,8 +15,8 @@ module SnapshotPodspecHelper
         source_files = Dir["components/#{@name}/tests/snapshot/*.{h,m,swift}"]
         supplemental_files = Dir["components/#{@name}/tests/snapshot/supplemental/*.{h,m,swift}"]
         example_files = Dir["components/#{@name}/examples/tests/snapshot/*.{h,m,swift}"]
-        theming_files = Dir["components/#{@name}/tests/snapshot/Theming/*.{h,m,swift}"]
-        return source_files + supplemental_files + example_files + theming_files
+        extension_files = Dir["components/#{@name}/tests/snapshot/*/*.{h,m,swift}"]
+        return source_files + supplemental_files + example_files + extension_files
       end
       return []
     end
diff --git a/catalog/MDCCatalog.xcodeproj/xcshareddata/xcschemes/MDCCatalog.xcscheme b/catalog/MDCCatalog.xcodeproj/xcshareddata/xcschemes/MDCCatalog.xcscheme
index bd8953157f3..d97f16eb9da 100644
--- a/catalog/MDCCatalog.xcodeproj/xcshareddata/xcschemes/MDCCatalog.xcscheme
+++ b/catalog/MDCCatalog.xcodeproj/xcshareddata/xcschemes/MDCCatalog.xcscheme
@@ -28,7 +28,7 @@
             buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B46A89F191593E7818BFE1A9B2E84BA1"
+               BlueprintIdentifier = "3E2E7CBF5A69F7357CB0E4A1EE2BE49F"
                BuildableName = "MaterialComponentsBeta-Unit-ActionSheet+ActionSheetThemer-UnitTests.xctest"
                BlueprintName = "MaterialComponentsBeta-Unit-ActionSheet+ActionSheetThemer-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -42,7 +42,7 @@
             buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9C03A67AA9048FB21C60468CA43A80B5"
+               BlueprintIdentifier = "A06F5C7178C1AD9F7A3741EC0D78BD34"
                BuildableName = "MaterialComponentsBeta-Unit-ActionSheet+ColorThemer-UnitTests.xctest"
                BlueprintName = "MaterialComponentsBeta-Unit-ActionSheet+ColorThemer-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -56,7 +56,7 @@
             buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C243374FFBBA259187199454E928A0EF"
+               BlueprintIdentifier = "8DC25A5F5327A7ED56ADE6B4CD0B2EB5"
                BuildableName = "MaterialComponents-Unit-ActionSheet-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-ActionSheet-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -75,7 +75,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "3CE7F2FF2A79357EBE4A9F5533CB3AAE"
+               BlueprintIdentifier = "5AEABD73C978E231D0994587B4ACF0E1"
                BuildableName = "MaterialComponents-Unit-ActionSheet+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-ActionSheet+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -85,7 +85,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C243374FFBBA259187199454E928A0EF"
+               BlueprintIdentifier = "8DC25A5F5327A7ED56ADE6B4CD0B2EB5"
                BuildableName = "MaterialComponents-Unit-ActionSheet-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-ActionSheet-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -95,7 +95,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4547F413D2C6A2A9B271A38A673EF509"
+               BlueprintIdentifier = "B0A8024F093ADA9CC587BC090A4419AC"
                BuildableName = "MaterialComponents-Unit-ActivityIndicator-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-ActivityIndicator-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -105,7 +105,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "81668DCA23126964978A4812F69658B9"
+               BlueprintIdentifier = "027EC1DCE82E80AD5CB428F3AD39E984"
                BuildableName = "MaterialComponents-Unit-AnimationTiming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-AnimationTiming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -115,7 +115,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C884CCDEDCD690B111D314BFB95A1FE6"
+               BlueprintIdentifier = "01685AAF95CBA5141F9D3EA6BBE3F6BC"
                BuildableName = "MaterialComponents-Unit-AppBar+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-AppBar+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -125,7 +125,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9201D16F99154F4913D283A7B2EB9D59"
+               BlueprintIdentifier = "360CC26408356C47D4A1A439E8B34410"
                BuildableName = "MaterialComponents-Unit-AppBar-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-AppBar-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -135,7 +135,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "37D55E6DBD4A3DBBEA0F282C03667794"
+               BlueprintIdentifier = "2B7391B2DFF14E1B954DFE5684858FE2"
                BuildableName = "MaterialComponents-Unit-BottomAppBar-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-BottomAppBar-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -145,7 +145,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4648316BB08779C830901915DDE8FA2B"
+               BlueprintIdentifier = "D6FE9B3EDF892DDD9D0F787FEA85B92B"
                BuildableName = "MaterialComponents-Unit-BottomNavigation-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-BottomNavigation-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -155,7 +155,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "17883644854CA8E7B972A1DF4AF36267"
+               BlueprintIdentifier = "1E188139762C3C4CB117FE0998D3D26E"
                BuildableName = "MaterialComponents-Unit-BottomSheet-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-BottomSheet-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -165,7 +165,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D7052E1FAD056D1C9A2A8E6D0365E0B2"
+               BlueprintIdentifier = "9E06EC0B192EDCC21C9FBB3179EF4FF1"
                BuildableName = "MaterialComponents-Unit-ButtonBar-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-ButtonBar-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -175,7 +175,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "3A2C530CC8C7DC82EA38550E2DFB9A19"
+               BlueprintIdentifier = "77C34355FC0CD1527B69ED2B007A7DD4"
                BuildableName = "MaterialComponents-Unit-Buttons+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Buttons+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -185,7 +185,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2BCDE3FD10CF2E86D0CF12E10258573C"
+               BlueprintIdentifier = "A71EAA04FB08E01EE3FAC73A2E95767F"
                BuildableName = "MaterialComponents-Unit-Buttons-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Buttons-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -195,7 +195,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "84044043426439D862EBB69C6F0BEDCA"
+               BlueprintIdentifier = "5A4FC0F41A2DEB369D630388A554614F"
                BuildableName = "MaterialComponents-Unit-Cards+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Cards+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -205,7 +205,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "EB3F892DFDFA8D0327F0F85EA9AC7243"
+               BlueprintIdentifier = "81C4EE9F6E002798282F33F8910D6ACB"
                BuildableName = "MaterialComponents-Unit-Cards-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Cards-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -215,7 +215,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D4B73E0D55A0FB0EB43BE608EDE85C4A"
+               BlueprintIdentifier = "E5CF4CA83D5E81EF70FE005E6A8C8FEA"
                BuildableName = "MaterialComponents-Unit-Chips+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Chips+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -225,7 +225,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2FA79C2531C7297C9D070DF718562767"
+               BlueprintIdentifier = "3F985DA4F3E8B5459CD0DFC100BD0EC4"
                BuildableName = "MaterialComponents-Unit-Chips-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Chips-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -235,7 +235,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C72E8828780541721980825D70661EE8"
+               BlueprintIdentifier = "45FDA756DF5E703C196D4AB94261BD5B"
                BuildableName = "MaterialComponents-Unit-CollectionCells-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-CollectionCells-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -245,7 +245,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2BEDB09D770471597C010F4485FD4D60"
+               BlueprintIdentifier = "77CED09DA4CB77C956A8F549CBDA11A8"
                BuildableName = "MaterialComponents-Unit-CollectionLayoutAttributes-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-CollectionLayoutAttributes-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -255,7 +255,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E456E4476A32B8C2C703DAECF57F3956"
+               BlueprintIdentifier = "F4B8E12E2380F086C99D6CE2939B11E5"
                BuildableName = "MaterialComponents-Unit-Collections-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Collections-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -265,7 +265,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "03BEE07E6270A80F59F7E9FC02ECF9E2"
+               BlueprintIdentifier = "74248269CDE0EE1BEE5FA70A5A569146"
                BuildableName = "MaterialComponents-Unit-Dialogs-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Dialogs-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -275,7 +275,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8E1DA7732CEFBBD92D86CF320881DF9C"
+               BlueprintIdentifier = "BD3536BF760F8AEEF8E9E04AEEB496E6"
                BuildableName = "MaterialComponents-Unit-FeatureHighlight-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-FeatureHighlight-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -285,7 +285,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "579B2656C9CDEFE9AA35C515A53C054D"
+               BlueprintIdentifier = "77C81E4C3A8D258D994E760532F18BF7"
                BuildableName = "MaterialComponents-Unit-FlexibleHeader-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-FlexibleHeader-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -295,7 +295,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D9285A8653D91C2F224488424E6FEFB5"
+               BlueprintIdentifier = "40538FB8F5280A29E587B2AC7FA19996"
                BuildableName = "MaterialComponents-Unit-HeaderStackView-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-HeaderStackView-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -305,7 +305,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7B568A1F7536E212B802689079CA3FDC"
+               BlueprintIdentifier = "39534A756102CCEB20BCB47FA182E668"
                BuildableName = "MaterialComponents-Unit-Ink-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Ink-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -315,7 +315,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B8DAAE0D1489BEE06BD9C3A43BC39C66"
+               BlueprintIdentifier = "F02FF61FFD3A802B2E6990E6B9EE5055"
                BuildableName = "MaterialComponents-Unit-LibraryInfo-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-LibraryInfo-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -325,7 +325,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D5F6699A69E956D6F9114AAFDA116CBA"
+               BlueprintIdentifier = "03427D937E6D8A8191170B67AE7889C9"
                BuildableName = "MaterialComponents-Unit-List-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-List-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -335,7 +335,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "87C55ADC7DFF64FCF1A814B11DF6E9C1"
+               BlueprintIdentifier = "54E4A1F93A01EFD44DF2FE9F161F5432"
                BuildableName = "MaterialComponents-Unit-MaskedTransition-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-MaskedTransition-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -345,7 +345,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "F7DF8D96EF9A9161BA5B7DA666F64E89"
+               BlueprintIdentifier = "B4629C7878F9AFE418078795704416C5"
                BuildableName = "MaterialComponents-Unit-NavigationBar-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-NavigationBar-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -355,7 +355,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9790FED9A3DB872D9E89B42330FFB09C"
+               BlueprintIdentifier = "E3CBD9C1497A4E2DAAC98B2EAAA0479E"
                BuildableName = "MaterialComponents-Unit-NavigationDrawer-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-NavigationDrawer-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -365,7 +365,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E2ACEE0FB895F2FDAA5C81EF983DAEA6"
+               BlueprintIdentifier = "D170AD26DF679291AB1D74BB27AC7C8B"
                BuildableName = "MaterialComponents-Unit-OverlayWindow-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-OverlayWindow-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -375,7 +375,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "0730E62DDAC3B18CCA6E7D03389BE794"
+               BlueprintIdentifier = "EE6CF86481A77C792D90EFD206C1CECB"
                BuildableName = "MaterialComponents-Unit-PageControl-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-PageControl-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -385,7 +385,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A9B3732FDCCBBA6C6E07EA09C79CB9D7"
+               BlueprintIdentifier = "D874218BA137CC6352E8E6E9332504FD"
                BuildableName = "MaterialComponents-Unit-Palettes-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Palettes-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -395,7 +395,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A88B9F43EF9E2E50EC5B1179D32BF7B8"
+               BlueprintIdentifier = "11781C83418AE7B8585083ED3C25C17F"
                BuildableName = "MaterialComponents-Unit-ProgressView-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-ProgressView-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -405,7 +405,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "CCB15457B97469A24197B23015E3BB62"
+               BlueprintIdentifier = "3E55985B3B36899547E3DAD57139D837"
                BuildableName = "MaterialComponents-Unit-Ripple-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Ripple-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -415,7 +415,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9C849EF8628302FEFF5B3304DEAE6C7C"
+               BlueprintIdentifier = "40DF556CD433DD58174A388CB98720BA"
                BuildableName = "MaterialComponents-Unit-ShadowElevations-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-ShadowElevations-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -425,7 +425,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2EF36EFCA0C260686399D6906589BFFE"
+               BlueprintIdentifier = "63BECCA23B5C7169DC15BE5A873A72DE"
                BuildableName = "MaterialComponents-Unit-ShadowLayer-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-ShadowLayer-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -435,7 +435,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "6CA356318CD060DC1C82FFB4267FD0D7"
+               BlueprintIdentifier = "39710615DB72A2B845D5C1FAE318B3FD"
                BuildableName = "MaterialComponents-Unit-ShapeLibrary-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-ShapeLibrary-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -445,7 +445,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "82E0A549120029E0AFEB371AD9EDE7E0"
+               BlueprintIdentifier = "A3B3E8A72DCB2CA75D4911B5D2451F50"
                BuildableName = "MaterialComponents-Unit-Shapes-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Shapes-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -455,7 +455,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A3B75D12F9A6943E2C4C2DE1F88699FC"
+               BlueprintIdentifier = "8CA0AEE54D05CD0F8A9E620AF28391A1"
                BuildableName = "MaterialComponents-Unit-Slider-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Slider-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -465,7 +465,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9A511C495EEE8D94D17411E09EAF75CF"
+               BlueprintIdentifier = "DD00D81B63E0194EE3564DE3ACE5C85E"
                BuildableName = "MaterialComponents-Unit-Snackbar-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Snackbar-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -475,7 +475,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "55F7FE7ED8DF475B8CA4FCC1DFE1ADFD"
+               BlueprintIdentifier = "D2E7D3177D716EEC8BDDA94E73594540"
                BuildableName = "MaterialComponents-Unit-Tabs+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Tabs+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -485,7 +485,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "0D9B66F9EDDE6704361F3AAD6FFC334C"
+               BlueprintIdentifier = "ACE81B693518F7EF088F6C940F36CA00"
                BuildableName = "MaterialComponents-Unit-Tabs-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Tabs-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -495,7 +495,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E36C3E0357E1B6F4B7388997A95A20F3"
+               BlueprintIdentifier = "B50EEF945A805597D167E9A4A2BF40E1"
                BuildableName = "MaterialComponents-Unit-TextFields+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-TextFields+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -505,7 +505,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "191841A71E52E11980E28734B04846D8"
+               BlueprintIdentifier = "9DA1A0A583AD4899700804119FFD82FD"
                BuildableName = "MaterialComponents-Unit-TextFields-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-TextFields-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -515,7 +515,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "CEEE93126070EC09090E743D67229203"
+               BlueprintIdentifier = "284C1435D749967DBB39C2C7BEEC913D"
                BuildableName = "MaterialComponents-Unit-Themes-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Themes-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -525,7 +525,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A52E7E373F52402F4D48539F925BBD64"
+               BlueprintIdentifier = "6D6C1C5C03CAFD5D168FAB91261516D7"
                BuildableName = "MaterialComponents-Unit-Typography-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Typography-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -535,7 +535,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "99188D890B3441BA55072414421EEDCE"
+               BlueprintIdentifier = "8F3FD7328015DC98B8037E7FFF518448"
                BuildableName = "MaterialComponents-Unit-private-Application-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-private-Application-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -545,7 +545,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "73134B76AD07427A553161A59F1456D8"
+               BlueprintIdentifier = "B806406D612E43DCE5A95FEEA92EC974"
                BuildableName = "MaterialComponents-Unit-private-KeyboardWatcher-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-private-KeyboardWatcher-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -555,7 +555,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ED2434F6BC5A72ED088A1459C8C1BB84"
+               BlueprintIdentifier = "3B0715BE751696065197E7B132CF798F"
                BuildableName = "MaterialComponents-Unit-private-Math-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-private-Math-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -565,7 +565,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "FBE7D167A075E4C1427EE126D37D883F"
+               BlueprintIdentifier = "CB469A2460E3EB8813D9C7F41CEE2CBE"
                BuildableName = "MaterialComponents-Unit-private-Overlay-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-private-Overlay-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -575,7 +575,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C5222EB179E74FADC44D3B41D067DAF7"
+               BlueprintIdentifier = "1696A1FD72898E5DC7DA0796EB5316E1"
                BuildableName = "MaterialComponents-Unit-private-ThumbTrack-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-private-ThumbTrack-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -585,7 +585,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "5D70D1693DB978AF46AC36F518437534"
+               BlueprintIdentifier = "9AFC701DBAF2EF24708C16FEEBD31375"
                BuildableName = "MaterialComponents-Unit-private-UIMetrics-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-private-UIMetrics-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -595,7 +595,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D2A659B2FA8E2182AE902DF8D0EBE106"
+               BlueprintIdentifier = "4ACBFD51FB960AC748AEB19DF9674935"
                BuildableName = "MaterialComponents-Unit-schemes-Color-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-schemes-Color-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -605,7 +605,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "70D12E31E7F57773106B764C32477A6B"
+               BlueprintIdentifier = "B44ED38F9D474CF38FADA04FDF5D2690"
                BuildableName = "MaterialComponents-Unit-schemes-Container-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-schemes-Container-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -615,7 +615,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4ADD4C40C02006B4A986765D6EC956D1"
+               BlueprintIdentifier = "C748C221DF64CED78C87F098E988341D"
                BuildableName = "MaterialComponents-Unit-schemes-Shape-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-schemes-Shape-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -625,7 +625,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9AFB6318DD93A90366F3FA009FD5F710"
+               BlueprintIdentifier = "7155239C0BF2B487269FB421906F7B92"
                BuildableName = "MaterialComponents-Unit-schemes-Typography-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-schemes-Typography-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -635,7 +635,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B46A89F191593E7818BFE1A9B2E84BA1"
+               BlueprintIdentifier = "3E2E7CBF5A69F7357CB0E4A1EE2BE49F"
                BuildableName = "MaterialComponentsBeta-Unit-ActionSheet+ActionSheetThemer-UnitTests.xctest"
                BlueprintName = "MaterialComponentsBeta-Unit-ActionSheet+ActionSheetThemer-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -645,7 +645,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9C03A67AA9048FB21C60468CA43A80B5"
+               BlueprintIdentifier = "A06F5C7178C1AD9F7A3741EC0D78BD34"
                BuildableName = "MaterialComponentsBeta-Unit-ActionSheet+ColorThemer-UnitTests.xctest"
                BlueprintName = "MaterialComponentsBeta-Unit-ActionSheet+ColorThemer-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -655,7 +655,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ABDAAA85E1D773514812FEBE81945EBE"
+               BlueprintIdentifier = "88EDC6F080DD13A85C457E8DF3D5680A"
                BuildableName = "MaterialComponentsBeta-Unit-BottomNavigation-UnitTests.xctest"
                BlueprintName = "MaterialComponentsBeta-Unit-BottomNavigation-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -665,7 +665,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7CE89E51CF331B1DC1A761A49A8B5985"
+               BlueprintIdentifier = "1407E65B882514BA19258E4E7E2CD8E7"
                BuildableName = "MaterialComponentsBeta-Unit-ButtonBar+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponentsBeta-Unit-ButtonBar+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -675,7 +675,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A785BDE337DEB34BD4A4081CA81594EA"
+               BlueprintIdentifier = "2EB4861D0DEFBC60759904424582E798"
                BuildableName = "MaterialComponentsSnapshotTests-Unit-SnapshotTests.xctest"
                BlueprintName = "MaterialComponentsSnapshotTests-Unit-SnapshotTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -685,7 +685,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "989C0A15DC2B47C8D0ED1FB9D3D7834E"
+               BlueprintIdentifier = "BEFB959C8B8734803945286E9C2346C5"
                BuildableName = "MaterialComponents-Unit-List+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-List+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -695,7 +695,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2E500851D3F02492C5E3B01ED09B8D28"
+               BlueprintIdentifier = "CCD06113384824F0016FA0CF5D813CF6"
                BuildableName = "MaterialComponents-Unit-Dialogs+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Dialogs+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -705,9 +705,9 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E420F376A09AC8E3AD7D8B3D0A9D4837"
-               BuildableName = "MaterialComponentsBeta-Unit-Tabs2-UnitTests.xctest"
-               BlueprintName = "MaterialComponentsBeta-Unit-Tabs2-UnitTests"
+               BlueprintIdentifier = "1566E5D3CA962D19D03010D84C2AF146"
+               BuildableName = "MaterialComponentsBeta-Unit-Tabs+TabBarView-UnitTests.xctest"
+               BlueprintName = "MaterialComponentsBeta-Unit-Tabs+TabBarView-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
             </BuildableReference>
          </TestableReference>
diff --git a/catalog/MDCDragons.xcodeproj/xcshareddata/xcschemes/MDCDragons.xcscheme b/catalog/MDCDragons.xcodeproj/xcshareddata/xcschemes/MDCDragons.xcscheme
index 9c1cf104573..329e316fec5 100644
--- a/catalog/MDCDragons.xcodeproj/xcshareddata/xcschemes/MDCDragons.xcscheme
+++ b/catalog/MDCDragons.xcodeproj/xcshareddata/xcschemes/MDCDragons.xcscheme
@@ -28,7 +28,7 @@
             buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B46A89F191593E7818BFE1A9B2E84BA1"
+               BlueprintIdentifier = "3E2E7CBF5A69F7357CB0E4A1EE2BE49F"
                BuildableName = "MaterialComponentsBeta-Unit-ActionSheet+ActionSheetThemer-UnitTests.xctest"
                BlueprintName = "MaterialComponentsBeta-Unit-ActionSheet+ActionSheetThemer-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -42,7 +42,7 @@
             buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9C03A67AA9048FB21C60468CA43A80B5"
+               BlueprintIdentifier = "A06F5C7178C1AD9F7A3741EC0D78BD34"
                BuildableName = "MaterialComponentsBeta-Unit-ActionSheet+ColorThemer-UnitTests.xctest"
                BlueprintName = "MaterialComponentsBeta-Unit-ActionSheet+ColorThemer-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -60,7 +60,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "3CE7F2FF2A79357EBE4A9F5533CB3AAE"
+               BlueprintIdentifier = "5AEABD73C978E231D0994587B4ACF0E1"
                BuildableName = "MaterialComponents-Unit-ActionSheet+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-ActionSheet+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -70,7 +70,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C243374FFBBA259187199454E928A0EF"
+               BlueprintIdentifier = "8DC25A5F5327A7ED56ADE6B4CD0B2EB5"
                BuildableName = "MaterialComponents-Unit-ActionSheet-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-ActionSheet-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -80,7 +80,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4547F413D2C6A2A9B271A38A673EF509"
+               BlueprintIdentifier = "B0A8024F093ADA9CC587BC090A4419AC"
                BuildableName = "MaterialComponents-Unit-ActivityIndicator-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-ActivityIndicator-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -90,7 +90,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "81668DCA23126964978A4812F69658B9"
+               BlueprintIdentifier = "027EC1DCE82E80AD5CB428F3AD39E984"
                BuildableName = "MaterialComponents-Unit-AnimationTiming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-AnimationTiming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -100,7 +100,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C884CCDEDCD690B111D314BFB95A1FE6"
+               BlueprintIdentifier = "01685AAF95CBA5141F9D3EA6BBE3F6BC"
                BuildableName = "MaterialComponents-Unit-AppBar+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-AppBar+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -110,7 +110,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9201D16F99154F4913D283A7B2EB9D59"
+               BlueprintIdentifier = "360CC26408356C47D4A1A439E8B34410"
                BuildableName = "MaterialComponents-Unit-AppBar-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-AppBar-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -120,7 +120,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "37D55E6DBD4A3DBBEA0F282C03667794"
+               BlueprintIdentifier = "2B7391B2DFF14E1B954DFE5684858FE2"
                BuildableName = "MaterialComponents-Unit-BottomAppBar-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-BottomAppBar-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -130,7 +130,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4648316BB08779C830901915DDE8FA2B"
+               BlueprintIdentifier = "D6FE9B3EDF892DDD9D0F787FEA85B92B"
                BuildableName = "MaterialComponents-Unit-BottomNavigation-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-BottomNavigation-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -140,7 +140,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "17883644854CA8E7B972A1DF4AF36267"
+               BlueprintIdentifier = "1E188139762C3C4CB117FE0998D3D26E"
                BuildableName = "MaterialComponents-Unit-BottomSheet-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-BottomSheet-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -150,7 +150,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D7052E1FAD056D1C9A2A8E6D0365E0B2"
+               BlueprintIdentifier = "9E06EC0B192EDCC21C9FBB3179EF4FF1"
                BuildableName = "MaterialComponents-Unit-ButtonBar-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-ButtonBar-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -160,7 +160,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "3A2C530CC8C7DC82EA38550E2DFB9A19"
+               BlueprintIdentifier = "77C34355FC0CD1527B69ED2B007A7DD4"
                BuildableName = "MaterialComponents-Unit-Buttons+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Buttons+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -170,7 +170,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2BCDE3FD10CF2E86D0CF12E10258573C"
+               BlueprintIdentifier = "A71EAA04FB08E01EE3FAC73A2E95767F"
                BuildableName = "MaterialComponents-Unit-Buttons-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Buttons-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -180,7 +180,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "84044043426439D862EBB69C6F0BEDCA"
+               BlueprintIdentifier = "5A4FC0F41A2DEB369D630388A554614F"
                BuildableName = "MaterialComponents-Unit-Cards+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Cards+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -190,7 +190,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "EB3F892DFDFA8D0327F0F85EA9AC7243"
+               BlueprintIdentifier = "81C4EE9F6E002798282F33F8910D6ACB"
                BuildableName = "MaterialComponents-Unit-Cards-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Cards-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -200,7 +200,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D4B73E0D55A0FB0EB43BE608EDE85C4A"
+               BlueprintIdentifier = "E5CF4CA83D5E81EF70FE005E6A8C8FEA"
                BuildableName = "MaterialComponents-Unit-Chips+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Chips+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -210,7 +210,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2FA79C2531C7297C9D070DF718562767"
+               BlueprintIdentifier = "3F985DA4F3E8B5459CD0DFC100BD0EC4"
                BuildableName = "MaterialComponents-Unit-Chips-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Chips-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -220,7 +220,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C72E8828780541721980825D70661EE8"
+               BlueprintIdentifier = "45FDA756DF5E703C196D4AB94261BD5B"
                BuildableName = "MaterialComponents-Unit-CollectionCells-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-CollectionCells-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -230,7 +230,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2BEDB09D770471597C010F4485FD4D60"
+               BlueprintIdentifier = "77CED09DA4CB77C956A8F549CBDA11A8"
                BuildableName = "MaterialComponents-Unit-CollectionLayoutAttributes-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-CollectionLayoutAttributes-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -240,7 +240,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E456E4476A32B8C2C703DAECF57F3956"
+               BlueprintIdentifier = "F4B8E12E2380F086C99D6CE2939B11E5"
                BuildableName = "MaterialComponents-Unit-Collections-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Collections-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -250,7 +250,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "03BEE07E6270A80F59F7E9FC02ECF9E2"
+               BlueprintIdentifier = "74248269CDE0EE1BEE5FA70A5A569146"
                BuildableName = "MaterialComponents-Unit-Dialogs-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Dialogs-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -260,7 +260,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8E1DA7732CEFBBD92D86CF320881DF9C"
+               BlueprintIdentifier = "BD3536BF760F8AEEF8E9E04AEEB496E6"
                BuildableName = "MaterialComponents-Unit-FeatureHighlight-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-FeatureHighlight-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -270,7 +270,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "579B2656C9CDEFE9AA35C515A53C054D"
+               BlueprintIdentifier = "77C81E4C3A8D258D994E760532F18BF7"
                BuildableName = "MaterialComponents-Unit-FlexibleHeader-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-FlexibleHeader-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -280,7 +280,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D9285A8653D91C2F224488424E6FEFB5"
+               BlueprintIdentifier = "40538FB8F5280A29E587B2AC7FA19996"
                BuildableName = "MaterialComponents-Unit-HeaderStackView-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-HeaderStackView-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -290,7 +290,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7B568A1F7536E212B802689079CA3FDC"
+               BlueprintIdentifier = "39534A756102CCEB20BCB47FA182E668"
                BuildableName = "MaterialComponents-Unit-Ink-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Ink-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -300,7 +300,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B8DAAE0D1489BEE06BD9C3A43BC39C66"
+               BlueprintIdentifier = "F02FF61FFD3A802B2E6990E6B9EE5055"
                BuildableName = "MaterialComponents-Unit-LibraryInfo-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-LibraryInfo-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -310,7 +310,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D5F6699A69E956D6F9114AAFDA116CBA"
+               BlueprintIdentifier = "03427D937E6D8A8191170B67AE7889C9"
                BuildableName = "MaterialComponents-Unit-List-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-List-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -320,7 +320,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "87C55ADC7DFF64FCF1A814B11DF6E9C1"
+               BlueprintIdentifier = "54E4A1F93A01EFD44DF2FE9F161F5432"
                BuildableName = "MaterialComponents-Unit-MaskedTransition-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-MaskedTransition-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -330,7 +330,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "F7DF8D96EF9A9161BA5B7DA666F64E89"
+               BlueprintIdentifier = "B4629C7878F9AFE418078795704416C5"
                BuildableName = "MaterialComponents-Unit-NavigationBar-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-NavigationBar-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -340,7 +340,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9790FED9A3DB872D9E89B42330FFB09C"
+               BlueprintIdentifier = "E3CBD9C1497A4E2DAAC98B2EAAA0479E"
                BuildableName = "MaterialComponents-Unit-NavigationDrawer-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-NavigationDrawer-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -350,7 +350,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E2ACEE0FB895F2FDAA5C81EF983DAEA6"
+               BlueprintIdentifier = "D170AD26DF679291AB1D74BB27AC7C8B"
                BuildableName = "MaterialComponents-Unit-OverlayWindow-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-OverlayWindow-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -360,7 +360,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "0730E62DDAC3B18CCA6E7D03389BE794"
+               BlueprintIdentifier = "EE6CF86481A77C792D90EFD206C1CECB"
                BuildableName = "MaterialComponents-Unit-PageControl-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-PageControl-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -370,7 +370,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A9B3732FDCCBBA6C6E07EA09C79CB9D7"
+               BlueprintIdentifier = "D874218BA137CC6352E8E6E9332504FD"
                BuildableName = "MaterialComponents-Unit-Palettes-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Palettes-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -380,7 +380,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A88B9F43EF9E2E50EC5B1179D32BF7B8"
+               BlueprintIdentifier = "11781C83418AE7B8585083ED3C25C17F"
                BuildableName = "MaterialComponents-Unit-ProgressView-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-ProgressView-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -390,7 +390,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "CCB15457B97469A24197B23015E3BB62"
+               BlueprintIdentifier = "3E55985B3B36899547E3DAD57139D837"
                BuildableName = "MaterialComponents-Unit-Ripple-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Ripple-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -400,7 +400,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9C849EF8628302FEFF5B3304DEAE6C7C"
+               BlueprintIdentifier = "40DF556CD433DD58174A388CB98720BA"
                BuildableName = "MaterialComponents-Unit-ShadowElevations-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-ShadowElevations-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -410,7 +410,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2EF36EFCA0C260686399D6906589BFFE"
+               BlueprintIdentifier = "63BECCA23B5C7169DC15BE5A873A72DE"
                BuildableName = "MaterialComponents-Unit-ShadowLayer-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-ShadowLayer-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -420,7 +420,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "6CA356318CD060DC1C82FFB4267FD0D7"
+               BlueprintIdentifier = "39710615DB72A2B845D5C1FAE318B3FD"
                BuildableName = "MaterialComponents-Unit-ShapeLibrary-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-ShapeLibrary-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -430,7 +430,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "82E0A549120029E0AFEB371AD9EDE7E0"
+               BlueprintIdentifier = "A3B3E8A72DCB2CA75D4911B5D2451F50"
                BuildableName = "MaterialComponents-Unit-Shapes-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Shapes-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -440,7 +440,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A3B75D12F9A6943E2C4C2DE1F88699FC"
+               BlueprintIdentifier = "8CA0AEE54D05CD0F8A9E620AF28391A1"
                BuildableName = "MaterialComponents-Unit-Slider-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Slider-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -450,7 +450,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9A511C495EEE8D94D17411E09EAF75CF"
+               BlueprintIdentifier = "DD00D81B63E0194EE3564DE3ACE5C85E"
                BuildableName = "MaterialComponents-Unit-Snackbar-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Snackbar-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -460,7 +460,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "55F7FE7ED8DF475B8CA4FCC1DFE1ADFD"
+               BlueprintIdentifier = "D2E7D3177D716EEC8BDDA94E73594540"
                BuildableName = "MaterialComponents-Unit-Tabs+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Tabs+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -470,7 +470,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "0D9B66F9EDDE6704361F3AAD6FFC334C"
+               BlueprintIdentifier = "ACE81B693518F7EF088F6C940F36CA00"
                BuildableName = "MaterialComponents-Unit-Tabs-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Tabs-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -480,7 +480,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E36C3E0357E1B6F4B7388997A95A20F3"
+               BlueprintIdentifier = "B50EEF945A805597D167E9A4A2BF40E1"
                BuildableName = "MaterialComponents-Unit-TextFields+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-TextFields+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -490,7 +490,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "191841A71E52E11980E28734B04846D8"
+               BlueprintIdentifier = "9DA1A0A583AD4899700804119FFD82FD"
                BuildableName = "MaterialComponents-Unit-TextFields-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-TextFields-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -500,7 +500,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "CEEE93126070EC09090E743D67229203"
+               BlueprintIdentifier = "284C1435D749967DBB39C2C7BEEC913D"
                BuildableName = "MaterialComponents-Unit-Themes-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Themes-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -510,7 +510,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A52E7E373F52402F4D48539F925BBD64"
+               BlueprintIdentifier = "6D6C1C5C03CAFD5D168FAB91261516D7"
                BuildableName = "MaterialComponents-Unit-Typography-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Typography-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -520,7 +520,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "99188D890B3441BA55072414421EEDCE"
+               BlueprintIdentifier = "8F3FD7328015DC98B8037E7FFF518448"
                BuildableName = "MaterialComponents-Unit-private-Application-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-private-Application-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -530,7 +530,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "73134B76AD07427A553161A59F1456D8"
+               BlueprintIdentifier = "B806406D612E43DCE5A95FEEA92EC974"
                BuildableName = "MaterialComponents-Unit-private-KeyboardWatcher-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-private-KeyboardWatcher-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -540,7 +540,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ED2434F6BC5A72ED088A1459C8C1BB84"
+               BlueprintIdentifier = "3B0715BE751696065197E7B132CF798F"
                BuildableName = "MaterialComponents-Unit-private-Math-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-private-Math-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -550,7 +550,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "FBE7D167A075E4C1427EE126D37D883F"
+               BlueprintIdentifier = "CB469A2460E3EB8813D9C7F41CEE2CBE"
                BuildableName = "MaterialComponents-Unit-private-Overlay-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-private-Overlay-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -560,7 +560,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C5222EB179E74FADC44D3B41D067DAF7"
+               BlueprintIdentifier = "1696A1FD72898E5DC7DA0796EB5316E1"
                BuildableName = "MaterialComponents-Unit-private-ThumbTrack-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-private-ThumbTrack-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -570,7 +570,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "5D70D1693DB978AF46AC36F518437534"
+               BlueprintIdentifier = "9AFC701DBAF2EF24708C16FEEBD31375"
                BuildableName = "MaterialComponents-Unit-private-UIMetrics-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-private-UIMetrics-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -580,7 +580,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D2A659B2FA8E2182AE902DF8D0EBE106"
+               BlueprintIdentifier = "4ACBFD51FB960AC748AEB19DF9674935"
                BuildableName = "MaterialComponents-Unit-schemes-Color-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-schemes-Color-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -590,7 +590,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "70D12E31E7F57773106B764C32477A6B"
+               BlueprintIdentifier = "B44ED38F9D474CF38FADA04FDF5D2690"
                BuildableName = "MaterialComponents-Unit-schemes-Container-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-schemes-Container-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -600,7 +600,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4ADD4C40C02006B4A986765D6EC956D1"
+               BlueprintIdentifier = "C748C221DF64CED78C87F098E988341D"
                BuildableName = "MaterialComponents-Unit-schemes-Shape-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-schemes-Shape-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -610,7 +610,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9AFB6318DD93A90366F3FA009FD5F710"
+               BlueprintIdentifier = "7155239C0BF2B487269FB421906F7B92"
                BuildableName = "MaterialComponents-Unit-schemes-Typography-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-schemes-Typography-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -620,7 +620,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B46A89F191593E7818BFE1A9B2E84BA1"
+               BlueprintIdentifier = "3E2E7CBF5A69F7357CB0E4A1EE2BE49F"
                BuildableName = "MaterialComponentsBeta-Unit-ActionSheet+ActionSheetThemer-UnitTests.xctest"
                BlueprintName = "MaterialComponentsBeta-Unit-ActionSheet+ActionSheetThemer-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -630,7 +630,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9C03A67AA9048FB21C60468CA43A80B5"
+               BlueprintIdentifier = "A06F5C7178C1AD9F7A3741EC0D78BD34"
                BuildableName = "MaterialComponentsBeta-Unit-ActionSheet+ColorThemer-UnitTests.xctest"
                BlueprintName = "MaterialComponentsBeta-Unit-ActionSheet+ColorThemer-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -640,7 +640,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ABDAAA85E1D773514812FEBE81945EBE"
+               BlueprintIdentifier = "88EDC6F080DD13A85C457E8DF3D5680A"
                BuildableName = "MaterialComponentsBeta-Unit-BottomNavigation-UnitTests.xctest"
                BlueprintName = "MaterialComponentsBeta-Unit-BottomNavigation-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -650,7 +650,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7CE89E51CF331B1DC1A761A49A8B5985"
+               BlueprintIdentifier = "1407E65B882514BA19258E4E7E2CD8E7"
                BuildableName = "MaterialComponentsBeta-Unit-ButtonBar+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponentsBeta-Unit-ButtonBar+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -660,7 +660,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A785BDE337DEB34BD4A4081CA81594EA"
+               BlueprintIdentifier = "2EB4861D0DEFBC60759904424582E798"
                BuildableName = "MaterialComponentsSnapshotTests-Unit-SnapshotTests.xctest"
                BlueprintName = "MaterialComponentsSnapshotTests-Unit-SnapshotTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -670,7 +670,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "989C0A15DC2B47C8D0ED1FB9D3D7834E"
+               BlueprintIdentifier = "BEFB959C8B8734803945286E9C2346C5"
                BuildableName = "MaterialComponents-Unit-List+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-List+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -680,7 +680,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2E500851D3F02492C5E3B01ED09B8D28"
+               BlueprintIdentifier = "CCD06113384824F0016FA0CF5D813CF6"
                BuildableName = "MaterialComponents-Unit-Dialogs+Theming-UnitTests.xctest"
                BlueprintName = "MaterialComponents-Unit-Dialogs+Theming-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -690,9 +690,9 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E420F376A09AC8E3AD7D8B3D0A9D4837"
-               BuildableName = "MaterialComponentsBeta-Unit-Tabs2-UnitTests.xctest"
-               BlueprintName = "MaterialComponentsBeta-Unit-Tabs2-UnitTests"
+               BlueprintIdentifier = "1566E5D3CA962D19D03010D84C2AF146"
+               BuildableName = "MaterialComponentsBeta-Unit-Tabs+TabBarView-UnitTests.xctest"
+               BlueprintName = "MaterialComponentsBeta-Unit-Tabs+TabBarView-UnitTests"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
             </BuildableReference>
          </TestableReference>
diff --git a/catalog/Podfile b/catalog/Podfile
index c55ebe1f3ab..f0a922ddab3 100644
--- a/catalog/Podfile
+++ b/catalog/Podfile
@@ -73,7 +73,7 @@ target "MDCCatalog" do
     'ActionSheet+ColorThemer/UnitTests',
     'BottomNavigation/UnitTests',
     'ButtonBar+Theming/UnitTests',
-    'Tabs2/UnitTests',
+    'Tabs+TabBarView/UnitTests',
   ]
   pod 'MaterialComponentsSnapshotTests', :path => '../', :testspecs => [
     'SnapshotTests'
diff --git a/components/Tabs/BUILD b/components/Tabs/BUILD
index d3863c4ac95..eefeaf6fb30 100644
--- a/components/Tabs/BUILD
+++ b/components/Tabs/BUILD
@@ -91,10 +91,15 @@ mdc_extension_objc_library(
     ],
 )
 
+mdc_extension_objc_library(
+    name = "TabBarView",
+)
+
 mdc_examples_objc_library(
     name = "ObjcExamples",
     deps = [
         ":ColorThemer",
+        ":TabBarView",
         ":Tabs",
         ":TypographyThemer",
         "//components/AppBar",
@@ -133,6 +138,13 @@ mdc_objc_library(
     visibility = ["//visibility:private"],
 )
 
+mdc_objc_library(
+    name = "privateTabBarView",
+    hdrs = native.glob(["src/TabBarView/private/*.h"]),
+    includes = ["src/TabBarView/private"],
+    visibility = ["//visibility:private"],
+)
+
 mdc_objc_library(
     name = "unit_test_sources",
     testonly = 1,
@@ -173,20 +185,38 @@ mdc_objc_library(
     ],
 )
 
+mdc_objc_library(
+    name = "unit_test_tabbarview_sources",
+    srcs = native.glob([
+        "tests/unit/TabBarView/*.m",
+    ]),
+    sdk_frameworks = [
+        "CoreGraphics",
+        "XCTest",
+    ],
+    deps = [
+        ":TabBarView",
+        ":privateTabBarView",
+    ],
+)
+
 mdc_unit_test_suite(
     name = "unit_tests",
     deps = [
         ":unit_test_sources",
+        ":unit_test_tabbarview_sources",
         ":unit_test_theming_sources",
     ],
 )
 
 mdc_snapshot_objc_library(
     name = "snapshot_test_lib",
-    extra_srcs = native.glob(["tests/snapshot/Theming/*.m"]),
+    extra_srcs = native.glob(["tests/snapshot/*/*.m"]),
     deps = [
+        ":TabBarView",
         ":Tabs",
         ":Theming",
+        ":privateTabBarView",
     ],
 )
 
diff --git a/components/Tabs2/src/MDCTabBarView.h b/components/Tabs/src/TabBarView/MDCTabBarView.h
similarity index 100%
rename from components/Tabs2/src/MDCTabBarView.h
rename to components/Tabs/src/TabBarView/MDCTabBarView.h
diff --git a/components/Tabs2/src/MDCTabBarView.m b/components/Tabs/src/TabBarView/MDCTabBarView.m
similarity index 100%
rename from components/Tabs2/src/MDCTabBarView.m
rename to components/Tabs/src/TabBarView/MDCTabBarView.m
diff --git a/components/Tabs2/src/MaterialTabs2.h b/components/Tabs/src/TabBarView/MaterialTabs+TabBarView.h
similarity index 100%
rename from components/Tabs2/src/MaterialTabs2.h
rename to components/Tabs/src/TabBarView/MaterialTabs+TabBarView.h
diff --git a/components/Tabs2/src/private/MDCTabBarViewItemView.h b/components/Tabs/src/TabBarView/private/MDCTabBarViewItemView.h
similarity index 100%
rename from components/Tabs2/src/private/MDCTabBarViewItemView.h
rename to components/Tabs/src/TabBarView/private/MDCTabBarViewItemView.h
diff --git a/components/Tabs2/src/private/MDCTabBarViewItemView.m b/components/Tabs/src/TabBarView/private/MDCTabBarViewItemView.m
similarity index 100%
rename from components/Tabs2/src/private/MDCTabBarViewItemView.m
rename to components/Tabs/src/TabBarView/private/MDCTabBarViewItemView.m
diff --git a/components/Tabs2/tests/snapshot/MDCTabBarViewItemViewSnapshotTests.m b/components/Tabs/tests/snapshot/TabBarView/MDCTabBarViewItemViewSnapshotTests.m
similarity index 96%
rename from components/Tabs2/tests/snapshot/MDCTabBarViewItemViewSnapshotTests.m
rename to components/Tabs/tests/snapshot/TabBarView/MDCTabBarViewItemViewSnapshotTests.m
index 38f6d4b4996..93d3c24a6f5 100644
--- a/components/Tabs2/tests/snapshot/MDCTabBarViewItemViewSnapshotTests.m
+++ b/components/Tabs/tests/snapshot/TabBarView/MDCTabBarViewItemViewSnapshotTests.m
@@ -15,7 +15,7 @@
 #import <XCTest/XCTest.h>
 
 #import <CoreGraphics/CoreGraphics.h>
-#import "../../src/private/MDCTabBarViewItemView.h"
+#import "../../../src/TabBarView/private/MDCTabBarViewItemView.h"
 #import "MaterialSnapshot.h"
 
 @interface MDCTabBarViewItemViewSnapshotTests : MDCSnapshotTestCase
diff --git a/components/Tabs2/tests/snapshot/MDCTabBarViewSnapshotTests.m b/components/Tabs/tests/snapshot/TabBarView/MDCTabBarViewSnapshotTests.m
similarity index 100%
rename from components/Tabs2/tests/snapshot/MDCTabBarViewSnapshotTests.m
rename to components/Tabs/tests/snapshot/TabBarView/MDCTabBarViewSnapshotTests.m
diff --git a/components/Tabs2/tests/unit/MDCTabBarViewItemViewTests.m b/components/Tabs/tests/unit/TabBarView/MDCTabBarViewItemViewTests.m
similarity index 97%
rename from components/Tabs2/tests/unit/MDCTabBarViewItemViewTests.m
rename to components/Tabs/tests/unit/TabBarView/MDCTabBarViewItemViewTests.m
index 38ea66f538c..019d612e13c 100644
--- a/components/Tabs2/tests/unit/MDCTabBarViewItemViewTests.m
+++ b/components/Tabs/tests/unit/TabBarView/MDCTabBarViewItemViewTests.m
@@ -15,7 +15,7 @@
 #import <XCTest/XCTest.h>
 
 #import <CoreGraphics/CoreGraphics.h>
-#import "../../src/private/MDCTabBarViewItemView.h"
+#import "../../../src/TabBarView/private/MDCTabBarViewItemView.h"
 
 // Minimum width of an item view.
 static const CGFloat kMinWidth = 90;
diff --git a/components/Tabs2/tests/unit/MDCTabBarViewTests.m b/components/Tabs/tests/unit/TabBarView/MDCTabBarViewTests.m
similarity index 100%
rename from components/Tabs2/tests/unit/MDCTabBarViewTests.m
rename to components/Tabs/tests/unit/TabBarView/MDCTabBarViewTests.m
diff --git a/components/Tabs2/BUILD b/components/Tabs2/BUILD
deleted file mode 100644
index e481aefd3d3..00000000000
--- a/components/Tabs2/BUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2019-present The Material Components for iOS Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-load(
-    "//:material_components_ios.bzl",
-    "mdc_examples_objc_library",
-    "mdc_objc_library",
-    "mdc_public_objc_library",
-    "mdc_snapshot_objc_library",
-    "mdc_snapshot_test",
-    "mdc_unit_test_objc_library",
-    "mdc_unit_test_suite",
-)
-
-licenses(["notice"])  # Apache 2.0
-
-mdc_public_objc_library(
-    name = "Tabs2",
-    visibility = ["//visibility:private"],
-)
-
-mdc_objc_library(
-    name = "privateHeaders",
-    hdrs = glob(["src/private/*.h"]),
-    testonly = 1,
-)
-
-mdc_examples_objc_library(
-    name = "ObjcExamples",
-    deps = [
-        ":Tabs2",
-        "//components/schemes/Container",
-    ],
-)
-
-mdc_unit_test_objc_library(
-    name = "unit_test_sources",
-    sdk_frameworks = ["CoreGraphics"],
-    deps = [
-        ":Tabs2",
-        ":privateHeaders",
-    ],
-)
-
-mdc_unit_test_suite(
-    name = "unit_tests",
-    deps = [
-        ":unit_test_sources",
-    ],
-)
-
-mdc_snapshot_objc_library(
-    name = "snapshot_test_lib",
-    deps = [
-        ":Tabs2",
-        ":privateHeaders",
-    ],
-)
-
-mdc_snapshot_test(
-    name = "snapshot_tests",
-    deps = [":snapshot_test_lib"],
-)
diff --git a/components/Tabs2/examples/MDCTabBarViewTypicalExampleViewController.m b/components/Tabs2/examples/MDCTabBarViewTypicalExampleViewController.m
deleted file mode 100644
index 11753be2804..00000000000
--- a/components/Tabs2/examples/MDCTabBarViewTypicalExampleViewController.m
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2019-present the Material Components for iOS authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#import <UIKit/UIKit.h>
-
-#import <MaterialComponents/MaterialContainerScheme.h>
-#import "MaterialTabs2.h"
-
-static NSString *const kExampleTitle = @"TabBarView";
-
-/**
- Typical use example showing how to place an @c MDCTabBarView within another view.
- */
-@interface MDCTabBarViewTypicalExampleViewController : UIViewController
-
-/** The tab bar for this example. */
-@property(nonatomic, strong) MDCTabBarView *tabBar;
-
-/** The container scheme injected into this example. */
-@property(nonatomic, strong) id<MDCContainerScheming> containerScheme;
-
-@end
-
-@implementation MDCTabBarViewTypicalExampleViewController
-
-- (void)viewDidLoad {
-  [super viewDidLoad];
-  self.title = kExampleTitle;
-
-  if (!self.containerScheme) {
-    self.containerScheme = [[MDCContainerScheme alloc] init];
-  }
-
-  self.view.backgroundColor = self.containerScheme.colorScheme.backgroundColor;
-
-  self.tabBar = [[MDCTabBarView alloc] init];
-  CGSize barIntrinsicContentSize = self.tabBar.intrinsicContentSize;
-  self.tabBar.bounds = CGRectMake(0, 0, 0, barIntrinsicContentSize.width);
-  // TODO: Change this to theming (or at least .primaryColor) once we have content.
-  self.tabBar.backgroundColor = self.containerScheme.colorScheme.primaryColorVariant;
-  self.tabBar.translatesAutoresizingMaskIntoConstraints = NO;
-  [self.view addSubview:self.tabBar];
-
-  if (@available(iOS 11.0, *)) {
-    [self.view.layoutMarginsGuide.topAnchor constraintEqualToAnchor:self.tabBar.topAnchor].active =
-        YES;
-  } else {
-    [self.topLayoutGuide.bottomAnchor constraintEqualToAnchor:self.tabBar.topAnchor].active = YES;
-  }
-  [self.view.leftAnchor constraintEqualToAnchor:self.tabBar.leftAnchor].active = YES;
-  [self.view.rightAnchor constraintEqualToAnchor:self.tabBar.rightAnchor].active = YES;
-}
-
-@end
-
-#pragma mark - CatalogByConvention
-@implementation MDCTabBarViewTypicalExampleViewController (CatalogByConvention)
-
-+ (NSDictionary *)catalogMetadata {
-  return @{
-    @"breadcrumbs" : @[ @"Tab Bar", kExampleTitle ],
-    @"primaryDemo" : @NO,
-    @"presentable" : @NO,
-  };
-}
-
-@end