diff --git a/FlipperKit.podspec b/FlipperKit.podspec
new file mode 120000
index 000000000..01cdfc86e
--- /dev/null
+++ b/FlipperKit.podspec
@@ -0,0 +1 @@
+iOS/FlipperKit.podspec
\ No newline at end of file
diff --git a/Sonar.podspec b/Sonar.podspec
deleted file mode 120000
index ec37c815a..000000000
--- a/Sonar.podspec
+++ /dev/null
@@ -1 +0,0 @@
-xplat/Sonar/Sonar.podspec
\ No newline at end of file
diff --git a/SonarKit.podspec b/SonarKit.podspec
deleted file mode 120000
index e8d8908c7..000000000
--- a/SonarKit.podspec
+++ /dev/null
@@ -1 +0,0 @@
-iOS/SonarKit.podspec
\ No newline at end of file
diff --git a/iOS/SonarKit.podspec b/iOS/FlipperKit.podspec
similarity index 100%
rename from iOS/SonarKit.podspec
rename to iOS/FlipperKit.podspec
diff --git a/iOS/Podfile b/iOS/Podfile
index e0596200b..fa69a378c 100644
--- a/iOS/Podfile
+++ b/iOS/Podfile
@@ -8,7 +8,7 @@ target 'FlipperKit' do
   # use_frameworks!
 
   project 'FlipperKit.xcodeproj'
-  pod 'Sonar', :path => '../Sonar.podspec'
+  pod 'Flipper', :path => '../Flipper.podspec'
   # Pods for SonarKit
   pod 'PeerTalk', '~>0.0'
   pod 'RSocket', '~>0.10'
@@ -16,6 +16,5 @@ target 'FlipperKit' do
   pod 'glog', '~>0.3'
   pod 'Folly', '~>1.0'
   pod 'CocoaAsyncSocket', '~>7.6'
-  pod 'Flipper', '~>0.0.1'
 
 end
diff --git a/iOS/Podfile.lock b/iOS/Podfile.lock
index b58abd349..3338b39cf 100644
--- a/iOS/Podfile.lock
+++ b/iOS/Podfile.lock
@@ -3,6 +3,9 @@ PODS:
   - CocoaAsyncSocket (7.6.3)
   - CocoaLibEvent (1.0.0)
   - DoubleConversion (1.1.5)
+  - Flipper (0.7.2):
+    - Folly (~> 1.1)
+    - RSocket (~> 0.10)
   - Folly (1.1.0):
     - boost-for-react-native
     - CocoaLibEvent (~> 1.0)
@@ -14,18 +17,15 @@ PODS:
   - PeerTalk (0.0.2)
   - RSocket (0.10.0):
     - Folly
-  - Sonar (0.7.2):
-    - Folly (~> 1.1)
-    - RSocket (~> 0.10)
 
 DEPENDENCIES:
   - CocoaAsyncSocket (~> 7.6)
   - DoubleConversion (~> 1.1)
+  - Flipper (from `../Flipper.podspec`)
   - Folly (~> 1.0)
   - glog (~> 0.3)
   - PeerTalk (~> 0.0)
   - RSocket (~> 0.10)
-  - Sonar (from `../Sonar.podspec`)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -41,21 +41,21 @@ SPEC REPOS:
     - RSocket
 
 EXTERNAL SOURCES:
-  Sonar:
-    :path: "../Sonar.podspec"
+  Flipper:
+    :path: "../Flipper.podspec"
 
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   CocoaAsyncSocket: eafaa68a7e0ec99ead0a7b35015e0bf25d2c8987
   CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
   DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c
+  Flipper: 495fbd327298fbc55b3ff7cb399eae52c1580494
   Folly: dd92f69322d8535b9df98d7c91e442b0fce2fff2
   glog: 1de0bb937dccdc981596d3b5825ebfb765017ded
   OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e
   PeerTalk: 77481b0a8136f226b90ccf828d6061f70139ffde
   RSocket: 4fdb7e562db30a2d4fceddefdc601749ffc9ebe2
