diff --git a/iOS/FlipperKit.podspec b/iOS/FlipperKit.podspec
index de9b08802..d444d1055 100644
--- a/iOS/FlipperKit.podspec
+++ b/iOS/FlipperKit.podspec
@@ -93,18 +93,18 @@ Pod::Spec.new do |spec|
     ss.source_files         = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/**/*.{h,cpp,m,mm}'
   end
 
-  spec.subspec "SonarKitLayoutComponentKitSupport" do |ss|
-    ss.header_dir = "SonarKitLayoutComponentKitSupport"
+  spec.subspec "FlipperKitLayoutComponentKitSupport" do |ss|
+    ss.header_dir = "FlipperKitLayoutComponentKitSupport"
     ss.dependency             'FlipperKit/Core'
     ss.dependency             'Yoga', yoga_version
     ss.dependency             'ComponentKit'
     ss.dependency             'FlipperKit/FlipperKitLayoutPlugin'
     ss.compiler_flags       = folly_compiler_flags
     ss.dependency             'FlipperKit/FlipperKitLayoutPlugin'
-    ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h',
-                             'iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h'
+    ss.public_header_files = 'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h',
+                             'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h'
 
-    ss.source_files         = "iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}"
+    ss.source_files         = "iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/**/*.{h,cpp,m,mm}"
     ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
                                 "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)\"/Headers/Private/FlipperKit/**" }
   end
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.h
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.h
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.h
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKComponent+Sonar.mm
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.h
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.h
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.h
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKInsetComponent+Sonar.h
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.h
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKInsetComponent+Sonar.h
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKInsetComponent+Sonar.mm
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKInsetComponent+Sonar.mm
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKInsetComponent+Sonar.mm
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKStatelessComponent+Sonar.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKStatelessComponent+Sonar.h
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKStatelessComponent+Sonar.h
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKStatelessComponent+Sonar.h
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKStatelessComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKStatelessComponent+Sonar.mm
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/CKStatelessComponent+Sonar.mm
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKStatelessComponent+Sonar.mm
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h
similarity index 85%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h
index d8ec9b1a7..b4f3c92ed 100644
--- a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h
+++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h
@@ -9,7 +9,7 @@
 
 #import <FlipperKitLayoutPlugin/SKDescriptorMapper.h>
 
-@interface SonarKitLayoutComponentKitSupport : NSObject
+@interface FlipperKitLayoutComponentKitSupport : NSObject
 
 + (void)setUpWithDescriptorMapper:(SKDescriptorMapper *)mapper;
 
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.mm
similarity index 92%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.mm
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.mm
index 54a3e81e1..f7194dc73 100644
--- a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.mm
+++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.mm
@@ -7,7 +7,7 @@
  */
 #if FB_SONARKIT_ENABLED
 
-#import "SonarKitLayoutComponentKitSupport.h"
+#import "FlipperKitLayoutComponentKitSupport.h"
 
 #import <ComponentKit/CKComponentRootView.h>
 #import <ComponentKit/CKComponentHostingView.h>
@@ -19,7 +19,7 @@
 #import "SKComponentLayoutDescriptor.h"
 #import "SKComponentLayoutWrapper.h"
 
-@implementation SonarKitLayoutComponentKitSupport
+@implementation FlipperKitLayoutComponentKitSupport
 
 + (void)setUpWithDescriptorMapper:(SKDescriptorMapper *)mapper {
   // What we really want here is "forProtocol:@protocol(CKInspectableView)" but no such luck.
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.h
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.h
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.h
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.mm
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.mm
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.mm
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.h
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.h
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.h
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutDescriptor.mm
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.h
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.h
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.h
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.h
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/Utils.h b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/Utils.h
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/Utils.h
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/Utils.h
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/Utils.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/Utils.mm
similarity index 100%
rename from iOS/Plugins/FlipperKitLayoutPlugin/SonarKitLayoutComponentKitSupport/Utils.mm
rename to iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/Utils.mm
diff --git a/iOS/Sample/AppDelegate.mm b/iOS/Sample/AppDelegate.mm
index ac6745558..7ab81f8bc 100644
--- a/iOS/Sample/AppDelegate.mm
+++ b/iOS/Sample/AppDelegate.mm
@@ -10,7 +10,7 @@
 #import <FlipperKit/FlipperClient.h>
 #import <FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h>
 #import <FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h>
-#import <SonarKitLayoutComponentKitSupport/SonarKitLayoutComponentKitSupport.h>
+#import <FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h>
 #import <SKIOSNetworkPlugin/SKIOSNetworkAdapter.h>
 
 #import "MainViewController.h"
@@ -31,7 +31,7 @@
   FlipperClient *client = [FlipperClient sharedClient];
 
   SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults];
