diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js
index aef48e3e1b4..b40f0285d21 100644
--- a/Libraries/Components/ScrollView/ScrollView.js
+++ b/Libraries/Components/ScrollView/ScrollView.js
@@ -47,10 +47,10 @@ let RCTScrollContentView;
 if (Platform.OS === 'android') {
   AndroidScrollView = requireNativeComponent('RCTScrollView');
   AndroidHorizontalScrollView = requireNativeComponent(
-    'AndroidHorizontalScrollView',
+    'RCTAndroidHorizontalScrollView',
   );
   AndroidHorizontalScrollContentView = requireNativeComponent(
-    'AndroidHorizontalScrollContentView',
+    'RCTAndroidHorizontalScrollContentView',
   );
 } else if (Platform.OS === 'ios') {
   RCTScrollView = requireNativeComponent('RCTScrollView');
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.java
index 284f41451f5..894e8286cf0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.java
@@ -14,7 +14,7 @@ import com.facebook.react.uimanager.ViewGroupManager;
 public class ReactHorizontalScrollContainerViewManager
     extends ViewGroupManager<ReactHorizontalScrollContainerView> {
 
-  protected static final String REACT_CLASS = "AndroidHorizontalScrollContentView";
+  protected static final String REACT_CLASS = "RCTAndroidHorizontalScrollContentView";
 
   public ReactHorizontalScrollContainerViewManager() {}
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
index e6536a6e53e..29e11e5348d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
@@ -37,7 +37,7 @@ public class ReactHorizontalScrollViewManager
     extends ViewGroupManager<ReactHorizontalScrollView>
     implements ReactScrollViewCommandHelper.ScrollCommandHandler<ReactHorizontalScrollView> {
 
-  protected static final String REACT_CLASS = "AndroidHorizontalScrollView";
+  protected static final String REACT_CLASS = "RCTAndroidHorizontalScrollView";
 
   private static final int[] SPACING_TYPES = {
       Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM,
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h b/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h
index 22d91300b54..6bebc8348ba 100644
--- a/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h
@@ -22,10 +22,10 @@ extern const char ScrollViewComponentName[];
  */
 class ScrollViewShadowNode final:
   public ConcreteViewShadowNode<
-    ScrollViewComponentName,
-    ScrollViewProps,
-    ScrollViewEventEmitter
-  > {
+      ScrollViewComponentName,
+      ScrollViewProps,
+      ScrollViewEventEmitter
+    > {
 
 public:
 
diff --git a/ReactCommon/fabric/uimanager/FabricUIManager.cpp b/ReactCommon/fabric/uimanager/FabricUIManager.cpp
index 496ca45d3bc..71d09d420ac 100644
--- a/ReactCommon/fabric/uimanager/FabricUIManager.cpp
+++ b/ReactCommon/fabric/uimanager/FabricUIManager.cpp
@@ -65,6 +65,10 @@ static const std::string componentNameByReactViewName(std::string viewName) {
     return "Image";
   }
 
+  if (viewName == "AndroidHorizontalScrollView") {
+    return "ScrollView";
+  }
+
   // We need this temporarly for testing purposes until we have proper
   // implementation of core components.
   if (
@@ -72,7 +76,8 @@ static const std::string componentNameByReactViewName(std::string viewName) {
     viewName == "MultilineTextInputView" ||
     viewName == "RefreshControl" ||
     viewName == "SafeAreaView" ||
-    viewName == "ScrollContentView"
+    viewName == "ScrollContentView" ||
+    viewName == "AndroidHorizontalScrollContentView" // Android
   ) {
     return "View";
   }