diff --git a/src/specs/NativeMapViewModule.ts b/src/specs/NativeMapViewModule.ts
index df4fc38c04..9c11fa4122 100644
--- a/src/specs/NativeMapViewModule.ts
+++ b/src/specs/NativeMapViewModule.ts
@@ -1,69 +1,71 @@
 /* eslint-disable @typescript-eslint/ban-types */
-import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
-import { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { TurboModule, CodegenTypes } from 'react-native';
 import { TurboModuleRegistry } from 'react-native';
 
 export interface Spec extends TurboModule {
-  takeSnap: (viewRef: Int32 | null, writeToDisk: boolean) => Promise<Object>;
+  takeSnap: (
+    viewRef: CodegenTypes.Int32 | null,
+    writeToDisk: boolean,
+  ) => Promise<Object>;
   queryTerrainElevation: (
-    viewRef: Int32 | null,
+    viewRef: CodegenTypes.Int32 | null,
     coordinates: ReadonlyArray<number>,
   ) => Promise<Object>;
   setSourceVisibility: (
-    viewRef: Int32 | null,
+    viewRef: CodegenTypes.Int32 | null,
     visible: boolean,
     sourceId: string,
     sourceLayerId: string,
   ) => Promise<Object>;
-  getCenter: (viewRef: Int32 | null) => Promise<Object>;
+  getCenter: (viewRef: CodegenTypes.Int32 | null) => Promise<Object>;
   getCoordinateFromView: (
-    viewRef: Int32 | null,
+    viewRef: CodegenTypes.Int32 | null,
     atPoint: ReadonlyArray<number>,
   ) => Promise<Object>;
   getPointInView: (
-    viewRef: Int32 | null,
+    viewRef: CodegenTypes.Int32 | null,
     atCoordinate: ReadonlyArray<number>,
   ) => Promise<Object>;
-  getZoom: (viewRef: Int32 | null) => Promise<Object>;
-  getVisibleBounds: (viewRef: Int32 | null) => Promise<Object>;
+  getZoom: (viewRef: CodegenTypes.Int32 | null) => Promise<Object>;
+  getVisibleBounds: (viewRef: CodegenTypes.Int32 | null) => Promise<Object>;
   queryRenderedFeaturesAtPoint: (
-    viewRef: Int32 | null,
+    viewRef: CodegenTypes.Int32 | null,
     atPoint: ReadonlyArray<number>,
     withFilter: ReadonlyArray<Object>,
     withLayerIDs: ReadonlyArray<string>,
   ) => Promise<Object>;
   queryRenderedFeaturesInRect: (
-    viewRef: Int32 | null,
+    viewRef: CodegenTypes.Int32 | null,
     withBBox: ReadonlyArray<number>,
     withFilter: ReadonlyArray<Object>,
     withLayerIDs: ReadonlyArray<string>,
   ) => Promise<Object>;
   setHandledMapChangedEvents: (
-    viewRef: Int32 | null,
+    viewRef: CodegenTypes.Int32 | null,
     events: ReadonlyArray<string>,
   ) => Promise<Object>;
-  clearData: (viewRef: Int32 | null) => Promise<Object>;
+  clearData: (viewRef: CodegenTypes.Int32 | null) => Promise<Object>;
   querySourceFeatures: (
-    viewRef: Int32 | null,
+    viewRef: CodegenTypes.Int32 | null,
     sourceId: string,
     withFilter: ReadonlyArray<Object>,
     withSourceLayerIDs: ReadonlyArray<string>,
   ) => Promise<Object>;
   setFeatureState: (
-    viewRef: Int32 | null,
+    viewRef: CodegenTypes.Int32 | null,
     featureId: string,
     state: Object,
     sourceId: string,
     sourceLayerId: string | null,
   ) => Promise<Object>;
   getFeatureState: (
-    viewRef: Int32 | null,
+    viewRef: CodegenTypes.Int32 | null,
     featureId: string,
     sourceId: string,
     sourceLayerId: string | null,
   ) => Promise<Object>;
   removeFeatureState: (
-    viewRef: Int32 | null,
+    viewRef: CodegenTypes.Int32 | null,
     featureId: string,
     stateKey: string | null,
     sourceId: string,
diff --git a/src/specs/NativeRNMBXCameraModule.ts b/src/specs/NativeRNMBXCameraModule.ts
index e87dc1a888..6b1a725e26 100644
--- a/src/specs/NativeRNMBXCameraModule.ts
+++ b/src/specs/NativeRNMBXCameraModule.ts
@@ -1,8 +1,7 @@
-import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
-import { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { TurboModule, CodegenTypes } from 'react-native';
 import { TurboModuleRegistry } from 'react-native';
 
-type ViewRef = Int32 | null;
+type ViewRef = CodegenTypes.Int32 | null;
 
 interface NativeCameraStop {
   centerCoordinate?: string;
diff --git a/src/specs/NativeRNMBXChangeLineOffsetsShapeAnimatorModule.ts b/src/specs/NativeRNMBXChangeLineOffsetsShapeAnimatorModule.ts
index 850f083057..16935f703e 100644
--- a/src/specs/NativeRNMBXChangeLineOffsetsShapeAnimatorModule.ts
+++ b/src/specs/NativeRNMBXChangeLineOffsetsShapeAnimatorModule.ts
@@ -1,18 +1,17 @@
-import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
-import { Int32, Double } from 'react-native/Libraries/Types/CodegenTypes';
+import type { TurboModule, CodegenTypes } from 'react-native';
 import { TurboModuleRegistry } from 'react-native';
 import { Position } from '@turf/helpers';
 
 //import type { UnsafeMixed } from './codegenUtils';
 
-type AnimatorTag = Int32;
+type AnimatorTag = CodegenTypes.Int32;
 
 export interface Spec extends TurboModule {
   generate(
     tag: AnimatorTag,
     coordinates: Position[],
-    startOffset: Double,
-    endOffset: Double,
+    startOffset: CodegenTypes.Double,
+    endOffset: CodegenTypes.Double,
   ): Promise<void>;
   setLineString(
     tag: AnimatorTag,
@@ -22,13 +21,13 @@ export interface Spec extends TurboModule {
   ): Promise<void>;
   setStartOffset(
     tag: AnimatorTag,
-    offset: Double,
-    duration: Double,
+    offset: CodegenTypes.Double,
+    duration: CodegenTypes.Double,
   ): Promise<void>;
   setEndOffset(
     tag: AnimatorTag,
-    offset: Double,
-    duration: Double,
+    offset: CodegenTypes.Double,
+    duration: CodegenTypes.Double,
   ): Promise<void>;
 }
 
diff --git a/src/specs/NativeRNMBXImageModule.ts b/src/specs/NativeRNMBXImageModule.ts
index 19e0ddc4f1..c81165d095 100644
--- a/src/specs/NativeRNMBXImageModule.ts
+++ b/src/specs/NativeRNMBXImageModule.ts
@@ -1,10 +1,9 @@
 /* eslint-disable @typescript-eslint/ban-types */
-import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
-import { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { TurboModule, CodegenTypes } from 'react-native';
 import { TurboModuleRegistry } from 'react-native';
 
 export interface Spec extends TurboModule {
-  refresh: (viewRef: Int32 | null) => Promise<Object>;
+  refresh: (viewRef: CodegenTypes.Int32 | null) => Promise<Object>;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('RNMBXImageModule');
diff --git a/src/specs/NativeRNMBXLocationModule.ts b/src/specs/NativeRNMBXLocationModule.ts
index 363d56b770..4478eac623 100644
--- a/src/specs/NativeRNMBXLocationModule.ts
+++ b/src/specs/NativeRNMBXLocationModule.ts
@@ -1,32 +1,31 @@
-import { TurboModule, TurboModuleRegistry} from "react-native";
-import type { EventEmitter } from 'react-native/Libraries/Types/CodegenTypes';
+import type { TurboModule, CodegenTypes } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
 
 type LocationEvent = {
-  type: string //"userlocationdupdated"
+  type: string; //"userlocationdupdated"
   payload: {
     coords: {
-      latitude: number
-      longitude: number
-      altitude: number
-      accuracy: number
-      speed: number
-      heading: number
-    }
-    timestamp: number
-  }
-}
+      latitude: number;
+      longitude: number;
+      altitude: number;
+      accuracy: number;
+      speed: number;
+      heading: number;
+    };
+    timestamp: number;
+  };
+};
 
 export interface Spec extends TurboModule {
-  start(minDisplacement: number): void
-  stop(): void
-  setRequestsAlwaysUse(requestsAlwaysUse: boolean): void
-  setMinDisplacement(minDisplacement: number): void
-  getLastKnownLocation(): Promise<LocationEvent['payload']>
-  simulateHeading(changesPerSecond: number, increment: number): void
-  setLocationEventThrottle(throttle: number): void
+  start(minDisplacement: number): void;
+  stop(): void;
+  setRequestsAlwaysUse(requestsAlwaysUse: boolean): void;
+  setMinDisplacement(minDisplacement: number): void;
+  getLastKnownLocation(): Promise<LocationEvent['payload']>;
+  simulateHeading(changesPerSecond: number, increment: number): void;
+  setLocationEventThrottle(throttle: number): void;
 
-  readonly onLocationUpdate: EventEmitter<LocationEvent>
+  readonly onLocationUpdate: CodegenTypes.EventEmitter<LocationEvent>;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('RNMBXLocationModule');
-
diff --git a/src/specs/NativeRNMBXMovePointShapeAnimatorModule.ts b/src/specs/NativeRNMBXMovePointShapeAnimatorModule.ts
index fb445dd42e..1f4ded8c65 100644
--- a/src/specs/NativeRNMBXMovePointShapeAnimatorModule.ts
+++ b/src/specs/NativeRNMBXMovePointShapeAnimatorModule.ts
@@ -1,17 +1,19 @@
-import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
-import { Int32, Double } from 'react-native/Libraries/Types/CodegenTypes';
+import type { TurboModule, CodegenTypes } from 'react-native';
 import { TurboModuleRegistry } from 'react-native';
 
 //import type { UnsafeMixed } from './codegenUtils';
 
-type AnimatorTag = Int32;
+type AnimatorTag = CodegenTypes.Int32;
 
 export interface Spec extends TurboModule {
-  generate(tag: AnimatorTag, coordinate: ReadonlyArray<Double>): Promise<void>;
+  generate(
+    tag: AnimatorTag,
+    coordinate: ReadonlyArray<CodegenTypes.Double>,
+  ): Promise<void>;
   moveTo(
     tag: AnimatorTag,
-    coordinate: ReadonlyArray<Double>,
-    duration: Double,
+    coordinate: ReadonlyArray<CodegenTypes.Double>,
+    duration: CodegenTypes.Double,
   ): Promise<void>;
 }
 
diff --git a/src/specs/NativeRNMBXPointAnnotationModule.ts b/src/specs/NativeRNMBXPointAnnotationModule.ts
index 01fb15100c..505a80822f 100644
--- a/src/specs/NativeRNMBXPointAnnotationModule.ts
+++ b/src/specs/NativeRNMBXPointAnnotationModule.ts
@@ -1,10 +1,9 @@
 /* eslint-disable @typescript-eslint/ban-types */
-import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
-import { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { TurboModule, CodegenTypes } from 'react-native';
 import { TurboModuleRegistry } from 'react-native';
 
 export interface Spec extends TurboModule {
-  refresh: (viewRef: Int32 | null) => Promise<Object>;
+  refresh: (viewRef: CodegenTypes.Int32 | null) => Promise<Object>;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>(
diff --git a/src/specs/NativeRNMBXShapeSourceModule.ts b/src/specs/NativeRNMBXShapeSourceModule.ts
index 3a8b158090..10cf5a383e 100644
--- a/src/specs/NativeRNMBXShapeSourceModule.ts
+++ b/src/specs/NativeRNMBXShapeSourceModule.ts
@@ -1,21 +1,20 @@
 /* eslint-disable @typescript-eslint/ban-types */
-import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
-import { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { TurboModule, CodegenTypes } from 'react-native';
 import { TurboModuleRegistry } from 'react-native';
 
 export interface Spec extends TurboModule {
   getClusterExpansionZoom: (
-    viewRef: Int32 | null,
+    viewRef: CodegenTypes.Int32 | null,
     featureJSON: string,
   ) => Promise<Object>;
   getClusterLeaves: (
-    viewRef: Int32 | null,
+    viewRef: CodegenTypes.Int32 | null,
     featureJSON: string,
-    number: Int32,
-    offset: Int32,
+    number: CodegenTypes.Int32,
+    offset: CodegenTypes.Int32,
   ) => Promise<Object>;
   getClusterChildren: (
-    viewRef: Int32 | null,
+    viewRef: CodegenTypes.Int32 | null,
     featureJSON: string,
   ) => Promise<Object>;
 }
diff --git a/src/specs/NativeRNMBXTileStoreModule.ts b/src/specs/NativeRNMBXTileStoreModule.ts
index 91082e4680..68af293a32 100644
--- a/src/specs/NativeRNMBXTileStoreModule.ts
+++ b/src/specs/NativeRNMBXTileStoreModule.ts
@@ -1,5 +1,4 @@
-import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
-import { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { TurboModule, CodegenTypes } from 'react-native';
 import { TurboModuleRegistry } from 'react-native';
 
 // eslint-disable-next-line @typescript-eslint/ban-types, @typescript-eslint/no-unused-vars
@@ -10,7 +9,7 @@ type StringOr<_T> = string;
 
 type Domain = 'Maps' | 'Navigation' | 'Search' | 'ADAS';
 
-type Tag = Int32;
+type Tag = CodegenTypes.Int32;
 
 type Value = { value: string | number };
 
diff --git a/src/specs/NativeRNMBXViewportModule.ts b/src/specs/NativeRNMBXViewportModule.ts
index b6d7e9381a..d63680dd60 100644
--- a/src/specs/NativeRNMBXViewportModule.ts
+++ b/src/specs/NativeRNMBXViewportModule.ts
@@ -1,5 +1,4 @@
-import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
-import { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { TurboModule, CodegenTypes } from 'react-native';
 import { TurboModuleRegistry } from 'react-native';
 
 type StateInfo =
@@ -26,7 +25,7 @@ type TransitionReal =
   | { kind: 'default'; options: { maxDurationMs?: number } };
 type Transition = ObjectOr<TransitionReal>;
 
-type ViewRef = Int32 | null;
+type ViewRef = CodegenTypes.Int32 | null;
 
 export interface Spec extends TurboModule {
   getState(viewRef: ViewRef): Promise<StateInfo>;
diff --git a/src/specs/RNMBXAtmosphereNativeComponent.ts b/src/specs/RNMBXAtmosphereNativeComponent.ts
index f20079fed1..a76ddcb709 100644
--- a/src/specs/RNMBXAtmosphereNativeComponent.ts
+++ b/src/specs/RNMBXAtmosphereNativeComponent.ts
@@ -1,5 +1,5 @@
 import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import { codegenNativeComponent } from 'react-native';
 
 import type { UnsafeMixed } from './codegenUtils';
 
diff --git a/src/specs/RNMBXBackgroundLayerNativeComponent.ts b/src/specs/RNMBXBackgroundLayerNativeComponent.ts
index d057273091..6a5a622c63 100644
--- a/src/specs/RNMBXBackgroundLayerNativeComponent.ts
+++ b/src/specs/RNMBXBackgroundLayerNativeComponent.ts
@@ -1,6 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import type { UnsafeMixed } from './codegenUtils';
 
@@ -15,11 +14,11 @@ export interface NativeProps extends ViewProps {
 
   aboveLayerID?: OptionalProp<string>;
   belowLayerID?: OptionalProp<string>;
-  layerIndex?: OptionalProp<Int32>;
+  layerIndex?: OptionalProp<CodegenTypes.Int32>;
   reactStyle: UnsafeMixed<any>;
 
-  maxZoomLevel?: OptionalProp<Double>;
-  minZoomLevel?: OptionalProp<Double>;
+  maxZoomLevel?: OptionalProp<CodegenTypes.Double>;
+  minZoomLevel?: OptionalProp<CodegenTypes.Double>;
 }
 
 export default codegenNativeComponent<NativeProps>(
diff --git a/src/specs/RNMBXCalloutNativeComponent.ts b/src/specs/RNMBXCalloutNativeComponent.ts
index 17ed5a71c7..63bcb11b2f 100644
--- a/src/specs/RNMBXCalloutNativeComponent.ts
+++ b/src/specs/RNMBXCalloutNativeComponent.ts
@@ -1,5 +1,5 @@
 import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import { codegenNativeComponent } from 'react-native';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface NativeProps extends ViewProps {}
diff --git a/src/specs/RNMBXCameraNativeComponent.ts b/src/specs/RNMBXCameraNativeComponent.ts
index 43a17e861f..126f423649 100644
--- a/src/specs/RNMBXCameraNativeComponent.ts
+++ b/src/specs/RNMBXCameraNativeComponent.ts
@@ -1,10 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import {
-  DirectEventHandler,
-  Double,
-  Int32,
-} from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import type { NativeCameraStop, UnsafeMixed } from './codegenUtils';
 
@@ -21,24 +16,24 @@ type UserTrackingModeChangeEventType = {
 
 export interface NativeProps extends ViewProps {
   maxBounds?: UnsafeMixed<string | null>;
-  animationDuration?: OptionalProp<Double>;
+  animationDuration?: OptionalProp<CodegenTypes.Double>;
   animationMode?: OptionalProp<string>;
   defaultStop?: UnsafeMixed<NativeCameraStop>;
-  userTrackingMode?: OptionalProp<Int32>;
+  userTrackingMode?: OptionalProp<CodegenTypes.Int32>;
 
   followUserLocation?: OptionalProp<boolean>;
   followUserMode?: OptionalProp<string>;
-  followZoomLevel?: OptionalProp<Double>;
-  followPitch?: OptionalProp<Double>;
-  followHeading?: OptionalProp<Double>;
+  followZoomLevel?: OptionalProp<CodegenTypes.Double>;
+  followPitch?: OptionalProp<CodegenTypes.Double>;
+  followHeading?: OptionalProp<CodegenTypes.Double>;
   followPadding?: UnsafeMixed<any>;
 
-  zoomLevel?: OptionalProp<Double>;
-  maxZoomLevel?: OptionalProp<Double>;
-  minZoomLevel?: OptionalProp<Double>;
+  zoomLevel?: OptionalProp<CodegenTypes.Double>;
+  maxZoomLevel?: OptionalProp<CodegenTypes.Double>;
+  minZoomLevel?: OptionalProp<CodegenTypes.Double>;
   stop?: UnsafeMixed<NativeCameraStop>;
 
-  onUserTrackingModeChange?: DirectEventHandler<UserTrackingModeChangeEventType>;
+  onUserTrackingModeChange?: CodegenTypes.DirectEventHandler<UserTrackingModeChangeEventType>;
 }
 
 export default codegenNativeComponent<NativeProps>(
diff --git a/src/specs/RNMBXCircleLayerNativeComponent.ts b/src/specs/RNMBXCircleLayerNativeComponent.ts
index 98846bcbcc..86d987f1af 100644
--- a/src/specs/RNMBXCircleLayerNativeComponent.ts
+++ b/src/specs/RNMBXCircleLayerNativeComponent.ts
@@ -1,6 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import { FilterExpression } from '../utils/MapboxStyles';
 
@@ -18,10 +17,10 @@ type CommonProps = {
 
   aboveLayerID?: OptionalProp<string>;
   belowLayerID?: OptionalProp<string>;
-  layerIndex?: OptionalProp<Int32>;
+  layerIndex?: OptionalProp<CodegenTypes.Int32>;
 
-  maxZoomLevel?: OptionalProp<Double>;
-  minZoomLevel?: OptionalProp<Double>;
+  maxZoomLevel?: OptionalProp<CodegenTypes.Double>;
+  minZoomLevel?: OptionalProp<CodegenTypes.Double>;
   sourceLayerID?: OptionalProp<string>;
   slot?: OptionalProp<Slot>;
 };
diff --git a/src/specs/RNMBXCustomLocationProviderNativeComponent.ts b/src/specs/RNMBXCustomLocationProviderNativeComponent.ts
index 719ed392b9..b8fffd86a9 100644
--- a/src/specs/RNMBXCustomLocationProviderNativeComponent.ts
+++ b/src/specs/RNMBXCustomLocationProviderNativeComponent.ts
@@ -1,6 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import { Double } from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import type { Position } from '../types/Position';
 
@@ -11,7 +10,7 @@ type OptionalProp<T> = UnsafeMixed<T>;
 
 export interface NativeProps extends ViewProps {
   coordinate?: OptionalProp<Position>;
-  heading?: OptionalProp<Double>;
+  heading?: OptionalProp<CodegenTypes.Double>;
 }
 
 export default codegenNativeComponent<NativeProps>(
diff --git a/src/specs/RNMBXFillExtrusionLayerNativeComponent.ts b/src/specs/RNMBXFillExtrusionLayerNativeComponent.ts
index b3801a7597..c651bd237e 100644
--- a/src/specs/RNMBXFillExtrusionLayerNativeComponent.ts
+++ b/src/specs/RNMBXFillExtrusionLayerNativeComponent.ts
@@ -1,6 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import type { UnsafeMixed } from './codegenUtils';
 
@@ -15,11 +14,11 @@ export interface NativeProps extends ViewProps {
 
   aboveLayerID?: OptionalProp<string>;
   belowLayerID?: OptionalProp<string>;
-  layerIndex?: OptionalProp<Int32>;
+  layerIndex?: OptionalProp<CodegenTypes.Int32>;
   reactStyle: UnsafeMixed<any>;
 
-  maxZoomLevel?: OptionalProp<Double>;
-  minZoomLevel?: OptionalProp<Double>;
+  maxZoomLevel?: OptionalProp<CodegenTypes.Double>;
+  minZoomLevel?: OptionalProp<CodegenTypes.Double>;
   sourceLayerID?: OptionalProp<string>;
 }
 
diff --git a/src/specs/RNMBXFillLayerNativeComponent.ts b/src/specs/RNMBXFillLayerNativeComponent.ts
index 4b705901bb..ff7af6fa21 100644
--- a/src/specs/RNMBXFillLayerNativeComponent.ts
+++ b/src/specs/RNMBXFillLayerNativeComponent.ts
@@ -1,6 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import { FilterExpression } from '../utils/MapboxStyles';
 
@@ -18,10 +17,10 @@ type CommonProps = {
 
   aboveLayerID?: OptionalProp<string>;
   belowLayerID?: OptionalProp<string>;
-  layerIndex?: OptionalProp<Int32>;
+  layerIndex?: OptionalProp<CodegenTypes.Int32>;
 
-  maxZoomLevel?: OptionalProp<Double>;
-  minZoomLevel?: OptionalProp<Double>;
+  maxZoomLevel?: OptionalProp<CodegenTypes.Double>;
+  minZoomLevel?: OptionalProp<CodegenTypes.Double>;
   sourceLayerID?: OptionalProp<string>;
   slot?: OptionalProp<Slot>;
 };
diff --git a/src/specs/RNMBXHeatmapLayerNativeComponent.ts b/src/specs/RNMBXHeatmapLayerNativeComponent.ts
index 08af671064..bd260e408c 100644
--- a/src/specs/RNMBXHeatmapLayerNativeComponent.ts
+++ b/src/specs/RNMBXHeatmapLayerNativeComponent.ts
@@ -1,6 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import { FilterExpression } from '../utils/MapboxStyles';
 
@@ -18,10 +17,10 @@ type CommonProps = {
 
   aboveLayerID?: OptionalProp<string>;
   belowLayerID?: OptionalProp<string>;
-  layerIndex?: OptionalProp<Int32>;
+  layerIndex?: OptionalProp<CodegenTypes.Int32>;
 
-  maxZoomLevel?: OptionalProp<Double>;
-  minZoomLevel?: OptionalProp<Double>;
+  maxZoomLevel?: OptionalProp<CodegenTypes.Double>;
+  minZoomLevel?: OptionalProp<CodegenTypes.Double>;
   sourceLayerID?: OptionalProp<string>;
   slot?: OptionalProp<Slot>;
 };
diff --git a/src/specs/RNMBXImageNativeComponent.ts b/src/specs/RNMBXImageNativeComponent.ts
index db177ed3ad..d8d6550a62 100644
--- a/src/specs/RNMBXImageNativeComponent.ts
+++ b/src/specs/RNMBXImageNativeComponent.ts
@@ -1,13 +1,12 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import type { Double } from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import type { UnsafeMixed } from './codegenUtils';
 
 export interface NativeProps extends ViewProps {
   stretchX: UnsafeMixed<Array<any>>; // Array<Number> inside UnsafeMixed
   stretchY: UnsafeMixed<Array<any>>; // Array<Number> inside UnsafeMixed
-  content: UnsafeMixed<Array<Double>>;
+  content: UnsafeMixed<Array<CodegenTypes.Double>>;
   sdf: UnsafeMixed<boolean>;
   name: UnsafeMixed<string>;
   scale?: UnsafeMixed<number>;
diff --git a/src/specs/RNMBXImageSourceNativeComponent.ts b/src/specs/RNMBXImageSourceNativeComponent.ts
index 8b053b092e..0544cb3510 100644
--- a/src/specs/RNMBXImageSourceNativeComponent.ts
+++ b/src/specs/RNMBXImageSourceNativeComponent.ts
@@ -1,5 +1,5 @@
 import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import { codegenNativeComponent } from 'react-native';
 
 import { UnsafeMixed } from './codegenUtils';
 
diff --git a/src/specs/RNMBXImagesNativeComponent.ts b/src/specs/RNMBXImagesNativeComponent.ts
index b700f2eac1..bf6ec1b081 100644
--- a/src/specs/RNMBXImagesNativeComponent.ts
+++ b/src/specs/RNMBXImagesNativeComponent.ts
@@ -1,6 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import type { DirectEventHandler } from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import type { UnsafeMixed } from './codegenUtils';
 
@@ -13,7 +12,7 @@ export interface NativeProps extends ViewProps {
   images: UnsafeMixed<any>;
   nativeImages: UnsafeMixed<Array<any>>;
   hasOnImageMissing: UnsafeMixed<boolean>;
-  onImageMissing: DirectEventHandler<OnImageMissingEventType>;
+  onImageMissing: CodegenTypes.DirectEventHandler<OnImageMissingEventType>;
 }
 
 export default codegenNativeComponent<NativeProps>(
diff --git a/src/specs/RNMBXLightNativeComponent.ts b/src/specs/RNMBXLightNativeComponent.ts
index d33358ada6..2b453c0694 100644
--- a/src/specs/RNMBXLightNativeComponent.ts
+++ b/src/specs/RNMBXLightNativeComponent.ts
@@ -1,5 +1,5 @@
 import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import { codegenNativeComponent } from 'react-native';
 
 import type { UnsafeMixed } from './codegenUtils';
 
diff --git a/src/specs/RNMBXLineLayerNativeComponent.ts b/src/specs/RNMBXLineLayerNativeComponent.ts
index acfd202676..21b0162378 100644
--- a/src/specs/RNMBXLineLayerNativeComponent.ts
+++ b/src/specs/RNMBXLineLayerNativeComponent.ts
@@ -1,6 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import { FilterExpression } from '../utils/MapboxStyles';
 
@@ -18,10 +17,10 @@ type CommonProps = {
 
   aboveLayerID?: OptionalProp<string>;
   belowLayerID?: OptionalProp<string>;
-  layerIndex?: OptionalProp<Int32>;
+  layerIndex?: OptionalProp<CodegenTypes.Int32>;
 
-  maxZoomLevel?: OptionalProp<Double>;
-  minZoomLevel?: OptionalProp<Double>;
+  maxZoomLevel?: OptionalProp<CodegenTypes.Double>;
+  minZoomLevel?: OptionalProp<CodegenTypes.Double>;
   sourceLayerID?: OptionalProp<string>;
   slot?: OptionalProp<Slot>;
 };
diff --git a/src/specs/RNMBXMapViewNativeComponent.ts b/src/specs/RNMBXMapViewNativeComponent.ts
index 7dadbc9f29..c881ee806f 100644
--- a/src/specs/RNMBXMapViewNativeComponent.ts
+++ b/src/specs/RNMBXMapViewNativeComponent.ts
@@ -1,10 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import {
-  BubblingEventHandler,
-  DirectEventHandler,
-  Int32,
-} from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import type { Point, UnsafeMixed } from './codegenUtils';
 
@@ -42,7 +37,7 @@ export interface NativeProps extends ViewProps {
   compassEnabled?: OptionalProp<boolean>;
   compassFadeWhenNorth?: OptionalProp<boolean>;
   compassPosition?: UnsafeMixed<any>;
-  compassViewPosition?: OptionalProp<Int32>;
+  compassViewPosition?: OptionalProp<CodegenTypes.Int32>;
   compassViewMargins?: OptionalProp<Point>;
 
   scaleBarEnabled?: OptionalProp<boolean>;
@@ -73,13 +68,13 @@ export interface NativeProps extends ViewProps {
   // iOS only
   compassImage?: OptionalProp<string>;
 
-  onPress?: BubblingEventHandler<OnPressEventType>;
-  onLongPress?: DirectEventHandler<OnPressEventType>;
-  onMapChange?: DirectEventHandler<OnMapChangeEventType>;
-  onCameraChanged?: DirectEventHandler<OnCameraChangedEventType>;
+  onPress?: CodegenTypes.BubblingEventHandler<OnPressEventType>;
+  onLongPress?: CodegenTypes.DirectEventHandler<OnPressEventType>;
+  onMapChange?: CodegenTypes.DirectEventHandler<OnMapChangeEventType>;
+  onCameraChanged?: CodegenTypes.DirectEventHandler<OnCameraChangedEventType>;
 
   mapViewImpl?: OptionalProp<string>;
-  preferredFramesPerSecond?: OptionalProp<Int32>;
+  preferredFramesPerSecond?: OptionalProp<CodegenTypes.Int32>;
 }
 
 export default codegenNativeComponent<NativeProps>(
@@ -133,9 +128,9 @@ type OnMapChangeEventTypeActual = {
 
 export type NativeMapViewActual = HostComponent<
   Omit<NativeProps, 'onCameraChanged' | 'onLongPress' | 'onMapChange'> & {
-    onCameraChanged?: DirectEventHandler<OnCameraChangedEventTypeActual>;
-    onLongPress?: DirectEventHandler<OnPressEventTypeActual>;
-    onPress?: DirectEventHandler<OnPressEventTypeActual>;
-    onMapChange?: DirectEventHandler<OnMapChangeEventTypeActual>;
+    onCameraChanged?: CodegenTypes.DirectEventHandler<OnCameraChangedEventTypeActual>;
+    onLongPress?: CodegenTypes.DirectEventHandler<OnPressEventTypeActual>;
+    onPress?: CodegenTypes.DirectEventHandler<OnPressEventTypeActual>;
+    onMapChange?: CodegenTypes.DirectEventHandler<OnMapChangeEventTypeActual>;
   }
 >;
diff --git a/src/specs/RNMBXMarkerViewContentNativeComponent.ts b/src/specs/RNMBXMarkerViewContentNativeComponent.ts
index f640d903a1..58a2249be5 100644
--- a/src/specs/RNMBXMarkerViewContentNativeComponent.ts
+++ b/src/specs/RNMBXMarkerViewContentNativeComponent.ts
@@ -1,5 +1,5 @@
 import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import { codegenNativeComponent } from 'react-native';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface NativeProps extends ViewProps {}
diff --git a/src/specs/RNMBXMarkerViewNativeComponent.ts b/src/specs/RNMBXMarkerViewNativeComponent.ts
index a73dcfd0d9..48b10fda3b 100644
--- a/src/specs/RNMBXMarkerViewNativeComponent.ts
+++ b/src/specs/RNMBXMarkerViewNativeComponent.ts
@@ -1,14 +1,13 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import { Position } from '../types/Position';
 
 import { UnsafeMixed } from './codegenUtils';
 
 type Point = {
-  x: Int32;
-  y: Int32;
+  x: CodegenTypes.Int32;
+  y: CodegenTypes.Int32;
 };
 
 export interface NativeProps extends ViewProps {
diff --git a/src/specs/RNMBXModelLayerNativeComponent.ts b/src/specs/RNMBXModelLayerNativeComponent.ts
index 08db32af6c..35f85a979e 100644
--- a/src/specs/RNMBXModelLayerNativeComponent.ts
+++ b/src/specs/RNMBXModelLayerNativeComponent.ts
@@ -1,6 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import { FilterExpression } from '../utils/MapboxStyles';
 import { StyleValue } from '../utils/StyleValue';
@@ -19,10 +18,10 @@ type CommonProps = {
 
   aboveLayerID?: OptionalProp<string>;
   belowLayerID?: OptionalProp<string>;
-  layerIndex?: OptionalProp<Int32>;
+  layerIndex?: OptionalProp<CodegenTypes.Int32>;
 
-  maxZoomLevel?: OptionalProp<Double>;
-  minZoomLevel?: OptionalProp<Double>;
+  maxZoomLevel?: OptionalProp<CodegenTypes.Double>;
+  minZoomLevel?: OptionalProp<CodegenTypes.Double>;
   sourceLayerID?: OptionalProp<string>;
   slot?: OptionalProp<Slot>;
 };
diff --git a/src/specs/RNMBXModelsNativeComponent.ts b/src/specs/RNMBXModelsNativeComponent.ts
index 1525d0be21..f453cb6fcf 100644
--- a/src/specs/RNMBXModelsNativeComponent.ts
+++ b/src/specs/RNMBXModelsNativeComponent.ts
@@ -1,5 +1,5 @@
 import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import { codegenNativeComponent } from 'react-native';
 
 import { UnsafeMixed } from './codegenUtils';
 
diff --git a/src/specs/RNMBXNativeUserLocationNativeComponent.ts b/src/specs/RNMBXNativeUserLocationNativeComponent.ts
index 08fc5183e0..18b37a0167 100644
--- a/src/specs/RNMBXNativeUserLocationNativeComponent.ts
+++ b/src/specs/RNMBXNativeUserLocationNativeComponent.ts
@@ -3,7 +3,7 @@ import type {
   ProcessedColorValue,
   ViewProps,
 } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import { codegenNativeComponent } from 'react-native';
 
 import type { Expression } from '../utils/MapboxStyles';
 
diff --git a/src/specs/RNMBXPointAnnotationNativeComponent.ts b/src/specs/RNMBXPointAnnotationNativeComponent.ts
index d85c293e9d..dcd09ea421 100644
--- a/src/specs/RNMBXPointAnnotationNativeComponent.ts
+++ b/src/specs/RNMBXPointAnnotationNativeComponent.ts
@@ -1,6 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import { DirectEventHandler } from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import type { UnsafeMixed } from './codegenUtils';
 
@@ -28,11 +27,11 @@ export interface NativeProps extends ViewProps {
   id: UnsafeMixed<string>;
   anchor: UnsafeMixed<any>;
 
-  onMapboxPointAnnotationDeselected: DirectEventHandler<OnMapboxPointAnnotationDeselectedEventType>;
-  onMapboxPointAnnotationDrag: DirectEventHandler<OnMapboxPointAnnotationDragEventType>;
-  onMapboxPointAnnotationDragEnd: DirectEventHandler<OnMapboxPointAnnotationDragEndEventType>;
-  onMapboxPointAnnotationDragStart: DirectEventHandler<OnMapboxPointAnnotationDragStartEventType>;
-  onMapboxPointAnnotationSelected: DirectEventHandler<OnMapboxPointAnnotationSelectedEventType>;
+  onMapboxPointAnnotationDeselected: CodegenTypes.DirectEventHandler<OnMapboxPointAnnotationDeselectedEventType>;
+  onMapboxPointAnnotationDrag: CodegenTypes.DirectEventHandler<OnMapboxPointAnnotationDragEventType>;
+  onMapboxPointAnnotationDragEnd: CodegenTypes.DirectEventHandler<OnMapboxPointAnnotationDragEndEventType>;
+  onMapboxPointAnnotationDragStart: CodegenTypes.DirectEventHandler<OnMapboxPointAnnotationDragStartEventType>;
+  onMapboxPointAnnotationSelected: CodegenTypes.DirectEventHandler<OnMapboxPointAnnotationSelectedEventType>;
 }
 
 export default codegenNativeComponent<NativeProps>(
diff --git a/src/specs/RNMBXRasterDemSourceNativeComponent.ts b/src/specs/RNMBXRasterDemSourceNativeComponent.ts
index 521a5ccc2f..46691a4989 100644
--- a/src/specs/RNMBXRasterDemSourceNativeComponent.ts
+++ b/src/specs/RNMBXRasterDemSourceNativeComponent.ts
@@ -1,6 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import { Double } from 'react-native/Libraries/Types/CodegenTypes';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import { UnsafeMixed } from './codegenUtils';
 
@@ -9,9 +8,9 @@ export interface NativeProps extends ViewProps {
   existing: UnsafeMixed<boolean>;
   url: UnsafeMixed<string>;
   tileUrlTemplates: UnsafeMixed<Array<string>>;
-  minZoomLevel: UnsafeMixed<Double>;
-  maxZoomLevel: UnsafeMixed<Double>;
-  tileSize: UnsafeMixed<Double>;
+  minZoomLevel: UnsafeMixed<CodegenTypes.Double>;
+  maxZoomLevel: UnsafeMixed<CodegenTypes.Double>;
+  tileSize: UnsafeMixed<CodegenTypes.Double>;
 }
 
 export default codegenNativeComponent<NativeProps>(
diff --git a/src/specs/RNMBXRasterLayerNativeComponent.ts b/src/specs/RNMBXRasterLayerNativeComponent.ts
index 1d71599427..828eebd0c9 100644
--- a/src/specs/RNMBXRasterLayerNativeComponent.ts
+++ b/src/specs/RNMBXRasterLayerNativeComponent.ts
@@ -1,6 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import { FilterExpression } from '../utils/MapboxStyles';
 
@@ -18,10 +17,10 @@ type CommonProps = {
 
   aboveLayerID?: OptionalProp<string>;
   belowLayerID?: OptionalProp<string>;
-  layerIndex?: OptionalProp<Int32>;
+  layerIndex?: OptionalProp<CodegenTypes.Int32>;
 
-  maxZoomLevel?: OptionalProp<Double>;
-  minZoomLevel?: OptionalProp<Double>;
+  maxZoomLevel?: OptionalProp<CodegenTypes.Double>;
+  minZoomLevel?: OptionalProp<CodegenTypes.Double>;
   sourceLayerID?: OptionalProp<string>;
   slot?: OptionalProp<Slot>;
 };
diff --git a/src/specs/RNMBXRasterSourceNativeComponent.ts b/src/specs/RNMBXRasterSourceNativeComponent.ts
index 1bad8e7f2c..f04f54fae3 100644
--- a/src/specs/RNMBXRasterSourceNativeComponent.ts
+++ b/src/specs/RNMBXRasterSourceNativeComponent.ts
@@ -1,6 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import { Double } from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import { UnsafeMixed } from './codegenUtils';
 
@@ -9,9 +8,9 @@ export interface NativeProps extends ViewProps {
   existing: UnsafeMixed<boolean>;
   url: UnsafeMixed<string>;
   tileUrlTemplates: UnsafeMixed<Array<string>>;
-  minZoomLevel: UnsafeMixed<Double>;
-  maxZoomLevel: UnsafeMixed<Double>;
-  tileSize: UnsafeMixed<Double>;
+  minZoomLevel: UnsafeMixed<CodegenTypes.Double>;
+  maxZoomLevel: UnsafeMixed<CodegenTypes.Double>;
+  tileSize: UnsafeMixed<CodegenTypes.Double>;
   tms: UnsafeMixed<boolean>;
   attribution: UnsafeMixed<string>;
   sourceBounds: UnsafeMixed<Array<number>>;
diff --git a/src/specs/RNMBXShapeSourceNativeComponent.ts b/src/specs/RNMBXShapeSourceNativeComponent.ts
index d73372569c..6b47ffba4e 100644
--- a/src/specs/RNMBXShapeSourceNativeComponent.ts
+++ b/src/specs/RNMBXShapeSourceNativeComponent.ts
@@ -1,10 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import {
-  DirectEventHandler,
-  Double,
-  Int32,
-} from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import type { UnsafeMixed } from './codegenUtils';
 
@@ -15,17 +10,17 @@ export interface NativeProps extends ViewProps {
   existing: UnsafeMixed<boolean>;
   url: UnsafeMixed<string>;
   shape: UnsafeMixed<string>;
-  cluster: UnsafeMixed<Int32>;
-  clusterRadius: UnsafeMixed<Double>;
-  clusterMaxZoomLevel: UnsafeMixed<Double>;
+  cluster: UnsafeMixed<CodegenTypes.Int32>;
+  clusterRadius: UnsafeMixed<CodegenTypes.Double>;
+  clusterMaxZoomLevel: UnsafeMixed<CodegenTypes.Double>;
   clusterProperties: UnsafeMixed<any>;
-  maxZoomLevel: UnsafeMixed<Double>;
-  buffer: UnsafeMixed<Double>;
-  tolerance: UnsafeMixed<Double>;
+  maxZoomLevel: UnsafeMixed<CodegenTypes.Double>;
+  buffer: UnsafeMixed<CodegenTypes.Double>;
+  tolerance: UnsafeMixed<CodegenTypes.Double>;
   lineMetrics: UnsafeMixed<boolean>;
   hasPressListener: UnsafeMixed<boolean>;
   hitbox: UnsafeMixed<any>;
-  onMapboxShapeSourcePress: DirectEventHandler<OnMapboxShapeSourcePressEventType>;
+  onMapboxShapeSourcePress: CodegenTypes.DirectEventHandler<OnMapboxShapeSourcePressEventType>;
 }
 
 export default codegenNativeComponent<NativeProps>(
diff --git a/src/specs/RNMBXSkyLayerNativeComponent.ts b/src/specs/RNMBXSkyLayerNativeComponent.ts
index 094e29b29e..520c0b3179 100644
--- a/src/specs/RNMBXSkyLayerNativeComponent.ts
+++ b/src/specs/RNMBXSkyLayerNativeComponent.ts
@@ -1,6 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import type { UnsafeMixed } from './codegenUtils';
 
@@ -15,11 +14,11 @@ export interface NativeProps extends ViewProps {
 
   aboveLayerID?: OptionalProp<string>;
   belowLayerID?: OptionalProp<string>;
-  layerIndex?: OptionalProp<Int32>;
+  layerIndex?: OptionalProp<CodegenTypes.Int32>;
   reactStyle?: OptionalProp<any>;
 
-  maxZoomLevel?: OptionalProp<Double>;
-  minZoomLevel?: OptionalProp<Double>;
+  maxZoomLevel?: OptionalProp<CodegenTypes.Double>;
+  minZoomLevel?: OptionalProp<CodegenTypes.Double>;
 }
 
 export default codegenNativeComponent<NativeProps>(
diff --git a/src/specs/RNMBXStyleImportNativeComponent.ts b/src/specs/RNMBXStyleImportNativeComponent.ts
index dce2bd7c48..c48fadddb0 100644
--- a/src/specs/RNMBXStyleImportNativeComponent.ts
+++ b/src/specs/RNMBXStyleImportNativeComponent.ts
@@ -1,5 +1,5 @@
 import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import { codegenNativeComponent } from 'react-native';
 
 import type { UnsafeMixed } from './codegenUtils';
 
diff --git a/src/specs/RNMBXSymbolLayerNativeComponent.ts b/src/specs/RNMBXSymbolLayerNativeComponent.ts
index b83654571a..6c02301ffc 100644
--- a/src/specs/RNMBXSymbolLayerNativeComponent.ts
+++ b/src/specs/RNMBXSymbolLayerNativeComponent.ts
@@ -1,6 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import { FilterExpression } from '../utils/MapboxStyles';
 
@@ -18,10 +17,10 @@ type CommonProps = {
 
   aboveLayerID?: OptionalProp<string>;
   belowLayerID?: OptionalProp<string>;
-  layerIndex?: OptionalProp<Int32>;
+  layerIndex?: OptionalProp<CodegenTypes.Int32>;
 
-  maxZoomLevel?: OptionalProp<Double>;
-  minZoomLevel?: OptionalProp<Double>;
+  maxZoomLevel?: OptionalProp<CodegenTypes.Double>;
+  minZoomLevel?: OptionalProp<CodegenTypes.Double>;
   sourceLayerID?: OptionalProp<string>;
   slot?: OptionalProp<Slot>;
 };
diff --git a/src/specs/RNMBXTerrainNativeComponent.ts b/src/specs/RNMBXTerrainNativeComponent.ts
index 0ffd33c058..6f206f9356 100644
--- a/src/specs/RNMBXTerrainNativeComponent.ts
+++ b/src/specs/RNMBXTerrainNativeComponent.ts
@@ -1,5 +1,5 @@
 import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import { codegenNativeComponent } from 'react-native';
 
 import type { UnsafeMixed } from './codegenUtils';
 
diff --git a/src/specs/RNMBXVectorSourceNativeComponent.ts b/src/specs/RNMBXVectorSourceNativeComponent.ts
index aad3b26f22..0f2a6633e7 100644
--- a/src/specs/RNMBXVectorSourceNativeComponent.ts
+++ b/src/specs/RNMBXVectorSourceNativeComponent.ts
@@ -1,9 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import {
-  DirectEventHandler,
-  Double,
-} from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import type { UnsafeMixed } from './codegenUtils';
 
@@ -15,12 +11,12 @@ export interface NativeProps extends ViewProps {
   url: UnsafeMixed<string>;
   tileUrlTemplates: UnsafeMixed<Array<string>>;
   attribution: UnsafeMixed<string>;
-  maxZoomLevel: UnsafeMixed<Double>;
-  minZoomLevel: UnsafeMixed<Double>;
+  maxZoomLevel: UnsafeMixed<CodegenTypes.Double>;
+  minZoomLevel: UnsafeMixed<CodegenTypes.Double>;
   tms: UnsafeMixed<boolean>;
   hasPressListener: UnsafeMixed<boolean>;
   hitbox: UnsafeMixed<any>;
-  onMapboxVectorSourcePress: DirectEventHandler<OnMapboxVectorSourcePressEventType>;
+  onMapboxVectorSourcePress: CodegenTypes.DirectEventHandler<OnMapboxVectorSourcePressEventType>;
 }
 
 export default codegenNativeComponent<NativeProps>(
diff --git a/src/specs/RNMBXViewportNativeComponent.ts b/src/specs/RNMBXViewportNativeComponent.ts
index e48767b456..6bd9e112fd 100644
--- a/src/specs/RNMBXViewportNativeComponent.ts
+++ b/src/specs/RNMBXViewportNativeComponent.ts
@@ -1,6 +1,5 @@
-import type { HostComponent, ViewProps } from 'react-native';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import { DirectEventHandler } from 'react-native/Libraries/Types/CodegenTypes';
+import type { HostComponent, ViewProps, CodegenTypes } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 
 import type { UnsafeMixed } from './codegenUtils';
 
@@ -103,7 +102,7 @@ export type OnStatusChangedEventTypeReal = {
 export interface NativeProps extends ViewProps {
   transitionsToIdleUponUserInteraction?: OptionalProp<boolean>;
   hasStatusChanged: boolean;
-  onStatusChanged?: DirectEventHandler<OnStatusChangedEventType>;
+  onStatusChanged?: CodegenTypes.DirectEventHandler<OnStatusChangedEventType>;
 }
 
 export default codegenNativeComponent<NativeProps>(
@@ -112,6 +111,6 @@ export default codegenNativeComponent<NativeProps>(
 
 export type NativeViewportReal = HostComponent<
   Omit<NativeProps, 'onStatusChanged'> & {
-    onStatusChanged?: DirectEventHandler<OnStatusChangedEventTypeReal>;
+    onStatusChanged?: CodegenTypes.DirectEventHandler<OnStatusChangedEventTypeReal>;
   }
 >;
diff --git a/src/specs/codegenUtils.ts b/src/specs/codegenUtils.ts
index c55e702e8e..fd82a28090 100644
--- a/src/specs/codegenUtils.ts
+++ b/src/specs/codegenUtils.ts
@@ -7,23 +7,23 @@ export type UnsafeMixed<T> = T;
 // https://github.com/rnmapbox/maps/pull/3082#discussion_r1339858750
 export type OptionalProp<T> = UnsafeMixed<T>;
 
-import { Double, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { CodegenTypes } from 'react-native';
 
 export type Point = {
-  x: Int32;
-  y: Int32;
+  x: CodegenTypes.Int32;
+  y: CodegenTypes.Int32;
 };
 
 export type NativeCameraStop = {
   centerCoordinate?: string;
   bounds?: string;
-  heading?: Double;
-  pitch?: Double;
-  zoom?: Double;
-  paddingLeft?: Double;
-  paddingRight?: Double;
-  paddingTop?: Double;
-  paddingBottom?: Double;
-  duration?: Double;
+  heading?: CodegenTypes.Double;
+  pitch?: CodegenTypes.Double;
+  zoom?: CodegenTypes.Double;
+  paddingLeft?: CodegenTypes.Double;
+  paddingRight?: CodegenTypes.Double;
+  paddingTop?: CodegenTypes.Double;
+  paddingBottom?: CodegenTypes.Double;
+  duration?: CodegenTypes.Double;
   mode?: number;
 } | null;
diff --git a/src/specs/codeparts/CommonLayerNativeComponentsProps.codepart-ts b/src/specs/codeparts/CommonLayerNativeComponentsProps.codepart-ts
index 7717d27578..1d26434352 100644
--- a/src/specs/codeparts/CommonLayerNativeComponentsProps.codepart-ts
+++ b/src/specs/codeparts/CommonLayerNativeComponentsProps.codepart-ts
@@ -9,10 +9,10 @@ type CommonProps = {
 
   aboveLayerID?: OptionalProp<string>;
   belowLayerID?: OptionalProp<string>;
-  layerIndex?: OptionalProp<Int32>;
+  layerIndex?: OptionalProp<CodegenTypes.Int32>;
 
-  maxZoomLevel?: OptionalProp<Double>;
-  minZoomLevel?: OptionalProp<Double>;
+  maxZoomLevel?: OptionalProp<CodegenTypes.Double>;
+  minZoomLevel?: OptionalProp<CodegenTypes.Double>;
   sourceLayerID?: OptionalProp<string>;
   slot?: OptionalProp<Slot>;
 };