-  [SonarKitLayoutComponentKitSupport setUpWithDescriptorMapper: layoutDescriptorMapper];
+  [FlipperKitLayoutComponentKitSupport setUpWithDescriptorMapper: layoutDescriptorMapper];
   [client addPlugin: [[FlipperKitLayoutPlugin alloc] initWithRootNode: application
                                                withDescriptorMapper: layoutDescriptorMapper]];
 
diff --git a/iOS/Sample/Podfile b/iOS/Sample/Podfile
index ea5a3fcb3..665a29ea0 100644
--- a/iOS/Sample/Podfile
+++ b/iOS/Sample/Podfile
@@ -5,7 +5,7 @@ swift_version = "4.1"
 
 target 'Sample' do
   pod 'FlipperKit', :path => '../../FlipperKit.podspec'
-  pod 'FlipperKit/SonarKitLayoutComponentKitSupport', :path => '../../FlipperKit.podspec'
+  pod 'FlipperKit/FlipperKitLayoutComponentKitSupport', :path => '../../FlipperKit.podspec'
   pod 'FlipperKit/SKIOSNetworkPlugin', :path => '../../FlipperKit.podspec'
   pod 'Flipper', :path => '../../Flipper.podspec'
   post_install do |installer|
diff --git a/iOS/SampleSwift/Podfile b/iOS/SampleSwift/Podfile
index 407682d85..8ec5098a5 100644
--- a/iOS/SampleSwift/Podfile
+++ b/iOS/SampleSwift/Podfile
@@ -8,7 +8,7 @@ target 'SampleSwift' do
   pod 'FlipperKit', :path => '../../FlipperKit.podspec'
   pod 'FlipperKit/SKIOSNetworkPlugin', :path => '../../FlipperKit.podspec'
   # Layout and network plugins are not yet supported for swift projects
-  #pod 'SonarKit/SonarKitLayoutComponentKitSupport', :path => '../../SonarKit.podspec'
+  #pod 'SonarKit/FlipperKitLayoutComponentKitSupport', :path => '../../SonarKit.podspec'
 
   post_install do |installer|
         installer.pods_project.targets.each do |target|
diff --git a/iOS/SampleSwift/SampleSwift/AppDelegate.swift b/iOS/SampleSwift/SampleSwift/AppDelegate.swift
index a0d130aba..fa6dc1dff 100644
--- a/iOS/SampleSwift/SampleSwift/AppDelegate.swift
+++ b/iOS/SampleSwift/SampleSwift/AppDelegate.swift
@@ -15,7 +15,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     let client = FlipperClient.shared()
     // Layout and network plugins are currently not supported for Swift apps.
 //    let layoutDescriptorMapper = SKDescriptorMapper(defaults: ())
-//    SonarKitLayoutComponentKitSupport.setUp(descriptorMapper: layoutDescriptorMapper)
+//    FlipperKitLayoutComponentKitSupport.setUp(descriptorMapper: layoutDescriptorMapper)
 //    client.addPlugin(FlipperKitLayoutPlugin(rootNode: application, descriptorMapper: layoutDescriptorMapper))
 
     client?.add(FlipperKitNetworkPlugin(networkAdapter: SKIOSNetworkAdapter()))