diff --git a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm
index 9fc0faa5d3a90c..257aaee235e494 100644
--- a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm
@@ -7,7 +7,7 @@
 
 #import "RCTActivityIndicatorViewComponentView.h"
 
-#import <fabric/components/activityindicator/ActivityIndicatorViewProps.h>
+#import <react/components/activityindicator/ActivityIndicatorViewProps.h>
 
 using namespace facebook::react;
 
diff --git a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
index 0ef3440e27b390..c687a60eb51308 100644
--- a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
@@ -7,12 +7,12 @@
 
 #import "RCTImageComponentView.h"
 
-#import <fabric/components/image/ImageEventEmitter.h>
-#import <fabric/components/image/ImageLocalData.h>
-#import <fabric/components/image/ImageProps.h>
-#import <fabric/imagemanager/ImageRequest.h>
-#import <fabric/imagemanager/ImageResponse.h>
-#import <fabric/imagemanager/RCTImagePrimitivesConversions.h>
+#import <react/components/image/ImageEventEmitter.h>
+#import <react/components/image/ImageLocalData.h>
+#import <react/components/image/ImageProps.h>
+#import <react/imagemanager/ImageRequest.h>
+#import <react/imagemanager/ImageResponse.h>
+#import <react/imagemanager/RCTImagePrimitivesConversions.h>
 
 #import "RCTConversions.h"
 #import "MainQueueExecutor.h"
diff --git a/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.mm b/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.mm
index 6364c561b0d801..4f1acc37225947 100644
--- a/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.mm
@@ -7,7 +7,7 @@
 
 #import "RCTRootComponentView.h"
 
-#import <fabric/components/root/RootProps.h>
+#import <react/components/root/RootProps.h>
 
 using namespace facebook::react;
 
diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
index 92d1d603ac2b2d..fe627377288b01 100644
--- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
@@ -8,10 +8,10 @@
 #import "RCTScrollViewComponentView.h"
 
 #import <React/RCTAssert.h>
-#import <fabric/components/scrollview/ScrollViewLocalData.h>
-#import <fabric/components/scrollview/ScrollViewProps.h>
-#import <fabric/components/scrollview/ScrollViewEventEmitter.h>
-#import <fabric/graphics/Geometry.h>
+#import <react/components/scrollview/ScrollViewLocalData.h>
+#import <react/components/scrollview/ScrollViewProps.h>
+#import <react/components/scrollview/ScrollViewEventEmitter.h>
+#import <react/graphics/Geometry.h>
 
 #import "RCTConversions.h"
 #import "RCTEnhancedScrollView.h"
diff --git a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm
index ee7fb5f89f9b40..5ff9be5e7c21ec 100644
--- a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm
@@ -7,8 +7,8 @@
 
 #import "RCTSwitchComponentView.h"
 
-#import <fabric/components/switch/SwitchEventEmitter.h>
-#import <fabric/components/switch/SwitchProps.h>
+#import <react/components/switch/SwitchEventEmitter.h>
+#import <react/components/switch/SwitchProps.h>
 
 using namespace facebook::react;
 
diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
index f75223fbcc992e..5d58241d6a5ddf 100644
--- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
@@ -7,12 +7,12 @@
 
 #import "RCTParagraphComponentView.h"
 
-#import <fabric/components/text/ParagraphLocalData.h>
-#import <fabric/components/text/ParagraphProps.h>
-#import <fabric/core/LocalData.h>
-#import <fabric/graphics/Geometry.h>
-#import <fabric/textlayoutmanager/TextLayoutManager.h>
-#import <fabric/textlayoutmanager/RCTTextLayoutManager.h>
+#import <react/components/text/ParagraphLocalData.h>
+#import <react/components/text/ParagraphProps.h>
+#import <react/core/LocalData.h>
+#import <react/graphics/Geometry.h>
+#import <react/textlayoutmanager/TextLayoutManager.h>
+#import <react/textlayoutmanager/RCTTextLayoutManager.h>
 #import "RCTConversions.h"
 
 using namespace facebook::react;
diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h
index 3ecf900767d2e3..0b8a6dda079bce 100644
--- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h
+++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h
@@ -9,11 +9,11 @@
 
 #import <React/RCTComponentViewProtocol.h>
 #import <React/UIView+ComponentViewProtocol.h>
-#import <fabric/core/LayoutMetrics.h>
-#import <fabric/core/Props.h>
-#import <fabric/components/view/ViewEventEmitter.h>
-#import <fabric/components/view/ViewProps.h>
-#import <fabric/events/EventEmitter.h>
+#import <react/core/LayoutMetrics.h>
+#import <react/core/Props.h>
+#import <react/components/view/ViewEventEmitter.h>
+#import <react/components/view/ViewProps.h>
+#import <react/events/EventEmitter.h>
 #import <React/RCTTouchableComponentViewProtocol.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
index 7e4489abe8b370..ce7e4a2c140b5e 100644
--- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
@@ -7,8 +7,8 @@
 
 #import "RCTViewComponentView.h"
 
-#import <fabric/components/view/ViewProps.h>
-#import <fabric/components/view/ViewEventEmitter.h>
+#import <react/components/view/ViewProps.h>
+#import <react/components/view/ViewEventEmitter.h>
 #import <objc/runtime.h>
 #import <React/RCTAssert.h>
 #import <React/RCTBorderDrawing.h>
diff --git a/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.h b/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.h
index f0ad4d465d365f..24f37679f19095 100644
--- a/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.h
+++ b/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.h
@@ -9,7 +9,7 @@
 
 #import <React/RCTMountItemProtocol.h>
 #import <React/RCTPrimitives.h>
-#import <fabric/events/EventEmitter.h>
+#import <react/events/EventEmitter.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/React/Fabric/Mounting/MountItems/RCTUpdateLayoutMetricsMountItem.h b/React/Fabric/Mounting/MountItems/RCTUpdateLayoutMetricsMountItem.h
index f97d2d6ad44caa..7fbab407cdfe99 100644
--- a/React/Fabric/Mounting/MountItems/RCTUpdateLayoutMetricsMountItem.h
+++ b/React/Fabric/Mounting/MountItems/RCTUpdateLayoutMetricsMountItem.h
@@ -9,7 +9,7 @@
 
 #import <React/RCTMountItemProtocol.h>
 #import <React/RCTPrimitives.h>
-#import <fabric/core/LayoutMetrics.h>
+#import <react/core/LayoutMetrics.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/React/Fabric/Mounting/MountItems/RCTUpdateLocalDataMountItem.h b/React/Fabric/Mounting/MountItems/RCTUpdateLocalDataMountItem.h
index a883b5cfb4ef3d..f25d4b7aa44c59 100644
--- a/React/Fabric/Mounting/MountItems/RCTUpdateLocalDataMountItem.h
+++ b/React/Fabric/Mounting/MountItems/RCTUpdateLocalDataMountItem.h
@@ -9,7 +9,7 @@
 
 #import <React/RCTMountItemProtocol.h>
 #import <React/RCTPrimitives.h>
-#import <fabric/core/LocalData.h>
+#import <react/core/LocalData.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/React/Fabric/Mounting/MountItems/RCTUpdatePropsMountItem.h b/React/Fabric/Mounting/MountItems/RCTUpdatePropsMountItem.h
index 8762bf5a7cd67e..7c05196e5d5d52 100644
--- a/React/Fabric/Mounting/MountItems/RCTUpdatePropsMountItem.h
+++ b/React/Fabric/Mounting/MountItems/RCTUpdatePropsMountItem.h
@@ -9,7 +9,7 @@
 
 #import <React/RCTMountItemProtocol.h>
 #import <React/RCTPrimitives.h>
-#import <fabric/core/Props.h>
+#import <react/core/Props.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/React/Fabric/Mounting/RCTComponentViewProtocol.h b/React/Fabric/Mounting/RCTComponentViewProtocol.h
index eeada911c28ecd..b7a26571ec49c1 100644
--- a/React/Fabric/Mounting/RCTComponentViewProtocol.h
+++ b/React/Fabric/Mounting/RCTComponentViewProtocol.h
@@ -7,10 +7,10 @@
 
 #import <UIKit/UIKit.h>
 
-#import <fabric/core/LocalData.h>
-#import <fabric/core/Props.h>
-#import <fabric/core/LayoutMetrics.h>
-#import <fabric/events/EventEmitter.h>
+#import <react/core/LocalData.h>
+#import <react/core/Props.h>
+#import <react/core/LayoutMetrics.h>
+#import <react/events/EventEmitter.h>
 #import <React/RCTPrimitives.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/React/Fabric/Mounting/RCTMountingManager.h b/React/Fabric/Mounting/RCTMountingManager.h
index ac52f7f44dd57e..600d33c86b6b2b 100644
--- a/React/Fabric/Mounting/RCTMountingManager.h
+++ b/React/Fabric/Mounting/RCTMountingManager.h
@@ -7,8 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
-#import <fabric/uimanager/ShadowView.h>
-#import <fabric/uimanager/ShadowViewMutation.h>
+#import <react/uimanager/ShadowView.h>
+#import <react/uimanager/ShadowViewMutation.h>
 #import <React/RCTPrimitives.h>
 #import <React/RCTMountingManagerDelegate.h>
 
diff --git a/React/Fabric/Mounting/RCTMountingManager.mm b/React/Fabric/Mounting/RCTMountingManager.mm
index 4c6597779d3585..c018d0fbb0d77e 100644
--- a/React/Fabric/Mounting/RCTMountingManager.mm
+++ b/React/Fabric/Mounting/RCTMountingManager.mm
@@ -7,7 +7,7 @@
 
 #import "RCTMountingManager.h"
 
-#import <fabric/core/LayoutableShadowNode.h>
+#import <react/core/LayoutableShadowNode.h>
 #import <React/RCTAssert.h>
 #import <React/RCTUtils.h>
 
diff --git a/React/Fabric/RCTConversions.h b/React/Fabric/RCTConversions.h
index fa9fdd8d6422fb..16ee3ed2d20bd3 100644
--- a/React/Fabric/RCTConversions.h
+++ b/React/Fabric/RCTConversions.h
@@ -7,10 +7,10 @@
 
 #import <UIKit/UIKit.h>
 
-#import <fabric/components/view/primitives.h>
-#import <fabric/components/view/AccessibilityPrimitives.h>
-#import <fabric/graphics/Color.h>
-#import <fabric/graphics/Geometry.h>
+#import <react/components/view/primitives.h>
+#import <react/components/view/AccessibilityPrimitives.h>
+#import <react/graphics/Color.h>
+#import <react/graphics/Geometry.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/React/Fabric/RCTScheduler.h b/React/Fabric/RCTScheduler.h
index 6b2d679cf1bf3e..9a80af8ec59cd4 100644
--- a/React/Fabric/RCTScheduler.h
+++ b/React/Fabric/RCTScheduler.h
@@ -9,9 +9,9 @@
 #import <memory>
 
 #import <React/RCTPrimitives.h>
-#import <fabric/core/LayoutConstraints.h>
-#import <fabric/core/LayoutContext.h>
-#import <fabric/uimanager/ShadowViewMutation.h>
+#import <react/core/LayoutConstraints.h>
+#import <react/core/LayoutContext.h>
+#import <react/uimanager/ShadowViewMutation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/React/Fabric/RCTScheduler.mm b/React/Fabric/RCTScheduler.mm
index a77eeb15cc2e3b..15a593d5651e39 100644
--- a/React/Fabric/RCTScheduler.mm
+++ b/React/Fabric/RCTScheduler.mm
@@ -7,9 +7,9 @@
 
 #import "RCTScheduler.h"
 
-#import <fabric/uimanager/ContextContainer.h>
-#import <fabric/uimanager/Scheduler.h>
-#import <fabric/uimanager/SchedulerDelegate.h>
+#import <react/uimanager/ContextContainer.h>
+#import <react/uimanager/Scheduler.h>
+#import <react/uimanager/SchedulerDelegate.h>
 
 #import <React/RCTFollyConvert.h>
 
diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm
index 59cac563736aee..1b8a92110e386e 100644
--- a/React/Fabric/RCTSurfacePresenter.mm
+++ b/React/Fabric/RCTSurfacePresenter.mm
@@ -24,10 +24,10 @@
 #import <React/RCTSurfaceView.h>
 #import <React/RCTSurfaceView+Internal.h>
 #import <React/RCTUtils.h>
-#import <fabric/core/LayoutContext.h>
-#import <fabric/core/LayoutConstraints.h>
-#import <fabric/imagemanager/ImageManager.h>
-#import <fabric/uimanager/ContextContainer.h>
+#import <react/core/LayoutContext.h>
+#import <react/core/LayoutConstraints.h>
+#import <react/imagemanager/ImageManager.h>
+#import <react/uimanager/ContextContainer.h>
 
 #import "MainRunLoopEventBeat.h"
 #import "RuntimeEventBeat.h"
diff --git a/React/Fabric/RCTTouchableComponentViewProtocol.h b/React/Fabric/RCTTouchableComponentViewProtocol.h
index d2fee6e44c6f01..b1142b050c705a 100644
--- a/React/Fabric/RCTTouchableComponentViewProtocol.h
+++ b/React/Fabric/RCTTouchableComponentViewProtocol.h
@@ -6,7 +6,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <fabric/components/view/TouchEventEmitter.h>
+#import <react/components/view/TouchEventEmitter.h>
 
 @protocol RCTTouchableComponentViewProtocol <NSObject>
 - (facebook::react::SharedTouchEventEmitter)touchEventEmitterAtPoint:(CGPoint)point;