-  Sonar: cfbef2d6119e92563d51bf3cdd9ae34f4eda068b
 
-PODFILE CHECKSUM: b42359a8a1bee962b021782d4c127c6c55bf2003
+PODFILE CHECKSUM: 31bacaa95d90ebfc33e2ca7a8235227e4339f2fd
 
 COCOAPODS: 1.5.3
diff --git a/iOS/Sample/Podfile b/iOS/Sample/Podfile
index 5bce8716a..ea5a3fcb3 100644
--- a/iOS/Sample/Podfile
+++ b/iOS/Sample/Podfile
@@ -4,9 +4,9 @@ source 'https://github.com/CocoaPods/Specs'
 swift_version = "4.1"
 
 target 'Sample' do
-  pod 'FlipperKit', :path => '../../SonarKit.podspec'
-  pod 'FlipperKit/SonarKitLayoutComponentKitSupport', :path => '../../SonarKit.podspec'
-  pod 'FlipperKit/SKIOSNetworkPlugin', :path => '../../SonarKit.podspec'
+  pod 'FlipperKit', :path => '../../FlipperKit.podspec'
+  pod 'FlipperKit/SonarKitLayoutComponentKitSupport', :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 45f6bdeec..407682d85 100644
--- a/iOS/SampleSwift/Podfile
+++ b/iOS/SampleSwift/Podfile
@@ -5,8 +5,8 @@ swift_version = "4.1"
 
 target 'SampleSwift' do
   pod 'Flipper', :path => '../../Flipper.podspec'
-  pod 'FlipperKit', :path => '../../SonarKit.podspec'
-  pod 'FlipperKit/SKIOSNetworkPlugin', :path => '../../SonarKit.podspec'
+  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'
 
diff --git a/iOS/SampleSwift/Podfile.lock b/iOS/SampleSwift/Podfile.lock
index d14208db5..282949302 100644
--- a/iOS/SampleSwift/Podfile.lock
+++ b/iOS/SampleSwift/Podfile.lock
@@ -39,8 +39,8 @@ PODS:
 
 DEPENDENCIES:
   - Flipper (from `../../Flipper.podspec`)
-  - FlipperKit (from `../../SonarKit.podspec`)
-  - FlipperKit/SKIOSNetworkPlugin (from `../../SonarKit.podspec`)
+  - FlipperKit (from `../../FlipperKit.podspec`)
+  - FlipperKit/SKIOSNetworkPlugin (from `../../FlipperKit.podspec`)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -59,7 +59,7 @@ EXTERNAL SOURCES:
   Flipper:
     :path: "../../Flipper.podspec"
   FlipperKit:
-    :path: "../../SonarKit.podspec"
+    :path: "../../FlipperKit.podspec"
 
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
@@ -67,13 +67,13 @@ SPEC CHECKSUMS:
   CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
   DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c
   Flipper: 495fbd327298fbc55b3ff7cb399eae52c1580494
-  FlipperKit: 9e4ca744d949b44dd4a6b5f9aefee45d46477fe3
+  FlipperKit: a3c03ff44340fa38ff476f6269484270533c5749
   Folly: dd92f69322d8535b9df98d7c91e442b0fce2fff2
   glog: 1de0bb937dccdc981596d3b5825ebfb765017ded
   OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e
   PeerTalk: 77481b0a8136f226b90ccf828d6061f70139ffde
   RSocket: 4fdb7e562db30a2d4fceddefdc601749ffc9ebe2
 
-PODFILE CHECKSUM: 7d3e554e10a8fbfaf5466a3d4083099a6e8a2f10
+PODFILE CHECKSUM: 74eec891e5ca29c4d3817bc4c2c8ed86c6b9958c
 
 COCOAPODS: 1.5.3