diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/RCTUIManagerScenarioTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/RCTUIManagerScenarioTests.m
index 520c9beda..ba0bbf508 100644
--- a/Examples/UIExplorer/UIExplorerIntegrationTests/RCTUIManagerScenarioTests.m
+++ b/Examples/UIExplorer/UIExplorerIntegrationTests/RCTUIManagerScenarioTests.m
@@ -95,7 +95,7 @@
   }
   for (NSInteger i = 2; i < 20; i++) {
     UIView *view = _uiManager.viewRegistry[@(i)];
-    [containerView addSubview:view];
+    [containerView insertReactSubview:view atIndex:containerView.reactSubviews.count];
   }
 
   // Remove views 1-5 from view 20
@@ -155,7 +155,7 @@
 
   for (NSInteger i = 1; i < 11; i++) {
     UIView *view = _uiManager.viewRegistry[@(i)];
-    [containerView addSubview:view];
+    [containerView insertReactSubview:view atIndex:containerView.reactSubviews.count];
   }
 
   [_uiManager _manageChildren:@20
diff --git a/Libraries/Text/RCTText.m b/Libraries/Text/RCTText.m
index fc5f60bdc..4a926b246 100644
--- a/Libraries/Text/RCTText.m
+++ b/Libraries/Text/RCTText.m
@@ -66,7 +66,7 @@ static void collectNonTextDescendants(RCTText *view, NSMutableArray *nonTextDesc
   self.backgroundColor = inheritedBackgroundColor;
 }
 
-- (void)reactUpdateSubviews
+- (void)didUpdateReactSubviews
 {
   // Do nothing, as subviews are managed by `setTextStorage:` method
 }
diff --git a/Libraries/Text/RCTTextView.m b/Libraries/Text/RCTTextView.m
index 9b0a4d737..f10cc2605 100644
--- a/Libraries/Text/RCTTextView.m
+++ b/Libraries/Text/RCTTextView.m
@@ -136,7 +136,7 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)aDecoder)
   }
 }
 
-- (void)reactUpdateSubviews
+- (void)didUpdateReactSubviews
 {
   // Do nothing, as we don't allow non-text subviews
 }
diff --git a/React/Views/RCTMap.m b/React/Views/RCTMap.m
index 7a1334668..fc071ec02 100644
--- a/React/Views/RCTMap.m
+++ b/React/Views/RCTMap.m
@@ -14,6 +14,7 @@
 #import "RCTMapAnnotation.h"
 #import "RCTMapOverlay.h"
 #import "RCTUtils.h"
+#import "UIView+React.h"
 
 const CLLocationDegrees RCTMapDefaultSpan = 0.005;
 const NSTimeInterval RCTMapRegionChangeObserveInterval = 0.1;
@@ -49,7 +50,7 @@ const CGFloat RCTMapZoomBoundBuffer = 0.01;
   [_regionChangeObserveTimer invalidate];
 }
 
-- (void)reactUpdateSubviews
+- (void)didUpdateReactSubviews
 {
   // Do nothing, as annotation views are managed by `setAnnotations:` method
 }