diff --git a/React/Fabric/Utils/MainRunLoopEventBeat.h b/React/Fabric/Utils/MainRunLoopEventBeat.h
index 189e062f645e54..30f9941e49ae78 100644
--- a/React/Fabric/Utils/MainRunLoopEventBeat.h
+++ b/React/Fabric/Utils/MainRunLoopEventBeat.h
@@ -7,8 +7,8 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreFoundation/CFRunLoop.h>
-#include <fabric/uimanager/primitives.h>
-#include <fabric/events/EventBeat.h>
+#include <react/uimanager/primitives.h>
+#include <react/events/EventBeat.h>
 
 namespace facebook {
 namespace react {
diff --git a/React/Fabric/Utils/RuntimeEventBeat.h b/React/Fabric/Utils/RuntimeEventBeat.h
index 09fba65f5e0aca..1cb20e10ba0955 100644
--- a/React/Fabric/Utils/RuntimeEventBeat.h
+++ b/React/Fabric/Utils/RuntimeEventBeat.h
@@ -7,8 +7,8 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreFoundation/CFRunLoop.h>
-#include <fabric/uimanager/primitives.h>
-#include <fabric/events/EventBeat.h>
+#include <react/uimanager/primitives.h>
+#include <react/events/EventBeat.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/attributedstring/AttributedString.cpp b/ReactCommon/fabric/attributedstring/AttributedString.cpp
index 02c6a3d5bd4d06..630fb98f537d70 100644
--- a/ReactCommon/fabric/attributedstring/AttributedString.cpp
+++ b/ReactCommon/fabric/attributedstring/AttributedString.cpp
@@ -7,7 +7,7 @@
 
 #include "AttributedString.h"
 
-#include <fabric/debug/DebugStringConvertibleItem.h>
+#include <react/debug/DebugStringConvertibleItem.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/attributedstring/AttributedString.h b/ReactCommon/fabric/attributedstring/AttributedString.h
index 164ccac2307f36..16c97508500d2c 100644
--- a/ReactCommon/fabric/attributedstring/AttributedString.h
+++ b/ReactCommon/fabric/attributedstring/AttributedString.h
@@ -10,11 +10,11 @@
 #include <functional>
 #include <memory>
 
-#include <fabric/attributedstring/TextAttributes.h>
-#include <fabric/core/Sealable.h>
-#include <fabric/core/ShadowNode.h>
-#include <fabric/debug/DebugStringConvertible.h>
 #include <folly/Optional.h>
+#include <react/attributedstring/TextAttributes.h>
+#include <react/core/Sealable.h>
+#include <react/core/ShadowNode.h>
+#include <react/debug/DebugStringConvertible.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/attributedstring/BUCK b/ReactCommon/fabric/attributedstring/BUCK
index e767d40ee9d415..ba7ffd7ef3ed29 100644
--- a/ReactCommon/fabric/attributedstring/BUCK
+++ b/ReactCommon/fabric/attributedstring/BUCK
@@ -28,7 +28,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "fabric/attributedstring",
+        prefix = "react/attributedstring",
     ),
     compiler_flags = [
         "-fexceptions",
diff --git a/ReactCommon/fabric/attributedstring/ParagraphAttributes.cpp b/ReactCommon/fabric/attributedstring/ParagraphAttributes.cpp
index 2d6b590f0ba945..00f216f9dfed51 100644
--- a/ReactCommon/fabric/attributedstring/ParagraphAttributes.cpp
+++ b/ReactCommon/fabric/attributedstring/ParagraphAttributes.cpp
@@ -7,9 +7,9 @@
 
 #include "ParagraphAttributes.h"
 
-#include <fabric/attributedstring/conversions.h>
-#include <fabric/debug/debugStringConvertibleUtils.h>
-#include <fabric/graphics/conversions.h>
+#include <react/attributedstring/conversions.h>
+#include <react/debug/debugStringConvertibleUtils.h>
+#include <react/graphics/conversions.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/attributedstring/ParagraphAttributes.h b/ReactCommon/fabric/attributedstring/ParagraphAttributes.h
index 506d13673515c0..2c9a0dc7198317 100644
--- a/ReactCommon/fabric/attributedstring/ParagraphAttributes.h
+++ b/ReactCommon/fabric/attributedstring/ParagraphAttributes.h
@@ -9,9 +9,9 @@
 
 #include <limits>
 
-#include <fabric/attributedstring/primitives.h>
-#include <fabric/debug/DebugStringConvertible.h>
-#include <fabric/graphics/Geometry.h>
+#include <react/attributedstring/primitives.h>
+#include <react/debug/DebugStringConvertible.h>
+#include <react/graphics/Geometry.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/attributedstring/TextAttributes.cpp b/ReactCommon/fabric/attributedstring/TextAttributes.cpp
index 43f87235a09012..95f0940e30f2fa 100644
--- a/ReactCommon/fabric/attributedstring/TextAttributes.cpp
+++ b/ReactCommon/fabric/attributedstring/TextAttributes.cpp
@@ -7,11 +7,12 @@
 
 #include "TextAttributes.h"
 
-#include <fabric/attributedstring/conversions.h>
-#include <fabric/core/conversions.h>
-#include <fabric/graphics/conversions.h>
+#include <react/attributedstring/conversions.h>
+#include <react/core/conversions.h>
+#include <react/graphics/conversions.h>
+#include <cmath>
 
-#include <fabric/debug/debugStringConvertibleUtils.h>
+#include <react/debug/debugStringConvertibleUtils.h>
 
 namespace facebook {
 namespace react {
@@ -24,14 +25,15 @@ void TextAttributes::apply(TextAttributes textAttributes) {
   backgroundColor = textAttributes.backgroundColor
       ? textAttributes.backgroundColor
       : backgroundColor;
-  opacity = !isnan(textAttributes.opacity) ? textAttributes.opacity : opacity;
+  opacity =
+      !std::isnan(textAttributes.opacity) ? textAttributes.opacity : opacity;
 
   // Font
   fontFamily = !textAttributes.fontFamily.empty() ? textAttributes.fontFamily
                                                   : fontFamily;
   fontSize =
-      !isnan(textAttributes.fontSize) ? textAttributes.fontSize : fontSize;
-  fontSizeMultiplier = !isnan(textAttributes.fontSizeMultiplier)
+      !std::isnan(textAttributes.fontSize) ? textAttributes.fontSize : fontSize;
+  fontSizeMultiplier = !std::isnan(textAttributes.fontSizeMultiplier)
       ? textAttributes.fontSizeMultiplier
       : fontSizeMultiplier;
   fontWeight = textAttributes.fontWeight.hasValue() ? textAttributes.fontWeight
@@ -44,13 +46,14 @@ void TextAttributes::apply(TextAttributes textAttributes) {
   allowFontScaling = textAttributes.allowFontScaling.hasValue()
       ? textAttributes.allowFontScaling
       : allowFontScaling;
-  letterSpacing = !isnan(textAttributes.letterSpacing)
+  letterSpacing = !std::isnan(textAttributes.letterSpacing)
       ? textAttributes.letterSpacing
       : letterSpacing;
 
   // Paragraph Styles
-  lineHeight = !isnan(textAttributes.lineHeight) ? textAttributes.lineHeight
-                                                 : lineHeight;
+  lineHeight = !std::isnan(textAttributes.lineHeight)
+      ? textAttributes.lineHeight
+      : lineHeight;
   alignment = textAttributes.alignment.hasValue() ? textAttributes.alignment
                                                   : alignment;
   baseWritingDirection = textAttributes.baseWritingDirection.hasValue()
@@ -76,7 +79,7 @@ void TextAttributes::apply(TextAttributes textAttributes) {
   textShadowOffset = textAttributes.textShadowOffset.hasValue()
       ? textAttributes.textShadowOffset.value()
       : textShadowOffset;
-  textShadowRadius = !isnan(textAttributes.textShadowRadius)
+  textShadowRadius = !std::isnan(textAttributes.textShadowRadius)
       ? textAttributes.textShadowRadius
       : textShadowRadius;
   textShadowColor = textAttributes.textShadowColor
diff --git a/ReactCommon/fabric/attributedstring/TextAttributes.h b/ReactCommon/fabric/attributedstring/TextAttributes.h
index e0acba5768178a..6340143d9c745a 100644
--- a/ReactCommon/fabric/attributedstring/TextAttributes.h
+++ b/ReactCommon/fabric/attributedstring/TextAttributes.h
@@ -10,13 +10,13 @@
 #include <functional>
 #include <limits>
 
-#include <fabric/attributedstring/primitives.h>
-#include <fabric/core/LayoutPrimitives.h>
-#include <fabric/core/ReactPrimitives.h>
-#include <fabric/debug/DebugStringConvertible.h>
-#include <fabric/graphics/Color.h>
-#include <fabric/graphics/Geometry.h>
 #include <folly/Optional.h>
+#include <react/attributedstring/primitives.h>
+#include <react/core/LayoutPrimitives.h>
+#include <react/core/ReactPrimitives.h>
+#include <react/debug/DebugStringConvertible.h>
+#include <react/graphics/Color.h>
+#include <react/graphics/Geometry.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/attributedstring/conversions.h b/ReactCommon/fabric/attributedstring/conversions.h
index 1b00609959e359..66e4bbc41515da 100644
--- a/ReactCommon/fabric/attributedstring/conversions.h
+++ b/ReactCommon/fabric/attributedstring/conversions.h
@@ -7,17 +7,18 @@
 
 #pragma once
 
-#include <fabric/attributedstring/AttributedString.h>
-#include <fabric/attributedstring/ParagraphAttributes.h>
-#include <fabric/attributedstring/TextAttributes.h>
-#include <fabric/attributedstring/conversions.h>
-#include <fabric/attributedstring/primitives.h>
-#include <fabric/core/LayoutableShadowNode.h>
-#include <fabric/core/ShadowNode.h>
-#include <fabric/core/conversions.h>
-#include <fabric/graphics/Geometry.h>
-#include <fabric/graphics/conversions.h>
 #include <folly/dynamic.h>
+#include <react/attributedstring/AttributedString.h>
+#include <react/attributedstring/ParagraphAttributes.h>
+#include <react/attributedstring/TextAttributes.h>
+#include <react/attributedstring/conversions.h>
+#include <react/attributedstring/primitives.h>
+#include <react/core/LayoutableShadowNode.h>
+#include <react/core/ShadowNode.h>
+#include <react/core/conversions.h>
+#include <react/graphics/Geometry.h>
+#include <react/graphics/conversions.h>
+#include <cmath>
 
 namespace facebook {
 namespace react {
@@ -395,16 +396,16 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {
     _textAttributes(
         "backgroundColor", toDynamic(textAttributes.backgroundColor));
   }
-  if (!isnan(textAttributes.opacity)) {
+  if (!std::isnan(textAttributes.opacity)) {
     _textAttributes("opacity", textAttributes.opacity);
   }
   if (!textAttributes.fontFamily.empty()) {
     _textAttributes("fontFamily", textAttributes.fontFamily);
   }
-  if (!isnan(textAttributes.fontSize)) {
+  if (!std::isnan(textAttributes.fontSize)) {
     _textAttributes("fontSize", textAttributes.fontSize);
   }
-  if (!isnan(textAttributes.fontSizeMultiplier)) {
+  if (!std::isnan(textAttributes.fontSizeMultiplier)) {
     _textAttributes("fontSizeMultiplier", textAttributes.fontSizeMultiplier);
   }
   if (textAttributes.fontWeight.has_value()) {
@@ -419,10 +420,10 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {
   if (textAttributes.allowFontScaling.has_value()) {
     _textAttributes("allowFontScaling", *textAttributes.allowFontScaling);
   }
-  if (!isnan(textAttributes.letterSpacing)) {
+  if (!std::isnan(textAttributes.letterSpacing)) {
     _textAttributes("letterSpacing", textAttributes.letterSpacing);
   }
-  if (!isnan(textAttributes.lineHeight)) {
+  if (!std::isnan(textAttributes.lineHeight)) {
     _textAttributes("lineHeight", textAttributes.lineHeight);
   }
   if (textAttributes.alignment.has_value()) {
@@ -455,7 +456,7 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {
   // Shadow
   // textShadowOffset = textAttributes.textShadowOffset.has_value() ?
   // textAttributes.textShadowOffset.value() : textShadowOffset;
-  if (!isnan(textAttributes.textShadowRadius)) {
+  if (!std::isnan(textAttributes.textShadowRadius)) {
     _textAttributes("textShadowRadius", textAttributes.textShadowRadius);
   }
   if (textAttributes.textShadowColor) {
diff --git a/ReactCommon/fabric/attributedstring/tests/AttributedStringTest.cpp b/ReactCommon/fabric/attributedstring/tests/AttributedStringTest.cpp
index 9ad5f5cb857097..1b9205d66050c8 100644
--- a/ReactCommon/fabric/attributedstring/tests/AttributedStringTest.cpp
+++ b/ReactCommon/fabric/attributedstring/tests/AttributedStringTest.cpp
@@ -8,11 +8,11 @@
 #include <memory>
 
 #include <assert.h>
-#include <fabric/attributedstring/TextAttributes.h>
-#include <fabric/attributedstring/conversions.h>
-#include <fabric/attributedstring/primitives.h>
-#include <fabric/graphics/conversions.h>
 #include <gtest/gtest.h>
+#include <react/attributedstring/TextAttributes.h>
+#include <react/attributedstring/conversions.h>
+#include <react/attributedstring/primitives.h>
+#include <react/graphics/conversions.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/attributedstring/tests/ParagraphAttributesTest.cpp b/ReactCommon/fabric/attributedstring/tests/ParagraphAttributesTest.cpp
index cd66bd10922e46..ca0d6a3b6a3745 100644
--- a/ReactCommon/fabric/attributedstring/tests/ParagraphAttributesTest.cpp
+++ b/ReactCommon/fabric/attributedstring/tests/ParagraphAttributesTest.cpp
@@ -8,10 +8,10 @@
 #include <memory>
 
 #include <assert.h>
-#include <fabric/attributedstring/ParagraphAttributes.h>
-#include <fabric/attributedstring/conversions.h>
-#include <fabric/attributedstring/primitives.h>
 #include <gtest/gtest.h>
+#include <react/attributedstring/ParagraphAttributes.h>
+#include <react/attributedstring/conversions.h>
+#include <react/attributedstring/primitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/attributedstring/tests/TextAttributesTest.cpp b/ReactCommon/fabric/attributedstring/tests/TextAttributesTest.cpp
index e9f455bb9ce1ea..c029c6649e2e34 100644
--- a/ReactCommon/fabric/attributedstring/tests/TextAttributesTest.cpp
+++ b/ReactCommon/fabric/attributedstring/tests/TextAttributesTest.cpp
@@ -8,11 +8,11 @@
 #include <memory>
 
 #include <assert.h>
-#include <fabric/attributedstring/TextAttributes.h>
-#include <fabric/attributedstring/conversions.h>
-#include <fabric/attributedstring/primitives.h>
-#include <fabric/graphics/conversions.h>
 #include <gtest/gtest.h>
+#include <react/attributedstring/TextAttributes.h>
+#include <react/attributedstring/conversions.h>
+#include <react/attributedstring/primitives.h>
+#include <react/graphics/conversions.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewComponentDescriptor.h b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewComponentDescriptor.h
index 4d0a2d64eee0e9..7dbe425337f335 100644
--- a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewComponentDescriptor.h
+++ b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewComponentDescriptor.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/components/activityindicator/ActivityIndicatorViewShadowNode.h>
-#include <fabric/core/ConcreteComponentDescriptor.h>
+#include <react/components/activityindicator/ActivityIndicatorViewShadowNode.h>
+#include <react/core/ConcreteComponentDescriptor.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.cpp b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.cpp
index f20964ca2c7949..6ff45aef622263 100644
--- a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.cpp
+++ b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.cpp
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <fabric/components/activityindicator/ActivityIndicatorViewProps.h>
-#include <fabric/components/activityindicator/conversions.h>
-#include <fabric/core/propsConversions.h>
+#include <react/components/activityindicator/ActivityIndicatorViewProps.h>
+#include <react/components/activityindicator/conversions.h>
+#include <react/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.h b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.h
index d205f147713c49..8a8f7395b11e07 100644
--- a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.h
+++ b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewProps.h
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <fabric/components/activityindicator/primitives.h>
-#include <fabric/components/view/ViewProps.h>
-#include <fabric/graphics/Color.h>
+#include <react/components/activityindicator/primitives.h>
+#include <react/components/view/ViewProps.h>
+#include <react/graphics/Color.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewShadowNode.h b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewShadowNode.h
index bffcdb7b46031c..ac768dd6d15941 100644
--- a/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewShadowNode.h
+++ b/ReactCommon/fabric/components/activityindicator/ActivityIndicatorViewShadowNode.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/components/activityindicator/ActivityIndicatorViewProps.h>
-#include <fabric/components/view/ConcreteViewShadowNode.h>
+#include <react/components/activityindicator/ActivityIndicatorViewProps.h>
+#include <react/components/view/ConcreteViewShadowNode.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/activityindicator/BUCK b/ReactCommon/fabric/components/activityindicator/BUCK
index 503a799884d6d0..eda131333ea2e2 100644
--- a/ReactCommon/fabric/components/activityindicator/BUCK
+++ b/ReactCommon/fabric/components/activityindicator/BUCK
@@ -15,7 +15,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "fabric/components/activityindicator",
+        prefix = "react/components/activityindicator",
     ),
     compiler_flags = [
         "-fexceptions",
diff --git a/ReactCommon/fabric/components/activityindicator/conversions.h b/ReactCommon/fabric/components/activityindicator/conversions.h
index 929f7fa77b5593..3982cb5e390846 100644
--- a/ReactCommon/fabric/components/activityindicator/conversions.h
+++ b/ReactCommon/fabric/components/activityindicator/conversions.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/components/activityindicator/primitives.h>
 #include <folly/dynamic.h>
+#include <react/components/activityindicator/primitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/image/BUCK b/ReactCommon/fabric/components/image/BUCK
index ee165e9addca2f..e496dc7a92db55 100644
--- a/ReactCommon/fabric/components/image/BUCK
+++ b/ReactCommon/fabric/components/image/BUCK
@@ -25,7 +25,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "fabric/components/image",
+        prefix = "react/components/image",
     ),
     compiler_flags = [
         "-fexceptions",
diff --git a/ReactCommon/fabric/components/image/ImageComponentDescriptor.h b/ReactCommon/fabric/components/image/ImageComponentDescriptor.h
index 72c79fb7df1888..09cf64965f4a57 100644
--- a/ReactCommon/fabric/components/image/ImageComponentDescriptor.h
+++ b/ReactCommon/fabric/components/image/ImageComponentDescriptor.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <fabric/components/image/ImageShadowNode.h>
-#include <fabric/core/ConcreteComponentDescriptor.h>
-#include <fabric/imagemanager/ImageManager.h>
-#include <fabric/uimanager/ContextContainer.h>
+#include <react/components/image/ImageShadowNode.h>
+#include <react/core/ConcreteComponentDescriptor.h>
+#include <react/imagemanager/ImageManager.h>
+#include <react/uimanager/ContextContainer.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/image/ImageEventEmitter.h b/ReactCommon/fabric/components/image/ImageEventEmitter.h
index e6a570acecf410..a853caf7536d18 100644
--- a/ReactCommon/fabric/components/image/ImageEventEmitter.h
+++ b/ReactCommon/fabric/components/image/ImageEventEmitter.h
@@ -6,7 +6,7 @@
  */
 #pragma once
 
-#include <fabric/components/view/ViewEventEmitter.h>
+#include <react/components/view/ViewEventEmitter.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/image/ImageLocalData.cpp b/ReactCommon/fabric/components/image/ImageLocalData.cpp
index d3abbc68906913..3fa237c1ad800a 100644
--- a/ReactCommon/fabric/components/image/ImageLocalData.cpp
+++ b/ReactCommon/fabric/components/image/ImageLocalData.cpp
@@ -7,8 +7,8 @@
 
 #include "ImageLocalData.h"
 
-#include <fabric/components/image/conversions.h>
-#include <fabric/debug/debugStringConvertibleUtils.h>
+#include <react/components/image/conversions.h>
+#include <react/debug/debugStringConvertibleUtils.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/image/ImageLocalData.h b/ReactCommon/fabric/components/image/ImageLocalData.h
index f0be34848dada2..d87e45a7c8132a 100644
--- a/ReactCommon/fabric/components/image/ImageLocalData.h
+++ b/ReactCommon/fabric/components/image/ImageLocalData.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <fabric/core/LocalData.h>
-#include <fabric/imagemanager/ImageRequest.h>
-#include <fabric/imagemanager/primitives.h>
+#include <react/core/LocalData.h>
+#include <react/imagemanager/ImageRequest.h>
+#include <react/imagemanager/primitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/image/ImageProps.cpp b/ReactCommon/fabric/components/image/ImageProps.cpp
index 6c4ca171b99909..5eca24296c95d0 100644
--- a/ReactCommon/fabric/components/image/ImageProps.cpp
+++ b/ReactCommon/fabric/components/image/ImageProps.cpp
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <fabric/components/image/ImageProps.h>
-#include <fabric/components/image/conversions.h>
-#include <fabric/core/propsConversions.h>
+#include <react/components/image/ImageProps.h>
+#include <react/components/image/conversions.h>
+#include <react/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/image/ImageProps.h b/ReactCommon/fabric/components/image/ImageProps.h
index 2e2dedd880c63b..d0c1369a66364f 100644
--- a/ReactCommon/fabric/components/image/ImageProps.h
+++ b/ReactCommon/fabric/components/image/ImageProps.h
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <fabric/components/view/ViewProps.h>
-#include <fabric/graphics/Color.h>
-#include <fabric/imagemanager/primitives.h>
+#include <react/components/view/ViewProps.h>
+#include <react/graphics/Color.h>
+#include <react/imagemanager/primitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/image/ImageShadowNode.cpp b/ReactCommon/fabric/components/image/ImageShadowNode.cpp
index 933fc6d40ab4be..5421515f8a3a70 100644
--- a/ReactCommon/fabric/components/image/ImageShadowNode.cpp
+++ b/ReactCommon/fabric/components/image/ImageShadowNode.cpp
@@ -7,9 +7,9 @@
 
 #include <cstdlib>
 
-#include <fabric/components/image/ImageLocalData.h>
-#include <fabric/components/image/ImageShadowNode.h>
-#include <fabric/core/LayoutContext.h>
+#include <react/components/image/ImageLocalData.h>
+#include <react/components/image/ImageShadowNode.h>
+#include <react/core/LayoutContext.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/image/ImageShadowNode.h b/ReactCommon/fabric/components/image/ImageShadowNode.h
index fc7008fbd7f017..e1a811fd1705db 100644
--- a/ReactCommon/fabric/components/image/ImageShadowNode.h
+++ b/ReactCommon/fabric/components/image/ImageShadowNode.h
@@ -7,11 +7,11 @@
 
 #pragma once
 
-#include <fabric/components/image/ImageEventEmitter.h>
-#include <fabric/components/image/ImageProps.h>
-#include <fabric/components/view/ConcreteViewShadowNode.h>
-#include <fabric/imagemanager/ImageManager.h>
-#include <fabric/imagemanager/primitives.h>
+#include <react/components/image/ImageEventEmitter.h>
+#include <react/components/image/ImageProps.h>
+#include <react/components/view/ConcreteViewShadowNode.h>
+#include <react/imagemanager/ImageManager.h>
+#include <react/imagemanager/primitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/image/conversions.h b/ReactCommon/fabric/components/image/conversions.h
index c6a0ceb25b8334..5943eb283dff50 100644
--- a/ReactCommon/fabric/components/image/conversions.h
+++ b/ReactCommon/fabric/components/image/conversions.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <fabric/graphics/conversions.h>
-#include <fabric/imagemanager/primitives.h>
 #include <folly/dynamic.h>
+#include <react/graphics/conversions.h>
+#include <react/imagemanager/primitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/root/BUCK b/ReactCommon/fabric/components/root/BUCK
index 46fb37865aeac7..56782c58e0618d 100644
--- a/ReactCommon/fabric/components/root/BUCK
+++ b/ReactCommon/fabric/components/root/BUCK
@@ -25,7 +25,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "fabric/components/root",
+        prefix = "react/components/root",
     ),
     compiler_flags = [
         "-fexceptions",
diff --git a/ReactCommon/fabric/components/root/RootProps.cpp b/ReactCommon/fabric/components/root/RootProps.cpp
index d30da924e24113..d0efb194000d21 100644
--- a/ReactCommon/fabric/components/root/RootProps.cpp
+++ b/ReactCommon/fabric/components/root/RootProps.cpp
@@ -7,8 +7,8 @@
 
 #include "RootProps.h"
 
-#include <fabric/components/view/YogaLayoutableShadowNode.h>
-#include <fabric/components/view/conversions.h>
+#include <react/components/view/YogaLayoutableShadowNode.h>
+#include <react/components/view/conversions.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/root/RootProps.h b/ReactCommon/fabric/components/root/RootProps.h
index aa48ac724a3720..1ef3068eaff62b 100644
--- a/ReactCommon/fabric/components/root/RootProps.h
+++ b/ReactCommon/fabric/components/root/RootProps.h
@@ -9,9 +9,9 @@
 
 #include <memory>
 
-#include <fabric/components/view/ViewProps.h>
-#include <fabric/core/LayoutConstraints.h>
-#include <fabric/core/LayoutContext.h>
+#include <react/components/view/ViewProps.h>
+#include <react/core/LayoutConstraints.h>
+#include <react/core/LayoutContext.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/root/RootShadowNode.cpp b/ReactCommon/fabric/components/root/RootShadowNode.cpp
index 912ea4bfc7d415..c306853d2a776d 100644
--- a/ReactCommon/fabric/components/root/RootShadowNode.cpp
+++ b/ReactCommon/fabric/components/root/RootShadowNode.cpp
@@ -7,7 +7,7 @@
 
 #include "RootShadowNode.h"
 
-#include <fabric/components/view/conversions.h>
+#include <react/components/view/conversions.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/root/RootShadowNode.h b/ReactCommon/fabric/components/root/RootShadowNode.h
index 771f770296ecba..f3429b0c0e43b1 100644
--- a/ReactCommon/fabric/components/root/RootShadowNode.h
+++ b/ReactCommon/fabric/components/root/RootShadowNode.h
@@ -9,9 +9,9 @@
 
 #include <memory>
 
-#include <fabric/components/root/RootProps.h>
-#include <fabric/components/view/ConcreteViewShadowNode.h>
-#include <fabric/core/LayoutContext.h>
+#include <react/components/root/RootProps.h>
+#include <react/components/view/ConcreteViewShadowNode.h>
+#include <react/core/LayoutContext.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/scrollview/BUCK b/ReactCommon/fabric/components/scrollview/BUCK
index 0f41f2e426ba44..71522013612772 100644
--- a/ReactCommon/fabric/components/scrollview/BUCK
+++ b/ReactCommon/fabric/components/scrollview/BUCK
@@ -28,7 +28,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "fabric/components/scrollview",
+        prefix = "react/components/scrollview",
     ),
     compiler_flags = [
         "-fexceptions",
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewComponentDescriptor.h b/ReactCommon/fabric/components/scrollview/ScrollViewComponentDescriptor.h
index a2390adfe9aa47..74ccf9240d3b7b 100644
--- a/ReactCommon/fabric/components/scrollview/ScrollViewComponentDescriptor.h
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewComponentDescriptor.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/components/scrollview/ScrollViewShadowNode.h>
-#include <fabric/core/ConcreteComponentDescriptor.h>
+#include <react/components/scrollview/ScrollViewShadowNode.h>
+#include <react/core/ConcreteComponentDescriptor.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h b/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h
index ed43669364629e..161b5d1f2dd3ef 100644
--- a/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h
@@ -8,10 +8,10 @@
 
 #include <memory>
 
-#include <fabric/components/view/ViewEventEmitter.h>
-#include <fabric/events/EventEmitter.h>
-#include <fabric/graphics/Geometry.h>
 #include <folly/dynamic.h>
+#include <react/components/view/ViewEventEmitter.h>
+#include <react/events/EventEmitter.h>
+#include <react/graphics/Geometry.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.cpp b/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.cpp
index f65676a3d5a492..f3e1cd1f21f08e 100644
--- a/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.cpp
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.cpp
@@ -7,8 +7,8 @@
 
 #include "ScrollViewLocalData.h"
 
-#include <fabric/debug/debugStringConvertibleUtils.h>
-#include <fabric/graphics/conversions.h>
+#include <react/debug/debugStringConvertibleUtils.h>
+#include <react/graphics/conversions.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.h b/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.h
index d9b92fc421c131..f54778fe1a7056 100644
--- a/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.h
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/core/LocalData.h>
-#include <fabric/graphics/Geometry.h>
+#include <react/core/LocalData.h>
+#include <react/graphics/Geometry.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewProps.cpp b/ReactCommon/fabric/components/scrollview/ScrollViewProps.cpp
index 5b104df5970044..4b2184b19f0b8d 100644
--- a/ReactCommon/fabric/components/scrollview/ScrollViewProps.cpp
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewProps.cpp
@@ -7,11 +7,11 @@
 
 #include "ScrollViewProps.h"
 
-#include <fabric/components/scrollview/conversions.h>
-#include <fabric/debug/debugStringConvertibleUtils.h>
-#include <fabric/graphics/conversions.h>
+#include <react/components/scrollview/conversions.h>
+#include <react/debug/debugStringConvertibleUtils.h>
+#include <react/graphics/conversions.h>
 
-#include <fabric/core/propsConversions.h>
+#include <react/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewProps.h b/ReactCommon/fabric/components/scrollview/ScrollViewProps.h
index 18bd21ff607ef6..4dc57b79db0bee 100644
--- a/ReactCommon/fabric/components/scrollview/ScrollViewProps.h
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewProps.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/components/scrollview/primitives.h>
-#include <fabric/components/view/ViewProps.h>
+#include <react/components/scrollview/primitives.h>
+#include <react/components/view/ViewProps.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.cpp b/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.cpp
index a18e651e26a1fd..4eb4bdeca53dca 100644
--- a/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.cpp
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.cpp
@@ -7,7 +7,7 @@
 
 #include "ScrollViewShadowNode.h"
 
-#include <fabric/core/LayoutMetrics.h>
+#include <react/core/LayoutMetrics.h>
 
 #include "ScrollViewLocalData.h"
 
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h b/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h
index 065727b7745fa0..fabc946a74032b 100644
--- a/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <fabric/components/scrollview/ScrollViewEventEmitter.h>
-#include <fabric/components/scrollview/ScrollViewProps.h>
-#include <fabric/components/view/ConcreteViewShadowNode.h>
-#include <fabric/core/LayoutContext.h>
+#include <react/components/scrollview/ScrollViewEventEmitter.h>
+#include <react/components/scrollview/ScrollViewProps.h>
+#include <react/components/view/ConcreteViewShadowNode.h>
+#include <react/core/LayoutContext.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/scrollview/conversions.h b/ReactCommon/fabric/components/scrollview/conversions.h
index 4dc551e0bc0daa..d5c2d5acdfb1ea 100644
--- a/ReactCommon/fabric/components/scrollview/conversions.h
+++ b/ReactCommon/fabric/components/scrollview/conversions.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/components/scrollview/primitives.h>
 #include <folly/dynamic.h>
+#include <react/components/scrollview/primitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/switch/BUCK b/ReactCommon/fabric/components/switch/BUCK
index 0b97fcd7a0e8d6..8babffce965de4 100644
--- a/ReactCommon/fabric/components/switch/BUCK
+++ b/ReactCommon/fabric/components/switch/BUCK
@@ -25,7 +25,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "fabric/components/switch",
+        prefix = "react/components/switch",
     ),
     compiler_flags = [
         "-fexceptions",
diff --git a/ReactCommon/fabric/components/switch/SwitchComponentDescriptor.h b/ReactCommon/fabric/components/switch/SwitchComponentDescriptor.h
index c603eb596e3d2b..6f40f83c5b0f6a 100644
--- a/ReactCommon/fabric/components/switch/SwitchComponentDescriptor.h
+++ b/ReactCommon/fabric/components/switch/SwitchComponentDescriptor.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/components/switch/SwitchShadowNode.h>
-#include <fabric/core/ConcreteComponentDescriptor.h>
+#include <react/components/switch/SwitchShadowNode.h>
+#include <react/core/ConcreteComponentDescriptor.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/switch/SwitchEventEmitter.h b/ReactCommon/fabric/components/switch/SwitchEventEmitter.h
index bce9a9d8ed7486..1b0dd263f6ca77 100644
--- a/ReactCommon/fabric/components/switch/SwitchEventEmitter.h
+++ b/ReactCommon/fabric/components/switch/SwitchEventEmitter.h
@@ -6,7 +6,7 @@
  */
 #pragma once
 
-#include <fabric/components/view/ViewEventEmitter.h>
+#include <react/components/view/ViewEventEmitter.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/switch/SwitchProps.cpp b/ReactCommon/fabric/components/switch/SwitchProps.cpp
index 5d648c14735bc2..3cbba88a97aab3 100644
--- a/ReactCommon/fabric/components/switch/SwitchProps.cpp
+++ b/ReactCommon/fabric/components/switch/SwitchProps.cpp
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <fabric/components/switch/SwitchProps.h>
-#include <fabric/core/propsConversions.h>
+#include <react/components/switch/SwitchProps.h>
+#include <react/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/switch/SwitchProps.h b/ReactCommon/fabric/components/switch/SwitchProps.h
index 102497ffbb2393..66c658125c1914 100644
--- a/ReactCommon/fabric/components/switch/SwitchProps.h
+++ b/ReactCommon/fabric/components/switch/SwitchProps.h
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <fabric/components/view/ViewProps.h>
-#include <fabric/graphics/Color.h>
+#include <react/components/view/ViewProps.h>
+#include <react/graphics/Color.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/switch/SwitchShadowNode.h b/ReactCommon/fabric/components/switch/SwitchShadowNode.h
index a9de57b3763f4d..939a32d3b804c3 100644
--- a/ReactCommon/fabric/components/switch/SwitchShadowNode.h
+++ b/ReactCommon/fabric/components/switch/SwitchShadowNode.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <fabric/components/switch/SwitchEventEmitter.h>
-#include <fabric/components/switch/SwitchProps.h>
-#include <fabric/components/view/ConcreteViewShadowNode.h>
+#include <react/components/switch/SwitchEventEmitter.h>
+#include <react/components/switch/SwitchProps.h>
+#include <react/components/view/ConcreteViewShadowNode.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/BUCK b/ReactCommon/fabric/components/text/BUCK
index 4f241814b6101c..dff38f26b23924 100644
--- a/ReactCommon/fabric/components/text/BUCK
+++ b/ReactCommon/fabric/components/text/BUCK
@@ -32,7 +32,7 @@ rn_xplat_cxx_library(
             ("text", "*.h"),
             ("rawtext", "*.h"),
         ],
-        prefix = "fabric/components/text",
+        prefix = "react/components/text",
     ),
     compiler_flags = [
         "-fexceptions",
diff --git a/ReactCommon/fabric/components/text/basetext/BaseTextProps.cpp b/ReactCommon/fabric/components/text/basetext/BaseTextProps.cpp
index 4e2d95289fb34e..0383bfe23b9965 100644
--- a/ReactCommon/fabric/components/text/basetext/BaseTextProps.cpp
+++ b/ReactCommon/fabric/components/text/basetext/BaseTextProps.cpp
@@ -7,10 +7,10 @@
 
 #include "BaseTextProps.h"
 
-#include <fabric/attributedstring/conversions.h>
-#include <fabric/core/propsConversions.h>
-#include <fabric/debug/DebugStringConvertibleItem.h>
-#include <fabric/graphics/conversions.h>
+#include <react/attributedstring/conversions.h>
+#include <react/core/propsConversions.h>
+#include <react/debug/DebugStringConvertibleItem.h>
+#include <react/graphics/conversions.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/basetext/BaseTextProps.h b/ReactCommon/fabric/components/text/basetext/BaseTextProps.h
index d23e6b1b1b334f..25968c2063d34e 100644
--- a/ReactCommon/fabric/components/text/basetext/BaseTextProps.h
+++ b/ReactCommon/fabric/components/text/basetext/BaseTextProps.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <fabric/attributedstring/TextAttributes.h>
-#include <fabric/core/Props.h>
-#include <fabric/graphics/Color.h>
-#include <fabric/graphics/Geometry.h>
+#include <react/attributedstring/TextAttributes.h>
+#include <react/core/Props.h>
+#include <react/graphics/Color.h>
+#include <react/graphics/Geometry.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.cpp b/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.cpp
index 086d2bde32447f..7c7036fbc4a847 100644
--- a/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.cpp
+++ b/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.cpp
@@ -7,11 +7,11 @@
 
 #include "BaseTextShadowNode.h"
 
-#include <fabric/components/text/RawTextProps.h>
-#include <fabric/components/text/RawTextShadowNode.h>
-#include <fabric/components/text/TextProps.h>
-#include <fabric/components/text/TextShadowNode.h>
-#include <fabric/debug/DebugStringConvertibleItem.h>
+#include <react/components/text/RawTextProps.h>
+#include <react/components/text/RawTextShadowNode.h>
+#include <react/components/text/TextProps.h>
+#include <react/components/text/TextShadowNode.h>
+#include <react/debug/DebugStringConvertibleItem.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.h b/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.h
index 4c47a18dce39d1..7da118643cd004 100644
--- a/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.h
+++ b/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/attributedstring/AttributedString.h>
-#include <fabric/attributedstring/TextAttributes.h>
+#include <react/attributedstring/AttributedString.h>
+#include <react/attributedstring/TextAttributes.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h b/ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h
index 9adeb0f344a434..9944483a72cc27 100644
--- a/ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <fabric/components/text/ParagraphShadowNode.h>
-#include <fabric/core/ConcreteComponentDescriptor.h>
-#include <fabric/textlayoutmanager/TextLayoutManager.h>
-#include <fabric/uimanager/ContextContainer.h>
+#include <react/components/text/ParagraphShadowNode.h>
+#include <react/core/ConcreteComponentDescriptor.h>
+#include <react/textlayoutmanager/TextLayoutManager.h>
+#include <react/uimanager/ContextContainer.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.cpp b/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.cpp
index 664e480188ef62..2c562ea30dec8d 100644
--- a/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.cpp
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.cpp
@@ -7,8 +7,8 @@
 
 #include "ParagraphLocalData.h"
 
-#include <fabric/components/text/conversions.h>
-#include <fabric/debug/debugStringConvertibleUtils.h>
+#include <react/components/text/conversions.h>
+#include <react/debug/debugStringConvertibleUtils.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.h b/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.h
index d03a634f5b8e0f..7005496f94c3d6 100644
--- a/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.h
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <fabric/attributedstring/AttributedString.h>
-#include <fabric/core/LocalData.h>
-#include <fabric/textlayoutmanager/TextLayoutManager.h>
+#include <react/attributedstring/AttributedString.h>
+#include <react/core/LocalData.h>
+#include <react/textlayoutmanager/TextLayoutManager.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphProps.cpp b/ReactCommon/fabric/components/text/paragraph/ParagraphProps.cpp
index 321d2abff6b9b9..d8135cd845a2e7 100644
--- a/ReactCommon/fabric/components/text/paragraph/ParagraphProps.cpp
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphProps.cpp
@@ -7,9 +7,9 @@
 
 #include "ParagraphProps.h"
 
-#include <fabric/attributedstring/conversions.h>
-#include <fabric/core/propsConversions.h>
-#include <fabric/debug/debugStringConvertibleUtils.h>
+#include <react/attributedstring/conversions.h>
+#include <react/core/propsConversions.h>
+#include <react/debug/debugStringConvertibleUtils.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphProps.h b/ReactCommon/fabric/components/text/paragraph/ParagraphProps.h
index 3874f5513a2e80..1e1ca67e15b97f 100644
--- a/ReactCommon/fabric/components/text/paragraph/ParagraphProps.h
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphProps.h
@@ -10,10 +10,10 @@
 #include <limits>
 #include <memory>
 
-#include <fabric/attributedstring/ParagraphAttributes.h>
-#include <fabric/components/text/BaseTextProps.h>
-#include <fabric/components/view/ViewProps.h>
-#include <fabric/core/Props.h>
+#include <react/attributedstring/ParagraphAttributes.h>
+#include <react/components/text/BaseTextProps.h>
+#include <react/components/view/ViewProps.h>
+#include <react/core/Props.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.h b/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.h
index f711acec9646b8..c1d1f14dfbbe2c 100644
--- a/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.h
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.h
@@ -7,14 +7,14 @@
 
 #pragma once
 
-#include <fabric/components/text/ParagraphProps.h>
-#include <fabric/components/text/TextShadowNode.h>
-#include <fabric/components/view/ConcreteViewShadowNode.h>
-#include <fabric/core/ConcreteShadowNode.h>
-#include <fabric/core/LayoutContext.h>
-#include <fabric/core/ShadowNode.h>
-#include <fabric/textlayoutmanager/TextLayoutManager.h>
 #include <folly/Optional.h>
+#include <react/components/text/ParagraphProps.h>
+#include <react/components/text/TextShadowNode.h>
+#include <react/components/view/ConcreteViewShadowNode.h>
+#include <react/core/ConcreteShadowNode.h>
+#include <react/core/LayoutContext.h>
+#include <react/core/ShadowNode.h>
+#include <react/textlayoutmanager/TextLayoutManager.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/paragraph/conversions.h b/ReactCommon/fabric/components/text/paragraph/conversions.h
index e3f2f6c1f386f0..bf2f2e1ebda795 100644
--- a/ReactCommon/fabric/components/text/paragraph/conversions.h
+++ b/ReactCommon/fabric/components/text/paragraph/conversions.h
@@ -3,9 +3,9 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
-#include <fabric/attributedstring/conversions.h>
-#include <fabric/components/text/ParagraphLocalData.h>
 #include <folly/dynamic.h>
+#include <react/attributedstring/conversions.h>
+#include <react/components/text/ParagraphLocalData.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/rawtext/RawTextComponentDescriptor.h b/ReactCommon/fabric/components/text/rawtext/RawTextComponentDescriptor.h
index 0796e25ffacb03..8ee9418ee3fe45 100644
--- a/ReactCommon/fabric/components/text/rawtext/RawTextComponentDescriptor.h
+++ b/ReactCommon/fabric/components/text/rawtext/RawTextComponentDescriptor.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/components/text/RawTextShadowNode.h>
-#include <fabric/core/ConcreteComponentDescriptor.h>
+#include <react/components/text/RawTextShadowNode.h>
+#include <react/core/ConcreteComponentDescriptor.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/rawtext/RawTextProps.cpp b/ReactCommon/fabric/components/text/rawtext/RawTextProps.cpp
index d3d993634ab54e..92a485ab5151cd 100644
--- a/ReactCommon/fabric/components/text/rawtext/RawTextProps.cpp
+++ b/ReactCommon/fabric/components/text/rawtext/RawTextProps.cpp
@@ -7,8 +7,8 @@
 
 #include "RawTextProps.h"
 
-#include <fabric/core/propsConversions.h>
-#include <fabric/debug/debugStringConvertibleUtils.h>
+#include <react/core/propsConversions.h>
+#include <react/debug/debugStringConvertibleUtils.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/rawtext/RawTextProps.h b/ReactCommon/fabric/components/text/rawtext/RawTextProps.h
index c89f4f77206439..4b774ca41b96c7 100644
--- a/ReactCommon/fabric/components/text/rawtext/RawTextProps.h
+++ b/ReactCommon/fabric/components/text/rawtext/RawTextProps.h
@@ -9,8 +9,8 @@
 
 #include <memory>
 
-#include <fabric/core/Props.h>
-#include <fabric/debug/DebugStringConvertible.h>
+#include <react/core/Props.h>
+#include <react/debug/DebugStringConvertible.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.h b/ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.h
index 0935678b4a49c8..6613289a57090d 100644
--- a/ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.h
+++ b/ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/components/text/RawTextProps.h>
-#include <fabric/core/ConcreteShadowNode.h>
+#include <react/components/text/RawTextProps.h>
+#include <react/core/ConcreteShadowNode.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/tests/ParagraphLocalDataTest.cpp b/ReactCommon/fabric/components/text/tests/ParagraphLocalDataTest.cpp
index d9572c5a4e5b1e..fab50b266dc496 100644
--- a/ReactCommon/fabric/components/text/tests/ParagraphLocalDataTest.cpp
+++ b/ReactCommon/fabric/components/text/tests/ParagraphLocalDataTest.cpp
@@ -8,12 +8,12 @@
 #include <memory>
 
 #include <assert.h>
-#include <fabric/attributedstring/AttributedString.h>
-#include <fabric/attributedstring/TextAttributes.h>
-#include <fabric/attributedstring/primitives.h>
-#include <fabric/components/text/ParagraphLocalData.h>
-#include <fabric/components/text/conversions.h>
 #include <gtest/gtest.h>
+#include <react/attributedstring/AttributedString.h>
+#include <react/attributedstring/TextAttributes.h>
+#include <react/attributedstring/primitives.h>
+#include <react/components/text/ParagraphLocalData.h>
+#include <react/components/text/conversions.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/text/TextComponentDescriptor.h b/ReactCommon/fabric/components/text/text/TextComponentDescriptor.h
index ce4ee80ea53c31..13946369def6bc 100644
--- a/ReactCommon/fabric/components/text/text/TextComponentDescriptor.h
+++ b/ReactCommon/fabric/components/text/text/TextComponentDescriptor.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/components/text/TextShadowNode.h>
-#include <fabric/core/ConcreteComponentDescriptor.h>
+#include <react/components/text/TextShadowNode.h>
+#include <react/core/ConcreteComponentDescriptor.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/text/TextProps.h b/ReactCommon/fabric/components/text/text/TextProps.h
index 3d81d17d77673e..83680db4706aa9 100644
--- a/ReactCommon/fabric/components/text/text/TextProps.h
+++ b/ReactCommon/fabric/components/text/text/TextProps.h
@@ -7,11 +7,11 @@
 
 #pragma once
 
-#include <fabric/attributedstring/TextAttributes.h>
-#include <fabric/components/text/BaseTextProps.h>
-#include <fabric/core/Props.h>
-#include <fabric/graphics/Color.h>
-#include <fabric/graphics/Geometry.h>
+#include <react/attributedstring/TextAttributes.h>
+#include <react/components/text/BaseTextProps.h>
+#include <react/core/Props.h>
+#include <react/graphics/Color.h>
+#include <react/graphics/Geometry.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/text/text/TextShadowNode.h b/ReactCommon/fabric/components/text/text/TextShadowNode.h
index 1cd7805a18b575..52ed70e955c13f 100644
--- a/ReactCommon/fabric/components/text/text/TextShadowNode.h
+++ b/ReactCommon/fabric/components/text/text/TextShadowNode.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <fabric/components/text/BaseTextShadowNode.h>
-#include <fabric/components/text/TextProps.h>
-#include <fabric/components/view/ViewEventEmitter.h>
-#include <fabric/core/ConcreteShadowNode.h>
+#include <react/components/text/BaseTextShadowNode.h>
+#include <react/components/text/TextProps.h>
+#include <react/components/view/ViewEventEmitter.h>
+#include <react/core/ConcreteShadowNode.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/view/BUCK b/ReactCommon/fabric/components/view/BUCK
index f246ff427b233c..868128eeabcd91 100644
--- a/ReactCommon/fabric/components/view/BUCK
+++ b/ReactCommon/fabric/components/view/BUCK
@@ -31,7 +31,7 @@ rn_xplat_cxx_library(
             ("root", "*.h"),
             ("yoga", "*.h"),
         ],
-        prefix = "fabric/components/view",
+        prefix = "react/components/view",
     ),
     compiler_flags = [
         "-fexceptions",
diff --git a/ReactCommon/fabric/components/view/ConcreteViewShadowNode.h b/ReactCommon/fabric/components/view/ConcreteViewShadowNode.h
index 41e8a9b4219a3c..584afe8ec9eeeb 100644
--- a/ReactCommon/fabric/components/view/ConcreteViewShadowNode.h
+++ b/ReactCommon/fabric/components/view/ConcreteViewShadowNode.h
@@ -7,15 +7,15 @@
 
 #pragma once
 
-#include <fabric/components/view/AccessibleShadowNode.h>
-#include <fabric/components/view/ViewEventEmitter.h>
-#include <fabric/components/view/ViewProps.h>
-#include <fabric/components/view/YogaLayoutableShadowNode.h>
-#include <fabric/core/ConcreteShadowNode.h>
-#include <fabric/core/LayoutableShadowNode.h>
-#include <fabric/core/ShadowNode.h>
-#include <fabric/core/ShadowNodeFragment.h>
-#include <fabric/debug/DebugStringConvertibleItem.h>
+#include <react/components/view/AccessibleShadowNode.h>
+#include <react/components/view/ViewEventEmitter.h>
+#include <react/components/view/ViewProps.h>
+#include <react/components/view/YogaLayoutableShadowNode.h>
+#include <react/core/ConcreteShadowNode.h>
+#include <react/core/LayoutableShadowNode.h>
+#include <react/core/ShadowNode.h>
+#include <react/core/ShadowNodeFragment.h>
+#include <react/debug/DebugStringConvertibleItem.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/view/TouchEventEmitter.h b/ReactCommon/fabric/components/view/TouchEventEmitter.h
index ce8ddfb2e55c36..c00e2755225781 100644
--- a/ReactCommon/fabric/components/view/TouchEventEmitter.h
+++ b/ReactCommon/fabric/components/view/TouchEventEmitter.h
@@ -6,9 +6,9 @@
  */
 #pragma once
 
-#include <fabric/core/LayoutMetrics.h>
-#include <fabric/core/ReactPrimitives.h>
-#include <fabric/events/EventEmitter.h>
+#include <react/core/LayoutMetrics.h>
+#include <react/core/ReactPrimitives.h>
+#include <react/events/EventEmitter.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/view/ViewComponentDescriptor.h b/ReactCommon/fabric/components/view/ViewComponentDescriptor.h
index fe8a6f74f43f82..dfa98ac1cbc033 100644
--- a/ReactCommon/fabric/components/view/ViewComponentDescriptor.h
+++ b/ReactCommon/fabric/components/view/ViewComponentDescriptor.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/components/view/ViewShadowNode.h>
-#include <fabric/core/ConcreteComponentDescriptor.h>
+#include <react/components/view/ViewShadowNode.h>
+#include <react/core/ConcreteComponentDescriptor.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/view/ViewEventEmitter.h b/ReactCommon/fabric/components/view/ViewEventEmitter.h
index e410a43da5e675..431ede00089f29 100644
--- a/ReactCommon/fabric/components/view/ViewEventEmitter.h
+++ b/ReactCommon/fabric/components/view/ViewEventEmitter.h
@@ -8,8 +8,8 @@
 
 #include <memory>
 
-#include <fabric/core/LayoutMetrics.h>
-#include <fabric/core/ReactPrimitives.h>
+#include <react/core/LayoutMetrics.h>
+#include <react/core/ReactPrimitives.h>
 #include "TouchEventEmitter.h"
 
 namespace facebook {
diff --git a/ReactCommon/fabric/components/view/ViewProps.cpp b/ReactCommon/fabric/components/view/ViewProps.cpp
index 91c2742d29dd7d..db11821b83a331 100644
--- a/ReactCommon/fabric/components/view/ViewProps.cpp
+++ b/ReactCommon/fabric/components/view/ViewProps.cpp
@@ -7,11 +7,11 @@
 
 #include "ViewProps.h"
 
-#include <fabric/components/view/conversions.h>
-#include <fabric/components/view/propsConversions.h>
-#include <fabric/core/propsConversions.h>
-#include <fabric/debug/debugStringConvertibleUtils.h>
-#include <fabric/graphics/conversions.h>
+#include <react/components/view/conversions.h>
+#include <react/components/view/propsConversions.h>
+#include <react/core/propsConversions.h>
+#include <react/debug/debugStringConvertibleUtils.h>
+#include <react/graphics/conversions.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/view/ViewProps.h b/ReactCommon/fabric/components/view/ViewProps.h
index 69d355e8e97a73..5259a85fd7e4a2 100644
--- a/ReactCommon/fabric/components/view/ViewProps.h
+++ b/ReactCommon/fabric/components/view/ViewProps.h
@@ -7,12 +7,12 @@
 
 #pragma once
 
-#include <fabric/components/view/AccessibilityProps.h>
-#include <fabric/components/view/YogaStylableProps.h>
-#include <fabric/components/view/primitives.h>
-#include <fabric/core/Props.h>
-#include <fabric/graphics/Color.h>
-#include <fabric/graphics/Geometry.h>
+#include <react/components/view/AccessibilityProps.h>
+#include <react/components/view/YogaStylableProps.h>
+#include <react/components/view/primitives.h>
+#include <react/core/Props.h>
+#include <react/graphics/Color.h>
+#include <react/graphics/Geometry.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/view/ViewShadowNode.h b/ReactCommon/fabric/components/view/ViewShadowNode.h
index d3eb4edcd9a36c..4111f939b3acee 100644
--- a/ReactCommon/fabric/components/view/ViewShadowNode.h
+++ b/ReactCommon/fabric/components/view/ViewShadowNode.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/components/view/ConcreteViewShadowNode.h>
-#include <fabric/components/view/ViewProps.h>
+#include <react/components/view/ConcreteViewShadowNode.h>
+#include <react/components/view/ViewProps.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp b/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp
index 1bdd986e8c1dd9..f8ba55d976d81c 100644
--- a/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp
+++ b/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp
@@ -7,10 +7,10 @@
 
 #include "AccessibilityProps.h"
 
-#include <fabric/components/view/accessibilityPropsConversions.h>
-#include <fabric/components/view/propsConversions.h>
-#include <fabric/core/propsConversions.h>
-#include <fabric/debug/debugStringConvertibleUtils.h>
+#include <react/components/view/accessibilityPropsConversions.h>
+#include <react/components/view/propsConversions.h>
+#include <react/core/propsConversions.h>
+#include <react/debug/debugStringConvertibleUtils.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h b/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h
index 953425fc1020f1..1253fc308f424f 100644
--- a/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h
+++ b/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <fabric/components/view/AccessibilityPrimitives.h>
-#include <fabric/core/Props.h>
-#include <fabric/core/ReactPrimitives.h>
-#include <fabric/debug/DebugStringConvertible.h>
+#include <react/components/view/AccessibilityPrimitives.h>
+#include <react/core/Props.h>
+#include <react/core/ReactPrimitives.h>
+#include <react/debug/DebugStringConvertible.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.h b/ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.h
index 88a490ccde5a83..db22cca4777164 100644
--- a/ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.h
+++ b/ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.h
@@ -9,8 +9,8 @@
 
 #include <memory>
 
-#include <fabric/components/view/AccessibilityProps.h>
-#include <fabric/core/ShadowNode.h>
+#include <react/components/view/AccessibilityProps.h>
+#include <react/core/ShadowNode.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/view/accessibility/accessibilityPropsConversions.h b/ReactCommon/fabric/components/view/accessibility/accessibilityPropsConversions.h
index 2e73874dee2518..4e7c361926e222 100644
--- a/ReactCommon/fabric/components/view/accessibility/accessibilityPropsConversions.h
+++ b/ReactCommon/fabric/components/view/accessibility/accessibilityPropsConversions.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/components/view/AccessibilityPrimitives.h>
 #include <folly/dynamic.h>
+#include <react/components/view/AccessibilityPrimitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/view/conversions.h b/ReactCommon/fabric/components/view/conversions.h
index b5683c0d70f2c6..d4274e4ded48e9 100644
--- a/ReactCommon/fabric/components/view/conversions.h
+++ b/ReactCommon/fabric/components/view/conversions.h
@@ -7,11 +7,11 @@
 
 #pragma once
 
-#include <fabric/components/view/primitives.h>
-#include <fabric/core/LayoutMetrics.h>
-#include <fabric/graphics/Geometry.h>
 #include <folly/Conv.h>
 #include <folly/dynamic.h>
+#include <react/components/view/primitives.h>
+#include <react/core/LayoutMetrics.h>
+#include <react/graphics/Geometry.h>
 #include <yoga/YGNode.h>
 #include <yoga/Yoga.h>
 #include <cmath>
diff --git a/ReactCommon/fabric/components/view/primitives.h b/ReactCommon/fabric/components/view/primitives.h
index 4f3a00dd550b91..04967251093b83 100644
--- a/ReactCommon/fabric/components/view/primitives.h
+++ b/ReactCommon/fabric/components/view/primitives.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <fabric/graphics/Color.h>
-#include <fabric/graphics/Geometry.h>
 #include <folly/Optional.h>
+#include <react/graphics/Color.h>
+#include <react/graphics/Geometry.h>
 #include <array>
 #include <cmath>
 
diff --git a/ReactCommon/fabric/components/view/propsConversions.h b/ReactCommon/fabric/components/view/propsConversions.h
index 4ef72d1d3be2f7..cd18390caa0759 100644
--- a/ReactCommon/fabric/components/view/propsConversions.h
+++ b/ReactCommon/fabric/components/view/propsConversions.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/components/view/conversions.h>
-#include <fabric/core/propsConversions.h>
+#include <react/components/view/conversions.h>
+#include <react/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/view/tests/ViewTest.cpp b/ReactCommon/fabric/components/view/tests/ViewTest.cpp
index 66a6a0b2218fab..acef5fdffc6376 100644
--- a/ReactCommon/fabric/components/view/tests/ViewTest.cpp
+++ b/ReactCommon/fabric/components/view/tests/ViewTest.cpp
@@ -7,8 +7,8 @@
 
 #include <memory>
 
-#include <fabric/components/view/ViewComponentDescriptor.h>
 #include <gtest/gtest.h>
+#include <react/components/view/ViewComponentDescriptor.h>
 
 using namespace facebook::react;
 
diff --git a/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp b/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp
index 3adadef249fbb7..298295f2146659 100644
--- a/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp
+++ b/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp
@@ -10,10 +10,10 @@
 #include <algorithm>
 #include <memory>
 
-#include <fabric/components/view/conversions.h>
-#include <fabric/core/LayoutConstraints.h>
-#include <fabric/core/LayoutContext.h>
-#include <fabric/debug/DebugStringConvertibleItem.h>
+#include <react/components/view/conversions.h>
+#include <react/core/LayoutConstraints.h>
+#include <react/core/LayoutContext.h>
+#include <react/debug/DebugStringConvertibleItem.h>
 #include <yoga/Yoga.h>
 
 namespace facebook {
diff --git a/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h b/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h
index 8c82d2ec4d84ee..8386937ac1e012 100644
--- a/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h
+++ b/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h
@@ -12,10 +12,10 @@
 
 #include <yoga/YGNode.h>
 
-#include <fabric/components/view/YogaStylableProps.h>
-#include <fabric/core/LayoutableShadowNode.h>
-#include <fabric/core/Sealable.h>
-#include <fabric/debug/DebugStringConvertible.h>
+#include <react/components/view/YogaStylableProps.h>
+#include <react/core/LayoutableShadowNode.h>
+#include <react/core/Sealable.h>
+#include <react/debug/DebugStringConvertible.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/components/view/yoga/YogaStylableProps.cpp b/ReactCommon/fabric/components/view/yoga/YogaStylableProps.cpp
index bf134efc81747c..74391cf23f9c95 100644
--- a/ReactCommon/fabric/components/view/yoga/YogaStylableProps.cpp
+++ b/ReactCommon/fabric/components/view/yoga/YogaStylableProps.cpp
@@ -7,10 +7,10 @@
 
 #include "YogaStylableProps.h"
 
-#include <fabric/components/view/conversions.h>
-#include <fabric/components/view/propsConversions.h>
-#include <fabric/core/propsConversions.h>
-#include <fabric/debug/debugStringConvertibleUtils.h>
+#include <react/components/view/conversions.h>
+#include <react/components/view/propsConversions.h>
+#include <react/core/propsConversions.h>
+#include <react/debug/debugStringConvertibleUtils.h>
 #include <yoga/YGNode.h>
 #include <yoga/Yoga.h>
 
diff --git a/ReactCommon/fabric/components/view/yoga/YogaStylableProps.h b/ReactCommon/fabric/components/view/yoga/YogaStylableProps.h
index 340a8ccb6258a1..470a064cbe82b7 100644
--- a/ReactCommon/fabric/components/view/yoga/YogaStylableProps.h
+++ b/ReactCommon/fabric/components/view/yoga/YogaStylableProps.h
@@ -9,8 +9,8 @@
 
 #include <yoga/YGStyle.h>
 
-#include <fabric/core/Props.h>
-#include <fabric/debug/DebugStringConvertible.h>
+#include <react/core/Props.h>
+#include <react/debug/DebugStringConvertible.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/core/BUCK b/ReactCommon/fabric/core/BUCK
index f896d7e58361b6..f03ab4b701b85f 100644
--- a/ReactCommon/fabric/core/BUCK
+++ b/ReactCommon/fabric/core/BUCK
@@ -23,7 +23,7 @@ rn_xplat_cxx_library(
             ("layout", "*.h"),
             ("shadownode", "*.h"),
         ],
-        prefix = "fabric/core",
+        prefix = "react/core",
     ),
     compiler_flags = [
         "-fexceptions",
diff --git a/ReactCommon/fabric/core/componentdescriptor/ComponentDescriptor.h b/ReactCommon/fabric/core/componentdescriptor/ComponentDescriptor.h
index 91dd70326fb026..6eb19fbacda19d 100644
--- a/ReactCommon/fabric/core/componentdescriptor/ComponentDescriptor.h
+++ b/ReactCommon/fabric/core/componentdescriptor/ComponentDescriptor.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/core/Props.h>
-#include <fabric/core/ShadowNode.h>
+#include <react/core/Props.h>
+#include <react/core/ShadowNode.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h b/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h
index 8d31318326596b..7a52cb2d286029 100644
--- a/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h
+++ b/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h
@@ -10,11 +10,11 @@
 #include <functional>
 #include <memory>
 
-#include <fabric/core/ComponentDescriptor.h>
-#include <fabric/core/Props.h>
-#include <fabric/core/ShadowNode.h>
-#include <fabric/core/ShadowNodeFragment.h>
-#include <fabric/events/EventDispatcher.h>
+#include <react/core/ComponentDescriptor.h>
+#include <react/core/Props.h>
+#include <react/core/ShadowNode.h>
+#include <react/core/ShadowNodeFragment.h>
+#include <react/events/EventDispatcher.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/core/conversions.h b/ReactCommon/fabric/core/conversions.h
index 9a9c4495e25412..d8ea97279f2980 100644
--- a/ReactCommon/fabric/core/conversions.h
+++ b/ReactCommon/fabric/core/conversions.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <fabric/core/LayoutPrimitives.h>
+#include <react/core/LayoutPrimitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/core/layout/LayoutConstraints.h b/ReactCommon/fabric/core/layout/LayoutConstraints.h
index 33607c300b86dd..1afd10b5986495 100644
--- a/ReactCommon/fabric/core/layout/LayoutConstraints.h
+++ b/ReactCommon/fabric/core/layout/LayoutConstraints.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/core/LayoutPrimitives.h>
-#include <fabric/graphics/Geometry.h>
+#include <react/core/LayoutPrimitives.h>
+#include <react/graphics/Geometry.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/core/layout/LayoutContext.h b/ReactCommon/fabric/core/layout/LayoutContext.h
index 80988f0986c60d..184d44f1caf92a 100644
--- a/ReactCommon/fabric/core/layout/LayoutContext.h
+++ b/ReactCommon/fabric/core/layout/LayoutContext.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <fabric/graphics/Geometry.h>
+#include <react/graphics/Geometry.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/core/layout/LayoutMetrics.h b/ReactCommon/fabric/core/layout/LayoutMetrics.h
index 92c31e833a5ddf..b7ee04a46fcace 100644
--- a/ReactCommon/fabric/core/layout/LayoutMetrics.h
+++ b/ReactCommon/fabric/core/layout/LayoutMetrics.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/core/LayoutPrimitives.h>
-#include <fabric/graphics/Geometry.h>
+#include <react/core/LayoutPrimitives.h>
+#include <react/graphics/Geometry.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/core/layout/LayoutableShadowNode.cpp b/ReactCommon/fabric/core/layout/LayoutableShadowNode.cpp
index f12e1175df35c9..61ae72fcc6304f 100644
--- a/ReactCommon/fabric/core/layout/LayoutableShadowNode.cpp
+++ b/ReactCommon/fabric/core/layout/LayoutableShadowNode.cpp
@@ -7,11 +7,11 @@
 
 #include "LayoutableShadowNode.h"
 
-#include <fabric/core/LayoutConstraints.h>
-#include <fabric/core/LayoutContext.h>
-#include <fabric/core/LayoutMetrics.h>
-#include <fabric/debug/DebugStringConvertibleItem.h>
-#include <fabric/graphics/conversions.h>
+#include <react/core/LayoutConstraints.h>
+#include <react/core/LayoutContext.h>
+#include <react/core/LayoutMetrics.h>
+#include <react/debug/DebugStringConvertibleItem.h>
+#include <react/graphics/conversions.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/core/layout/LayoutableShadowNode.h b/ReactCommon/fabric/core/layout/LayoutableShadowNode.h
index 50d57a0e686bce..74c82a2ce450de 100644
--- a/ReactCommon/fabric/core/layout/LayoutableShadowNode.h
+++ b/ReactCommon/fabric/core/layout/LayoutableShadowNode.h
@@ -12,9 +12,9 @@
 #include <memory>
 #include <vector>
 
-#include <fabric/core/LayoutMetrics.h>
-#include <fabric/core/Sealable.h>
-#include <fabric/debug/DebugStringConvertible.h>
+#include <react/core/LayoutMetrics.h>
+#include <react/core/Sealable.h>
+#include <react/debug/DebugStringConvertible.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/core/propsConversions.h b/ReactCommon/fabric/core/propsConversions.h
index a1a8db5b00f8a1..c95fdb94570ba2 100644
--- a/ReactCommon/fabric/core/propsConversions.h
+++ b/ReactCommon/fabric/core/propsConversions.h
@@ -7,11 +7,11 @@
 
 #pragma once
 
-#include <fabric/graphics/Color.h>
-#include <fabric/graphics/Geometry.h>
-#include <fabric/graphics/conversions.h>
 #include <folly/Optional.h>
 #include <folly/dynamic.h>
+#include <react/graphics/Color.h>
+#include <react/graphics/Geometry.h>
+#include <react/graphics/conversions.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/core/shadownode/ConcreteShadowNode.h b/ReactCommon/fabric/core/shadownode/ConcreteShadowNode.h
index cd99d629fa5815..c85abc748a6818 100644
--- a/ReactCommon/fabric/core/shadownode/ConcreteShadowNode.h
+++ b/ReactCommon/fabric/core/shadownode/ConcreteShadowNode.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/core/Props.h>
-#include <fabric/core/ShadowNode.h>
+#include <react/core/Props.h>
+#include <react/core/ShadowNode.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/core/shadownode/LocalData.h b/ReactCommon/fabric/core/shadownode/LocalData.h
index 9fe47c774b522c..d62b3d29128768 100644
--- a/ReactCommon/fabric/core/shadownode/LocalData.h
+++ b/ReactCommon/fabric/core/shadownode/LocalData.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <fabric/core/Sealable.h>
-#include <fabric/debug/DebugStringConvertible.h>
 #include <folly/dynamic.h>
+#include <react/core/Sealable.h>
+#include <react/debug/DebugStringConvertible.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/core/shadownode/Props.cpp b/ReactCommon/fabric/core/shadownode/Props.cpp
index c6ca7d20c3092a..945f7e666a3495 100644
--- a/ReactCommon/fabric/core/shadownode/Props.cpp
+++ b/ReactCommon/fabric/core/shadownode/Props.cpp
@@ -7,8 +7,8 @@
 
 #include "Props.h"
 
-#include <fabric/core/propsConversions.h>
 #include <folly/dynamic.h>
+#include <react/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/core/shadownode/Props.h b/ReactCommon/fabric/core/shadownode/Props.h
index ace5e4dfe9996c..e2fd66d22c601a 100644
--- a/ReactCommon/fabric/core/shadownode/Props.h
+++ b/ReactCommon/fabric/core/shadownode/Props.h
@@ -9,9 +9,9 @@
 
 #include <folly/dynamic.h>
 
-#include <fabric/core/ReactPrimitives.h>
-#include <fabric/core/Sealable.h>
-#include <fabric/debug/DebugStringConvertible.h>
+#include <react/core/ReactPrimitives.h>
+#include <react/core/Sealable.h>
+#include <react/debug/DebugStringConvertible.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/core/shadownode/ShadowNode.cpp b/ReactCommon/fabric/core/shadownode/ShadowNode.cpp
index 3ea2d8193f3833..1a282dd6e9875d 100644
--- a/ReactCommon/fabric/core/shadownode/ShadowNode.cpp
+++ b/ReactCommon/fabric/core/shadownode/ShadowNode.cpp
@@ -9,9 +9,9 @@
 
 #include <string>
 
-#include <fabric/core/ShadowNodeFragment.h>
-#include <fabric/debug/DebugStringConvertible.h>
-#include <fabric/debug/debugStringConvertibleUtils.h>
+#include <react/core/ShadowNodeFragment.h>
+#include <react/debug/DebugStringConvertible.h>
+#include <react/debug/debugStringConvertibleUtils.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/core/shadownode/ShadowNode.h b/ReactCommon/fabric/core/shadownode/ShadowNode.h
index a58c3aeb86d4fb..aa15621449c653 100644
--- a/ReactCommon/fabric/core/shadownode/ShadowNode.h
+++ b/ReactCommon/fabric/core/shadownode/ShadowNode.h
@@ -11,12 +11,12 @@
 #include <string>
 #include <vector>
 
-#include <fabric/core/LocalData.h>
-#include <fabric/core/Props.h>
-#include <fabric/core/ReactPrimitives.h>
-#include <fabric/core/Sealable.h>
-#include <fabric/debug/DebugStringConvertible.h>
-#include <fabric/events/EventEmitter.h>
+#include <react/core/LocalData.h>
+#include <react/core/Props.h>
+#include <react/core/ReactPrimitives.h>
+#include <react/core/Sealable.h>
+#include <react/debug/DebugStringConvertible.h>
+#include <react/events/EventEmitter.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/core/shadownode/ShadowNodeFragment.h b/ReactCommon/fabric/core/shadownode/ShadowNodeFragment.h
index 9c483a14df13f5..8dabd15677f5c7 100644
--- a/ReactCommon/fabric/core/shadownode/ShadowNodeFragment.h
+++ b/ReactCommon/fabric/core/shadownode/ShadowNodeFragment.h
@@ -7,11 +7,11 @@
 
 #pragma once
 
-#include <fabric/core/LocalData.h>
-#include <fabric/core/Props.h>
-#include <fabric/core/ReactPrimitives.h>
-#include <fabric/core/ShadowNode.h>
-#include <fabric/events/EventEmitter.h>
+#include <react/core/LocalData.h>
+#include <react/core/Props.h>
+#include <react/core/ReactPrimitives.h>
+#include <react/core/ShadowNode.h>
+#include <react/events/EventEmitter.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/core/tests/PrimitivesTest.cpp b/ReactCommon/fabric/core/tests/PrimitivesTest.cpp
index fa0495f686e396..7c96796a889937 100644
--- a/ReactCommon/fabric/core/tests/PrimitivesTest.cpp
+++ b/ReactCommon/fabric/core/tests/PrimitivesTest.cpp
@@ -7,8 +7,8 @@
 
 #include <exception>
 
-#include <fabric/core/Sealable.h>
 #include <gtest/gtest.h>
+#include <react/core/Sealable.h>
 
 using namespace facebook::react;
 
diff --git a/ReactCommon/fabric/core/tests/ShadowNodeTest.cpp b/ReactCommon/fabric/core/tests/ShadowNodeTest.cpp
index 8caeff77742d55..45311bbfa27e27 100644
--- a/ReactCommon/fabric/core/tests/ShadowNodeTest.cpp
+++ b/ReactCommon/fabric/core/tests/ShadowNodeTest.cpp
@@ -7,9 +7,9 @@
 
 #include <memory>
 
-#include <fabric/core/ConcreteShadowNode.h>
-#include <fabric/core/ShadowNode.h>
 #include <gtest/gtest.h>
+#include <react/core/ConcreteShadowNode.h>
+#include <react/core/ShadowNode.h>
 
 #include "TestComponent.h"
 
diff --git a/ReactCommon/fabric/core/tests/TestComponent.h b/ReactCommon/fabric/core/tests/TestComponent.h
index c25e7864466ac1..8296d63250e3e8 100644
--- a/ReactCommon/fabric/core/tests/TestComponent.h
+++ b/ReactCommon/fabric/core/tests/TestComponent.h
@@ -9,11 +9,11 @@
 
 #include <memory>
 
-#include <fabric/core/ConcreteComponentDescriptor.h>
-#include <fabric/core/ConcreteShadowNode.h>
-#include <fabric/core/LocalData.h>
-#include <fabric/core/ShadowNode.h>
 #include <folly/dynamic.h>
+#include <react/core/ConcreteComponentDescriptor.h>
+#include <react/core/ConcreteShadowNode.h>
+#include <react/core/LocalData.h>
+#include <react/core/ShadowNode.h>
 
 using namespace facebook::react;
 
diff --git a/ReactCommon/fabric/debug/BUCK b/ReactCommon/fabric/debug/BUCK
index e13f71ed026bc4..8c2dbe3eaed1ff 100644
--- a/ReactCommon/fabric/debug/BUCK
+++ b/ReactCommon/fabric/debug/BUCK
@@ -30,7 +30,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "fabric/debug",
+        prefix = "react/debug",
     ),
     compiler_flags = [
         "-fexceptions",
diff --git a/ReactCommon/fabric/debug/DebugStringConvertibleItem.h b/ReactCommon/fabric/debug/DebugStringConvertibleItem.h
index edb01c4ea1d609..f4b60fae17625f 100644
--- a/ReactCommon/fabric/debug/DebugStringConvertibleItem.h
+++ b/ReactCommon/fabric/debug/DebugStringConvertibleItem.h
@@ -9,7 +9,7 @@
 
 #include <string>
 
-#include <fabric/debug/DebugStringConvertible.h>
+#include <react/debug/DebugStringConvertible.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/debug/debugStringConvertibleUtils.h b/ReactCommon/fabric/debug/debugStringConvertibleUtils.h
index 928f267f6492db..51bf698b4be0b9 100644
--- a/ReactCommon/fabric/debug/debugStringConvertibleUtils.h
+++ b/ReactCommon/fabric/debug/debugStringConvertibleUtils.h
@@ -12,10 +12,10 @@
 #include <string>
 #include <vector>
 
-#include <fabric/debug/DebugStringConvertible.h>
-#include <fabric/debug/DebugStringConvertibleItem.h>
 #include <folly/Conv.h>
 #include <folly/Optional.h>
+#include <react/debug/DebugStringConvertible.h>
+#include <react/debug/DebugStringConvertibleItem.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/debug/tests/DebugStringConvertibleTest.cpp b/ReactCommon/fabric/debug/tests/DebugStringConvertibleTest.cpp
index b8175c3a147eb3..99a1e43a365113 100644
--- a/ReactCommon/fabric/debug/tests/DebugStringConvertibleTest.cpp
+++ b/ReactCommon/fabric/debug/tests/DebugStringConvertibleTest.cpp
@@ -7,8 +7,8 @@
 
 #include <memory>
 
-#include <fabric/debug/DebugStringConvertibleItem.h>
 #include <gtest/gtest.h>
+#include <react/debug/DebugStringConvertibleItem.h>
 
 using namespace facebook::react;
 
diff --git a/ReactCommon/fabric/events/BUCK b/ReactCommon/fabric/events/BUCK
index b75663932e0b3b..9823eb1e3e2bb3 100644
--- a/ReactCommon/fabric/events/BUCK
+++ b/ReactCommon/fabric/events/BUCK
@@ -28,7 +28,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "fabric/events",
+        prefix = "react/events",
     ),
     compiler_flags = [
         "-fexceptions",
diff --git a/ReactCommon/fabric/events/BatchedEventQueue.h b/ReactCommon/fabric/events/BatchedEventQueue.h
index da6fbf3b010bb0..c73490a52c4c92 100644
--- a/ReactCommon/fabric/events/BatchedEventQueue.h
+++ b/ReactCommon/fabric/events/BatchedEventQueue.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <fabric/events/EventQueue.h>
+#include <react/events/EventQueue.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/events/EventBeatBasedExecutor.h b/ReactCommon/fabric/events/EventBeatBasedExecutor.h
index 80a616891d505b..7ef5a2d74ceec7 100644
--- a/ReactCommon/fabric/events/EventBeatBasedExecutor.h
+++ b/ReactCommon/fabric/events/EventBeatBasedExecutor.h
@@ -11,7 +11,7 @@
 #include <mutex>
 #include <vector>
 
-#include <fabric/events/EventBeat.h>
+#include <react/events/EventBeat.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/events/EventDispatcher.h b/ReactCommon/fabric/events/EventDispatcher.h
index 4a89c9d2234faf..897376b1e15ada 100644
--- a/ReactCommon/fabric/events/EventDispatcher.h
+++ b/ReactCommon/fabric/events/EventDispatcher.h
@@ -8,10 +8,10 @@
 
 #include <memory>
 
-#include <fabric/events/EventBeat.h>
-#include <fabric/events/EventQueue.h>
-#include <fabric/events/RawEvent.h>
-#include <fabric/events/primitives.h>
+#include <react/events/EventBeat.h>
+#include <react/events/EventQueue.h>
+#include <react/events/RawEvent.h>
+#include <react/events/primitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/events/EventEmitter.cpp b/ReactCommon/fabric/events/EventEmitter.cpp
index 7961f964c51723..cd823647a79252 100644
--- a/ReactCommon/fabric/events/EventEmitter.cpp
+++ b/ReactCommon/fabric/events/EventEmitter.cpp
@@ -7,8 +7,8 @@
 
 #include "EventEmitter.h"
 
-#include <fabric/debug/SystraceSection.h>
 #include <folly/dynamic.h>
+#include <react/debug/SystraceSection.h>
 
 #include "RawEvent.h"
 
diff --git a/ReactCommon/fabric/events/EventEmitter.h b/ReactCommon/fabric/events/EventEmitter.h
index 1a51b982a767e0..a974822d0cb5f0 100644
--- a/ReactCommon/fabric/events/EventEmitter.h
+++ b/ReactCommon/fabric/events/EventEmitter.h
@@ -9,9 +9,9 @@
 #include <memory>
 #include <mutex>
 
-#include <fabric/events/EventDispatcher.h>
-#include <fabric/events/primitives.h>
 #include <folly/dynamic.h>
+#include <react/events/EventDispatcher.h>
+#include <react/events/primitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/events/EventQueue.h b/ReactCommon/fabric/events/EventQueue.h
index aec7a3c9f24933..1a322beddfc022 100644
--- a/ReactCommon/fabric/events/EventQueue.h
+++ b/ReactCommon/fabric/events/EventQueue.h
@@ -11,10 +11,10 @@
 #include <mutex>
 #include <vector>
 
-#include <fabric/events/EventBeat.h>
-#include <fabric/events/RawEvent.h>
-#include <fabric/events/primitives.h>
 #include <jsi/jsi.h>
+#include <react/events/EventBeat.h>
+#include <react/events/RawEvent.h>
+#include <react/events/primitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/events/RawEvent.h b/ReactCommon/fabric/events/RawEvent.h
index ecb022af6e48be..1b34f884f8b40a 100644
--- a/ReactCommon/fabric/events/RawEvent.h
+++ b/ReactCommon/fabric/events/RawEvent.h
@@ -8,8 +8,8 @@
 
 #include <memory>
 
-#include <fabric/events/primitives.h>
 #include <folly/dynamic.h>
+#include <react/events/primitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/events/UnbatchedEventQueue.h b/ReactCommon/fabric/events/UnbatchedEventQueue.h
index 06c4a14de5043b..46f2392e928aaf 100644
--- a/ReactCommon/fabric/events/UnbatchedEventQueue.h
+++ b/ReactCommon/fabric/events/UnbatchedEventQueue.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <fabric/events/EventQueue.h>
+#include <react/events/EventQueue.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/graphics/BUCK b/ReactCommon/fabric/graphics/BUCK
index 2bbfff443c4c9e..a1386775b521b8 100644
--- a/ReactCommon/fabric/graphics/BUCK
+++ b/ReactCommon/fabric/graphics/BUCK
@@ -30,7 +30,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "fabric/graphics",
+        prefix = "react/graphics",
     ),
     compiler_flags = [
         "-fexceptions",
@@ -42,7 +42,7 @@ rn_xplat_cxx_library(
         [
             ("platform/android", "**/*.h"),
         ],
-        prefix = "fabric/graphics",
+        prefix = "react/graphics",
     ),
     fbandroid_srcs = glob(
         [
@@ -63,7 +63,7 @@ rn_xplat_cxx_library(
         [
             ("platform/ios", "*.h"),
         ],
-        prefix = "fabric/graphics",
+        prefix = "react/graphics",
     ),
     ios_frameworks = [
         "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
diff --git a/ReactCommon/fabric/graphics/Geometry.h b/ReactCommon/fabric/graphics/Geometry.h
index 2a29b1fc570f90..df491e4a167480 100644
--- a/ReactCommon/fabric/graphics/Geometry.h
+++ b/ReactCommon/fabric/graphics/Geometry.h
@@ -9,7 +9,7 @@
 #include <functional>
 #include <tuple>
 
-#include <fabric/graphics/Float.h>
+#include <react/graphics/Float.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/graphics/conversions.h b/ReactCommon/fabric/graphics/conversions.h
index 1298c7812eca2a..aa847b933d92a8 100644
--- a/ReactCommon/fabric/graphics/conversions.h
+++ b/ReactCommon/fabric/graphics/conversions.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <fabric/graphics/Color.h>
-#include <fabric/graphics/Geometry.h>
 #include <folly/dynamic.h>
+#include <react/graphics/Color.h>
+#include <react/graphics/Geometry.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/graphics/platform/android/Color.h b/ReactCommon/fabric/graphics/platform/android/Color.h
index 6928b018aa1fb4..1539245659572b 100644
--- a/ReactCommon/fabric/graphics/platform/android/Color.h
+++ b/ReactCommon/fabric/graphics/platform/android/Color.h
@@ -10,7 +10,7 @@
 #include <functional>
 #include <limits>
 
-#include <fabric/graphics/ColorComponents.h>
+#include <react/graphics/ColorComponents.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/graphics/platform/ios/Color.h b/ReactCommon/fabric/graphics/platform/ios/Color.h
index 73064db216e078..90780062148553 100644
--- a/ReactCommon/fabric/graphics/platform/ios/Color.h
+++ b/ReactCommon/fabric/graphics/platform/ios/Color.h
@@ -10,8 +10,8 @@
 #include <memory>
 
 #include <CoreGraphics/CoreGraphics.h>
-#include <fabric/graphics/ColorComponents.h>
-#include <fabric/graphics/Float.h>
+#include <react/graphics/ColorComponents.h>
+#include <react/graphics/Float.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/imagemanager/BUCK b/ReactCommon/fabric/imagemanager/BUCK
index c2cbd42426127d..0886629bb4d6d6 100644
--- a/ReactCommon/fabric/imagemanager/BUCK
+++ b/ReactCommon/fabric/imagemanager/BUCK
@@ -32,7 +32,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "fabric/imagemanager",
+        prefix = "react/imagemanager",
     ),
     fbandroid_headers = subdir_glob(
         [
@@ -61,7 +61,7 @@ rn_xplat_cxx_library(
             ("", "*.h"),
             ("platform/ios", "RCTImagePrimitivesConversions.h"),
         ],
-        prefix = "fabric/imagemanager",
+        prefix = "react/imagemanager",
     ),
     ios_frameworks = [
         "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
diff --git a/ReactCommon/fabric/imagemanager/ImageManager.h b/ReactCommon/fabric/imagemanager/ImageManager.h
index 3bdbee79b0ecd6..dba71a377083d3 100644
--- a/ReactCommon/fabric/imagemanager/ImageManager.h
+++ b/ReactCommon/fabric/imagemanager/ImageManager.h
@@ -9,8 +9,8 @@
 
 #include <memory>
 
-#include <fabric/imagemanager/ImageRequest.h>
-#include <fabric/imagemanager/primitives.h>
+#include <react/imagemanager/ImageRequest.h>
+#include <react/imagemanager/primitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/imagemanager/ImageRequest.h b/ReactCommon/fabric/imagemanager/ImageRequest.h
index 9151f498b719f5..ebe0a93e7b4687 100644
--- a/ReactCommon/fabric/imagemanager/ImageRequest.h
+++ b/ReactCommon/fabric/imagemanager/ImageRequest.h
@@ -9,10 +9,10 @@
 
 #include <mutex>
 
-#include <fabric/imagemanager/ImageResponse.h>
-#include <fabric/imagemanager/primitives.h>
 #include <folly/futures/Future.h>
 #include <folly/futures/FutureSplitter.h>
+#include <react/imagemanager/ImageResponse.h>
+#include <react/imagemanager/primitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.h b/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.h
index 53a8eb567ffb34..0bd16fdabca3a7 100644
--- a/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.h
+++ b/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.h
@@ -7,8 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
-#import <fabric/imagemanager/ImageRequest.h>
-#import <fabric/imagemanager/primitives.h>
+#import <react/imagemanager/ImageRequest.h>
+#import <react/imagemanager/primitives.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/ReactCommon/fabric/imagemanager/platform/ios/RCTImagePrimitivesConversions.h b/ReactCommon/fabric/imagemanager/platform/ios/RCTImagePrimitivesConversions.h
index 13326635fce8a1..2a4b6f0f53e3d9 100644
--- a/ReactCommon/fabric/imagemanager/platform/ios/RCTImagePrimitivesConversions.h
+++ b/ReactCommon/fabric/imagemanager/platform/ios/RCTImagePrimitivesConversions.h
@@ -8,7 +8,7 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTImageLoader.h>
-#import <fabric/imagemanager/primitives.h>
+#import <react/imagemanager/primitives.h>
 
 using namespace facebook::react;
 
diff --git a/ReactCommon/fabric/imagemanager/primitives.h b/ReactCommon/fabric/imagemanager/primitives.h
index b9f02f4aa5441d..5544a82ae5e362 100644
--- a/ReactCommon/fabric/imagemanager/primitives.h
+++ b/ReactCommon/fabric/imagemanager/primitives.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include <fabric/graphics/Geometry.h>
+#include <react/graphics/Geometry.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/imagemanager/tests/ImageManagerTest.cpp b/ReactCommon/fabric/imagemanager/tests/ImageManagerTest.cpp
index dedb2c1ea74c57..1611e019a61b81 100644
--- a/ReactCommon/fabric/imagemanager/tests/ImageManagerTest.cpp
+++ b/ReactCommon/fabric/imagemanager/tests/ImageManagerTest.cpp
@@ -9,7 +9,7 @@
 
 #include <gtest/gtest.h>
 
-#include <fabric/imagemanager/ImageManager.h>
+#include <react/imagemanager/ImageManager.h>
 
 using namespace facebook::react;
 
diff --git a/ReactCommon/fabric/sample/SampleComponentDescriptorFactor.cpp b/ReactCommon/fabric/sample/SampleComponentDescriptorFactor.cpp
index e842c98ecd4b52..4f15775f5f34fe 100644
--- a/ReactCommon/fabric/sample/SampleComponentDescriptorFactor.cpp
+++ b/ReactCommon/fabric/sample/SampleComponentDescriptorFactor.cpp
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <fabric/uimanager/ComponentDescriptorFactory.h>
-#include <fabric/uimanager/ComponentDescriptorRegistry.h>
-#include <fabric/uimanager/ContextContainer.h>
+#include <react/uimanager/ComponentDescriptorFactory.h>
+#include <react/uimanager/ComponentDescriptorRegistry.h>
+#include <react/uimanager/ContextContainer.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/textlayoutmanager/BUCK b/ReactCommon/fabric/textlayoutmanager/BUCK
index dedeaaf68fda50..a56bc827587c56 100644
--- a/ReactCommon/fabric/textlayoutmanager/BUCK
+++ b/ReactCommon/fabric/textlayoutmanager/BUCK
@@ -32,7 +32,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "fabric/textlayoutmanager",
+        prefix = "react/textlayoutmanager",
     ),
     compiler_flags = [
         "-fexceptions",
@@ -48,7 +48,7 @@ rn_xplat_cxx_library(
             ("", "*.h"),
             ("platform/android", "*.h"),
         ],
-        prefix = "fabric/textlayoutmanager",
+        prefix = "react/textlayoutmanager",
     ),
     fbandroid_headers = subdir_glob(
         [
@@ -73,7 +73,7 @@ rn_xplat_cxx_library(
         [
             ("platform/ios", "*.h"),
         ],
-        prefix = "fabric/textlayoutmanager",
+        prefix = "react/textlayoutmanager",
     ),
     ios_frameworks = [
         "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.cpp b/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.cpp
index e3ae34f373a2e1..22354e2eb8d32c 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.cpp
+++ b/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.cpp
@@ -7,7 +7,7 @@
 
 #include "TextLayoutManager.h"
 
-#include <fabric/attributedstring/conversions.h>
+#include <react/attributedstring/conversions.h>
 #include <react/jni/ReadableNativeMap.h>
 
 using namespace facebook::jni;
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h b/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h
index aa94601b718a8b..31a5479d725b78 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h
+++ b/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h
@@ -9,10 +9,10 @@
 
 #include <memory>
 
-#include <fabric/attributedstring/AttributedString.h>
-#include <fabric/attributedstring/ParagraphAttributes.h>
-#include <fabric/core/LayoutConstraints.h>
-#include <fabric/uimanager/ContextContainer.h>
+#include <react/attributedstring/AttributedString.h>
+#include <react/attributedstring/ParagraphAttributes.h>
+#include <react/core/LayoutConstraints.h>
+#include <react/uimanager/ContextContainer.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h
index 6f190e7cade9a8..87cc2b55f9d3ea 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h
@@ -7,8 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
-#include <fabric/attributedstring/AttributedString.h>
-#include <fabric/attributedstring/TextAttributes.h>
+#include <react/attributedstring/AttributedString.h>
+#include <react/attributedstring/TextAttributes.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm
index 8b21215d7ce4e4..52d205fb8df0f0 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm
@@ -7,10 +7,10 @@
 
 #import "RCTAttributedTextUtils.h"
 
-#include <fabric/core/LayoutableShadowNode.h>
-#include <fabric/textlayoutmanager/RCTFontProperties.h>
-#include <fabric/textlayoutmanager/RCTFontUtils.h>
-#include <fabric/textlayoutmanager/RCTTextPrimitivesConversions.h>
+#include <react/core/LayoutableShadowNode.h>
+#include <react/textlayoutmanager/RCTFontProperties.h>
+#include <react/textlayoutmanager/RCTFontUtils.h>
+#include <react/textlayoutmanager/RCTTextPrimitivesConversions.h>
 
 @implementation RCTSharedShadowNodeWrapper
 @end
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontUtils.h b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontUtils.h
index 30d0832ed835b8..3740072e5d6a11 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontUtils.h
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontUtils.h
@@ -7,7 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import <fabric/textlayoutmanager/RCTFontProperties.h>
+#import <react/textlayoutmanager/RCTFontProperties.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.h b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.h
index d44e05fdd3927c..510775fd0825be 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.h
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.h
@@ -7,10 +7,10 @@
 
 #import <UIKit/UIKit.h>
 
-#import <fabric/attributedstring/AttributedString.h>
-#import <fabric/attributedstring/ParagraphAttributes.h>
-#import <fabric/core/LayoutConstraints.h>
-#import <fabric/graphics/Geometry.h>
+#import <react/attributedstring/AttributedString.h>
+#import <react/attributedstring/ParagraphAttributes.h>
+#import <react/core/LayoutConstraints.h>
+#import <react/graphics/Geometry.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h
index 2ac7a295d6d848..7880077542f8ed 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h
@@ -7,8 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
-#include <fabric/textlayoutmanager/RCTFontProperties.h>
-#include <fabric/textlayoutmanager/RCTFontUtils.h>
+#include <react/textlayoutmanager/RCTFontProperties.h>
+#include <react/textlayoutmanager/RCTFontUtils.h>
 
 using namespace facebook::react;
 
diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h b/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h
index dc7baea7516008..c03970c22e1d0c 100644
--- a/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h
+++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h
@@ -9,10 +9,10 @@
 
 #include <memory>
 
-#include <fabric/attributedstring/AttributedString.h>
-#include <fabric/attributedstring/ParagraphAttributes.h>
-#include <fabric/core/LayoutConstraints.h>
-#include <fabric/uimanager/ContextContainer.h>
+#include <react/attributedstring/AttributedString.h>
+#include <react/attributedstring/ParagraphAttributes.h>
+#include <react/core/LayoutConstraints.h>
+#include <react/uimanager/ContextContainer.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/textlayoutmanager/tests/TextLayoutManagerTest.cpp b/ReactCommon/fabric/textlayoutmanager/tests/TextLayoutManagerTest.cpp
index d534fb699a7635..17ba173305d54c 100644
--- a/ReactCommon/fabric/textlayoutmanager/tests/TextLayoutManagerTest.cpp
+++ b/ReactCommon/fabric/textlayoutmanager/tests/TextLayoutManagerTest.cpp
@@ -9,7 +9,7 @@
 
 #include <gtest/gtest.h>
 
-#include <fabric/textlayoutmanager/TextLayoutManager.h>
+#include <react/textlayoutmanager/TextLayoutManager.h>
 
 using namespace facebook::react;
 
diff --git a/ReactCommon/fabric/uimanager/BUCK b/ReactCommon/fabric/uimanager/BUCK
index 682cd1a31bf80f..f0ce4821aea9b6 100644
--- a/ReactCommon/fabric/uimanager/BUCK
+++ b/ReactCommon/fabric/uimanager/BUCK
@@ -28,7 +28,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "fabric/uimanager",
+        prefix = "react/uimanager",
     ),
     compiler_flags = [
         "-fexceptions",
diff --git a/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h b/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h
index 3ef02294c38d6d..c527e529e5f987 100644
--- a/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h
+++ b/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h
@@ -9,9 +9,9 @@
 
 #include <memory>
 
-#include <fabric/core/ComponentDescriptor.h>
-#include <fabric/events/EventDispatcher.h>
-#include <fabric/uimanager/ContextContainer.h>
+#include <react/core/ComponentDescriptor.h>
+#include <react/events/EventDispatcher.h>
+#include <react/uimanager/ContextContainer.h>
 
 #include "ComponentDescriptorRegistry.h"
 
diff --git a/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.cpp b/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.cpp
index 3ea1e2ddd968e2..b72d5d13a0f1d3 100644
--- a/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.cpp
+++ b/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.cpp
@@ -5,8 +5,8 @@
 
 #include "ComponentDescriptorRegistry.h"
 
-#include <fabric/core/ShadowNodeFragment.h>
-#include <fabric/uimanager/primitives.h>
+#include <react/core/ShadowNodeFragment.h>
+#include <react/uimanager/primitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.h b/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.h
index 83a119713b3209..7f6614fb9c6c20 100644
--- a/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.h
+++ b/ReactCommon/fabric/uimanager/ComponentDescriptorRegistry.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include <fabric/core/ComponentDescriptor.h>
+#include <react/core/ComponentDescriptor.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/Differentiator.cpp b/ReactCommon/fabric/uimanager/Differentiator.cpp
index e3e26739df4bc9..3b6f1f891b95ca 100644
--- a/ReactCommon/fabric/uimanager/Differentiator.cpp
+++ b/ReactCommon/fabric/uimanager/Differentiator.cpp
@@ -5,7 +5,7 @@
 
 #include "Differentiator.h"
 
-#include <fabric/core/LayoutableShadowNode.h>
+#include <react/core/LayoutableShadowNode.h>
 #include "ShadowView.h"
 
 namespace facebook {
diff --git a/ReactCommon/fabric/uimanager/Differentiator.h b/ReactCommon/fabric/uimanager/Differentiator.h
index 384b5570dc0c86..e24c8a7018bc6c 100644
--- a/ReactCommon/fabric/uimanager/Differentiator.h
+++ b/ReactCommon/fabric/uimanager/Differentiator.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <fabric/core/ShadowNode.h>
-#include <fabric/uimanager/ShadowViewMutation.h>
+#include <react/core/ShadowNode.h>
+#include <react/uimanager/ShadowViewMutation.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/Scheduler.cpp b/ReactCommon/fabric/uimanager/Scheduler.cpp
index 68303b6868b088..d8320996a0f08d 100644
--- a/ReactCommon/fabric/uimanager/Scheduler.cpp
+++ b/ReactCommon/fabric/uimanager/Scheduler.cpp
@@ -7,11 +7,11 @@
 
 #include <jsi/jsi.h>
 
-#include <fabric/core/LayoutContext.h>
-#include <fabric/uimanager/ComponentDescriptorRegistry.h>
-#include <fabric/uimanager/UITemplateProcessor.h>
-#include <fabric/uimanager/UIManager.h>
-#include <fabric/uimanager/UIManagerBinding.h>
+#include <react/core/LayoutContext.h>
+#include <react/uimanager/ComponentDescriptorRegistry.h>
+#include <react/uimanager/UIManager.h>
+#include <react/uimanager/UIManagerBinding.h>
+#include <react/uimanager/UITemplateProcessor.h>
 
 #include "ComponentDescriptorFactory.h"
 #include "Differentiator.h"
diff --git a/ReactCommon/fabric/uimanager/Scheduler.h b/ReactCommon/fabric/uimanager/Scheduler.h
index d977317925ca38..9c36711627c3f1 100644
--- a/ReactCommon/fabric/uimanager/Scheduler.h
+++ b/ReactCommon/fabric/uimanager/Scheduler.h
@@ -8,16 +8,16 @@
 #include <memory>
 #include <mutex>
 
-#include <fabric/core/ComponentDescriptor.h>
-#include <fabric/core/LayoutConstraints.h>
-#include <fabric/uimanager/ComponentDescriptorRegistry.h>
-#include <fabric/uimanager/ContextContainer.h>
-#include <fabric/uimanager/SchedulerDelegate.h>
-#include <fabric/uimanager/ShadowTree.h>
-#include <fabric/uimanager/ShadowTreeDelegate.h>
-#include <fabric/uimanager/UIManagerBinding.h>
-#include <fabric/uimanager/UIManagerDelegate.h>
-#include <fabric/uimanager/primitives.h>
+#include <react/core/ComponentDescriptor.h>
+#include <react/core/LayoutConstraints.h>
+#include <react/uimanager/ComponentDescriptorRegistry.h>
+#include <react/uimanager/ContextContainer.h>
+#include <react/uimanager/SchedulerDelegate.h>
+#include <react/uimanager/ShadowTree.h>
+#include <react/uimanager/ShadowTreeDelegate.h>
+#include <react/uimanager/UIManagerBinding.h>
+#include <react/uimanager/UIManagerDelegate.h>
+#include <react/uimanager/primitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/SchedulerDelegate.h b/ReactCommon/fabric/uimanager/SchedulerDelegate.h
index 081154c1b0d653..446fb5fb09c31f 100644
--- a/ReactCommon/fabric/uimanager/SchedulerDelegate.h
+++ b/ReactCommon/fabric/uimanager/SchedulerDelegate.h
@@ -7,9 +7,9 @@
 
 #include <memory>
 
-#include <fabric/core/ReactPrimitives.h>
-#include <fabric/core/ShadowNode.h>
-#include <fabric/uimanager/ShadowViewMutation.h>
+#include <react/core/ReactPrimitives.h>
+#include <react/core/ShadowNode.h>
+#include <react/uimanager/ShadowViewMutation.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/ShadowTree.cpp b/ReactCommon/fabric/uimanager/ShadowTree.cpp
index efa1de8555921c..48823af51bbf72 100644
--- a/ReactCommon/fabric/uimanager/ShadowTree.cpp
+++ b/ReactCommon/fabric/uimanager/ShadowTree.cpp
@@ -5,8 +5,8 @@
 
 #include "ShadowTree.h"
 
-#include <fabric/core/LayoutContext.h>
-#include <fabric/core/LayoutPrimitives.h>
+#include <react/core/LayoutContext.h>
+#include <react/core/LayoutPrimitives.h>
 
 #include "Differentiator.h"
 #include "ShadowTreeDelegate.h"
diff --git a/ReactCommon/fabric/uimanager/ShadowTree.h b/ReactCommon/fabric/uimanager/ShadowTree.h
index 836f956b62ce1f..346dc96db98019 100644
--- a/ReactCommon/fabric/uimanager/ShadowTree.h
+++ b/ReactCommon/fabric/uimanager/ShadowTree.h
@@ -8,12 +8,12 @@
 #include <memory>
 #include <mutex>
 
-#include <fabric/components/root/RootShadowNode.h>
-#include <fabric/core/LayoutConstraints.h>
-#include <fabric/core/ReactPrimitives.h>
-#include <fabric/core/ShadowNode.h>
-#include <fabric/uimanager/ShadowTreeDelegate.h>
-#include <fabric/uimanager/ShadowViewMutation.h>
+#include <react/components/root/RootShadowNode.h>
+#include <react/core/LayoutConstraints.h>
+#include <react/core/ReactPrimitives.h>
+#include <react/core/ShadowNode.h>
+#include <react/uimanager/ShadowTreeDelegate.h>
+#include <react/uimanager/ShadowViewMutation.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/ShadowTreeDelegate.h b/ReactCommon/fabric/uimanager/ShadowTreeDelegate.h
index 7dbc96e7325d9e..e4d14018405ca2 100644
--- a/ReactCommon/fabric/uimanager/ShadowTreeDelegate.h
+++ b/ReactCommon/fabric/uimanager/ShadowTreeDelegate.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <fabric/uimanager/ShadowViewMutation.h>
+#include <react/uimanager/ShadowViewMutation.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/ShadowView.cpp b/ReactCommon/fabric/uimanager/ShadowView.cpp
index 8f0c869afd1bdb..1120745c7f6d83 100644
--- a/ReactCommon/fabric/uimanager/ShadowView.cpp
+++ b/ReactCommon/fabric/uimanager/ShadowView.cpp
@@ -5,7 +5,7 @@
 
 #include "ShadowView.h"
 
-#include <fabric/core/LayoutableShadowNode.h>
+#include <react/core/LayoutableShadowNode.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/ShadowView.h b/ReactCommon/fabric/uimanager/ShadowView.h
index 54c3b972f2f0da..867fdc235bffb6 100644
--- a/ReactCommon/fabric/uimanager/ShadowView.h
+++ b/ReactCommon/fabric/uimanager/ShadowView.h
@@ -5,12 +5,12 @@
 
 #pragma once
 
-#include <fabric/core/LayoutMetrics.h>
-#include <fabric/core/LocalData.h>
-#include <fabric/core/Props.h>
-#include <fabric/core/ReactPrimitives.h>
-#include <fabric/core/ShadowNode.h>
-#include <fabric/events/EventEmitter.h>
+#include <react/core/LayoutMetrics.h>
+#include <react/core/LocalData.h>
+#include <react/core/Props.h>
+#include <react/core/ReactPrimitives.h>
+#include <react/core/ShadowNode.h>
+#include <react/events/EventEmitter.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/ShadowViewMutation.h b/ReactCommon/fabric/uimanager/ShadowViewMutation.h
index 6619bec6b8f416..b5d452bc8d4ef2 100644
--- a/ReactCommon/fabric/uimanager/ShadowViewMutation.h
+++ b/ReactCommon/fabric/uimanager/ShadowViewMutation.h
@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include <fabric/uimanager/ShadowView.h>
+#include <react/uimanager/ShadowView.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/UIManager.cpp b/ReactCommon/fabric/uimanager/UIManager.cpp
index e32237f0a806a5..881362cb283e6b 100644
--- a/ReactCommon/fabric/uimanager/UIManager.cpp
+++ b/ReactCommon/fabric/uimanager/UIManager.cpp
@@ -2,8 +2,8 @@
 
 #include "UIManager.h"
 
-#include <fabric/core/ShadowNodeFragment.h>
-#include <fabric/debug/SystraceSection.h>
+#include <react/core/ShadowNodeFragment.h>
+#include <react/debug/SystraceSection.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/UIManager.h b/ReactCommon/fabric/uimanager/UIManager.h
index 179fbdb4e50996..f7431c9ad3df40 100644
--- a/ReactCommon/fabric/uimanager/UIManager.h
+++ b/ReactCommon/fabric/uimanager/UIManager.h
@@ -6,9 +6,9 @@
 #include <folly/dynamic.h>
 #include <jsi/jsi.h>
 
-#include <fabric/core/ShadowNode.h>
-#include <fabric/uimanager/ComponentDescriptorRegistry.h>
-#include <fabric/uimanager/UIManagerDelegate.h>
+#include <react/core/ShadowNode.h>
+#include <react/uimanager/ComponentDescriptorRegistry.h>
+#include <react/uimanager/UIManagerDelegate.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/UIManagerBinding.cpp b/ReactCommon/fabric/uimanager/UIManagerBinding.cpp
index 6eb0dbc8926db2..05341d3d7c9456 100644
--- a/ReactCommon/fabric/uimanager/UIManagerBinding.cpp
+++ b/ReactCommon/fabric/uimanager/UIManagerBinding.cpp
@@ -2,7 +2,7 @@
 
 #include "UIManagerBinding.h"
 
-#include <fabric/debug/SystraceSection.h>
+#include <react/debug/SystraceSection.h>
 
 #include <jsi/JSIDynamic.h>
 
diff --git a/ReactCommon/fabric/uimanager/UIManagerBinding.h b/ReactCommon/fabric/uimanager/UIManagerBinding.h
index ad4614cc051127..f52d695941f07e 100644
--- a/ReactCommon/fabric/uimanager/UIManagerBinding.h
+++ b/ReactCommon/fabric/uimanager/UIManagerBinding.h
@@ -2,10 +2,10 @@
 
 #pragma once
 
-#include <fabric/uimanager/UIManager.h>
-#include <fabric/uimanager/primitives.h>
 #include <folly/dynamic.h>
 #include <jsi/jsi.h>
+#include <react/uimanager/UIManager.h>
+#include <react/uimanager/primitives.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/UIManagerDelegate.h b/ReactCommon/fabric/uimanager/UIManagerDelegate.h
index 0e67113b89fb3b..e2375329d9af22 100644
--- a/ReactCommon/fabric/uimanager/UIManagerDelegate.h
+++ b/ReactCommon/fabric/uimanager/UIManagerDelegate.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <fabric/core/ReactPrimitives.h>
-#include <fabric/core/ShadowNode.h>
+#include <react/core/ReactPrimitives.h>
+#include <react/core/ShadowNode.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/UITemplateProcessor.cpp b/ReactCommon/fabric/uimanager/UITemplateProcessor.cpp
index 13045a3fdbc4cb..fa252065d2cf33 100644
--- a/ReactCommon/fabric/uimanager/UITemplateProcessor.cpp
+++ b/ReactCommon/fabric/uimanager/UITemplateProcessor.cpp
@@ -7,16 +7,16 @@
 
 #include "UITemplateProcessor.h"
 
-#include <fabric/components/view/ViewComponentDescriptor.h>
-#include <fabric/components/view/ViewProps.h>
-#include <fabric/components/view/ViewShadowNode.h>
-#include <fabric/core/LayoutContext.h>
-#include <fabric/core/ShadowNodeFragment.h>
-#include <fabric/core/componentDescriptor.h>
-#include <fabric/debug/DebugStringConvertible.h>
-#include <fabric/debug/DebugStringConvertibleItem.h>
 #include <folly/json.h>
 #include <glog/logging.h>
+#include <react/components/view/ViewComponentDescriptor.h>
+#include <react/components/view/ViewProps.h>
+#include <react/components/view/ViewShadowNode.h>
+#include <react/core/LayoutContext.h>
+#include <react/core/ShadowNodeFragment.h>
+#include <react/core/componentDescriptor.h>
+#include <react/debug/DebugStringConvertible.h>
+#include <react/debug/DebugStringConvertibleItem.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/UITemplateProcessor.h b/ReactCommon/fabric/uimanager/UITemplateProcessor.h
index 3039e1f668a089..a478eb6f0e5ecf 100644
--- a/ReactCommon/fabric/uimanager/UITemplateProcessor.h
+++ b/ReactCommon/fabric/uimanager/UITemplateProcessor.h
@@ -11,9 +11,9 @@
 
 #include <folly/dynamic.h>
 
-#include <fabric/core/ShadowNode.h>
-#include <fabric/uimanager/ComponentDescriptorRegistry.h>
-#include <fabric/uimanager/UIManagerDelegate.h>
+#include <react/core/ShadowNode.h>
+#include <react/uimanager/ComponentDescriptorRegistry.h>
+#include <react/uimanager/UIManagerDelegate.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/primitives.h b/ReactCommon/fabric/uimanager/primitives.h
index 71b2d8606f6d99..8400116a2baf0e 100644
--- a/ReactCommon/fabric/uimanager/primitives.h
+++ b/ReactCommon/fabric/uimanager/primitives.h
@@ -2,10 +2,10 @@
 
 #pragma once
 
-#include <fabric/core/ShadowNode.h>
 #include <folly/dynamic.h>
 #include <jsi/JSIDynamic.h>
 #include <jsi/jsi.h>
+#include <react/core/ShadowNode.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/tests/FabricUIManagerTest.cpp b/ReactCommon/fabric/uimanager/tests/FabricUIManagerTest.cpp
index f9a42eab9e7489..59dbbab049c125 100644
--- a/ReactCommon/fabric/uimanager/tests/FabricUIManagerTest.cpp
+++ b/ReactCommon/fabric/uimanager/tests/FabricUIManagerTest.cpp
@@ -7,8 +7,8 @@
 
 #include <memory>
 
-#include <fabric/uimanager/UIManager.h>
 #include <gtest/gtest.h>
+#include <react/uimanager/UIManager.h>
 
 using namespace facebook::react;
 
diff --git a/ReactCommon/fabric/uimanager/tests/UITemplateProcessorTest.cpp b/ReactCommon/fabric/uimanager/tests/UITemplateProcessorTest.cpp
index baca33cdabd6a3..d1a52576d61d0c 100644
--- a/ReactCommon/fabric/uimanager/tests/UITemplateProcessorTest.cpp
+++ b/ReactCommon/fabric/uimanager/tests/UITemplateProcessorTest.cpp
@@ -7,20 +7,20 @@
 
 #include <exception>
 
-#include <fabric/uimanager/ComponentDescriptorFactory.h>
-#include <fabric/uimanager/UITemplateProcessor.h>
 #include <gtest/gtest.h>
+#include <react/uimanager/ComponentDescriptorFactory.h>
+#include <react/uimanager/UITemplateProcessor.h>
 
 using namespace facebook::react;
 
-#include <fabric/components/activityindicator/ActivityIndicatorViewComponentDescriptor.h>
-#include <fabric/components/image/ImageComponentDescriptor.h>
-#include <fabric/components/scrollview/ScrollViewComponentDescriptor.h>
-#include <fabric/components/text/ParagraphComponentDescriptor.h>
-#include <fabric/components/text/RawTextComponentDescriptor.h>
-#include <fabric/components/text/TextComponentDescriptor.h>
-#include <fabric/components/view/ViewComponentDescriptor.h>
-#include <fabric/uimanager/ComponentDescriptorRegistry.h>
+#include <react/components/activityindicator/ActivityIndicatorViewComponentDescriptor.h>
+#include <react/components/image/ImageComponentDescriptor.h>
+#include <react/components/scrollview/ScrollViewComponentDescriptor.h>
+#include <react/components/text/ParagraphComponentDescriptor.h>
+#include <react/components/text/RawTextComponentDescriptor.h>
+#include <react/components/text/TextComponentDescriptor.h>
+#include <react/components/view/ViewComponentDescriptor.h>
+#include <react/uimanager/ComponentDescriptorRegistry.h>
 
 namespace facebook {
 namespace react {