diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm
index 495fbcae9..7d4206386 100644
--- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm
+++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm
@@ -17,6 +17,8 @@
 #import <FlipperKitLayoutPlugin/SKNamed.h>
 #import <FlipperKitLayoutPlugin/SKObject.h>
 
+#import "CKFlexboxComponent+Sonar.h"
+#import "CKInsetComponent+Sonar.h"
 #import "CKStatelessComponent+Sonar.h"
 
 /** This protocol isn't actually adopted anywhere, it just lets us use the SEL below */
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm
index ec5e3d1b1..39d46e583 100644
--- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm
+++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKFlexboxComponent+Sonar.mm
@@ -21,10 +21,10 @@ FB_LINKABLE(CKFlexboxComponent_Sonar)
 - (NSArray<SKNamed<NSDictionary<NSString *, NSObject *> *> *> *)sonar_additionalDataOverride
 {
   static NSDictionary<NSNumber *, NSString *> *CKFlexboxDirectionEnumMap = @{
-                                @(CKFlexboxDirectionColumn): @"vertical",
-                                @(CKFlexboxDirectionRow): @"horizontal",
-                                @(CKFlexboxDirectionColumnReverse): @"vertical-reverse",
-                                @(CKFlexboxDirectionRowReverse): @"horizontal-reverse",
+                                @(CKFlexboxDirectionColumn): @"column",
+                                @(CKFlexboxDirectionRow): @"row",
+                                @(CKFlexboxDirectionColumnReverse): @"column-reverse",
+                                @(CKFlexboxDirectionRowReverse): @"row-reverse",
                                 };
 
   static NSDictionary<NSNumber *, NSString *> *CKFlexboxJustifyContentEnumMap = @{